diff --git a/.github/actions/binary-compatible-builds/main.js b/.github/actions/binary-compatible-builds/main.js
index 6230126fcb81..378c5c202c9c 100755
--- a/.github/actions/binary-compatible-builds/main.js
+++ b/.github/actions/binary-compatible-builds/main.js
@@ -34,7 +34,7 @@ if (process.env.CENTOS !== undefined) {
   return;
 }
 
-const name = process.env.INPUT_NAME.replace(/-min$/, '');
+const name = process.env.INPUT_NAME;
 
 child_process.execFileSync('docker', [
   'build',
diff --git a/.github/actions/install-rust/action.yml b/.github/actions/install-rust/action.yml
index b15c33c0a4cd..003c994f6dfc 100644
--- a/.github/actions/install-rust/action.yml
+++ b/.github/actions/install-rust/action.yml
@@ -61,14 +61,6 @@ runs:
         CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
         EOF
 
-    - name: Require semicolons in WIT
-      shell: bash
-      run: echo WIT_REQUIRE_SEMICOLONS=1 >> "$GITHUB_ENV"
-
-    - name: Install the WASI target
-      shell: bash
-      run: rustup target add wasm32-wasi wasm32-unknown-unknown
-
     - name: Choose registry cache key
       shell: bash
       # Update the registry index cache at most once per day. actions/cache
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fa44e2d9bb38..d5b777e48338 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -125,7 +125,6 @@ jobs:
     outputs:
       run-full: ${{ steps.calculate.outputs.run-full }}
       test-matrix: ${{ steps.calculate.outputs.test-matrix }}
-      build-matrix: ${{ steps.calculate.outputs.build-matrix }}
       test-capi: ${{ steps.calculate.outputs.test-capi }}
       build-fuzz: ${{ steps.calculate.outputs.build-fuzz }}
       audit: ${{ steps.calculate.outputs.audit }}
@@ -171,9 +170,6 @@ jobs:
         echo "test-matrix={\"include\":$(echo $matrix)}" >> $GITHUB_OUTPUT
         echo "$matrix"
 
-        matrix="$(node ./ci/build-build-matrix.js)"
-        echo "build-matrix={\"include\":$(echo $matrix)}" >> $GITHUB_OUTPUT
-
         if [ "$run_full" = "true" ]; then
             echo run-full=true >> $GITHUB_OUTPUT
             echo test-capi=true >> $GITHUB_OUTPUT
@@ -200,7 +196,7 @@ jobs:
         submodules: true
     - uses: ./.github/actions/install-rust
       with:
-        toolchain: nightly-2023-10-10
+        toolchain: nightly-2023-07-02
 
     # Build C API documentation
     - run: curl -L https://sourceforge.net/projects/doxygen/files/rel-1.9.3/doxygen-1.9.3.linux.bin.tar.gz/download | tar xzf -
@@ -270,7 +266,8 @@ jobs:
     # Check some feature combinations of the `wasmtime` crate
     - run: cargo check -p wasmtime --no-default-features
     - run: cargo check -p wasmtime --no-default-features --features wat
-    - run: cargo check -p wasmtime --no-default-features --features profiling
+    - run: cargo check -p wasmtime --no-default-features --features jitdump
+    - run: cargo check -p wasmtime --no-default-features --features vtune
     - run: cargo check -p wasmtime --no-default-features --features cache
     - run: cargo check -p wasmtime --no-default-features --features async
     - run: cargo check -p wasmtime --no-default-features --features pooling-allocator
@@ -279,20 +276,12 @@ jobs:
     - run: cargo check -p wasmtime --no-default-features --features cranelift,wat,async,cache
     - run: cargo check -p wasmtime --no-default-features --features winch
     - run: cargo check -p wasmtime --no-default-features --features wmemcheck
-    - run: cargo check -p wasmtime --no-default-features --features demangle
-    - run: cargo check -p wasmtime --no-default-features --features addr2line
     - run: cargo check --features component-model
     - run: cargo check -p wasmtime --features incremental-cache
 
-    # Feature combinations of the `wasmtime-cli`
-    - run: cargo check -p wasmtime-cli --no-default-features
-
     # Check that benchmarks of the cranelift project build
     - run: cargo check --benches -p cranelift-codegen
 
-    # Check that the bench-api compiles
-    - run: cargo check -p wasmtime-bench-api
-
     # Check some feature combinations of the `wasmtime-c-api` crate
     - run: cargo check -p wasmtime-c-api --no-default-features
     - run: cargo check -p wasmtime-c-api --no-default-features --features wat
@@ -367,7 +356,7 @@ jobs:
     # flags to rustc.
     - uses: ./.github/actions/install-rust
       with:
-        toolchain: nightly-2023-10-10
+        toolchain: nightly-2023-07-02
     - run: cargo install cargo-fuzz --vers "^0.11"
     # Install the OCaml packages necessary for fuzz targets that use the
     # `wasm-spec-interpreter`.
@@ -394,9 +383,9 @@ jobs:
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     env:
-      QEMU_BUILD_VERSION: 8.1.1
+      QEMU_BUILD_VERSION: 8.0.4
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix: ${{ fromJson(needs.determine.outputs.test-matrix) }}
     steps:
     - uses: actions/checkout@v3
@@ -416,6 +405,8 @@ jobs:
       if: matrix.target == 'x86_64-pc-windows-gnu'
 
     - run: cargo fetch --locked
+    - run: cargo fetch --locked --manifest-path crates/test-programs/wasi-tests/Cargo.toml
+    - run: cargo fetch --locked --manifest-path crates/test-programs/wasi-http-tests/Cargo.toml
 
     - uses: actions/cache@v3
       with:
@@ -453,6 +444,7 @@ jobs:
         # quickly.
         curl https://download.qemu.org/qemu-$QEMU_BUILD_VERSION.tar.xz | tar xJf -
         cd qemu-$QEMU_BUILD_VERSION
+        patch -p1 < $GITHUB_WORKSPACE/ci/qemu-cpuinfo.patch
         ./configure --target-list=${{ matrix.qemu_target }} --prefix=${{ runner.tool_cache}}/qemu --disable-tools --disable-slirp --disable-fdt --disable-capstone --disable-docs
         ninja -C build install
         touch ${{ runner.tool_cache }}/qemu/built
@@ -510,7 +502,7 @@ jobs:
           submodules: true
       - uses: ./.github/actions/install-rust
       - run: rustup target add wasm32-wasi
-      - uses: abrown/install-openvino-action@v7
+      - uses: abrown/install-openvino-action@v6
         with:
           version: 2022.3.0
           apt: true
@@ -648,7 +640,7 @@ jobs:
         submodules: true
     - uses: ./.github/actions/install-rust
       with:
-        toolchain: nightly-2023-10-10
+        toolchain: nightly-2023-07-02
     - run: rustup component add rust-src miri
     - uses: actions/cache@v3
       with:
@@ -674,28 +666,40 @@ jobs:
   # Perform release builds of `wasmtime` and `libwasmtime.so`. Builds a variety
   # of platforms and architectures and then uploads the release artifacts to
   # this workflow run's list of artifacts.
-  #
-  # Note that the full matrix is computed by `ci/build-build-matrix.js`.
   build:
     needs: determine
     if: needs.determine.outputs.run-full
     name: Release build for ${{ matrix.build }}
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
-      matrix: ${{ fromJson(needs.determine.outputs.build-matrix) }}
+      matrix:
+        include:
+        - build: x86_64-linux
+          os: ubuntu-latest
+        - build: x86_64-macos
+          os: macos-latest
+        - build: aarch64-macos
+          os: macos-latest
+          target: aarch64-apple-darwin
+        - build: x86_64-windows
+          os: windows-latest
+        - build: x86_64-mingw
+          os: windows-latest
+          target: x86_64-pc-windows-gnu
+        - build: aarch64-linux
+          os: ubuntu-latest
+          target: aarch64-unknown-linux-gnu
+        - build: s390x-linux
+          os: ubuntu-latest
+          target: s390x-unknown-linux-gnu
+        - build: riscv64gc-linux
+          os: ubuntu-latest
+          target: riscv64gc-unknown-linux-gnu
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: true
-
     - uses: ./.github/actions/install-rust
-      with:
-        toolchain: ${{ matrix.rust }}
-    - run: |
-        rustup component add rust-src
-        rustup target add ${{ matrix.target }}
-
     # On one builder produce the source tarball since there's no need to produce
     # it everywhere
     - run: ./ci/build-src-tarball.sh
@@ -703,13 +707,21 @@ jobs:
     - uses: ./.github/actions/binary-compatible-builds
       with:
         name: ${{ matrix.build }}
+    - run: |
+        echo CARGO_BUILD_TARGET=${{ matrix.target }} >> $GITHUB_ENV
+        rustup target add ${{ matrix.target }}
+      if: matrix.target != ''
+
+    # Build `wasmtime` and executables. Note that we include some non-default
+    # features so the # release artifacts can be maximally feature-ful.
+    - run: $CENTOS cargo build --release --bin wasmtime --features all-arch,component-model
 
-    - run: $CENTOS ./ci/build-release-artifacts.sh "${{ matrix.build }}" "${{ matrix.target }}"
+    # Build `libwasmtime.so`
+    - run: $CENTOS cargo build --release --manifest-path crates/c-api/Cargo.toml
 
-    # Assemble release artifacts appropriate for this platform, then upload them
+    # Assemble release artifats appropriate for this platform, then upload them
     # unconditionally to this workflow's files so we have a copy of them.
     - run: ./ci/build-tarballs.sh "${{ matrix.build }}" "${{ matrix.target }}"
-
     - uses: actions/upload-artifact@v3
       with:
         name: bins-${{ matrix.build }}
diff --git a/.github/workflows/publish-artifacts.yml b/.github/workflows/publish-artifacts.yml
index 8c149003dc91..e036474d24eb 100644
--- a/.github/workflows/publish-artifacts.yml
+++ b/.github/workflows/publish-artifacts.yml
@@ -28,8 +28,6 @@ jobs:
       env:
         GH_TOKEN: ${{ github.token }}
 
-    - run: ./ci/merge-artifacts.sh
-
     # Deploy the `gh-pages.tar.gz` artifact to the `gh-pages` branch.
     - run: tar xf gh-pages.tar.gz
       working-directory: gh-pages
@@ -43,6 +41,10 @@ jobs:
 
     - run: npm install --production
       working-directory: .github/actions/github-release
+    - run: |
+        mkdir dist
+        mv -t dist bins-*/*.tar.*
+        mv -t dist bins-*/*.{zip,msi,wasm}
     - name: Publish Release
       uses: ./.github/actions/github-release
       with:
diff --git a/.gitignore b/.gitignore
index 7790b83f8725..afb3ff15003f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,5 +21,3 @@ foo
 publish
 vendor
 examples/build
-examples/.cache
-*.coredump
diff --git a/Cargo.lock b/Cargo.lock
index a0bdb3b5a96b..5aee586bfcfa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -106,9 +106,9 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "arbitrary"
-version = "1.3.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2e1373abdaa212b704512ec2bd8b26bd0b7d5c3f70117411a5d9a451383c859"
+checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e"
 dependencies = [
  "derive_arbitrary",
 ]
@@ -194,9 +194,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
 
 [[package]]
 name = "block-buffer"
@@ -226,7 +226,7 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
 
 [[package]]
 name = "byte-array-literals"
-version = "15.0.0"
+version = "14.0.0"
 
 [[package]]
 name = "byteorder"
@@ -257,7 +257,7 @@ checksum = "b779b2d0a001c125b4584ad586268fb4b92d957bff8d26d7fe0dd78283faa814"
 dependencies = [
  "cap-primitives",
  "cap-std",
- "io-lifetimes",
+ "io-lifetimes 2.0.2",
  "windows-sys",
 ]
 
@@ -269,7 +269,7 @@ checksum = "6ffc30dee200c20b4dcb80572226f42658e1d9c4b668656d7cc59c33d50e396e"
 dependencies = [
  "cap-primitives",
  "cap-std",
- "rustix",
+ "rustix 0.38.8",
  "smallvec",
 ]
 
@@ -282,10 +282,10 @@ dependencies = [
  "ambient-authority",
  "fs-set-times",
  "io-extras",
- "io-lifetimes",
+ "io-lifetimes 2.0.2",
  "ipnet",
  "maybe-owned",
- "rustix",
+ "rustix 0.38.8",
  "windows-sys",
  "winx",
 ]
@@ -308,8 +308,8 @@ checksum = "84bade423fa6403efeebeafe568fdb230e8c590a275fba2ba978dd112efcf6e9"
 dependencies = [
  "cap-primitives",
  "io-extras",
- "io-lifetimes",
- "rustix",
+ "io-lifetimes 2.0.2",
+ "rustix 0.38.8",
 ]
 
 [[package]]
@@ -320,7 +320,7 @@ checksum = "7b9e3348a3510c4619b4c7a7bcdef09a71221da18f266bda3ed6b9aea2c509e2"
 dependencies = [
  "cap-std",
  "rand",
- "rustix",
+ "rustix 0.38.8",
  "uuid",
 ]
 
@@ -332,7 +332,7 @@ checksum = "f8f52b3c8f4abfe3252fd0a071f3004aaa3b18936ec97bdbd8763ce03aff6247"
 dependencies = [
  "cap-primitives",
  "once_cell",
- "rustix",
+ "rustix 0.38.8",
  "winx",
 ]
 
@@ -484,6 +484,15 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
+[[package]]
+name = "command-tests"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "getrandom",
+ "wit-bindgen",
+]
+
 [[package]]
 name = "component-fuzz-util"
 version = "0.0.0"
@@ -557,7 +566,7 @@ dependencies = [
 
 [[package]]
 name = "cranelift"
-version = "0.102.0"
+version = "0.101.0"
 dependencies = [
  "cranelift-codegen",
  "cranelift-frontend",
@@ -565,14 +574,14 @@ dependencies = [
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.102.0"
+version = "0.101.0"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.102.0"
+version = "0.101.0"
 dependencies = [
  "anyhow",
  "bincode",
@@ -600,25 +609,25 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.102.0"
+version = "0.101.0"
 dependencies = [
  "cranelift-codegen-shared",
 ]
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.102.0"
+version = "0.101.0"
 
 [[package]]
 name = "cranelift-control"
-version = "0.102.0"
+version = "0.101.0"
 dependencies = [
  "arbitrary",
 ]
 
 [[package]]
 name = "cranelift-entity"
-version = "0.102.0"
+version = "0.101.0"
 dependencies = [
  "serde",
  "serde_derive",
@@ -650,7 +659,6 @@ dependencies = [
  "serde",
  "serde_derive",
  "similar",
- "smallvec",
  "target-lexicon",
  "thiserror",
  "toml",
@@ -660,7 +668,7 @@ dependencies = [
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.102.0"
+version = "0.101.0"
 dependencies = [
  "cranelift-codegen",
  "hashbrown 0.14.0",
@@ -684,7 +692,7 @@ dependencies = [
 
 [[package]]
 name = "cranelift-interpreter"
-version = "0.102.0"
+version = "0.101.0"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -698,7 +706,7 @@ dependencies = [
 
 [[package]]
 name = "cranelift-isle"
-version = "0.102.0"
+version = "0.101.0"
 dependencies = [
  "codespan-reporting",
  "log",
@@ -707,7 +715,7 @@ dependencies = [
 
 [[package]]
 name = "cranelift-jit"
-version = "0.102.0"
+version = "0.101.0"
 dependencies = [
  "anyhow",
  "cranelift",
@@ -728,7 +736,7 @@ dependencies = [
 
 [[package]]
 name = "cranelift-module"
-version = "0.102.0"
+version = "0.101.0"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -740,7 +748,7 @@ dependencies = [
 
 [[package]]
 name = "cranelift-native"
-version = "0.102.0"
+version = "0.101.0"
 dependencies = [
  "cranelift-codegen",
  "libc",
@@ -749,7 +757,7 @@ dependencies = [
 
 [[package]]
 name = "cranelift-object"
-version = "0.102.0"
+version = "0.101.0"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -764,7 +772,7 @@ dependencies = [
 
 [[package]]
 name = "cranelift-reader"
-version = "0.102.0"
+version = "0.101.0"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -774,7 +782,7 @@ dependencies = [
 
 [[package]]
 name = "cranelift-serde"
-version = "0.102.0"
+version = "0.101.0"
 dependencies = [
  "clap",
  "cranelift-codegen",
@@ -821,7 +829,7 @@ dependencies = [
 
 [[package]]
 name = "cranelift-wasm"
-version = "0.102.0"
+version = "0.101.0"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1134,9 +1142,12 @@ checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
 
 [[package]]
 name = "fastrand"
-version = "2.0.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+dependencies = [
+ "instant",
+]
 
 [[package]]
 name = "fd-lock"
@@ -1145,7 +1156,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b0377f1edc77dbd1118507bc7a66e4ab64d2b90c66f90726dc801e73a8c68f9"
 dependencies = [
  "cfg-if",
- "rustix",
+ "rustix 0.38.8",
  "windows-sys",
 ]
 
@@ -1208,8 +1219,8 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd738b84894214045e8414eaded76359b4a5773f0a0a56b16575110739cdcf39"
 dependencies = [
- "io-lifetimes",
- "rustix",
+ "io-lifetimes 2.0.2",
+ "rustix 0.38.8",
  "windows-sys",
 ]
 
@@ -1299,7 +1310,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.3.3",
  "debugid",
  "fxhash",
  "serde",
@@ -1579,7 +1590,18 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d3c230ee517ee76b1cc593b52939ff68deda3fae9e41eca426c6b4993df51c4"
 dependencies = [
- "io-lifetimes",
+ "io-lifetimes 2.0.2",
+ "windows-sys",
+]
+
+[[package]]
+name = "io-lifetimes"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
+dependencies = [
+ "hermit-abi 0.3.0",
+ "libc",
  "windows-sys",
 ]
 
@@ -1597,12 +1619,13 @@ checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.9"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
 dependencies = [
  "hermit-abi 0.3.0",
- "rustix",
+ "io-lifetimes 1.0.10",
+ "rustix 0.37.13",
  "windows-sys",
 ]
 
@@ -1642,9 +1665,9 @@ checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
 
 [[package]]
 name = "ittapi"
-version = "0.4.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b996fe614c41395cdaedf3cf408a9534851090959d90d54a535f675550b64b1"
+checksum = "2e648c437172ce7d3ac35ca11a068755072054826fa455a916b43524fa4a62a7"
 dependencies = [
  "anyhow",
  "ittapi-sys",
@@ -1653,9 +1676,9 @@ dependencies = [
 
 [[package]]
 name = "ittapi-sys"
-version = "0.4.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f5385394064fa2c886205dba02598013ce83d3e92d33dbdc0c52fe0e7bf4fc"
+checksum = "a9b32a4d23f72548178dde54f3c12c6b6a08598e25575c0d0fa5bd861e0dc1a5"
 dependencies = [
  "cc",
 ]
@@ -1692,9 +1715,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
 
 [[package]]
 name = "libc"
-version = "0.2.149"
+version = "0.2.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 
 [[package]]
 name = "libfuzzer-sys"
@@ -1725,9 +1748,15 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.10"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
+checksum = "9b085a4f2cde5781fc4b1717f2e86c62f5cda49de7ba99a7c2eae02b61c9064c"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
 
 [[package]]
 name = "listenfd"
@@ -1781,11 +1810,11 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "memfd"
-version = "0.6.4"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64"
+checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e"
 dependencies = [
- "rustix",
+ "rustix 0.37.13",
 ]
 
 [[package]]
@@ -1826,16 +1855,6 @@ dependencies = [
  "windows-sys",
 ]
 
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
 [[package]]
 name = "num-traits"
 version = "0.2.15"
@@ -1947,12 +1966,6 @@ dependencies = [
  "pretty_env_logger 0.4.0",
 ]
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "paste"
 version = "1.0.7"
@@ -2069,6 +2082,17 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "pulldown-cmark"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998"
+dependencies = [
+ "bitflags 1.3.2",
+ "memchr",
+ "unicase",
+]
+
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -2153,6 +2177,13 @@ dependencies = [
  "num_cpus",
 ]
 
+[[package]]
+name = "reactor-tests"
+version = "0.1.0"
+dependencies = [
+ "wit-bindgen",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.2.13"
@@ -2184,9 +2215,9 @@ dependencies = [
 
 [[package]]
 name = "regalloc2"
-version = "0.9.3"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6"
+checksum = "5b4dcbd3a2ae7fb94b5813fa0e957c6ab51bf5d0a8ee1b69e0c2d0f1e6eb8485"
 dependencies = [
  "hashbrown 0.13.2",
  "log",
@@ -2281,15 +2312,29 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
-version = "0.38.21"
+version = "0.37.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f79bef90eb6d984c72722595b5b1348ab39275a5e5123faca6863bf07d75a4e0"
+dependencies = [
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes 1.0.10",
+ "libc",
+ "linux-raw-sys 0.3.3",
+ "windows-sys",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
+checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.3.3",
  "errno",
  "itoa",
  "libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.4.3",
  "once_cell",
  "windows-sys",
 ]
@@ -2440,15 +2485,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "similar"
 version = "2.2.0"
@@ -2577,12 +2613,12 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27ce32341b2c0b70c144bbf35627fdc1ef18c76ced5e5e7b3ee8b5ba6b2ab6a0"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.3.3",
  "cap-fs-ext",
  "cap-std",
  "fd-lock",
- "io-lifetimes",
- "rustix",
+ "io-lifetimes 2.0.2",
+ "rustix 0.38.8",
  "windows-sys",
  "winx",
 ]
@@ -2595,14 +2631,15 @@ checksum = "d7fa7e55043acb85fca6b3c01485a2eeb6b69c5d21002e273c79e465f43b7ac1"
 
 [[package]]
 name = "tempfile"
-version = "3.8.0"
+version = "3.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
+checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
 dependencies = [
+ "autocfg",
  "cfg-if",
  "fastrand",
  "redox_syscall 0.3.5",
- "rustix",
+ "rustix 0.37.13",
  "windows-sys",
 ]
 
@@ -2641,22 +2678,27 @@ name = "test-programs"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "base64",
- "futures",
- "getrandom",
- "libc",
- "sha2",
- "url",
- "wasi",
- "wit-bindgen",
-]
-
-[[package]]
-name = "test-programs-artifacts"
-version = "0.0.0"
-dependencies = [
+ "cap-rand",
+ "cap-std",
  "cargo_metadata",
+ "cfg-if",
  "heck",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "is-terminal",
+ "lazy_static",
+ "tempfile",
+ "test-log",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+ "wasi-cap-std-sync",
+ "wasi-common",
+ "wasmtime",
+ "wasmtime-wasi",
+ "wasmtime-wasi-http",
  "wit-component",
 ]
 
@@ -2727,7 +2769,6 @@ dependencies = [
  "mio",
  "num_cpus",
  "pin-project-lite",
- "signal-hook-registry",
  "socket2",
  "tokio-macros",
  "windows-sys",
@@ -2808,18 +2849,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
 dependencies = [
  "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
-dependencies = [
- "lazy_static",
- "log",
- "tracing-core",
 ]
 
 [[package]]
@@ -2829,14 +2858,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
 dependencies = [
  "matchers",
- "nu-ansi-term",
  "once_cell",
  "regex",
  "sharded-slab",
  "thread_local",
  "tracing",
  "tracing-core",
- "tracing-log",
 ]
 
 [[package]]
@@ -2851,6 +2878,15 @@ version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 
+[[package]]
+name = "unicase"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+dependencies = [
+ "version_check",
+]
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.8"
@@ -2934,15 +2970,9 @@ dependencies = [
  "which",
 ]
 
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
 [[package]]
 name = "verify-component-adapter"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "wasmparser",
@@ -2992,7 +3022,7 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasi-cap-std-sync"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3002,9 +3032,10 @@ dependencies = [
  "cap-time-ext",
  "fs-set-times",
  "io-extras",
- "io-lifetimes",
+ "io-lifetimes 2.0.2",
+ "is-terminal",
  "once_cell",
- "rustix",
+ "rustix 0.38.8",
  "system-interface",
  "tempfile",
  "tracing",
@@ -3014,31 +3045,34 @@ dependencies = [
 
 [[package]]
 name = "wasi-common"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
- "bitflags 2.4.1",
+ "bitflags 2.3.3",
  "cap-rand",
  "cap-std",
  "io-extras",
  "log",
- "rustix",
- "tempfile",
- "test-log",
- "test-programs-artifacts",
+ "rustix 0.38.8",
  "thiserror",
- "tokio",
  "tracing",
- "tracing-subscriber",
  "wasmtime",
- "wasmtime-wasi",
  "wiggle",
  "windows-sys",
 ]
 
+[[package]]
+name = "wasi-http-tests"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "tokio",
+ "wit-bindgen",
+]
+
 [[package]]
 name = "wasi-preview1-component-adapter"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "byte-array-literals",
  "object",
@@ -3047,16 +3081,34 @@ dependencies = [
  "wit-bindgen",
 ]
 
+[[package]]
+name = "wasi-sockets-tests"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasi-tests"
+version = "0.0.0"
+dependencies = [
+ "libc",
+ "once_cell",
+ "wasi",
+ "wit-bindgen",
+]
+
 [[package]]
 name = "wasi-tokio"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "cap-std",
  "cap-tempfile",
  "io-extras",
- "io-lifetimes",
- "rustix",
+ "io-lifetimes 2.0.2",
+ "rustix 0.38.8",
  "tempfile",
  "tokio",
  "wasi-cap-std-sync",
@@ -3120,23 +3172,22 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
 
 [[package]]
 name = "wasm-encoder"
-version = "0.35.0"
+version = "0.33.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ca90ba1b5b0a70d3d49473c5579951f3bddc78d47b59256d2f9d4922b150aca"
+checksum = "b39de0723a53d3c8f54bed106cfbc0d06b3e4d945c5c5022115a61e3b29183ae"
 dependencies = [
  "leb128",
 ]
 
 [[package]]
 name = "wasm-metadata"
-version = "0.10.9"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14abc161bfda5b519aa229758b68f2a52b45a12b993808665c857d1a9a00223c"
+checksum = "9fab01638cbecc57afec7b53ce0e28620b44d7ae1dea53120c96dd08486c07ce"
 dependencies = [
  "anyhow",
  "indexmap 2.0.0",
  "serde",
- "serde_derive",
  "serde_json",
  "spdx",
  "wasm-encoder",
@@ -3145,9 +3196,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-mutate"
-version = "0.2.38"
+version = "0.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1e04b0c049b0a0c42dd108a56c5c92500076747363d3bf1e83e7f0f8b4dfe4"
+checksum = "730c1644f14f3dfa52d8c63bb26c6f3fe89ba80430f1ce29b0388e04825ec514"
 dependencies = [
  "egg",
  "log",
@@ -3159,9 +3210,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-smith"
-version = "0.12.21"
+version = "0.12.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fef779c243bbf04d9f03333c2cb50b98047c6dcc2a1db0cc7d0691e4135064b4"
+checksum = "154bb82cb9f17e5c0773e192e800094583767f752077d5116be376de747539eb"
 dependencies = [
  "arbitrary",
  "flagset",
@@ -3211,9 +3262,9 @@ dependencies = [
 
 [[package]]
 name = "wasmparser"
-version = "0.115.0"
+version = "0.113.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e06c0641a4add879ba71ccb3a1e4278fd546f76f1eafb21d8f7b07733b547cd5"
+checksum = "a128cea7b8516703ab41b10a0b1aa9ba18d0454cd3792341489947ddeee268db"
 dependencies = [
  "indexmap 2.0.0",
  "semver",
@@ -3230,9 +3281,9 @@ dependencies = [
 
 [[package]]
 name = "wasmprinter"
-version = "0.2.70"
+version = "0.2.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e74458a9bc5cc9c7108abfa0fe4dc88d5abf1f3baf194df3264985f17d559b5e"
+checksum = "ab2e5e818f88cee5311e9a5df15cba0a8f772978baf3109af97004bce6e8e3c6"
 dependencies = [
  "anyhow",
  "wasmparser",
@@ -3240,7 +3291,7 @@ dependencies = [
 
 [[package]]
 name = "wasmtime"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3281,14 +3332,14 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-asm-macros"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "wasmtime-bench-api"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "cap-std",
@@ -3305,22 +3356,12 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-c-api"
-version = "15.0.0"
-dependencies = [
- "wasmtime-c-api-impl",
-]
-
-[[package]]
-name = "wasmtime-c-api-impl"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "cap-std",
  "env_logger 0.10.0",
- "futures",
- "log",
  "once_cell",
- "tracing",
  "wasi-cap-std-sync",
  "wasi-common",
  "wasmtime",
@@ -3339,7 +3380,7 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-cache"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "base64",
@@ -3349,7 +3390,7 @@ dependencies = [
  "log",
  "once_cell",
  "pretty_env_logger 0.5.0",
- "rustix",
+ "rustix 0.38.8",
  "serde",
  "serde_derive",
  "sha2",
@@ -3361,12 +3402,11 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-cli"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "async-trait",
  "bstr",
- "bytes",
  "clap",
  "component-macro-test",
  "component-test-util",
@@ -3374,8 +3414,6 @@ dependencies = [
  "env_logger 0.10.0",
  "expect-test",
  "filecheck",
- "http-body-util",
- "hyper",
  "libc",
  "listenfd",
  "log",
@@ -3383,16 +3421,16 @@ dependencies = [
  "num_cpus",
  "once_cell",
  "rayon",
- "rustix",
+ "rustix 0.38.8",
  "serde",
  "serde_derive",
  "serde_json",
  "target-lexicon",
  "tempfile",
- "test-programs-artifacts",
+ "test-programs",
  "tokio",
- "tracing",
  "walkdir",
+ "wasm-encoder",
  "wasmparser",
  "wasmtime",
  "wasmtime-cache",
@@ -3407,27 +3445,27 @@ dependencies = [
  "wasmtime-wasi-nn",
  "wasmtime-wasi-threads",
  "wasmtime-wast",
- "wast 66.0.2",
+ "wast 65.0.1",
  "wat",
  "windows-sys",
 ]
 
 [[package]]
 name = "wasmtime-cli-flags"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "clap",
  "file-per-thread-logger",
  "humantime 2.1.0",
+ "pretty_env_logger 0.5.0",
  "rayon",
- "tracing-subscriber",
  "wasmtime",
 ]
 
 [[package]]
 name = "wasmtime-component-macro"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "component-macro-test-helpers",
@@ -3443,11 +3481,11 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-component-util"
-version = "15.0.0"
+version = "14.0.0"
 
 [[package]]
 name = "wasmtime-cranelift"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -3470,7 +3508,7 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-cranelift-shared"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -3484,9 +3522,10 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-environ"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
+ "atty",
  "clap",
  "cranelift-entity",
  "env_logger 0.10.0",
@@ -3522,7 +3561,7 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-explorer"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "capstone",
@@ -3536,13 +3575,12 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-fiber"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
- "anyhow",
  "backtrace",
  "cc",
  "cfg-if",
- "rustix",
+ "rustix 0.38.8",
  "wasmtime-asm-macros",
  "wasmtime-versioned-export-macros",
  "windows-sys",
@@ -3605,7 +3643,7 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-jit"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "addr2line",
  "anyhow",
@@ -3617,7 +3655,7 @@ dependencies = [
  "log",
  "object",
  "rustc-demangle",
- "rustix",
+ "rustix 0.38.8",
  "serde",
  "serde_derive",
  "target-lexicon",
@@ -3630,17 +3668,17 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-jit-debug"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "object",
  "once_cell",
- "rustix",
+ "rustix 0.38.8",
  "wasmtime-versioned-export-macros",
 ]
 
 [[package]]
 name = "wasmtime-jit-icache-coherence"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "cfg-if",
  "libc",
@@ -3649,7 +3687,7 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-runtime"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "cc",
@@ -3663,9 +3701,8 @@ dependencies = [
  "memoffset",
  "once_cell",
  "paste",
- "proptest",
  "rand",
- "rustix",
+ "rustix 0.38.8",
  "sptr",
  "wasm-encoder",
  "wasmtime-asm-macros",
@@ -3679,7 +3716,7 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-types"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "cranelift-entity",
  "serde",
@@ -3690,7 +3727,7 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-versioned-export-macros"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3699,11 +3736,11 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-wasi"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "bitflags 2.4.1",
+ "bitflags 2.3.3",
  "bytes",
  "cap-fs-ext",
  "cap-net-ext",
@@ -3713,20 +3750,17 @@ dependencies = [
  "fs-set-times",
  "futures",
  "io-extras",
- "io-lifetimes",
+ "io-lifetimes 2.0.2",
+ "is-terminal",
  "libc",
- "log",
  "once_cell",
- "rustix",
+ "rustix 0.38.8",
  "system-interface",
- "tempfile",
  "test-log",
- "test-programs-artifacts",
  "thiserror",
  "tokio",
  "tracing",
  "tracing-subscriber",
- "url",
  "wasi-cap-std-sync",
  "wasi-common",
  "wasi-tokio",
@@ -3737,11 +3771,10 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-wasi-http"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "base64",
  "bytes",
  "futures",
  "http",
@@ -3749,13 +3782,10 @@ dependencies = [
  "http-body-util",
  "hyper",
  "rustls",
- "sha2",
- "test-log",
- "test-programs-artifacts",
+ "thiserror",
  "tokio",
  "tokio-rustls",
  "tracing",
- "tracing-subscriber",
  "wasmtime",
  "wasmtime-wasi",
  "webpki-roots",
@@ -3763,7 +3793,7 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-wasi-nn"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "openvino",
@@ -3776,7 +3806,7 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-wasi-threads"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "log",
@@ -3788,17 +3818,17 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-wast"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "log",
  "wasmtime",
- "wast 66.0.2",
+ "wast 65.0.1",
 ]
 
 [[package]]
 name = "wasmtime-winch"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -3813,7 +3843,7 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-wit-bindgen"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "heck",
@@ -3823,7 +3853,7 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-wmemcheck"
-version = "15.0.0"
+version = "14.0.0"
 
 [[package]]
 name = "wast"
@@ -3836,9 +3866,9 @@ dependencies = [
 
 [[package]]
 name = "wast"
-version = "66.0.2"
+version = "65.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93cb43b0ac6dd156f2c375735ccfd72b012a7c0a6e6d09503499b8d3cb6e6072"
+checksum = "5fd8c1cbadf94a0b0d1071c581d3cfea1b7ed5192c79808dd15406e508dd0afb"
 dependencies = [
  "leb128",
  "memchr",
@@ -3848,11 +3878,11 @@ dependencies = [
 
 [[package]]
 name = "wat"
-version = "1.0.77"
+version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e367582095d2903caeeea9acbb140e1db9c7677001efa4347c3687fd34fe7072"
+checksum = "3209e35eeaf483714f4c6be93f4a03e69aad5f304e3fa66afa7cb90fe1c8051f"
 dependencies = [
- "wast 66.0.2",
+ "wast 65.0.1",
 ]
 
 [[package]]
@@ -3884,11 +3914,11 @@ dependencies = [
 
 [[package]]
 name = "wiggle"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "bitflags 2.4.1",
+ "bitflags 2.3.3",
  "proptest",
  "thiserror",
  "tokio",
@@ -3901,7 +3931,7 @@ dependencies = [
 
 [[package]]
 name = "wiggle-generate"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "anyhow",
  "heck",
@@ -3914,7 +3944,7 @@ dependencies = [
 
 [[package]]
 name = "wiggle-macro"
-version = "15.0.0"
+version = "14.0.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3969,7 +3999,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "winch-codegen"
-version = "0.13.0"
+version = "0.12.0"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -4102,25 +4132,25 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4857cedf8371f690bb6782a3e2b065c54d1b6661be068aaf3eac8b45e813fdf8"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.3.3",
  "windows-sys",
 ]
 
 [[package]]
 name = "wit-bindgen"
-version = "0.13.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d92ce0ca6b6074059413a9581a637550c3a740581c854f9847ec293c8aed71"
+checksum = "f8a3e8e965dc50e6eb4410d9a11720719fadc6a1713803ea5f3be390b81c8279"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.3.3",
  "wit-bindgen-rust-macro",
 ]
 
 [[package]]
 name = "wit-bindgen-core"
-version = "0.13.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "565b945ae074886071eccf9cdaf8ccd7b959c2b0d624095bea5fe62003e8b3e0"
+checksum = "77255512565dfbd0b61de466e854918041d1da53c7bc049d6188c6e02643dc1e"
 dependencies = [
  "anyhow",
  "wit-component",
@@ -4129,44 +4159,54 @@ dependencies = [
 
 [[package]]
 name = "wit-bindgen-rust"
-version = "0.13.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5695ff4e41873ed9ce56d2787e6b5772bdad9e70e2c1d2d160621d1762257f4f"
+checksum = "399c60e6ea8598d1380e792f13d557007834f0fb799fea6503408cbc5debb4ae"
 dependencies = [
  "anyhow",
  "heck",
  "wasm-metadata",
  "wit-bindgen-core",
+ "wit-bindgen-rust-lib",
  "wit-component",
 ]
 
+[[package]]
+name = "wit-bindgen-rust-lib"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd9fb7a43c7dc28b0b727d6ae01bf369981229b7539e768fba2b7a4df13feeeb"
+dependencies = [
+ "heck",
+ "wit-bindgen-core",
+]
+
 [[package]]
 name = "wit-bindgen-rust-macro"
-version = "0.13.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a91835ea4231da1fe7971679d505ba14be7826e192b6357f08465866ef482e08"
+checksum = "44cea5ed784da06da0e55836a6c160e7502dbe28771c2368a595e8606243bf22"
 dependencies = [
  "anyhow",
  "proc-macro2",
- "quote",
  "syn 2.0.29",
  "wit-bindgen-core",
  "wit-bindgen-rust",
+ "wit-bindgen-rust-lib",
  "wit-component",
 ]
 
 [[package]]
 name = "wit-component"
-version = "0.16.0"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e87488b57a08e2cbbd076b325acbe7f8666965af174d69d5929cd373bd54547f"
+checksum = "af872ef43ecb73cc49c7bd2dd19ef9117168e183c78cf70000dca0e14b6a5473"
 dependencies = [
  "anyhow",
- "bitflags 2.4.1",
+ "bitflags 2.3.3",
  "indexmap 2.0.0",
  "log",
  "serde",
- "serde_derive",
  "serde_json",
  "wasm-encoder",
  "wasm-metadata",
@@ -4176,19 +4216,20 @@ dependencies = [
 
 [[package]]
 name = "wit-parser"
-version = "0.12.1"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ace9943d89bbf3dbbc71b966da0e7302057b311f36a4ac3d65ddfef17b52cf"
+checksum = "1dcd022610436a1873e60bfdd9b407763f2404adf7d1cb57912c7ae4059e57a5"
 dependencies = [
  "anyhow",
  "id-arena",
  "indexmap 2.0.0",
  "log",
+ "pulldown-cmark",
  "semver",
  "serde",
- "serde_derive",
  "serde_json",
  "unicode-xid",
+ "url",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 31a1ac788920..9c1fca098d05 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,13 +22,13 @@ path = "src/bin/wasmtime.rs"
 doc = false
 
 [dependencies]
-wasmtime = { workspace = true }
-wasmtime-cache = { workspace = true, optional = true }
+wasmtime = { workspace = true, features = ['cache', 'cranelift'] }
+wasmtime-cache = { workspace = true }
 wasmtime-cli-flags = { workspace = true }
-wasmtime-cranelift = { workspace = true, optional = true }
+wasmtime-cranelift = { workspace = true }
 wasmtime-environ = { workspace = true }
-wasmtime-explorer = { workspace = true, optional = true }
-wasmtime-wast = { workspace = true, optional = true }
+wasmtime-explorer = { workspace = true }
+wasmtime-wast = { workspace = true }
 wasmtime-wasi = { workspace = true, default-features = true, features = [
   "exit",
 ] }
@@ -36,24 +36,17 @@ wasmtime-wasi-nn = { workspace = true, optional = true }
 wasmtime-wasi-threads = { workspace = true, optional = true }
 wasmtime-wasi-http = { workspace = true, optional = true }
 wasmtime-runtime = { workspace = true }
-clap = { workspace = true }
+clap = { workspace = true, features = ["color", "suggestions", "derive"] }
 anyhow = { workspace = true }
 target-lexicon = { workspace = true }
 once_cell = { workspace = true }
 listenfd = "1.0.0"
-wat = { workspace = true, optional = true }
+wat = { workspace = true }
 serde = { workspace = true }
 serde_derive = { workspace = true }
 serde_json = { workspace = true }
 wasmparser = { workspace = true }
-tracing = { workspace = true }
-log = { workspace = true }
-
-async-trait = { workspace = true }
-bytes = { workspace = true }
-tokio = { workspace = true, optional = true, features = [ "signal", "macros" ] }
-hyper = { workspace = true, optional = true }
-http-body-util = { workspace = true, optional = true }
+wasm-encoder = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]
 rustix = { workspace = true, features = ["mm", "param"] }
@@ -66,8 +59,9 @@ log = { workspace = true }
 expect-test = { workspace = true }
 filecheck = { workspace = true }
 tempfile = { workspace = true }
+test-programs = { path = "crates/test-programs" }
 wasmtime-runtime = { workspace = true }
-tokio = { workspace = true, features = ["rt", "time", "macros", "rt-multi-thread"] }
+tokio = { version = "1.8.0", features = ["rt", "time", "macros", "rt-multi-thread"] }
 wast = { workspace = true }
 criterion = "0.5.0"
 num_cpus = "1.13.0"
@@ -84,7 +78,6 @@ libc = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 walkdir = { workspace = true }
-test-programs-artifacts = { workspace = true }
 
 [target.'cfg(windows)'.dev-dependencies]
 windows-sys = { workspace = true, features = ["Win32_System_Memory"] }
@@ -103,9 +96,16 @@ members = [
   "cranelift/isle/islec",
   "cranelift/serde",
   "crates/bench-api",
-  "crates/c-api/artifact",
+  "crates/c-api",
+  "crates/cli-flags",
   "crates/environ/fuzz",
-  "crates/test-programs",
+  "crates/jit-icache-coherence",
+  "crates/test-programs/wasi-tests",
+  "crates/test-programs/wasi-http-tests",
+  "crates/test-programs/wasi-sockets-tests",
+  "crates/test-programs/command-tests",
+  "crates/test-programs/reactor-tests",
+  "crates/wmemcheck",
   "crates/wasi-preview1-component-adapter",
   "crates/wasi-preview1-component-adapter/verify",
   "crates/winch",
@@ -122,68 +122,66 @@ exclude = [
 ]
 
 [workspace.package]
-version = "15.0.0"
+version = "14.0.0"
 authors = ["The Wasmtime Project Developers"]
 edition = "2021"
 # Wasmtime's current policy is that this number can be no larger than the
 # current stable release of Rust minus 2.
-rust-version = "1.71.0"
+rust-version = "1.70.0"
 
 [workspace.dependencies]
-arbitrary = { version = "1.3.1" }
-wasmtime-wmemcheck = { path = "crates/wmemcheck", version = "=15.0.0" }
-wasmtime = { path = "crates/wasmtime", version = "15.0.0", default-features = false }
-wasmtime-cache = { path = "crates/cache", version = "=15.0.0" }
-wasmtime-cli-flags = { path = "crates/cli-flags", version = "=15.0.0" }
-wasmtime-cranelift = { path = "crates/cranelift", version = "=15.0.0" }
-wasmtime-cranelift-shared = { path = "crates/cranelift-shared", version = "=15.0.0" }
-wasmtime-winch = { path = "crates/winch", version = "=15.0.0" }
-wasmtime-environ = { path = "crates/environ", version = "=15.0.0" }
-wasmtime-explorer = { path = "crates/explorer", version = "=15.0.0" }
-wasmtime-fiber = { path = "crates/fiber", version = "=15.0.0" }
-wasmtime-types = { path = "crates/types", version = "15.0.0" }
-wasmtime-jit = { path = "crates/jit", version = "=15.0.0" }
-wasmtime-jit-debug = { path = "crates/jit-debug", version = "=15.0.0" }
-wasmtime-runtime = { path = "crates/runtime", version = "=15.0.0" }
-wasmtime-wast = { path = "crates/wast", version = "=15.0.0" }
-wasmtime-wasi = { path = "crates/wasi", version = "15.0.0", default-features = false }
-wasmtime-wasi-http = { path = "crates/wasi-http", version = "=15.0.0", default-features = false }
-wasmtime-wasi-nn = { path = "crates/wasi-nn", version = "15.0.0" }
-wasmtime-wasi-threads = { path = "crates/wasi-threads", version = "15.0.0" }
-wasmtime-component-util = { path = "crates/component-util", version = "=15.0.0" }
-wasmtime-component-macro = { path = "crates/component-macro", version = "=15.0.0" }
-wasmtime-asm-macros = { path = "crates/asm-macros", version = "=15.0.0" }
-wasmtime-versioned-export-macros = { path = "crates/versioned-export-macros", version = "=15.0.0" }
+wasmtime-wmemcheck = { path = "crates/wmemcheck", version = "=14.0.0" }
+wasmtime = { path = "crates/wasmtime", version = "14.0.0", default-features = false }
+wasmtime-cache = { path = "crates/cache", version = "=14.0.0" }
+wasmtime-cli-flags = { path = "crates/cli-flags", version = "=14.0.0" }
+wasmtime-cranelift = { path = "crates/cranelift", version = "=14.0.0" }
+wasmtime-cranelift-shared = { path = "crates/cranelift-shared", version = "=14.0.0" }
+wasmtime-winch = { path = "crates/winch", version = "=14.0.0" }
+wasmtime-environ = { path = "crates/environ", version = "=14.0.0" }
+wasmtime-explorer = { path = "crates/explorer", version = "=14.0.0" }
+wasmtime-fiber = { path = "crates/fiber", version = "=14.0.0" }
+wasmtime-types = { path = "crates/types", version = "14.0.0" }
+wasmtime-jit = { path = "crates/jit", version = "=14.0.0" }
+wasmtime-jit-debug = { path = "crates/jit-debug", version = "=14.0.0" }
+wasmtime-runtime = { path = "crates/runtime", version = "=14.0.0" }
+wasmtime-wast = { path = "crates/wast", version = "=14.0.0" }
+wasmtime-wasi = { path = "crates/wasi", version = "14.0.0", default-features = false }
+wasmtime-wasi-http = { path = "crates/wasi-http", version = "=14.0.0", default-features = false }
+wasmtime-wasi-nn = { path = "crates/wasi-nn", version = "14.0.0" }
+wasmtime-wasi-threads = { path = "crates/wasi-threads", version = "14.0.0" }
+wasmtime-component-util = { path = "crates/component-util", version = "=14.0.0" }
+wasmtime-component-macro = { path = "crates/component-macro", version = "=14.0.0" }
+wasmtime-asm-macros = { path = "crates/asm-macros", version = "=14.0.0" }
+wasmtime-versioned-export-macros = { path = "crates/versioned-export-macros", version = "=14.0.0" }
 component-test-util = { path = "crates/misc/component-test-util" }
 component-fuzz-util = { path = "crates/misc/component-fuzz-util" }
-wiggle = { path = "crates/wiggle", version = "=15.0.0", default-features = false }
-wiggle-macro = { path = "crates/wiggle/macro", version = "=15.0.0" }
-wiggle-generate = { path = "crates/wiggle/generate", version = "=15.0.0" }
-wasi-common = { path = "crates/wasi-common", version = "=15.0.0" }
-wasi-tokio = { path = "crates/wasi-common/tokio", version = "=15.0.0" }
-wasi-cap-std-sync = { path = "crates/wasi-common/cap-std-sync", version = "=15.0.0" }
+wiggle = { path = "crates/wiggle", version = "=14.0.0", default-features = false }
+wiggle-macro = { path = "crates/wiggle/macro", version = "=14.0.0" }
+wiggle-generate = { path = "crates/wiggle/generate", version = "=14.0.0" }
+wasi-common = { path = "crates/wasi-common", version = "=14.0.0" }
+wasi-tokio = { path = "crates/wasi-common/tokio", version = "=14.0.0" }
+wasi-cap-std-sync = { path = "crates/wasi-common/cap-std-sync", version = "=14.0.0" }
 wasmtime-fuzzing = { path = "crates/fuzzing" }
-wasmtime-jit-icache-coherence = { path = "crates/jit-icache-coherence", version = "=15.0.0" }
-wasmtime-wit-bindgen = { path = "crates/wit-bindgen", version = "=15.0.0" }
-test-programs-artifacts = { path = 'crates/test-programs/artifacts' }
-
-cranelift-wasm = { path = "cranelift/wasm", version = "0.102.0" }
-cranelift-codegen = { path = "cranelift/codegen", version = "0.102.0", default-features = false, features = ["std", "unwind"] }
-cranelift-frontend = { path = "cranelift/frontend", version = "0.102.0" }
-cranelift-entity = { path = "cranelift/entity", version = "0.102.0" }
-cranelift-native = { path = "cranelift/native", version = "0.102.0" }
-cranelift-module = { path = "cranelift/module", version = "0.102.0" }
-cranelift-interpreter = { path = "cranelift/interpreter", version = "0.102.0" }
-cranelift-reader = { path = "cranelift/reader", version = "0.102.0" }
+wasmtime-jit-icache-coherence = { path = "crates/jit-icache-coherence", version = "=14.0.0" }
+wasmtime-wit-bindgen = { path = "crates/wit-bindgen", version = "=14.0.0" }
+
+cranelift-wasm = { path = "cranelift/wasm", version = "0.101.0" }
+cranelift-codegen = { path = "cranelift/codegen", version = "0.101.0" }
+cranelift-frontend = { path = "cranelift/frontend", version = "0.101.0" }
+cranelift-entity = { path = "cranelift/entity", version = "0.101.0" }
+cranelift-native = { path = "cranelift/native", version = "0.101.0" }
+cranelift-module = { path = "cranelift/module", version = "0.101.0" }
+cranelift-interpreter = { path = "cranelift/interpreter", version = "0.101.0" }
+cranelift-reader = { path = "cranelift/reader", version = "0.101.0" }
 cranelift-filetests = { path = "cranelift/filetests" }
-cranelift-object = { path = "cranelift/object", version = "0.102.0" }
-cranelift-jit = { path = "cranelift/jit", version = "0.102.0" }
+cranelift-object = { path = "cranelift/object", version = "0.101.0" }
+cranelift-jit = { path = "cranelift/jit", version = "0.101.0" }
 cranelift-fuzzgen = { path = "cranelift/fuzzgen" }
-cranelift-bforest = { path = "cranelift/bforest", version = "0.102.0" }
-cranelift-control = { path = "cranelift/control", version = "0.102.0" }
-cranelift = { path = "cranelift/umbrella", version = "0.102.0" }
+cranelift-bforest = { path = "cranelift/bforest", version = "0.101.0" }
+cranelift-control = { path = "cranelift/control", version = "0.101.0" }
+cranelift = { path = "cranelift/umbrella", version = "0.101.0" }
 
-winch-codegen = { path = "winch/codegen", version = "=0.13.0" }
+winch-codegen = { path = "winch/codegen", version = "=0.12.0" }
 winch-filetests = { path = "winch/filetests" }
 winch-test-macros = { path = "winch/test-macros" }
 
@@ -192,7 +190,7 @@ byte-array-literals = { path = "crates/wasi-preview1-component-adapter/byte-arra
 
 # Bytecode Alliance maintained dependencies:
 # ---------------------------
-regalloc2 = "0.9.3"
+regalloc2 = "0.9.2"
 
 # cap-std family:
 target-lexicon = { version = "0.12.3", default-features = false, features = ["std"] }
@@ -209,18 +207,18 @@ io-extras = "0.18.0"
 rustix = "0.38.8"
 is-terminal = "0.4.0"
 # wit-bindgen:
-wit-bindgen = { version = "0.13.0", default-features = false }
+wit-bindgen = { version = "0.11.0", default-features = false }
 
 # wasm-tools family:
-wasmparser = "0.115.0"
-wat = "1.0.77"
-wast = "66.0.2"
-wasmprinter = "0.2.70"
-wasm-encoder = "0.35.0"
-wasm-smith = "0.12.21"
-wasm-mutate = "0.2.38"
-wit-parser = "0.12.1"
-wit-component = "0.16.0"
+wasmparser = "0.113.1"
+wat = "1.0.73"
+wast = "65.0.1"
+wasmprinter = "0.2.66"
+wasm-encoder = "0.33.1"
+wasm-smith = "0.12.17"
+wasm-mutate = "0.2.34"
+wit-parser = "0.11.1"
+wit-component = "0.14.2"
 
 # Non-Bytecode Alliance maintained dependencies:
 # --------------------------
@@ -231,7 +229,7 @@ windows-sys = "0.48.0"
 env_logger = "0.10"
 expect-test = "1.4.1"
 log = { version = "0.4.8", default-features = false }
-clap = { version = "4.3.12", default-features = false, features = ["std", "derive"] }
+clap = { version = "4.3.12", features = ["color", "suggestions", "derive"] }
 hashbrown = { version = "0.14", default-features = false }
 capstone = "0.9.0"
 once_cell = "1.12.0"
@@ -255,108 +253,40 @@ tempfile = "3.1.0"
 filecheck = "0.5.0"
 libc = "0.2.60"
 file-per-thread-logger = "0.2.0"
-tokio = { version = "1.26.0", features = [ "rt", "time" ] }
-hyper = "=1.0.0-rc.3"
-http = "0.2.9"
-http-body = "=1.0.0-rc.2"
-http-body-util = "=0.1.0-rc.2"
+tokio = { version = "1.26.0" }
 bytes = "1.4"
 futures = { version = "0.3.27", default-features = false }
 indexmap = "2.0.0"
 pretty_env_logger = "0.5.0"
 syn = "2.0.25"
 test-log = { version = "0.2", default-features = false, features = ["trace"] }
-tracing-subscriber = { version = "0.3.1", default-features = false, features = ['fmt', 'env-filter', 'ansi', 'tracing-log'] }
-url = "2.3.1"
+tracing-subscriber = { version = "0.3.1", default-features = false, features = ['fmt', 'env-filter'] }
 
-# =============================================================================
-#
-# Features for the Wasmtime CLI executable
-#
-#
-# Note that many of these features are inherited from Wasmtime itself or
-# otherwise configure the `wasmtime` crate's execution. Features are provided as
-# compile-time switches to disable functionality primarily if one is interested
-# in configuring binary size and or exploring the binary size implications of
-# various features. Most features are enabled by default but most embeddings
-# likely won't need all features.
 [features]
 default = [
-  # All subcommands are included by default.
-  "compile",
-  "explore",
-  "serve",
-  "wast",
-  "config",
-
-  # On-by-default WASI features
+  "jitdump",
+  "wasmtime/wat",
+  "wasmtime/parallel-compilation",
+  "vtune",
   "wasi-nn",
   "wasi-threads",
   "wasi-http",
-
-  # Most features of Wasmtime are enabled by default.
-  "wat",
-  "parallel-compilation",
   "pooling-allocator",
-  "cache",
-  "logging",
-  "demangle",
-  "cranelift",
-  "profiling",
-  "coredump",
-  "addr2line",
-  "debug-builtins",
-
-  # Enable some nice features of clap by default, but they come at a binary size
-  # cost, so allow disabling this through disabling of our own `default`
-  # feature.
-  "clap/default",
 ]
-
-# ========================================
-# Off-by-default features
-#
-# These features are off-by-default but may optionally be enabled.
-all-arch = ["wasmtime/all-arch"]
-winch = ["wasmtime/winch"]
-wmemcheck = ["wasmtime/wmemcheck"]
-
-# This feature, when enabled, will statically compile out all logging statements
-# throughout Wasmtime and its dependencies.
-disable-logging = ["log/max_level_off", "tracing/max_level_off"]
-
-# ========================================
-# On-by-default features
-#
-# These features are all included in the `default` set above and this is
-# the internal mapping for what they enable in Wasmtime itself.
+jitdump = ["wasmtime/jitdump"]
+vtune = ["wasmtime/vtune"]
 wasi-nn = ["dep:wasmtime-wasi-nn"]
 wasi-threads = ["dep:wasmtime-wasi-threads"]
-wasi-http = ["component-model", "dep:wasmtime-wasi-http", "dep:tokio", "dep:hyper", "wasmtime-wasi-http?/sync"]
+wasi-http = ["dep:wasmtime-wasi-http", "wasmtime-wasi-http?/sync"]
 pooling-allocator = ["wasmtime/pooling-allocator", "wasmtime-cli-flags/pooling-allocator"]
+all-arch = ["wasmtime/all-arch"]
 component-model = [
   "wasmtime/component-model",
   "wasmtime-wast/component-model",
   "wasmtime-cli-flags/component-model"
 ]
-wat = ["dep:wat"]
-cache = ["dep:wasmtime-cache", "wasmtime-cli-flags/cache"]
-parallel-compilation = ["wasmtime-cli-flags/parallel-compilation"]
-logging = ["wasmtime-cli-flags/logging"]
-demangle = ["wasmtime/demangle"]
-cranelift = ["wasmtime-cli-flags/cranelift", "dep:wasmtime-cranelift"]
-profiling = ["wasmtime/profiling"]
-coredump = ["wasmtime-cli-flags/coredump"]
-addr2line = ["wasmtime/addr2line"]
-debug-builtins = ["wasmtime/debug-builtins"]
-
-# CLI subcommands for the `wasmtime` executable. See `wasmtime $cmd --help`
-# for more information on each subcommand.
-serve = ["wasi-http", "component-model", "dep:http-body-util"]
-explore = ["dep:wasmtime-explorer"]
-wast = ["dep:wasmtime-wast"]
-config = ["cache"]
-compile = ["cranelift"]
+winch = ["wasmtime/winch"]
+wmemcheck = ["wasmtime/wmemcheck"]
 
 [[test]]
 name = "host_segfault"
diff --git a/RELEASES.md b/RELEASES.md
index 296ee1357d90..6d1ba437dda8 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -1,211 +1,13 @@
 --------------------------------------------------------------------------------
 
-## 15.0.0
-
-Unreleased.
-
-### Added
-
-### Changed
-
---------------------------------------------------------------------------------
-
-## 14.0.2
-
-Released 2023-10-26
-
-### Fixed
-
-* Make the `wasmtime::unix` module accessible on macOS again.
-  [#7360](https://github.com/bytecodealliance/wasmtime/pull/7360)
-
-* Inter-crate dependencies between `cranelift-*` crates now disable the
-  `default` feature meaning that it's possible for embedders to depend on
-  `cranelift-codegen` as well without the `default` feature.
-  [#7369](https://github.com/bytecodealliance/wasmtime/pull/7369)
-
---------------------------------------------------------------------------------
-
-## 14.0.1
-
-Released 2023-10-23
-
-### Fixed
-
-* Cranelift: preserve uext and sext flags for parameters on x86\_64 and apple
-  aarch64. Note that this does not affect Wasmtime and is only intended for
-  Cranelift embedders such as `rustc_codegen_cranelift`.
-  [#7333](https://github.com/bytecodealliance/wasmtime/pull/7333)
-
---------------------------------------------------------------------------------
-
 ## 14.0.0
 
-Released 2023-10-20
-
-One of the larger changes in this release is a redesign of Wasmtime's CLI
-arguments and where arguments are passed. This means that previous invocations
-of the `wasmtime` CLI executable will need to be updated. No functionality was
-removed but most of it is behind new flags. One major change is that Wasmtime
-CLI flags are now grouped behind short options like `-O`. For example
-
-    wasmtime run --opt-level 2 foo.wasm
-
-is now:
-
-    wasmtime run -O opt-level=2 foo.wasm
-
-Additionally options prefixed with `--enable-*` or `--disable-*` now
-consistently are considered boolean setters. For example:
-
-    wasmtime run --disable-cache foo.wasm
-
-is now:
-
-    wasmtime run -C cache=n foo.wasm
-
-Options can be explored with `wasmtime -C help` for example, and `wasmtime -h`
-will show all option groups that can be expanded.
-
-Another major change in the CLI is that any CLI argument which positionally
-comes after the wasm file specified will be passed as an argument to the guest
-module. For example this invocations
-
-    wasmtime run foo.wasm --epoch-interruption
-
-was previously accepted as enabling epoch interruption for the `foo.wasm` file.
-This is now interpreted as if it were `./foo.wasm --epoch-interruption`,
-however, passing the flag to the wasm file itself. Flags to Wasmtime must now
-come after Wasmtime's subcommand (in this case `run`) and before the wasm file
-that's being run, for example:
-
-    wasmtime run -W epoch-interruption foo.wasm
-
-More information about this change can be found on
-[#6925](https://github.com/bytecodealliance/wasmtime/pull/6925) and
-[#6946](https://github.com/bytecodealliance/wasmtime/pull/6946).
+Unreleased.
 
 ### Added
 
-* Added the `wasmtime::FrameInfo::module` method, which returns the
-  `wasmtime::Module` associated with the stack frame.
-
-* The `wasmtime::component::Linker` type now implements `Clone`.
-  [#7032](https://github.com/bytecodealliance/wasmtime/pull/7032)
-
-* Wasmtime's `TypedFunc` API now supports the `v128` WebAssembly type on x86\_64
-  and aarch64.
-  [#7010](https://github.com/bytecodealliance/wasmtime/pull/7010)
-
-* Support for resources exported from a WebAssembly guest has been added to the
-  component `bindgen!` macro.
-  [#7050](https://github.com/bytecodealliance/wasmtime/pull/7050)
-
-* The C API now supports learning about a module's `image_range`.
-  [#7064](https://github.com/bytecodealliance/wasmtime/pull/7064)
-
-* Passing values between components is now possible with a more complete
-  implementation of type-checking of values.
-  [#7065](https://github.com/bytecodealliance/wasmtime/pull/7065)
-
-* Types representing resources can now be customized with `bindgen!`.
-  [#7069](https://github.com/bytecodealliance/wasmtime/pull/7069)
-
-* Wasm-defined globals and memories are now included in core dumps, and the
-  `wasmtime::WasmCoreDump` type is now serializable.
-  [#6935](https://github.com/bytecodealliance/wasmtime/pull/6935)
-  [#7078](https://github.com/bytecodealliance/wasmtime/pull/7078)
-
-* Initial experimental support for Intel MPK has been added to support running
-  more instances concurrently.
-  [#7072](https://github.com/bytecodealliance/wasmtime/pull/7072)
-
-* The implementation of `wasi:http` now supports inbound requests in addition to
-  outbound requests. A new `wasmtime serve` command is an example way of
-  handling http requests with wasm files.
-  [#7091](https://github.com/bytecodealliance/wasmtime/pull/7091)
-
-* The C API now supports Wasmtime's "host memory creation" API to customize the
-  allocation of linear memories.
-  [#7115](https://github.com/bytecodealliance/wasmtime/pull/7115)
-
-* The C API now supports asynchronous invocation of WebAssembly programs.
-  [#7106](https://github.com/bytecodealliance/wasmtime/pull/7106)
-
-* The C API now supports Wasmtime's `InstancePre<T>` type.
-  [#7140](https://github.com/bytecodealliance/wasmtime/pull/7140)
-
-* The `wasi:sockets/ip-name-lookup` interface is now implemented by Wasmtime.
-  [#7109](https://github.com/bytecodealliance/wasmtime/pull/7109)
-
 ### Changed
 
-* Wasmtime's CLI has been significantly overhauled. See the note above.
-  [#6925](https://github.com/bytecodealliance/wasmtime/pull/6925)
-  [#6946](https://github.com/bytecodealliance/wasmtime/pull/6946)
-
-* The `wasmtime::FrameInfo::module_name` has been removed, however you can now
-  get identical results by chaining `wasmtime::FrameInfo::module` and
-  `wasmtime::Module::name`: `my_frame.module().name()`.
-
-* WASI interfaces have seen significant work since the previous release. Streams
-  for example have a new backpressure and flushing design. Additionally WIT
-  `resource`s are now used ubiquitously throughout the specification and
-  implementation.
-  [#6877](https://github.com/bytecodealliance/wasmtime/pull/6877)
-  [#7029](https://github.com/bytecodealliance/wasmtime/pull/7029)
-  [#7090](https://github.com/bytecodealliance/wasmtime/pull/7090)
-
-* The implementation of `wasi:http` now uses `{input,output}-stream` from the
-  `wasi:io/streams` interface.
-  [#7056](https://github.com/bytecodealliance/wasmtime/pull/7056)
-
-* Lifting and lowering of the `list<u8>` component values has been significantly
-  optimized.
-  [#6971](https://github.com/bytecodealliance/wasmtime/pull/6971)
-
-* The `wasmtime-c-api` crate is now additionally built as an rlib as well as the
-  previous cdylib/staticlib combo.
-  [#6765](https://github.com/bytecodealliance/wasmtime/pull/6765)
-
-### Fixed
-
-* Support referencing stack slots in the DWARF debug info.
-  [#6960](https://github.com/bytecodealliance/wasmtime/pull/6960)
-
-* Printing unicode to stdio on Windows has been fixed.
-  [#6825](https://github.com/bytecodealliance/wasmtime/pull/6825)
-
-* Building for x86\_64-linux-android has been fixed.
-  [#7055](https://github.com/bytecodealliance/wasmtime/pull/7055)
-
-* Fixed stdout/stderr becoming nonblocking by accident with WASI preview2 on
-  macOS.
-  [#7058](https://github.com/bytecodealliance/wasmtime/pull/7058)
-
-* Fixed some character boundary-related panics in the preview2 implementation of
-  preview1.
-  [#7011](https://github.com/bytecodealliance/wasmtime/pull/7011)
-
-* Fixed an issue of guests sleeping for an incorrect amount of time with
-  preview2.
-  [#6993](https://github.com/bytecodealliance/wasmtime/pull/6993)
-
-* Cranelift will now return an error when running out of temporaries in a very
-  large function instead of panicking.
-  [#7114](https://github.com/bytecodealliance/wasmtime/pull/7114)
-
---------------------------------------------------------------------------------
-
-## 13.0.1
-
-Released 2023-10-26
-
-### Fixed
-
-* Make the `wasmtime::unix` module accessible on macOS again.
-  [#7360](https://github.com/bytecodealliance/wasmtime/pull/7360)
-
 --------------------------------------------------------------------------------
 
 ## 13.0.0
diff --git a/build.rs b/build.rs
index 64584ca886c4..b591af39d7cd 100644
--- a/build.rs
+++ b/build.rs
@@ -205,34 +205,13 @@ fn ignore(testsuite: &str, testname: &str, strategy: &str) -> bool {
     // We ignore tests that assert for traps on windows, given
     // that Winch doesn't encode unwind information for Windows, yet.
     if strategy == "Winch" {
-        let assert_trap = [
-            "i32",
-            "i64",
-            "call_indirect",
-            "table_fill",
-            "table_init",
-            "table_copy",
-            "table_set",
-            "table_get",
-        ]
-        .contains(&testname);
-
-        if assert_trap && env::var("CARGO_CFG_TARGET_OS").unwrap().as_str() == "windows" {
+        if testsuite != "winch" {
             return true;
         }
 
-        if testsuite == "misc_testsuite" {
-            // The misc/call_indirect is fully supported by Winch.
-            if testname != "call_indirect" {
-                return true;
-            }
-        }
-        if testsuite == "spec_testsuite" {
-            // The official table init and table copy tests are now supported.
-            return !["table_init", "table_copy"].contains(&testname);
-        }
+        let assert_trap = ["i32", "i64"].contains(&testname);
 
-        if testsuite != "winch" {
+        if assert_trap && env::var("CARGO_CFG_TARGET_OS").unwrap().as_str() == "windows" {
             return true;
         }
     }
diff --git a/ci/build-build-matrix.js b/ci/build-build-matrix.js
deleted file mode 100644
index 23c2b6ebb060..000000000000
--- a/ci/build-build-matrix.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Small script used to calculate the matrix of builds that are going to be
-// done if CI decides to do a release build.
-//
-// This is a separate script primarily to write out all the release
-// targets/platforms once and then duplicate them all with a "min" build.
-
-const array = [
-  {
-    // The name of the build which shows up in the name of the artifact for
-    // Wasmtime's github releases.
-    "build": "x86_64-linux",
-    // The GitHub Actions platform that this build runs on
-    "os": "ubuntu-latest",
-    // The Rust target that will be used for the build.
-    "target": "x86_64-unknown-linux-gnu",
-  },
-  {
-    "build": "aarch64-linux",
-    "os": "ubuntu-latest",
-    "target": "aarch64-unknown-linux-gnu",
-  },
-  {
-    "build": "s390x-linux",
-    "os": "ubuntu-latest",
-    "target": "s390x-unknown-linux-gnu",
-  },
-  {
-    "build": "riscv64gc-linux",
-    "os": "ubuntu-latest",
-    "target": "riscv64gc-unknown-linux-gnu",
-  },
-  {
-    "build": "x86_64-macos",
-    "os": "macos-latest",
-    "target": "x86_64-apple-darwin",
-  },
-  {
-    "build": "aarch64-macos",
-    "os": "macos-latest",
-    "target": "aarch64-apple-darwin",
-  },
-  {
-    "build": "x86_64-windows",
-    "os": "windows-latest",
-    "target": "x86_64-pc-windows-msvc",
-  },
-  {
-    "build": "x86_64-mingw",
-    "os": "windows-latest",
-    "target": "x86_64-pc-windows-gnu",
-  },
-];
-
-const builds = [];
-for (let build of array) {
-  // Perform a "deep clone" roundtripping through JSON for a copy of the build
-  // that's normal
-  build.rust = 'stable';
-  builds.push(JSON.parse(JSON.stringify(build)));
-
-  // Next generate a "min" build and add it to the builds list. Min builds
-  // require Nightly rust due to some nightly build options that are configured.
-  build.build += '-min';
-  build.rust = 'nightly-2023-10-10';
-  builds.push(build);
-}
-
-console.log(JSON.stringify(builds));
diff --git a/ci/build-release-artifacts.sh b/ci/build-release-artifacts.sh
deleted file mode 100755
index 71c7888395cd..000000000000
--- a/ci/build-release-artifacts.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# A script to build the release artifacts of Wasmtime into the `target`
-# directory. For now this is the CLI and the C API. Note that this script only
-# produces the artifacts through Cargo and doesn't package things up. That's
-# intended for the `build-tarballs.sh` script.
-#
-# This script takes a Rust target as its first input and optionally a parameter
-# afterwards which can be "-min" to indicate that a minimal build should be
-# produced with as many features as possible stripped out.
-
-set -ex
-
-build=$1
-target=$2
-
-# Default build flags for release artifacts. Leave debugging for
-# builds-from-source which have richer information anyway, and additionally the
-# CLI won't benefit from catching unwinds and neither will the C API so use
-# panic=abort in both situations.
-export CARGO_PROFILE_RELEASE_STRIP=debuginfo
-export CARGO_PROFILE_RELEASE_PANIC=abort
-
-if [[ "$build" = *-min ]]; then
-  # Configure a whole bunch of compile-time options which help reduce the size
-  # of the binary artifact produced.
-  export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
-  export RUSTFLAGS=-Zlocation-detail=none
-  export CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1
-  export CARGO_PROFILE_RELEASE_LTO=true
-  flags="-Zbuild-std=std,panic_abort --no-default-features -Zbuild-std-features=std_detect_dlsym_getauxval"
-  flags="$flags --features disable-logging"
-else
-  # For release builds the CLI is built a bit more feature-ful than the Cargo
-  # defaults to provide artifacts that can do as much as possible.
-  bin_flags="--features all-arch,component-model"
-fi
-
-cargo build --release $flags --target $target -p wasmtime-cli $bin_flags
-cargo build --release $flags --target $target -p wasmtime-c-api
diff --git a/ci/build-src-tarball.sh b/ci/build-src-tarball.sh
index c5d3c10fa9b7..571fcc47a3a7 100755
--- a/ci/build-src-tarball.sh
+++ b/ci/build-src-tarball.sh
@@ -18,5 +18,3 @@ cargo vendor > .cargo/config.toml
 tar -czf /tmp/$pkgname.tar.gz --transform "s/^\./$pkgname/S" --exclude=.git .
 mkdir -p dist
 mv /tmp/$pkgname.tar.gz dist/
-
-rm .cargo/config.toml
diff --git a/ci/build-tarballs.sh b/ci/build-tarballs.sh
index d8a249f113b1..eb6197c2a5ac 100755
--- a/ci/build-tarballs.sh
+++ b/ci/build-tarballs.sh
@@ -1,18 +1,19 @@
 #!/bin/bash
 
 # A small script used for assembling release tarballs for both the `wasmtime`
-# binary and the C API. This is executed with two arguments, mostly coming
-# from the CI matrix.
+# binary and the C API. This is executed with two arguments, mostly coming from
+# the CI matrix.
 #
-# * The first argument is the name of the "build", used to name the release.
-# * The second argument is the Rust target that the build was performed for.
+# * The first argument is the name of the platform, used to name the release
+# * The second argument is the "target", if present, currently only for
+#   cross-compiles
 #
 # This expects the build to already be done and will assemble release artifacts
 # in `dist/`
 
 set -ex
 
-build=$1
+platform=$1
 target=$2
 
 rm -rf tmp
@@ -24,15 +25,8 @@ if [[ $GITHUB_REF == refs/heads/release-* ]]; then
   tag=v$(./ci/print-current-version.sh)
 fi
 
-# For *-min builds produce the same named artifacts as the normal build and
-# they'll get unioned together in a later step in the CI.
-build_pkgname=$build
-if [[ $build == *-min ]]; then
-  build_pkgname=${build%-min}
-fi
-
-bin_pkgname=wasmtime-$tag-$build_pkgname
-api_pkgname=wasmtime-$tag-$build_pkgname-c-api
+bin_pkgname=wasmtime-$tag-$platform
+api_pkgname=wasmtime-$tag-$platform-c-api
 
 mkdir tmp/$api_pkgname
 mkdir tmp/$api_pkgname/lib
@@ -43,61 +37,47 @@ cp LICENSE README.md tmp/$bin_pkgname
 cp -r crates/c-api/include tmp/$api_pkgname
 cp crates/c-api/wasm-c-api/include/wasm.h tmp/$api_pkgname/include
 
-# For *-min builds rename artifacts with a `-min` suffix to avoid eventual
-# clashes with the normal builds when the tarballs are unioned together.
-if [[ $build == *-min ]]; then
-  min="-min"
-fi
-
 fmt=tar
-
-case $build in
-  x86_64-windows*)
-    cp target/$target/release/wasmtime.exe tmp/$bin_pkgname/wasmtime$min.exe
-    cp target/$target/release/wasmtime.dll tmp/$api_pkgname/lib/wasmtime$min.dll
-    cp target/$target/release/wasmtime.lib tmp/$api_pkgname/lib/wasmtime$min.lib
-    cp target/$target/release/wasmtime.dll.lib tmp/$api_pkgname/lib/wasmtime$min.dll.lib
-    fmt=zip
-
-    if [ "$min" = "" ]; then
-      # Generate a `*.msi` installer for Windows as well
-      export WT_VERSION=`cat Cargo.toml | sed -n 's/^version = "\([^"]*\)".*/\1/p'`
-      "$WIX/bin/candle" -arch x64 -out target/wasmtime.wixobj ci/wasmtime.wxs
-      "$WIX/bin/light" -out dist/$bin_pkgname.msi target/wasmtime.wixobj -ext WixUtilExtension
-      rm dist/$bin_pkgname.wixpdb
-    fi
-    ;;
-
-  x86_64-mingw*)
-    cp target/$target/release/wasmtime.exe tmp/$bin_pkgname/wasmtime$min.exe
-    cp target/$target/release/wasmtime.dll tmp/$api_pkgname/lib/wasmtime$min.dll
-    cp target/$target/release/libwasmtime.a tmp/$api_pkgname/lib/libwasmtime$min.a
-    cp target/$target/release/libwasmtime.dll.a tmp/$api_pkgname/lib/libwasmtime$min.dll.a
-    fmt=zip
-    ;;
-
-  *-macos*)
-    # Postprocess the macOS dylib a bit to have a more reasonable `LC_ID_DYLIB`
-    # directive than the default one that comes out of the linker when typically
-    # doing `cargo build`. For more info see #984
-    install_name_tool -id "@rpath/libwasmtime$min.dylib" target/$target/release/libwasmtime.dylib
-    cp target/$target/release/wasmtime tmp/$bin_pkgname/wasmtime$min
-    cp target/$target/release/libwasmtime.a tmp/$api_pkgname/lib/libwasmtime$min.a
-    cp target/$target/release/libwasmtime.dylib tmp/$api_pkgname/lib/libwasmtime$min.dylib
-    ;;
-
-  *)
-    cp target/$target/release/wasmtime tmp/$bin_pkgname/wasmtime$min
-    cp target/$target/release/libwasmtime.a tmp/$api_pkgname/lib/libwasmtime$min.a
-    cp target/$target/release/libwasmtime.so tmp/$api_pkgname/lib/libwasmtime$min.so
-    ;;
-esac
+if [ "$platform" = "x86_64-windows" ]; then
+  cp target/release/wasmtime.exe tmp/$bin_pkgname
+  cp target/release/{wasmtime.dll,wasmtime.lib,wasmtime.dll.lib} tmp/$api_pkgname/lib
+  fmt=zip
+
+  # Generate a `*.msi` installer for Windows as well
+  export WT_VERSION=`cat Cargo.toml | sed -n 's/^version = "\([^"]*\)".*/\1/p'`
+  "$WIX/bin/candle" -arch x64 -out target/wasmtime.wixobj ci/wasmtime.wxs
+  "$WIX/bin/light" -out dist/$bin_pkgname.msi target/wasmtime.wixobj -ext WixUtilExtension
+  rm dist/$bin_pkgname.wixpdb
+elif [ "$platform" = "x86_64-mingw" ]; then
+  cp target/x86_64-pc-windows-gnu/release/wasmtime.exe tmp/$bin_pkgname
+  cp target/x86_64-pc-windows-gnu/release/{wasmtime.dll,libwasmtime.a,libwasmtime.dll.a} tmp/$api_pkgname/lib
+  fmt=zip
+elif [ "$platform" = "x86_64-macos" ]; then
+  # Postprocess the macOS dylib a bit to have a more reasonable `LC_ID_DYLIB`
+  # directive than the default one that comes out of the linker when typically
+  # doing `cargo build`. For more info see #984
+  install_name_tool -id "@rpath/libwasmtime.dylib" target/release/libwasmtime.dylib
+  cp target/release/wasmtime tmp/$bin_pkgname
+  cp target/release/libwasmtime.{a,dylib} tmp/$api_pkgname/lib
+elif [ "$platform" = "aarch64-macos" ]; then
+  install_name_tool -id "@rpath/libwasmtime.dylib" target/aarch64-apple-darwin/release/libwasmtime.dylib
+  cp target/aarch64-apple-darwin/release/wasmtime tmp/$bin_pkgname
+  cp target/aarch64-apple-darwin/release/libwasmtime.{a,dylib} tmp/$api_pkgname/lib
+elif [ "$target" = "" ]; then
+  cp target/release/wasmtime tmp/$bin_pkgname
+  cp target/release/libwasmtime.{a,so} tmp/$api_pkgname/lib
+else
+  cp target/$target/release/wasmtime tmp/$bin_pkgname
+  cp target/$target/release/libwasmtime.{a,so} tmp/$api_pkgname/lib
+fi
 
 
 mktarball() {
   dir=$1
   if [ "$fmt" = "tar" ]; then
-    tar -czvf dist/$dir.tar.gz -C tmp $dir
+    # this is a bit wonky, but the goal is to use `xz` with threaded compression
+    # to ideally get better performance with the `-T0` flag.
+    tar -cvf - -C tmp $dir | xz -9 -T0 > dist/$dir.tar.xz
   else
     # Note that this runs on Windows, and it looks like GitHub Actions doesn't
     # have a `zip` tool there, so we use something else
diff --git a/ci/build-test-matrix.js b/ci/build-test-matrix.js
index 5fee846d6787..35c2c00efd57 100644
--- a/ci/build-test-matrix.js
+++ b/ci/build-test-matrix.js
@@ -91,11 +91,17 @@ const array = [
     "target": "riscv64gc-unknown-linux-gnu",
     "gcc_package": "gcc-riscv64-linux-gnu",
     "gcc": "riscv64-linux-gnu-gcc",
-    "qemu": "qemu-riscv64 -cpu rv64,v=true,vlen=256,vext_spec=v1.0,zba=true,zbb=true,zbc=true,zbs=true,zbkb=true,zcb=true -L /usr/riscv64-linux-gnu",
+    "qemu": "qemu-riscv64 -cpu rv64,v=true,vlen=256,vext_spec=v1.0,zba=true,zbb=true,zbc=true,zbs=true,zbkb=true -L /usr/riscv64-linux-gnu",
     "qemu_target": "riscv64-linux-user",
     "name": "Test Linux riscv64",
     "filter": "linux-riscv64",
     "isa": "riscv64",
+    // There appears to be a miscompile in Rust 1.72 for riscv64 where
+    // wasmtime-wasi tests are segfaulting in CI with the stack pointing in
+    // Tokio. Updating rustc seems to do the trick, so without doing a full
+    // rigorous investigation this uses beta for now but Rust 1.73 should be
+    // good to go for this.
+    "rust": "beta-2023-09-10",
   }
 ];
 
diff --git a/ci/merge-artifacts.sh b/ci/merge-artifacts.sh
deleted file mode 100755
index aece95e6c4ad..000000000000
--- a/ci/merge-artifacts.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-# Script to merge the outputs of a run on github actions to github releases.
-# This is invoked from `.github/workflows/publish-artifacts.yml`. All previous
-# artifacts from builds are located in `bins-*` folders. The main purpose of
-# this script is to take the "min" build and merge it into the "normal" build to
-# produce one final tarball. This means that the final artifacts will have both
-# a normal and a min build in them for comparison and usage.
-
-set -ex
-
-# Prepare the upload folder and move all aritfacts that aren't being merged into
-# this folder, e.g. the MSI installer and adapter wasm files.
-rm -rf dist
-mkdir dist
-mv -t dist bins-*/*.{msi,wasm}
-
-# Merge tarballs and zips by searching for `*-min` builds, unpacking the
-# min/normal builds, into the same destination, and then repacking into a
-# tarball.
-#
-# Note that for now xz compression is used for the final artifact to try to get
-# small artifacts, but it's left at the default level since a lot of artifacts
-# are processed here and turning it up to the max 9 compression might take
-# quite awhile on CI for this one builder to process.
-for min in bins-*-min/*.tar.*; do
- normal=${min/-min\//\/}
- filename=$(basename $normal)
- dir=${filename%.tar.gz}
-
- rm -rf tmp
- mkdir tmp
- tar xf $min -C tmp
- tar xf $normal -C tmp
- tar -cf - -C tmp $dir | xz -T0 > dist/$dir.tar.xz
- rm $min $normal
-done
-
-for min in bins-*-min/*.zip; do
-  normal=${min/-min\//\/}
-  filename=$(basename $normal)
-  dir=${filename%.zip}
-
-  rm -rf tmp
-  mkdir tmp
-  (cd tmp && unzip -o ../$min)
-  (cd tmp && unzip -o ../$normal)
-  (cd tmp && 7z a ../dist/$dir.zip $dir/)
-  rm $min $normal
-done
-
-# Copy over remaining source tarball into the dist folder
-mv -t dist bins-*/*.tar.*
diff --git a/ci/qemu-cpuinfo.patch b/ci/qemu-cpuinfo.patch
new file mode 100644
index 000000000000..261bcb593409
--- /dev/null
+++ b/ci/qemu-cpuinfo.patch
@@ -0,0 +1,115 @@
+From 5d05b046efb079360d0175164ee04947f20f9e66 Mon Sep 17 00:00:00 2001
+From: Afonso Bordado <afonsobordado@az8.co>
+Date: Tue, 21 Mar 2023 18:45:20 +0000
+Subject: [PATCH] linux-user: Emulate /proc/cpuinfo output for riscv
+
+RISC-V does not expose all extensions via hwcaps, thus some userspace
+applications may want to query these via /proc/cpuinfo.
+
+Currently when querying this file the host's file is shown instead
+which is slightly confusing. Emulate a basic /proc/cpuinfo file
+with mmu info and an ISA string.
+---
+ linux-user/syscall.c        | 34 ++++++++++++++++++++++++++++++++--
+ tests/tcg/riscv64/cpuinfo.c | 30 ++++++++++++++++++++++++++++++
+ 2 files changed, 62 insertions(+), 2 deletions(-)
+ create mode 100644 tests/tcg/riscv64/cpuinfo.c
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 333e6b7026..e6d85e0e8a 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -8231,7 +8231,8 @@ void target_exception_dump(CPUArchState *env, const char *fmt, int code)
+ }
+ 
+ #if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN || \
+-    defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA)
++    defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA) || \
++    defined(TARGET_RISCV)
+ static int is_proc(const char *filename, const char *entry)
+ {
+     return strcmp(filename, entry) == 0;
+@@ -8309,6 +8310,35 @@ static int open_cpuinfo(CPUArchState *cpu_env, int fd)
+ }
+ #endif
+ 
++#if defined(TARGET_RISCV)
++static int open_cpuinfo(CPUArchState *cpu_env, int fd)
++{
++    int i;
++    int num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
++    RISCVCPU *cpu = env_archcpu(cpu_env);
++    const RISCVCPUConfig *cfg = riscv_cpu_cfg((CPURISCVState *) cpu_env);
++    char *isa_string = riscv_isa_string(cpu);
++    const char *mmu;
++
++    if (cfg->mmu) {
++        mmu = (cpu_env->xl == MXL_RV32) ? "sv32"  : "sv48";
++    } else {
++        mmu = "none";
++    }
++
++    for (i = 0; i < num_cpus; i++) {
++        dprintf(fd, "processor\t: %d\n", i);
++        dprintf(fd, "hart\t\t: %d\n", i);
++        dprintf(fd, "isa\t\t: %s\n", isa_string);
++        dprintf(fd, "mmu\t\t: %s\n", mmu);
++        dprintf(fd, "uarch\t\t: qemu\n\n");
++    }
++
++    g_free(isa_string);
++    return 0;
++}
++#endif
++
+ #if defined(TARGET_M68K)
+ static int open_hardware(CPUArchState *cpu_env, int fd)
+ {
+@@ -8333,7 +8363,7 @@ static int do_openat(CPUArchState *cpu_env, int dirfd, const char *pathname, int
+ #if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
+         { "/proc/net/route", open_net_route, is_proc },
+ #endif
+-#if defined(TARGET_SPARC) || defined(TARGET_HPPA)
++#if defined(TARGET_SPARC) || defined(TARGET_HPPA) || defined(TARGET_RISCV)
+         { "/proc/cpuinfo", open_cpuinfo, is_proc },
+ #endif
+ #if defined(TARGET_M68K)
+diff --git a/tests/tcg/riscv64/cpuinfo.c b/tests/tcg/riscv64/cpuinfo.c
+new file mode 100644
+index 0000000000..296abd0a8c
+--- /dev/null
++++ b/tests/tcg/riscv64/cpuinfo.c
+@@ -0,0 +1,30 @@
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <assert.h>
++
++#define BUFFER_SIZE 1024
++
++int main(void)
++{
++    char buffer[BUFFER_SIZE];
++    FILE *fp = fopen("/proc/cpuinfo", "r");
++    assert(fp != NULL);
++
++    while (fgets(buffer, BUFFER_SIZE, fp) != NULL) {
++        if (strstr(buffer, "processor") != NULL) {
++            assert(strstr(buffer, "processor\t: ") == buffer);
++        } else if (strstr(buffer, "hart") != NULL) {
++            assert(strstr(buffer, "hart\t\t: ") == buffer);
++        } else if (strstr(buffer, "isa") != NULL) {
++            assert(strcmp(buffer, "isa\t\t: rv64imafdc_zicsr_zifencei\n") == 0);
++        } else if (strstr(buffer, "mmu") != NULL) {
++            assert(strcmp(buffer, "mmu\t\t: sv48\n") == 0);
++        } else if (strstr(buffer, "uarch") != NULL) {
++            assert(strcmp(buffer, "uarch\t\t: qemu\n") == 0);
++        }
++    }
++
++    fclose(fp);
++    return 0;
++}
+-- 
+2.34.1
+
diff --git a/ci/run-tests.sh b/ci/run-tests.sh
index db338dc2409e..b29b6eb71d9b 100755
--- a/ci/run-tests.sh
+++ b/ci/run-tests.sh
@@ -1,10 +1,14 @@
 #!/bin/bash
 
 cargo test \
+    --features "test-programs/test_programs" \
     --features wasi-threads \
     --features wasi-http \
     --features component-model \
-    --features serve \
     --workspace \
-    --exclude test-programs \
+    --exclude 'wasmtime-wasi-*' \
+    --exclude wasi-tests \
+    --exclude wasi-http-tests \
+    --exclude command-tests \
+    --exclude reactor-tests \
     $@
diff --git a/ci/run-wasi-nn-example.sh b/ci/run-wasi-nn-example.sh
index 6f433bc3eff2..74bab3bd30fc 100755
--- a/ci/run-wasi-nn-example.sh
+++ b/ci/run-wasi-nn-example.sh
@@ -39,7 +39,7 @@ pushd $WASMTIME_DIR/crates/wasi-nn/examples/classification-example
 cargo build --release --target=wasm32-wasi
 cp target/wasm32-wasi/release/wasi-nn-example.wasm $TMP_DIR
 popd
-cargo run -- run --dir $TMP_DIR::fixture -S nn $TMP_DIR/wasi-nn-example.wasm
+cargo run -- run --dir fixture::$TMP_DIR -S nn $TMP_DIR/wasi-nn-example.wasm
 
 # Build and run another example, this time using Wasmtime's graph flag to
 # preload the model.
@@ -47,7 +47,7 @@ pushd $WASMTIME_DIR/crates/wasi-nn/examples/classification-example-named
 cargo build --release --target=wasm32-wasi
 cp target/wasm32-wasi/release/wasi-nn-example-named.wasm $TMP_DIR
 popd
-cargo run -- run --dir $TMP_DIR::fixture -S nn,nn-graph=openvino::$TMP_DIR \
+cargo run -- run --dir fixture::$TMP_DIR -S nn,nn-graph=openvino::$TMP_DIR \
     $TMP_DIR/wasi-nn-example-named.wasm
 
 # Clean up the temporary directory only if it was not specified (users may want
diff --git a/ci/wasmtime.wxs b/ci/wasmtime.wxs
index 0e947135d555..ec3a58f9aa13 100644
--- a/ci/wasmtime.wxs
+++ b/ci/wasmtime.wxs
@@ -62,7 +62,7 @@
 
         <DirectoryRef Id="BINDIR">
             <Component Id="wasmtime.exe" Guid="*">
-                <File Id="wasmtime.exe" Source="target\x86_64-pc-windows-msvc\release\wasmtime.exe" KeyPath="yes" Checksum="yes"/>
+                <File Id="wasmtime.exe" Source="target\release\wasmtime.exe" KeyPath="yes" Checksum="yes"/>
             </Component>
         </DirectoryRef>
 
diff --git a/cranelift/Cargo.toml b/cranelift/Cargo.toml
index 24577ddc1c2e..f6b271112dbb 100644
--- a/cranelift/Cargo.toml
+++ b/cranelift/Cargo.toml
@@ -44,7 +44,7 @@ indicatif = "0.13.0"
 thiserror = { workspace = true }
 walkdir = { workspace = true }
 anyhow = { workspace = true }
-clap = { workspace = true, features = ['default'] }
+clap = { workspace = true }
 similar = { workspace = true }
 toml = { workspace = true }
 serde = { workspace = true }
diff --git a/cranelift/bforest/Cargo.toml b/cranelift/bforest/Cargo.toml
index f620eb757029..d55fdad495ee 100644
--- a/cranelift/bforest/Cargo.toml
+++ b/cranelift/bforest/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-bforest"
-version = "0.102.0"
+version = "0.101.0"
 description = "A forest of B+-trees"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-bforest"
diff --git a/cranelift/codegen/Cargo.toml b/cranelift/codegen/Cargo.toml
index 6697393e93af..05bb88bed4a9 100644
--- a/cranelift/codegen/Cargo.toml
+++ b/cranelift/codegen/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-codegen"
-version = "0.102.0"
+version = "0.101.0"
 description = "Low-level code generator library"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-codegen"
@@ -16,7 +16,7 @@ edition.workspace = true
 anyhow = { workspace = true, optional = true }
 bumpalo = "3"
 capstone = { workspace = true, optional = true }
-cranelift-codegen-shared = { path = "./shared", version = "0.102.0" }
+cranelift-codegen-shared = { path = "./shared", version = "0.101.0" }
 cranelift-entity = { workspace = true }
 cranelift-bforest = { workspace = true }
 cranelift-control = { workspace = true }
@@ -41,8 +41,8 @@ criterion = { version = "0.5.0", features = ["html_reports"] }
 similar = "2.1.0"
 
 [build-dependencies]
-cranelift-codegen-meta = { path = "meta", version = "0.102.0" }
-cranelift-isle = { path = "../isle/isle", version = "=0.102.0" }
+cranelift-codegen-meta = { path = "meta", version = "0.101.0" }
+cranelift-isle = { path = "../isle/isle", version = "=0.101.0" }
 
 [features]
 default = ["std", "unwind", "host-arch"]
diff --git a/cranelift/codegen/meta/Cargo.toml b/cranelift/codegen/meta/Cargo.toml
index f507cc873bbe..4b930571018d 100644
--- a/cranelift/codegen/meta/Cargo.toml
+++ b/cranelift/codegen/meta/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cranelift-codegen-meta"
 authors = ["The Cranelift Project Developers"]
-version = "0.102.0"
+version = "0.101.0"
 description = "Metaprogram for cranelift-codegen code generator library"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"
@@ -12,4 +12,4 @@ edition.workspace = true
 rustdoc-args = [ "--document-private-items" ]
 
 [dependencies]
-cranelift-codegen-shared = { path = "../shared", version = "0.102.0" }
+cranelift-codegen-shared = { path = "../shared", version = "0.101.0" }
diff --git a/cranelift/codegen/meta/src/shared/immediates.rs b/cranelift/codegen/meta/src/shared/immediates.rs
index 5584b5564bb9..9f908c93da48 100644
--- a/cranelift/codegen/meta/src/shared/immediates.rs
+++ b/cranelift/codegen/meta/src/shared/immediates.rs
@@ -181,7 +181,6 @@ impl Immediates {
                 trapcode_values.insert("heap_oob", "HeapOutOfBounds");
                 trapcode_values.insert("int_ovf", "IntegerOverflow");
                 trapcode_values.insert("int_divz", "IntegerDivisionByZero");
-                trapcode_values.insert("bad_toint", "BadConversionToInteger");
                 new_enum(
                     "code",
                     "ir::TrapCode",
diff --git a/cranelift/codegen/meta/src/shared/settings.rs b/cranelift/codegen/meta/src/shared/settings.rs
index f632280145c8..e4e511b5e8cb 100644
--- a/cranelift/codegen/meta/src/shared/settings.rs
+++ b/cranelift/codegen/meta/src/shared/settings.rs
@@ -63,20 +63,6 @@ pub(crate) fn define() -> SettingGroup {
         true,
     );
 
-    settings.add_bool(
-        "enable_pcc",
-        "Enable proof-carrying code translation validation.",
-        r#"
-            This adds a proof-carrying-code mode. Proof-carrying code (PCC) is a strategy to verify
-            that the compiler preserves certain properties or invariants in the compiled code.
-            For example, a frontend that translates WebAssembly to CLIF can embed PCC facts in
-            the CLIF, and Cranelift will verify that the final machine code satisfies the stated
-            facts at each intermediate computed value. Loads and stores can be marked as "checked"
-            and their memory effects can be verified as safe.
-        "#,
-        false,
-    );
-
     // Note that Cranelift doesn't currently need an is_pie flag, because PIE is
     // just PIC where symbols can't be pre-empted, which can be expressed with the
     // `colocated` flag on external functions and global values.
diff --git a/cranelift/codegen/shared/Cargo.toml b/cranelift/codegen/shared/Cargo.toml
index d68f66091609..3575420fa117 100644
--- a/cranelift/codegen/shared/Cargo.toml
+++ b/cranelift/codegen/shared/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-codegen-shared"
-version = "0.102.0"
+version = "0.101.0"
 description = "For code shared between cranelift-codegen-meta and cranelift-codegen"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"
diff --git a/cranelift/codegen/src/binemit/mod.rs b/cranelift/codegen/src/binemit/mod.rs
index 9eed2905c4cd..d5582d87f3be 100644
--- a/cranelift/codegen/src/binemit/mod.rs
+++ b/cranelift/codegen/src/binemit/mod.rs
@@ -64,21 +64,15 @@ pub enum Reloc {
     /// Offset within page of TLVP slot.
     MachOAarch64TlsAdrPageOff12,
 
-    /// Aarch64 TLSDESC Adr Page21
-    /// This is equivalent to `R_AARCH64_TLSDESC_ADR_PAGE21` in the [aaelf64](https://github.com/ARM-software/abi-aa/blob/2bcab1e3b22d55170c563c3c7940134089176746/aaelf64/aaelf64.rst#57105thread-local-storage-descriptors)
-    Aarch64TlsDescAdrPage21,
+    /// Aarch64 TLS GD
+    /// Set an ADRP immediate field to the top 21 bits of the final address. Checks for overflow.
+    /// This is equivalent to `R_AARCH64_TLSGD_ADR_PAGE21` in the [aaelf64](https://github.com/ARM-software/abi-aa/blob/2bcab1e3b22d55170c563c3c7940134089176746/aaelf64/aaelf64.rst#relocations-for-thread-local-storage)
+    Aarch64TlsGdAdrPage21,
 
-    /// Aarch64 TLSDESC Ld64 Lo12
-    /// This is equivalent to `R_AARCH64_TLSDESC_LD64_LO12` in the [aaelf64](https://github.com/ARM-software/abi-aa/blob/2bcab1e3b22d55170c563c3c7940134089176746/aaelf64/aaelf64.rst#57105thread-local-storage-descriptors)
-    Aarch64TlsDescLd64Lo12,
-
-    /// Aarch64 TLSDESC Add Lo12
-    /// This is equivalent to `R_AARCH64_TLSGD_ADD_LO12` in the [aaelf64](https://github.com/ARM-software/abi-aa/blob/2bcab1e3b22d55170c563c3c7940134089176746/aaelf64/aaelf64.rst#57105thread-local-storage-descriptors)
-    Aarch64TlsDescAddLo12,
-
-    /// Aarch64 TLSDESC Call
-    /// This is equivalent to `R_AARCH64_TLSDESC_CALL` in the [aaelf64](https://github.com/ARM-software/abi-aa/blob/2bcab1e3b22d55170c563c3c7940134089176746/aaelf64/aaelf64.rst#57105thread-local-storage-descriptors)
-    Aarch64TlsDescCall,
+    /// Aarch64 TLS GD
+    /// Set the add immediate field to the low 12 bits of the final address. Does not check for overflow.
+    /// This is equivalent to `R_AARCH64_TLSGD_ADD_LO12_NC` in the [aaelf64](https://github.com/ARM-software/abi-aa/blob/2bcab1e3b22d55170c563c3c7940134089176746/aaelf64/aaelf64.rst#relocations-for-thread-local-storage)
+    Aarch64TlsGdAddLo12Nc,
 
     /// AArch64 GOT Page
     /// Set the immediate value of an ADRP to bits 32:12 of X; check that –232 <= X < 232
@@ -91,14 +85,12 @@ pub enum Reloc {
     /// This is equivalent to `R_AARCH64_LD64_GOT_LO12_NC` (312) in the  [aaelf64](https://github.com/ARM-software/abi-aa/blob/2bcab1e3b22d55170c563c3c7940134089176746/aaelf64/aaelf64.rst#static-aarch64-relocations)
     Aarch64Ld64GotLo12Nc,
 
-    /// RISC-V Call PLT: 32-bit PC-relative function call, macros call, tail (PIC)
-    ///
-    /// Despite having PLT in the name, this relocation is also used for normal calls.
-    /// The non-PLT version of this relocation has been deprecated.
-    ///
-    /// This is the `R_RISCV_CALL_PLT` relocation from the RISC-V ELF psABI document.
-    /// https://github.com/riscv-non-isa/riscv-elf-psabi-doc/blob/master/riscv-elf.adoc#procedure-calls
-    RiscvCallPlt,
+    /// procedure call.
+    /// call symbol
+    /// expands to the following assembly and relocation:
+    /// auipc ra, 0
+    /// jalr ra, ra, 0
+    RiscvCall,
 
     /// RISC-V TLS GD: High 20 bits of 32-bit PC-relative TLS GD GOT reference,
     ///
@@ -112,12 +104,6 @@ pub enum Reloc {
     /// https://github.com/riscv-non-isa/riscv-elf-psabi-doc/blob/master/riscv-elf.adoc#pc-relative-symbol-addresses
     RiscvPCRelLo12I,
 
-    /// High 20 bits of a 32-bit PC-relative GOT offset relocation
-    ///
-    /// This is the `R_RISCV_GOT_HI20` relocation from the RISC-V ELF psABI document.
-    /// https://github.com/riscv-non-isa/riscv-elf-psabi-doc/blob/master/riscv-elf.adoc#pc-relative-symbol-addresses
-    RiscvGotHi20,
-
     /// s390x TLS GD64 - 64-bit offset of tls_index for GD symbol in GOT
     S390xTlsGd64,
     /// s390x TLS GDCall - marker to enable optimization of TLS calls
@@ -139,18 +125,15 @@ impl fmt::Display for Reloc {
             Self::X86GOTPCRel4 => write!(f, "GOTPCRel4"),
             Self::X86SecRel => write!(f, "SecRel"),
             Self::Arm32Call | Self::Arm64Call => write!(f, "Call"),
-            Self::RiscvCallPlt => write!(f, "RiscvCallPlt"),
+            Self::RiscvCall => write!(f, "RiscvCall"),
             Self::RiscvTlsGdHi20 => write!(f, "RiscvTlsGdHi20"),
-            Self::RiscvGotHi20 => write!(f, "RiscvGotHi20"),
             Self::RiscvPCRelLo12I => write!(f, "RiscvPCRelLo12I"),
             Self::ElfX86_64TlsGd => write!(f, "ElfX86_64TlsGd"),
             Self::MachOX86_64Tlv => write!(f, "MachOX86_64Tlv"),
             Self::MachOAarch64TlsAdrPage21 => write!(f, "MachOAarch64TlsAdrPage21"),
             Self::MachOAarch64TlsAdrPageOff12 => write!(f, "MachOAarch64TlsAdrPageOff12"),
-            Self::Aarch64TlsDescAdrPage21 => write!(f, "Aarch64TlsDescAdrPage21"),
-            Self::Aarch64TlsDescLd64Lo12 => write!(f, "Aarch64TlsDescLd64Lo12"),
-            Self::Aarch64TlsDescAddLo12 => write!(f, "Aarch64TlsDescAddLo12"),
-            Self::Aarch64TlsDescCall => write!(f, "Aarch64TlsDescCall"),
+            Self::Aarch64TlsGdAdrPage21 => write!(f, "Aarch64TlsGdAdrPage21"),
+            Self::Aarch64TlsGdAddLo12Nc => write!(f, "Aarch64TlsGdAddLo12Nc"),
             Self::Aarch64AdrGotPage21 => write!(f, "Aarch64AdrGotPage21"),
             Self::Aarch64Ld64GotLo12Nc => write!(f, "Aarch64AdrGotLo12Nc"),
             Self::S390xTlsGd64 => write!(f, "TlsGd64"),
diff --git a/cranelift/codegen/src/context.rs b/cranelift/codegen/src/context.rs
index ca3d5fb73628..2dc62ee77fd5 100644
--- a/cranelift/codegen/src/context.rs
+++ b/cranelift/codegen/src/context.rs
@@ -237,8 +237,6 @@ impl Context {
     /// Run the verifier on the function.
     ///
     /// Also check that the dominator tree and control flow graph are consistent with the function.
-    ///
-    /// TODO: rename to "CLIF validate" or similar.
     pub fn verify<'a, FOI: Into<FlagsOrIsa<'a>>>(&self, fisa: FOI) -> VerifierResult<()> {
         let mut errors = VerifierErrors::default();
         let _ = verify_context(&self.func, &self.cfg, &self.domtree, fisa, &mut errors);
diff --git a/cranelift/codegen/src/egraph.rs b/cranelift/codegen/src/egraph.rs
index b54c1e7b63d3..e12b6fed39f2 100644
--- a/cranelift/codegen/src/egraph.rs
+++ b/cranelift/codegen/src/egraph.rs
@@ -162,7 +162,6 @@ where
                 let result = self.func.dfg.first_result(inst);
                 self.value_to_opt_value[result] = orig_result;
                 self.eclasses.union(result, orig_result);
-                self.func.dfg.merge_facts(result, orig_result);
                 self.stats.union += 1;
                 result
             } else {
@@ -257,11 +256,6 @@ where
                 // still works, but take *only* the subsuming
                 // value, and break now.
                 isle_ctx.ctx.eclasses.union(optimized_value, union_value);
-                isle_ctx
-                    .ctx
-                    .func
-                    .dfg
-                    .merge_facts(optimized_value, union_value);
                 union_value = optimized_value;
                 break;
             }
@@ -279,11 +273,6 @@ where
                 .ctx
                 .eclasses
                 .union(old_union_value, optimized_value);
-            isle_ctx
-                .ctx
-                .func
-                .dfg
-                .merge_facts(old_union_value, optimized_value);
             isle_ctx.ctx.eclasses.union(old_union_value, union_value);
         }
 
@@ -353,7 +342,6 @@ where
                 new_result
             );
             self.value_to_opt_value[result] = new_result;
-            self.func.dfg.merge_facts(result, new_result);
             true
         }
         // Otherwise, generic side-effecting op -- always keep it, and
@@ -670,7 +658,7 @@ pub(crate) struct Stats {
     pub(crate) elaborate_visit_node: u64,
     pub(crate) elaborate_memoize_hit: u64,
     pub(crate) elaborate_memoize_miss: u64,
-    pub(crate) elaborate_remat: u64,
+    pub(crate) elaborate_memoize_miss_remat: u64,
     pub(crate) elaborate_licm_hoist: u64,
     pub(crate) elaborate_func: u64,
     pub(crate) elaborate_func_pre_insts: u64,
diff --git a/cranelift/codegen/src/egraph/cost.rs b/cranelift/codegen/src/egraph/cost.rs
index bc807df02dd1..9cfb0894ca74 100644
--- a/cranelift/codegen/src/egraph/cost.rs
+++ b/cranelift/codegen/src/egraph/cost.rs
@@ -33,6 +33,12 @@ use crate::ir::Opcode;
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub(crate) struct Cost(u32);
 impl Cost {
+    pub(crate) fn at_level(&self, loop_level: usize) -> Cost {
+        let loop_level = std::cmp::min(2, loop_level);
+        let multiplier = 1u32 << ((10 * loop_level) as u32);
+        Cost(self.0.saturating_mul(multiplier)).finite()
+    }
+
     pub(crate) fn infinity() -> Cost {
         // 2^32 - 1 is, uh, pretty close to infinite... (we use `Cost`
         // only for heuristics and always saturate so this suffices!)
diff --git a/cranelift/codegen/src/egraph/elaborate.rs b/cranelift/codegen/src/egraph/elaborate.rs
index 26c7378b2c7f..6acf83cba9ae 100644
--- a/cranelift/codegen/src/egraph/elaborate.rs
+++ b/cranelift/codegen/src/egraph/elaborate.rs
@@ -5,10 +5,9 @@ use super::cost::{pure_op_cost, Cost};
 use super::domtree::DomTreeWithChildren;
 use super::Stats;
 use crate::dominator_tree::DominatorTree;
-use crate::fx::{FxHashMap, FxHashSet};
-use crate::hash_map::Entry as HashEntry;
+use crate::fx::FxHashSet;
 use crate::ir::{Block, Function, Inst, Value, ValueDef};
-use crate::loop_analysis::{Loop, LoopAnalysis};
+use crate::loop_analysis::{Loop, LoopAnalysis, LoopLevel};
 use crate::scoped_hash_map::ScopedHashMap;
 use crate::trace;
 use crate::unionfind::UnionFind;
@@ -57,8 +56,6 @@ pub(crate) struct Elaborator<'a> {
     elab_result_stack: Vec<ElaboratedValue>,
     /// Explicitly-unrolled block elaboration stack.
     block_stack: Vec<BlockStackEntry>,
-    /// Copies of values that have been rematerialized.
-    remat_copies: FxHashMap<(Block, Value), Value>,
     /// Stats for various events during egraph processing, to help
     /// with optimization of this infrastructure.
     stats: &'a mut Stats,
@@ -98,6 +95,7 @@ enum ElabStackEntry {
         inst: Inst,
         result_idx: usize,
         num_args: usize,
+        remat: bool,
         before: Inst,
     },
 }
@@ -136,7 +134,6 @@ impl<'a> Elaborator<'a> {
             elab_stack: vec![],
             elab_result_stack: vec![],
             block_stack: vec![],
-            remat_copies: FxHashMap::default(),
             stats,
         }
     }
@@ -214,24 +211,26 @@ impl<'a> Elaborator<'a> {
                 // at this point, only the side-effecting skeleton),
                 // then it must be computed and thus we give it zero
                 // cost.
+                ValueDef::Result(inst, _) if self.func.layout.inst_block(inst).is_some() => {
+                    best[value] = (Cost::zero(), value);
+                }
                 ValueDef::Result(inst, _) => {
-                    if let Some(_) = self.func.layout.inst_block(inst) {
-                        best[value] = (Cost::zero(), value);
-                    } else {
-                        trace!(" -> value {}: result, computing cost", value);
-                        let inst_data = &self.func.dfg.insts[inst];
-                        // N.B.: at this point we know that the opcode is
-                        // pure, so `pure_op_cost`'s precondition is
-                        // satisfied.
-                        let cost = self
-                            .func
-                            .dfg
-                            .inst_values(inst)
-                            .fold(pure_op_cost(inst_data.opcode()), |cost, value| {
-                                cost + best[value].0
-                            });
-                        best[value] = (cost, value);
-                    }
+                    trace!(" -> value {}: result, computing cost", value);
+                    let inst_data = &self.func.dfg.insts[inst];
+                    let loop_level = self
+                        .func
+                        .layout
+                        .inst_block(inst)
+                        .map(|block| self.loop_analysis.loop_level(block))
+                        .unwrap_or(LoopLevel::root());
+                    // N.B.: at this point we know that the opcode is
+                    // pure, so `pure_op_cost`'s precondition is
+                    // satisfied.
+                    let cost = self.func.dfg.inst_values(inst).fold(
+                        pure_op_cost(inst_data.opcode()).at_level(loop_level.level()),
+                        |cost, value| cost + best[value].0,
+                    );
+                    best[value] = (cost, value);
                 }
             };
             debug_assert_ne!(best[value].0, Cost::infinity());
@@ -259,49 +258,13 @@ impl<'a> Elaborator<'a> {
         self.elab_result_stack.pop().unwrap()
     }
 
-    /// Possibly rematerialize the instruction producing the value in
-    /// `arg` and rewrite `arg` to refer to it, if needed. Returns
-    /// `true` if a rewrite occurred.
-    fn maybe_remat_arg(
-        remat_values: &FxHashSet<Value>,
-        func: &mut Function,
-        remat_copies: &mut FxHashMap<(Block, Value), Value>,
-        insert_block: Block,
-        before: Inst,
-        arg: &mut ElaboratedValue,
-        stats: &mut Stats,
-    ) -> bool {
-        // TODO (#7313): we may want to consider recursive
-        // rematerialization as well. We could process the arguments of
-        // the rematerialized instruction up to a certain depth. This
-        // would affect, e.g., adds-with-one-constant-arg, which are
-        // currently rematerialized. Right now we don't do this, to
-        // avoid the need for another fixpoint loop here.
-        if arg.in_block != insert_block && remat_values.contains(&arg.value) {
-            let new_value = match remat_copies.entry((insert_block, arg.value)) {
-                HashEntry::Occupied(o) => *o.get(),
-                HashEntry::Vacant(v) => {
-                    let inst = func.dfg.value_def(arg.value).inst().unwrap();
-                    debug_assert_eq!(func.dfg.inst_results(inst).len(), 1);
-                    let new_inst = func.dfg.clone_inst(inst);
-                    func.layout.insert_inst(new_inst, before);
-                    let new_result = func.dfg.inst_results(new_inst)[0];
-                    *v.insert(new_result)
-                }
-            };
-            trace!("rematerialized {} as {}", arg.value, new_value);
-            arg.value = new_value;
-            stats.elaborate_remat += 1;
-            true
-        } else {
-            false
-        }
-    }
-
     fn process_elab_stack(&mut self) {
-        while let Some(entry) = self.elab_stack.pop() {
+        while let Some(entry) = self.elab_stack.last() {
             match entry {
-                ElabStackEntry::Start { value, before } => {
+                &ElabStackEntry::Start { value, before } => {
+                    // We always replace the Start entry, so pop it now.
+                    self.elab_stack.pop();
+
                     debug_assert_ne!(value, Value::reserved_value());
                     let value = self.func.dfg.resolve_aliases(value);
 
@@ -320,17 +283,39 @@ impl<'a> Elaborator<'a> {
                     // eclass.
                     trace!("looking up best value for {}", value);
                     let (_, best_value) = self.value_to_best_value[value];
-                    trace!("elaborate: value {} -> best {}", value, best_value);
                     debug_assert_ne!(best_value, Value::reserved_value());
+                    trace!("elaborate: value {} -> best {}", value, best_value);
 
-                    if let Some(elab_val) = self.value_to_elaborated_value.get(&canonical_value) {
-                        // Value is available; use it.
-                        trace!("elaborate: value {} -> {:?}", value, elab_val);
-                        self.stats.elaborate_memoize_hit += 1;
-                        self.elab_result_stack.push(*elab_val);
-                        continue;
-                    }
-
+                    let remat = if let Some(elab_val) =
+                        self.value_to_elaborated_value.get(&canonical_value)
+                    {
+                        // Value is available. Look at the defined
+                        // block, and determine whether this node kind
+                        // allows rematerialization if the value comes
+                        // from another block. If so, ignore the hit
+                        // and recompute below.
+                        let remat = elab_val.in_block != self.cur_block
+                            && self.remat_values.contains(&best_value);
+                        if !remat {
+                            trace!("elaborate: value {} -> {:?}", value, elab_val);
+                            self.stats.elaborate_memoize_hit += 1;
+                            self.elab_result_stack.push(*elab_val);
+                            continue;
+                        }
+                        trace!("elaborate: value {} -> remat", canonical_value);
+                        self.stats.elaborate_memoize_miss_remat += 1;
+                        // The op is pure at this point, so it is always valid to
+                        // remove from this map.
+                        self.value_to_elaborated_value.remove(&canonical_value);
+                        true
+                    } else {
+                        // Value not available; but still look up
+                        // whether it's been flagged for remat because
+                        // this affects placement.
+                        let remat = self.remat_values.contains(&best_value);
+                        trace!(" -> not present in map; remat = {}", remat);
+                        remat
+                    };
                     self.stats.elaborate_memoize_miss += 1;
 
                     // Now resolve the value to its definition to see
@@ -378,6 +363,7 @@ impl<'a> Elaborator<'a> {
                         inst,
                         result_idx,
                         num_args,
+                        remat,
                         before,
                     });
 
@@ -390,17 +376,21 @@ impl<'a> Elaborator<'a> {
                     }
                 }
 
-                ElabStackEntry::PendingInst {
+                &ElabStackEntry::PendingInst {
                     inst,
                     result_idx,
                     num_args,
+                    remat,
                     before,
                 } => {
+                    self.elab_stack.pop();
+
                     trace!(
-                        "PendingInst: {} result {} args {} before {}",
+                        "PendingInst: {} result {} args {} remat {} before {}",
                         inst,
                         result_idx,
                         num_args,
+                        remat,
                         before
                     );
 
@@ -408,7 +398,7 @@ impl<'a> Elaborator<'a> {
                     // point. Grab them and drain them out, removing
                     // them.
                     let arg_idx = self.elab_result_stack.len() - num_args;
-                    let arg_values = &mut self.elab_result_stack[arg_idx..];
+                    let arg_values = &self.elab_result_stack[arg_idx..];
 
                     // Compute max loop depth.
                     //
@@ -454,15 +444,16 @@ impl<'a> Elaborator<'a> {
 
                     // We know that this is a pure inst, because
                     // non-pure roots have already been placed in the
-                    // value-to-elab'd-value map, so they will not
-                    // reach this stage of processing.
+                    // value-to-elab'd-value map and are never subject
+                    // to remat, so they will not reach this stage of
+                    // processing.
                     //
                     // We now must determine the location at which we
                     // place the instruction. This is the current
                     // block *unless* we hoist above a loop when all
                     // args are loop-invariant (and this op is pure).
                     let (scope_depth, before, insert_block) =
-                        if loop_hoist_level == self.loop_stack.len() {
+                        if loop_hoist_level == self.loop_stack.len() || remat {
                             // Depends on some value at the current
                             // loop depth, or remat forces it here:
                             // place it at the current location.
@@ -495,39 +486,16 @@ impl<'a> Elaborator<'a> {
                         insert_block
                     );
 
-                    // Now that we have the location for the
-                    // instruction, check if any of its args are remat
-                    // values. If so, and if we don't have a copy of
-                    // the rematerializing instruction for this block
-                    // yet, create one.
-                    let mut remat_arg = false;
-                    for arg_value in arg_values.iter_mut() {
-                        if Self::maybe_remat_arg(
-                            &self.remat_values,
-                            &mut self.func,
-                            &mut self.remat_copies,
-                            insert_block,
-                            before,
-                            arg_value,
-                            &mut self.stats,
-                        ) {
-                            remat_arg = true;
-                        }
-                    }
-
-                    // Now we need to place `inst` at the computed
-                    // location (just before `before`). Note that
-                    // `inst` may already have been placed somewhere
-                    // else, because a pure node may be elaborated at
-                    // more than one place. In this case, we need to
-                    // duplicate the instruction (and return the
-                    // `Value`s for that duplicated instance instead).
-                    //
-                    // Also clone if we rematerialized, because we
-                    // don't want to rewrite the args in the original
-                    // copy.
+                    //  Now we need to place `inst` at the computed
+                    //  location (just before `before`). Note that
+                    //  `inst` may already have been placed somewhere
+                    //  else, because a pure node may be elaborated at
+                    //  more than one place. In this case, we need to
+                    //  duplicate the instruction (and return the
+                    //  `Value`s for that duplicated instance
+                    //  instead).
                     trace!("need inst {} before {}", inst, before);
-                    let inst = if self.func.layout.inst_block(inst).is_some() || remat_arg {
+                    let inst = if self.func.layout.inst_block(inst).is_some() {
                         // Clone the inst!
                         let new_inst = self.func.dfg.clone_inst(inst);
                         trace!(
@@ -644,16 +612,7 @@ impl<'a> Elaborator<'a> {
                 // Elaborate the arg, placing any newly-inserted insts
                 // before `before`. Get the updated value, which may
                 // be different than the original.
-                let mut new_arg = self.elaborate_eclass_use(*arg, before);
-                Self::maybe_remat_arg(
-                    &self.remat_values,
-                    &mut self.func,
-                    &mut self.remat_copies,
-                    block,
-                    inst,
-                    &mut new_arg,
-                    &mut self.stats,
-                );
+                let new_arg = self.elaborate_eclass_use(*arg, before);
                 trace!("   -> rewrote arg to {:?}", new_arg);
                 *arg = new_arg.value;
             }
diff --git a/cranelift/codegen/src/ir/dfg.rs b/cranelift/codegen/src/ir/dfg.rs
index 501a7f0a4ef4..76b1b08cbeea 100644
--- a/cranelift/codegen/src/ir/dfg.rs
+++ b/cranelift/codegen/src/ir/dfg.rs
@@ -5,7 +5,6 @@ use crate::ir;
 use crate::ir::builder::ReplaceBuilder;
 use crate::ir::dynamic_type::{DynamicTypeData, DynamicTypes};
 use crate::ir::instructions::{CallInfo, InstructionData};
-use crate::ir::pcc::Fact;
 use crate::ir::{
     types, Block, BlockCall, ConstantData, ConstantPool, DynamicType, ExtFuncData, FuncRef,
     Immediate, Inst, JumpTables, RelSourceLoc, SigRef, Signature, Type, Value,
@@ -126,9 +125,6 @@ pub struct DataFlowGraph {
     /// Primary value table with entries for all values.
     values: PrimaryMap<Value, ValueDataPacked>,
 
-    /// Facts: proof-carrying-code assertions about values.
-    pub facts: SecondaryMap<Value, Option<Fact>>,
-
     /// Function signature table. These signatures are referenced by indirect call instructions as
     /// well as the external function references.
     pub signatures: PrimaryMap<SigRef, Signature>,
@@ -162,7 +158,6 @@ impl DataFlowGraph {
             dynamic_types: DynamicTypes::new(),
             value_lists: ValueListPool::new(),
             values: PrimaryMap::new(),
-            facts: SecondaryMap::new(),
             signatures: PrimaryMap::new(),
             old_signatures: SecondaryMap::new(),
             ext_funcs: PrimaryMap::new(),
@@ -188,7 +183,6 @@ impl DataFlowGraph {
         self.constants.clear();
         self.immediates.clear();
         self.jump_tables.clear();
-        self.facts.clear();
     }
 
     /// Get the total number of instructions created in this function, whether they are currently
@@ -959,13 +953,7 @@ impl DataFlowGraph {
         // Get the controlling type variable.
         let ctrl_typevar = self.ctrl_typevar(inst);
         // Create new result values.
-        let num_results = self.make_inst_results(new_inst, ctrl_typevar);
-        // Copy over PCC facts, if any.
-        for i in 0..num_results {
-            let old_result = self.inst_results(inst)[i];
-            let new_result = self.inst_results(new_inst)[i];
-            self.facts[new_result] = self.facts[old_result].clone();
-        }
+        self.make_inst_results(new_inst, ctrl_typevar);
         new_inst
     }
 
@@ -1291,38 +1279,6 @@ impl DataFlowGraph {
     pub fn detach_block_params(&mut self, block: Block) -> ValueList {
         self.blocks[block].params.take()
     }
-
-    /// Merge the facts for two values. If both values have facts and
-    /// they differ, both values get a special "conflict" fact that is
-    /// never satisfied.
-    pub fn merge_facts(&mut self, a: Value, b: Value) {
-        let a = self.resolve_aliases(a);
-        let b = self.resolve_aliases(b);
-        match (&self.facts[a], &self.facts[b]) {
-            (Some(a), Some(b)) if a == b => { /* nothing */ }
-            (None, None) => { /* nothing */ }
-            (Some(a), None) => {
-                self.facts[b] = Some(a.clone());
-            }
-            (None, Some(b)) => {
-                self.facts[a] = Some(b.clone());
-            }
-            (Some(a_fact), Some(b_fact)) => {
-                assert_eq!(self.value_type(a), self.value_type(b));
-                let merged = Fact::intersect(a_fact, b_fact);
-                crate::trace!(
-                    "facts merge on {} and {}: {:?}, {:?} -> {:?}",
-                    a,
-                    b,
-                    a_fact,
-                    b_fact,
-                    merged,
-                );
-                self.facts[a] = Some(merged.clone());
-                self.facts[b] = Some(merged);
-            }
-        }
-    }
 }
 
 /// Contents of a basic block.
diff --git a/cranelift/codegen/src/ir/entities.rs b/cranelift/codegen/src/ir/entities.rs
index af2b0efc9488..f33e198c0936 100644
--- a/cranelift/codegen/src/ir/entities.rs
+++ b/cranelift/codegen/src/ir/entities.rs
@@ -209,29 +209,6 @@ impl GlobalValue {
     }
 }
 
-/// An opaque reference to a memory type.
-///
-/// A `MemoryType` is a descriptor of a struct layout in memory, with
-/// types and proof-carrying-code facts optionally attached to the
-/// fields.
-#[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
-#[cfg_attr(feature = "enable-serde", derive(Serialize, Deserialize))]
-pub struct MemoryType(u32);
-entity_impl!(MemoryType, "mt");
-
-impl MemoryType {
-    /// Create a new memory type reference from its number.
-    ///
-    /// This method is for use by the parser.
-    pub fn with_number(n: u32) -> Option<Self> {
-        if n < u32::MAX {
-            Some(Self(n))
-        } else {
-            None
-        }
-    }
-}
-
 /// An opaque reference to a constant.
 ///
 /// You can store [`ConstantData`](super::ConstantData) in a
@@ -435,8 +412,6 @@ pub enum AnyEntity {
     DynamicType(DynamicType),
     /// A Global value.
     GlobalValue(GlobalValue),
-    /// A memory type.
-    MemoryType(MemoryType),
     /// A jump table.
     JumpTable(JumpTable),
     /// A constant.
@@ -462,7 +437,6 @@ impl fmt::Display for AnyEntity {
             Self::DynamicStackSlot(r) => r.fmt(f),
             Self::DynamicType(r) => r.fmt(f),
             Self::GlobalValue(r) => r.fmt(f),
-            Self::MemoryType(r) => r.fmt(f),
             Self::JumpTable(r) => r.fmt(f),
             Self::Constant(r) => r.fmt(f),
             Self::FuncRef(r) => r.fmt(f),
@@ -521,12 +495,6 @@ impl From<GlobalValue> for AnyEntity {
     }
 }
 
-impl From<MemoryType> for AnyEntity {
-    fn from(r: MemoryType) -> Self {
-        Self::MemoryType(r)
-    }
-}
-
 impl From<JumpTable> for AnyEntity {
     fn from(r: JumpTable) -> Self {
         Self::JumpTable(r)
diff --git a/cranelift/codegen/src/ir/function.rs b/cranelift/codegen/src/ir/function.rs
index 5d91e705e9eb..f5b85c50af80 100644
--- a/cranelift/codegen/src/ir/function.rs
+++ b/cranelift/codegen/src/ir/function.rs
@@ -5,10 +5,10 @@
 
 use crate::entity::{PrimaryMap, SecondaryMap};
 use crate::ir::{
-    self, pcc::Fact, Block, DataFlowGraph, DynamicStackSlot, DynamicStackSlotData,
-    DynamicStackSlots, DynamicType, ExtFuncData, FuncRef, GlobalValue, GlobalValueData, Inst,
-    JumpTable, JumpTableData, Layout, MemoryType, MemoryTypeData, Opcode, SigRef, Signature,
-    SourceLocs, StackSlot, StackSlotData, StackSlots, Table, TableData, Type,
+    self, Block, DataFlowGraph, DynamicStackSlot, DynamicStackSlotData, DynamicStackSlots,
+    DynamicType, ExtFuncData, FuncRef, GlobalValue, GlobalValueData, Inst, JumpTable,
+    JumpTableData, Layout, Opcode, SigRef, Signature, SourceLocs, StackSlot, StackSlotData,
+    StackSlots, Table, TableData, Type,
 };
 use crate::isa::CallConv;
 use crate::write::write_function;
@@ -172,12 +172,6 @@ pub struct FunctionStencil {
     /// Global values referenced.
     pub global_values: PrimaryMap<ir::GlobalValue, ir::GlobalValueData>,
 
-    /// Global value proof-carrying-code facts.
-    pub global_value_facts: SecondaryMap<ir::GlobalValue, Option<Fact>>,
-
-    /// Memory types for proof-carrying code.
-    pub memory_types: PrimaryMap<ir::MemoryType, ir::MemoryTypeData>,
-
     /// Tables referenced.
     pub tables: PrimaryMap<ir::Table, ir::TableData>,
 
@@ -207,8 +201,6 @@ impl FunctionStencil {
         self.sized_stack_slots.clear();
         self.dynamic_stack_slots.clear();
         self.global_values.clear();
-        self.global_value_facts.clear();
-        self.memory_types.clear();
         self.tables.clear();
         self.dfg.clear();
         self.layout.clear();
@@ -243,11 +235,6 @@ impl FunctionStencil {
         self.global_values.push(data)
     }
 
-    /// Declares a memory type for use by the function.
-    pub fn create_memory_type(&mut self, data: MemoryTypeData) -> MemoryType {
-        self.memory_types.push(data)
-    }
-
     /// Find the global dyn_scale value associated with given DynamicType.
     pub fn get_dyn_scale(&self, ty: DynamicType) -> GlobalValue {
         self.dfg.dynamic_types.get(ty).unwrap().dynamic_scale
@@ -327,17 +314,7 @@ impl FunctionStencil {
     pub fn is_leaf(&self) -> bool {
         // Conservative result: if there's at least one function signature referenced in this
         // function, assume it is not a leaf.
-        let has_signatures = !self.dfg.signatures.is_empty();
-
-        // Under some TLS models, retrieving the address of a TLS variable requires calling a
-        // function. Conservatively assume that any function that references a tls global value
-        // is not a leaf.
-        let has_tls = self.global_values.values().any(|gv| match gv {
-            GlobalValueData::Symbol { tls, .. } => *tls,
-            _ => false,
-        });
-
-        !has_signatures && !has_tls
+        self.dfg.signatures.is_empty()
     }
 
     /// Replace the `dst` instruction's data with the `src` instruction's data
@@ -421,8 +398,6 @@ impl Function {
                 sized_stack_slots: StackSlots::new(),
                 dynamic_stack_slots: DynamicStackSlots::new(),
                 global_values: PrimaryMap::new(),
-                global_value_facts: SecondaryMap::new(),
-                memory_types: PrimaryMap::new(),
                 tables: PrimaryMap::new(),
                 dfg: DataFlowGraph::new(),
                 layout: Layout::new(),
diff --git a/cranelift/codegen/src/ir/globalvalue.rs b/cranelift/codegen/src/ir/globalvalue.rs
index 438a13e50119..530875641e43 100644
--- a/cranelift/codegen/src/ir/globalvalue.rs
+++ b/cranelift/codegen/src/ir/globalvalue.rs
@@ -1,7 +1,7 @@
 //! Global values.
 
 use crate::ir::immediates::{Imm64, Offset32};
-use crate::ir::{ExternalName, GlobalValue, MemFlags, Type};
+use crate::ir::{ExternalName, GlobalValue, Type};
 use crate::isa::TargetIsa;
 use core::fmt;
 
@@ -31,8 +31,9 @@ pub enum GlobalValueData {
         /// Type of the loaded value.
         global_type: Type,
 
-        /// Specifies the memory flags to be used by the load. Guaranteed to be notrap and aligned.
-        flags: MemFlags,
+        /// Specifies whether the memory that this refers to is readonly, allowing for the
+        /// elimination of redundant loads.
+        readonly: bool,
     },
 
     /// Value is an offset from another global value.
@@ -110,8 +111,15 @@ impl fmt::Display for GlobalValueData {
                 base,
                 offset,
                 global_type,
-                flags,
-            } => write!(f, "load.{}{} {}{}", global_type, flags, base, offset),
+                readonly,
+            } => write!(
+                f,
+                "load.{} notrap aligned {}{}{}",
+                global_type,
+                if readonly { "readonly " } else { "" },
+                base,
+                offset
+            ),
             Self::IAddImm {
                 global_type,
                 base,
diff --git a/cranelift/codegen/src/ir/memflags.rs b/cranelift/codegen/src/ir/memflags.rs
index 546e11fa3703..87165ba69117 100644
--- a/cranelift/codegen/src/ir/memflags.rs
+++ b/cranelift/codegen/src/ir/memflags.rs
@@ -6,19 +6,10 @@ use core::fmt;
 use serde_derive::{Deserialize, Serialize};
 
 enum FlagBit {
-    /// Guaranteed not to trap. This may enable additional
-    /// optimizations to be performed.
     Notrap,
-    /// Guaranteed to use "natural alignment" for the given type. This
-    /// may enable better instruction selection.
     Aligned,
-    /// A load that reads data in memory that does not change for the
-    /// duration of the function's execution. This may enable
-    /// additional optimizations to be performed.
     Readonly,
-    /// Load multi-byte values from memory in a little-endian format.
     LittleEndian,
-    /// Load multi-byte values from memory in a big-endian format.
     BigEndian,
     /// Accesses only the "heap" part of abstract state. Used for
     /// alias analysis. Mutually exclusive with "table" and "vmctx".
@@ -29,15 +20,10 @@ enum FlagBit {
     /// Accesses only the "vmctx" part of abstract state. Used for
     /// alias analysis. Mutually exclusive with "heap" and "table".
     Vmctx,
-    /// Check this load or store for safety when using the
-    /// proof-carrying-code framework. The address must have a
-    /// `PointsTo` fact attached with a sufficiently large valid range
-    /// for the accessed size.
-    Checked,
 }
 
-const NAMES: [&str; 9] = [
-    "notrap", "aligned", "readonly", "little", "big", "heap", "table", "vmctx", "checked",
+const NAMES: [&str; 8] = [
+    "notrap", "aligned", "readonly", "little", "big", "heap", "table", "vmctx",
 ];
 
 /// Endianness of a memory access.
@@ -62,7 +48,7 @@ pub enum Endianness {
 #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)]
 #[cfg_attr(feature = "enable-serde", derive(Serialize, Deserialize))]
 pub struct MemFlags {
-    bits: u16,
+    bits: u8,
 }
 
 impl MemFlags {
@@ -279,32 +265,6 @@ impl MemFlags {
         self.set_vmctx();
         self
     }
-
-    /// Test if the `checked` bit is set.
-    ///
-    /// Loads and stores with this flag are verified to access
-    /// pointers only with a validated `PointsTo` fact attached, and
-    /// with that fact validated, when using the proof-carrying-code
-    /// framework. If initial facts on program inputs are correct
-    /// (i.e., correctly denote the shape and types of data structures
-    /// in memory), and if PCC validates the compiled output, then all
-    /// `checked`-marked memory accesses are guaranteed (up to the
-    /// checker's correctness) to access valid memory. This can be
-    /// used to ensure memory safety and sandboxing.
-    pub fn checked(self) -> bool {
-        self.read(FlagBit::Checked)
-    }
-
-    /// Set the `checked` bit.
-    pub fn set_checked(&mut self) {
-        self.set(FlagBit::Checked);
-    }
-
-    /// Set the `checked` bit, returning new flags.
-    pub fn with_checked(mut self) -> Self {
-        self.set_checked();
-        self
-    }
 }
 
 impl fmt::Display for MemFlags {
diff --git a/cranelift/codegen/src/ir/memtype.rs b/cranelift/codegen/src/ir/memtype.rs
deleted file mode 100644
index 403661d89c82..000000000000
--- a/cranelift/codegen/src/ir/memtype.rs
+++ /dev/null
@@ -1,181 +0,0 @@
-//! Definitions for "memory types" in CLIF.
-//!
-//! A memory type is a struct-like definition -- fields with offsets,
-//! each field having a type and possibly an attached fact -- that we
-//! can use in proof-carrying code to validate accesses to structs and
-//! propagate facts onto the loaded values as well.
-//!
-//! Memory types are meant to be rich enough to describe the *layout*
-//! of values in memory, but do not necessarily need to embody
-//! higher-level features such as subtyping directly. Rather, they
-//! should encode an implementation of a type or object system.
-//!
-//! Note also that it is a non-goal for now for this type system to be
-//! "complete" or fully orthogonal: we have some restrictions now
-//! (e.g., struct fields are only primitives) because this is all we
-//! need for existing PCC applications, and it keeps the
-//! implementation simpler.
-//!
-//! There are a few basic kinds of types:
-//!
-//! - A struct is an aggregate of fields and an overall size. Each
-//!   field has a *primitive Cranelift type*. This is for simplicity's
-//!   sake: we do not allow nested memory types because to do so
-//!   invites cycles, requires recursive computation of sizes, creates
-//!   complicated questions when field types are dynamically-sized,
-//!   and in general is more complexity than we need.
-//!
-//!   The expectation (validated by PCC) is that when a checked load
-//!   or store accesses memory typed by a memory type, accesses will
-//!   only be to fields at offsets named in the type, and will be via
-//!   the given Cranelift type -- i.e., no type-punning occurs in
-//!   memory.
-//!
-//!   The overall size of the struct may be larger than that implied
-//!   by the fields because (i) we may not want or need to name all
-//!   the actually-existing fields in the memory type, and (ii) there
-//!   may be alignment padding that we also don't want or need to
-//!   represent explicitly.
-//!
-//! - A static memory is an untyped blob of storage with a static
-//!   size. This is memory that can be accessed with any type of load
-//!   or store at any valid offset.
-//!
-//!   Note that this is *distinct* from an "array of u8" kind of
-//!   representation of memory, if/when we can represent such a thing,
-//!   because the expectation with memory types' fields (including
-//!   array elements) is that they are strongly typed, only accessed
-//!   via that type, and not type-punned. We don't want to imply any
-//!   restriction on load/store size, or any actual structure, with
-//!   untyped memory; it's just a blob.
-//!
-//! Eventually we plan to also have:
-//!
-//! - A dynamic memory is an untyped blob of storage with a size given
-//!   by a global value (GV). This is otherwise just like the "static
-//!   memory" variant described above.
-//!
-//! - A dynamic array is a sequence of struct memory types, with a
-//!   length given by a global value (GV). This is useful to model,
-//!   e.g., tables.
-//!
-//! - A discriminated union is a union of several memory types
-//!   together with a tag field. This will be useful to model and
-//!   verify subtyping/downcasting for Wasm GC, among other uses.
-//!
-//! - Nullability on pointer fields: the fact will hold only if the
-//!   field is not null (all zero bits).
-
-use crate::ir::pcc::Fact;
-use crate::ir::Type;
-use alloc::vec::Vec;
-
-#[cfg(feature = "enable-serde")]
-use serde_derive::{Deserialize, Serialize};
-
-/// Data defining a memory type.
-///
-/// A memory type corresponds to a layout of data in memory. It may
-/// have a statically-known or dynamically-known size.
-#[derive(Clone, PartialEq, Hash)]
-#[cfg_attr(feature = "enable-serde", derive(Serialize, Deserialize))]
-pub enum MemoryTypeData {
-    /// An aggregate consisting of certain fields at certain offsets.
-    ///
-    /// Fields must be sorted by offset, must be within the struct's
-    /// overall size, and must not overlap. These conditions are
-    /// checked by the CLIF verifier.
-    Struct {
-        /// Size of this type.
-        size: u64,
-
-        /// Fields in this type. Sorted by offset.
-        fields: Vec<MemoryTypeField>,
-    },
-
-    /// A statically-sized untyped blob of memory.
-    Memory {
-        /// Accessible size.
-        size: u64,
-    },
-
-    /// A type with no size.
-    Empty,
-}
-
-impl std::default::Default for MemoryTypeData {
-    fn default() -> Self {
-        Self::Empty
-    }
-}
-
-impl std::fmt::Display for MemoryTypeData {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        match self {
-            Self::Struct { size, fields } => {
-                write!(f, "struct {size} {{")?;
-                let mut first = true;
-                for field in fields {
-                    if first {
-                        first = false;
-                    } else {
-                        write!(f, ",")?;
-                    }
-                    write!(f, " {}: {}", field.offset, field.ty)?;
-                    if field.readonly {
-                        write!(f, " readonly")?;
-                    }
-                    if let Some(fact) = &field.fact {
-                        write!(f, " ! {}", fact)?;
-                    }
-                }
-                write!(f, " }}")?;
-                Ok(())
-            }
-            Self::Memory { size } => {
-                write!(f, "memory {size:#x}")
-            }
-            Self::Empty => {
-                write!(f, "empty")
-            }
-        }
-    }
-}
-
-/// One field in a memory type.
-#[derive(Clone, PartialEq, Hash)]
-#[cfg_attr(feature = "enable-serde", derive(Serialize, Deserialize))]
-pub struct MemoryTypeField {
-    /// The offset of this field in the memory type.
-    pub offset: u64,
-    /// The primitive type of the value in this field. Accesses to the
-    /// field must use this type (i.e., cannot bitcast/type-pun in
-    /// memory).
-    pub ty: Type,
-    /// A proof-carrying-code fact about this value, if any.
-    pub fact: Option<Fact>,
-    /// Whether this field is read-only, i.e., stores should be
-    /// disallowed.
-    pub readonly: bool,
-}
-
-impl MemoryTypeField {
-    /// Get the fact, if any, on a field.
-    pub fn fact(&self) -> Option<&Fact> {
-        self.fact.as_ref()
-    }
-}
-
-impl MemoryTypeData {
-    /// Provide the static size of this type, if known.
-    ///
-    /// (The size may not be known for dynamically-sized arrays or
-    /// memories, when those memtype kinds are added.)
-    pub fn static_size(&self) -> Option<u64> {
-        match self {
-            Self::Struct { size, .. } => Some(*size),
-            Self::Memory { size } => Some(*size),
-            Self::Empty => Some(0),
-        }
-    }
-}
diff --git a/cranelift/codegen/src/ir/mod.rs b/cranelift/codegen/src/ir/mod.rs
index e2ec87d67205..986f8003722c 100644
--- a/cranelift/codegen/src/ir/mod.rs
+++ b/cranelift/codegen/src/ir/mod.rs
@@ -18,8 +18,6 @@ pub(crate) mod known_symbol;
 pub mod layout;
 pub(crate) mod libcall;
 mod memflags;
-mod memtype;
-pub mod pcc;
 mod progpoint;
 mod sourceloc;
 pub mod stackslot;
@@ -39,7 +37,7 @@ pub use crate::ir::dfg::{BlockData, DataFlowGraph, ValueDef};
 pub use crate::ir::dynamic_type::{dynamic_to_fixed, DynamicTypeData, DynamicTypes};
 pub use crate::ir::entities::{
     Block, Constant, DynamicStackSlot, DynamicType, FuncRef, GlobalValue, Immediate, Inst,
-    JumpTable, MemoryType, SigRef, StackSlot, Table, UserExternalNameRef, Value,
+    JumpTable, SigRef, StackSlot, Table, UserExternalNameRef, Value,
 };
 pub use crate::ir::extfunc::{
     AbiParam, ArgumentExtension, ArgumentPurpose, ExtFuncData, Signature,
@@ -55,7 +53,6 @@ pub use crate::ir::known_symbol::KnownSymbol;
 pub use crate::ir::layout::Layout;
 pub use crate::ir::libcall::{get_probestack_funcref, LibCall};
 pub use crate::ir::memflags::{Endianness, MemFlags};
-pub use crate::ir::memtype::{MemoryTypeData, MemoryTypeField};
 pub use crate::ir::progpoint::ProgramPoint;
 pub use crate::ir::sourceloc::RelSourceLoc;
 pub use crate::ir::sourceloc::SourceLoc;
diff --git a/cranelift/codegen/src/ir/pcc.rs b/cranelift/codegen/src/ir/pcc.rs
deleted file mode 100644
index fe7f08c96cdb..000000000000
--- a/cranelift/codegen/src/ir/pcc.rs
+++ /dev/null
@@ -1,809 +0,0 @@
-//! Proof-carrying code. We attach "facts" to values and then check
-//! that they remain true after compilation.
-//!
-//! A few key design principle of this approach are:
-//!
-//! - The producer of the IR provides the axioms. All "ground truth",
-//!   such as what memory is accessible -- is meant to come by way of
-//!   facts on the function arguments and global values. In some
-//!   sense, all we are doing here is validating the "internal
-//!   consistency" of the facts that are provided on values, and the
-//!   actions performed on those values.
-//!
-//! - We do not derive and forward-propagate facts eagerly. Rather,
-//!   the producer needs to provide breadcrumbs -- a "proof witness"
-//!   of sorts -- to allow the checking to complete. That means that
-//!   as an address is computed, or pointer chains are dereferenced,
-//!   each intermediate value will likely have some fact attached.
-//!
-//!   This does create more verbose IR, but a significant positive
-//!   benefit is that it avoids unnecessary work: we do not build up a
-//!   knowledge base that effectively encodes the integer ranges of
-//!   many or most values in the program. Rather, we only check
-//!   specifically the memory-access sequences. In practice, each such
-//!   sequence is likely to be a carefully-controlled sequence of IR
-//!   operations from, e.g., a sandboxing compiler (such as
-//!   `cranelift-wasm`) so adding annotations here to communicate
-//!   intent (ranges, bounds-checks, and the like) is no problem.
-//!
-//! Facts are attached to SSA values in CLIF, and are maintained
-//! through optimizations and through lowering. They are thus also
-//! present on VRegs in the VCode. In theory, facts could be checked
-//! at either level, though in practice it is most useful to check
-//! them at the VCode level if the goal is an end-to-end verification
-//! of certain properties (e.g., memory sandboxing).
-//!
-//! Checking facts entails visiting each instruction that defines a
-//! value with a fact, and checking the result's fact against the
-//! facts on arguments and the operand. For VCode, this is
-//! fundamentally a question of the target ISA's semantics, so we call
-//! into the `LowerBackend` for this. Note that during checking there
-//! is also limited forward propagation / inference, but only within
-//! an instruction: for example, an addressing mode commonly can
-//! include an addition, multiplication/shift, or extend operation,
-//! and there is no way to attach facts to the intermediate values
-//! "inside" the instruction, so instead the backend can use
-//! `FactContext::add()` and friends to forward-propagate facts.
-//!
-//! TODO:
-//!
-//! Completeness:
-//! - Propagate facts through optimization (egraph layer).
-//! - Generate facts in cranelift-wasm frontend when lowering memory ops.
-//! - Support bounds-checking-type operations for dynamic memories and
-//!   tables.
-//!
-//! More checks:
-//! - Check that facts on `vmctx` GVs are subsumed by the actual facts
-//!   on the vmctx arg in block0 (function arg).
-//!
-//! Generality:
-//! - facts on outputs (in func signature)?
-//! - Implement checking at the CLIF level as well.
-//! - Check instructions that can trap as well?
-//!
-//! Nicer errors:
-//! - attach instruction index or some other identifier to errors
-//!
-//! Refactoring:
-//! - avoid the "default fact" infra everywhere we fetch facts,
-//!   instead doing it in the subsume check (and take the type with
-//!   subsume)?
-//!
-//! Text format cleanup:
-//! - make the bitwidth on `max` facts optional in the CLIF text
-//!   format?
-//! - make offset in `mem` fact optional in the text format?
-//!
-//! Bikeshed colors (syntax):
-//! - Put fact bang-annotations after types?
-//!   `v0: i64 ! fact(..)` vs. `v0 ! fact(..): i64`
-
-use crate::ir;
-use crate::ir::types::*;
-use crate::isa::TargetIsa;
-use crate::machinst::{BlockIndex, LowerBackend, VCode};
-use crate::trace;
-use regalloc2::Function as _;
-use std::fmt;
-
-#[cfg(feature = "enable-serde")]
-use serde_derive::{Deserialize, Serialize};
-
-/// The result of checking proof-carrying-code facts.
-pub type PccResult<T> = std::result::Result<T, PccError>;
-
-/// An error or inconsistency discovered when checking proof-carrying
-/// code.
-#[derive(Debug, Clone)]
-pub enum PccError {
-    /// An operation wraps around, invalidating the stated value
-    /// range.
-    Overflow,
-    /// An input to an operator that produces a fact-annotated value
-    /// does not have a fact describing it, and one is needed.
-    MissingFact,
-    /// A derivation of an output fact is unsupported (incorrect or
-    /// not derivable).
-    UnsupportedFact,
-    /// A block parameter claims a fact that one of its predecessors
-    /// does not support.
-    UnsupportedBlockparam,
-    /// A memory access is out of bounds.
-    OutOfBounds,
-    /// Proof-carrying-code checking is not implemented for a
-    /// particular compiler backend.
-    UnimplementedBackend,
-    /// Proof-carrying-code checking is not implemented for a
-    /// particular instruction that instruction-selection chose. This
-    /// is an internal compiler error.
-    UnimplementedInst,
-    /// Access to an invalid or undefined field offset in a struct.
-    InvalidFieldOffset,
-    /// Access to a field via the wrong type.
-    BadFieldType,
-    /// Store to a read-only field.
-    WriteToReadOnlyField,
-    /// Store of data to a field with a fact that does not subsume the
-    /// field's fact.
-    InvalidStoredFact,
-}
-
-/// A fact on a value.
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-#[cfg_attr(feature = "enable-serde", derive(Serialize, Deserialize))]
-pub enum Fact {
-    /// A bitslice of a value (up to a bitwidth) is within the given
-    /// integer range.
-    ///
-    /// The slicing behavior is needed because this fact can describe
-    /// both an SSA `Value`, whose entire value is well-defined, and a
-    /// `VReg` in VCode, whose bits beyond the type stored in that
-    /// register are don't-care (undefined).
-    Range {
-        /// The bitwidth of bits we care about, from the LSB upward.
-        bit_width: u16,
-        /// The minimum value that the bitslice can take
-        /// (inclusive). The range is unsigned: the specified bits of
-        /// the actual value will be greater than or equal to this
-        /// value, as evaluated by an unsigned integer comparison.
-        min: u64,
-        /// The maximum value that the bitslice can take
-        /// (inclusive). The range is unsigned: the specified bits of
-        /// the actual value will be less than or equal to this value,
-        /// as evaluated by an unsigned integer comparison.
-        max: u64,
-    },
-
-    /// A pointer to a memory type.
-    Mem {
-        /// The memory type.
-        ty: ir::MemoryType,
-        /// The minimum offset into the memory type, inclusive.
-        min_offset: u64,
-        /// The maximum offset into the memory type, inclusive.
-        max_offset: u64,
-    },
-
-    /// A "conflict fact": this fact results from merging two other
-    /// facts, and it can never be satisfied -- checking any value
-    /// against this fact will fail.
-    Conflict,
-}
-
-impl fmt::Display for Fact {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Fact::Range {
-                bit_width,
-                min,
-                max,
-            } => write!(f, "range({}, {:#x}, {:#x})", bit_width, min, max),
-            Fact::Mem {
-                ty,
-                min_offset,
-                max_offset,
-            } => write!(f, "mem({}, {:#x}, {:#x})", ty, min_offset, max_offset),
-            Fact::Conflict => write!(f, "conflict"),
-        }
-    }
-}
-
-impl Fact {
-    /// Create a range fact that specifies a single known constant value.
-    pub fn constant(bit_width: u16, value: u64) -> Self {
-        debug_assert!(value <= max_value_for_width(bit_width));
-        // `min` and `max` are inclusive, so this specifies a range of
-        // exactly one value.
-        Fact::Range {
-            bit_width,
-            min: value,
-            max: value,
-        }
-    }
-
-    /// Create a range fact that specifies the maximum range for a
-    /// value of the given bit-width.
-    pub const fn max_range_for_width(bit_width: u16) -> Self {
-        match bit_width {
-            bit_width if bit_width < 64 => Fact::Range {
-                bit_width,
-                min: 0,
-                max: (1u64 << bit_width) - 1,
-            },
-            64 => Fact::Range {
-                bit_width: 64,
-                min: 0,
-                max: u64::MAX,
-            },
-            _ => panic!("bit width too large!"),
-        }
-    }
-
-    /// Create a range fact that specifies the maximum range for a
-    /// value of the given bit-width, zero-extended into a wider
-    /// width.
-    pub const fn max_range_for_width_extended(from_width: u16, to_width: u16) -> Self {
-        debug_assert!(from_width <= to_width);
-        match from_width {
-            from_width if from_width < 64 => Fact::Range {
-                bit_width: to_width,
-                min: 0,
-                max: (1u64 << from_width) - 1,
-            },
-            64 => Fact::Range {
-                bit_width: to_width,
-                min: 0,
-                max: u64::MAX,
-            },
-            _ => panic!("bit width too large!"),
-        }
-    }
-
-    /// Try to infer a minimal fact for a value of the given IR type.
-    pub fn infer_from_type(ty: ir::Type) -> Option<&'static Self> {
-        static FACTS: [Fact; 4] = [
-            Fact::max_range_for_width(8),
-            Fact::max_range_for_width(16),
-            Fact::max_range_for_width(32),
-            Fact::max_range_for_width(64),
-        ];
-        match ty {
-            I8 => Some(&FACTS[0]),
-            I16 => Some(&FACTS[1]),
-            I32 => Some(&FACTS[2]),
-            I64 => Some(&FACTS[3]),
-            _ => None,
-        }
-    }
-
-    /// Does this fact "propagate" automatically, i.e., cause
-    /// instructions that process it to infer their own output facts?
-    /// Not all facts propagate automatically; otherwise, verification
-    /// would be much slower.
-    pub fn propagates(&self) -> bool {
-        match self {
-            Fact::Mem { .. } => true,
-            _ => false,
-        }
-    }
-
-    /// Is this a constant value of the given bitwidth? Return it as a
-    /// `Some(value)` if so.
-    pub fn as_const(&self, bits: u16) -> Option<u64> {
-        match self {
-            Fact::Range {
-                bit_width,
-                min,
-                max,
-            } if *bit_width == bits && min == max => Some(*min),
-            _ => None,
-        }
-    }
-
-    /// Merge two facts. We take the *intersection*: that is, we know
-    /// both facts to be true, so we can intersect ranges. (This
-    /// differs from the usual static analysis approach, where we are
-    /// merging multiple possibilities into a generalized / widened
-    /// fact. We want to narrow here.)
-    pub fn intersect(a: &Fact, b: &Fact) -> Fact {
-        match (a, b) {
-            (
-                Fact::Range {
-                    bit_width: bw_lhs,
-                    min: min_lhs,
-                    max: max_lhs,
-                },
-                Fact::Range {
-                    bit_width: bw_rhs,
-                    min: min_rhs,
-                    max: max_rhs,
-                },
-            ) if bw_lhs == bw_rhs && max_lhs >= min_rhs && max_rhs >= min_lhs => Fact::Range {
-                bit_width: *bw_lhs,
-                min: std::cmp::max(*min_lhs, *min_rhs),
-                max: std::cmp::min(*max_lhs, *max_rhs),
-            },
-
-            (
-                Fact::Mem {
-                    ty: ty_lhs,
-                    min_offset: min_offset_lhs,
-                    max_offset: max_offset_lhs,
-                },
-                Fact::Mem {
-                    ty: ty_rhs,
-                    min_offset: min_offset_rhs,
-                    max_offset: max_offset_rhs,
-                },
-            ) if ty_lhs == ty_rhs
-                && max_offset_lhs >= min_offset_rhs
-                && max_offset_rhs >= min_offset_lhs =>
-            {
-                Fact::Mem {
-                    ty: *ty_lhs,
-                    min_offset: std::cmp::max(*min_offset_lhs, *min_offset_rhs),
-                    max_offset: std::cmp::min(*max_offset_lhs, *max_offset_rhs),
-                }
-            }
-
-            _ => Fact::Conflict,
-        }
-    }
-}
-
-macro_rules! ensure {
-    ( $condition:expr, $err:tt $(,)? ) => {
-        if !$condition {
-            return Err(PccError::$err);
-        }
-    };
-}
-
-macro_rules! bail {
-    ( $err:tt ) => {{
-        return Err(PccError::$err);
-    }};
-}
-
-/// A "context" in which we can evaluate and derive facts. This
-/// context carries environment/global properties, such as the machine
-/// pointer width.
-pub struct FactContext<'a> {
-    function: &'a ir::Function,
-    pointer_width: u16,
-}
-
-impl<'a> FactContext<'a> {
-    /// Create a new "fact context" in which to evaluate facts.
-    pub fn new(function: &'a ir::Function, pointer_width: u16) -> Self {
-        FactContext {
-            function,
-            pointer_width,
-        }
-    }
-
-    /// Computes whether `lhs` "subsumes" (implies) `rhs`.
-    pub fn subsumes(&self, lhs: &Fact, rhs: &Fact) -> bool {
-        match (lhs, rhs) {
-            // Reflexivity.
-            (l, r) if l == r => true,
-
-            (
-                Fact::Range {
-                    bit_width: bw_lhs,
-                    min: min_lhs,
-                    max: max_lhs,
-                },
-                Fact::Range {
-                    bit_width: bw_rhs,
-                    min: min_rhs,
-                    max: max_rhs,
-                },
-            ) => {
-                // If the bitwidths we're claiming facts about are the
-                // same, or the left-hand-side makes a claim about a
-                // wider bitwidth, and if the right-hand-side range is
-                // larger than the left-hand-side range, than the LHS
-                // subsumes the RHS.
-                //
-                // In other words, we can always expand the claimed
-                // possible value range.
-                bw_lhs >= bw_rhs && max_lhs <= max_rhs && min_lhs >= min_rhs
-            }
-
-            (
-                Fact::Mem {
-                    ty: ty_lhs,
-                    min_offset: min_offset_lhs,
-                    max_offset: max_offset_lhs,
-                },
-                Fact::Mem {
-                    ty: ty_rhs,
-                    min_offset: min_offset_rhs,
-                    max_offset: max_offset_rhs,
-                },
-            ) => {
-                ty_lhs == ty_rhs
-                    && max_offset_lhs <= max_offset_rhs
-                    && min_offset_lhs >= min_offset_rhs
-            }
-
-            _ => false,
-        }
-    }
-
-    /// Computes whether the optional fact `lhs` subsumes (implies)
-    /// the optional fact `lhs`. A `None` never subsumes any fact, and
-    /// is always subsumed by any fact at all (or no fact).
-    pub fn subsumes_fact_optionals(&self, lhs: Option<&Fact>, rhs: Option<&Fact>) -> bool {
-        match (lhs, rhs) {
-            (None, None) => true,
-            (Some(_), None) => true,
-            (None, Some(_)) => false,
-            (Some(lhs), Some(rhs)) => self.subsumes(lhs, rhs),
-        }
-    }
-
-    /// Computes whatever fact can be known about the sum of two
-    /// values with attached facts. The add is performed to the given
-    /// bit-width. Note that this is distinct from the machine or
-    /// pointer width: e.g., many 64-bit machines can still do 32-bit
-    /// adds that wrap at 2^32.
-    pub fn add(&self, lhs: &Fact, rhs: &Fact, add_width: u16) -> Option<Fact> {
-        match (lhs, rhs) {
-            (
-                Fact::Range {
-                    bit_width: bw_lhs,
-                    min: min_lhs,
-                    max: max_lhs,
-                },
-                Fact::Range {
-                    bit_width: bw_rhs,
-                    min: min_rhs,
-                    max: max_rhs,
-                },
-            ) if bw_lhs == bw_rhs && add_width >= *bw_lhs => {
-                let computed_min = min_lhs.checked_add(*min_rhs)?;
-                let computed_max = max_lhs.checked_add(*max_rhs)?;
-                let computed_max = std::cmp::min(max_value_for_width(add_width), computed_max);
-                Some(Fact::Range {
-                    bit_width: *bw_lhs,
-                    min: computed_min,
-                    max: computed_max,
-                })
-            }
-
-            (
-                Fact::Range {
-                    bit_width: bw_max,
-                    min,
-                    max,
-                },
-                Fact::Mem {
-                    ty,
-                    min_offset,
-                    max_offset,
-                },
-            )
-            | (
-                Fact::Mem {
-                    ty,
-                    min_offset,
-                    max_offset,
-                },
-                Fact::Range {
-                    bit_width: bw_max,
-                    min,
-                    max,
-                },
-            ) if *bw_max >= self.pointer_width && add_width >= *bw_max => {
-                let min_offset = min_offset.checked_add(*min)?;
-                let max_offset = max_offset.checked_add(*max)?;
-                Some(Fact::Mem {
-                    ty: *ty,
-                    min_offset,
-                    max_offset,
-                })
-            }
-
-            _ => None,
-        }
-    }
-
-    /// Computes the `uextend` of a value with the given facts.
-    pub fn uextend(&self, fact: &Fact, from_width: u16, to_width: u16) -> Option<Fact> {
-        trace!(
-            "uextend: fact {:?} from {} to {}",
-            fact,
-            from_width,
-            to_width
-        );
-        if from_width == to_width {
-            return Some(fact.clone());
-        }
-
-        match fact {
-            // If the claim is already for a same-or-wider value and the min
-            // and max are within range of the narrower value, we can
-            // claim the same range.
-            Fact::Range {
-                bit_width,
-                min,
-                max,
-            } if *bit_width >= from_width
-                && *min <= max_value_for_width(from_width)
-                && *max <= max_value_for_width(from_width) =>
-            {
-                Some(Fact::Range {
-                    bit_width: to_width,
-                    min: *min,
-                    max: *max,
-                })
-            }
-            // Otherwise, we can at least claim that the value is
-            // within the range of `from_width`.
-            Fact::Range { .. } => Some(Fact::max_range_for_width_extended(from_width, to_width)),
-
-            _ => None,
-        }
-    }
-
-    /// Computes the `sextend` of a value with the given facts.
-    pub fn sextend(&self, fact: &Fact, from_width: u16, to_width: u16) -> Option<Fact> {
-        match fact {
-            // If we have a defined value in bits 0..bit_width, and
-            // the MSB w.r.t. `from_width` is *not* set, then we can
-            // do the same as `uextend`.
-            Fact::Range {
-                bit_width,
-                // We can ignore `min`: it is always <= max in
-                // unsigned terms, and we check max's LSB below.
-                min: _,
-                max,
-            } if *bit_width == from_width && (*max & (1 << (*bit_width - 1)) == 0) => {
-                self.uextend(fact, from_width, to_width)
-            }
-            _ => None,
-        }
-    }
-
-    /// Computes the bit-truncation of a value with the given fact.
-    pub fn truncate(&self, fact: &Fact, from_width: u16, to_width: u16) -> Option<Fact> {
-        if from_width == to_width {
-            return Some(fact.clone());
-        }
-
-        trace!(
-            "truncate: fact {:?} from {} to {}",
-            fact,
-            from_width,
-            to_width
-        );
-
-        match fact {
-            Fact::Range {
-                bit_width,
-                min,
-                max,
-            } if *bit_width == from_width => {
-                let max_val = (1u64 << to_width) - 1;
-                if *min <= max_val && *max <= max_val {
-                    Some(Fact::Range {
-                        bit_width: to_width,
-                        min: *min,
-                        max: *max,
-                    })
-                } else {
-                    Some(Fact::Range {
-                        bit_width: to_width,
-                        min: 0,
-                        max: max_val,
-                    })
-                }
-            }
-            _ => None,
-        }
-    }
-
-    /// Scales a value with a fact by a known constant.
-    pub fn scale(&self, fact: &Fact, width: u16, factor: u32) -> Option<Fact> {
-        match fact {
-            Fact::Range {
-                bit_width,
-                min,
-                max,
-            } if *bit_width == width => {
-                let min = min.checked_mul(u64::from(factor))?;
-                let max = max.checked_mul(u64::from(factor))?;
-                if *bit_width < 64 && max > max_value_for_width(width) {
-                    return None;
-                }
-                Some(Fact::Range {
-                    bit_width: *bit_width,
-                    min,
-                    max,
-                })
-            }
-            _ => None,
-        }
-    }
-
-    /// Left-shifts a value with a fact by a known constant.
-    pub fn shl(&self, fact: &Fact, width: u16, amount: u16) -> Option<Fact> {
-        if amount >= 32 {
-            return None;
-        }
-        let factor: u32 = 1 << amount;
-        self.scale(fact, width, factor)
-    }
-
-    /// Offsets a value with a fact by a known amount.
-    pub fn offset(&self, fact: &Fact, width: u16, offset: i64) -> Option<Fact> {
-        trace!(
-            "FactContext::offset: {:?} + {} in width {}",
-            fact,
-            offset,
-            width
-        );
-
-        let compute_offset = |base: u64| -> Option<u64> {
-            if offset >= 0 {
-                base.checked_add(u64::try_from(offset).unwrap())
-            } else {
-                base.checked_sub(u64::try_from(-offset).unwrap())
-            }
-        };
-
-        match fact {
-            Fact::Range {
-                bit_width,
-                min,
-                max,
-            } if *bit_width == width => {
-                let min = compute_offset(*min)?;
-                let max = compute_offset(*max)?;
-
-                Some(Fact::Range {
-                    bit_width: *bit_width,
-                    min,
-                    max,
-                })
-            }
-            Fact::Mem {
-                ty,
-                min_offset: mem_min_offset,
-                max_offset: mem_max_offset,
-            } => {
-                let min_offset = compute_offset(*mem_min_offset)?;
-                let max_offset = compute_offset(*mem_max_offset)?;
-                Some(Fact::Mem {
-                    ty: *ty,
-                    min_offset,
-                    max_offset,
-                })
-            }
-            _ => None,
-        }
-    }
-
-    /// Check that accessing memory via a pointer with this fact, with
-    /// a memory access of the given size, is valid.
-    ///
-    /// If valid, returns the memory type and offset into that type
-    /// that this address accesses, if known, or `None` if the range
-    /// doesn't constrain the access to exactly one location.
-    fn check_address(&self, fact: &Fact, size: u32) -> PccResult<Option<(ir::MemoryType, u64)>> {
-        trace!("check_address: fact {:?} size {}", fact, size);
-        match fact {
-            Fact::Mem {
-                ty,
-                min_offset,
-                max_offset,
-            } => {
-                let end_offset: u64 = max_offset
-                    .checked_add(u64::from(size))
-                    .ok_or(PccError::Overflow)?;
-                match &self.function.memory_types[*ty] {
-                    ir::MemoryTypeData::Struct { size, .. }
-                    | ir::MemoryTypeData::Memory { size } => {
-                        ensure!(end_offset <= *size, OutOfBounds)
-                    }
-                    ir::MemoryTypeData::Empty => bail!(OutOfBounds),
-                }
-                let specific_ty_and_offset = if min_offset == max_offset {
-                    Some((*ty, *min_offset))
-                } else {
-                    None
-                };
-                Ok(specific_ty_and_offset)
-            }
-            _ => bail!(OutOfBounds),
-        }
-    }
-
-    /// Get the access struct field, if any, by a pointer with the
-    /// given fact and an access of the given type.
-    pub fn struct_field<'b>(
-        &'b self,
-        fact: &Fact,
-        access_ty: ir::Type,
-    ) -> PccResult<Option<&'b ir::MemoryTypeField>> {
-        let (ty, offset) = match self.check_address(fact, access_ty.bytes())? {
-            Some((ty, offset)) => (ty, offset),
-            None => return Ok(None),
-        };
-
-        if let ir::MemoryTypeData::Struct { fields, .. } = &self.function.memory_types[ty] {
-            let field = fields
-                .iter()
-                .find(|field| field.offset == offset)
-                .ok_or(PccError::InvalidFieldOffset)?;
-            if field.ty != access_ty {
-                bail!(BadFieldType);
-            }
-            Ok(Some(field))
-        } else {
-            // Access to valid memory, but not a struct: no facts can be attached to the result.
-            Ok(None)
-        }
-    }
-
-    /// Check a load, and determine what fact, if any, the result of the load might have.
-    pub fn load<'b>(&'b self, fact: &Fact, access_ty: ir::Type) -> PccResult<Option<&'b Fact>> {
-        Ok(self
-            .struct_field(fact, access_ty)?
-            .and_then(|field| field.fact()))
-    }
-
-    /// Check a store.
-    pub fn store(
-        &self,
-        fact: &Fact,
-        access_ty: ir::Type,
-        data_fact: Option<&Fact>,
-    ) -> PccResult<()> {
-        if let Some(field) = self.struct_field(fact, access_ty)? {
-            // If it's a read-only field, disallow.
-            if field.readonly {
-                bail!(WriteToReadOnlyField);
-            }
-            // Check that the fact on the stored data subsumes the field's fact.
-            if !self.subsumes_fact_optionals(data_fact, field.fact()) {
-                bail!(InvalidStoredFact);
-            }
-        }
-        Ok(())
-    }
-}
-
-fn max_value_for_width(bits: u16) -> u64 {
-    assert!(bits <= 64);
-    if bits == 64 {
-        u64::MAX
-    } else {
-        (1u64 << bits) - 1
-    }
-}
-
-/// Top-level entry point after compilation: this checks the facts in
-/// VCode.
-pub fn check_vcode_facts<B: LowerBackend + TargetIsa>(
-    f: &ir::Function,
-    vcode: &mut VCode<B::MInst>,
-    backend: &B,
-) -> PccResult<()> {
-    let ctx = FactContext::new(f, backend.triple().pointer_width().unwrap().bits().into());
-
-    // Check that individual instructions are valid according to input
-    // facts, and support the stated output facts.
-    for block in 0..vcode.num_blocks() {
-        let block = BlockIndex::new(block);
-        for inst in vcode.block_insns(block).iter() {
-            // Check any output facts on this inst.
-            if let Err(e) = backend.check_fact(&ctx, vcode, inst) {
-                log::error!("Error checking instruction: {:?}", vcode[inst]);
-                return Err(e);
-            }
-
-            // If this is a branch, check that all block arguments subsume
-            // the assumed facts on the blockparams of successors.
-            if vcode.is_branch(inst) {
-                for (succ_idx, succ) in vcode.block_succs(block).iter().enumerate() {
-                    for (arg, param) in vcode
-                        .branch_blockparams(block, inst, succ_idx)
-                        .iter()
-                        .zip(vcode.block_params(*succ).iter())
-                    {
-                        let arg_fact = vcode.vreg_fact(*arg);
-                        let param_fact = vcode.vreg_fact(*param);
-                        if !ctx.subsumes_fact_optionals(arg_fact, param_fact) {
-                            return Err(PccError::UnsupportedBlockparam);
-                        }
-                    }
-                }
-            }
-        }
-    }
-    Ok(())
-}
diff --git a/cranelift/codegen/src/isa/aarch64/abi.rs b/cranelift/codegen/src/isa/aarch64/abi.rs
index b5d6e56fcd9f..bcf865d2603f 100644
--- a/cranelift/codegen/src/isa/aarch64/abi.rs
+++ b/cranelift/codegen/src/isa/aarch64/abi.rs
@@ -1148,14 +1148,10 @@ impl ABIMachineSpec for AArch64MachineDeps {
     }
 
     fn get_ext_mode(
-        call_conv: isa::CallConv,
-        specified: ir::ArgumentExtension,
+        _call_conv: isa::CallConv,
+        _specified: ir::ArgumentExtension,
     ) -> ir::ArgumentExtension {
-        if call_conv == isa::CallConv::AppleAarch64 {
-            specified
-        } else {
-            ir::ArgumentExtension::None
-        }
+        ir::ArgumentExtension::None
     }
 
     fn compute_frame_layout(
diff --git a/cranelift/codegen/src/isa/aarch64/inst.isle b/cranelift/codegen/src/isa/aarch64/inst.isle
index 90c0911185c5..624a5c9d987b 100644
--- a/cranelift/codegen/src/isa/aarch64/inst.isle
+++ b/cranelift/codegen/src/isa/aarch64/inst.isle
@@ -883,8 +883,7 @@
 
        ;; Jump-table sequence, as one compound instruction (see note in lower_inst.rs for rationale).
        (JTSequence
-        (default MachLabel)
-        (targets BoxVecMachLabel)
+        (info BoxJTSequenceInfo)
         (ridx Reg)
         (rtmp1 WritableReg)
         (rtmp2 WritableReg))
@@ -947,9 +946,8 @@
 
        ;; A call to the `ElfTlsGetAddr` libcall. Returns address of TLS symbol in x0.
        (ElfTlsGetAddr
-        (symbol BoxExternalName)
-        (rd WritableReg)
-        (tmp WritableReg))
+        (symbol ExternalName)
+        (rd WritableReg))
 
        (MachOTlsGetAddr
         (symbol ExternalName)
@@ -1719,13 +1717,18 @@
 (decl u64_into_imm_logic (Type u64) ImmLogic)
 (extern constructor u64_into_imm_logic u64_into_imm_logic)
 
-(decl branch_target (MachLabel) BranchTarget)
+(decl branch_target (VecMachLabel u8) BranchTarget)
 (extern constructor branch_target branch_target)
-(convert MachLabel BranchTarget branch_target)
 
-(decl targets_jt_space (BoxVecMachLabel) CodeOffset)
+(decl targets_jt_size (VecMachLabel) u32)
+(extern constructor targets_jt_size targets_jt_size)
+
+(decl targets_jt_space (VecMachLabel) CodeOffset)
 (extern constructor targets_jt_space targets_jt_space)
 
+(decl targets_jt_info (VecMachLabel) BoxJTSequenceInfo)
+(extern constructor targets_jt_info targets_jt_info)
+
 ;; Calculate the minimum floating-point bound for a conversion to floating
 ;; point from an integer type.
 ;; Accepts whether the output is signed, the size of the input
@@ -2705,9 +2708,6 @@
 (rule (and_vec x y size) (vec_rrr (VecALUOp.And) x y size))
 
 ;; Helpers for generating `eor` instructions.
-(decl eor (Type Reg Reg) Reg)
-(rule (eor ty x y) (alu_rrr (ALUOp.Eor) ty x y))
-
 (decl eor_vec (Reg Reg VectorSize) Reg)
 (rule (eor_vec x y size) (vec_rrr (VecALUOp.Eor) x y size))
 
@@ -3312,6 +3312,17 @@
 (rule (splat_const n size)
       (vec_dup (imm $I64 (ImmExtend.Zero) n) size))
 
+;; Each of these extractors tests whether the upper half of the input equals the
+;; lower half of the input
+(decl u128_replicated_u64 (u64) u128)
+(extern extractor u128_replicated_u64 u128_replicated_u64)
+(decl u64_replicated_u32 (u64) u64)
+(extern extractor u64_replicated_u32 u64_replicated_u32)
+(decl u32_replicated_u16 (u64) u64)
+(extern extractor u32_replicated_u16 u32_replicated_u16)
+(decl u16_replicated_u8 (u64) u64)
+(extern extractor u16_replicated_u8 u16_replicated_u8)
+
 ;; Lower a FloatCC to a Cond.
 (decl fp_cond_code (FloatCC) Cond)
 ;; TODO: Port lower_fp_condcode() to ISLE.
@@ -3765,8 +3776,7 @@
 (decl elf_tls_get_addr (ExternalName) Reg)
 (rule (elf_tls_get_addr name)
       (let ((dst WritableReg (temp_writable_reg $I64))
-            (tmp WritableReg (temp_writable_reg $I64))
-            (_ Unit (emit (MInst.ElfTlsGetAddr (box_external_name name) dst tmp))))
+            (_ Unit (emit (MInst.ElfTlsGetAddr name dst))))
         dst))
 
 (decl macho_tls_get_addr (ExternalName) Reg)
@@ -4066,12 +4076,12 @@
 ;; PC-rel offset to the jumptable would be incorrect.
 ;; (The alternative is to introduce a relocation pass
 ;; for inlined jumptables, which is much worse, IMHO.)
-(decl jt_sequence (Reg MachLabel BoxVecMachLabel) ConsumesFlags)
-(rule (jt_sequence ridx default targets)
+(decl jt_sequence (Reg BoxJTSequenceInfo) ConsumesFlags)
+(rule (jt_sequence ridx info)
       (let ((rtmp1 WritableReg (temp_writable_reg $I64))
             (rtmp2 WritableReg (temp_writable_reg $I64)))
        (ConsumesFlags.ConsumesFlagsSideEffect
-        (MInst.JTSequence default targets ridx rtmp1 rtmp2))))
+        (MInst.JTSequence info ridx rtmp1 rtmp2))))
 
 ;; Helper for emitting `MInst.CondBr` instructions.
 (decl cond_br (BranchTarget BranchTarget CondBrKind) ConsumesFlags)
@@ -4092,16 +4102,18 @@
        (MInst.EmitIsland needed_space)))
 
 ;; Helper for emitting `br_table` sequences.
-(decl br_table_impl (u64 Reg MachLabel BoxVecMachLabel) Unit)
-(rule (br_table_impl (imm12_from_u64 jt_size) ridx default targets)
-      (emit_side_effect (with_flags_side_effect
-           (cmp_imm (OperandSize.Size32) ridx jt_size)
-           (jt_sequence ridx default targets))))
-(rule -1 (br_table_impl jt_size ridx default targets)
-      (let ((jt_size Reg (imm $I64 (ImmExtend.Zero) jt_size)))
+(decl br_table_impl (u64 Reg VecMachLabel) Unit)
+(rule (br_table_impl (imm12_from_u64 jt_size) ridx targets)
+      (let ((jt_info BoxJTSequenceInfo (targets_jt_info targets)))
+       (emit_side_effect (with_flags_side_effect
+            (cmp_imm (OperandSize.Size32) ridx jt_size)
+            (jt_sequence ridx jt_info)))))
+(rule -1 (br_table_impl jt_size ridx targets)
+      (let ((jt_size Reg (imm $I64 (ImmExtend.Zero) jt_size))
+            (jt_info BoxJTSequenceInfo (targets_jt_info targets)))
        (emit_side_effect (with_flags_side_effect
             (cmp (OperandSize.Size32) ridx jt_size)
-            (jt_sequence ridx default targets)))))
+            (jt_sequence ridx jt_info)))))
 
 ;; Helper for emitting the `uzp1` instruction
 (decl vec_uzp1 (Reg Reg VectorSize) Reg)
diff --git a/cranelift/codegen/src/isa/aarch64/inst/args.rs b/cranelift/codegen/src/isa/aarch64/inst/args.rs
index c6394e6596f3..cf1d6d05a671 100644
--- a/cranelift/codegen/src/isa/aarch64/inst/args.rs
+++ b/cranelift/codegen/src/isa/aarch64/inst/args.rs
@@ -11,7 +11,7 @@ use std::string::String;
 // Instruction sub-components: shift and extend descriptors
 
 /// A shift operator for a register or immediate.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug)]
 #[repr(u8)]
 pub enum ShiftOp {
     /// Logical shift left.
@@ -580,14 +580,6 @@ impl OperandSize {
             OperandSize::Size64 => 1,
         }
     }
-
-    /// The maximum unsigned value representable in a value of this size.
-    pub fn max_value(&self) -> u64 {
-        match self {
-            OperandSize::Size32 => u32::MAX as u64,
-            OperandSize::Size64 => u64::MAX,
-        }
-    }
 }
 
 /// Type used to communicate the size of a scalar SIMD & FP operand.
@@ -647,17 +639,6 @@ impl ScalarSize {
             ScalarSize::Size128 => ScalarSize::Size64,
         }
     }
-
-    /// Return a type with the same size as this scalar.
-    pub fn ty(&self) -> Type {
-        match self {
-            ScalarSize::Size8 => I8,
-            ScalarSize::Size16 => I16,
-            ScalarSize::Size32 => I32,
-            ScalarSize::Size64 => I64,
-            ScalarSize::Size128 => I128,
-        }
-    }
 }
 
 /// Type used to communicate the size of a vector operand.
diff --git a/cranelift/codegen/src/isa/aarch64/inst/emit.rs b/cranelift/codegen/src/isa/aarch64/inst/emit.rs
index 39a49dfdd275..43bdd4a3e981 100644
--- a/cranelift/codegen/src/isa/aarch64/inst/emit.rs
+++ b/cranelift/codegen/src/isa/aarch64/inst/emit.rs
@@ -4,7 +4,7 @@ use cranelift_control::ControlPlane;
 use regalloc2::Allocation;
 
 use crate::binemit::{Reloc, StackMap};
-use crate::ir::{self, types::*, MemFlags, RelSourceLoc, TrapCode};
+use crate::ir::{self, types::*, LibCall, MemFlags, RelSourceLoc, TrapCode};
 use crate::isa::aarch64::inst::*;
 use crate::machinst::{ty_bits, Reg, RegClass, Writable};
 use crate::trace;
@@ -3275,8 +3275,7 @@ impl MachInstEmit for Inst {
                 ridx,
                 rtmp1,
                 rtmp2,
-                default,
-                ref targets,
+                ref info,
                 ..
             } => {
                 let ridx = allocs.next(ridx);
@@ -3288,7 +3287,7 @@ impl MachInstEmit for Inst {
 
                 // Branch to default when condition code from prior comparison indicates.
                 let br = enc_conditional_br(
-                    BranchTarget::Label(default),
+                    info.default_target,
                     CondBrKind::Cond(Cond::Hs),
                     &mut AllocationConsumer::default(),
                 );
@@ -3297,7 +3296,9 @@ impl MachInstEmit for Inst {
                 // will not be merged with any other branch, flipped, or elided (it is not preceded
                 // or succeeded by any other branch). Just emit it with the label use.
                 let default_br_offset = sink.cur_offset();
-                sink.use_label_at_offset(default_br_offset, default, LabelUse::Branch19);
+                if let BranchTarget::Label(l) = info.default_target {
+                    sink.use_label_at_offset(default_br_offset, l, LabelUse::Branch19);
+                }
                 sink.put4(br);
 
                 // Overwrite the index with a zero when the above
@@ -3346,14 +3347,18 @@ impl MachInstEmit for Inst {
                 inst.emit(&[], sink, emit_info, state);
                 // Emit jump table (table of 32-bit offsets).
                 let jt_off = sink.cur_offset();
-                for &target in targets.iter() {
+                for &target in info.targets.iter() {
                     let word_off = sink.cur_offset();
                     // off_into_table is an addend here embedded in the label to be later patched
                     // at the end of codegen. The offset is initially relative to this jump table
                     // entry; with the extra addend, it'll be relative to the jump table's start,
                     // after patching.
                     let off_into_table = word_off - jt_off;
-                    sink.use_label_at_offset(word_off, target, LabelUse::PCRel32);
+                    sink.use_label_at_offset(
+                        word_off,
+                        target.as_label().unwrap(),
+                        LabelUse::PCRel32,
+                    );
                     sink.put4(off_into_table);
                 }
 
@@ -3537,81 +3542,32 @@ impl MachInstEmit for Inst {
                 }
             }
 
-            &Inst::ElfTlsGetAddr {
-                ref symbol,
-                rd,
-                tmp,
-            } => {
+            &Inst::ElfTlsGetAddr { ref symbol, rd } => {
                 let rd = allocs.next_writable(rd);
-                let tmp = allocs.next_writable(tmp);
                 assert_eq!(xreg(0), rd.to_reg());
 
-                // See the original proposal for TLSDESC.
-                // http://www.fsfla.org/~lxoliva/writeups/TLS/paper-lk2006.pdf
-                //
-                // Implement the TLSDESC instruction sequence:
-                //   adrp x0, :tlsdesc:tlsvar
-                //   ldr  tmp, [x0, :tlsdesc_lo12:tlsvar]
-                //   add  x0, x0, :tlsdesc_lo12:tlsvar
-                //   blr  tmp
-                //   mrs  tmp, tpidr_el0
-                //   add  x0, x0, tmp
-                //
                 // This is the instruction sequence that GCC emits for ELF GD TLS Relocations in aarch64
-                // See: https://gcc.godbolt.org/z/e4j7MdErh
-
-                // adrp x0, :tlsdesc:tlsvar
-                sink.add_reloc(Reloc::Aarch64TlsDescAdrPage21, &**symbol, 0);
-                Inst::Adrp { rd, off: 0 }.emit(&[], sink, emit_info, state);
-
-                // ldr  tmp, [x0, :tlsdesc_lo12:tlsvar]
-                sink.add_reloc(Reloc::Aarch64TlsDescLd64Lo12, &**symbol, 0);
-                Inst::ULoad64 {
-                    rd: tmp,
-                    mem: AMode::reg(rd.to_reg()),
-                    flags: MemFlags::trusted(),
-                }
-                .emit(&[], sink, emit_info, state);
+                // See: https://gcc.godbolt.org/z/KhMh5Gvra
 
-                // add x0, x0, :tlsdesc_lo12:tlsvar
-                sink.add_reloc(Reloc::Aarch64TlsDescAddLo12, &**symbol, 0);
-                Inst::AluRRImm12 {
-                    alu_op: ALUOp::Add,
-                    size: OperandSize::Size64,
-                    rd,
-                    rn: rd.to_reg(),
-                    imm12: Imm12::maybe_from_u64(0).unwrap(),
-                }
-                .emit(&[], sink, emit_info, state);
+                // adrp x0, <label>
+                sink.add_reloc(Reloc::Aarch64TlsGdAdrPage21, symbol, 0);
+                let inst = Inst::Adrp { rd, off: 0 };
+                inst.emit(&[], sink, emit_info, state);
 
-                // blr tmp
-                sink.add_reloc(Reloc::Aarch64TlsDescCall, &**symbol, 0);
-                Inst::CallInd {
-                    info: crate::isa::Box::new(CallIndInfo {
-                        rn: tmp.to_reg(),
-                        uses: smallvec![],
-                        defs: smallvec![],
-                        clobbers: PRegSet::empty(),
-                        opcode: Opcode::CallIndirect,
-                        caller_callconv: CallConv::SystemV,
-                        callee_callconv: CallConv::SystemV,
-                        callee_pop_size: 0,
-                    }),
-                }
-                .emit(&[], sink, emit_info, state);
+                // add x0, x0, <label>
+                sink.add_reloc(Reloc::Aarch64TlsGdAddLo12Nc, symbol, 0);
+                sink.put4(0x91000000);
 
-                // mrs tmp, tpidr_el0
-                sink.put4(0xd53bd040 | machreg_to_gpr(tmp.to_reg()));
+                // bl __tls_get_addr
+                sink.add_reloc(
+                    Reloc::Arm64Call,
+                    &ExternalName::LibCall(LibCall::ElfTlsGetAddr),
+                    0,
+                );
+                sink.put4(0x94000000);
 
-                // add x0, x0, tmp
-                Inst::AluRRR {
-                    alu_op: ALUOp::Add,
-                    size: OperandSize::Size64,
-                    rd,
-                    rn: rd.to_reg(),
-                    rm: tmp.to_reg(),
-                }
-                .emit(&[], sink, emit_info, state);
+                // nop
+                sink.put4(0xd503201f);
             }
 
             &Inst::MachOTlsGetAddr { ref symbol, rd } => {
diff --git a/cranelift/codegen/src/isa/aarch64/inst/imms.rs b/cranelift/codegen/src/isa/aarch64/inst/imms.rs
index 197c87aa18ee..7617d1be3258 100644
--- a/cranelift/codegen/src/isa/aarch64/inst/imms.rs
+++ b/cranelift/codegen/src/isa/aarch64/inst/imms.rs
@@ -307,16 +307,6 @@ impl Imm12 {
     pub fn imm_bits(&self) -> u32 {
         self.bits as u32
     }
-
-    /// Get the actual value that this immediate corresponds to.
-    pub fn value(&self) -> u32 {
-        let base = self.bits as u32;
-        if self.shift12 {
-            base << 12
-        } else {
-            base
-        }
-    }
 }
 
 /// An immediate for logical instructions.
diff --git a/cranelift/codegen/src/isa/aarch64/inst/mod.rs b/cranelift/codegen/src/isa/aarch64/inst/mod.rs
index ed2f0c63da2e..891401e0b1ff 100644
--- a/cranelift/codegen/src/isa/aarch64/inst/mod.rs
+++ b/cranelift/codegen/src/isa/aarch64/inst/mod.rs
@@ -140,6 +140,16 @@ pub struct ReturnCallInfo {
     pub key: Option<APIKey>,
 }
 
+/// Additional information for JTSequence instructions, left out of line to lower the size of the Inst
+/// enum.
+#[derive(Clone, Debug)]
+pub struct JTSequenceInfo {
+    /// Possible branch targets.
+    pub targets: Vec<BranchTarget>,
+    /// Default branch target.
+    pub default_target: BranchTarget,
+}
+
 fn count_zero_half_words(mut value: u64, num_half_words: u8) -> usize {
     let mut count = 0;
     for _ in 0..num_half_words {
@@ -939,15 +949,11 @@ fn aarch64_get_operands<F: Fn(VReg) -> VReg>(inst: &Inst, collector: &mut Operan
         &Inst::Bti { .. } => {}
         &Inst::VirtualSPOffsetAdj { .. } => {}
 
-        &Inst::ElfTlsGetAddr { rd, tmp, .. } => {
-            // TLSDESC has a very neat calling convention. It is required to preserve
-            // all registers except x0 and x30. X30 is non allocatable in cranelift since
-            // its the link register.
-            //
-            // Additionally we need a second register as a temporary register for the
-            // TLSDESC sequence. This register can be any register other than x0 (and x30).
+        &Inst::ElfTlsGetAddr { rd, .. } => {
             collector.reg_fixed_def(rd, regs::xreg(0));
-            collector.reg_early_def(tmp);
+            let mut clobbers = AArch64MachineDeps::get_regs_clobbered_by_call(CallConv::SystemV);
+            clobbers.remove(regs::xreg_preg(0));
+            collector.reg_clobbers(clobbers);
         }
         &Inst::MachOTlsGetAddr { rd, .. } => {
             collector.reg_fixed_def(rd, regs::xreg(0));
@@ -1049,34 +1055,6 @@ impl MachInst for Inst {
         }
     }
 
-    fn is_mem_access(&self) -> bool {
-        match self {
-            &Inst::ULoad8 { .. }
-            | &Inst::SLoad8 { .. }
-            | &Inst::ULoad16 { .. }
-            | &Inst::SLoad16 { .. }
-            | &Inst::ULoad32 { .. }
-            | &Inst::SLoad32 { .. }
-            | &Inst::ULoad64 { .. }
-            | &Inst::LoadP64 { .. }
-            | &Inst::FpuLoad32 { .. }
-            | &Inst::FpuLoad64 { .. }
-            | &Inst::FpuLoad128 { .. }
-            | &Inst::FpuLoadP64 { .. }
-            | &Inst::FpuLoadP128 { .. }
-            | &Inst::Store8 { .. }
-            | &Inst::Store16 { .. }
-            | &Inst::Store32 { .. }
-            | &Inst::Store64 { .. }
-            | &Inst::StoreP64 { .. }
-            | &Inst::FpuStore32 { .. }
-            | &Inst::FpuStore64 { .. }
-            | &Inst::FpuStore128 { .. } => true,
-            // TODO: verify this carefully
-            _ => false,
-        }
-    }
-
     fn gen_move(to_reg: Writable<Reg>, from_reg: Reg, ty: Type) -> Inst {
         let bits = ty.bits();
 
@@ -2700,8 +2678,7 @@ impl Inst {
             &Inst::Word4 { data } => format!("data.i32 {}", data),
             &Inst::Word8 { data } => format!("data.i64 {}", data),
             &Inst::JTSequence {
-                default,
-                ref targets,
+                ref info,
                 ridx,
                 rtmp1,
                 rtmp2,
@@ -2710,7 +2687,7 @@ impl Inst {
                 let ridx = pretty_print_reg(ridx, allocs);
                 let rtmp1 = pretty_print_reg(rtmp1.to_reg(), allocs);
                 let rtmp2 = pretty_print_reg(rtmp2.to_reg(), allocs);
-                let default_target = BranchTarget::Label(default).pretty_print(0, allocs);
+                let default_target = info.default_target.pretty_print(0, allocs);
                 format!(
                     concat!(
                         "b.hs {} ; ",
@@ -2733,7 +2710,7 @@ impl Inst {
                     rtmp1,
                     rtmp2,
                     rtmp1,
-                    targets
+                    info.targets
                 )
             }
             &Inst::LoadExtName {
@@ -2847,14 +2824,9 @@ impl Inst {
             }
             &Inst::EmitIsland { needed_space } => format!("emit_island {}", needed_space),
 
-            &Inst::ElfTlsGetAddr {
-                ref symbol,
-                rd,
-                tmp,
-            } => {
+            &Inst::ElfTlsGetAddr { ref symbol, rd } => {
                 let rd = pretty_print_reg(rd.to_reg(), allocs);
-                let tmp = pretty_print_reg(tmp.to_reg(), allocs);
-                format!("elf_tls_get_addr {}, {}, {}", rd, tmp, symbol.display(None))
+                format!("elf_tls_get_addr {}, {}", rd, symbol.display(None))
             }
             &Inst::MachOTlsGetAddr { ref symbol, rd } => {
                 let rd = pretty_print_reg(rd.to_reg(), allocs);
diff --git a/cranelift/codegen/src/isa/aarch64/lower.isle b/cranelift/codegen/src/isa/aarch64/lower.isle
index 4d8b29fb6fd2..80fcec000ec9 100644
--- a/cranelift/codegen/src/isa/aarch64/lower.isle
+++ b/cranelift/codegen/src/isa/aarch64/lower.isle
@@ -12,7 +12,7 @@
 ;; blocks while we lower, the fallthrough in the new order is not (necessarily)
 ;; the same as the fallthrough in CLIF. So, we use the explicitly-provided
 ;; target.
-(decl partial lower_branch (Inst MachLabelSlice) Unit)
+(decl partial lower_branch (Inst VecMachLabel) Unit)
 
 ;;;; Rules for `iconst` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -339,7 +339,7 @@
 
 ;;;; Rules for `iabs` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(rule -1 (lower (has_type ty @ (multi_lane _ _) (iabs x)))
+(rule (lower (has_type ty @ (multi_lane _ _) (iabs x)))
       (vec_abs x (vector_size ty)))
 
 (rule 2 (lower (has_type $I64 (iabs x)))
@@ -348,24 +348,6 @@
 (rule 1 (lower (has_type (fits_in_32 ty) (iabs x)))
       (abs (OperandSize.Size32) (put_in_reg_sext32 x)))
 
-; `rustc` implementation.
-; - create a bitmask of all 1s if negative, or 0s if positive.
-; - xor all bits by bitmask. then subtract bitmask from xor'd values.
-; - if `x` is positive, the xor'd bits = x and the mask = 0, so we end up with
-;   `x - 0`.
-; - if `x` is negative, the xor'd bits = ~x and the mask = -1, so we end up with
-;   `~x - (-1) = ~x + 1`, which is exactly `abs(x)`.
-(rule (lower (has_type $I128 (iabs x)))
-      (let ((x_regs ValueRegs x)
-            (x_lo Reg (value_regs_get x_regs 0))
-            (x_hi Reg (value_regs_get x_regs 1))
-            (asr_reg Reg (asr_imm $I64 x_hi (imm_shift_from_u8 63)))
-            (eor_hi Reg (eor $I64 x_hi asr_reg))
-            (eor_lo Reg (eor $I64 x_lo asr_reg))
-            (subs_lo ProducesFlags (sub_with_flags_paired $I64 eor_lo asr_reg))
-            (sbc_hi ConsumesFlags (sbc_paired $I64 eor_hi asr_reg)))
-       (with_flags subs_lo sbc_hi)))
-
 ;;;; Rules for `avg_round` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (rule (lower (has_type $I64X2 (avg_round x y)))
@@ -2847,9 +2829,11 @@
 ;;; Rules for `brif` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; `brif` following `icmp`
-(rule (lower_branch (brif (maybe_uextend (icmp cc x @ (value_type ty) y)) _ _) (two_targets taken not_taken))
+(rule (lower_branch (brif (maybe_uextend (icmp cc x @ (value_type ty) y)) _ _) targets)
       (let ((comparison FlagsAndCC (lower_icmp_into_flags cc x y ty))
-            (cond Cond (cond_code (flags_and_cc_cc comparison))))
+            (cond Cond (cond_code (flags_and_cc_cc comparison)))
+            (taken BranchTarget (branch_target targets 0))
+            (not_taken BranchTarget (branch_target targets 1)))
         (emit_side_effect
          (with_flags_side_effect (flags_and_cc_flags comparison)
                                  (cond_br taken
@@ -2857,43 +2841,49 @@
                                           (cond_br_cond cond))))))
 
 ;; `brif` following `fcmp`
-(rule (lower_branch (brif (maybe_uextend (fcmp cc x @ (value_type (ty_scalar_float ty)) y)) _ _) (two_targets taken not_taken))
-      (let ((cond Cond (fp_cond_code cc)))
+(rule (lower_branch (brif (maybe_uextend (fcmp cc x @ (value_type (ty_scalar_float ty)) y)) _ _) targets)
+      (let ((cond Cond (fp_cond_code cc))
+            (taken BranchTarget (branch_target targets 0))
+            (not_taken BranchTarget (branch_target targets 1)))
        (emit_side_effect
         (with_flags_side_effect (fpu_cmp (scalar_size ty) x y)
                                 (cond_br taken not_taken
                                  (cond_br_cond cond))))))
 
 ;; standard `brif`
-(rule -1 (lower_branch (brif c @ (value_type $I128) _ _) (two_targets taken not_taken))
+(rule -1 (lower_branch (brif c @ (value_type $I128) _ _) targets)
       (let ((flags ProducesFlags (flags_to_producesflags c))
             (c ValueRegs (put_in_regs c))
             (c_lo Reg (value_regs_get c 0))
             (c_hi Reg (value_regs_get c 1))
-            (rt Reg (orr $I64 c_lo c_hi)))
+            (rt Reg (orr $I64 c_lo c_hi))
+            (taken BranchTarget (branch_target targets 0))
+            (not_taken BranchTarget (branch_target targets 1)))
        (emit_side_effect
         (with_flags_side_effect flags
          (cond_br taken not_taken (cond_br_not_zero rt))))))
-(rule -2 (lower_branch (brif c @ (value_type ty) _ _) (two_targets taken not_taken))
+(rule -2 (lower_branch (brif c @ (value_type ty) _ _) targets)
       (if (ty_int_ref_scalar_64 ty))
       (let ((flags ProducesFlags (flags_to_producesflags c))
-            (rt Reg (put_in_reg_zext64 c)))
+            (rt Reg (put_in_reg_zext64 c))
+            (taken BranchTarget (branch_target targets 0))
+            (not_taken BranchTarget (branch_target targets 1)))
        (emit_side_effect
         (with_flags_side_effect flags
          (cond_br taken not_taken (cond_br_not_zero rt))))))
 
 ;;; Rules for `jump` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(rule (lower_branch (jump _) (single_target label))
-      (emit_side_effect (aarch64_jump label)))
+(rule (lower_branch (jump _) targets)
+      (emit_side_effect (aarch64_jump (branch_target targets 0))))
 
 ;;; Rules for `br_table` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; `targets` contains the default target with the list of branch targets
 ;; concatenated.
-(rule (lower_branch (br_table idx _) (jump_table_targets default targets))
-      (let ((jt_size u32 (jump_table_size targets))
+(rule (lower_branch (br_table idx _) targets)
+      (let ((jt_size u32 (targets_jt_size targets))
             (_ InstOutput (side_effect
                   (emit_island (targets_jt_space targets))))
             (ridx Reg (put_in_reg_zext32 idx)))
-       (br_table_impl (u32_as_u64 jt_size) ridx default targets)))
+       (br_table_impl (u32_as_u64 jt_size) ridx targets)))
diff --git a/cranelift/codegen/src/isa/aarch64/lower.rs b/cranelift/codegen/src/isa/aarch64/lower.rs
index de428e0c4f3f..02c841d1b2f9 100644
--- a/cranelift/codegen/src/isa/aarch64/lower.rs
+++ b/cranelift/codegen/src/isa/aarch64/lower.rs
@@ -8,13 +8,12 @@
 //! - Floating-point immediates (FIMM instruction).
 
 use crate::ir::condcodes::{FloatCC, IntCC};
-use crate::ir::pcc::{FactContext, PccResult};
 use crate::ir::Inst as IRInst;
 use crate::ir::{Opcode, Value};
 use crate::isa::aarch64::inst::*;
-use crate::isa::aarch64::pcc;
 use crate::isa::aarch64::AArch64Backend;
 use crate::machinst::lower::*;
+use crate::machinst::Reg;
 use crate::machinst::*;
 
 pub mod isle;
@@ -130,13 +129,4 @@ impl LowerBackend for AArch64Backend {
     fn maybe_pinned_reg(&self) -> Option<Reg> {
         Some(regs::pinned_reg())
     }
-
-    fn check_fact(
-        &self,
-        ctx: &FactContext<'_>,
-        vcode: &mut VCode<Self::MInst>,
-        inst: InsnIndex,
-    ) -> PccResult<()> {
-        pcc::check(ctx, vcode, inst)
-    }
 }
diff --git a/cranelift/codegen/src/isa/aarch64/lower/isle.rs b/cranelift/codegen/src/isa/aarch64/lower/isle.rs
index 0c3f151c4818..ffea0fc42595 100644
--- a/cranelift/codegen/src/isa/aarch64/lower/isle.rs
+++ b/cranelift/codegen/src/isa/aarch64/lower/isle.rs
@@ -10,8 +10,8 @@ use super::{
     fp_reg, lower_condcode, lower_fp_condcode, stack_reg, writable_link_reg, writable_zero_reg,
     zero_reg, ASIMDFPModImm, ASIMDMovModImm, BranchTarget, CallIndInfo, CallInfo, Cond, CondBrKind,
     ExtendOp, FPUOpRI, FPUOpRIMod, FloatCC, Imm12, ImmLogic, ImmShift, Inst as MInst, IntCC,
-    MachLabel, MemLabel, MoveWideConst, MoveWideOp, Opcode, OperandSize, Reg, SImm9, ScalarSize,
-    ShiftOpAndAmt, UImm12Scaled, UImm5, VecMisc2, VectorSize, NZCV,
+    JTSequenceInfo, MachLabel, MemLabel, MoveWideConst, MoveWideOp, Opcode, OperandSize, Reg,
+    SImm9, ScalarSize, ShiftOpAndAmt, UImm12Scaled, UImm5, VecMisc2, VectorSize, NZCV,
 };
 use crate::ir::condcodes;
 use crate::isa;
@@ -43,6 +43,7 @@ type BoxCallInfo = Box<CallInfo>;
 type BoxCallIndInfo = Box<CallIndInfo>;
 type BoxReturnCallInfo = Box<ReturnCallInfo>;
 type VecMachLabel = Vec<MachLabel>;
+type BoxJTSequenceInfo = Box<JTSequenceInfo>;
 type BoxExternalName = Box<ExternalName>;
 type VecArgPair = Vec<ArgPair>;
 
@@ -595,15 +596,32 @@ impl Context for IsleContext<'_, '_, MInst, AArch64Backend> {
         super::regs::pinned_reg().to_real_reg().unwrap().into()
     }
 
-    fn branch_target(&mut self, label: MachLabel) -> BranchTarget {
-        BranchTarget::Label(label)
+    fn branch_target(&mut self, elements: &VecMachLabel, idx: u8) -> BranchTarget {
+        BranchTarget::Label(elements[idx as usize])
     }
 
-    fn targets_jt_space(&mut self, elements: &BoxVecMachLabel) -> CodeOffset {
+    fn targets_jt_size(&mut self, elements: &VecMachLabel) -> u32 {
+        (elements.len() - 1) as u32
+    }
+
+    fn targets_jt_space(&mut self, elements: &VecMachLabel) -> CodeOffset {
         // calculate the number of bytes needed for the jumptable sequence:
         // 4 bytes per instruction, with 8 instructions base + the size of
         // the jumptable more.
-        (4 * (8 + elements.len())).try_into().unwrap()
+        4 * (8 + self.targets_jt_size(elements))
+    }
+
+    fn targets_jt_info(&mut self, elements: &VecMachLabel) -> BoxJTSequenceInfo {
+        let targets: Vec<BranchTarget> = elements
+            .iter()
+            .skip(1)
+            .map(|bix| BranchTarget::Label(*bix))
+            .collect();
+        let default_target = BranchTarget::Label(elements[0]);
+        Box::new(JTSequenceInfo {
+            targets,
+            default_target,
+        })
     }
 
     fn min_fp_value(&mut self, signed: bool, in_bits: u8, out_bits: u8) -> Reg {
@@ -797,6 +815,44 @@ impl Context for IsleContext<'_, '_, MInst, AArch64Backend> {
         }
     }
 
+    fn u128_replicated_u64(&mut self, val: u128) -> Option<u64> {
+        let low64 = val as u64 as u128;
+        if (low64 | (low64 << 64)) == val {
+            Some(low64 as u64)
+        } else {
+            None
+        }
+    }
+
+    fn u64_replicated_u32(&mut self, val: u64) -> Option<u64> {
+        let low32 = val as u32 as u64;
+        if (low32 | (low32 << 32)) == val {
+            Some(low32)
+        } else {
+            None
+        }
+    }
+
+    fn u32_replicated_u16(&mut self, val: u64) -> Option<u64> {
+        let val = val as u32;
+        let low16 = val as u16 as u32;
+        if (low16 | (low16 << 16)) == val {
+            Some(low16.into())
+        } else {
+            None
+        }
+    }
+
+    fn u16_replicated_u8(&mut self, val: u64) -> Option<u64> {
+        let val = val as u16;
+        let low8 = val as u8 as u16;
+        if (low8 | (low8 << 8)) == val {
+            Some(low8.into())
+        } else {
+            None
+        }
+    }
+
     fn shift_masked_imm(&mut self, ty: Type, imm: u64) -> u8 {
         (imm as u8) & ((ty.lane_bits() - 1) as u8)
     }
diff --git a/cranelift/codegen/src/isa/aarch64/mod.rs b/cranelift/codegen/src/isa/aarch64/mod.rs
index 59541d9d1517..ec724abbf444 100644
--- a/cranelift/codegen/src/isa/aarch64/mod.rs
+++ b/cranelift/codegen/src/isa/aarch64/mod.rs
@@ -21,7 +21,6 @@ use target_lexicon::{Aarch64Architecture, Architecture, OperatingSystem, Triple}
 mod abi;
 pub mod inst;
 mod lower;
-mod pcc;
 pub mod settings;
 
 use self::inst::EmitInfo;
diff --git a/cranelift/codegen/src/isa/aarch64/pcc.rs b/cranelift/codegen/src/isa/aarch64/pcc.rs
deleted file mode 100644
index a84604aa0810..000000000000
--- a/cranelift/codegen/src/isa/aarch64/pcc.rs
+++ /dev/null
@@ -1,468 +0,0 @@
-//! Proof-carrying code checking for AArch64 VCode.
-
-use crate::ir::pcc::*;
-use crate::ir::types::*;
-use crate::ir::MemFlags;
-use crate::ir::Type;
-use crate::isa::aarch64::inst::args::{PairAMode, ShiftOp};
-use crate::isa::aarch64::inst::Inst;
-use crate::isa::aarch64::inst::{ALUOp, MoveWideOp};
-use crate::isa::aarch64::inst::{AMode, ExtendOp};
-use crate::machinst::pcc::*;
-use crate::machinst::Reg;
-use crate::machinst::{InsnIndex, VCode};
-use crate::trace;
-
-fn extend_fact(ctx: &FactContext, value: &Fact, mode: ExtendOp) -> Option<Fact> {
-    match mode {
-        ExtendOp::UXTB => ctx.uextend(value, 8, 64),
-        ExtendOp::UXTH => ctx.uextend(value, 16, 64),
-        ExtendOp::UXTW => ctx.uextend(value, 32, 64),
-        ExtendOp::UXTX => Some(value.clone()),
-        ExtendOp::SXTB => ctx.sextend(value, 8, 64),
-        ExtendOp::SXTH => ctx.sextend(value, 16, 64),
-        ExtendOp::SXTW => ctx.sextend(value, 32, 64),
-        ExtendOp::SXTX => None,
-    }
-}
-
-pub(crate) fn check(
-    ctx: &FactContext,
-    vcode: &mut VCode<Inst>,
-    inst_idx: InsnIndex,
-) -> PccResult<()> {
-    trace!("Checking facts on inst: {:?}", vcode[inst_idx]);
-
-    match vcode[inst_idx] {
-        Inst::Args { .. } => {
-            // Defs on the args have "axiomatic facts": we trust the
-            // ABI code to pass through the values unharmed, so the
-            // facts given to us in the CLIF should still be true.
-            Ok(())
-        }
-        Inst::ULoad8 { rd, ref mem, flags } | Inst::SLoad8 { rd, ref mem, flags } => {
-            check_load(ctx, Some(rd.to_reg()), flags, mem, vcode, I8)
-        }
-        Inst::ULoad16 { rd, ref mem, flags } | Inst::SLoad16 { rd, ref mem, flags } => {
-            check_load(ctx, Some(rd.to_reg()), flags, mem, vcode, I16)
-        }
-        Inst::ULoad32 { rd, ref mem, flags } | Inst::SLoad32 { rd, ref mem, flags } => {
-            check_load(ctx, Some(rd.to_reg()), flags, mem, vcode, I32)
-        }
-        Inst::ULoad64 { rd, ref mem, flags } => {
-            check_load(ctx, Some(rd.to_reg()), flags, mem, vcode, I64)
-        }
-        Inst::FpuLoad32 { ref mem, flags, .. } => check_load(ctx, None, flags, mem, vcode, F32),
-        Inst::FpuLoad64 { ref mem, flags, .. } => check_load(ctx, None, flags, mem, vcode, F64),
-        Inst::FpuLoad128 { ref mem, flags, .. } => check_load(ctx, None, flags, mem, vcode, I8X16),
-        Inst::LoadP64 { ref mem, flags, .. } => check_load_pair(ctx, flags, mem, vcode, 16),
-        Inst::FpuLoadP64 { ref mem, flags, .. } => check_load_pair(ctx, flags, mem, vcode, 16),
-        Inst::FpuLoadP128 { ref mem, flags, .. } => check_load_pair(ctx, flags, mem, vcode, 32),
-        Inst::VecLoadReplicate {
-            rn, flags, size, ..
-        } => check_load_addr(ctx, flags, rn, vcode, size.lane_size().ty()),
-        Inst::LoadAcquire {
-            access_ty,
-            rn,
-            flags,
-            ..
-        } => check_load_addr(ctx, flags, rn, vcode, access_ty),
-
-        Inst::Store8 { rd, ref mem, flags } => check_store(ctx, Some(rd), flags, mem, vcode, I8),
-        Inst::Store16 { rd, ref mem, flags } => check_store(ctx, Some(rd), flags, mem, vcode, I16),
-        Inst::Store32 { rd, ref mem, flags } => check_store(ctx, Some(rd), flags, mem, vcode, I32),
-        Inst::Store64 { rd, ref mem, flags } => check_store(ctx, Some(rd), flags, mem, vcode, I64),
-        Inst::FpuStore32 { ref mem, flags, .. } => check_store(ctx, None, flags, mem, vcode, F32),
-        Inst::FpuStore64 { ref mem, flags, .. } => check_store(ctx, None, flags, mem, vcode, F64),
-        Inst::FpuStore128 { ref mem, flags, .. } => {
-            check_store(ctx, None, flags, mem, vcode, I8X16)
-        }
-        Inst::StoreP64 { ref mem, flags, .. } => check_store_pair(ctx, flags, mem, vcode, 16),
-        Inst::FpuStoreP64 { ref mem, flags, .. } => check_store_pair(ctx, flags, mem, vcode, 16),
-        Inst::FpuStoreP128 { ref mem, flags, .. } => check_store_pair(ctx, flags, mem, vcode, 32),
-        Inst::StoreRelease {
-            access_ty,
-            rn,
-            flags,
-            ..
-        } => check_store_addr(ctx, flags, rn, vcode, access_ty),
-
-        Inst::AluRRR {
-            alu_op: ALUOp::Add,
-            size,
-            rd,
-            rn,
-            rm,
-        } => check_binop(ctx, vcode, 64, rd, rn, rm, |rn, rm| {
-            clamp_range(
-                ctx,
-                64,
-                size.bits().into(),
-                ctx.add(rn, rm, size.bits().into()),
-            )
-        }),
-        Inst::AluRRImm12 {
-            alu_op: ALUOp::Add,
-            size,
-            rd,
-            rn,
-            imm12,
-        } => check_unop(ctx, vcode, 64, rd, rn, |rn| {
-            let imm12: i64 = imm12.value().into();
-            clamp_range(
-                ctx,
-                64,
-                size.bits().into(),
-                ctx.offset(&rn, size.bits().into(), imm12),
-            )
-        }),
-        Inst::AluRRImm12 {
-            alu_op: ALUOp::Sub,
-            size,
-            rd,
-            rn,
-            imm12,
-        } => check_unop(ctx, vcode, 64, rd, rn, |rn| {
-            let imm12: i64 = imm12.value().into();
-            clamp_range(
-                ctx,
-                64,
-                size.bits().into(),
-                ctx.offset(&rn, size.bits().into(), -imm12),
-            )
-        }),
-        Inst::AluRRRShift {
-            alu_op: ALUOp::Add,
-            size,
-            rd,
-            rn,
-            rm,
-            shiftop,
-        } if shiftop.op() == ShiftOp::LSL && has_fact(vcode, rn) && has_fact(vcode, rm) => {
-            check_binop(ctx, vcode, 64, rd, rn, rm, |rn, rm| {
-                let rm_shifted = fail_if_missing(ctx.shl(
-                    &rm,
-                    size.bits().into(),
-                    shiftop.amt().value().into(),
-                ))?;
-                clamp_range(
-                    ctx,
-                    64,
-                    size.bits().into(),
-                    ctx.add(&rn, &rm_shifted, size.bits().into()),
-                )
-            })
-        }
-        Inst::AluRRRExtend {
-            alu_op: ALUOp::Add,
-            size,
-            rd,
-            rn,
-            rm,
-            extendop,
-        } if has_fact(vcode, rn) && has_fact(vcode, rm) => {
-            check_binop(ctx, vcode, 64, rd, rn, rm, |rn, rm| {
-                let rm_extended = fail_if_missing(extend_fact(ctx, rm, extendop))?;
-                clamp_range(
-                    ctx,
-                    64,
-                    size.bits().into(),
-                    ctx.add(&rn, &rm_extended, size.bits().into()),
-                )
-            })
-        }
-        Inst::AluRRImmShift {
-            alu_op: ALUOp::Lsl,
-            size,
-            rd,
-            rn,
-            immshift,
-        } if has_fact(vcode, rn) => check_unop(ctx, vcode, 64, rd, rn, |rn| {
-            clamp_range(
-                ctx,
-                64,
-                size.bits().into(),
-                ctx.shl(&rn, size.bits().into(), immshift.value().into()),
-            )
-        }),
-        Inst::Extend {
-            rd,
-            rn,
-            signed: false,
-            from_bits,
-            to_bits,
-        } if has_fact(vcode, rn) => check_unop(ctx, vcode, 64, rd, rn, |rn| {
-            clamp_range(
-                ctx,
-                64,
-                to_bits.into(),
-                ctx.uextend(&rn, from_bits.into(), to_bits.into()),
-            )
-        }),
-
-        Inst::AluRRR { rd, size, .. }
-        | Inst::AluRRImm12 { rd, size, .. }
-        | Inst::AluRRRShift { rd, size, .. }
-        | Inst::AluRRRExtend { rd, size, .. }
-        | Inst::AluRRImmLogic { rd, size, .. }
-        | Inst::AluRRImmShift { rd, size, .. } => check_output(ctx, vcode, rd, &[], |_vcode| {
-            clamp_range(ctx, 64, size.bits().into(), None)
-        }),
-
-        Inst::Extend {
-            rd,
-            from_bits,
-            to_bits,
-            ..
-        } => check_output(ctx, vcode, rd, &[], |_vcode| {
-            clamp_range(ctx, to_bits.into(), from_bits.into(), None)
-        }),
-
-        Inst::MovWide {
-            op: MoveWideOp::MovZ,
-            imm,
-            size: _,
-            rd,
-        } => {
-            let constant = u64::from(imm.bits) << (imm.shift * 16);
-            check_constant(ctx, vcode, rd, 64, constant)
-        }
-
-        Inst::MovWide {
-            op: MoveWideOp::MovN,
-            imm,
-            size,
-            rd,
-        } => {
-            let constant = !(u64::from(imm.bits) << (imm.shift * 16)) & size.max_value();
-            check_constant(ctx, vcode, rd, 64, constant)
-        }
-
-        Inst::MovK { rd, rn, imm, .. } => {
-            let input = get_fact_or_default(vcode, rn, 64);
-            trace!("MovK: input = {:?}", input);
-            if let Some(input_constant) = input.as_const(64) {
-                trace!(" -> input_constant: {}", input_constant);
-                let constant = u64::from(imm.bits) << (imm.shift * 16);
-                let constant = input_constant | constant;
-                trace!(" -> merged constant: {}", constant);
-                check_constant(ctx, vcode, rd, 64, constant)
-            } else {
-                check_output(ctx, vcode, rd, &[], |_vcode| {
-                    Ok(Fact::max_range_for_width(64))
-                })
-            }
-        }
-
-        _ if vcode.inst_defines_facts(inst_idx) => Err(PccError::UnsupportedFact),
-
-        _ => Ok(()),
-    }
-}
-
-fn check_load(
-    ctx: &FactContext,
-    rd: Option<Reg>,
-    flags: MemFlags,
-    addr: &AMode,
-    vcode: &VCode<Inst>,
-    ty: Type,
-) -> PccResult<()> {
-    let result_fact = rd.and_then(|rd| vcode.vreg_fact(rd.into()));
-    let bits = u16::try_from(ty.bits()).unwrap();
-    check_addr(
-        ctx,
-        flags,
-        addr,
-        vcode,
-        ty,
-        LoadOrStore::Load {
-            result_fact,
-            from_bits: bits,
-            to_bits: bits,
-        },
-    )
-}
-
-fn check_store(
-    ctx: &FactContext,
-    rd: Option<Reg>,
-    flags: MemFlags,
-    addr: &AMode,
-    vcode: &VCode<Inst>,
-    ty: Type,
-) -> PccResult<()> {
-    let stored_fact = rd.and_then(|rd| vcode.vreg_fact(rd.into()));
-    check_addr(
-        ctx,
-        flags,
-        addr,
-        vcode,
-        ty,
-        LoadOrStore::Store { stored_fact },
-    )
-}
-
-fn check_addr<'a>(
-    ctx: &FactContext,
-    flags: MemFlags,
-    addr: &AMode,
-    vcode: &VCode<Inst>,
-    ty: Type,
-    op: LoadOrStore<'a>,
-) -> PccResult<()> {
-    if !flags.checked() {
-        return Ok(());
-    }
-
-    trace!("check_addr: {:?}", addr);
-
-    let check = |addr: &Fact, ty: Type| -> PccResult<()> {
-        match op {
-            LoadOrStore::Load {
-                result_fact,
-                from_bits,
-                to_bits,
-            } => {
-                let loaded_fact =
-                    clamp_range(ctx, to_bits, from_bits, ctx.load(addr, ty)?.cloned())?;
-                trace!(
-                    "checking a load: loaded_fact = {loaded_fact:?} result_fact = {result_fact:?}"
-                );
-                if ctx.subsumes_fact_optionals(Some(&loaded_fact), result_fact) {
-                    Ok(())
-                } else {
-                    Err(PccError::UnsupportedFact)
-                }
-            }
-            LoadOrStore::Store { stored_fact } => ctx.store(addr, ty, stored_fact),
-        }
-    };
-
-    match addr {
-        &AMode::RegReg { rn, rm } => {
-            let rn = get_fact_or_default(vcode, rn, 64);
-            let rm = get_fact_or_default(vcode, rm, 64);
-            let sum = fail_if_missing(ctx.add(&rn, &rm, 64))?;
-            trace!("rn = {rn:?} rm = {rm:?} sum = {sum:?}");
-            check(&sum, ty)
-        }
-        &AMode::RegScaled { rn, rm, ty } => {
-            let rn = get_fact_or_default(vcode, rn, 64);
-            let rm = get_fact_or_default(vcode, rm, 64);
-            let rm_scaled = fail_if_missing(ctx.scale(&rm, 64, ty.bytes()))?;
-            let sum = fail_if_missing(ctx.add(&rn, &rm_scaled, 64))?;
-            check(&sum, ty)
-        }
-        &AMode::RegScaledExtended {
-            rn,
-            rm,
-            ty,
-            extendop,
-        } => {
-            let rn = get_fact_or_default(vcode, rn, 64);
-            let rm = get_fact_or_default(vcode, rm, 64);
-            let rm_extended = fail_if_missing(extend_fact(ctx, &rm, extendop))?;
-            let rm_scaled = fail_if_missing(ctx.scale(&rm_extended, 64, ty.bytes()))?;
-            let sum = fail_if_missing(ctx.add(&rn, &rm_scaled, 64))?;
-            check(&sum, ty)
-        }
-        &AMode::RegExtended { rn, rm, extendop } => {
-            let rn = get_fact_or_default(vcode, rn, 64);
-            let rm = get_fact_or_default(vcode, rm, 64);
-            let rm_extended = fail_if_missing(extend_fact(ctx, &rm, extendop))?;
-            let sum = fail_if_missing(ctx.add(&rn, &rm_extended, 64))?;
-            check(&sum, ty)?;
-            Ok(())
-        }
-        &AMode::Unscaled { rn, simm9 } => {
-            let rn = get_fact_or_default(vcode, rn, 64);
-            let sum = fail_if_missing(ctx.offset(&rn, 64, simm9.value.into()))?;
-            check(&sum, ty)
-        }
-        &AMode::UnsignedOffset { rn, uimm12 } => {
-            let rn = get_fact_or_default(vcode, rn, 64);
-            // N.B.: the architecture scales the immediate in the
-            // encoded instruction by the size of the loaded type, so
-            // e.g. an offset field of 4095 can mean a load of offset
-            // 32760 (= 4095 * 8) for I64s. The `UImm12Scaled` type
-            // stores the *scaled* value, so we don't need to multiply
-            // (again) by the type's size here.
-            let offset: u64 = uimm12.value.into();
-            // This `unwrap()` will always succeed because the value
-            // will always be positive and much smaller than
-            // `i64::MAX` (see above).
-            let sum = fail_if_missing(ctx.offset(&rn, 64, i64::try_from(offset).unwrap()))?;
-            check(&sum, ty)
-        }
-        &AMode::Label { .. } | &AMode::Const { .. } => {
-            // Always accept: labels and constants must be within the
-            // generated code (else they won't be resolved).
-            Ok(())
-        }
-        &AMode::RegOffset { rn, off, .. } => {
-            let rn = get_fact_or_default(vcode, rn, 64);
-            let sum = fail_if_missing(ctx.offset(&rn, 64, off))?;
-            check(&sum, ty)
-        }
-        &AMode::SPOffset { .. }
-        | &AMode::FPOffset { .. }
-        | &AMode::NominalSPOffset { .. }
-        | &AMode::SPPostIndexed { .. }
-        | &AMode::SPPreIndexed { .. } => {
-            // We trust ABI code (for now!) and no lowering rules
-            // lower input value accesses directly to these.
-            Ok(())
-        }
-    }
-}
-
-fn check_load_pair(
-    _ctx: &FactContext,
-    _flags: MemFlags,
-    _addr: &PairAMode,
-    _vcode: &VCode<Inst>,
-    _size: u8,
-) -> PccResult<()> {
-    Err(PccError::UnimplementedInst)
-}
-
-fn check_store_pair(
-    _ctx: &FactContext,
-    _flags: MemFlags,
-    _addr: &PairAMode,
-    _vcode: &VCode<Inst>,
-    _size: u8,
-) -> PccResult<()> {
-    Err(PccError::UnimplementedInst)
-}
-
-fn check_load_addr(
-    ctx: &FactContext,
-    flags: MemFlags,
-    reg: Reg,
-    vcode: &VCode<Inst>,
-    ty: Type,
-) -> PccResult<()> {
-    if !flags.checked() {
-        return Ok(());
-    }
-    let fact = get_fact_or_default(vcode, reg, 64);
-    let _output_fact = ctx.load(&fact, ty)?;
-    Ok(())
-}
-
-fn check_store_addr(
-    ctx: &FactContext,
-    flags: MemFlags,
-    reg: Reg,
-    vcode: &VCode<Inst>,
-    ty: Type,
-) -> PccResult<()> {
-    if !flags.checked() {
-        return Ok(());
-    }
-    let fact = get_fact_or_default(vcode, reg, 64);
-    let _output_fact = ctx.store(&fact, ty, None)?;
-    Ok(())
-}
diff --git a/cranelift/codegen/src/isa/riscv64/abi.rs b/cranelift/codegen/src/isa/riscv64/abi.rs
index d119d0f8ea24..9abc85451d0e 100644
--- a/cranelift/codegen/src/isa/riscv64/abi.rs
+++ b/cranelift/codegen/src/isa/riscv64/abi.rs
@@ -318,29 +318,12 @@ impl ABIMachineSpec for Riscv64MachineDeps {
 
     fn gen_sp_reg_adjust(amount: i32) -> SmallInstVec<Inst> {
         let mut insts = SmallVec::new();
-
         if amount == 0 {
             return insts;
         }
-
-        if let Some(imm) = Imm12::maybe_from_i64(amount as i64) {
-            insts.push(Inst::AluRRImm12 {
-                alu_op: AluOPRRI::Addi,
-                rd: writable_stack_reg(),
-                rs: stack_reg(),
-                imm12: imm,
-            })
-        } else {
-            let tmp = writable_spilltmp_reg();
-            insts.extend(Inst::load_constant_u64(tmp, amount as i64 as u64));
-            insts.push(Inst::AluRRR {
-                alu_op: AluOPRRR::Add,
-                rd: writable_stack_reg(),
-                rs1: tmp.to_reg(),
-                rs2: stack_reg(),
-            });
-        }
-
+        insts.push(Inst::AdjustSp {
+            amount: amount as i64,
+        });
         insts
     }
 
@@ -363,7 +346,7 @@ impl ABIMachineSpec for Riscv64MachineDeps {
             // sd   ra,8(sp)     ;; save ra.
             // sd   fp,0(sp)     ;; store old fp.
             // mv   fp,sp        ;; set fp to sp.
-            insts.extend(Self::gen_sp_reg_adjust(-16));
+            insts.push(Inst::AdjustSp { amount: -16 });
             insts.push(Self::gen_store_stack(
                 StackAMode::SPOffset(8, I64),
                 link_reg(),
@@ -411,7 +394,7 @@ impl ABIMachineSpec for Riscv64MachineDeps {
                 writable_fp_reg(),
                 I64,
             ));
-            insts.extend(Self::gen_sp_reg_adjust(16));
+            insts.push(Inst::AdjustSp { amount: 16 });
         }
 
         if call_conv == isa::CallConv::Tail && frame_layout.stack_args_size > 0 {
@@ -489,8 +472,9 @@ impl ABIMachineSpec for Riscv64MachineDeps {
                 ));
                 cur_offset += 8
             }
-
-            insts.extend(Self::gen_sp_reg_adjust(-(stack_size as i32)));
+            insts.push(Inst::AdjustSp {
+                amount: -(stack_size as i64),
+            });
         }
         insts
     }
@@ -503,7 +487,9 @@ impl ABIMachineSpec for Riscv64MachineDeps {
         let mut insts = SmallVec::new();
         let stack_size = frame_layout.fixed_frame_storage_size + frame_layout.clobber_size;
         if stack_size > 0 {
-            insts.extend(Self::gen_sp_reg_adjust(stack_size as i32));
+            insts.push(Inst::AdjustSp {
+                amount: stack_size as i64,
+            });
         }
         let mut cur_offset = 8;
         for reg in &frame_layout.clobbered_callee_saves {
diff --git a/cranelift/codegen/src/isa/riscv64/inst.isle b/cranelift/codegen/src/isa/riscv64/inst.isle
index 8627f2a293fa..dc5aca2d130e 100644
--- a/cranelift/codegen/src/isa/riscv64/inst.isle
+++ b/cranelift/codegen/src/isa/riscv64/inst.isle
@@ -22,7 +22,7 @@
     ;; An ALU operation with one register sources and a register destination.
     (FpuRR
       (alu_op FpuOPRR)
-      (frm FRM)
+      (frm OptionFloatRoundingMode)
       (rd WritableReg)
       (rs Reg))
 
@@ -37,7 +37,7 @@
     ;; An ALU operation with two register sources and a register destination.
     (FpuRRR
       (alu_op FpuOPRRR)
-      (frm FRM)
+      (frm OptionFloatRoundingMode)
       (rd WritableReg)
       (rs1 Reg)
       (rs2 Reg))
@@ -45,7 +45,7 @@
     ;; An ALU operation with three register sources and a register destination.
     (FpuRRRR
       (alu_op FpuOPRRRR)
-      (frm FRM)
+      (frm OptionFloatRoundingMode)
       (rd WritableReg)
       (rs1 Reg)
       (rs2 Reg)
@@ -103,6 +103,8 @@
       (from_bits u8)
       (to_bits u8))
 
+    (AdjustSp
+      (amount i64))
     (Call
       (info BoxCallInfo))
 
@@ -219,8 +221,9 @@
 
     ;; select x or y base on condition
     (Select
-      (dst WritableValueRegs)
-      (condition IntegerCompare)
+      (dst VecWritableReg)
+      (ty Type)
+      (condition Reg)
       (x ValueRegs)
       (y ValueRegs))
 
@@ -239,6 +242,36 @@
       (addr Reg)
       (v Reg)
       (ty Type))
+    ;; select x or y base on op_code
+    (IntSelect
+      (op IntSelectOP)
+      (dst VecWritableReg)
+      (x ValueRegs)
+      (y ValueRegs)
+      (ty Type))
+    ;; an integer compare.
+    (Icmp
+      (cc IntCC)
+      (rd WritableReg)
+      (a ValueRegs)
+      (b ValueRegs)
+      (ty Type))
+    ;; select a reg base on condition.
+    ;; very useful because in lowering stage we can not have condition branch.
+    (SelectReg
+      (rd WritableReg)
+      (rs1 Reg)
+      (rs2 Reg)
+      (condition IntegerCompare))
+    ;;
+    (FcvtToInt
+      (is_sat bool)
+      (rd WritableReg)
+      (tmp WritableReg) ;; a float register to load bounds.
+      (rs Reg)
+      (is_signed bool)
+      (in_type Type)
+      (out_type Type))
 
     (RawData (data VecU8))
 
@@ -257,6 +290,15 @@
       (f_tmp WritableReg)
       (rs Reg)
       (ty Type))
+    ;;;; FMax
+    (FloatSelect
+      (op FloatSelectOP)
+      (rd WritableReg)
+      ;; a integer register
+      (tmp WritableReg)
+      (rs1 Reg)
+      (rs2 Reg)
+      (ty Type))
 
     ;; popcnt  if target doesn't support extension B
     ;; use iteration to implement.
@@ -276,7 +318,13 @@
       (tmp WritableReg)
       (rs Reg)
       (ty Type))
-
+    ;; Byte-reverse register
+    (Rev8
+      (rs Reg)
+      (step WritableReg)
+      (tmp WritableReg)
+      (rd WritableReg))
+    ;;
     (Brev8
       (rs Reg)
       (ty Type)
@@ -359,6 +407,11 @@
 ))
 
 
+(type FloatSelectOP (enum
+  (Max)
+  (Min)
+))
+
 (type FloatRoundOP (enum
   (Nearest)
   (Ceil)
@@ -366,6 +419,13 @@
   (Trunc)
 ))
 
+(type IntSelectOP (enum
+  (Smax)
+  (Umax)
+  (Smin)
+  (Umin)
+))
+
 (type AtomicOP (enum
   (LrW)
   (ScW)
@@ -668,7 +728,6 @@
   (CSub)
   (CAddw)
   (CSubw)
-  (CMul)
 ))
 
 ;; Opcodes for the CJ compressed instruction format
@@ -682,11 +741,6 @@
   (CAddiw)
   (CAddi16sp)
   (CSlli)
-  (CLi)
-  (CLui)
-  (CLwsp)
-  (CLdsp)
-  (CFldsp)
 ))
 
 ;; Opcodes for the CIW compressed instruction format
@@ -694,56 +748,6 @@
   (CAddi4spn)
 ))
 
-;; Opcodes for the CB compressed instruction format
-(type CbOp (enum
-  (CSrli)
-  (CSrai)
-  (CAndi)
-))
-
-;; Opcodes for the CSS compressed instruction format
-(type CssOp (enum
-  (CSwsp)
-  (CSdsp)
-  (CFsdsp)
-))
-
-;; Opcodes for the CS compressed instruction format
-(type CsOp (enum
-  (CSw)
-  (CSd)
-  (CFsd)
-))
-
-;; Opcodes for the CL compressed instruction format
-(type ClOp (enum
-  (CLw)
-  (CLd)
-  (CFld)
-))
-
-;; Opcodes for the CSZN compressed instruction format
-(type CsznOp (enum
-  (CNot)
-  (CZextb)
-  (CZexth)
-  (CZextw)
-  (CSextb)
-  (CSexth)
-))
-
-;; This is a mix of all Zcb memory adressing instructions
-;;
-;; Technically they are split across 4 different formats.
-;; But they are all very similar, so we just group them all together.
-(type ZcbMemOp (enum
-  (CLbu)
-  (CLhu)
-  (CLh)
-  (CSb)
-  (CSh)
-))
-
 
 (type CsrRegOP (enum
   ;; Atomic Read/Write CSR
@@ -823,6 +827,7 @@
 (type Imm20 (primitive Imm20))
 (type Imm3 (primitive Imm3))
 (type CondBrTarget (primitive CondBrTarget))
+(type OptionFloatRoundingMode (primitive OptionFloatRoundingMode))
 (type VecU8 (primitive VecU8))
 (type AMO (primitive AMO))
 (type VecMachLabel extern (enum))
@@ -1029,9 +1034,6 @@
 
 ;; ISA Extension helpers
 
-(decl pure has_m () bool)
-(extern constructor has_m has_m)
-
 (decl pure has_v () bool)
 (extern constructor has_v has_v)
 
@@ -1060,6 +1062,15 @@
       (_ Unit (emit (MInst.FloatRound op rd tmp tmp2 rs ty))))
     (writable_reg_to_reg rd)))
 
+(decl gen_float_select (FloatSelectOP Reg Reg Type) Reg)
+(rule
+  (gen_float_select op x y ty)
+  (let
+    ((rd WritableReg (temp_writable_reg ty))
+      (tmp WritableXReg (temp_writable_xreg))
+      (_ Unit (emit (MInst.FloatSelect op rd tmp x y ty))))
+    (writable_reg_to_reg rd)))
+
 
 ;;;; Instruction Helpers ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -1167,12 +1178,6 @@
 (rule (rv_andi rs1 imm)
   (alu_rr_imm12 (AluOPRRI.Andi) rs1 imm))
 
-;; Helper for emitting the `slt` ("Set Less Than") instruction.
-;; rd ← rs1 < rs2
-(decl rv_slt (XReg XReg) XReg)
-(rule (rv_slt rs1 rs2)
-  (alu_rrr (AluOPRRR.Slt) rs1 rs2))
-
 ;; Helper for emitting the `sltu` ("Set Less Than Unsigned") instruction.
 ;; rd ← rs1 < rs2
 (decl rv_sltu (XReg XReg) XReg)
@@ -1185,12 +1190,6 @@
 (rule (rv_snez rs1)
   (rv_sltu (zero_reg) rs1))
 
-;; Helper for emiting the `slti` ("Set Less Than Immediate") instruction.
-;; rd ← rs1 < imm
-(decl rv_slti (XReg Imm12) XReg)
-(rule (rv_slti rs1 imm)
-  (alu_rr_imm12 (AluOPRRI.Slti) rs1 imm))
-
 ;; Helper for emiting the `sltiu` ("Set Less Than Immediate Unsigned") instruction.
 ;; rd ← rs1 < imm
 (decl rv_sltiu (XReg Imm12) XReg)
@@ -1313,6 +1312,8 @@
 (rule (rv_remu rs1 rs2)
   (alu_rrr (AluOPRRR.RemU) rs1 rs2))
 
+
+
 ;; RV64M Extension
 ;; TODO: Enable these instructions only when we have the M extension
 
@@ -1351,156 +1352,72 @@
 ;; TODO: Enable these instructions only when we have the F or D extensions
 
 ;; Helper for emitting the `fadd` instruction.
-(decl rv_fadd (Type FRM FReg FReg) FReg)
-(rule (rv_fadd $F32 frm rs1 rs2) (fpu_rrr (FpuOPRRR.FaddS) $F32 frm rs1 rs2))
-(rule (rv_fadd $F64 frm rs1 rs2) (fpu_rrr (FpuOPRRR.FaddD) $F64 frm rs1 rs2))
+(decl rv_fadd (Type FReg FReg) FReg)
+(rule (rv_fadd $F32 rs1 rs2) (fpu_rrr (FpuOPRRR.FaddS) $F32 rs1 rs2))
+(rule (rv_fadd $F64 rs1 rs2) (fpu_rrr (FpuOPRRR.FaddD) $F64 rs1 rs2))
 
 ;; Helper for emitting the `fsub` instruction.
-(decl rv_fsub (Type FRM FReg FReg) FReg)
-(rule (rv_fsub $F32 frm rs1 rs2) (fpu_rrr (FpuOPRRR.FsubS) $F32 frm rs1 rs2))
-(rule (rv_fsub $F64 frm rs1 rs2) (fpu_rrr (FpuOPRRR.FsubD) $F64 frm rs1 rs2))
+(decl rv_fsub (Type FReg FReg) FReg)
+(rule (rv_fsub $F32 rs1 rs2) (fpu_rrr (FpuOPRRR.FsubS) $F32 rs1 rs2))
+(rule (rv_fsub $F64 rs1 rs2) (fpu_rrr (FpuOPRRR.FsubD) $F64 rs1 rs2))
 
 ;; Helper for emitting the `fmul` instruction.
-(decl rv_fmul (Type FRM FReg FReg) FReg)
-(rule (rv_fmul $F32 frm rs1 rs2) (fpu_rrr (FpuOPRRR.FmulS) $F32 frm rs1 rs2))
-(rule (rv_fmul $F64 frm rs1 rs2) (fpu_rrr (FpuOPRRR.FmulD) $F64 frm rs1 rs2))
+(decl rv_fmul (Type FReg FReg) FReg)
+(rule (rv_fmul $F32 rs1 rs2) (fpu_rrr (FpuOPRRR.FmulS) $F32 rs1 rs2))
+(rule (rv_fmul $F64 rs1 rs2) (fpu_rrr (FpuOPRRR.FmulD) $F64 rs1 rs2))
 
 ;; Helper for emitting the `fdiv` instruction.
-(decl rv_fdiv (Type FRM FReg FReg) FReg)
-(rule (rv_fdiv $F32 frm rs1 rs2) (fpu_rrr (FpuOPRRR.FdivS) $F32 frm rs1 rs2))
-(rule (rv_fdiv $F64 frm rs1 rs2) (fpu_rrr (FpuOPRRR.FdivD) $F64 frm rs1 rs2))
+(decl rv_fdiv (Type FReg FReg) FReg)
+(rule (rv_fdiv $F32 rs1 rs2) (fpu_rrr (FpuOPRRR.FdivS) $F32 rs1 rs2))
+(rule (rv_fdiv $F64 rs1 rs2) (fpu_rrr (FpuOPRRR.FdivD) $F64 rs1 rs2))
 
 ;; Helper for emitting the `fsqrt` instruction.
-(decl rv_fsqrt (Type FRM FReg) FReg)
-(rule (rv_fsqrt $F32 frm rs1) (fpu_rr (FpuOPRR.FsqrtS) $F32 frm rs1))
-(rule (rv_fsqrt $F64 frm rs1) (fpu_rr (FpuOPRR.FsqrtD) $F64 frm rs1))
+(decl rv_fsqrt (Type FReg) FReg)
+(rule (rv_fsqrt $F32 rs1) (fpu_rr (FpuOPRR.FsqrtS) $F32 rs1))
+(rule (rv_fsqrt $F64 rs1) (fpu_rr (FpuOPRR.FsqrtD) $F64 rs1))
 
 ;; Helper for emitting the `fmadd` instruction.
-(decl rv_fmadd (Type FRM FReg FReg FReg) FReg)
-(rule (rv_fmadd $F32 frm rs1 rs2 rs3) (fpu_rrrr (FpuOPRRRR.FmaddS) $F32 frm rs1 rs2 rs3))
-(rule (rv_fmadd $F64 frm rs1 rs2 rs3) (fpu_rrrr (FpuOPRRRR.FmaddD) $F64 frm rs1 rs2 rs3))
+(decl rv_fmadd (Type FReg FReg FReg) FReg)
+(rule (rv_fmadd $F32 rs1 rs2 rs3) (fpu_rrrr (FpuOPRRRR.FmaddS) $F32 rs1 rs2 rs3))
+(rule (rv_fmadd $F64 rs1 rs2 rs3) (fpu_rrrr (FpuOPRRRR.FmaddD) $F64 rs1 rs2 rs3))
 
 ;; Helper for emitting the `fmv.x.w` instruction.
 (decl rv_fmvxw (FReg) XReg)
-(rule (rv_fmvxw r) (fpu_rr (FpuOPRR.FmvXW) $I32 (FRM.RNE) r))
+(rule (rv_fmvxw r) (fpu_rr (FpuOPRR.FmvXW) $I32 r))
 
 ;; Helper for emitting the `fmv.x.d` instruction.
 (decl rv_fmvxd (FReg) XReg)
-(rule (rv_fmvxd r) (fpu_rr (FpuOPRR.FmvXD) $I64 (FRM.RNE) r))
+(rule (rv_fmvxd r) (fpu_rr (FpuOPRR.FmvXD) $I64 r))
 
 ;; Helper for emitting the `fmv.w.x` instruction.
 (decl rv_fmvwx (XReg) FReg)
-(rule (rv_fmvwx r) (fpu_rr (FpuOPRR.FmvWX) $F32 (FRM.RNE) r))
+(rule (rv_fmvwx r) (fpu_rr (FpuOPRR.FmvWX) $F32 r))
 
 ;; Helper for emitting the `fmv.d.x` instruction.
 (decl rv_fmvdx (XReg) FReg)
-(rule (rv_fmvdx r) (fpu_rr (FpuOPRR.FmvDX) $F64 (FRM.RNE) r))
+(rule (rv_fmvdx r) (fpu_rr (FpuOPRR.FmvDX) $F64 r))
 
 ;; Helper for emitting the `fcvt.d.s` ("Float Convert Double to Single") instruction.
 (decl rv_fcvtds (FReg) FReg)
-(rule (rv_fcvtds rs1) (fpu_rr (FpuOPRR.FcvtDS) $F32 (FRM.RNE) rs1))
+(rule (rv_fcvtds rs1) (fpu_rr (FpuOPRR.FcvtDS) $F32 rs1))
 
 ;; Helper for emitting the `fcvt.s.d` ("Float Convert Single to Double") instruction.
-(decl rv_fcvtsd (FRM FReg) FReg)
-(rule (rv_fcvtsd frm rs1) (fpu_rr (FpuOPRR.FcvtSD) $F64 frm rs1))
-
-;; Helper for emitting the `fcvt.s.w` instruction.
-(decl rv_fcvtsw (FRM XReg) FReg)
-(rule (rv_fcvtsw frm rs1) (fpu_rr (FpuOPRR.FcvtSw) $F32 frm rs1))
-
-;; Helper for emitting the `fcvt.s.wu` instruction.
-(decl rv_fcvtswu (FRM XReg) FReg)
-(rule (rv_fcvtswu frm rs1) (fpu_rr (FpuOPRR.FcvtSwU) $F32 frm rs1))
-
-;; Helper for emitting the `fcvt.d.w` instruction.
-(decl rv_fcvtdw (XReg) FReg)
-(rule (rv_fcvtdw rs1) (fpu_rr (FpuOPRR.FcvtDW) $F32 (FRM.RNE) rs1))
-
-;; Helper for emitting the `fcvt.d.wu` instruction.
-(decl rv_fcvtdwu (XReg) FReg)
-(rule (rv_fcvtdwu rs1) (fpu_rr (FpuOPRR.FcvtDWU) $F32 (FRM.RNE) rs1))
-
-;; Helper for emitting the `fcvt.s.l` instruction.
-(decl rv_fcvtsl (FRM XReg) FReg)
-(rule (rv_fcvtsl frm rs1) (fpu_rr (FpuOPRR.FcvtSL) $F32 frm rs1))
-
-;; Helper for emitting the `fcvt.s.lu` instruction.
-(decl rv_fcvtslu (FRM XReg) FReg)
-(rule (rv_fcvtslu frm rs1) (fpu_rr (FpuOPRR.FcvtSLU) $F32 frm rs1))
-
-;; Helper for emitting the `fcvt.d.l` instruction.
-(decl rv_fcvtdl (FRM XReg) FReg)
-(rule (rv_fcvtdl frm rs1) (fpu_rr (FpuOPRR.FcvtDL) $F32 frm rs1))
-
-;; Helper for emitting the `fcvt.d.lu` instruction.
-(decl rv_fcvtdlu (FRM XReg) FReg)
-(rule (rv_fcvtdlu frm rs1) (fpu_rr (FpuOPRR.FcvtDLu) $F32 frm rs1))
-
-;; Helper for emitting the `fcvt.w.s` instruction.
-(decl rv_fcvtws (FRM FReg) XReg)
-(rule (rv_fcvtws frm rs1) (fpu_rr (FpuOPRR.FcvtWS) $I64 frm rs1))
-
-;; Helper for emitting the `fcvt.l.s` instruction.
-(decl rv_fcvtls (FRM FReg) XReg)
-(rule (rv_fcvtls frm rs1) (fpu_rr (FpuOPRR.FcvtLS) $I64 frm rs1))
-
-;; Helper for emitting the `fcvt.wu.s` instruction.
-(decl rv_fcvtwus (FRM FReg) XReg)
-(rule (rv_fcvtwus frm rs1) (fpu_rr (FpuOPRR.FcvtWuS) $I64 frm rs1))
-
-;; Helper for emitting the `fcvt.lu.s` instruction.
-(decl rv_fcvtlus (FRM FReg) XReg)
-(rule (rv_fcvtlus frm rs1) (fpu_rr (FpuOPRR.FcvtLuS) $I64 frm rs1))
-
-;; Helper for emitting the `fcvt.w.d` instruction.
-(decl rv_fcvtwd (FRM FReg) XReg)
-(rule (rv_fcvtwd frm rs1) (fpu_rr (FpuOPRR.FcvtWD) $I64 frm rs1))
-
-;; Helper for emitting the `fcvt.l.d` instruction.
-(decl rv_fcvtld (FRM FReg) XReg)
-(rule (rv_fcvtld frm rs1) (fpu_rr (FpuOPRR.FcvtLD) $I64 frm rs1))
-
-;; Helper for emitting the `fcvt.wu.d` instruction.
-(decl rv_fcvtwud (FRM FReg) XReg)
-(rule (rv_fcvtwud frm rs1) (fpu_rr (FpuOPRR.FcvtWuD) $I64 frm rs1))
-
-;; Helper for emitting the `fcvt.lu.d` instruction.
-(decl rv_fcvtlud (FRM FReg) XReg)
-(rule (rv_fcvtlud frm rs1) (fpu_rr (FpuOPRR.FcvtLuD) $I64 frm rs1))
-
-;; Helper for emitting the `fcvt.w.*` instructions.
-(decl rv_fcvtw (Type FRM FReg) XReg)
-(rule (rv_fcvtw $F32 frm rs1) (rv_fcvtws frm rs1))
-(rule (rv_fcvtw $F64 frm rs1) (rv_fcvtwd frm rs1))
-
-;; Helper for emitting the `fcvt.l.*` instructions.
-(decl rv_fcvtl (Type FRM FReg) XReg)
-(rule (rv_fcvtl $F32 frm rs1) (rv_fcvtls frm rs1))
-(rule (rv_fcvtl $F64 frm rs1) (rv_fcvtld frm rs1))
-
-;; Helper for emitting the `fcvt.wu.*` instructions.
-(decl rv_fcvtwu (Type FRM FReg) XReg)
-(rule (rv_fcvtwu $F32 frm rs1) (rv_fcvtwus frm rs1))
-(rule (rv_fcvtwu $F64 frm rs1) (rv_fcvtwud frm rs1))
-
-;; Helper for emitting the `fcvt.lu.*` instructions.
-(decl rv_fcvtlu (Type FRM FReg) XReg)
-(rule (rv_fcvtlu $F32 frm rs1) (rv_fcvtlus frm rs1))
-(rule (rv_fcvtlu $F64 frm rs1) (rv_fcvtlud frm rs1))
+(decl rv_fcvtsd (FReg) FReg)
+(rule (rv_fcvtsd rs1) (fpu_rr (FpuOPRR.FcvtSD) $F64 rs1))
 
 ;; Helper for emitting the `fsgnj` ("Floating Point Sign Injection") instruction.
 ;; The output of this instruction is `rs1` with the sign bit from `rs2`
 ;; This implements the `copysign` operation
 (decl rv_fsgnj (Type FReg FReg) FReg)
-(rule (rv_fsgnj $F32 rs1 rs2) (fpu_rrr (FpuOPRRR.FsgnjS) $F32 (FRM.RNE) rs1 rs2))
-(rule (rv_fsgnj $F64 rs1 rs2) (fpu_rrr (FpuOPRRR.FsgnjD) $F64 (FRM.RNE) rs1 rs2))
+(rule (rv_fsgnj $F32 rs1 rs2) (fpu_rrr (FpuOPRRR.FsgnjS) $F32 rs1 rs2))
+(rule (rv_fsgnj $F64 rs1 rs2) (fpu_rrr (FpuOPRRR.FsgnjD) $F64 rs1 rs2))
 
 ;; Helper for emitting the `fsgnjn` ("Floating Point Sign Injection Negated") instruction.
 ;; The output of this instruction is `rs1` with the negated sign bit from `rs2`
 ;; When `rs1 == rs2` this implements the `neg` operation
 (decl rv_fsgnjn (Type FReg FReg) FReg)
-(rule (rv_fsgnjn $F32 rs1 rs2) (fpu_rrr (FpuOPRRR.FsgnjnS) $F32 (FRM.RTZ) rs1 rs2))
-(rule (rv_fsgnjn $F64 rs1 rs2) (fpu_rrr (FpuOPRRR.FsgnjnD) $F64 (FRM.RTZ) rs1 rs2))
+(rule (rv_fsgnjn $F32 rs1 rs2) (fpu_rrr (FpuOPRRR.FsgnjnS) $F32 rs1 rs2))
+(rule (rv_fsgnjn $F64 rs1 rs2) (fpu_rrr (FpuOPRRR.FsgnjnD) $F64 rs1 rs2))
 
 ;; Helper for emitting the `fneg` ("Floating Point Negate") instruction.
 ;; This instruction is a mnemonic for `fsgnjn rd, rs1, rs1`
@@ -1511,8 +1428,8 @@
 ;; The output of this instruction is `rs1` with the XOR of the sign bits from `rs1` and `rs2`.
 ;; When `rs1 == rs2` this implements `fabs`
 (decl rv_fsgnjx (Type FReg FReg) FReg)
-(rule (rv_fsgnjx $F32 rs1 rs2) (fpu_rrr (FpuOPRRR.FsgnjxS) $F32 (FRM.RDN) rs1 rs2))
-(rule (rv_fsgnjx $F64 rs1 rs2) (fpu_rrr (FpuOPRRR.FsgnjxD) $F64 (FRM.RDN) rs1 rs2))
+(rule (rv_fsgnjx $F32 rs1 rs2) (fpu_rrr (FpuOPRRR.FsgnjxS) $F32 rs1 rs2))
+(rule (rv_fsgnjx $F64 rs1 rs2) (fpu_rrr (FpuOPRRR.FsgnjxD) $F64 rs1 rs2))
 
 ;; Helper for emitting the `fabs` ("Floating Point Absolute") instruction.
 ;; This instruction is a mnemonic for `fsgnjx rd, rs1, rs1`
@@ -1521,18 +1438,18 @@
 
 ;; Helper for emitting the `feq` ("Float Equal") instruction.
 (decl rv_feq (Type FReg FReg) XReg)
-(rule (rv_feq $F32 rs1 rs2) (fpu_rrr (FpuOPRRR.FeqS) $I64 (FRM.RDN) rs1 rs2))
-(rule (rv_feq $F64 rs1 rs2) (fpu_rrr (FpuOPRRR.FeqD) $I64 (FRM.RDN) rs1 rs2))
+(rule (rv_feq $F32 rs1 rs2) (fpu_rrr (FpuOPRRR.FeqS) $I64 rs1 rs2))
+(rule (rv_feq $F64 rs1 rs2) (fpu_rrr (FpuOPRRR.FeqD) $I64 rs1 rs2))
 
 ;; Helper for emitting the `flt` ("Float Less Than") instruction.
 (decl rv_flt (Type FReg FReg) XReg)
-(rule (rv_flt $F32 rs1 rs2) (fpu_rrr (FpuOPRRR.FltS) $I64 (FRM.RTZ) rs1 rs2))
-(rule (rv_flt $F64 rs1 rs2) (fpu_rrr (FpuOPRRR.FltD) $I64 (FRM.RTZ) rs1 rs2))
+(rule (rv_flt $F32 rs1 rs2) (fpu_rrr (FpuOPRRR.FltS) $I64 rs1 rs2))
+(rule (rv_flt $F64 rs1 rs2) (fpu_rrr (FpuOPRRR.FltD) $I64 rs1 rs2))
 
 ;; Helper for emitting the `fle` ("Float Less Than or Equal") instruction.
 (decl rv_fle (Type FReg FReg) XReg)
-(rule (rv_fle $F32 rs1 rs2) (fpu_rrr (FpuOPRRR.FleS) $I64 (FRM.RNE) rs1 rs2))
-(rule (rv_fle $F64 rs1 rs2) (fpu_rrr (FpuOPRRR.FleD) $I64 (FRM.RNE) rs1 rs2))
+(rule (rv_fle $F32 rs1 rs2) (fpu_rrr (FpuOPRRR.FleS) $I64 rs1 rs2))
+(rule (rv_fle $F64 rs1 rs2) (fpu_rrr (FpuOPRRR.FleD) $I64 rs1 rs2))
 
 ;; Helper for emitting the `fgt` ("Float Greater Than") instruction.
 ;; Note: The arguments are reversed
@@ -1544,16 +1461,6 @@
 (decl rv_fge (Type FReg FReg) XReg)
 (rule (rv_fge ty rs1 rs2) (rv_fle ty rs2 rs1))
 
-;; Helper for emitting the `fmin` instruction.
-(decl rv_fmin (Type FReg FReg) FReg)
-(rule (rv_fmin $F32 rs1 rs2) (fpu_rrr (FpuOPRRR.FminS) $F32 (FRM.RNE) rs1 rs2))
-(rule (rv_fmin $F64 rs1 rs2) (fpu_rrr (FpuOPRRR.FminD) $F64 (FRM.RNE) rs1 rs2))
-
-;; Helper for emitting the `fmax` instruction.
-(decl rv_fmax (Type FReg FReg) FReg)
-(rule (rv_fmax $F32 rs1 rs2) (fpu_rrr (FpuOPRRR.FmaxS) $F32 (FRM.RTZ) rs1 rs2))
-(rule (rv_fmax $F64 rs1 rs2) (fpu_rrr (FpuOPRRR.FmaxD) $F64 (FRM.RTZ) rs1 rs2))
-
 
 ;; `Zba` Extension Instructions
 
@@ -1583,11 +1490,7 @@
 ;; rd ← rs1 ∧ ~(rs2)
 (decl rv_andn (XReg XReg) XReg)
 (rule (rv_andn rs1 rs2)
-  (if-let $true (has_zbb))
   (alu_rrr (AluOPRRR.Andn) rs1 rs2))
-(rule (rv_andn rs1 rs2)
-  (if-let $false (has_zbb))
-  (rv_and rs1 (rv_not rs2)))
 
 ;; Helper for emitting the `orn` ("Or Negated") instruction.
 ;; rd ← rs1 ∨ ~(rs2)
@@ -1595,12 +1498,6 @@
 (rule (rv_orn rs1 rs2)
   (alu_rrr (AluOPRRR.Orn) rs1 rs2))
 
-;; Helper for emitting the `xnor` ("Exclusive NOR") instruction.
-;; rd ← ~(rs1 ^ rs2)
-(decl rv_xnor (XReg XReg) XReg)
-(rule (rv_xnor rs1 rs2)
-  (alu_rrr (AluOPRRR.Xnor) rs1 rs2))
-
 ;; Helper for emitting the `clz` ("Count Leading Zero Bits") instruction.
 (decl rv_clz (XReg) XReg)
 (rule (rv_clz rs1)
@@ -1626,31 +1523,11 @@
 (rule (rv_cpop rs1)
   (alu_rr_funct12 (AluOPRRI.Cpop) rs1))
 
-;; Helper for emitting the `cpopw` ("Count Population") instruction.
-(decl rv_cpopw (XReg) XReg)
-(rule (rv_cpopw rs1)
-  (alu_rr_funct12 (AluOPRRI.Cpopw) rs1))
-
 ;; Helper for emitting the `max` instruction.
 (decl rv_max (XReg XReg) XReg)
 (rule (rv_max rs1 rs2)
   (alu_rrr (AluOPRRR.Max) rs1 rs2))
 
-;; Helper for emitting the `maxu` instruction.
-(decl rv_maxu (XReg XReg) XReg)
-(rule (rv_maxu rs1 rs2)
-  (alu_rrr (AluOPRRR.Maxu) rs1 rs2))
-
-;; Helper for emitting the `min` instruction.
-(decl rv_min (XReg XReg) XReg)
-(rule (rv_min rs1 rs2)
-  (alu_rrr (AluOPRRR.Max) rs1 rs2))
-
-;; Helper for emitting the `minu` instruction.
-(decl rv_minu (XReg XReg) XReg)
-(rule (rv_minu rs1 rs2)
-  (alu_rrr (AluOPRRR.Minu) rs1 rs2))
-
 ;; Helper for emitting the `sext.b` instruction.
 (decl rv_sextb (XReg) XReg)
 (rule (rv_sextb rs1)
@@ -1686,16 +1563,6 @@
 (rule (rv_rorw rs1 rs2)
   (alu_rrr (AluOPRRR.Rorw) rs1 rs2))
 
-;; Helper for emitting the `rori` ("Rotate Right") instruction.
-(decl rv_rori (XReg Imm12) XReg)
-(rule (rv_rori rs1 rs2)
-  (alu_rr_imm12 (AluOPRRI.Rori) rs1 rs2))
-
-;; Helper for emitting the `roriw` ("Rotate Right Word") instruction.
-(decl rv_roriw (XReg Imm12) XReg)
-(rule (rv_roriw rs1 rs2)
-  (alu_rr_imm12 (AluOPRRI.Roriw) rs1 rs2))
-
 ;; Helper for emitting the `rev8` ("Byte Reverse") instruction.
 (decl rv_rev8 (XReg) XReg)
 (rule (rv_rev8 rs1)
@@ -1709,41 +1576,12 @@
 (rule (rv_brev8 rs1)
   (alu_rr_funct12 (AluOPRRI.Brev8) rs1))
 
-;; `Zbs` Extension Instructions
-
-(decl rv_bclr (XReg XReg) XReg)
-(rule (rv_bclr rs1 rs2)
-  (alu_rrr (AluOPRRR.Bclr) rs1 rs2))
-
-(decl rv_bclri (XReg Imm12) XReg)
-(rule (rv_bclri rs1 imm)
-  (alu_rr_imm12 (AluOPRRI.Bclri) rs1 imm))
-
-(decl rv_bext (XReg XReg) XReg)
-(rule (rv_bext rs1 rs2)
-  (alu_rrr (AluOPRRR.Bext) rs1 rs2))
-
-(decl rv_bexti (XReg Imm12) XReg)
-(rule (rv_bexti rs1 imm)
-  (alu_rr_imm12 (AluOPRRI.Bexti) rs1 imm))
-
-(decl rv_binv (XReg XReg) XReg)
-(rule (rv_binv rs1 rs2)
-  (alu_rrr (AluOPRRR.Binv) rs1 rs2))
-
-(decl rv_binvi (XReg Imm12) XReg)
-(rule (rv_binvi rs1 imm)
-  (alu_rr_imm12 (AluOPRRI.Binvi) rs1 imm))
-
-(decl rv_bset (XReg XReg) XReg)
-(rule (rv_bset rs1 rs2)
-  (alu_rrr (AluOPRRR.Bset) rs1 rs2))
-
 ;; Helper for emitting the `bseti` ("Single-Bit Set Immediate") instruction.
 (decl rv_bseti (XReg Imm12) XReg)
 (rule (rv_bseti rs1 imm)
   (alu_rr_imm12 (AluOPRRI.Bseti) rs1 imm))
 
+
 ;; `Zbkb` Extension Instructions
 
 ;; Helper for emitting the `pack` ("Pack low halves of registers") instruction.
@@ -1791,66 +1629,45 @@
 (decl i64_generate_imm (Imm20 Imm12) i64)
 (extern extractor i64_generate_imm i64_generate_imm)
 
-;; Helper for generating a i64 from a shift of a Imm20 constant with LUI
-(decl i64_shift_for_lui (u64 Imm12) i64)
-(extern extractor i64_shift_for_lui i64_shift_for_lui)
-
-;; Helper for generating a i64 from a shift of a Imm20 constant
-(decl i64_shift (i64 Imm12) i64)
-(extern extractor i64_shift i64_shift)
 
 ;; Immediate Loading rules
 ;; TODO: Loading the zero reg directly causes a bunch of regalloc errors, we should look into it.
+;; TODO: We can load constants like 0x3ff0000000000000 by loading the bits then doing a shift left.
 ;; TODO: Load floats using `fld` instead of `ld`
 (decl imm (Type u64) Reg)
 
 ;; Refs get loaded as integers.
-(rule 5 (imm $R32 c) (imm $I32 c))
-(rule 5 (imm $R64 c) (imm $I64 c))
+(rule 4 (imm $R32 c) (imm $I32 c))
+(rule 4 (imm $R64 c) (imm $I64 c))
 
 ;; Floats get loaded as integers and then moved into an F register.
-(rule 5 (imm $F32 c) (gen_bitcast (imm $I32 c) $I32 $F32))
-(rule 5 (imm $F64 c) (gen_bitcast (imm $I64 c) $I64 $F64))
+(rule 4 (imm $F32 c) (gen_bitcast (imm $I32 c) $I32 $F32))
+(rule 4 (imm $F64 c) (gen_bitcast (imm $I64 c) $I64 $F64))
 
 ;; Try to match just an imm12
-(rule 4 (imm (ty_int ty) c)
+(rule 3 (imm (ty_int ty) c)
   (if-let (i64_generate_imm (imm20_is_zero) imm12) (i64_sextend_u64 ty c))
   (rv_addi (zero_reg) imm12))
 
 ;; We can also try to load using a single LUI.
 ;; LUI takes a 20 bit immediate, places it on bits 13 to 32 of the register.
 ;; In RV64 this value is then sign extended to 64bits.
-(rule 3 (imm (ty_int ty) c)
+(rule 2 (imm (ty_int ty) c)
   (if-let (i64_generate_imm imm20 (imm12_is_zero)) (i64_sextend_u64 ty c))
   (rv_lui imm20))
 
 ;; We can combo addi + lui to represent all 32-bit immediates
 ;; And some 64-bit immediates as well.
-(rule 2 (imm (ty_int ty) c)
+(rule 1 (imm (ty_int ty) c)
   (if-let (i64_generate_imm imm20 imm12) (i64_sextend_u64 ty c))
   (rv_addi (rv_lui imm20) imm12))
 
-;; If the non-zero bits of the immediate fit in 20 bits, we can use LUI + shift
-(rule 1 (imm (ty_int ty) c)
-  (if-let (i64_shift_for_lui (imm20_from_u64 base) shift) (i64_sextend_u64 ty c))
-  (rv_slli (rv_lui base) shift))
-
-;; Combine one of the above rules with a shift-left if possible, This chops off
-;; all trailing zeros from the input constant and then attempts if the resulting
-;; constant can itself use one of the above rules via the `i64_generate_imm`
-;; matcher. This will then recurse on the above rules to materialize a smaller
-;; constant which is then shifted left to create the desired constant.
-(rule 0 (imm (ty_int ty) c)
-  (if-let (i64_shift c_shifted shift) (i64_sextend_u64 ty c))  ;; constant to make
-  (if-let (i64_generate_imm _ _) c_shifted)                    ;; can the smaller constant be made?
-  (rv_slli (imm ty (i64_as_u64 c_shifted)) shift))
-
 ;; Otherwise we fall back to loading the immediate from the constant pool.
-(rule -1 (imm (ty_int ty) c)
-  (gen_load
-    (gen_const_amode (emit_u64_le_const c))
+(rule 0 (imm (ty_int ty) c)
+  (emit_load
     (LoadOP.Ld)
-    (mem_flags_trusted)))
+    (mem_flags_trusted)
+    (gen_const_amode (emit_u64_le_const c))))
 
 ;; Imm12 Rules
 
@@ -1875,10 +1692,6 @@
 (decl imm12_const_add (i32 i32) Imm12)
 (extern constructor imm12_const_add imm12_const_add)
 
-;; Performs a fallible add of the `Imm12` value and the 32-bit value provided.
-(decl pure partial imm12_add (Imm12 i32) Imm12)
-(extern constructor imm12_add imm12_add)
-
 (decl imm12_and (Imm12 u64) Imm12)
 (extern constructor imm12_and imm12_and)
 
@@ -1906,12 +1719,6 @@
 (decl pure imm20_is_zero () Imm20)
 (extern extractor imm20_is_zero imm20_is_zero)
 
-(decl imm20_from_u64 (Imm20) u64)
-(extern extractor imm20_from_u64 imm20_from_u64)
-
-(decl imm20_from_i64 (Imm20) i64)
-(extern extractor imm20_from_i64 imm20_from_i64)
-
 
 ;; Imm5 Extractors
 
@@ -1925,33 +1732,19 @@
 (decl pure partial i8_to_imm5 (i8) Imm5)
 (extern constructor i8_to_imm5 i8_to_imm5)
 
-;; Helper to go directly from a `Value` to an `Imm5`.
-(decl imm5_from_value (Imm5) Value)
-(extractor (imm5_from_value n) (i64_from_iconst (imm5_from_i64 n)))
-
-;; Constructor that matches a `Value` equivalent to a replicated Imm5 on all lanes.
-(decl pure partial replicated_imm5 (Value) Imm5)
-(rule (replicated_imm5 (splat (imm5_from_value n))) n)
-(rule (replicated_imm5 (vconst (u128_from_constant n128)))
-  (if-let (u128_replicated_u64 n64) n128)
-  (if-let (u64_replicated_u32 n32) n64)
-  (if-let (u32_replicated_u16 n16) n32)
-  (if-let (u16_replicated_u8 n8) n16)
-  (if-let n (i8_to_imm5 (u8_as_i8 n8)))
-  n)
+;; Extractor that matches a `Value` equivalent to a replicated Imm5 on all lanes.
+;; TODO(#6527): Try matching vconst here as well
+(decl replicated_imm5 (Imm5) Value)
+(extractor (replicated_imm5 n)
+  (def_inst (splat (i64_from_iconst (imm5_from_i64 n)))))
 
 ;; UImm5 Helpers
 
-;; Constructor that matches a `Value` equivalent to a replicated UImm5 on all lanes.
-(decl pure partial replicated_uimm5 (Value) UImm5)
-(rule (replicated_uimm5 (splat (uimm5_from_value n))) n)
-(rule 1 (replicated_uimm5 (vconst (u128_from_constant n128)))
-  (if-let (u128_replicated_u64 n64) n128)
-  (if-let (u64_replicated_u32 n32) n64)
-  (if-let (u32_replicated_u16 n16) n32)
-  (if-let (u16_replicated_u8 n8) n16)
-  (if-let (uimm5_from_u8 n) n8)
-  n)
+;; Extractor that matches a `Value` equivalent to a replicated UImm5 on all lanes.
+;; TODO(#6527): Try matching vconst here as well
+(decl replicated_uimm5 (UImm5) Value)
+(extractor (replicated_uimm5 n)
+  (def_inst (splat (uimm5_from_value n))))
 
 ;; Helper to go directly from a `Value`, when it's an `iconst`, to an `UImm5`.
 (decl uimm5_from_value (UImm5) Value)
@@ -1980,11 +1773,14 @@
 (rule (canonical_nan_u64 $F32) 0x7fc00000)
 (rule (canonical_nan_u64 $F64) 0x7ff8000000000000)
 
+(decl gen_default_frm () OptionFloatRoundingMode)
+(extern constructor gen_default_frm gen_default_frm)
+
 ;; Helper for emitting `MInst.FpuRR` instructions.
-(decl fpu_rr (FpuOPRR Type FRM Reg) Reg)
-(rule (fpu_rr op ty frm src)
+(decl fpu_rr (FpuOPRR Type Reg) Reg)
+(rule (fpu_rr op ty src)
       (let ((dst WritableReg (temp_writable_reg ty))
-            (_ Unit (emit (MInst.FpuRR op frm dst src))))
+            (_ Unit (emit (MInst.FpuRR op (gen_default_frm) dst src))))
         dst))
 
 ;; Helper for emitting `MInst.AluRRR` instructions.
@@ -1995,17 +1791,17 @@
         dst))
 
 ;; Helper for emitting `MInst.AluRRR` instructions.
-(decl fpu_rrr (FpuOPRRR Type FRM Reg Reg) Reg)
-(rule (fpu_rrr op ty frm src1 src2)
+(decl fpu_rrr (FpuOPRRR Type Reg Reg) Reg)
+(rule (fpu_rrr op ty src1 src2)
       (let ((dst WritableReg (temp_writable_reg ty))
-            (_ Unit (emit (MInst.FpuRRR op frm dst src1 src2))))
+            (_ Unit (emit (MInst.FpuRRR op (gen_default_frm) dst src1 src2))))
         dst))
 
 ;; Helper for emitting `MInst.FpuRRRR` instructions.
-(decl fpu_rrrr (FpuOPRRRR Type FRM Reg Reg Reg) Reg)
-(rule (fpu_rrrr op ty frm src1 src2 src3)
+(decl fpu_rrrr (FpuOPRRRR Type Reg Reg Reg) Reg)
+(rule (fpu_rrrr op ty src1 src2 src3)
       (let ((dst WritableReg (temp_writable_reg ty))
-            (_ Unit (emit (MInst.FpuRRRR op frm dst src1 src2 src3))))
+            (_ Unit (emit (MInst.FpuRRRR op (gen_default_frm) dst src1 src2 src3))))
         dst))
 
 
@@ -2052,6 +1848,33 @@
 (rule (select_addi (fits_in_64 ty)) (AluOPRRI.Addi))
 
 
+(decl gen_bnot (Type ValueRegs) ValueRegs)
+(rule 2 (gen_bnot (ty_scalar_float ty) x)
+  (let ((val FReg (value_regs_get x 0))
+        (x_val XReg (move_f_to_x val ty))
+        (inverted XReg (rv_not x_val))
+        (res FReg (move_x_to_f inverted (float_int_of_same_size ty))))
+    (value_reg res)))
+
+(rule 1 (gen_bnot $I128 x)
+  (let ((lo XReg (rv_not (value_regs_get x 0)))
+        (hi XReg (rv_not (value_regs_get x 1))))
+    (value_regs lo hi)))
+
+(rule 0 (gen_bnot (ty_int_ref_scalar_64 _) x)
+  (rv_not (value_regs_get x 0)))
+
+
+(decl gen_and (Type ValueRegs ValueRegs) ValueRegs)
+(rule 1 (gen_and $I128 x y)
+  (value_regs
+    (rv_and (value_regs_get x 0) (value_regs_get y 0))
+    (rv_and (value_regs_get x 1) (value_regs_get y 1))))
+
+(rule 0 (gen_and (fits_in_64 _) x y)
+  (rv_and (value_regs_get x 0) (value_regs_get y 0)))
+
+
 (decl gen_andi (XReg u64) XReg)
 (rule 1 (gen_andi x (imm12_from_u64 y))
   (rv_andi x y))
@@ -2070,6 +1893,69 @@
   (rv_or (value_regs_get x 0) (value_regs_get y 0)))
 
 
+
+(decl gen_bswap (Type XReg) XReg)
+
+;; This is only here to make the rule below work. bswap.i8 isn't valid
+(rule 0 (gen_bswap $I8 x) x)
+
+(rule 1 (gen_bswap (ty_int_ref_16_to_64 ty) x)
+  (if-let half_ty (ty_half_width ty))
+  (if-let half_size (u64_to_imm12 (ty_bits half_ty)))
+  (let (;; This swaps the top bytes and zeroes the bottom bytes, so that
+        ;; we can or it with the bottom bytes later.
+        (swap_top XReg (gen_bswap half_ty x))
+        (top XReg (rv_slli swap_top half_size))
+
+        ;; Get the top half, swap it, and zero extend it so we can `or` it
+        ;; with the bottom half.
+        (shifted XReg (rv_srli x half_size))
+        (swap_bot XReg (gen_bswap half_ty shifted))
+        (bot XReg (zext swap_bot half_ty $I64)))
+    (rv_or top bot)))
+
+;; With `zbb` we can use `rev8` and shift the result
+(rule 2 (gen_bswap (int_fits_in_32 ty) x)
+  (if-let $true (has_zbb))
+  (if-let shift_amt (u64_to_imm12 (u64_sub 64 (ty_bits ty))))
+  (rv_srli (rv_rev8 x) shift_amt))
+
+;; With `zbb` we can use `rev8` that does this
+(rule 3 (gen_bswap $I64 x)
+  (if-let $true (has_zbb))
+  (rv_rev8 x))
+
+
+
+(decl lower_bit_reverse (Reg Type) Reg)
+
+(rule
+  (lower_bit_reverse r $I8)
+  (gen_brev8 r $I8))
+
+(rule
+  (lower_bit_reverse r $I16)
+  (let
+    ((tmp XReg (gen_brev8 r $I16))
+      (tmp2 XReg (gen_rev8 tmp))
+      (result XReg (rv_srli tmp2 (imm12_const 48))))
+    result))
+
+(rule
+  (lower_bit_reverse r $I32)
+  (let
+    ((tmp XReg (gen_brev8 r $I32))
+      (tmp2 XReg (gen_rev8 tmp))
+      (result XReg (rv_srli tmp2 (imm12_const 32))))
+    result))
+
+(rule
+  (lower_bit_reverse r $I64)
+  (let
+    ((tmp XReg (gen_rev8 r)))
+    (gen_brev8 tmp $I64)))
+
+
 (decl lower_ctz (Type Reg) Reg)
 (rule (lower_ctz ty x)
   (gen_cltz $false x ty))
@@ -2087,8 +1973,77 @@
   (if-let $true (has_zbb))
   (rv_ctz x))
 
+;; Count trailing zeros from a i128 bit value.
+;; We count both halves separately and conditionally add them if it makes sense.
+(decl lower_ctz_128 (ValueRegs) ValueRegs)
+(rule (lower_ctz_128 x)
+  (let ((x_lo XReg (value_regs_get x 0))
+        (x_hi XReg (value_regs_get x 1))
+        ;; Count both halves
+        (high XReg (lower_ctz $I64 x_hi))
+        (low XReg (lower_ctz $I64 x_lo))
+        ;; Only add the top half if the bottom is zero
+        (high XReg (gen_select_reg (IntCC.Equal) x_lo (zero_reg) high (zero_reg)))
+        (result XReg (rv_add low high)))
+    (extend result (ExtendOp.Zero) $I64 $I128)))
+
+(decl lower_clz (Type XReg) XReg)
+(rule (lower_clz ty rs)
+  (gen_cltz $true rs ty))
+
+(rule 1 (lower_clz (fits_in_16 ty) r)
+  (if-let $true (has_zbb))
+  (let ((tmp XReg (zext r ty $I64))
+        (count XReg (rv_clz tmp))
+        ;; We always do the operation on the full 64-bit register, so subtract 64 from the result.
+        (result XReg (rv_addi count (imm12_const_add (ty_bits ty) -64))))
+    result))
+
+(rule 2 (lower_clz $I32 r)
+  (if-let $true (has_zbb))
+  (rv_clzw r))
+
+(rule 2 (lower_clz $I64 r)
+  (if-let $true (has_zbb))
+  (rv_clz r))
+
+
 ;; Count leading zeros from a i128 bit value.
 ;; We count both halves separately and conditionally add them if it makes sense.
+(decl lower_clz_i128 (ValueRegs) ValueRegs)
+(rule (lower_clz_i128 x)
+  (let ((x_lo XReg (value_regs_get x 0))
+        (x_hi XReg (value_regs_get x 1))
+        ;; Count both halves
+        (high XReg (lower_clz $I64 x_hi))
+        (low XReg (lower_clz $I64 x_lo))
+        ;; Only add the bottom zeros if the top half is zero
+        (low XReg (gen_select_reg (IntCC.Equal) x_hi (zero_reg) low (zero_reg)))
+        (result XReg (rv_add high low)))
+    (extend result (ExtendOp.Zero) $I64 $I128)))
+
+
+(decl lower_cls (Type XReg) XReg)
+(rule (lower_cls ty r)
+  (let ((tmp XReg (sext r ty $I64))
+        (tmp2 XReg (gen_select_reg (IntCC.SignedLessThan) tmp (zero_reg) (rv_not tmp) tmp))
+        (tmp3 XReg (lower_clz ty tmp2)))
+    (rv_addi tmp3 (imm12_const -1))))
+
+;; If the sign bit is set, we count the leading zeros of the inverted value.
+;; Otherwise we can just count the leading zeros of the original value.
+;; Subtract 1 since the sign bit does not count.
+(decl lower_cls_i128 (ValueRegs) ValueRegs)
+(rule (lower_cls_i128 x)
+  (let ((low XReg (value_regs_get x 0))
+        (high XReg (value_regs_get x 1))
+        (low XReg (gen_select_reg (IntCC.SignedLessThan) high (zero_reg) (rv_not low) low))
+        (high XReg (gen_select_reg (IntCC.SignedLessThan) high (zero_reg) (rv_not high) high))
+        (tmp ValueRegs (lower_clz_i128 (value_regs low high)))
+        (count XReg (value_regs_get tmp 0))
+        (result XReg (rv_addi count (imm12_const -1))))
+    (extend result (ExtendOp.Zero) $I64 $I128)))
+
 
 (decl gen_cltz (bool XReg Type) XReg)
 (rule (gen_cltz leading rs ty)
@@ -2098,108 +2053,122 @@
         (_ Unit (emit (MInst.Cltz leading sum step tmp rs ty))))
     sum))
 
+
+;; Extends an integer if it is smaller than 64 bits.
+(decl ext_int_if_need (bool ValueRegs Type) ValueRegs)
+;;; For values smaller than 64 bits, we need to extend them to 64 bits
+(rule 0 (ext_int_if_need $true val (fits_in_32 (ty_int ty)))
+  (extend val (ExtendOp.Signed) ty $I64))
+(rule 0 (ext_int_if_need $false val (fits_in_32 (ty_int ty)))
+  (extend val (ExtendOp.Zero) ty $I64))
+;; If the value is larger than one machine register, we don't need to do anything
+(rule 1 (ext_int_if_need _ r $I64) r)
+(rule 2 (ext_int_if_need _ r $I128) r)
+
+
 ;; Performs a zero extension of the given value
-(decl zext (Value) XReg)
+(decl zext (XReg Type Type) XReg)
+(rule (zext val from_ty (fits_in_64 to_ty)) (value_regs_get (extend val (ExtendOp.Zero) from_ty to_ty) 0))
+
+;; Performs a signed extension of the given value
+(decl sext (XReg Type Type) XReg)
+(rule (sext val from_ty (fits_in_64 to_ty)) (value_regs_get (extend val (ExtendOp.Signed) from_ty to_ty) 0))
+
+(type ExtendOp
+  (enum
+    (Zero)
+    (Signed)))
+
+;; Performs either a sign or zero extension of the given value
+(decl extend (ValueRegs ExtendOp Type Type) ValueRegs)
+
+;;; Generic Rules Extending to I64
+(decl pure extend_shift_op (ExtendOp) AluOPRRI)
+(rule (extend_shift_op (ExtendOp.Zero)) (AluOPRRI.Srli))
+(rule (extend_shift_op (ExtendOp.Signed)) (AluOPRRI.Srai))
 
 ;; In the most generic case, we shift left and then shift right.
-(rule 0 (zext val @ (value_type (fits_in_32 ty)))
-  (let ((shift Imm12 (imm_from_bits (u64_sub 64 (ty_bits ty)))))
-    (rv_srli (rv_slli val shift) shift)))
+;; The type of right shift is determined by the extend op.
+(rule 0 (extend val extend_op (fits_in_32 from_ty) (fits_in_64 to_ty))
+  (let ((val XReg (value_regs_get val 0))
+        (shift Imm12 (imm_from_bits (u64_sub 64 (ty_bits from_ty))))
+        (left XReg (rv_slli val shift))
+        (shift_op AluOPRRI (extend_shift_op extend_op))
+        (right XReg (alu_rr_imm12 shift_op left shift)))
+    right))
 
 ;; If we are zero extending a U8 we can use a `andi` instruction.
-(rule 1 (zext val @ (value_type $I8))
-  (rv_andi val (imm12_const 0xff)))
+(rule 1 (extend val (ExtendOp.Zero) $I8 (fits_in_64 to_ty))
+  (let ((val XReg (value_regs_get val 0)))
+    (rv_andi val (imm12_const 255))))
+
+;; When signed extending from 32 to 64 bits we can use a
+;; `addiw val 0`. Also known as a `sext.w`
+(rule 1 (extend val (ExtendOp.Signed) $I32 $I64)
+  (let ((val XReg (value_regs_get val 0)))
+    (rv_sextw val)))
+
 
 ;; No point in trying to use `packh` here to zero extend 8 bit values
 ;; since we can just use `andi` instead which is part of the base ISA.
 
 ;; If we have the `zbkb` extension `packw` can be used to zero extend 16 bit values
-(rule 1 (zext val @ (value_type $I16))
+(rule 1 (extend val (ExtendOp.Zero) $I16 (fits_in_64 _))
   (if-let $true (has_zbkb))
-  (rv_packw val (zero_reg)))
+  (let ((val XReg (value_regs_get val 0)))
+    (rv_packw val (zero_reg))))
 
 ;; If we have the `zbkb` extension `pack` can be used to zero extend 32 bit registers
-(rule 1 (zext val @ (value_type $I32))
+(rule 1 (extend val (ExtendOp.Zero) $I32 $I64)
   (if-let $true (has_zbkb))
-  (rv_pack val (zero_reg)))
+  (let ((val XReg (value_regs_get val 0)))
+    (rv_pack val (zero_reg))))
+
+
+;; If we have the `zbb` extension we can use the dedicated `sext.b` instruction.
+(rule 1 (extend val (ExtendOp.Signed) $I8 (fits_in_64 _))
+  (if-let $true (has_zbb))
+  (let ((val XReg (value_regs_get val 0)))
+    (rv_sextb val)))
+
+;; If we have the `zbb` extension we can use the dedicated `sext.h` instruction.
+(rule 1 (extend val (ExtendOp.Signed) $I16 (fits_in_64 _))
+  (if-let $true (has_zbb))
+  (let ((val XReg (value_regs_get val 0)))
+    (rv_sexth val)))
 
 ;; If we have the `zbb` extension we can use the dedicated `zext.h` instruction.
-(rule 2 (zext val @ (value_type $I16))
+(rule 2 (extend val (ExtendOp.Zero) $I16 (fits_in_64 _))
   (if-let $true (has_zbb))
-  (rv_zexth val))
+  (let ((val XReg (value_regs_get val 0)))
+    (rv_zexth val)))
 
 ;; With `zba` we have a `zext.w` instruction
-(rule 2 (zext val @ (value_type $I32))
+(rule 2 (extend val (ExtendOp.Zero) $I32 $I64)
   (if-let $true (has_zba))
-  (rv_zextw val))
-
-;; Ignore sign extensions for values whose representation is already the full
-;; register width.
-(rule 3 (zext val)
-  (if (val_already_extended (ExtendOp.Zero) val))
-  val)
-
-;; Performs a signed extension of the given value
-(decl sext (Value) XReg)
-
-;; Same base case as `zext`, shift left-then-right.
-(rule 0 (sext val @ (value_type (fits_in_32 ty)))
-  (let ((shift Imm12 (imm_from_bits (u64_sub 64 (ty_bits ty)))))
-    (rv_srai (rv_slli val shift) shift)))
+  (let ((val XReg (value_regs_get val 0)))
+    (rv_zextw val)))
+
+;;; Signed rules extending to I128
+;; Extend the bottom part, and extract the sign bit from the bottom as the top
+(rule 3 (extend val (ExtendOp.Signed) (fits_in_64 from_ty) $I128)
+  (let ((val XReg (value_regs_get val 0))
+        (low XReg (sext val from_ty $I64))
+        (high XReg (rv_srai low (imm12_const 63))))
+    (value_regs low high)))
 
-;; If we have the `zbb` extension we can use the dedicated `sext.b` instruction.
-(rule 1 (sext val @ (value_type $I8))
-  (if-let $true (has_zbb))
-  (rv_sextb val))
+;;; Unsigned rules extending to I128
+;; Extend the bottom register to I64 and then just zero out the top half.
+(rule 3 (extend val (ExtendOp.Zero) (fits_in_64 from_ty) $I128)
+  (let ((val XReg (value_regs_get val 0))
+        (low XReg (zext val from_ty $I64))
+        (high XReg (imm $I64 0)))
+    (value_regs low high)))
 
-;; If we have the `zbb` extension we can use the dedicated `sext.h` instruction.
-(rule 1 (sext val @ (value_type $I16))
-  (if-let $true (has_zbb))
-  (rv_sexth val))
+;; Catch all rule for ignoring extensions of the same type.
+(rule 4 (extend val _ ty ty) val)
 
-;; When signed extending from 32 to 64 bits we can use a
-;; `addiw val 0`. Also known as a `sext.w`
-(rule 1 (sext val @ (value_type $I32))
-  (rv_sextw val))
-
-;; Ignore sign extensions for values whose representation is already the full
-;; register width.
-(rule 2 (sext val)
-  (if (val_already_extended (ExtendOp.Signed) val))
-  val)
-
-;; Helper matcher for when a value's representation is already sign or zero
-;; extended to the full 64-bit register representation. This is used by `zext`
-;; and `sext` above to skip the extension instruction entirely in some
-;; circumstances.
-(decl pure partial val_already_extended (ExtendOp Value) bool)
-(rule 0 (val_already_extended _ v @ (value_type $I64)) $true)
-
-;; When extending our backend always extends to the full register width, so
-;; there's no need to extend-an-extend.
-(rule 1 (val_already_extended (ExtendOp.Zero) (uextend _)) $true)
-(rule 1 (val_already_extended (ExtendOp.Signed) (sextend _)) $true)
-
-;; The result of `icmp`/`fcmp` is zero or one, meaning that it's already sign
-;; extended to the full register width.
-(rule 1 (val_already_extended _ (icmp _ _ _)) $true)
-(rule 1 (val_already_extended _ (fcmp _ _ _)) $true)
-
-;; The lowering for these operations always sign-extend their results due to the
-;; use of the `*w` instructions in RV64I. Note that this requires that the
-;; extension is from 32 to 64, 16/8-bit operations are explicitly excluded here.
-;; There are no native instructions for the 16/8 bit operations so they must
-;; fall through to actual sign extension above.
-(rule 1 (val_already_extended (ExtendOp.Signed) (has_type $I32 (ishl _ _))) $true)
-(rule 1 (val_already_extended (ExtendOp.Signed) (has_type $I32 (ushr _ _))) $true)
-(rule 1 (val_already_extended (ExtendOp.Signed) (has_type $I32 (sshr _ _))) $true)
-(rule 1 (val_already_extended (ExtendOp.Signed) (has_type $I32 (iadd _ _))) $true)
-(rule 1 (val_already_extended (ExtendOp.Signed) (has_type $I32 (isub _ _))) $true)
 
-(type ExtendOp
-  (enum
-    (Zero)
-    (Signed)))
 
 (decl lower_b128_binary (AluOPRRR ValueRegs ValueRegs) ValueRegs)
 (rule
@@ -2211,6 +2180,15 @@
       (high XReg (alu_rrr op (value_regs_get a 1) (value_regs_get b 1))))
     (value_regs low high)))
 
+(decl lower_umlhi (Type XReg XReg) XReg)
+(rule 1 (lower_umlhi $I64 rs1 rs2)
+  (rv_mulhu rs1 rs2))
+
+(rule (lower_umlhi ty rs1 rs2)
+  (let
+    ((tmp XReg (rv_mul (zext rs1 ty $I64) (zext rs2 ty $I64))))
+    (rv_srli tmp (imm12_const (ty_bits ty)))))
+
 (decl lower_smlhi (Type XReg XReg) XReg)
 (rule 1
   (lower_smlhi $I64 rs1 rs2)
@@ -2222,12 +2200,101 @@
     ((tmp XReg (rv_mul rs1 rs2)))
     (rv_srli tmp (imm12_const (ty_bits ty)))))
 
+
+(decl lower_rotl (Type XReg XReg) XReg)
+
+(rule 1
+  (lower_rotl $I64 rs amount)
+  (if-let $true (has_zbb))
+  (rv_rol rs amount))
+
+(rule
+  (lower_rotl $I64 rs amount)
+  (if-let $false (has_zbb))
+  (lower_rotl_shift $I64 rs amount))
+
+(rule 1
+  (lower_rotl $I32 rs amount)
+  (if-let $true (has_zbb))
+  (rv_rolw rs amount))
+
+(rule
+  (lower_rotl $I32 rs amount)
+  (if-let $false (has_zbb))
+  (lower_rotl_shift $I32 rs amount))
+
+(rule -1
+  (lower_rotl ty rs amount)
+  (lower_rotl_shift ty rs amount))
+
+;;; using shift to implement rotl.
+(decl lower_rotl_shift (Type XReg XReg) XReg)
+
+;;; for I8 and I16 ...
+(rule
+  (lower_rotl_shift ty rs amount)
+  (let
+    ((x ValueRegs (gen_shamt ty amount))
+      (shamt Reg (value_regs_get x 0))
+      (len_sub_shamt Reg (value_regs_get x 1))
+      ;;
+      (part1 Reg (rv_sll rs shamt))
+      ;;
+      (part2 Reg (rv_srl rs len_sub_shamt))
+      (part3 Reg (gen_select_reg (IntCC.Equal) shamt (zero_reg) (zero_reg) part2)))
+    (rv_or part1 part3)))
+
+
 ;;;; construct shift amount.rotl on i128 will use shift to implement. So can call this function.
 ;;;; this will return shift amount and (ty_bits - "shift amount")
 ;;;; if ty_bits is greater than 64 like i128, then shmat will fallback to 64.because We are 64 bit platform.
 (decl gen_shamt (Type XReg) ValueRegs)
 (extern constructor gen_shamt gen_shamt)
 
+(decl lower_rotr (Type XReg XReg) XReg)
+
+(rule 1
+  (lower_rotr $I64 rs amount)
+  (if-let $true (has_zbb))
+  (rv_ror rs amount))
+(rule
+  (lower_rotr $I64 rs amount)
+  (if-let $false (has_zbb))
+  (lower_rotr_shift $I64 rs amount))
+
+(rule 1
+  (lower_rotr $I32 rs amount)
+  (if-let $true (has_zbb))
+  (rv_rorw rs amount))
+
+(rule
+  (lower_rotr $I32 rs amount)
+  (if-let $false (has_zbb))
+  (lower_rotr_shift $I32 rs amount))
+
+(rule -1
+  (lower_rotr ty rs amount)
+  (lower_rotr_shift ty rs amount))
+
+(decl lower_rotr_shift (Type XReg XReg) XReg)
+
+;;;
+(rule
+  (lower_rotr_shift ty rs amount)
+  (let
+    ((x ValueRegs (gen_shamt ty amount))
+      (shamt XReg (value_regs_get x 0))
+      (len_sub_shamt XReg (value_regs_get x 1))
+      ;;
+      (part1 XReg (rv_srl rs shamt))
+      ;;
+      (part2 XReg (rv_sll rs len_sub_shamt))
+      ;;
+      (part3 XReg (gen_select_reg (IntCC.Equal) shamt (zero_reg) (zero_reg) part2)))
+    (rv_or part1 part3)))
+
+
+
 ;; bseti: Set a single bit in a register, indexed by a constant.
 (decl gen_bseti (Reg u64) Reg)
 (rule (gen_bseti val bit)
@@ -2246,75 +2313,101 @@
   (rv_bseti val (imm12_const (u64_as_i32 bit))))
 
 
-(decl gen_popcnt (XReg) Reg)
-(rule (gen_popcnt rs)
+(decl gen_popcnt (Reg Type) Reg)
+(rule
+  (gen_popcnt rs ty)
   (let
     ((tmp WritableXReg (temp_writable_xreg))
       (step WritableXReg (temp_writable_xreg))
       (sum WritableXReg (temp_writable_xreg))
-      (_ Unit (emit (MInst.Popcnt sum step tmp rs $I64))))
+      (_ Unit (emit (MInst.Popcnt sum step tmp rs ty))))
     (writable_reg_to_reg sum)))
 
-;; Generates a AMode that points to a register plus an offset.
-(decl gen_reg_offset_amode (Reg i64 Type) AMode)
-(extern constructor gen_reg_offset_amode gen_reg_offset_amode)
-
-;; Generates a AMode that an offset from the stack pointer.
-(decl gen_sp_offset_amode (i64 Type) AMode)
-(extern constructor gen_sp_offset_amode gen_sp_offset_amode)
-
-;; Generates a AMode that an offset from the frame pointer.
-(decl gen_fp_offset_amode (i64 Type) AMode)
-(extern constructor gen_fp_offset_amode gen_fp_offset_amode)
-
-;; Generates an AMode that points to a stack slot + offset.
-(decl gen_stack_slot_amode (StackSlot i64 Type) AMode)
-(extern constructor gen_stack_slot_amode gen_stack_slot_amode)
-
-;; Generates a AMode that points to a constant in the constant pool.
-(decl gen_const_amode (VCodeConstant) AMode)
-(extern constructor gen_const_amode gen_const_amode)
-
-
-
-;; Tries to match a Value + Offset into an AMode
-(decl amode (Value i32 Type) AMode)
-(rule 0 (amode addr offset ty) (amode_inner addr offset ty))
-
-;; If we are adding a constant offset with an iadd we can instead make that
-;; offset part of the amode offset.
-;;
-;; We can't recurse into `amode` again since that could cause stack overflows.
-;; See: https://github.com/bytecodealliance/wasmtime/pull/6968
-(rule 1 (amode (iadd addr (iconst (simm32 y))) offset ty)
-  (if-let new_offset (s32_add_fallible y offset))
-  (amode_inner addr new_offset ty))
-(rule 2 (amode (iadd (iconst (simm32 x)) addr) offset ty)
-  (if-let new_offset (s32_add_fallible x offset))
-  (amode_inner addr new_offset ty))
-
+(decl lower_popcnt (XReg Type) XReg)
+(rule 1 (lower_popcnt rs ty)
+  (if-let $true (has_zbb))
+  (rv_cpop (zext rs ty $I64)))
 
-;; These are the normal rules for generating an AMode.
-(decl amode_inner (Value i32 Type) AMode)
+(rule (lower_popcnt rs ty)
+  (if-let $false (has_zbb))
+  (gen_popcnt rs ty))
 
-;; In the simplest case we just lower into a Reg+Offset
-(rule 0 (amode_inner r @ (value_type (ty_addr64 _)) offset ty)
-  (gen_reg_offset_amode r offset ty))
+(decl lower_popcnt_i128 (ValueRegs) ValueRegs)
+(rule
+  (lower_popcnt_i128 a)
+  (let
+    ( ;; low part.
+      (low XReg (lower_popcnt (value_regs_get a 0) $I64))
+      ;; high part.
+      (high XReg (lower_popcnt (value_regs_get a 1) $I64))
+      ;; add toghter.
+      (result XReg (rv_add low high)))
+    (value_regs result (imm $I64 0))))
 
-;; If the value is a `get_frame_pointer`, we can just use the offset from that.
-(rule 1 (amode_inner (get_frame_pointer) offset ty)
-  (gen_fp_offset_amode offset ty))
+(decl lower_i128_rotl (ValueRegs ValueRegs) ValueRegs)
+(rule
+  (lower_i128_rotl x y)
+  (let
+    ((tmp ValueRegs (gen_shamt $I128 (value_regs_get y 0)))
+      (shamt XReg (value_regs_get tmp 0))
+      (len_sub_shamt XReg (value_regs_get tmp 1))
+      ;;
+      (low_part1 XReg (rv_sll (value_regs_get x 0) shamt))
+      (low_part2 XReg (rv_srl (value_regs_get x 1) len_sub_shamt))
+      ;;; if shamt == 0 low_part2 will overflow we should zero instead.
+      (low_part3 XReg (gen_select_reg (IntCC.Equal) shamt (zero_reg) (zero_reg) low_part2))
+      (low XReg (rv_or low_part1 low_part3))
+      ;;
+      (high_part1 XReg (rv_sll (value_regs_get x 1) shamt))
+      (high_part2 XReg (rv_srl (value_regs_get x 0) len_sub_shamt))
+      (high_part3 XReg (gen_select_reg (IntCC.Equal) shamt (zero_reg) (zero_reg) high_part2))
+      (high XReg (rv_or high_part1 high_part3))
+      ;;
+      (const64 XReg (imm $I64 64))
+      (shamt_128 XReg (rv_andi (value_regs_get y 0) (imm12_const 127))))
+    ;; right now we only rotate less than 64 bits.
+    ;; if shamt is greater than or equal 64 , we should switch low and high.
+    (value_regs
+      (gen_select_reg (IntCC.UnsignedGreaterThanOrEqual) shamt_128 const64 high low)
+      (gen_select_reg (IntCC.UnsignedGreaterThanOrEqual) shamt_128 const64 low high)
+    )))
 
-;; If the value is a `get_stack_pointer`, we can just use the offset from that.
-(rule 1 (amode_inner (get_stack_pointer) offset ty)
-  (gen_sp_offset_amode offset ty))
 
-;; Similarly if the value is a `stack_addr` we can also turn that into an sp offset.
-(rule 1 (amode_inner (stack_addr ss ss_offset) amode_offset ty)
-  (if-let combined_offset (s32_add_fallible ss_offset amode_offset))
-  (gen_stack_slot_amode ss combined_offset ty))
+(decl lower_i128_rotr (ValueRegs ValueRegs) ValueRegs)
+(rule
+  (lower_i128_rotr x y)
+  (let
+    ((tmp ValueRegs (gen_shamt $I128 (value_regs_get y 0)))
+      (shamt XReg (value_regs_get tmp 0))
+      (len_sub_shamt XReg (value_regs_get tmp 1))
+      ;;
+      (low_part1 XReg (rv_srl (value_regs_get x 0) shamt))
+      (low_part2 XReg (rv_sll (value_regs_get x 1) len_sub_shamt))
+      ;;; if shamt == 0 low_part2 will overflow we should zero instead.
+      (low_part3 XReg (gen_select_reg (IntCC.Equal) shamt (zero_reg) (zero_reg) low_part2))
+      (low XReg (rv_or low_part1 low_part3))
+      ;;
+      (high_part1 XReg (rv_srl (value_regs_get x 1) shamt))
+      (high_part2 XReg (rv_sll (value_regs_get x 0) len_sub_shamt))
+      (high_part3 XReg (gen_select_reg (IntCC.Equal) shamt (zero_reg) (zero_reg) high_part2))
+      (high XReg (rv_or high_part1 high_part3))
 
+      ;;
+      (const64 XReg (imm $I64 64))
+      (shamt_128 XReg (rv_andi (value_regs_get y 0) (imm12_const 127))))
+    ;; right now we only rotate less than 64 bits.
+    ;; if shamt is greater than or equal 64 , we should switch low and high.
+    (value_regs
+      (gen_select_reg (IntCC.UnsignedGreaterThanOrEqual) shamt_128 const64 high low)
+      (gen_select_reg (IntCC.UnsignedGreaterThanOrEqual) shamt_128 const64 low high)
+    )))
+
+(decl gen_amode (Reg Offset32 Type) AMode)
+(extern constructor gen_amode gen_amode)
 
+;; Generates a AMode that points to a constant in the constant pool.
+(decl gen_const_amode (VCodeConstant) AMode)
+(extern constructor gen_const_amode gen_const_amode)
 
 
 ;; Returns a canonical type for a LoadOP. We only return I64 or F64.
@@ -2323,20 +2416,43 @@
 (rule 1 (load_op_reg_type (LoadOP.Flw)) $F64)
 (rule 0 (load_op_reg_type _) $I64)
 
+(decl emit_load (LoadOP MemFlags AMode) Reg)
+(rule (emit_load op flags from)
+      (let ((dst WritableReg (temp_writable_reg (load_op_reg_type op)))
+            (_ Unit (emit (MInst.Load dst op flags from))))
+        dst))
+
 ;; helper function to load from memory.
-(decl gen_load (AMode LoadOP MemFlags) Reg)
-(rule (gen_load amode op flags)
-  (let ((dst WritableReg (temp_writable_reg (load_op_reg_type op)))
-      (_ Unit (emit (MInst.Load dst op flags amode))))
-    dst))
+(decl gen_load (Reg Offset32 LoadOP MemFlags Type) Reg)
+(rule (gen_load p offset op flags ty)
+  (emit_load op flags (gen_amode p offset $I64)))
+
+(decl gen_load_128 (Reg Offset32 MemFlags) ValueRegs)
+(rule (gen_load_128 p offset flags)
+  (let ((low Reg (gen_load p offset (LoadOP.Ld) flags $I64))
+        (high Reg (gen_load p (offset32_add offset 8) (LoadOP.Ld) flags $I64)))
+    (value_regs low high)))
 
-;; helper function to store to memory.
-(decl gen_store (AMode StoreOP MemFlags Reg) InstOutput)
-(rule (gen_store amode op flags src)
-  (side_effect (SideEffectNoResult.Inst (MInst.Store amode op flags src))))
+(decl default_memflags () MemFlags)
+(extern constructor default_memflags default_memflags)
 
+(decl offset32_add (Offset32 i64) Offset32)
+(extern constructor offset32_add offset32_add)
 
+;; helper function to store to memory.
+(decl gen_store (Reg Offset32 StoreOP MemFlags Reg) InstOutput)
+(rule
+  (gen_store base offset op flags src)
+  (side_effect (SideEffectNoResult.Inst (MInst.Store (gen_amode base offset $I64) op flags src)))
+)
 
+(decl gen_store_128 (Reg Offset32 MemFlags ValueRegs) InstOutput)
+(rule
+  (gen_store_128 p offset flags src)
+  (side_effect
+    (SideEffectNoResult.Inst2
+      (MInst.Store (gen_amode p offset $I64) (StoreOP.Sd) flags (value_regs_get src 0))
+      (MInst.Store (gen_amode p (offset32_add offset 8) $I64) (StoreOP.Sd) flags (value_regs_get src 1)))))
 
 (decl valid_atomic_transaction (Type) Type)
 (extern extractor valid_atomic_transaction valid_atomic_transaction)
@@ -2448,54 +2564,41 @@
 (decl gen_stack_addr (StackSlot Offset32) Reg)
 (extern constructor gen_stack_addr gen_stack_addr)
 
-(decl gen_select_xreg (IntegerCompare XReg XReg) XReg)
-
-(rule 1 (gen_select_xreg (int_compare_decompose cc x y) x y)
-  (if-let (IntCC.UnsignedLessThan) (intcc_without_eq cc))
-  (if-let $true (has_zbb))
-  (rv_minu x y))
-
-(rule 1 (gen_select_xreg (int_compare_decompose cc x y) x y)
-  (if-let (IntCC.SignedLessThan) (intcc_without_eq cc))
-  (if-let $true (has_zbb))
-  (rv_min x y))
+;;
+(decl gen_select (Type Reg ValueRegs ValueRegs) ValueRegs)
+(rule
+  (gen_select ty c x y)
+  (let
+    ((dst VecWritableReg (alloc_vec_writable ty))
+      ;;
+      (reuslt VecWritableReg (vec_writable_clone dst))
+      (_ Unit (emit (MInst.Select dst ty c x y))))
+    (vec_writable_to_regs reuslt)))
 
-(rule 1 (gen_select_xreg (int_compare_decompose cc x y) x y)
-  (if-let (IntCC.UnsignedGreaterThan) (intcc_without_eq cc))
-  (if-let $true (has_zbb))
-  (rv_maxu x y))
+;; Parameters are "intcc compare_a compare_b rs1 rs2".
+(decl gen_select_reg (IntCC XReg XReg Reg Reg) Reg)
+(extern constructor gen_select_reg gen_select_reg)
 
-(rule 1 (gen_select_xreg (int_compare_decompose cc x y) x y)
-  (if-let (IntCC.SignedGreaterThan) (intcc_without_eq cc))
-  (if-let $true (has_zbb))
-  (rv_max x y))
+;;; clone WritableReg
+;;; if not rust compiler will complain about use moved value.
+(decl vec_writable_clone (VecWritableReg) VecWritableReg)
+(extern constructor vec_writable_clone vec_writable_clone)
 
-(rule 0 (gen_select_xreg c x y)
-  (let
-    ((dst WritableReg (temp_writable_xreg))
-     (_ Unit (emit (MInst.Select dst c x y))))
-    (writable_reg_to_reg dst)))
+(decl vec_writable_to_regs (VecWritableReg) ValueRegs)
+(extern constructor vec_writable_to_regs vec_writable_to_regs)
 
+(decl alloc_vec_writable (Type) VecWritableReg)
+(extern constructor alloc_vec_writable alloc_vec_writable)
 
-(decl gen_select_vreg (IntegerCompare VReg VReg) VReg)
-(rule (gen_select_vreg c x y)
-  (let
-    ((dst WritableReg (temp_writable_vreg))
-     (_ Unit (emit (MInst.Select dst c (vreg_to_reg x) (vreg_to_reg y)))))
-    (writable_reg_to_reg dst)))
-(decl gen_select_freg (IntegerCompare FReg FReg) FReg)
-(rule (gen_select_freg c x y)
-  (let
-    ((dst WritableReg (temp_writable_freg))
-     (_ Unit (emit (MInst.Select dst c (freg_to_reg x) (freg_to_reg y)))))
-    (writable_reg_to_reg dst)))
-(decl gen_select_regs (IntegerCompare ValueRegs ValueRegs) ValueRegs)
-(rule (gen_select_regs c x y)
+(decl gen_int_select (Type IntSelectOP ValueRegs ValueRegs) ValueRegs)
+(rule
+  (gen_int_select ty op x y)
   (let
-    ((dst1 WritableReg (temp_writable_xreg))
-     (dst2 WritableReg (temp_writable_xreg))
-     (_ Unit (emit (MInst.Select (writable_value_regs dst1 dst2) c x y))))
-    (value_regs dst1 dst2)))
+    ( ;;;
+      (dst VecWritableReg (alloc_vec_writable ty))
+      ;;;
+      (_ Unit (emit (MInst.IntSelect op (vec_writable_clone dst) x y ty))))
+    (vec_writable_to_regs dst)))
 
 (decl udf (TrapCode) InstOutput)
 (rule
@@ -2508,6 +2611,32 @@
 (decl store_op (Type) StoreOP)
 (extern constructor store_op store_op)
 
+;; bool is "is_signed"
+(decl int_load_op (bool u8) LoadOP)
+(rule
+  (int_load_op $false 8)
+  (LoadOP.Lbu))
+
+(rule
+  (int_load_op $true 8)
+  (LoadOP.Lb))
+
+(rule
+  (int_load_op $false 16)
+  (LoadOP.Lhu))
+(rule
+  (int_load_op $true 16)
+  (LoadOP.Lh))
+(rule
+  (int_load_op $false 32)
+  (LoadOP.Lwu))
+(rule
+  (int_load_op $true 32)
+  (LoadOP.Lw))
+
+(rule
+  (int_load_op _ 64)
+  (LoadOP.Ld))
 
 ;;;; load extern name
 (decl load_ext_name (ExternalName i64) Reg)
@@ -2519,6 +2648,19 @@
             (_ Unit (emit (MInst.ElfTlsGetAddr dst name))))
         dst))
 
+(decl int_convert_2_float_op (Type bool Type) FpuOPRR)
+(extern constructor int_convert_2_float_op int_convert_2_float_op)
+
+;;;;
+(decl gen_fcvt_int (bool FReg bool Type Type) XReg)
+(rule
+  (gen_fcvt_int is_sat rs is_signed in_type out_type)
+  (let
+    ((result WritableReg (temp_writable_reg out_type))
+      (tmp WritableFReg (temp_writable_freg))
+      (_ Unit (emit (MInst.FcvtToInt is_sat result tmp rs is_signed in_type out_type))))
+    (writable_reg_to_reg result)))
+
 ;;; some float binary operation
 ;;; 1. need move into x reister.
 ;;; 2. do the operation.
@@ -2532,6 +2674,15 @@
     (move_x_to_f tmp (float_int_of_same_size ty))))
 
 
+;;; lower icmp
+(decl lower_icmp (IntCC ValueRegs ValueRegs Type) Reg)
+(rule 1 (lower_icmp cc x y ty)
+  (if (signed_cond_code cc))
+  (gen_icmp cc (ext_int_if_need $true x ty) (ext_int_if_need $true y ty) ty))
+(rule (lower_icmp cc x y ty)
+  (gen_icmp cc (ext_int_if_need $false x ty) (ext_int_if_need $false y ty) ty))
+
+
 (decl i128_sub (ValueRegs ValueRegs) ValueRegs)
 (rule
   (i128_sub x y )
@@ -2546,153 +2697,112 @@
       (high XReg (rv_sub high_tmp borrow)))
     (value_regs low high)))
 
-;; Consume a CmpResult, producing a branch on its result.
-(decl cond_br (IntegerCompare CondBrTarget CondBrTarget) SideEffectNoResult)
-(rule (cond_br cmp then else)
-      (SideEffectNoResult.Inst
-        (MInst.CondBr then else cmp)))
-
-;; Helper for emitting the `j` mnemonic, an unconditional jump to label.
-(decl rv_j (MachLabel) SideEffectNoResult)
-(rule (rv_j label)
-  (SideEffectNoResult.Inst (MInst.Jal label)))
-
-;; Construct an IntegerCompare value.
-(decl int_compare (IntCC XReg XReg) IntegerCompare)
-(extern constructor int_compare int_compare)
-
-;; Extract the components of an `IntegerCompare`
-(decl int_compare_decompose (IntCC XReg XReg) IntegerCompare)
-(extern extractor infallible int_compare_decompose int_compare_decompose)
-
-(decl label_to_br_target (MachLabel) CondBrTarget)
-(extern constructor label_to_br_target label_to_br_target)
-(convert MachLabel CondBrTarget label_to_br_target)
-
-(decl cmp_eqz (XReg) IntegerCompare)
-(rule (cmp_eqz r) (int_compare (IntCC.Equal) r (zero_reg)))
-
-(decl cmp_nez (XReg) IntegerCompare)
-(rule (cmp_nez r) (int_compare (IntCC.NotEqual) r (zero_reg)))
 
-(decl cmp_eq (XReg XReg) IntegerCompare)
-(rule (cmp_eq rs1 rs2) (int_compare (IntCC.Equal) rs1 rs2))
+;;; Returns the sum in the first register, and the overflow test in the second.
+(decl lower_uadd_overflow (XReg XReg Type) ValueRegs)
 
-(decl cmp_ne (XReg XReg) IntegerCompare)
-(rule (cmp_ne rs1 rs2) (int_compare (IntCC.NotEqual) rs1 rs2))
+(rule 1
+  (lower_uadd_overflow x y $I64)
+  (let ((tmp XReg (rv_add x y))
+        (test XReg (gen_icmp (IntCC.UnsignedLessThan) tmp x $I64)))
+    (value_regs tmp test)))
 
-(decl cmp_lt (XReg XReg) IntegerCompare)
-(rule (cmp_lt rs1 rs2) (int_compare (IntCC.SignedLessThan) rs1 rs2))
+(rule
+  (lower_uadd_overflow x y (fits_in_32 ty))
+  (let ((tmp_x XReg (zext x ty $I64))
+        (tmp_y XReg (zext y ty $I64))
+        (sum XReg (rv_add tmp_x tmp_y))
+        (test XReg (rv_srli sum (imm12_const (ty_bits ty)))))
+    (value_regs sum test)))
 
-(decl cmp_ltz (XReg) IntegerCompare)
-(rule (cmp_ltz rs) (int_compare (IntCC.SignedLessThan) rs (zero_reg)))
+;;; cc a b targets Type
+(decl lower_br_icmp (IntCC ValueRegs ValueRegs VecMachLabel Type) Unit)
+(extern constructor lower_br_icmp lower_br_icmp)
 
-(decl cmp_gt (XReg XReg) IntegerCompare)
-(rule (cmp_gt rs1 rs2) (int_compare (IntCC.SignedGreaterThan) rs1 rs2))
+;; int scalar zero regs.
+(decl int_zero_reg (Type) ValueRegs)
+(extern constructor int_zero_reg int_zero_reg)
 
-(decl cmp_ge (XReg XReg) IntegerCompare)
-(rule (cmp_ge rs1 rs2) (int_compare (IntCC.SignedGreaterThanOrEqual) rs1 rs2))
+(decl lower_cond_br (IntCC ValueRegs VecMachLabel Type) Unit)
+(extern constructor lower_cond_br lower_cond_br)
 
-(decl cmp_le (XReg XReg) IntegerCompare)
-(rule (cmp_le rs1 rs2) (int_compare (IntCC.SignedLessThanOrEqual) rs1 rs2))
+(decl intcc_to_extend_op (IntCC) ExtendOp)
+(extern constructor intcc_to_extend_op intcc_to_extend_op)
 
-(decl cmp_gtu (XReg XReg) IntegerCompare)
-(rule (cmp_gtu rs1 rs2) (int_compare (IntCC.UnsignedGreaterThan) rs1 rs2))
+;; Normalize a value for comparision.
+;;
+;; This ensures that types smaller than a register don't accidentally
+;; pass undefined high bits when being compared as a full register.
+(decl normalize_cmp_value (Type ValueRegs ExtendOp) ValueRegs)
+
+(rule 1 (normalize_cmp_value (fits_in_32 ity) r op)
+      (extend r op ity $I64))
+
+(rule (normalize_cmp_value $I64  r _) r)
+(rule (normalize_cmp_value $I128 r _) r)
+
+(decl normalize_fcvt_from_int (XReg Type ExtendOp) XReg)
+(rule 2 (normalize_fcvt_from_int r (fits_in_16 ty) op)
+  (value_regs_get (extend r op ty $I64) 0))
+(rule 1 (normalize_fcvt_from_int r _ _)
+  r)
+
+;; Convert a truthy value, possibly of more than one register (an
+;; I128), to one register. If narrower than 64 bits, must have already
+;; been masked (e.g. by `normalize_cmp_value`).
+(decl truthy_to_reg (Type ValueRegs) XReg)
+(rule 1 (truthy_to_reg (fits_in_64 _) regs)
+      (value_regs_get regs 0))
+(rule 0 (truthy_to_reg $I128 regs)
+      (let ((lo XReg (value_regs_get regs 0))
+            (hi XReg (value_regs_get regs 1)))
+        (rv_or lo hi)))
 
-(decl cmp_geu (XReg XReg) IntegerCompare)
-(rule (cmp_geu rs1 rs2) (int_compare (IntCC.UnsignedGreaterThanOrEqual) rs1 rs2))
 
-(decl cmp_ltu (XReg XReg) IntegerCompare)
-(rule (cmp_ltu rs1 rs2) (int_compare (IntCC.UnsignedLessThan) rs1 rs2))
+(decl label_to_br_target (MachLabel) CondBrTarget)
+(extern constructor label_to_br_target label_to_br_target)
 
-(decl cmp_leu (XReg XReg) IntegerCompare)
-(rule (cmp_leu rs1 rs2) (int_compare (IntCC.UnsignedLessThanOrEqual) rs1 rs2))
+(decl vec_label_get (VecMachLabel u8) MachLabel)
+(extern constructor vec_label_get vec_label_get)
 
-;; Helper to generate an `IntegerCompare` which represents the "truthy" value of
-;; the input provided.
-;;
-;; This is used in `Select` and `brif` for example to generate conditional
-;; branches. The returned comparison, when taken, represents that `Value` is
-;; nonzero. When not taken the input `Value` is zero.
-(decl is_nonzero_cmp (Value) IntegerCompare)
+(decl partial lower_branch (Inst VecMachLabel) Unit)
+(rule (lower_branch (jump _) targets )
+      (emit_side_effect (SideEffectNoResult.Inst (MInst.Jal (vec_label_get targets 0)))))
 
-;; Base case - convert to a "truthy" value and compare it against zero.
-;;
-;; Note that non-64-bit types need to be extended since the upper bits from
-;; Cranelift's point of view are undefined. Favor a zero extension for 8-bit
-;; types because that's a single `andi` instruction, but favor sign-extension
-;; for 16 and 32-bit types because many RISC-V which operate on the low 32-bits.
-;; Additionally the base 64-bit ISA has a single instruction for sign-extending
-;; from 32 to 64-bits which makes that a bit cheaper if used.
-;; of registers sign-extend the results.
-(rule 0 (is_nonzero_cmp val @ (value_type (fits_in_64 _)))
-  (cmp_nez (sext val)))
-(rule 1 (is_nonzero_cmp val @ (value_type $I8))
-  (cmp_nez (zext val)))
-(rule 1 (is_nonzero_cmp val @ (value_type $I128))
-  (cmp_nez (rv_or (value_regs_get val 0) (value_regs_get val 1))))
-
-;; If the input value is itself an `icmp` or `fcmp` we can avoid generating the
-;; result of the comparison and instead move the comparison directly into the
-;; `IntegerCompare` that's returned.
-(rule 2 (is_nonzero_cmp (maybe_uextend (icmp cc a b @ (value_type (fits_in_64 _)))))
-  (icmp_to_int_compare cc a b))
-(rule 2 (is_nonzero_cmp (maybe_uextend (fcmp cc a @ (value_type ty) b)))
-  (fcmp_to_float_compare cc ty a b))
-
-;; Creates an `IntegerCompare` from an `icmp` node's parts. This will extend
-;; values as necessary to their full register width to perform the
-;; comparison. The returned `IntegerCompare` is suitable to use in conditional
-;; branches for example.
-;;
-;; Note that this should ideally only be used when the `IntegerCompare` returned
-;; is fed into a branch. If `IntegerCompare` is materialized this will miss out
-;; on optimizations to compare against constants using some native instructions.
-(decl icmp_to_int_compare (IntCC Value Value) IntegerCompare)
-(rule 0 (icmp_to_int_compare cc a b @ (value_type (fits_in_64 in_ty)))
-  (int_compare cc (put_value_in_reg_for_icmp cc a) (put_value_in_reg_for_icmp cc b)))
-(rule 1 (icmp_to_int_compare cc a b @ (value_type $I128))
-  (cmp_nez (lower_icmp_i128 cc a b)))
-
-;; Places a `Value` into a full register width to prepare for a comparison
-;; using `IntCC`.
-;;
-;; This is largely a glorified means of choosing sign-extension or
-;; zero-extension for the `Value` input.
-(decl put_value_in_reg_for_icmp (IntCC Value) XReg)
-
-;; Base cases, use the `cc` to determine whether to zero or sign extend.
-(rule 0 (put_value_in_reg_for_icmp cc val)
-  (zext val))
-(rule 1 (put_value_in_reg_for_icmp cc val)
-  (if (signed_cond_code cc))
-  (sext val))
+;; Default behavior for branching based on an input value.
+(rule
+  (lower_branch (brif v @ (value_type ty) _ _) targets)
+  (lower_cond_br (IntCC.NotEqual) (normalize_cmp_value ty v (ExtendOp.Zero)) targets ty))
 
-;; For equality and inequality favor sign extension since it's generally
-;; easier to perform sign extension on RV64 via native instructions. For 8-bit
-;; types though use zero-extension since that's a single instruction `and`.
-(rule 2 (put_value_in_reg_for_icmp (IntCC.Equal) val @ (value_type (fits_in_64 _)))
-  (sext val))
-(rule 2 (put_value_in_reg_for_icmp (IntCC.NotEqual) val @ (value_type (fits_in_64 _)))
-  (sext val))
-(rule 3 (put_value_in_reg_for_icmp (IntCC.Equal) val @ (value_type $I8))
-  (zext val))
-(rule 3 (put_value_in_reg_for_icmp (IntCC.NotEqual) val @ (value_type $I8))
-  (zext val))
+;; Special case for SI128 to reify the comparison value and branch on it.
+(rule 2
+  (lower_branch (brif v @ (value_type $I128) _ _) targets)
+  (let ((zero ValueRegs (value_regs (zero_reg) (zero_reg)))
+        (cmp XReg (gen_icmp (IntCC.NotEqual) v zero $I128)))
+    (lower_cond_br (IntCC.NotEqual) cmp targets $I64)))
 
-;; As a special case use `x0` directly if a constant is 0.
-(rule 4 (put_value_in_reg_for_icmp _ (i64_from_iconst 0))
-  (zero_reg))
+;; Branching on the result of an icmp
+(rule 1
+  (lower_branch (brif (maybe_uextend (icmp cc a @ (value_type ty) b)) _ _) targets)
+  (lower_br_icmp cc a b targets ty))
 
+;; Branching on the result of an fcmp
+(rule 1
+  (lower_branch (brif (maybe_uextend (fcmp cc a @ (value_type ty) b)) _ _) targets)
+  (if-let $true (floatcc_unordered cc))
+  (let ((then CondBrTarget (label_to_br_target (vec_label_get targets 0)))
+        (else CondBrTarget (label_to_br_target (vec_label_get targets 1))))
+    (emit_side_effect (cond_br (emit_fcmp (floatcc_complement cc) ty a b) else then))))
 
-(decl partial lower_branch (Inst MachLabelSlice) Unit)
-(rule (lower_branch (jump _) (single_target label))
-      (emit_side_effect (rv_j label)))
+(rule 1
+  (lower_branch (brif (maybe_uextend (fcmp cc a @ (value_type ty) b)) _ _) targets)
+  (if-let $false (floatcc_unordered cc))
+  (let ((then CondBrTarget (label_to_br_target (vec_label_get targets 0)))
+        (else CondBrTarget (label_to_br_target (vec_label_get targets 1))))
+    (emit_side_effect (cond_br (emit_fcmp cc ty a b) then else))))
 
-(rule (lower_branch (brif v _ _) (two_targets then else))
-  (emit_side_effect (cond_br (is_nonzero_cmp v) then else)))
 
-(decl lower_br_table (Reg MachLabelSlice) Unit)
+(decl lower_br_table (Reg VecMachLabel) Unit)
 (extern constructor lower_br_table lower_br_table)
 
 (rule (lower_branch (br_table index _) targets)
@@ -2724,6 +2834,23 @@
 (rule (float_int_of_same_size $F64) $I64)
 
 
+(decl gen_rev8 (XReg) XReg)
+(rule 1
+  (gen_rev8 rs)
+  (if-let $true (has_zbb))
+  (rv_rev8 rs))
+
+(rule
+  (gen_rev8 rs)
+  (if-let $false (has_zbb))
+  (let
+    ((rd WritableXReg (temp_writable_xreg))
+      (tmp WritableXReg (temp_writable_xreg))
+      (step WritableXReg (temp_writable_xreg))
+      (_ Unit (emit (MInst.Rev8 rs step tmp rd))))
+    (writable_reg_to_reg rd)))
+
+
 (decl gen_brev8 (Reg Type) Reg)
 (rule 1
   (gen_brev8 rs _)
@@ -2751,6 +2878,17 @@
   (i128_sub (value_regs_zero) val))
 
 
+;; Selects the greatest of two registers as signed values.
+(decl max (Type XReg XReg) XReg)
+(rule (max (fits_in_64 (ty_int ty)) x y)
+  (if-let $true (has_zbb))
+  (rv_max x y))
+
+(rule (max (fits_in_64 (ty_int ty)) x y)
+  (if-let $false (has_zbb))
+  (gen_select_reg (IntCC.SignedGreaterThan) x y x y))
+
+
 ;; Builds an instruction sequence that traps if the comparision succeeds.
 (decl gen_trapif (IntCC XReg XReg TrapCode) InstOutput)
 (rule (gen_trapif cc a b trap_code)
@@ -2766,6 +2904,25 @@
 (rule (gen_trapz test trap_code)
   (gen_trapif (IntCC.Equal) test (zero_reg) trap_code))
 
+
+(decl shift_int_to_most_significant (XReg Type) XReg)
+(extern constructor shift_int_to_most_significant shift_int_to_most_significant)
+
+;;; generate div overflow.
+(decl gen_div_overflow (XReg XReg Type) InstOutput)
+(rule (gen_div_overflow rs1 rs2 ty)
+  (let ((r_const_neg_1 XReg (imm $I64 (i64_as_u64 -1)))
+        (r_const_min XReg (rv_slli (imm $I64 1) (imm12_const 63)))
+        (tmp_rs1 XReg (shift_int_to_most_significant rs1 ty))
+        (t1 XReg (gen_icmp (IntCC.Equal) r_const_neg_1 rs2 ty))
+        (t2 XReg (gen_icmp (IntCC.Equal) r_const_min tmp_rs1 ty))
+        (test XReg (rv_and t1 t2)))
+    (gen_trapnz test (TrapCode.IntegerOverflow))))
+
+(decl gen_div_by_zero (XReg) InstOutput)
+(rule (gen_div_by_zero r)
+  (gen_trapz r (TrapCode.IntegerDivisionByZero)))
+
 ;;;; Helpers for Emitting Calls ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (decl gen_call (SigRef ExternalName RelocDistance ValueSlice) InstOutput)
@@ -2784,31 +2941,45 @@
 
 ;;;; Helpers for bmask ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;; Generates either 0 if `Value` is zero or -1 otherwise.
-(decl gen_bmask (Value) XReg)
-
-;; Base cases: use `snez` after a sign extension to ensure that the entire
-;; register is defined. For i128 we test both the upper and lower half.
-(rule 0 (gen_bmask val @ (value_type (fits_in_64 _)))
-  (let ((non_zero XReg (rv_snez (sext val))))
-    (rv_neg non_zero)))
-(rule 1 (gen_bmask val @ (value_type $I128))
-  (let ((non_zero XReg (rv_snez (rv_or (value_regs_get val 0) (value_regs_get val 1)))))
-    (rv_neg non_zero)))
-
-;; If the input value is an `icmp` or an `fcmp` directly then the `snez` can
-;; be omitted because the result of the icmp or fcmp is a 0 or 1 directly. This
-;; means we can go straight to the `neg` instruction to produce the final
-;; result.
-(rule 2 (gen_bmask val @ (maybe_uextend (icmp _ _ _))) (rv_neg val))
-(rule 2 (gen_bmask val @ (maybe_uextend (fcmp _ _ _))) (rv_neg val))
-
-(decl lower_bmask (Value Type) ValueRegs)
-(rule 0 (lower_bmask val (fits_in_64 _))
-  (value_reg (gen_bmask val)))
-(rule 1 (lower_bmask val $I128)
-  (let ((bits XReg (gen_bmask val)))
-    (value_regs bits bits)))
+(decl lower_bmask (Type Type ValueRegs) ValueRegs)
+
+;; Produces -1 if the 64-bit value is non-zero, and 0 otherwise.
+;; If the type is smaller than 64 bits, we need to mask off the
+;; high bits.
+(rule
+  0
+  (lower_bmask (fits_in_64 _) (fits_in_64 in_ty) val)
+  (let ((input XReg (truthy_to_reg in_ty (normalize_cmp_value in_ty val (ExtendOp.Zero))))
+        (non_zero XReg (rv_snez input)))
+    (value_reg (rv_neg non_zero))))
+
+;; Bitwise-or the two registers that make up the 128-bit value, then recurse as
+;; though it was a 64-bit value.
+(rule
+  1
+  (lower_bmask (fits_in_64 ty) $I128 val)
+  (let ((lo XReg (value_regs_get val 0))
+        (hi XReg (value_regs_get val 1))
+        (combined XReg (rv_or lo hi)))
+    (lower_bmask ty $I64 (value_reg combined))))
+
+;; Conversion of one 64-bit value to a 128-bit one. Duplicate the result of the
+;; bmask of the 64-bit value into both result registers of the i128.
+(rule
+  2
+  (lower_bmask $I128 (fits_in_64 in_ty) val)
+  (let ((res ValueRegs (lower_bmask $I64 in_ty val)))
+    (value_regs (value_regs_get res 0) (value_regs_get res 0))))
+
+;; Conversion of one 64-bit value to a 128-bit one. Duplicate the result of
+;; bmasking the 128-bit value to a 64-bit value into both registers of the
+;; 128-bit result.
+(rule
+  3
+  (lower_bmask $I128 $I128 val)
+  (let ((res ValueRegs (lower_bmask $I64 $I128 val)))
+    (value_regs (value_regs_get res 0) (value_regs_get res 0))))
+
 
 ;;;; Helpers for physical registers ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -2827,9 +2998,8 @@
 (extern constructor sp_reg sp_reg)
 
 ;; Helper for creating the zero register.
-(decl zero_reg () XReg)
+(decl zero_reg () Reg)
 (extern constructor zero_reg zero_reg)
-(extern extractor zero_reg is_zero_reg)
 
 (decl value_regs_zero () ValueRegs)
 (rule (value_regs_zero)
@@ -2841,64 +3011,131 @@
 
 ;;;; Helpers for floating point comparisons ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(type FloatCompare (enum
-  ;; The comparison succeeded if `r` is one
-  (One (r XReg))
-  ;; The comparison succeeded if `r` is zero
-  (Zero (r XReg))
-))
+(decl not (XReg) XReg)
+(rule (not x) (rv_xori x (imm_from_bits 1)))
 
-(decl float_compare_invert (FloatCompare) FloatCompare)
-(rule (float_compare_invert (FloatCompare.One r)) (FloatCompare.Zero r))
-(rule (float_compare_invert (FloatCompare.Zero r)) (FloatCompare.One r))
+(decl is_not_nan (Type FReg) XReg)
+(rule (is_not_nan ty a) (rv_feq ty a a))
 
-(decl float_to_int_compare (FloatCompare) IntegerCompare)
-(rule (float_to_int_compare (FloatCompare.One r)) (cmp_nez r))
-(rule (float_to_int_compare (FloatCompare.Zero r)) (cmp_eqz r))
-(convert FloatCompare IntegerCompare float_to_int_compare)
+(decl ordered (Type FReg FReg) XReg)
+(rule (ordered ty a b) (rv_and (is_not_nan ty a) (is_not_nan ty b)))
 
-;; Compare two floating point numbers and return a zero/non-zero result.
-(decl fcmp_to_float_compare (FloatCC Type FReg FReg) FloatCompare)
+(type CmpResult (enum
+                  (Result
+                    (result XReg)
+                    (invert bool))))
 
-;; Direct codegen for unordered comparisons is not that efficient, so invert
-;; the comparison to get an ordered comparison and generate that. Then invert
-;; the result to produce the final fcmp result.
-(rule 0 (fcmp_to_float_compare cc ty a b)
-  (if-let $true (floatcc_unordered cc))
-  (float_compare_invert (fcmp_to_float_compare (floatcc_complement cc) ty a b)))
+;; Wrapper for the common case when constructing comparison results. It assumes
+;; that the result isn't negated.
+(decl cmp_result (XReg) CmpResult)
+(rule (cmp_result result) (CmpResult.Result result $false))
+
+;; Wrapper for the case where it's more convenient to construct the negated
+;; version of the comparison.
+(decl cmp_result_invert (XReg) CmpResult)
+(rule (cmp_result_invert result) (CmpResult.Result result $true))
+
+;; Consume a CmpResult, producing a branch on its result.
+(decl cond_br (CmpResult CondBrTarget CondBrTarget) SideEffectNoResult)
+(rule (cond_br cmp then else)
+      (SideEffectNoResult.Inst
+        (MInst.CondBr then else (cmp_integer_compare cmp))))
+
+;; Construct an IntegerCompare value.
+(decl int_compare (IntCC XReg XReg) IntegerCompare)
+(extern constructor int_compare int_compare)
+
+;; Convert a comparison into a branch test.
+(decl cmp_integer_compare (CmpResult) IntegerCompare)
+
+(rule
+  (cmp_integer_compare (CmpResult.Result res $false))
+  (int_compare (IntCC.NotEqual) res (zero_reg)))
+
+(rule
+  (cmp_integer_compare (CmpResult.Result res $true))
+  (int_compare (IntCC.Equal) res (zero_reg)))
+
+;; Convert a comparison into a boolean value.
+(decl cmp_value (CmpResult) XReg)
+(rule (cmp_value (CmpResult.Result res $false)) res)
+(rule (cmp_value (CmpResult.Result res $true)) (not res))
+
+;; Compare two floating point numbers and return a zero/non-zero result.
+(decl emit_fcmp (FloatCC Type FReg FReg) CmpResult)
 
 ;; a is not nan && b is not nan
-(rule 1 (fcmp_to_float_compare (FloatCC.Ordered) ty a b)
-  (FloatCompare.One (rv_and (is_not_nan ty a) (is_not_nan ty b))))
+(rule
+  (emit_fcmp (FloatCC.Ordered) ty a b)
+  (cmp_result (ordered ty a b)))
 
-(decl is_not_nan (Type FReg) XReg)
-(rule (is_not_nan ty a) (rv_feq ty a a))
+;; a is nan || b is nan
+;; == !(a is not nan && b is not nan)
+(rule
+  (emit_fcmp (FloatCC.Unordered) ty a b)
+  (cmp_result_invert (ordered ty a b)))
 
 ;; a == b
-(rule 1 (fcmp_to_float_compare (FloatCC.Equal) ty a b)
-  (FloatCompare.One (rv_feq ty a b)))
+(rule
+  (emit_fcmp (FloatCC.Equal) ty a b)
+  (cmp_result (rv_feq ty a b)))
 
 ;; a != b
 ;; == !(a == b)
-(rule 1 (fcmp_to_float_compare (FloatCC.NotEqual) ty a b)
-  (FloatCompare.Zero (rv_feq ty a b)))
+(rule
+  (emit_fcmp (FloatCC.NotEqual) ty a b)
+  (cmp_result_invert (rv_feq ty a b)))
 
 ;; a < b || a > b
-(rule 1 (fcmp_to_float_compare (FloatCC.OrderedNotEqual) ty a b)
-  (FloatCompare.One (rv_or (rv_flt ty a b) (rv_fgt ty a b))))
+(rule
+  (emit_fcmp (FloatCC.OrderedNotEqual) ty a b)
+  (cmp_result (rv_or (rv_flt ty a b) (rv_fgt ty a b))))
+
+;; !(ordered a b) || a == b
+(rule
+  (emit_fcmp (FloatCC.UnorderedOrEqual) ty a b)
+  (cmp_result (rv_or (not (ordered ty a b)) (rv_feq ty a b))))
 
 ;; a < b
-(rule 1 (fcmp_to_float_compare (FloatCC.LessThan) ty a b)
-  (FloatCompare.One (rv_flt ty a b)))
+(rule
+  (emit_fcmp (FloatCC.LessThan) ty a b)
+  (cmp_result (rv_flt ty a b)))
 
 ;; a <= b
-(rule 1 (fcmp_to_float_compare (FloatCC.LessThanOrEqual) ty a b)
-  (FloatCompare.One (rv_fle ty a b)))
+(rule
+  (emit_fcmp (FloatCC.LessThanOrEqual) ty a b)
+  (cmp_result (rv_fle ty a b)))
 
 ;; a > b
-(rule 1 (fcmp_to_float_compare (FloatCC.GreaterThan) ty a b)
-  (FloatCompare.One (rv_fgt ty a b)))
+(rule
+  (emit_fcmp (FloatCC.GreaterThan) ty a b)
+  (cmp_result (rv_fgt ty a b)))
 
 ;; a >= b
-(rule 1 (fcmp_to_float_compare (FloatCC.GreaterThanOrEqual) ty a b)
-  (FloatCompare.One (rv_fge ty a b)))
+(rule
+  (emit_fcmp (FloatCC.GreaterThanOrEqual) ty a b)
+  (cmp_result (rv_fge ty a b)))
+
+;; !(ordered a b) || a < b
+;; == !(ordered a b && a >= b)
+(rule
+  (emit_fcmp (FloatCC.UnorderedOrLessThan) ty a b)
+  (cmp_result_invert (rv_and (ordered ty a b) (rv_fge ty a b))))
+
+;; !(ordered a b) || a <= b
+;; == !(ordered a b && a > b)
+(rule
+  (emit_fcmp (FloatCC.UnorderedOrLessThanOrEqual) ty a b)
+  (cmp_result_invert (rv_and (ordered ty a b) (rv_fgt ty a b))))
+
+;; !(ordered a b) || a > b
+;; == !(ordered a b && a <= b)
+(rule
+  (emit_fcmp (FloatCC.UnorderedOrGreaterThan) ty a b)
+  (cmp_result_invert (rv_and (ordered ty a b) (rv_fle ty a b))))
+
+;; !(ordered a b) || a >= b
+;; == !(ordered a b && a < b)
+(rule
+  (emit_fcmp (FloatCC.UnorderedOrGreaterThanOrEqual) ty a b)
+  (cmp_result_invert (rv_and (ordered ty a b) (rv_flt ty a b))))
diff --git a/cranelift/codegen/src/isa/riscv64/inst/args.rs b/cranelift/codegen/src/isa/riscv64/inst/args.rs
index e791d31a7723..469dc531e20c 100644
--- a/cranelift/codegen/src/isa/riscv64/inst/args.rs
+++ b/cranelift/codegen/src/isa/riscv64/inst/args.rs
@@ -1,12 +1,14 @@
 //! Riscv64 ISA definitions: instruction arguments.
 
+// Some variants are never constructed, but we still want them as options in the future.
+#![allow(dead_code)]
 use super::*;
 use crate::ir::condcodes::CondCode;
 
 use crate::isa::riscv64::inst::{reg_name, reg_to_gpr_num};
 
 use crate::isa::riscv64::lower::isle::generated_code::{
-    COpcodeSpace, CaOp, CbOp, CiOp, CiwOp, CjOp, ClOp, CrOp, CsOp, CssOp, CsznOp, ZcbMemOp,
+    COpcodeSpace, CaOp, CiOp, CiwOp, CjOp, CrOp,
 };
 use crate::machinst::isle::WritableReg;
 
@@ -249,8 +251,17 @@ impl BranchFunct3 {
             BranchFunct3::Geu => 0b111,
         }
     }
+    pub(crate) fn op_name(self) -> &'static str {
+        match self {
+            BranchFunct3::Eq => "eq",
+            BranchFunct3::Ne => "ne",
+            BranchFunct3::Lt => "lt",
+            BranchFunct3::Ge => "ge",
+            BranchFunct3::Ltu => "ltu",
+            BranchFunct3::Geu => "geu",
+        }
+    }
 }
-
 impl IntegerCompare {
     pub(crate) fn op_code(self) -> u32 {
         0b1100011
@@ -334,6 +345,10 @@ impl FpuOPRRRR {
         }
     }
 
+    pub(crate) fn funct3(self, rounding_mode: Option<FRM>) -> u32 {
+        rounding_mode.unwrap_or_default().as_u32()
+    }
+
     pub(crate) fn op_code(self) -> u32 {
         match self {
             FpuOPRRRR::FmaddS => 0b1000011,
@@ -402,6 +417,15 @@ impl FpuOPRR {
         }
     }
 
+    // move from f register to x register.
+    pub(crate) fn move_f_to_x_op(ty: Type) -> Self {
+        match ty {
+            F32 => Self::FmvXW,
+            F64 => Self::FmvXD,
+            _ => unreachable!("ty:{:?}", ty),
+        }
+    }
+
     pub(crate) fn float_convert_2_int_op(from: Type, is_type_signed: bool, to: Type) -> Self {
         let type_32 = to.bits() <= 32;
         match from {
@@ -439,6 +463,43 @@ impl FpuOPRR {
         }
     }
 
+    pub(crate) fn int_convert_2_float_op(from: Type, is_type_signed: bool, to: Type) -> Self {
+        let type_32 = from.bits() == 32;
+        match to {
+            F32 => {
+                if is_type_signed {
+                    if type_32 {
+                        Self::FcvtSw
+                    } else {
+                        Self::FcvtSL
+                    }
+                } else {
+                    if type_32 {
+                        Self::FcvtSwU
+                    } else {
+                        Self::FcvtSLU
+                    }
+                }
+            }
+            F64 => {
+                if is_type_signed {
+                    if type_32 {
+                        Self::FcvtDW
+                    } else {
+                        Self::FcvtDL
+                    }
+                } else {
+                    if type_32 {
+                        Self::FcvtDWU
+                    } else {
+                        Self::FcvtDLu
+                    }
+                }
+            }
+            _ => unreachable!("to type:{}", to),
+        }
+    }
+
     pub(crate) fn op_code(self) -> u32 {
         match self {
             FpuOPRR::FsqrtS
@@ -530,6 +591,38 @@ impl FpuOPRR {
             FpuOPRR::FsqrtD => 0b0101101,
         }
     }
+
+    pub(crate) fn funct3(self, rounding_mode: Option<FRM>) -> u32 {
+        let rounding_mode = rounding_mode.unwrap_or_default().as_u32();
+        match self {
+            FpuOPRR::FsqrtS => rounding_mode,
+            FpuOPRR::FcvtWS => rounding_mode,
+            FpuOPRR::FcvtWuS => rounding_mode,
+            FpuOPRR::FmvXW => 0b000,
+            FpuOPRR::FclassS => 0b001,
+            FpuOPRR::FcvtSw => rounding_mode,
+            FpuOPRR::FcvtSwU => rounding_mode,
+            FpuOPRR::FmvWX => 0b000,
+            FpuOPRR::FcvtLS => rounding_mode,
+            FpuOPRR::FcvtLuS => rounding_mode,
+            FpuOPRR::FcvtSL => rounding_mode,
+            FpuOPRR::FcvtSLU => rounding_mode,
+            FpuOPRR::FcvtLD => rounding_mode,
+            FpuOPRR::FcvtLuD => rounding_mode,
+            FpuOPRR::FmvXD => 0b000,
+            FpuOPRR::FcvtDL => rounding_mode,
+            FpuOPRR::FcvtDLu => rounding_mode,
+            FpuOPRR::FmvDX => 0b000,
+            FpuOPRR::FcvtSD => rounding_mode,
+            FpuOPRR::FcvtDS => rounding_mode,
+            FpuOPRR::FclassD => 0b001,
+            FpuOPRR::FcvtWD => rounding_mode,
+            FpuOPRR::FcvtWuD => rounding_mode,
+            FpuOPRR::FcvtDW => rounding_mode,
+            FpuOPRR::FcvtDWU => 0b000,
+            FpuOPRR::FsqrtD => rounding_mode,
+        }
+    }
 }
 
 impl FpuOPRRR {
@@ -562,6 +655,41 @@ impl FpuOPRRR {
         }
     }
 
+    pub fn funct3(self, rounding_mode: Option<FRM>) -> u32 {
+        let rounding_mode = rounding_mode.unwrap_or_default();
+        let rounding_mode = rounding_mode.as_u32();
+        match self {
+            Self::FaddS => rounding_mode,
+            Self::FsubS => rounding_mode,
+            Self::FmulS => rounding_mode,
+            Self::FdivS => rounding_mode,
+
+            Self::FsgnjS => 0b000,
+            Self::FsgnjnS => 0b001,
+            Self::FsgnjxS => 0b010,
+            Self::FminS => 0b000,
+            Self::FmaxS => 0b001,
+
+            Self::FeqS => 0b010,
+            Self::FltS => 0b001,
+            Self::FleS => 0b000,
+
+            Self::FaddD => rounding_mode,
+            Self::FsubD => rounding_mode,
+            Self::FmulD => rounding_mode,
+            Self::FdivD => rounding_mode,
+
+            Self::FsgnjD => 0b000,
+            Self::FsgnjnD => 0b001,
+            Self::FsgnjxD => 0b010,
+            Self::FminD => 0b000,
+            Self::FmaxD => 0b001,
+            Self::FeqD => 0b010,
+            Self::FltD => 0b001,
+            Self::FleD => 0b000,
+        }
+    }
+
     pub fn op_code(self) -> u32 {
         match self {
             Self::FaddS
@@ -1148,7 +1276,6 @@ impl FRM {
 
 impl FFlagsException {
     #[inline]
-    #[allow(dead_code)]
     pub(crate) fn mask(self) -> u32 {
         match self {
             FFlagsException::NV => 1 << 4,
@@ -1190,15 +1317,6 @@ impl LoadOP {
         }
     }
 
-    pub(crate) fn size(&self) -> i64 {
-        match self {
-            Self::Lb | Self::Lbu => 1,
-            Self::Lh | Self::Lhu => 2,
-            Self::Lw | Self::Lwu | Self::Flw => 4,
-            Self::Ld | Self::Fld => 8,
-        }
-    }
-
     pub(crate) fn op_code(self) -> u32 {
         match self {
             Self::Lb | Self::Lh | Self::Lw | Self::Lbu | Self::Lhu | Self::Lwu | Self::Ld => {
@@ -1245,16 +1363,6 @@ impl StoreOP {
             _ => unreachable!(),
         }
     }
-
-    pub(crate) fn size(&self) -> i64 {
-        match self {
-            Self::Sb => 1,
-            Self::Sh => 2,
-            Self::Sw | Self::Fsw => 4,
-            Self::Sd | Self::Fsd => 8,
-        }
-    }
-
     pub(crate) fn op_code(self) -> u32 {
         match self {
             Self::Sb | Self::Sh | Self::Sw | Self::Sd => 0b0100011,
@@ -1273,7 +1381,6 @@ impl StoreOP {
     }
 }
 
-#[allow(dead_code)]
 impl FClassResult {
     pub(crate) const fn bit(self) -> u32 {
         match self {
@@ -1539,6 +1646,37 @@ impl AtomicOP {
     }
 }
 
+impl IntSelectOP {
+    #[inline]
+    pub(crate) fn from_ir_op(op: crate::ir::Opcode) -> Self {
+        match op {
+            crate::ir::Opcode::Smax => Self::Smax,
+            crate::ir::Opcode::Umax => Self::Umax,
+            crate::ir::Opcode::Smin => Self::Smin,
+            crate::ir::Opcode::Umin => Self::Umin,
+            _ => unreachable!(),
+        }
+    }
+    #[inline]
+    pub(crate) fn op_name(self) -> &'static str {
+        match self {
+            IntSelectOP::Smax => "smax",
+            IntSelectOP::Umax => "umax",
+            IntSelectOP::Smin => "smin",
+            IntSelectOP::Umin => "umin",
+        }
+    }
+    #[inline]
+    pub(crate) fn to_int_cc(self) -> IntCC {
+        match self {
+            IntSelectOP::Smax => IntCC::SignedGreaterThan,
+            IntSelectOP::Umax => IntCC::UnsignedGreaterThan,
+            IntSelectOP::Smin => IntCC::SignedLessThan,
+            IntSelectOP::Umin => IntCC::UnsignedLessThan,
+        }
+    }
+}
+
 ///Atomic Memory ordering.
 #[derive(Copy, Clone, Debug)]
 pub enum AMO {
@@ -1606,8 +1744,62 @@ impl FloatRoundOP {
     }
 }
 
+impl FloatSelectOP {
+    pub(crate) fn op_name(self) -> &'static str {
+        match self {
+            FloatSelectOP::Max => "max",
+            FloatSelectOP::Min => "min",
+        }
+    }
+
+    pub(crate) fn to_fpuoprrr(self, ty: Type) -> FpuOPRRR {
+        match self {
+            FloatSelectOP::Max => {
+                if ty == F32 {
+                    FpuOPRRR::FmaxS
+                } else {
+                    FpuOPRRR::FmaxD
+                }
+            }
+            FloatSelectOP::Min => {
+                if ty == F32 {
+                    FpuOPRRR::FminS
+                } else {
+                    FpuOPRRR::FminD
+                }
+            }
+        }
+    }
+    // move qnan bits into int register.
+    pub(crate) fn snan_bits(self, rd: Writable<Reg>, ty: Type) -> SmallInstVec<Inst> {
+        let mut insts = SmallInstVec::new();
+        insts.push(Inst::load_imm12(rd, Imm12::from_i16(-1)));
+        let x = if ty == F32 { 22 } else { 51 };
+        insts.push(Inst::AluRRImm12 {
+            alu_op: AluOPRRI::Srli,
+            rd: rd,
+            rs: rd.to_reg(),
+            imm12: Imm12::from_i16(x),
+        });
+        insts.push(Inst::AluRRImm12 {
+            alu_op: AluOPRRI::Slli,
+            rd: rd,
+            rs: rd.to_reg(),
+            imm12: Imm12::from_i16(x),
+        });
+        insts
+    }
+}
+
+pub(crate) fn f32_bits(f: f32) -> u32 {
+    u32::from_le_bytes(f.to_le_bytes())
+}
+pub(crate) fn f64_bits(f: f64) -> u64 {
+    u64::from_le_bytes(f.to_le_bytes())
+}
+
 ///
-pub(crate) fn f32_cvt_to_int_bounds(signed: bool, out_bits: u32) -> (f32, f32) {
+pub(crate) fn f32_cvt_to_int_bounds(signed: bool, out_bits: u8) -> (f32, f32) {
     match (signed, out_bits) {
         (true, 8) => (i8::min_value() as f32 - 1., i8::max_value() as f32 + 1.),
         (true, 16) => (i16::min_value() as f32 - 1., i16::max_value() as f32 + 1.),
@@ -1621,7 +1813,7 @@ pub(crate) fn f32_cvt_to_int_bounds(signed: bool, out_bits: u32) -> (f32, f32) {
     }
 }
 
-pub(crate) fn f64_cvt_to_int_bounds(signed: bool, out_bits: u32) -> (f64, f64) {
+pub(crate) fn f64_cvt_to_int_bounds(signed: bool, out_bits: u8) -> (f64, f64) {
     match (signed, out_bits) {
         (true, 8) => (i8::min_value() as f64 - 1., i8::max_value() as f64 + 1.),
         (true, 16) => (i16::min_value() as f64 - 1., i16::max_value() as f64 + 1.),
@@ -1749,7 +1941,6 @@ impl CaOp {
             CaOp::CSub => 0b00,
             CaOp::CAddw => 0b01,
             CaOp::CSubw => 0b00,
-            CaOp::CMul => 0b10,
         }
     }
 
@@ -1757,20 +1948,16 @@ impl CaOp {
         // https://github.com/michaeljclark/riscv-meta/blob/master/opcodes
         match self {
             CaOp::CAnd | CaOp::COr | CaOp::CXor | CaOp::CSub => 0b100_011,
-            CaOp::CSubw | CaOp::CAddw | CaOp::CMul => 0b100_111,
+            CaOp::CSubw | CaOp::CAddw => 0b100_111,
         }
     }
 
     pub fn op(&self) -> COpcodeSpace {
         // https://five-embeddev.com/riscv-isa-manual/latest/rvc-opcode-map.html#rvcopcodemap
         match self {
-            CaOp::CAnd
-            | CaOp::COr
-            | CaOp::CXor
-            | CaOp::CSub
-            | CaOp::CAddw
-            | CaOp::CSubw
-            | CaOp::CMul => COpcodeSpace::C1,
+            CaOp::CAnd | CaOp::COr | CaOp::CXor | CaOp::CSub | CaOp::CAddw | CaOp::CSubw => {
+                COpcodeSpace::C1
+            }
         }
     }
 }
@@ -1796,19 +1983,16 @@ impl CiOp {
         // https://github.com/michaeljclark/riscv-meta/blob/master/opcodes
         match self {
             CiOp::CAddi | CiOp::CSlli => 0b000,
-            CiOp::CAddiw | CiOp::CFldsp => 0b001,
-            CiOp::CLi | CiOp::CLwsp => 0b010,
-            CiOp::CAddi16sp | CiOp::CLui | CiOp::CLdsp => 0b011,
+            CiOp::CAddiw => 0b001,
+            CiOp::CAddi16sp => 0b011,
         }
     }
 
     pub fn op(&self) -> COpcodeSpace {
         // https://five-embeddev.com/riscv-isa-manual/latest/rvc-opcode-map.html#rvcopcodemap
         match self {
-            CiOp::CAddi | CiOp::CAddiw | CiOp::CAddi16sp | CiOp::CLi | CiOp::CLui => {
-                COpcodeSpace::C1
-            }
-            CiOp::CSlli | CiOp::CLwsp | CiOp::CLdsp | CiOp::CFldsp => COpcodeSpace::C2,
+            CiOp::CAddi | CiOp::CAddiw | CiOp::CAddi16sp => COpcodeSpace::C1,
+            CiOp::CSlli => COpcodeSpace::C2,
         }
     }
 }
@@ -1828,149 +2012,3 @@ impl CiwOp {
         }
     }
 }
-
-impl CbOp {
-    pub fn funct3(&self) -> u32 {
-        // https://github.com/michaeljclark/riscv-meta/blob/master/opcodes
-        match self {
-            CbOp::CSrli | CbOp::CSrai | CbOp::CAndi => 0b100,
-        }
-    }
-
-    pub fn funct2(&self) -> u32 {
-        // https://github.com/michaeljclark/riscv-meta/blob/master/opcodes
-        match self {
-            CbOp::CSrli => 0b00,
-            CbOp::CSrai => 0b01,
-            CbOp::CAndi => 0b10,
-        }
-    }
-
-    pub fn op(&self) -> COpcodeSpace {
-        // https://five-embeddev.com/riscv-isa-manual/latest/rvc-opcode-map.html#rvcopcodemap
-        match self {
-            CbOp::CSrli | CbOp::CSrai | CbOp::CAndi => COpcodeSpace::C1,
-        }
-    }
-}
-
-impl CssOp {
-    pub fn funct3(&self) -> u32 {
-        // https://github.com/michaeljclark/riscv-meta/blob/master/opcodes
-        match self {
-            CssOp::CFsdsp => 0b101,
-            CssOp::CSwsp => 0b110,
-            CssOp::CSdsp => 0b111,
-        }
-    }
-
-    pub fn op(&self) -> COpcodeSpace {
-        // https://five-embeddev.com/riscv-isa-manual/latest/rvc-opcode-map.html#rvcopcodemap
-        match self {
-            CssOp::CSwsp | CssOp::CSdsp | CssOp::CFsdsp => COpcodeSpace::C2,
-        }
-    }
-}
-
-impl CsOp {
-    pub fn funct3(&self) -> u32 {
-        // https://github.com/michaeljclark/riscv-meta/blob/master/opcodes
-        match self {
-            CsOp::CFsd => 0b101,
-            CsOp::CSw => 0b110,
-            CsOp::CSd => 0b111,
-        }
-    }
-
-    pub fn op(&self) -> COpcodeSpace {
-        // https://five-embeddev.com/riscv-isa-manual/latest/rvc-opcode-map.html#rvcopcodemap
-        match self {
-            CsOp::CSw | CsOp::CSd | CsOp::CFsd => COpcodeSpace::C0,
-        }
-    }
-}
-
-impl ClOp {
-    pub fn funct3(&self) -> u32 {
-        // https://github.com/michaeljclark/riscv-meta/blob/master/opcodes
-        match self {
-            ClOp::CFld => 0b001,
-            ClOp::CLw => 0b010,
-            ClOp::CLd => 0b011,
-        }
-    }
-
-    pub fn op(&self) -> COpcodeSpace {
-        // https://five-embeddev.com/riscv-isa-manual/latest/rvc-opcode-map.html#rvcopcodemap
-        match self {
-            ClOp::CLw | ClOp::CLd | ClOp::CFld => COpcodeSpace::C0,
-        }
-    }
-}
-
-impl CsznOp {
-    pub fn funct6(&self) -> u32 {
-        // https://github.com/michaeljclark/riscv-meta/blob/master/opcodes
-        match self {
-            CsznOp::CNot
-            | CsznOp::CZextw
-            | CsznOp::CZextb
-            | CsznOp::CZexth
-            | CsznOp::CSextb
-            | CsznOp::CSexth => 0b100_111,
-        }
-    }
-
-    pub fn funct5(&self) -> u32 {
-        // https://github.com/michaeljclark/riscv-meta/blob/master/opcodes
-        match self {
-            CsznOp::CNot => 0b11_101,
-            CsznOp::CZextb => 0b11_000,
-            CsznOp::CZexth => 0b11_010,
-            CsznOp::CZextw => 0b11_100,
-            CsznOp::CSextb => 0b11_001,
-            CsznOp::CSexth => 0b11_011,
-        }
-    }
-
-    pub fn op(&self) -> COpcodeSpace {
-        // https://five-embeddev.com/riscv-isa-manual/latest/rvc-opcode-map.html#rvcopcodemap
-        match self {
-            CsznOp::CNot
-            | CsznOp::CZextb
-            | CsznOp::CZexth
-            | CsznOp::CZextw
-            | CsznOp::CSextb
-            | CsznOp::CSexth => COpcodeSpace::C1,
-        }
-    }
-}
-
-impl ZcbMemOp {
-    pub fn funct6(&self) -> u32 {
-        // https://github.com/michaeljclark/riscv-meta/blob/master/opcodes
-        match self {
-            ZcbMemOp::CLbu => 0b100_000,
-            // These two opcodes are differentiated in the imm field of the instruction.
-            ZcbMemOp::CLhu | ZcbMemOp::CLh => 0b100_001,
-            ZcbMemOp::CSb => 0b100_010,
-            ZcbMemOp::CSh => 0b100_011,
-        }
-    }
-
-    pub fn imm_bits(&self) -> u8 {
-        match self {
-            ZcbMemOp::CLhu | ZcbMemOp::CLh | ZcbMemOp::CSh => 1,
-            ZcbMemOp::CLbu | ZcbMemOp::CSb => 2,
-        }
-    }
-
-    pub fn op(&self) -> COpcodeSpace {
-        // https://five-embeddev.com/riscv-isa-manual/latest/rvc-opcode-map.html#rvcopcodemap
-        match self {
-            ZcbMemOp::CLbu | ZcbMemOp::CLhu | ZcbMemOp::CLh | ZcbMemOp::CSb | ZcbMemOp::CSh => {
-                COpcodeSpace::C0
-            }
-        }
-    }
-}
diff --git a/cranelift/codegen/src/isa/riscv64/inst/emit.rs b/cranelift/codegen/src/isa/riscv64/inst/emit.rs
index 936037d77028..ffc1173d493f 100644
--- a/cranelift/codegen/src/isa/riscv64/inst/emit.rs
+++ b/cranelift/codegen/src/isa/riscv64/inst/emit.rs
@@ -3,9 +3,7 @@
 use crate::binemit::StackMap;
 use crate::ir::{self, LibCall, RelSourceLoc, TrapCode};
 use crate::isa::riscv64::inst::*;
-use crate::isa::riscv64::lower::isle::generated_code::{
-    CaOp, CbOp, CiOp, CiwOp, ClOp, CrOp, CsOp, CssOp, CsznOp, ZcbMemOp,
-};
+use crate::isa::riscv64::lower::isle::generated_code::{CaOp, CiOp, CiwOp, CrOp};
 use crate::machinst::{AllocationConsumer, Reg, Writable};
 use crate::trace;
 use cranelift_control::ControlPlane;
@@ -68,6 +66,10 @@ impl EmitState {
         self.stack_map.take()
     }
 
+    fn clear_post_insn(&mut self) {
+        self.stack_map = None;
+    }
+
     fn cur_srcloc(&self) -> RelSourceLoc {
         self.cur_srcloc
     }
@@ -155,7 +157,7 @@ impl Inst {
             } else {
                 FpuOPRRR::FeqD
             },
-            frm: FRM::RDN,
+            frm: None,
             rd: rd,
             rs1: rs,
             rs2: rs,
@@ -169,12 +171,147 @@ impl Inst {
             } else {
                 FpuOPRRR::FsgnjxD
             },
-            frm: FRM::RDN,
+            frm: None,
             rd: rd,
             rs1: rs,
             rs2: rs,
         }
     }
+    /// If a float is zero.
+    pub(crate) fn emit_if_float_not_zero(
+        tmp: Writable<Reg>,
+        rs: Reg,
+        ty: Type,
+        taken: CondBrTarget,
+        not_taken: CondBrTarget,
+    ) -> SmallInstVec<Inst> {
+        let mut insts = SmallInstVec::new();
+        let class_op = if ty == F32 {
+            FpuOPRR::FclassS
+        } else {
+            FpuOPRR::FclassD
+        };
+        insts.push(Inst::FpuRR {
+            alu_op: class_op,
+            frm: None,
+            rd: tmp,
+            rs: rs,
+        });
+        insts.push(Inst::AluRRImm12 {
+            alu_op: AluOPRRI::Andi,
+            rd: tmp,
+            rs: tmp.to_reg(),
+            imm12: Imm12::from_i16(FClassResult::is_zero_bits() as i16),
+        });
+        insts.push(Inst::CondBr {
+            taken,
+            not_taken,
+            kind: IntegerCompare {
+                kind: IntCC::Equal,
+                rs1: tmp.to_reg(),
+                rs2: zero_reg(),
+            },
+        });
+        insts
+    }
+
+    pub(crate) fn lower_br_icmp(
+        cc: IntCC,
+        a: ValueRegs<Reg>,
+        b: ValueRegs<Reg>,
+        taken: CondBrTarget,
+        not_taken: CondBrTarget,
+        ty: Type,
+    ) -> SmallInstVec<Inst> {
+        let mut insts = SmallInstVec::new();
+        if ty.bits() <= 64 {
+            let rs1 = a.only_reg().unwrap();
+            let rs2 = b.only_reg().unwrap();
+            let inst = Inst::CondBr {
+                taken,
+                not_taken,
+                kind: IntegerCompare { kind: cc, rs1, rs2 },
+            };
+            insts.push(inst);
+            return insts;
+        }
+        // compare i128
+        let low = |cc: IntCC| -> IntegerCompare {
+            IntegerCompare {
+                rs1: a.regs()[0],
+                rs2: b.regs()[0],
+                kind: cc,
+            }
+        };
+        let high = |cc: IntCC| -> IntegerCompare {
+            IntegerCompare {
+                rs1: a.regs()[1],
+                rs2: b.regs()[1],
+                kind: cc,
+            }
+        };
+        match cc {
+            IntCC::Equal => {
+                // if high part not equal,
+                // then we can go to not_taken otherwise fallthrough.
+                insts.push(Inst::CondBr {
+                    taken: not_taken,
+                    not_taken: CondBrTarget::Fallthrough,
+                    kind: high(IntCC::NotEqual),
+                });
+                // the rest part.
+                insts.push(Inst::CondBr {
+                    taken,
+                    not_taken,
+                    kind: low(IntCC::Equal),
+                });
+            }
+
+            IntCC::NotEqual => {
+                // if the high part not equal ,
+                // we know the whole must be not equal,
+                // we can goto the taken part , otherwise fallthrought.
+                insts.push(Inst::CondBr {
+                    taken,
+                    not_taken: CondBrTarget::Fallthrough, //  no branch
+                    kind: high(IntCC::NotEqual),
+                });
+
+                insts.push(Inst::CondBr {
+                    taken,
+                    not_taken,
+                    kind: low(IntCC::NotEqual),
+                });
+            }
+            IntCC::SignedGreaterThanOrEqual
+            | IntCC::SignedLessThanOrEqual
+            | IntCC::UnsignedGreaterThanOrEqual
+            | IntCC::UnsignedLessThanOrEqual
+            | IntCC::SignedGreaterThan
+            | IntCC::SignedLessThan
+            | IntCC::UnsignedLessThan
+            | IntCC::UnsignedGreaterThan => {
+                //
+                insts.push(Inst::CondBr {
+                    taken,
+                    not_taken: CondBrTarget::Fallthrough,
+                    kind: high(cc.without_equal()),
+                });
+                //
+                insts.push(Inst::CondBr {
+                    taken: not_taken,
+                    not_taken: CondBrTarget::Fallthrough,
+                    kind: high(IntCC::NotEqual),
+                });
+                insts.push(Inst::CondBr {
+                    taken,
+                    not_taken,
+                    kind: low(cc.unsigned()),
+                });
+            }
+        }
+        insts
+    }
 
     /// Returns Some(VState) if this insturction is expecting a specific vector state
     /// before emission.
@@ -197,6 +334,7 @@ impl Inst {
             | Inst::Rets { .. }
             | Inst::Ret { .. }
             | Inst::Extend { .. }
+            | Inst::AdjustSp { .. }
             | Inst::Call { .. }
             | Inst::CallInd { .. }
             | Inst::ReturnCall { .. }
@@ -218,6 +356,10 @@ impl Inst {
             | Inst::Atomic { .. }
             | Inst::Select { .. }
             | Inst::AtomicCas { .. }
+            | Inst::IntSelect { .. }
+            | Inst::Icmp { .. }
+            | Inst::SelectReg { .. }
+            | Inst::FcvtToInt { .. }
             | Inst::RawData { .. }
             | Inst::AtomicStore { .. }
             | Inst::AtomicLoad { .. }
@@ -226,7 +368,9 @@ impl Inst {
             | Inst::Unwind { .. }
             | Inst::DummyUse { .. }
             | Inst::FloatRound { .. }
+            | Inst::FloatSelect { .. }
             | Inst::Popcnt { .. }
+            | Inst::Rev8 { .. }
             | Inst::Cltz { .. }
             | Inst::Brev8 { .. }
             | Inst::StackProbeLoop { .. } => None,
@@ -288,8 +432,8 @@ impl MachInstEmit for Inst {
         let mut start_off = sink.cur_offset();
 
         // First try to emit this as a compressed instruction
-        let res = inst.try_emit_compressed(sink, emit_info, state, &mut start_off);
-        if res.is_none() {
+        let success = inst.try_emit_compressed(sink, emit_info, state, &mut start_off);
+        if !success {
             // If we can't lets emit it as a normal instruction
             inst.emit_uncompressed(sink, emit_info, state, &mut start_off);
         }
@@ -318,18 +462,13 @@ impl Inst {
         emit_info: &EmitInfo,
         state: &mut EmitState,
         start_off: &mut u32,
-    ) -> Option<()> {
-        let has_m = emit_info.isa_flags.has_m();
-        let has_zba = emit_info.isa_flags.has_zba();
-        let has_zbb = emit_info.isa_flags.has_zbb();
+    ) -> bool {
         let has_zca = emit_info.isa_flags.has_zca();
-        let has_zcb = emit_info.isa_flags.has_zcb();
-        let has_zcd = emit_info.isa_flags.has_zcd();
 
         // Currently all compressed extensions (Zcb, Zcd, Zcmp, Zcmt, etc..) require Zca
         // to be enabled, so check it early.
         if !has_zca {
-            return None;
+            return false;
         }
 
         fn reg_is_compressible(r: Reg) -> bool {
@@ -371,8 +510,7 @@ impl Inst {
                     | AluOPRRR::Xor
                     | AluOPRRR::Sub
                     | AluOPRRR::Addw
-                    | AluOPRRR::Subw
-                    | AluOPRRR::Mul),
+                    | AluOPRRR::Subw),
                 rd,
                 rs1,
                 rs2,
@@ -384,8 +522,7 @@ impl Inst {
                     AluOPRRR::Sub => CaOp::CSub,
                     AluOPRRR::Addw => CaOp::CAddw,
                     AluOPRRR::Subw => CaOp::CSubw,
-                    AluOPRRR::Mul if has_zcb && has_m => CaOp::CMul,
-                    _ => return None,
+                    _ => unreachable!(),
                 };
 
                 sink.put2(encode_ca_type(op, rd, rs2));
@@ -476,17 +613,6 @@ impl Inst {
                 sink.put2(encode_ciw_type(CiwOp::CAddi4spn, rd, imm));
             }
 
-            // c.li
-            Inst::AluRRImm12 {
-                alu_op: AluOPRRI::Addi,
-                rd,
-                rs,
-                imm12,
-            } if rd.to_reg() != zero_reg() && rs == zero_reg() => {
-                let imm6 = Imm6::maybe_from_imm12(imm12)?;
-                sink.put2(encode_ci_type(CiOp::CLi, rd, imm6));
-            }
-
             // c.addi
             Inst::AluRRImm12 {
                 alu_op: AluOPRRI::Addi,
@@ -494,7 +620,11 @@ impl Inst {
                 rs,
                 imm12,
             } if rd.to_reg() == rs && rs != zero_reg() && imm12.as_i16() != 0 => {
-                let imm6 = Imm6::maybe_from_imm12(imm12)?;
+                let imm6 = match Imm6::maybe_from_imm12(imm12) {
+                    Some(imm6) => imm6,
+                    None => return false,
+                };
+
                 sink.put2(encode_ci_type(CiOp::CAddi, rd, imm6));
             }
 
@@ -505,29 +635,13 @@ impl Inst {
                 rs,
                 imm12,
             } if rd.to_reg() == rs && rs != zero_reg() => {
-                let imm6 = Imm6::maybe_from_imm12(imm12)?;
+                let imm6 = match Imm6::maybe_from_imm12(imm12) {
+                    Some(imm6) => imm6,
+                    None => return false,
+                };
                 sink.put2(encode_ci_type(CiOp::CAddiw, rd, imm6));
             }
 
-            // c.lui
-            //
-            // c.lui loads the non-zero 6-bit immediate field into bits 17–12
-            // of the destination register, clears the bottom 12 bits, and
-            // sign-extends bit 17 into all higher bits of the destination.
-            Inst::Lui { rd, imm: imm20 }
-                if rd.to_reg() != zero_reg()
-                    && rd.to_reg() != stack_reg()
-                    && imm20.as_i32() != 0 =>
-            {
-                // Check that the top bits are sign extended
-                let imm = imm20.as_i32() << 14 >> 14;
-                if imm != imm20.as_i32() {
-                    return None;
-                }
-                let imm6 = Imm6::maybe_from_i32(imm)?;
-                sink.put2(encode_ci_type(CiOp::CLui, rd, imm6));
-            }
-
             // c.slli
             Inst::AluRRImm12 {
                 alu_op: AluOPRRI::Slli,
@@ -540,324 +654,10 @@ impl Inst {
                 let imm6 = Imm6::maybe_from_i16(shift << 10 >> 10).unwrap();
                 sink.put2(encode_ci_type(CiOp::CSlli, rd, imm6));
             }
-
-            // c.srli / c.srai
-            Inst::AluRRImm12 {
-                alu_op: op @ (AluOPRRI::Srli | AluOPRRI::Srai),
-                rd,
-                rs,
-                imm12,
-            } if rd.to_reg() == rs && reg_is_compressible(rs) && imm12.as_i16() != 0 => {
-                let op = match op {
-                    AluOPRRI::Srli => CbOp::CSrli,
-                    AluOPRRI::Srai => CbOp::CSrai,
-                    _ => unreachable!(),
-                };
-
-                // The shift amount is unsigned, but we encode it as signed.
-                let shift = imm12.as_i16() & 0x3f;
-                let imm6 = Imm6::maybe_from_i16(shift << 10 >> 10).unwrap();
-                sink.put2(encode_cb_type(op, rd, imm6));
-            }
-
-            // c.zextb
-            //
-            // This is an alias for `andi rd, rd, 0xff`
-            Inst::AluRRImm12 {
-                alu_op: AluOPRRI::Andi,
-                rd,
-                rs,
-                imm12,
-            } if has_zcb
-                && rd.to_reg() == rs
-                && reg_is_compressible(rs)
-                && imm12.as_i16() == 0xff =>
-            {
-                sink.put2(encode_cszn_type(CsznOp::CZextb, rd));
-            }
-
-            // c.andi
-            Inst::AluRRImm12 {
-                alu_op: AluOPRRI::Andi,
-                rd,
-                rs,
-                imm12,
-            } if rd.to_reg() == rs && reg_is_compressible(rs) => {
-                let imm6 = Imm6::maybe_from_imm12(imm12)?;
-                sink.put2(encode_cb_type(CbOp::CAndi, rd, imm6));
-            }
-
-            // Stack Based Loads
-            Inst::Load {
-                rd,
-                op: op @ (LoadOP::Lw | LoadOP::Ld | LoadOP::Fld),
-                from,
-                flags,
-            } if from.get_base_register() == Some(stack_reg())
-                && (from.get_offset_with_state(state) % op.size()) == 0 =>
-            {
-                // We encode the offset in multiples of the load size.
-                let offset = from.get_offset_with_state(state);
-                let imm6 = u8::try_from(offset / op.size())
-                    .ok()
-                    .and_then(Uimm6::maybe_from_u8)?;
-
-                // Some additional constraints on these instructions.
-                //
-                // Integer loads are not allowed to target x0, but floating point loads
-                // are, since f0 is not a special register.
-                //
-                // Floating point loads are not included in the base Zca extension
-                // but in a separate Zcd extension. Both of these are part of the C Extension.
-                let rd_is_zero = rd.to_reg() == zero_reg();
-                let op = match op {
-                    LoadOP::Lw if !rd_is_zero => CiOp::CLwsp,
-                    LoadOP::Ld if !rd_is_zero => CiOp::CLdsp,
-                    LoadOP::Fld if has_zcd => CiOp::CFldsp,
-                    _ => return None,
-                };
-
-                let srcloc = state.cur_srcloc();
-                if !srcloc.is_default() && !flags.notrap() {
-                    // Register the offset at which the actual load instruction starts.
-                    sink.add_trap(TrapCode::HeapOutOfBounds);
-                }
-                sink.put2(encode_ci_sp_load(op, rd, imm6));
-            }
-
-            // Regular Loads
-            Inst::Load {
-                rd,
-                op:
-                    op
-                    @ (LoadOP::Lw | LoadOP::Ld | LoadOP::Fld | LoadOP::Lbu | LoadOP::Lhu | LoadOP::Lh),
-                from,
-                flags,
-            } if reg_is_compressible(rd.to_reg())
-                && from
-                    .get_base_register()
-                    .map(reg_is_compressible)
-                    .unwrap_or(false)
-                && (from.get_offset_with_state(state) % op.size()) == 0 =>
-            {
-                let base = from.get_base_register().unwrap();
-
-                // We encode the offset in multiples of the store size.
-                let offset = from.get_offset_with_state(state);
-                let offset = u8::try_from(offset / op.size()).ok()?;
-
-                // We mix two different formats here.
-                //
-                // c.lw / c.ld / c.fld instructions are available in the standard Zca
-                // extension using the CL format.
-                //
-                // c.lbu / c.lhu / c.lh are only available in the Zcb extension and
-                // are also encoded differently. Technically they each have a different
-                // format, but they are similar enough that we can group them.
-                let is_zcb_load = matches!(op, LoadOP::Lbu | LoadOP::Lhu | LoadOP::Lh);
-                let encoded = if is_zcb_load {
-                    if !has_zcb {
-                        return None;
-                    }
-
-                    let op = match op {
-                        LoadOP::Lbu => ZcbMemOp::CLbu,
-                        LoadOP::Lhu => ZcbMemOp::CLhu,
-                        LoadOP::Lh => ZcbMemOp::CLh,
-                        _ => unreachable!(),
-                    };
-
-                    // Byte stores & loads have 2 bits of immediate offset. Halfword stores
-                    // and loads only have 1 bit.
-                    let imm2 = Uimm2::maybe_from_u8(offset)?;
-                    if (offset & !((1 << op.imm_bits()) - 1)) != 0 {
-                        return None;
-                    }
-
-                    encode_zcbmem_load(op, rd, base, imm2)
-                } else {
-                    // Floating point loads are not included in the base Zca extension
-                    // but in a separate Zcd extension. Both of these are part of the C Extension.
-                    let op = match op {
-                        LoadOP::Lw => ClOp::CLw,
-                        LoadOP::Ld => ClOp::CLd,
-                        LoadOP::Fld if has_zcd => ClOp::CFld,
-                        _ => return None,
-                    };
-                    let imm5 = Uimm5::maybe_from_u8(offset)?;
-
-                    encode_cl_type(op, rd, base, imm5)
-                };
-
-                let srcloc = state.cur_srcloc();
-                if !srcloc.is_default() && !flags.notrap() {
-                    // Register the offset at which the actual load instruction starts.
-                    sink.add_trap(TrapCode::HeapOutOfBounds);
-                }
-                sink.put2(encoded);
-            }
-
-            // Stack Based Stores
-            Inst::Store {
-                src,
-                op: op @ (StoreOP::Sw | StoreOP::Sd | StoreOP::Fsd),
-                to,
-                flags,
-            } if to.get_base_register() == Some(stack_reg())
-                && (to.get_offset_with_state(state) % op.size()) == 0 =>
-            {
-                // We encode the offset in multiples of the store size.
-                let offset = to.get_offset_with_state(state);
-                let imm6 = u8::try_from(offset / op.size())
-                    .ok()
-                    .and_then(Uimm6::maybe_from_u8)?;
-
-                // Floating point stores are not included in the base Zca extension
-                // but in a separate Zcd extension. Both of these are part of the C Extension.
-                let op = match op {
-                    StoreOP::Sw => CssOp::CSwsp,
-                    StoreOP::Sd => CssOp::CSdsp,
-                    StoreOP::Fsd if has_zcd => CssOp::CFsdsp,
-                    _ => return None,
-                };
-
-                let srcloc = state.cur_srcloc();
-                if !srcloc.is_default() && !flags.notrap() {
-                    // Register the offset at which the actual load instruction starts.
-                    sink.add_trap(TrapCode::HeapOutOfBounds);
-                }
-                sink.put2(encode_css_type(op, src, imm6));
-            }
-
-            // Regular Stores
-            Inst::Store {
-                src,
-                op: op @ (StoreOP::Sw | StoreOP::Sd | StoreOP::Fsd | StoreOP::Sh | StoreOP::Sb),
-                to,
-                flags,
-            } if reg_is_compressible(src)
-                && to
-                    .get_base_register()
-                    .map(reg_is_compressible)
-                    .unwrap_or(false)
-                && (to.get_offset_with_state(state) % op.size()) == 0 =>
-            {
-                let base = to.get_base_register().unwrap();
-
-                // We encode the offset in multiples of the store size.
-                let offset = to.get_offset_with_state(state);
-                let offset = u8::try_from(offset / op.size()).ok()?;
-
-                // We mix two different formats here.
-                //
-                // c.sw / c.sd / c.fsd instructions are available in the standard Zca
-                // extension using the CL format.
-                //
-                // c.sb / c.sh are only available in the Zcb extension and are also
-                // encoded differently.
-                let is_zcb_store = matches!(op, StoreOP::Sh | StoreOP::Sb);
-                let encoded = if is_zcb_store {
-                    if !has_zcb {
-                        return None;
-                    }
-
-                    let op = match op {
-                        StoreOP::Sh => ZcbMemOp::CSh,
-                        StoreOP::Sb => ZcbMemOp::CSb,
-                        _ => unreachable!(),
-                    };
-
-                    // Byte stores & loads have 2 bits of immediate offset. Halfword stores
-                    // and loads only have 1 bit.
-                    let imm2 = Uimm2::maybe_from_u8(offset)?;
-                    if (offset & !((1 << op.imm_bits()) - 1)) != 0 {
-                        return None;
-                    }
-
-                    encode_zcbmem_store(op, src, base, imm2)
-                } else {
-                    // Floating point stores are not included in the base Zca extension
-                    // but in a separate Zcd extension. Both of these are part of the C Extension.
-                    let op = match op {
-                        StoreOP::Sw => CsOp::CSw,
-                        StoreOP::Sd => CsOp::CSd,
-                        StoreOP::Fsd if has_zcd => CsOp::CFsd,
-                        _ => return None,
-                    };
-                    let imm5 = Uimm5::maybe_from_u8(offset)?;
-
-                    encode_cs_type(op, src, base, imm5)
-                };
-
-                let srcloc = state.cur_srcloc();
-                if !srcloc.is_default() && !flags.notrap() {
-                    // Register the offset at which the actual load instruction starts.
-                    sink.add_trap(TrapCode::HeapOutOfBounds);
-                }
-                sink.put2(encoded);
-            }
-
-            // c.not
-            //
-            // This is an alias for `xori rd, rd, -1`
-            Inst::AluRRImm12 {
-                alu_op: AluOPRRI::Xori,
-                rd,
-                rs,
-                imm12,
-            } if has_zcb
-                && rd.to_reg() == rs
-                && reg_is_compressible(rs)
-                && imm12.as_i16() == -1 =>
-            {
-                sink.put2(encode_cszn_type(CsznOp::CNot, rd));
-            }
-
-            // c.sext.b / c.sext.h / c.zext.h
-            //
-            // These are all the extend instructions present in `Zcb`, they
-            // also require `Zbb` since they aren't available in the base ISA.
-            Inst::AluRRImm12 {
-                alu_op: alu_op @ (AluOPRRI::Sextb | AluOPRRI::Sexth | AluOPRRI::Zexth),
-                rd,
-                rs,
-                imm12,
-            } if has_zcb
-                && has_zbb
-                && rd.to_reg() == rs
-                && reg_is_compressible(rs)
-                && imm12.as_i16() == 0 =>
-            {
-                let op = match alu_op {
-                    AluOPRRI::Sextb => CsznOp::CSextb,
-                    AluOPRRI::Sexth => CsznOp::CSexth,
-                    AluOPRRI::Zexth => CsznOp::CZexth,
-                    _ => unreachable!(),
-                };
-                sink.put2(encode_cszn_type(op, rd));
-            }
-
-            // c.zext.w
-            //
-            // This is an alias for `add.uw rd, rd, zero`
-            Inst::AluRRR {
-                alu_op: AluOPRRR::Adduw,
-                rd,
-                rs1,
-                rs2,
-            } if has_zcb
-                && has_zba
-                && rd.to_reg() == rs1
-                && reg_is_compressible(rs1)
-                && rs2 == zero_reg() =>
-            {
-                sink.put2(encode_cszn_type(CsznOp::CZextw, rd));
-            }
-
-            _ => return None,
+            _ => return false,
         }
 
-        return Some(());
+        return true;
     }
 
     fn emit_uncompressed(
@@ -926,7 +726,7 @@ impl Inst {
             } => {
                 let x = alu_op.op_code()
                     | reg_to_gpr_num(rd.to_reg()) << 7
-                    | frm.as_u32() << 12
+                    | alu_op.funct3(frm) << 12
                     | reg_to_gpr_num(rs) << 15
                     | alu_op.rs2_funct5() << 20
                     | alu_op.funct7() << 25;
@@ -946,7 +746,7 @@ impl Inst {
             } => {
                 let x = alu_op.op_code()
                     | reg_to_gpr_num(rd.to_reg()) << 7
-                    | frm.as_u32() << 12
+                    | alu_op.funct3(frm) << 12
                     | reg_to_gpr_num(rs1) << 15
                     | reg_to_gpr_num(rs2) << 20
                     | alu_op.funct2() << 25
@@ -963,7 +763,7 @@ impl Inst {
             } => {
                 let x: u32 = alu_op.op_code()
                     | reg_to_gpr_num(rd.to_reg()) << 7
-                    | frm.as_u32() << 12
+                    | (alu_op.funct3(frm)) << 12
                     | reg_to_gpr_num(rs1) << 15
                     | reg_to_gpr_num(rs2) << 20
                     | alu_op.funct7() << 25;
@@ -1156,18 +956,79 @@ impl Inst {
                     .into_iter()
                     .for_each(|i| i.emit(&[], sink, emit_info, state));
             }
-
-            &Inst::Call { ref info } => {
-                if info.opcode.is_call() {
-                    sink.add_call_site(info.opcode);
+            &Inst::AdjustSp { amount } => {
+                if let Some(imm) = Imm12::maybe_from_i64(amount) {
+                    Inst::AluRRImm12 {
+                        alu_op: AluOPRRI::Addi,
+                        rd: writable_stack_reg(),
+                        rs: stack_reg(),
+                        imm12: imm,
+                    }
+                    .emit(&[], sink, emit_info, state);
+                } else {
+                    let tmp = writable_spilltmp_reg();
+                    let mut insts = Inst::load_constant_u64(tmp, amount as u64);
+                    insts.push(Inst::AluRRR {
+                        alu_op: AluOPRRR::Add,
+                        rd: writable_stack_reg(),
+                        rs1: tmp.to_reg(),
+                        rs2: stack_reg(),
+                    });
+                    insts
+                        .into_iter()
+                        .for_each(|i| i.emit(&[], sink, emit_info, state));
                 }
-                sink.add_reloc(Reloc::RiscvCallPlt, &info.dest, 0);
-                if let Some(s) = state.take_stack_map() {
-                    sink.add_stack_map(StackMapExtent::UpcomingBytes(8), s);
+            }
+            &Inst::Call { ref info } => {
+                // call
+                match info.dest {
+                    ExternalName::User { .. } => {
+                        if info.opcode.is_call() {
+                            sink.add_call_site(info.opcode);
+                        }
+                        sink.add_reloc(Reloc::RiscvCall, &info.dest, 0);
+                        if let Some(s) = state.take_stack_map() {
+                            sink.add_stack_map(StackMapExtent::UpcomingBytes(8), s);
+                        }
+                        Inst::construct_auipc_and_jalr(
+                            Some(writable_link_reg()),
+                            writable_link_reg(),
+                            0,
+                        )
+                        .into_iter()
+                        .for_each(|i| i.emit_uncompressed(sink, emit_info, state, start_off));
+                    }
+                    ExternalName::LibCall(..)
+                    | ExternalName::TestCase { .. }
+                    | ExternalName::KnownSymbol(..) => {
+                        // use indirect call. it is more simple.
+                        // load ext name.
+                        Inst::LoadExtName {
+                            rd: writable_spilltmp_reg2(),
+                            name: Box::new(info.dest.clone()),
+                            offset: 0,
+                        }
+                        .emit(&[], sink, emit_info, state);
+
+                        // call
+                        Inst::CallInd {
+                            info: Box::new(CallIndInfo {
+                                rn: spilltmp_reg2(),
+                                // This doesen't really matter but we might as well send
+                                // the correct info.
+                                uses: info.uses.clone(),
+                                defs: info.defs.clone(),
+                                clobbers: info.clobbers,
+                                opcode: Opcode::CallIndirect,
+                                caller_callconv: info.caller_callconv,
+                                callee_callconv: info.callee_callconv,
+                                // Send this as 0 to avoid updating the pop size twice.
+                                callee_pop_size: 0,
+                            }),
+                        }
+                        .emit(&[], sink, emit_info, state);
+                    }
                 }
-                Inst::construct_auipc_and_jalr(Some(writable_link_reg()), writable_link_reg(), 0)
-                    .into_iter()
-                    .for_each(|i| i.emit_uncompressed(sink, emit_info, state, start_off));
 
                 let callee_pop_size = i64::from(info.callee_pop_size);
                 state.virtual_sp_offset -= callee_pop_size;
@@ -1215,7 +1076,7 @@ impl Inst {
                 );
 
                 sink.add_call_site(ir::Opcode::ReturnCall);
-                sink.add_reloc(Reloc::RiscvCallPlt, &**callee, 0);
+                sink.add_reloc(Reloc::RiscvCall, &**callee, 0);
                 Inst::construct_auipc_and_jalr(None, writable_spilltmp_reg(), 0)
                     .into_iter()
                     .for_each(|i| i.emit_uncompressed(sink, emit_info, state, start_off));
@@ -1295,7 +1156,7 @@ impl Inst {
                         } else {
                             FpuOPRRR::FsgnjD
                         },
-                        frm: FRM::RNE,
+                        frm: None,
                         rd: rd,
                         rs1: rm,
                         rs2: rm,
@@ -1580,30 +1441,35 @@ impl Inst {
                 condition,
                 ref x,
                 ref y,
+                ty: _ty,
             } => {
-                let label_true = sink.get_label();
+                let mut insts = SmallInstVec::new();
                 let label_false = sink.get_label();
-                let label_end = sink.get_label();
-                Inst::CondBr {
-                    taken: CondBrTarget::Label(label_true),
-                    not_taken: CondBrTarget::Label(label_false),
-                    kind: condition,
-                }
-                .emit(&[], sink, emit_info, state);
-                sink.bind_label(label_true, &mut state.ctrl_plane);
+                insts.push(Inst::CondBr {
+                    taken: CondBrTarget::Label(label_false),
+                    not_taken: CondBrTarget::Fallthrough,
+                    kind: IntegerCompare {
+                        kind: IntCC::Equal,
+                        rs1: condition,
+                        rs2: zero_reg(),
+                    },
+                });
                 // here is the true
                 // select the first value
-                for i in gen_moves(dst.regs(), x.regs()) {
-                    i.emit(&[], sink, emit_info, state);
-                }
-                Inst::gen_jump(label_end).emit(&[], sink, emit_info, state);
-
+                insts.extend(gen_moves(&dst[..], x.regs()));
+                let label_jump_over = sink.get_label();
+                insts.push(Inst::gen_jump(label_jump_over));
+                // here is false
+                insts
+                    .drain(..)
+                    .for_each(|i: Inst| i.emit(&[], sink, emit_info, state));
                 sink.bind_label(label_false, &mut state.ctrl_plane);
-                for i in gen_moves(dst.regs(), y.regs()) {
-                    i.emit(&[], sink, emit_info, state);
-                }
-
-                sink.bind_label(label_end, &mut state.ctrl_plane);
+                // select second value1
+                insts.extend(gen_moves(&dst[..], y.regs()));
+                insts
+                    .into_iter()
+                    .for_each(|i| i.emit(&[], sink, emit_info, state));
+                sink.bind_label(label_jump_over, &mut state.ctrl_plane);
             }
             &Inst::Jalr { rd, base, offset } => {
                 sink.put4(enc_jalr(rd, base, offset));
@@ -1611,6 +1477,29 @@ impl Inst {
             &Inst::EBreak => {
                 sink.put4(0x00100073);
             }
+            &Inst::Icmp { cc, rd, a, b, ty } => {
+                let label_true = sink.get_label();
+                let label_false = sink.get_label();
+                let label_end = sink.get_label();
+
+                Inst::lower_br_icmp(
+                    cc,
+                    a,
+                    b,
+                    CondBrTarget::Label(label_true),
+                    CondBrTarget::Label(label_false),
+                    ty,
+                )
+                .into_iter()
+                .for_each(|i| i.emit(&[], sink, emit_info, state));
+
+                sink.bind_label(label_true, &mut state.ctrl_plane);
+                Inst::load_imm12(rd, Imm12::ONE).emit(&[], sink, emit_info, state);
+                Inst::gen_jump(label_end).emit(&[], sink, emit_info, state);
+                sink.bind_label(label_false, &mut state.ctrl_plane);
+                Inst::load_imm12(rd, Imm12::ZERO).emit(&[], sink, emit_info, state);
+                sink.bind_label(label_end, &mut state.ctrl_plane);
+            }
             &Inst::AtomicCas {
                 offset,
                 t0,
@@ -1820,23 +1709,22 @@ impl Inst {
                         }
                         .iter()
                         .for_each(|i| i.emit(&[], sink, emit_info, state));
-
-                        Inst::CondBr {
-                            taken: CondBrTarget::Label(label_select_dst),
-                            not_taken: CondBrTarget::Fallthrough,
-                            kind: IntegerCompare {
-                                kind: match op {
-                                    crate::ir::AtomicRmwOp::Umin => IntCC::UnsignedLessThan,
-                                    crate::ir::AtomicRmwOp::Umax => IntCC::UnsignedGreaterThan,
-                                    crate::ir::AtomicRmwOp::Smin => IntCC::SignedLessThan,
-                                    crate::ir::AtomicRmwOp::Smax => IntCC::SignedGreaterThan,
-                                    _ => unreachable!(),
-                                },
-                                rs1: dst.to_reg(),
-                                rs2: x,
+                        Inst::lower_br_icmp(
+                            match op {
+                                crate::ir::AtomicRmwOp::Umin => IntCC::UnsignedLessThan,
+                                crate::ir::AtomicRmwOp::Umax => IntCC::UnsignedGreaterThan,
+                                crate::ir::AtomicRmwOp::Smin => IntCC::SignedLessThan,
+                                crate::ir::AtomicRmwOp::Smax => IntCC::SignedGreaterThan,
+                                _ => unreachable!(),
                             },
-                        }
-                        .emit(&[], sink, emit_info, state);
+                            ValueRegs::one(dst.to_reg()),
+                            ValueRegs::one(x),
+                            CondBrTarget::Label(label_select_dst),
+                            CondBrTarget::Fallthrough,
+                            ty,
+                        )
+                        .iter()
+                        .for_each(|i| i.emit(&[], sink, emit_info, state));
                         // here we select x.
                         Inst::gen_move(t0, x, I64).emit(&[], sink, emit_info, state);
                         Inst::gen_jump(label_select_done).emit(&[], sink, emit_info, state);
@@ -1896,17 +1784,260 @@ impl Inst {
                 }
                 .emit(&[], sink, emit_info, state);
 
-                // if store is not ok,retry.
-                Inst::CondBr {
-                    taken: CondBrTarget::Label(retry),
-                    not_taken: CondBrTarget::Fallthrough,
-                    kind: IntegerCompare {
-                        kind: IntCC::NotEqual,
-                        rs1: t0.to_reg(),
-                        rs2: zero_reg(),
-                    },
+                // if store is not ok,retry.
+                Inst::CondBr {
+                    taken: CondBrTarget::Label(retry),
+                    not_taken: CondBrTarget::Fallthrough,
+                    kind: IntegerCompare {
+                        kind: IntCC::NotEqual,
+                        rs1: t0.to_reg(),
+                        rs2: zero_reg(),
+                    },
+                }
+                .emit(&[], sink, emit_info, state);
+            }
+
+            &Inst::IntSelect {
+                op,
+                ref dst,
+                x,
+                y,
+                ty,
+            } => {
+                let label_true = sink.get_label();
+                let label_false = sink.get_label();
+                let label_done = sink.get_label();
+                Inst::lower_br_icmp(
+                    op.to_int_cc(),
+                    x,
+                    y,
+                    CondBrTarget::Label(label_true),
+                    CondBrTarget::Label(label_false),
+                    ty,
+                )
+                .into_iter()
+                .for_each(|i| i.emit(&[], sink, emit_info, state));
+
+                let gen_move = |dst: &Vec<Writable<Reg>>,
+                                val: &ValueRegs<Reg>,
+                                sink: &mut MachBuffer<Inst>,
+                                state: &mut EmitState| {
+                    let mut insts = SmallInstVec::new();
+                    insts.push(Inst::Mov {
+                        rd: dst[0],
+                        rm: val.regs()[0],
+                        ty: I64,
+                    });
+                    if ty.bits() == 128 {
+                        insts.push(Inst::Mov {
+                            rd: dst[1],
+                            rm: val.regs()[1],
+                            ty,
+                        });
+                    }
+                    insts
+                        .into_iter()
+                        .for_each(|i| i.emit(&[], sink, emit_info, state));
+                };
+                //here is true , use x.
+                sink.bind_label(label_true, &mut state.ctrl_plane);
+                gen_move(dst, &x, sink, state);
+                Inst::gen_jump(label_done).emit(&[], sink, emit_info, state);
+                // here is false use y
+                sink.bind_label(label_false, &mut state.ctrl_plane);
+                gen_move(dst, &y, sink, state);
+                sink.bind_label(label_done, &mut state.ctrl_plane);
+            }
+
+            &Inst::SelectReg {
+                condition,
+                rd,
+                rs1,
+                rs2,
+            } => {
+                let label_true = sink.get_label();
+                let label_jump_over = sink.get_label();
+                let ty = Inst::canonical_type_for_rc(rs1.class());
+
+                sink.use_label_at_offset(sink.cur_offset(), label_true, LabelUse::B12);
+                let x = condition.emit();
+                sink.put4(x);
+                // here is false , use rs2
+                Inst::gen_move(rd, rs2, ty).emit(&[], sink, emit_info, state);
+                // and jump over
+                Inst::gen_jump(label_jump_over).emit(&[], sink, emit_info, state);
+                // here condition is true , use rs1
+                sink.bind_label(label_true, &mut state.ctrl_plane);
+                Inst::gen_move(rd, rs1, ty).emit(&[], sink, emit_info, state);
+                sink.bind_label(label_jump_over, &mut state.ctrl_plane);
+            }
+            &Inst::FcvtToInt {
+                is_sat,
+                rd,
+                rs,
+                is_signed,
+                in_type,
+                out_type,
+                tmp,
+            } => {
+                let label_nan = sink.get_label();
+                let label_jump_over = sink.get_label();
+                // get if nan.
+                Inst::emit_not_nan(rd, rs, in_type).emit(&[], sink, emit_info, state);
+                // jump to nan.
+                Inst::CondBr {
+                    taken: CondBrTarget::Label(label_nan),
+                    not_taken: CondBrTarget::Fallthrough,
+                    kind: IntegerCompare {
+                        kind: IntCC::Equal,
+                        rs2: zero_reg(),
+                        rs1: rd.to_reg(),
+                    },
+                }
+                .emit(&[], sink, emit_info, state);
+
+                if !is_sat {
+                    let f32_bounds = f32_cvt_to_int_bounds(is_signed, out_type.bits() as u8);
+                    let f64_bounds = f64_cvt_to_int_bounds(is_signed, out_type.bits() as u8);
+                    if in_type == F32 {
+                        Inst::load_fp_constant32(tmp, f32_bits(f32_bounds.0), |_| {
+                            writable_spilltmp_reg()
+                        })
+                    } else {
+                        Inst::load_fp_constant64(tmp, f64_bits(f64_bounds.0), |_| {
+                            writable_spilltmp_reg()
+                        })
+                    }
+                    .iter()
+                    .for_each(|i| i.emit(&[], sink, emit_info, state));
+
+                    let le_op = if in_type == F32 {
+                        FpuOPRRR::FleS
+                    } else {
+                        FpuOPRRR::FleD
+                    };
+
+                    // rd := rs <= tmp
+                    Inst::FpuRRR {
+                        alu_op: le_op,
+                        frm: None,
+                        rd,
+                        rs1: rs,
+                        rs2: tmp.to_reg(),
+                    }
+                    .emit(&[], sink, emit_info, state);
+                    Inst::TrapIf {
+                        cc: IntCC::NotEqual,
+                        rs1: rd.to_reg(),
+                        rs2: zero_reg(),
+                        trap_code: TrapCode::IntegerOverflow,
+                    }
+                    .emit(&[], sink, emit_info, state);
+
+                    if in_type == F32 {
+                        Inst::load_fp_constant32(tmp, f32_bits(f32_bounds.1), |_| {
+                            writable_spilltmp_reg()
+                        })
+                    } else {
+                        Inst::load_fp_constant64(tmp, f64_bits(f64_bounds.1), |_| {
+                            writable_spilltmp_reg()
+                        })
+                    }
+                    .iter()
+                    .for_each(|i| i.emit(&[], sink, emit_info, state));
+
+                    // rd := rs >= tmp
+                    Inst::FpuRRR {
+                        alu_op: le_op,
+                        frm: None,
+                        rd,
+                        rs1: tmp.to_reg(),
+                        rs2: rs,
+                    }
+                    .emit(&[], sink, emit_info, state);
+
+                    Inst::TrapIf {
+                        cc: IntCC::NotEqual,
+                        rs1: rd.to_reg(),
+                        rs2: zero_reg(),
+                        trap_code: TrapCode::IntegerOverflow,
+                    }
+                    .emit(&[], sink, emit_info, state);
+                }
+                // convert to int normally.
+                Inst::FpuRR {
+                    frm: Some(FRM::RTZ),
+                    alu_op: FpuOPRR::float_convert_2_int_op(in_type, is_signed, out_type),
+                    rd,
+                    rs,
+                }
+                .emit(&[], sink, emit_info, state);
+                if out_type.bits() < 32 && is_signed {
+                    // load value part mask.
+                    Inst::load_constant_u32(
+                        writable_spilltmp_reg(),
+                        if 16 == out_type.bits() {
+                            (u16::MAX >> 1) as u64
+                        } else {
+                            // I8
+                            (u8::MAX >> 1) as u64
+                        },
+                    )
+                    .into_iter()
+                    .for_each(|x| x.emit(&[], sink, emit_info, state));
+                    // keep value part.
+                    Inst::AluRRR {
+                        alu_op: AluOPRRR::And,
+                        rd: writable_spilltmp_reg(),
+                        rs1: rd.to_reg(),
+                        rs2: spilltmp_reg(),
+                    }
+                    .emit(&[], sink, emit_info, state);
+                    // extact sign bit.
+                    Inst::AluRRImm12 {
+                        alu_op: AluOPRRI::Srli,
+                        rd: rd,
+                        rs: rd.to_reg(),
+                        imm12: Imm12::from_i16(31),
+                    }
+                    .emit(&[], sink, emit_info, state);
+                    Inst::AluRRImm12 {
+                        alu_op: AluOPRRI::Slli,
+                        rd: rd,
+                        rs: rd.to_reg(),
+                        imm12: Imm12::from_i16(if 16 == out_type.bits() {
+                            15
+                        } else {
+                            // I8
+                            7
+                        }),
+                    }
+                    .emit(&[], sink, emit_info, state);
+                    // make result,sign bit and value part.
+                    Inst::AluRRR {
+                        alu_op: AluOPRRR::Or,
+                        rd: rd,
+                        rs1: rd.to_reg(),
+                        rs2: spilltmp_reg(),
+                    }
+                    .emit(&[], sink, emit_info, state);
+                }
+
+                // I already have the result,jump over.
+                Inst::gen_jump(label_jump_over).emit(&[], sink, emit_info, state);
+                // here is nan , move 0 into rd register
+                sink.bind_label(label_nan, &mut state.ctrl_plane);
+                if is_sat {
+                    Inst::load_imm12(rd, Imm12::ZERO).emit(&[], sink, emit_info, state);
+                } else {
+                    // here is ud2.
+                    Inst::Udf {
+                        trap_code: TrapCode::BadConversionToInteger,
+                    }
+                    .emit(&[], sink, emit_info, state);
                 }
-                .emit(&[], sink, emit_info, state);
+                // bind jump_over
+                sink.bind_label(label_jump_over, &mut state.ctrl_plane);
             }
 
             &Inst::LoadExtName {
@@ -1914,71 +2045,26 @@ impl Inst {
                 ref name,
                 offset,
             } => {
-                if emit_info.shared_flag.is_pic() {
-                    // Load a PC-relative address into a register.
-                    // RISC-V does this slightly differently from other arches. We emit a relocation
-                    // with a label, instead of the symbol itself.
-                    //
-                    // See: https://github.com/riscv-non-isa/riscv-elf-psabi-doc/blob/master/riscv-elf.adoc#pc-relative-symbol-addresses
-                    //
-                    // Emit the following code:
-                    // label:
-                    //   auipc rd, 0              # R_RISCV_GOT_HI20 (symbol_name)
-                    //   ld    rd, rd, 0          # R_RISCV_PCREL_LO12_I (label)
-
-                    // Create the lable that is going to be published to the final binary object.
-                    let auipc_label = sink.get_label();
-                    sink.bind_label(auipc_label, &mut state.ctrl_plane);
-
-                    // Get the current PC.
-                    sink.add_reloc(Reloc::RiscvGotHi20, &**name, 0);
-                    Inst::Auipc {
-                        rd: rd,
-                        imm: Imm20::from_i32(0),
-                    }
-                    .emit_uncompressed(sink, emit_info, state, start_off);
+                let label_data = sink.get_label();
+                let label_end = sink.get_label();
 
-                    // The `ld` here, points to the `auipc` label instead of directly to the symbol.
-                    sink.add_reloc(Reloc::RiscvPCRelLo12I, &auipc_label, 0);
-                    Inst::Load {
-                        rd,
-                        op: LoadOP::Ld,
-                        flags: MemFlags::trusted(),
-                        from: AMode::RegOffset(rd.to_reg(), 0, I64),
-                    }
-                    .emit_uncompressed(sink, emit_info, state, start_off);
-                } else {
-                    // In the non PIC sequence we relocate the absolute address into
-                    // a prealocatted space, load it into a register and jump over it.
-                    //
-                    // Emit the following code:
-                    //   ld rd, label_data
-                    //   j label_end
-                    // label_data:
-                    //   <8 byte space>           # ABS8
-                    // label_end:
-
-                    let label_data = sink.get_label();
-                    let label_end = sink.get_label();
-
-                    // Load the value from a label
-                    Inst::Load {
-                        rd,
-                        op: LoadOP::Ld,
-                        flags: MemFlags::trusted(),
-                        from: AMode::Label(label_data),
-                    }
-                    .emit(&[], sink, emit_info, state);
+                // Load the value from a label
+                Inst::Load {
+                    rd,
+                    op: LoadOP::Ld,
+                    flags: MemFlags::trusted(),
+                    from: AMode::Label(label_data),
+                }
+                .emit(&[], sink, emit_info, state);
 
-                    // Jump over the data
-                    Inst::gen_jump(label_end).emit(&[], sink, emit_info, state);
+                // Jump over the data
+                Inst::gen_jump(label_end).emit(&[], sink, emit_info, state);
 
-                    sink.bind_label(label_data, &mut state.ctrl_plane);
-                    sink.add_reloc(Reloc::Abs8, name.as_ref(), offset);
-                    sink.put8(0);
+                sink.bind_label(label_data, &mut state.ctrl_plane);
+                sink.add_reloc(Reloc::Abs8, name.as_ref(), offset);
+                sink.put8(0);
 
-                    sink.bind_label(label_end, &mut state.ctrl_plane);
-                }
+                sink.bind_label(label_end, &mut state.ctrl_plane);
             }
 
             &Inst::ElfTlsGetAddr { rd, ref name } => {
@@ -2157,7 +2243,7 @@ impl Inst {
 
                 // branch if f_tmp < rd
                 Inst::FpuRRR {
-                    frm: FRM::RTZ,
+                    frm: None,
                     alu_op: if ty == F32 {
                         FpuOPRRR::FltS
                     } else {
@@ -2183,19 +2269,15 @@ impl Inst {
                 //convert to int.
                 Inst::FpuRR {
                     alu_op: FpuOPRR::float_convert_2_int_op(ty, true, I64),
-                    frm: op.to_frm(),
+                    frm: Some(op.to_frm()),
                     rd: int_tmp,
                     rs: rs,
                 }
                 .emit(&[], sink, emit_info, state);
                 //convert back.
                 Inst::FpuRR {
-                    alu_op: if ty == F32 {
-                        FpuOPRR::FcvtSL
-                    } else {
-                        FpuOPRR::FcvtDL
-                    },
-                    frm: op.to_frm(),
+                    alu_op: FpuOPRR::int_convert_2_float_op(I64, true, ty),
+                    frm: Some(op.to_frm()),
                     rd,
                     rs: int_tmp.to_reg(),
                 }
@@ -2207,7 +2289,7 @@ impl Inst {
                     } else {
                         FpuOPRRR::FsgnjD
                     },
-                    frm: FRM::RNE,
+                    frm: None,
                     rd,
                     rs1: rd.to_reg(),
                     rs2: rs,
@@ -2223,7 +2305,7 @@ impl Inst {
                     } else {
                         FpuOPRRR::FaddD
                     },
-                    frm: FRM::RNE,
+                    frm: None,
                     rd: rd,
                     rs1: rs,
                     rs2: rs,
@@ -2236,6 +2318,126 @@ impl Inst {
                 sink.bind_label(label_jump_over, &mut state.ctrl_plane);
             }
 
+            &Inst::FloatSelect {
+                op,
+                rd,
+                tmp,
+                rs1,
+                rs2,
+                ty,
+            } => {
+                let label_nan = sink.get_label();
+                let label_jump_over = sink.get_label();
+                // check if rs1 is nan.
+                Inst::emit_not_nan(tmp, rs1, ty).emit(&[], sink, emit_info, state);
+                Inst::CondBr {
+                    taken: CondBrTarget::Label(label_nan),
+                    not_taken: CondBrTarget::Fallthrough,
+                    kind: IntegerCompare {
+                        kind: IntCC::Equal,
+                        rs1: tmp.to_reg(),
+                        rs2: zero_reg(),
+                    },
+                }
+                .emit(&[], sink, emit_info, state);
+                // check if rs2 is nan.
+                Inst::emit_not_nan(tmp, rs2, ty).emit(&[], sink, emit_info, state);
+                Inst::CondBr {
+                    taken: CondBrTarget::Label(label_nan),
+                    not_taken: CondBrTarget::Fallthrough,
+                    kind: IntegerCompare {
+                        kind: IntCC::Equal,
+                        rs1: tmp.to_reg(),
+                        rs2: zero_reg(),
+                    },
+                }
+                .emit(&[], sink, emit_info, state);
+                // here rs1 and rs2 is not nan.
+                Inst::FpuRRR {
+                    alu_op: op.to_fpuoprrr(ty),
+                    frm: None,
+                    rd: rd,
+                    rs1: rs1,
+                    rs2: rs2,
+                }
+                .emit(&[], sink, emit_info, state);
+                // special handle for +0 or -0.
+                {
+                    // check is rs1 and rs2 all equal to zero.
+                    let label_done = sink.get_label();
+                    {
+                        // if rs1 == 0
+                        let mut insts = Inst::emit_if_float_not_zero(
+                            tmp,
+                            rs1,
+                            ty,
+                            CondBrTarget::Label(label_done),
+                            CondBrTarget::Fallthrough,
+                        );
+                        insts.extend(Inst::emit_if_float_not_zero(
+                            tmp,
+                            rs2,
+                            ty,
+                            CondBrTarget::Label(label_done),
+                            CondBrTarget::Fallthrough,
+                        ));
+                        insts
+                            .iter()
+                            .for_each(|i| i.emit(&[], sink, emit_info, state));
+                    }
+                    Inst::FpuRR {
+                        alu_op: FpuOPRR::move_f_to_x_op(ty),
+                        frm: None,
+                        rd: tmp,
+                        rs: rs1,
+                    }
+                    .emit(&[], sink, emit_info, state);
+                    Inst::FpuRR {
+                        alu_op: FpuOPRR::move_f_to_x_op(ty),
+                        frm: None,
+                        rd: writable_spilltmp_reg(),
+                        rs: rs2,
+                    }
+                    .emit(&[], sink, emit_info, state);
+                    Inst::AluRRR {
+                        alu_op: if op == FloatSelectOP::Max {
+                            AluOPRRR::And
+                        } else {
+                            AluOPRRR::Or
+                        },
+                        rd: tmp,
+                        rs1: tmp.to_reg(),
+                        rs2: spilltmp_reg(),
+                    }
+                    .emit(&[], sink, emit_info, state);
+                    // move back to rd.
+                    Inst::FpuRR {
+                        alu_op: FpuOPRR::move_x_to_f_op(ty),
+                        frm: None,
+                        rd,
+                        rs: tmp.to_reg(),
+                    }
+                    .emit(&[], sink, emit_info, state);
+                    //
+                    sink.bind_label(label_done, &mut state.ctrl_plane);
+                }
+                // we have the reuslt,jump over.
+                Inst::gen_jump(label_jump_over).emit(&[], sink, emit_info, state);
+                // here is nan.
+                sink.bind_label(label_nan, &mut state.ctrl_plane);
+                op.snan_bits(tmp, ty)
+                    .into_iter()
+                    .for_each(|i| i.emit(&[], sink, emit_info, state));
+                // move to rd.
+                Inst::FpuRR {
+                    alu_op: FpuOPRR::move_x_to_f_op(ty),
+                    frm: None,
+                    rd,
+                    rs: tmp.to_reg(),
+                }
+                .emit(&[], sink, emit_info, state);
+                sink.bind_label(label_jump_over, &mut state.ctrl_plane);
+            }
             &Inst::Popcnt {
                 sum,
                 tmp,
@@ -2323,6 +2525,71 @@ impl Inst {
                 }
                 sink.bind_label(label_done, &mut state.ctrl_plane);
             }
+            &Inst::Rev8 { rs, rd, tmp, step } => {
+                // init.
+                Inst::gen_move(rd, zero_reg(), I64).emit(&[], sink, emit_info, state);
+                Inst::gen_move(tmp, rs, I64).emit(&[], sink, emit_info, state);
+                // load 56 to step.
+                Inst::load_imm12(step, Imm12::from_i16(56)).emit(&[], sink, emit_info, state);
+                let label_done = sink.get_label();
+                let label_loop = sink.get_label();
+                sink.bind_label(label_loop, &mut state.ctrl_plane);
+                Inst::CondBr {
+                    taken: CondBrTarget::Label(label_done),
+                    not_taken: CondBrTarget::Fallthrough,
+                    kind: IntegerCompare {
+                        kind: IntCC::SignedLessThan,
+                        rs1: step.to_reg(),
+                        rs2: zero_reg(),
+                    },
+                }
+                .emit(&[], sink, emit_info, state);
+                Inst::AluRRImm12 {
+                    alu_op: AluOPRRI::Andi,
+                    rd: writable_spilltmp_reg(),
+                    rs: tmp.to_reg(),
+                    imm12: Imm12::from_i16(255),
+                }
+                .emit(&[], sink, emit_info, state);
+                Inst::AluRRR {
+                    alu_op: AluOPRRR::Sll,
+                    rd: writable_spilltmp_reg(),
+                    rs1: spilltmp_reg(),
+                    rs2: step.to_reg(),
+                }
+                .emit(&[], sink, emit_info, state);
+
+                Inst::AluRRR {
+                    alu_op: AluOPRRR::Or,
+                    rd: rd,
+                    rs1: rd.to_reg(),
+                    rs2: spilltmp_reg(),
+                }
+                .emit(&[], sink, emit_info, state);
+
+                {
+                    // reset step
+                    Inst::AluRRImm12 {
+                        alu_op: AluOPRRI::Addi,
+                        rd: step,
+                        rs: step.to_reg(),
+                        imm12: Imm12::from_i16(-8),
+                    }
+                    .emit(&[], sink, emit_info, state);
+                    //reset tmp.
+                    Inst::AluRRImm12 {
+                        alu_op: AluOPRRI::Srli,
+                        rd: tmp,
+                        rs: tmp.to_reg(),
+                        imm12: Imm12::from_i16(8),
+                    }
+                    .emit(&[], sink, emit_info, state);
+                    // loop.
+                    Inst::gen_jump(label_loop).emit(&[], sink, emit_info, state);
+                }
+
+                sink.bind_label(label_done, &mut state.ctrl_plane);
+            }
             &Inst::Cltz {
                 sum,
                 tmp,
@@ -2795,13 +3062,6 @@ impl Inst {
             }
         }
 
-        fn alloc_writable_value_regs(
-            origin: &ValueRegs<Writable<Reg>>,
-            alloc: &mut AllocationConsumer,
-        ) -> ValueRegs<Writable<Reg>> {
-            alloc_value_regs(&origin.map(|r| r.to_reg()), alloc).map(Writable::from_reg)
-        }
-
         match self {
             Inst::Nop0 => self,
             Inst::Nop4 => self,
@@ -2927,6 +3187,7 @@ impl Inst {
                 from_bits,
                 to_bits,
             },
+            Inst::AdjustSp { .. } => self,
 
             Inst::Call { .. } => self,
             Inst::CallInd { mut info } => {
@@ -3022,19 +3283,23 @@ impl Inst {
                 condition,
                 ref x,
                 ref y,
+                ty,
             } => {
-                let mut condition: IntegerCompare = condition.clone();
-                condition.rs1 = allocs.next(condition.rs1);
-                condition.rs2 = allocs.next(condition.rs2);
+                let condition = allocs.next(condition);
                 let x = alloc_value_regs(x, allocs);
                 let y = alloc_value_regs(y, allocs);
-                let dst = alloc_writable_value_regs(dst, allocs);
+                let dst: Vec<_> = dst
+                    .clone()
+                    .into_iter()
+                    .map(|r| allocs.next_writable(r))
+                    .collect();
 
                 Inst::Select {
                     dst,
                     condition,
                     x,
                     y,
+                    ty,
                 }
             }
             Inst::Jalr { rd, base, offset } => {
@@ -3049,6 +3314,20 @@ impl Inst {
 
             Inst::EBreak => self,
 
+            Inst::Icmp {
+                cc,
+                rd,
+                ref a,
+                ref b,
+                ty,
+            } => Inst::Icmp {
+                cc,
+                a: alloc_value_regs(a, allocs),
+                b: alloc_value_regs(b, allocs),
+                rd: allocs.next_writable(rd),
+                ty,
+            },
+
             Inst::AtomicCas {
                 offset,
                 t0,
@@ -3085,6 +3364,54 @@ impl Inst {
                 dst: allocs.next_writable(dst),
             },
 
+            Inst::IntSelect {
+                op,
+                dst,
+                ref x,
+                ref y,
+                ty,
+            } => {
+                let x = alloc_value_regs(x, allocs);
+                let y = alloc_value_regs(y, allocs);
+                let dst: Vec<_> = dst.iter().map(|r| allocs.next_writable(*r)).collect();
+                Inst::IntSelect { op, ty, dst, x, y }
+            }
+
+            Inst::SelectReg {
+                condition,
+                rd,
+                rs1,
+                rs2,
+            } => {
+                let mut condition: IntegerCompare = condition.clone();
+                condition.rs1 = allocs.next(condition.rs1);
+                condition.rs2 = allocs.next(condition.rs2);
+                Inst::SelectReg {
+                    condition,
+                    rs1: allocs.next(rs1),
+                    rs2: allocs.next(rs2),
+                    rd: allocs.next_writable(rd),
+                }
+            }
+
+            Inst::FcvtToInt {
+                is_sat,
+                rd,
+                rs,
+                is_signed,
+                in_type,
+                out_type,
+                tmp,
+            } => Inst::FcvtToInt {
+                is_sat,
+                is_signed,
+                in_type,
+                out_type,
+                rs: allocs.next(rs),
+                tmp: allocs.next_writable(tmp),
+                rd: allocs.next_writable(rd),
+            },
+
             Inst::LoadExtName { rd, name, offset } => Inst::LoadExtName {
                 rd: allocs.next_writable(rd),
                 name,
@@ -3139,6 +3466,22 @@ impl Inst {
                 rd: allocs.next_writable(rd),
             },
 
+            Inst::FloatSelect {
+                op,
+                rd,
+                tmp,
+                rs1,
+                rs2,
+                ty,
+            } => Inst::FloatSelect {
+                op,
+                ty,
+                rs1: allocs.next(rs1),
+                rs2: allocs.next(rs2),
+                tmp: allocs.next_writable(tmp),
+                rd: allocs.next_writable(rd),
+            },
+
             Inst::Popcnt {
                 sum,
                 tmp,
@@ -3152,6 +3495,14 @@ impl Inst {
                 sum: allocs.next_writable(sum),
                 ty,
             },
+
+            Inst::Rev8 { rs, rd, tmp, step } => Inst::Rev8 {
+                rs: allocs.next(rs),
+                tmp: allocs.next_writable(tmp),
+                step: allocs.next_writable(step),
+                rd: allocs.next_writable(rd),
+            },
+
             Inst::Cltz {
                 sum,
                 tmp,
diff --git a/cranelift/codegen/src/isa/riscv64/inst/emit_tests.rs b/cranelift/codegen/src/isa/riscv64/inst/emit_tests.rs
index d0975502acf4..d5038bfca4b1 100644
--- a/cranelift/codegen/src/isa/riscv64/inst/emit_tests.rs
+++ b/cranelift/codegen/src/isa/riscv64/inst/emit_tests.rs
@@ -5,10 +5,6 @@ use crate::settings;
 use alloc::vec::Vec;
 use std::borrow::Cow;
 
-fn fa7() -> Reg {
-    f_reg(17)
-}
-
 #[test]
 fn test_riscv64_binemit() {
     struct TestUnit {
@@ -1160,7 +1156,7 @@ fn test_riscv64_binemit() {
     //
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RNE,
+            frm: Some(FRM::RNE),
             alu_op: FpuOPRRR::FaddS,
             rd: writable_fa0(),
             rs1: fa0(),
@@ -1171,7 +1167,7 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RTZ,
+            frm: Some(FRM::RTZ),
             alu_op: FpuOPRRR::FsubS,
             rd: writable_fa0(),
             rs1: fa0(),
@@ -1182,7 +1178,7 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RUP,
+            frm: Some(FRM::RUP),
             alu_op: FpuOPRRR::FmulS,
             rd: writable_fa0(),
             rs1: fa0(),
@@ -1193,18 +1189,18 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRRR::FdivS,
             rd: writable_fa0(),
             rs1: fa0(),
             rs2: fa1(),
         },
-        "fdiv.s fa0,fa0,fa1,fcsr",
+        "fdiv.s fa0,fa0,fa1",
         0x18b57553,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RNE,
+            frm: None,
             alu_op: FpuOPRRR::FsgnjS,
             rd: writable_fa0(),
             rs1: fa0(),
@@ -1215,7 +1211,7 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RTZ,
+            frm: None,
             alu_op: FpuOPRRR::FsgnjnS,
             rd: writable_fa0(),
             rs1: fa0(),
@@ -1227,7 +1223,7 @@ fn test_riscv64_binemit() {
 
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RDN,
+            frm: None,
             alu_op: FpuOPRRR::FsgnjxS,
             rd: writable_fa0(),
             rs1: fa0(),
@@ -1238,7 +1234,7 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RNE,
+            frm: None,
             alu_op: FpuOPRRR::FminS,
             rd: writable_fa0(),
             rs1: fa0(),
@@ -1250,7 +1246,7 @@ fn test_riscv64_binemit() {
 
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RTZ,
+            frm: None,
             alu_op: FpuOPRRR::FmaxS,
             rd: writable_fa0(),
             rs1: fa0(),
@@ -1261,7 +1257,7 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RDN,
+            frm: None,
             alu_op: FpuOPRRR::FeqS,
             rd: writable_a0(),
             rs1: fa0(),
@@ -1272,7 +1268,7 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RTZ,
+            frm: None,
             alu_op: FpuOPRRR::FltS,
             rd: writable_a0(),
             rs1: fa0(),
@@ -1283,7 +1279,7 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RNE,
+            frm: None,
             alu_op: FpuOPRRR::FleS,
             rd: writable_a0(),
             rs1: fa0(),
@@ -1296,51 +1292,51 @@ fn test_riscv64_binemit() {
     //
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRRR::FaddD,
             rd: writable_fa0(),
             rs1: fa0(),
             rs2: fa1(),
         },
-        "fadd.d fa0,fa0,fa1,fcsr",
+        "fadd.d fa0,fa0,fa1",
         0x2b57553,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRRR::FsubD,
             rd: writable_fa0(),
             rs1: fa0(),
             rs2: fa1(),
         },
-        "fsub.d fa0,fa0,fa1,fcsr",
+        "fsub.d fa0,fa0,fa1",
         0xab57553,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRRR::FmulD,
             rd: writable_fa0(),
             rs1: fa0(),
             rs2: fa1(),
         },
-        "fmul.d fa0,fa0,fa1,fcsr",
+        "fmul.d fa0,fa0,fa1",
         0x12b57553,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRRR::FdivD,
             rd: writable_fa0(),
             rs1: fa0(),
             rs2: fa1(),
         },
-        "fdiv.d fa0,fa0,fa1,fcsr",
+        "fdiv.d fa0,fa0,fa1",
         0x1ab57553,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RNE,
+            frm: None,
             alu_op: FpuOPRRR::FsgnjD,
             rd: writable_fa0(),
             rs1: fa0(),
@@ -1351,7 +1347,7 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RTZ,
+            frm: None,
             alu_op: FpuOPRRR::FsgnjnD,
             rd: writable_fa0(),
             rs1: fa0(),
@@ -1363,7 +1359,7 @@ fn test_riscv64_binemit() {
 
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RDN,
+            frm: None,
             alu_op: FpuOPRRR::FsgnjxD,
             rd: writable_fa0(),
             rs1: fa0(),
@@ -1374,7 +1370,7 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RNE,
+            frm: None,
             alu_op: FpuOPRRR::FminD,
             rd: writable_fa0(),
             rs1: fa0(),
@@ -1386,7 +1382,7 @@ fn test_riscv64_binemit() {
 
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RTZ,
+            frm: None,
             alu_op: FpuOPRRR::FmaxD,
             rd: writable_fa0(),
             rs1: fa0(),
@@ -1397,7 +1393,7 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RDN,
+            frm: None,
             alu_op: FpuOPRRR::FeqD,
             rd: writable_a0(),
             rs1: fa0(),
@@ -1408,7 +1404,7 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RTZ,
+            frm: None,
             alu_op: FpuOPRRR::FltD,
             rd: writable_a0(),
             rs1: fa0(),
@@ -1419,7 +1415,7 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRR {
-            frm: FRM::RNE,
+            frm: None,
             alu_op: FpuOPRRR::FleD,
             rd: writable_a0(),
             rs1: fa0(),
@@ -1432,7 +1428,7 @@ fn test_riscv64_binemit() {
     //
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::RNE,
+            frm: Some(FRM::RNE),
             alu_op: FpuOPRR::FsqrtS,
             rd: writable_fa0(),
             rs: fa1(),
@@ -1442,28 +1438,28 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRR::FcvtWS,
             rd: writable_a0(),
             rs: fa1(),
         },
-        "fcvt.w.s a0,fa1,fcsr",
+        "fcvt.w.s a0,fa1",
         0xc005f553,
     ));
 
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRR::FcvtWuS,
             rd: writable_a0(),
             rs: fa1(),
         },
-        "fcvt.wu.s a0,fa1,fcsr",
+        "fcvt.wu.s a0,fa1",
         0xc015f553,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::RNE,
+            frm: None,
             alu_op: FpuOPRR::FmvXW,
             rd: writable_a0(),
             rs: fa1(),
@@ -1473,7 +1469,7 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::RTZ,
+            frm: None,
             alu_op: FpuOPRR::FclassS,
             rd: writable_a0(),
             rs: fa1(),
@@ -1484,28 +1480,28 @@ fn test_riscv64_binemit() {
 
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRR::FcvtSw,
             rd: writable_fa0(),
             rs: a0(),
         },
-        "fcvt.s.w fa0,a0,fcsr",
+        "fcvt.s.w fa0,a0",
         0xd0057553,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRR::FcvtSwU,
             rd: writable_fa0(),
             rs: a0(),
         },
-        "fcvt.s.wu fa0,a0,fcsr",
+        "fcvt.s.wu fa0,a0",
         0xd0157553,
     ));
 
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::RNE,
+            frm: None,
             alu_op: FpuOPRR::FmvWX,
             rd: writable_fa0(),
             rs: a0(),
@@ -1515,81 +1511,81 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRR::FcvtLS,
             rd: writable_a0(),
             rs: fa0(),
         },
-        "fcvt.l.s a0,fa0,fcsr",
+        "fcvt.l.s a0,fa0",
         0xc0257553,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRR::FcvtLuS,
             rd: writable_a0(),
             rs: fa0(),
         },
-        "fcvt.lu.s a0,fa0,fcsr",
+        "fcvt.lu.s a0,fa0",
         0xc0357553,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::Fcsr,
+            frm: None,
 
             alu_op: FpuOPRR::FcvtSL,
             rd: writable_fa0(),
             rs: a0(),
         },
-        "fcvt.s.l fa0,a0,fcsr",
+        "fcvt.s.l fa0,a0",
         0xd0257553,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRR::FcvtSLU,
             rd: writable_fa0(),
             rs: a0(),
         },
-        "fcvt.s.lu fa0,a0,fcsr",
+        "fcvt.s.lu fa0,a0",
         0xd0357553,
     ));
 
     //
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRR::FsqrtD,
             rd: writable_fa0(),
             rs: fa1(),
         },
-        "fsqrt.d fa0,fa1,fcsr",
+        "fsqrt.d fa0,fa1",
         0x5a05f553,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRR::FcvtWD,
             rd: writable_a0(),
             rs: fa1(),
         },
-        "fcvt.w.d a0,fa1,fcsr",
+        "fcvt.w.d a0,fa1",
         0xc205f553,
     ));
 
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRR::FcvtWuD,
             rd: writable_a0(),
             rs: fa1(),
         },
-        "fcvt.wu.d a0,fa1,fcsr",
+        "fcvt.wu.d a0,fa1",
         0xc215f553,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::RNE,
+            frm: None,
             alu_op: FpuOPRR::FmvXD,
             rd: writable_a0(),
             rs: fa1(),
@@ -1599,7 +1595,7 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::RTZ,
+            frm: None,
             alu_op: FpuOPRR::FclassD,
             rd: writable_a0(),
             rs: fa1(),
@@ -1610,17 +1606,17 @@ fn test_riscv64_binemit() {
 
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRR::FcvtSD,
             rd: writable_fa0(),
             rs: fa0(),
         },
-        "fcvt.s.d fa0,fa0,fcsr",
+        "fcvt.s.d fa0,fa0",
         0x40157553,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::RNE,
+            frm: None,
             alu_op: FpuOPRR::FcvtDWU,
             rd: writable_fa0(),
             rs: a0(),
@@ -1631,7 +1627,7 @@ fn test_riscv64_binemit() {
 
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::RNE,
+            frm: None,
             alu_op: FpuOPRR::FmvDX,
             rd: writable_fa0(),
             rs: a0(),
@@ -1641,49 +1637,49 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRR::FcvtLD,
             rd: writable_a0(),
             rs: fa0(),
         },
-        "fcvt.l.d a0,fa0,fcsr",
+        "fcvt.l.d a0,fa0",
         0xc2257553,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRR::FcvtLuD,
             rd: writable_a0(),
             rs: fa0(),
         },
-        "fcvt.lu.d a0,fa0,fcsr",
+        "fcvt.lu.d a0,fa0",
         0xc2357553,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRR::FcvtDL,
             rd: writable_fa0(),
             rs: a0(),
         },
-        "fcvt.d.l fa0,a0,fcsr",
+        "fcvt.d.l fa0,a0",
         0xd2257553,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRR::FcvtDLu,
             rd: writable_fa0(),
             rs: a0(),
         },
-        "fcvt.d.lu fa0,a0,fcsr",
+        "fcvt.d.lu fa0,a0",
         0xd2357553,
     ));
     //////////////////////
 
     insns.push(TestUnit::new(
         Inst::FpuRRRR {
-            frm: FRM::RNE,
+            frm: Some(FRM::RNE),
             alu_op: FpuOPRRRR::FmaddS,
             rd: writable_fa0(),
             rs1: fa0(),
@@ -1695,56 +1691,56 @@ fn test_riscv64_binemit() {
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRRRR::FmsubS,
             rd: writable_fa0(),
             rs1: fa0(),
             rs2: fa1(),
             rs3: fa7(),
         },
-        "fmsub.s fa0,fa0,fa1,fa7,fcsr",
+        "fmsub.s fa0,fa0,fa1,fa7",
         0x88b57547,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRRRR::FnmsubS,
             rd: writable_fa0(),
             rs1: fa0(),
             rs2: fa1(),
             rs3: fa7(),
         },
-        "fnmsub.s fa0,fa0,fa1,fa7,fcsr",
+        "fnmsub.s fa0,fa0,fa1,fa7",
         0x88b5754b,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRRRR::FnmaddS,
             rd: writable_fa0(),
             rs1: fa0(),
             rs2: fa1(),
             rs3: fa7(),
         },
-        "fnmadd.s fa0,fa0,fa1,fa7,fcsr",
+        "fnmadd.s fa0,fa0,fa1,fa7",
         0x88b5754f,
     ));
 
     insns.push(TestUnit::new(
         Inst::FpuRRRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRRRR::FmaddD,
             rd: writable_fa0(),
             rs1: fa0(),
             rs2: fa1(),
             rs3: fa7(),
         },
-        "fmadd.d fa0,fa0,fa1,fa7,fcsr",
+        "fmadd.d fa0,fa0,fa1,fa7",
         0x8ab57543,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRRR {
-            frm: FRM::Fcsr,
+            frm: None,
 
             alu_op: FpuOPRRRR::FmsubD,
             rd: writable_fa0(),
@@ -1752,31 +1748,31 @@ fn test_riscv64_binemit() {
             rs2: fa1(),
             rs3: fa7(),
         },
-        "fmsub.d fa0,fa0,fa1,fa7,fcsr",
+        "fmsub.d fa0,fa0,fa1,fa7",
         0x8ab57547,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRRRR::FnmsubD,
             rd: writable_fa0(),
             rs1: fa0(),
             rs2: fa1(),
             rs3: fa7(),
         },
-        "fnmsub.d fa0,fa0,fa1,fa7,fcsr",
+        "fnmsub.d fa0,fa0,fa1,fa7",
         0x8ab5754b,
     ));
     insns.push(TestUnit::new(
         Inst::FpuRRRR {
-            frm: FRM::Fcsr,
+            frm: None,
             alu_op: FpuOPRRRR::FnmaddD,
             rd: writable_fa0(),
             rs1: fa0(),
             rs2: fa1(),
             rs3: fa7(),
         },
-        "fnmadd.d fa0,fa0,fa1,fa7,fcsr",
+        "fnmadd.d fa0,fa0,fa1,fa7",
         0x8ab5754f,
     ));
 
@@ -2043,7 +2039,7 @@ fn test_riscv64_binemit() {
     insns.push(TestUnit::new(
         Inst::FpuRRR {
             alu_op: FpuOPRRR::FsgnjS,
-            frm: FRM::RNE,
+            frm: None,
             rd: writable_fa0(),
             rs1: fa1(),
             rs2: fa1(),
@@ -2054,7 +2050,7 @@ fn test_riscv64_binemit() {
     insns.push(TestUnit::new(
         Inst::FpuRRR {
             alu_op: FpuOPRRR::FsgnjD,
-            frm: FRM::RNE,
+            frm: None,
             rd: writable_fa0(),
             rs1: fa1(),
             rs2: fa1(),
@@ -2066,7 +2062,7 @@ fn test_riscv64_binemit() {
     insns.push(TestUnit::new(
         Inst::FpuRRR {
             alu_op: FpuOPRRR::FsgnjnS,
-            frm: FRM::RTZ,
+            frm: None,
             rd: writable_fa0(),
             rs1: fa1(),
             rs2: fa1(),
@@ -2077,7 +2073,7 @@ fn test_riscv64_binemit() {
     insns.push(TestUnit::new(
         Inst::FpuRRR {
             alu_op: FpuOPRRR::FsgnjnD,
-            frm: FRM::RTZ,
+            frm: None,
             rd: writable_fa0(),
             rs1: fa1(),
             rs2: fa1(),
@@ -2114,6 +2110,111 @@ fn make_test_flags() -> (settings::Flags, super::super::riscv_settings::Flags) {
     (flags, isa_flags)
 }
 
+#[derive(Debug)]
+pub(crate) struct DebugRTypeInst {
+    op_code: u32,
+    rd: u32,
+    funct3: u32,
+    rs1: u32,
+    rs2: u32,
+    funct7: u32,
+}
+
+impl DebugRTypeInst {
+    pub(crate) fn from_bs(x: &[u8]) -> Option<Self> {
+        if x.len() != 4 {
+            return None;
+        }
+        let a = [x[0], x[1], x[2], x[3]];
+        Some(Self::from_u32(u32::from_le_bytes(a)))
+    }
+
+    pub(crate) fn from_u32(x: u32) -> Self {
+        let op_code = x & 0b111_1111;
+        let x = x >> 7;
+        let rd = x & 0b1_1111;
+        let x = x >> 5;
+        let funct3 = x & 0b111;
+        let x = x >> 3;
+        let rs1 = x & 0b1_1111;
+        let x = x >> 5;
+        let rs2 = x & 0b1_1111;
+        let x = x >> 5;
+        let funct7 = x & 0b111_1111;
+        Self {
+            op_code,
+            rd,
+            funct3,
+            rs1,
+            rs2,
+            funct7,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub(crate) struct DebugITypeInst {
+    op_code: u32,
+    rd: u32,
+    funct3: u32,
+    rs: u32,
+    imm12: u32,
+    shamt5: u32,
+    shamt6: u32,
+    funct7: u32,
+    funct6: u32,
+}
+
+impl DebugITypeInst {
+    pub(crate) fn from_bs(x: &[u8]) -> Self {
+        let a = [x[0], x[1], x[2], x[3]];
+        Self::from_u32(u32::from_le_bytes(a))
+    }
+    pub(crate) fn from_u32(x: u32) -> Self {
+        let op_code = x & 0b111_1111;
+        let x = x >> 7;
+        let rd = x & 0b1_1111;
+        let x = x >> 5;
+        let funct3 = x & 0b111;
+        let x = x >> 3;
+        let rs = x & 0b1_1111;
+        let x = x >> 5;
+        let imm12 = x & 0b1111_1111_1111;
+        let shamt5 = imm12 & 0b1_1111;
+        let shamt6 = imm12 & 0b11_1111;
+        let funct7 = imm12 >> 5;
+        let funct6 = funct7 >> 1;
+        Self {
+            op_code,
+            rd,
+            funct3,
+            rs,
+            imm12,
+            shamt5,
+            shamt6,
+            funct7,
+            funct6,
+        }
+    }
+    fn print_b(self) {
+        println!("opcode:{:b}", self.op_code);
+        println!("rd:{}", self.rd);
+        println!("funct3:{:b}", self.funct3);
+        println!("rs:{}", self.rs);
+        println!("shamt5:{:b}", self.shamt5);
+        println!("shamt6:{:b}", self.shamt6);
+        println!("funct6:{:b}", self.funct6);
+        println!("funct7:{:b}", self.funct7);
+    }
+}
+
+#[test]
+fn xxx() {
+    let x = 1240847763;
+    let x = DebugITypeInst::from_u32(x);
+    x.print_b();
+}
+
 #[test]
 fn riscv64_worst_case_instruction_size() {
     let (flags, isa_flags) = make_test_flags();
@@ -2122,6 +2223,69 @@ fn riscv64_worst_case_instruction_size() {
     //there are all candidates potential generate a lot of bytes.
     let mut candidates: Vec<MInst> = vec![];
 
+    candidates.push(Inst::IntSelect {
+        dst: vec![writable_a0(), writable_a0()],
+        ty: I128,
+        op: IntSelectOP::Smax,
+        x: ValueRegs::two(x_reg(1), x_reg(2)),
+        y: ValueRegs::two(x_reg(3), x_reg(4)),
+    });
+
+    candidates.push(Inst::FcvtToInt {
+        rd: writable_a0(),
+        rs: fa0(),
+        is_signed: true,
+        in_type: F64,
+        out_type: I8,
+        is_sat: false,
+        tmp: writable_a1(),
+    });
+    candidates.push(Inst::FcvtToInt {
+        rd: writable_a0(),
+        rs: fa0(),
+        is_signed: true,
+        in_type: F64,
+        out_type: I16,
+        is_sat: false,
+        tmp: writable_a1(),
+    });
+    candidates.push(Inst::FcvtToInt {
+        rd: writable_a0(),
+        rs: fa0(),
+        is_signed: true,
+        in_type: F32,
+        out_type: I8,
+        is_sat: false,
+        tmp: writable_a1(),
+    });
+    candidates.push(Inst::FcvtToInt {
+        rd: writable_a0(),
+        rs: fa0(),
+        is_signed: true,
+        in_type: F32,
+        out_type: I16,
+        is_sat: false,
+        tmp: writable_a1(),
+    });
+    candidates.push(Inst::FcvtToInt {
+        rd: writable_a0(),
+        rs: fa0(),
+        is_signed: true,
+        in_type: F64,
+        out_type: I8,
+        is_sat: false,
+        tmp: writable_a1(),
+    });
+    candidates.push(Inst::FcvtToInt {
+        rd: writable_a0(),
+        rs: fa0(),
+        is_signed: true,
+        in_type: F64,
+        out_type: I16,
+        is_sat: false,
+        tmp: writable_a1(),
+    });
+
     candidates.push(Inst::FloatRound {
         op: FloatRoundOP::Trunc,
         int_tmp: writable_a0(),
@@ -2131,6 +2295,15 @@ fn riscv64_worst_case_instruction_size() {
         ty: F64,
     });
 
+    candidates.push(Inst::FloatSelect {
+        op: FloatSelectOP::Max,
+        rd: writable_fa0(),
+        tmp: writable_a0(),
+        rs1: fa0(),
+        rs2: fa0(),
+        ty: F64,
+    });
+
     let mut max: (u32, MInst) = (0, Inst::Nop0);
     for i in candidates {
         let mut buffer = MachBuffer::new();
diff --git a/cranelift/codegen/src/isa/riscv64/inst/encode.rs b/cranelift/codegen/src/isa/riscv64/inst/encode.rs
index c169c11ec353..2a06b1093a5f 100644
--- a/cranelift/codegen/src/isa/riscv64/inst/encode.rs
+++ b/cranelift/codegen/src/isa/riscv64/inst/encode.rs
@@ -9,9 +9,8 @@
 use super::*;
 use crate::isa::riscv64::inst::reg_to_gpr_num;
 use crate::isa::riscv64::lower::isle::generated_code::{
-    COpcodeSpace, CaOp, CbOp, CiOp, CiwOp, CjOp, ClOp, CrOp, CsOp, CssOp, CsznOp, VecAluOpRImm5,
-    VecAluOpRR, VecAluOpRRImm5, VecAluOpRRR, VecAluOpRRRImm5, VecAluOpRRRR, VecElementWidth,
-    VecOpCategory, VecOpMasking, ZcbMemOp,
+    CaOp, CiOp, CiwOp, CjOp, CrOp, VecAluOpRImm5, VecAluOpRR, VecAluOpRRImm5, VecAluOpRRR,
+    VecAluOpRRRImm5, VecAluOpRRRR, VecElementWidth, VecOpCategory, VecOpMasking,
 };
 use crate::machinst::isle::WritableReg;
 use crate::Reg;
@@ -408,41 +407,6 @@ pub fn encode_ci_type(op: CiOp, rd: WritableReg, imm: Imm6) -> u16 {
     bits.try_into().unwrap()
 }
 
-// Stack-Pointer relative loads are regular CI instructions, but, the immediate
-// is zero extended, and with a slightly different immediate field encoding.
-pub fn encode_ci_sp_load(op: CiOp, rd: WritableReg, imm: Uimm6) -> u16 {
-    let imm = imm.bits();
-
-    // These are the spec encoded offsets.
-    // LWSP:  [5|4:2|7:6]
-    // LDSP:  [5|4:3|8:6]
-    // FLDSP: [5|4:3|8:6]
-    //
-    // We don't recieve the entire offset in `imm`, just a multiple of the load-size.
-
-    // Number of bits in the lowest position of imm. 3 for lwsp, 2 for {f,}ldsp.
-    let low_bits = match op {
-        CiOp::CLwsp => 3,                // [4:2]
-        CiOp::CLdsp | CiOp::CFldsp => 2, // [4:3]
-        _ => unreachable!(),
-    };
-    let high_bits = 6 - 1 - low_bits;
-    let mut enc_imm = 0;
-
-    // Encode [7:6] at the bottom of imm
-    enc_imm |= imm >> (6 - high_bits);
-
-    // Next place [4:2] in the middle
-    enc_imm |= (imm & ((1 << low_bits) - 1)) << high_bits;
-
-    // Finally place [5] at the top
-    enc_imm |= ((imm >> low_bits) & 1) << 5;
-
-    let enc_imm = Imm6::maybe_from_i16((enc_imm as i16) << 10 >> 10).unwrap();
-
-    encode_ci_type(op, rd, enc_imm)
-}
-
 /// c.addi16sp is a regular CI op, but the immediate field is encoded in a weird way
 pub fn encode_c_addi16sp(imm: Imm6) -> u16 {
     let imm = imm.bits();
@@ -468,7 +432,7 @@ pub fn encode_ciw_type(op: CiwOp, rd: WritableReg, imm: u8) -> u16 {
     let mut imm_field = 0;
     imm_field |= ((imm >> 1) & 1) << 0;
     imm_field |= ((imm >> 0) & 1) << 1;
-    imm_field |= ((imm >> 4) & 15) << 2;
+    imm_field |= ((imm >> 4) & 7) << 2;
     imm_field |= ((imm >> 2) & 3) << 6;
 
     let mut bits = 0;
@@ -478,180 +442,3 @@ pub fn encode_ciw_type(op: CiwOp, rd: WritableReg, imm: u8) -> u16 {
     bits |= unsigned_field_width(op.funct3(), 3) << 13;
     bits.try_into().unwrap()
 }
-
-// Encode a CB type instruction.
-//
-// The imm field is a 6 bit signed immediate.
-//
-// 0--1-2-------6-7-------9-10-------11-12-------13--------15
-// |op | imm[4:0] |   dst  |  funct2   |  imm[5]  | funct3 |
-pub fn encode_cb_type(op: CbOp, rd: WritableReg, imm: Imm6) -> u16 {
-    let imm = imm.bits();
-
-    let mut bits = 0;
-    bits |= unsigned_field_width(op.op().bits(), 2);
-    bits |= unsigned_field_width((imm & 0x1f) as u32, 5) << 2;
-    bits |= reg_to_compressed_gpr_num(rd.to_reg()) << 7;
-    bits |= unsigned_field_width(op.funct2(), 2) << 10;
-    bits |= unsigned_field_width(((imm >> 5) & 1) as u32, 1) << 12;
-    bits |= unsigned_field_width(op.funct3(), 3) << 13;
-    bits.try_into().unwrap()
-}
-
-// Encode a CSS type instruction.
-//
-// The imm field is a 6 bit unsigned immediate.
-//
-// 0--1-2-------6-7--------12-13-------15
-// |op |   src   |    imm    |  funct3  |
-pub fn encode_css_type(op: CssOp, src: Reg, imm: Uimm6) -> u16 {
-    let imm = imm.bits();
-
-    // These are the spec encoded offsets.
-    // c.swsp:  [5:2|7:6]
-    // c.sdsp:  [5:3|8:6]
-    // c.fsdsp: [5:3|8:6]
-    //
-    // We don't recieve the entire offset in `imm`, just a multiple of the load-size.
-
-    // Number of bits in the lowest position of imm. 4 for c.swsp, 3 for c.{f,}sdsp.
-    let low_bits = match op {
-        CssOp::CSwsp => 4,                 // [5:2]
-        CssOp::CSdsp | CssOp::CFsdsp => 3, // [5:3]
-    };
-    let high_bits = 6 - low_bits;
-
-    let mut enc_imm = 0;
-    enc_imm |= (imm & ((1 << low_bits) - 1)) << high_bits;
-    enc_imm |= imm >> low_bits;
-
-    let mut bits = 0;
-    bits |= unsigned_field_width(op.op().bits(), 2);
-    bits |= reg_to_gpr_num(src) << 2;
-    bits |= unsigned_field_width(enc_imm as u32, 6) << 7;
-    bits |= unsigned_field_width(op.funct3(), 3) << 13;
-    bits.try_into().unwrap()
-}
-
-// Encode a CS type instruction.
-//
-// The imm field is a 5 bit unsigned immediate.
-//
-// 0--1-2-----4-5----------6-7---------9-10----------12-13-----15
-// |op |  src  | imm(2-bit) |   base    |  imm(3-bit)  | funct3  |
-pub fn encode_cs_type(op: CsOp, src: Reg, base: Reg, imm: Uimm5) -> u16 {
-    let size = match op {
-        CsOp::CFsd | CsOp::CSd => 8,
-        CsOp::CSw => 4,
-    };
-
-    encode_cs_cl_type_bits(op.op(), op.funct3(), size, src, base, imm)
-}
-
-// Encode a CL type instruction.
-//
-// The imm field is a 5 bit unsigned immediate.
-//
-// 0--1-2------4-5----------6-7---------9-10----------12-13-----15
-// |op |  dest  | imm(2-bit) |   base    |  imm(3-bit)  | funct3  |
-pub fn encode_cl_type(op: ClOp, dest: WritableReg, base: Reg, imm: Uimm5) -> u16 {
-    let size = match op {
-        ClOp::CFld | ClOp::CLd => 8,
-        ClOp::CLw => 4,
-    };
-
-    encode_cs_cl_type_bits(op.op(), op.funct3(), size, dest.to_reg(), base, imm)
-}
-
-// CL and CS type instructions have the same physical layout.
-//
-// 0--1-2----------4-5----------6-7---------9-10----------12-13-----15
-// |op |  dest/src  | imm(2-bit) |   base    |  imm(3-bit)  | funct3  |
-fn encode_cs_cl_type_bits(
-    op: COpcodeSpace,
-    funct3: u32,
-    size: u32,
-    dest_src: Reg,
-    base: Reg,
-    imm: Uimm5,
-) -> u16 {
-    let imm = imm.bits();
-
-    // c.sw  / c.lw:  [2|6]
-    // c.sd  / c.ld:  [7:6]
-    // c.fsd / c.fld: [7:6]
-    //
-    // We differentiate these based on the operation size
-    let imm2 = match size {
-        4 => ((imm >> 4) & 1) | ((imm & 1) << 1),
-        8 => (imm >> 3) & 0b11,
-        _ => unreachable!(),
-    };
-
-    // [5:3] on all opcodes
-    let imm3 = match size {
-        4 => (imm >> 1) & 0b111,
-        8 => (imm >> 0) & 0b111,
-        _ => unreachable!(),
-    };
-
-    let mut bits = 0;
-    bits |= unsigned_field_width(op.bits(), 2);
-    bits |= reg_to_compressed_gpr_num(dest_src) << 2;
-    bits |= unsigned_field_width(imm2 as u32, 2) << 5;
-    bits |= reg_to_compressed_gpr_num(base) << 7;
-    bits |= unsigned_field_width(imm3 as u32, 3) << 10;
-    bits |= unsigned_field_width(funct3, 3) << 13;
-    bits.try_into().unwrap()
-}
-
-// Encode a CSZN type instruction.
-//
-// This is an additional encoding format that is introduced in the Zcb extension.
-//
-// 0--1-2---------6-7--------9-10------15
-// |op |   funct5  |  rd/rs1  | funct6 |
-pub fn encode_cszn_type(op: CsznOp, rd: WritableReg) -> u16 {
-    let mut bits = 0;
-    bits |= unsigned_field_width(op.op().bits(), 2);
-    bits |= unsigned_field_width(op.funct5(), 5) << 2;
-    bits |= reg_to_compressed_gpr_num(rd.to_reg()) << 7;
-    bits |= unsigned_field_width(op.funct6(), 6) << 10;
-    bits.try_into().unwrap()
-}
-
-// Encodes the various memory operations in the Zcb extension.
-//
-// 0--1-2----------4-5----------6-7---------9-10-------15
-// |op |  dest/src  | imm(2-bit) |   base    |  funct6  |
-fn encode_zcbmem_bits(op: ZcbMemOp, dest_src: Reg, base: Reg, imm: Uimm2) -> u16 {
-    let imm = imm.bits();
-
-    // For these ops, bit 6 is part of the opcode, and bit 5 encodes the imm offset.
-    let imm = match op {
-        ZcbMemOp::CLh | ZcbMemOp::CLhu | ZcbMemOp::CSh => {
-            debug_assert_eq!(imm & !1, 0);
-            // Only c.lh has this bit as 1
-            let opcode_bit = (op == ZcbMemOp::CLh) as u8;
-            imm | (opcode_bit << 1)
-        }
-        // In the rest of the ops the imm is reversed.
-        _ => ((imm & 1) << 1) | ((imm >> 1) & 1),
-    };
-
-    let mut bits = 0;
-    bits |= unsigned_field_width(op.op().bits(), 2);
-    bits |= reg_to_compressed_gpr_num(dest_src) << 2;
-    bits |= unsigned_field_width(imm as u32, 2) << 5;
-    bits |= reg_to_compressed_gpr_num(base) << 7;
-    bits |= unsigned_field_width(op.funct6(), 6) << 10;
-    bits.try_into().unwrap()
-}
-
-pub fn encode_zcbmem_load(op: ZcbMemOp, rd: WritableReg, base: Reg, imm: Uimm2) -> u16 {
-    encode_zcbmem_bits(op, rd.to_reg(), base, imm)
-}
-
-pub fn encode_zcbmem_store(op: ZcbMemOp, src: Reg, base: Reg, imm: Uimm2) -> u16 {
-    encode_zcbmem_bits(op, src, base, imm)
-}
diff --git a/cranelift/codegen/src/isa/riscv64/inst/imms.rs b/cranelift/codegen/src/isa/riscv64/inst/imms.rs
index 259599b53086..6f4d7075db70 100644
--- a/cranelift/codegen/src/isa/riscv64/inst/imms.rs
+++ b/cranelift/codegen/src/isa/riscv64/inst/imms.rs
@@ -74,18 +74,6 @@ pub struct Imm20 {
 impl Imm20 {
     pub(crate) const ZERO: Self = Self { bits: 0 };
 
-    pub fn maybe_from_u64(val: u64) -> Option<Imm20> {
-        Self::maybe_from_i64(val as i64)
-    }
-
-    pub fn maybe_from_i64(val: i64) -> Option<Imm20> {
-        if val >= -(0x7_ffff + 1) && val <= 0x7_ffff {
-            Some(Imm20 { bits: val as u32 })
-        } else {
-            None
-        }
-    }
-
     #[inline]
     pub fn from_i32(bits: i32) -> Self {
         assert!(bits >= -(0x7_ffff + 1) && bits <= 0x7_ffff);
@@ -195,10 +183,6 @@ impl Imm6 {
         }
     }
 
-    pub fn maybe_from_i32(value: i32) -> Option<Self> {
-        value.try_into().ok().and_then(Imm6::maybe_from_i16)
-    }
-
     pub fn maybe_from_imm12(value: Imm12) -> Option<Self> {
         Imm6::maybe_from_i16(value.as_i16())
     }
@@ -215,90 +199,6 @@ impl Display for Imm6 {
     }
 }
 
-/// A unsigned 6-bit immediate.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct Uimm6 {
-    value: u8,
-}
-
-impl Uimm6 {
-    /// Create an unsigned 6-bit immediate from an u8
-    pub fn maybe_from_u8(value: u8) -> Option<Self> {
-        if value <= 63 {
-            Some(Self { value })
-        } else {
-            None
-        }
-    }
-
-    /// Bits for encoding.
-    pub fn bits(&self) -> u8 {
-        self.value & 0x3f
-    }
-}
-
-impl Display for Uimm6 {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
-        write!(f, "{}", self.value)
-    }
-}
-
-/// A unsigned 5-bit immediate.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct Uimm5 {
-    value: u8,
-}
-
-impl Uimm5 {
-    /// Create an unsigned 5-bit immediate from an u8
-    pub fn maybe_from_u8(value: u8) -> Option<Self> {
-        if value <= 31 {
-            Some(Self { value })
-        } else {
-            None
-        }
-    }
-
-    /// Bits for encoding.
-    pub fn bits(&self) -> u8 {
-        self.value & 0x1f
-    }
-}
-
-impl Display for Uimm5 {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
-        write!(f, "{}", self.value)
-    }
-}
-
-/// A unsigned 2-bit immediate.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct Uimm2 {
-    value: u8,
-}
-
-impl Uimm2 {
-    /// Create an unsigned 2-bit immediate from an u8
-    pub fn maybe_from_u8(value: u8) -> Option<Self> {
-        if value <= 3 {
-            Some(Self { value })
-        } else {
-            None
-        }
-    }
-
-    /// Bits for encoding.
-    pub fn bits(&self) -> u8 {
-        self.value & 0x3
-    }
-}
-
-impl Display for Uimm2 {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
-        write!(f, "{}", self.value)
-    }
-}
-
 impl Inst {
     pub(crate) fn imm_min() -> i64 {
         let imm20_max: i64 = (1 << 19) << 12;
diff --git a/cranelift/codegen/src/isa/riscv64/inst/mod.rs b/cranelift/codegen/src/isa/riscv64/inst/mod.rs
index 875b53561020..77a207e21788 100644
--- a/cranelift/codegen/src/isa/riscv64/inst/mod.rs
+++ b/cranelift/codegen/src/isa/riscv64/inst/mod.rs
@@ -1,5 +1,9 @@
 //! This module defines riscv64-specific machine instruction types.
 
+// Some variants are not constructed, but we still want them as options in the future.
+#![allow(dead_code)]
+#![allow(non_camel_case_types)]
+
 use super::lower::isle::generated_code::{VecAMode, VecElementWidth, VecOpMasking};
 use crate::binemit::{Addend, CodeOffset, Reloc};
 pub use crate::ir::condcodes::IntCC;
@@ -40,17 +44,26 @@ mod emit_tests;
 
 use std::fmt::{Display, Formatter};
 
+pub(crate) type OptionReg = Option<Reg>;
+pub(crate) type OptionImm12 = Option<Imm12>;
+pub(crate) type OptionUimm5 = Option<UImm5>;
+pub(crate) type OptionFloatRoundingMode = Option<FRM>;
 pub(crate) type VecU8 = Vec<u8>;
-
+pub(crate) type VecWritableReg = Vec<Writable<Reg>>;
 //=============================================================================
 // Instructions (top level): definition
 
 pub use crate::isa::riscv64::lower::isle::generated_code::{
     AluOPRRI, AluOPRRR, AtomicOP, CsrImmOP, CsrRegOP, FClassResult, FFlagsException, FloatRoundOP,
-    FpuOPRR, FpuOPRRR, FpuOPRRRR, LoadOP, MInst as Inst, StoreOP, CSR, FRM,
+    FloatSelectOP, FpuOPRR, FpuOPRRR, FpuOPRRRR, IntSelectOP, LoadOP, MInst as Inst, StoreOP, CSR,
+    FRM,
 };
 use crate::isa::riscv64::lower::isle::generated_code::{CjOp, MInst, VecAluOpRRImm5, VecAluOpRRR};
 
+type BoxCallInfo = Box<CallInfo>;
+type BoxCallIndInfo = Box<CallIndInfo>;
+type BoxReturnCallInfo = Box<ReturnCallInfo>;
+
 /// Additional information for (direct) Call instructions, left out of line to lower the size of
 /// the Inst enum.
 #[derive(Clone, Debug)]
@@ -247,7 +260,7 @@ impl Inst {
         let tmp = alloc_tmp(I64);
         insts.extend(Self::load_constant_u32(tmp, const_data as u64));
         insts.push(Inst::FpuRR {
-            frm: FRM::RNE,
+            frm: None,
             alu_op: FpuOPRR::move_x_to_f_op(F32),
             rd,
             rs: tmp.to_reg(),
@@ -265,7 +278,7 @@ impl Inst {
         let tmp = alloc_tmp(I64);
         insts.extend(Self::load_constant_u64(tmp, const_data));
         insts.push(Inst::FpuRR {
-            frm: FRM::RNE,
+            frm: None,
             alu_op: FpuOPRR::move_x_to_f_op(F64),
             rd,
             rs: tmp.to_reg(),
@@ -405,6 +418,7 @@ fn riscv64_get_operands<F: Fn(VReg) -> VReg>(inst: &Inst, collector: &mut Operan
             collector.reg_use(rn);
             collector.reg_def(rd);
         }
+        &Inst::AdjustSp { .. } => {}
         &Inst::Call { ref info } => {
             for u in &info.uses {
                 collector.reg_fixed_use(u.vreg, u.preg);
@@ -509,25 +523,11 @@ fn riscv64_get_operands<F: Fn(VReg) -> VReg>(inst: &Inst, collector: &mut Operan
             y,
             ..
         } => {
-            collector.reg_use(condition.rs1);
-            collector.reg_use(condition.rs2);
+            collector.reg_use(condition);
             collector.reg_uses(x.regs());
             collector.reg_uses(y.regs());
-            // If there's more than one destination register then use
-            // `reg_early_def` to prevent destination registers from overlapping
-            // with any operands. This ensures that the lowering doesn't have to
-            // deal with a situation such as when the input registers need to be
-            // swapped when moved to the destination.
-            //
-            // When there's only one destination register though don't use an
-            // early def because once the register is written no other inputs
-            // are read so it's ok for the destination to overlap the sources.
-            if dst.regs().len() > 1 {
-                for d in dst.regs() {
-                    collector.reg_early_def(d.clone());
-                }
-            } else {
-                collector.reg_defs(dst.regs());
+            for d in dst.iter() {
+                collector.reg_early_def(d.clone());
             }
         }
         &Inst::AtomicCas {
@@ -543,7 +543,42 @@ fn riscv64_get_operands<F: Fn(VReg) -> VReg>(inst: &Inst, collector: &mut Operan
             collector.reg_early_def(t0);
             collector.reg_early_def(dst);
         }
+        &Inst::IntSelect {
+            ref dst,
+            ref x,
+            ref y,
+            ..
+        } => {
+            collector.reg_uses(x.regs());
+            collector.reg_uses(y.regs());
+            for d in dst.iter() {
+                collector.reg_early_def(d.clone());
+            }
+        }
 
+        &Inst::Icmp { rd, a, b, .. } => {
+            collector.reg_uses(a.regs());
+            collector.reg_uses(b.regs());
+            collector.reg_def(rd);
+        }
+
+        &Inst::SelectReg {
+            rd,
+            rs1,
+            rs2,
+            condition,
+        } => {
+            collector.reg_use(condition.rs1);
+            collector.reg_use(condition.rs2);
+            collector.reg_use(rs1);
+            collector.reg_use(rs2);
+            collector.reg_def(rd);
+        }
+        &Inst::FcvtToInt { rd, rs, tmp, .. } => {
+            collector.reg_use(rs);
+            collector.reg_early_def(tmp);
+            collector.reg_early_def(rd);
+        }
         &Inst::RawData { .. } => {}
         &Inst::AtomicStore { src, p, .. } => {
             collector.reg_use(src);
@@ -585,6 +620,13 @@ fn riscv64_get_operands<F: Fn(VReg) -> VReg>(inst: &Inst, collector: &mut Operan
             collector.reg_early_def(f_tmp);
             collector.reg_early_def(rd);
         }
+        &Inst::FloatSelect {
+            rd, tmp, rs1, rs2, ..
+        } => {
+            collector.reg_uses(&[rs1, rs2]);
+            collector.reg_early_def(tmp);
+            collector.reg_early_def(rd);
+        }
         &Inst::Popcnt {
             sum, step, rs, tmp, ..
         } => {
@@ -593,6 +635,12 @@ fn riscv64_get_operands<F: Fn(VReg) -> VReg>(inst: &Inst, collector: &mut Operan
             collector.reg_early_def(step);
             collector.reg_early_def(sum);
         }
+        &Inst::Rev8 { rs, rd, tmp, step } => {
+            collector.reg_use(rs);
+            collector.reg_early_def(tmp);
+            collector.reg_early_def(step);
+            collector.reg_early_def(rd);
+        }
         &Inst::Cltz {
             sum, step, tmp, rs, ..
         } => {
@@ -852,10 +900,6 @@ impl MachInst for Inst {
         }
     }
 
-    fn is_mem_access(&self) -> bool {
-        panic!("TODO FILL ME OUT")
-    }
-
     fn gen_move(to_reg: Writable<Reg>, from_reg: Reg, ty: Type) -> Inst {
         let x = Inst::Mov {
             rd: to_reg,
@@ -1027,8 +1071,12 @@ impl Inst {
             x
         };
 
-        fn format_frm(rounding_mode: FRM) -> String {
-            format!(",{}", rounding_mode.to_static_str())
+        fn format_frm(rounding_mode: Option<FRM>) -> String {
+            if let Some(r) = rounding_mode {
+                format!(",{}", r.to_static_str(),)
+            } else {
+                "".into()
+            }
         }
 
         let mut empty_allocs = AllocationConsumer::default();
@@ -1072,6 +1120,29 @@ impl Inst {
                     ty
                 )
             }
+            &Inst::FloatSelect {
+                op,
+                rd,
+                tmp,
+                rs1,
+                rs2,
+                ty,
+            } => {
+                let rs1 = format_reg(rs1, allocs);
+                let rs2 = format_reg(rs2, allocs);
+                let tmp = format_reg(tmp.to_reg(), allocs);
+                let rd = format_reg(rd.to_reg(), allocs);
+                format!(
+                    "f{}.{} {},{},{}##tmp={} ty={}",
+                    op.op_name(),
+                    if ty == F32 { "s" } else { "d" },
+                    rd,
+                    rs1,
+                    rs2,
+                    tmp,
+                    ty
+                )
+            }
             &Inst::AtomicStore { src, ty, p } => {
                 let src = format_reg(src, allocs);
                 let p = format_reg(p, allocs);
@@ -1160,6 +1231,13 @@ impl Inst {
                 let sum = format_reg(sum.to_reg(), allocs);
                 format!("popcnt {},{}##ty={} tmp={} step={}", sum, rs, ty, tmp, step)
             }
+            &Inst::Rev8 { rs, rd, tmp, step } => {
+                let rs = format_reg(rs, allocs);
+                let tmp = format_reg(tmp.to_reg(), allocs);
+                let step = format_reg(step.to_reg(), allocs);
+                let rd = format_reg(rd.to_reg(), allocs);
+                format!("rev8 {},{}##step={} tmp={}", rd, rs, step, tmp)
+            }
             &Inst::Cltz {
                 sum,
                 step,
@@ -1182,6 +1260,48 @@ impl Inst {
                     step
                 )
             }
+            &Inst::FcvtToInt {
+                is_sat,
+                rd,
+                rs,
+                is_signed,
+                in_type,
+                out_type,
+                tmp,
+            } => {
+                let rs = format_reg(rs, allocs);
+                let tmp = format_reg(tmp.to_reg(), allocs);
+                let rd = format_reg(rd.to_reg(), allocs);
+                format!(
+                    "fcvt_to_{}int{}.{} {},{}##in_ty={} tmp={}",
+                    if is_signed { "s" } else { "u" },
+                    if is_sat { "_sat" } else { "" },
+                    out_type,
+                    rd,
+                    rs,
+                    in_type,
+                    tmp
+                )
+            }
+            &Inst::SelectReg {
+                rd,
+                rs1,
+                rs2,
+                ref condition,
+            } => {
+                let c_rs1 = format_reg(condition.rs1, allocs);
+                let c_rs2 = format_reg(condition.rs2, allocs);
+                let rs1 = format_reg(rs1, allocs);
+                let rs2 = format_reg(rs2, allocs);
+                let rd = format_reg(rd.to_reg(), allocs);
+                format!(
+                    "select_reg {},{},{}##condition={}",
+                    rd,
+                    rs1,
+                    rs2,
+                    format!("({} {} {})", c_rs1, condition.kind.to_static_str(), c_rs2),
+                )
+            }
             &Inst::AtomicCas {
                 offset,
                 t0,
@@ -1202,6 +1322,25 @@ impl Inst {
                     ty, dst, e, v, addr, t0, offset,
                 )
             }
+            &Inst::Icmp { cc, rd, a, b, ty } => {
+                let a = format_regs(a.regs(), allocs);
+                let b = format_regs(b.regs(), allocs);
+                let rd = format_reg(rd.to_reg(), allocs);
+                format!("{} {},{},{}##ty={}", cc.to_static_str(), rd, a, b, ty)
+            }
+            &Inst::IntSelect {
+                op,
+                ref dst,
+                x,
+                y,
+                ty,
+            } => {
+                let x = format_regs(x.regs(), allocs);
+                let y = format_regs(y.regs(), allocs);
+                let dst: Vec<_> = dst.iter().map(|r| r.to_reg()).collect();
+                let dst = format_regs(&dst[..], allocs);
+                format!("{} {},{},{}##ty={}", op.op_name(), dst, x, y, ty,)
+            }
             &Inst::BrTable {
                 index,
                 tmp1,
@@ -1273,18 +1412,7 @@ impl Inst {
             } => {
                 let rs = format_reg(rs, allocs);
                 let rd = format_reg(rd.to_reg(), allocs);
-                let frm = match alu_op {
-                    FpuOPRR::FmvXW
-                    | FpuOPRR::FmvWX
-                    | FpuOPRR::FmvXD
-                    | FpuOPRR::FmvDX
-                    | FpuOPRR::FclassS
-                    | FpuOPRR::FclassD
-                    | FpuOPRR::FcvtDW
-                    | FpuOPRR::FcvtDWU => String::new(),
-                    _ => format_frm(frm),
-                };
-                format!("{} {rd},{rs}{frm}", alu_op.op_name())
+                format!("{} {},{}{}", alu_op.op_name(), rd, rs, format_frm(frm))
             }
             &Inst::FpuRRR {
                 alu_op,
@@ -1299,32 +1427,35 @@ impl Inst {
                 let rs1_is_rs2 = rs1 == rs2;
                 if rs1_is_rs2 && alu_op.is_copy_sign() {
                     // this is move instruction.
-                    format!("fmv.{} {rd},{rs1}", if alu_op.is_32() { "s" } else { "d" })
+                    format!(
+                        "fmv.{} {},{}",
+                        if alu_op.is_32() { "s" } else { "d" },
+                        rd,
+                        rs1
+                    )
                 } else if rs1_is_rs2 && alu_op.is_copy_neg_sign() {
-                    format!("fneg.{} {rd},{rs1}", if alu_op.is_32() { "s" } else { "d" })
+                    format!(
+                        "fneg.{} {},{}",
+                        if alu_op.is_32() { "s" } else { "d" },
+                        rd,
+                        rs1
+                    )
                 } else if rs1_is_rs2 && alu_op.is_copy_xor_sign() {
-                    format!("fabs.{} {rd},{rs1}", if alu_op.is_32() { "s" } else { "d" })
+                    format!(
+                        "fabs.{} {},{}",
+                        if alu_op.is_32() { "s" } else { "d" },
+                        rd,
+                        rs1
+                    )
                 } else {
-                    let frm = match alu_op {
-                        FpuOPRRR::FsgnjS
-                        | FpuOPRRR::FsgnjnS
-                        | FpuOPRRR::FsgnjxS
-                        | FpuOPRRR::FsgnjD
-                        | FpuOPRRR::FsgnjnD
-                        | FpuOPRRR::FsgnjxD
-                        | FpuOPRRR::FminS
-                        | FpuOPRRR::FminD
-                        | FpuOPRRR::FmaxS
-                        | FpuOPRRR::FmaxD
-                        | FpuOPRRR::FeqS
-                        | FpuOPRRR::FeqD
-                        | FpuOPRRR::FltS
-                        | FpuOPRRR::FltD
-                        | FpuOPRRR::FleS
-                        | FpuOPRRR::FleD => String::new(),
-                        _ => format_frm(frm),
-                    };
-                    format!("{} {rd},{rs1},{rs2}{frm}", alu_op.op_name())
+                    format!(
+                        "{} {},{},{}{}",
+                        alu_op.op_name(),
+                        rd,
+                        rs1,
+                        rs2,
+                        format_frm(frm)
+                    )
                 }
             }
             &Inst::FpuRRRR {
@@ -1465,6 +1596,9 @@ impl Inst {
                     format!("slli {rd},{rn},{shift_bits}; {op} {rd},{rd},{shift_bits}")
                 };
             }
+            &MInst::AdjustSp { amount } => {
+                format!("{} sp,{:+}", "add", amount)
+            }
             &MInst::Call { ref info } => format!("call {}", info.dest.display(None)),
             &MInst::CallInd { ref info } => {
                 let rd = format_reg(info.rn, allocs);
@@ -1601,22 +1735,14 @@ impl Inst {
                 condition,
                 ref x,
                 ref y,
+                ty,
             } => {
-                let c_rs1 = format_reg(condition.rs1, allocs);
-                let c_rs2 = format_reg(condition.rs2, allocs);
+                let condition = format_reg(condition, allocs);
                 let x = format_regs(x.regs(), allocs);
                 let y = format_regs(y.regs(), allocs);
-                let dst = dst.map(|r| r.to_reg());
-                let dst = format_regs(dst.regs(), allocs);
-                format!(
-                    "select {},{},{}##condition=({} {} {})",
-                    dst,
-                    x,
-                    y,
-                    c_rs1,
-                    condition.kind.to_static_str(),
-                    c_rs2
-                )
+                let dst: Vec<_> = dst.clone().into_iter().map(|r| r.to_reg()).collect();
+                let dst = format_regs(&dst[..], allocs);
+                format!("select_{} {},{},{}##condition={}", ty, dst, x, y, condition)
             }
             &MInst::Udf { trap_code } => format!("udf##trap_code={}", trap_code),
             &MInst::EBreak {} => String::from("ebreak"),
@@ -1926,14 +2052,13 @@ impl MachInstLabelUse for LabelUse {
 
     fn from_reloc(reloc: Reloc, addend: Addend) -> Option<LabelUse> {
         match (reloc, addend) {
-            (Reloc::RiscvCallPlt, _) => Some(Self::PCRel32),
+            (Reloc::RiscvCall, _) => Some(Self::PCRel32),
             _ => None,
         }
     }
 }
 
 impl LabelUse {
-    #[allow(dead_code)] // in case it's needed in the future
     fn offset_in_range(self, offset: i64) -> bool {
         let min = -(self.max_neg_range() as i64);
         let max = self.max_pos_range() as i64;
diff --git a/cranelift/codegen/src/isa/riscv64/inst/regs.rs b/cranelift/codegen/src/isa/riscv64/inst/regs.rs
index d17e19b37744..e78acee06b6c 100644
--- a/cranelift/codegen/src/isa/riscv64/inst/regs.rs
+++ b/cranelift/codegen/src/isa/riscv64/inst/regs.rs
@@ -18,46 +18,38 @@ pub fn a0() -> Reg {
 
 // second argument of function call
 #[inline]
-#[allow(dead_code)]
 pub fn a1() -> Reg {
     x_reg(11)
 }
 
 // third argument of function call
 #[inline]
-#[allow(dead_code)]
 pub fn a2() -> Reg {
     x_reg(12)
 }
 
 #[inline]
-#[allow(dead_code)]
 pub fn writable_a0() -> Writable<Reg> {
     Writable::from_reg(a0())
 }
 #[inline]
-#[allow(dead_code)]
 pub fn writable_a1() -> Writable<Reg> {
     Writable::from_reg(a1())
 }
 #[inline]
-#[allow(dead_code)]
 pub fn writable_a2() -> Writable<Reg> {
     Writable::from_reg(a2())
 }
 
 #[inline]
-#[allow(dead_code)]
 pub fn fa0() -> Reg {
     f_reg(10)
 }
 #[inline]
-#[allow(dead_code)]
 pub fn writable_fa0() -> Writable<Reg> {
     Writable::from_reg(fa0())
 }
 #[inline]
-#[allow(dead_code)]
 pub fn writable_fa1() -> Writable<Reg> {
     Writable::from_reg(fa1())
 }
@@ -66,6 +58,11 @@ pub fn fa1() -> Reg {
     f_reg(11)
 }
 
+#[inline]
+pub fn fa7() -> Reg {
+    f_reg(17)
+}
+
 /// Get a reference to the zero-register.
 #[inline]
 pub fn zero_reg() -> Reg {
@@ -170,6 +167,12 @@ pub(crate) fn x_reg_range(start: usize, end: usize) -> Vec<Writable<Reg>> {
     regs
 }
 
+#[inline]
+pub fn v_reg(enc: usize) -> Reg {
+    let p_reg = PReg::new(enc, RegClass::Vector);
+    let v_reg = VReg::new(p_reg.index(), p_reg.class());
+    Reg::from(v_reg)
+}
 pub const fn pv_reg(enc: usize) -> PReg {
     PReg::new(enc, RegClass::Vector)
 }
diff --git a/cranelift/codegen/src/isa/riscv64/inst/unwind/systemv.rs b/cranelift/codegen/src/isa/riscv64/inst/unwind/systemv.rs
index 75bd6cebf7ec..9c0ee61191ae 100644
--- a/cranelift/codegen/src/isa/riscv64/inst/unwind/systemv.rs
+++ b/cranelift/codegen/src/isa/riscv64/inst/unwind/systemv.rs
@@ -145,7 +145,7 @@ mod tests {
 
         assert_eq!(
             format!("{:?}", fde),
-            "FrameDescriptionEntry { address: Constant(4321), length: 16, lsda: None, instructions: [] }"
+            "FrameDescriptionEntry { address: Constant(4321), length: 20, lsda: None, instructions: [] }"
         );
     }
 
diff --git a/cranelift/codegen/src/isa/riscv64/inst/vector.rs b/cranelift/codegen/src/isa/riscv64/inst/vector.rs
index 4d5ac4f611ff..6ab2016f1020 100644
--- a/cranelift/codegen/src/isa/riscv64/inst/vector.rs
+++ b/cranelift/codegen/src/isa/riscv64/inst/vector.rs
@@ -1,4 +1,5 @@
 use crate::isa::riscv64::inst::AllocationConsumer;
+use crate::isa::riscv64::inst::EmitState;
 use crate::isa::riscv64::lower::isle::generated_code::VecAluOpRRRR;
 use crate::isa::riscv64::lower::isle::generated_code::{
     VecAMode, VecAluOpRImm5, VecAluOpRR, VecAluOpRRImm5, VecAluOpRRR, VecAluOpRRRImm5, VecAvl,
@@ -1084,6 +1085,12 @@ impl VecAMode {
         }
     }
 
+    pub(crate) fn get_offset_with_state(&self, state: &EmitState) -> i64 {
+        match self {
+            VecAMode::UnitStride { base, .. } => base.get_offset_with_state(state),
+        }
+    }
+
     /// `mop` field, described in Table 7 of Section 7.2. Vector Load/Store Addressing Modes
     /// https://github.com/riscv/riscv-v-spec/blob/master/v-spec.adoc#72-vector-loadstore-addressing-modes
     pub fn mop(&self) -> u32 {
diff --git a/cranelift/codegen/src/isa/riscv64/inst_vector.isle b/cranelift/codegen/src/isa/riscv64/inst_vector.isle
index 8c48ec991e19..685761e2a8d0 100644
--- a/cranelift/codegen/src/isa/riscv64/inst_vector.isle
+++ b/cranelift/codegen/src/isa/riscv64/inst_vector.isle
@@ -1585,13 +1585,11 @@
 (rule 2 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.Equal) (splat x) y)
   (rv_vmseq_vx y x (unmasked) ty))
 
-(rule 3 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.Equal) x y)
-  (if-let y_imm (replicated_imm5 y))
-  (rv_vmseq_vi x y_imm (unmasked) ty))
+(rule 3 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.Equal) x (replicated_imm5 y))
+  (rv_vmseq_vi x y (unmasked) ty))
 
-(rule 4 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.Equal) x y)
-  (if-let x_imm (replicated_imm5 x))
-  (rv_vmseq_vi y x_imm (unmasked) ty))
+(rule 4 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.Equal) (replicated_imm5 x) y)
+  (rv_vmseq_vi y x (unmasked) ty))
 
 ;; IntCC.NotEqual
 
@@ -1604,13 +1602,11 @@
 (rule 2 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.NotEqual) (splat x) y)
   (rv_vmsne_vx y x (unmasked) ty))
 
-(rule 3 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.NotEqual) x y)
-  (if-let y_imm (replicated_imm5 y))
-  (rv_vmsne_vi x y_imm (unmasked) ty))
+(rule 3 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.NotEqual) x (replicated_imm5 y))
+  (rv_vmsne_vi x y (unmasked) ty))
 
-(rule 4 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.NotEqual) x y)
-  (if-let x_imm (replicated_imm5 x))
-  (rv_vmsne_vi y x_imm (unmasked) ty))
+(rule 4 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.NotEqual) (replicated_imm5 x) y)
+  (rv_vmsne_vi y x (unmasked) ty))
 
 ;; IntCC.UnsignedLessThan
 
@@ -1623,9 +1619,8 @@
 (rule 2 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.UnsignedLessThan) (splat x) y)
   (rv_vmsgtu_vx y x (unmasked) ty))
 
-(rule 4 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.UnsignedLessThan) x y)
-  (if-let x_imm (replicated_imm5 x))
-  (rv_vmsgtu_vi y x_imm (unmasked) ty))
+(rule 4 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.UnsignedLessThan) (replicated_imm5 x) y)
+  (rv_vmsgtu_vi y x (unmasked) ty))
 
 ;; IntCC.SignedLessThan
 
@@ -1638,9 +1633,8 @@
 (rule 2 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.SignedLessThan) (splat x) y)
   (rv_vmsgt_vx y x (unmasked) ty))
 
-(rule 4 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.SignedLessThan) x y)
-  (if-let x_imm (replicated_imm5 x))
-  (rv_vmsgt_vi y x_imm (unmasked) ty))
+(rule 4 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.SignedLessThan) (replicated_imm5 x) y)
+  (rv_vmsgt_vi y x (unmasked) ty))
 
 ;; IntCC.UnsignedLessThanOrEqual
 
@@ -1650,9 +1644,8 @@
 (rule 1 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.UnsignedLessThanOrEqual) x (splat y))
   (rv_vmsleu_vx x y (unmasked) ty))
 
-(rule 3 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.UnsignedLessThanOrEqual) x y)
-  (if-let y_imm (replicated_imm5 y))
-  (rv_vmsleu_vi x y_imm (unmasked) ty))
+(rule 3 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.UnsignedLessThanOrEqual) x (replicated_imm5 y))
+  (rv_vmsleu_vi x y (unmasked) ty))
 
 ;; IntCC.SignedLessThanOrEqual
 
@@ -1662,9 +1655,8 @@
 (rule 1 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.SignedLessThanOrEqual) x (splat y))
   (rv_vmsle_vx x y (unmasked) ty))
 
-(rule 3 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.SignedLessThanOrEqual) x y)
-  (if-let y_imm (replicated_imm5 y))
-  (rv_vmsle_vi x y_imm (unmasked) ty))
+(rule 3 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.SignedLessThanOrEqual) x (replicated_imm5 y))
+  (rv_vmsle_vi x y (unmasked) ty))
 
 ;; IntCC.UnsignedGreaterThan
 
@@ -1677,9 +1669,8 @@
 (rule 2 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.UnsignedGreaterThan) (splat x) y)
   (rv_vmsltu_vx y x (unmasked) ty))
 
-(rule 3 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.UnsignedGreaterThan) x y)
-  (if-let y_imm (replicated_imm5 y))
-  (rv_vmsgtu_vi x y_imm (unmasked) ty))
+(rule 3 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.UnsignedGreaterThan) x (replicated_imm5 y))
+  (rv_vmsgtu_vi x y (unmasked) ty))
 
 ;; IntCC.SignedGreaterThan
 
@@ -1692,9 +1683,8 @@
 (rule 2 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.SignedGreaterThan) (splat x) y)
   (rv_vmslt_vx y x (unmasked) ty))
 
-(rule 3 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.SignedGreaterThan) x y)
-  (if-let y_imm (replicated_imm5 y))
-  (rv_vmsgt_vi x y_imm (unmasked) ty))
+(rule 3 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.SignedGreaterThan) x (replicated_imm5 y))
+  (rv_vmsgt_vi x y (unmasked) ty))
 
 ;; IntCC.UnsignedGreaterThanOrEqual
 
@@ -1704,9 +1694,8 @@
 (rule 2 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.UnsignedGreaterThanOrEqual) (splat x) y)
   (rv_vmsleu_vx y x (unmasked) ty))
 
-(rule 4 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.UnsignedGreaterThanOrEqual) x y)
-  (if-let x_imm (replicated_imm5 x))
-  (rv_vmsleu_vi y x_imm (unmasked) ty))
+(rule 4 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.UnsignedGreaterThanOrEqual) (replicated_imm5 x) y)
+  (rv_vmsleu_vi y x (unmasked) ty))
 
 ;; IntCC.SignedGreaterThanOrEqual
 
@@ -1716,9 +1705,8 @@
 (rule 2 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.SignedGreaterThanOrEqual) (splat x) y)
   (rv_vmsle_vx y x (unmasked) ty))
 
-(rule 4 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.SignedGreaterThanOrEqual) x y)
-  (if-let x_imm (replicated_imm5 x))
-  (rv_vmsle_vi y x_imm (unmasked) ty))
+(rule 4 (gen_icmp_mask (ty_vec_fits_in_register ty) (IntCC.SignedGreaterThanOrEqual) (replicated_imm5 x) y)
+  (rv_vmsle_vi y x (unmasked) ty))
 
 
 
diff --git a/cranelift/codegen/src/isa/riscv64/lower.isle b/cranelift/codegen/src/isa/riscv64/lower.isle
index 0d3a271f4df6..d67adcc198e2 100644
--- a/cranelift/codegen/src/isa/riscv64/lower.isle
+++ b/cranelift/codegen/src/isa/riscv64/lower.isle
@@ -33,10 +33,7 @@
 ;;;; Rules for `iadd` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; Base case, simply adding things in registers.
-(rule -1 (lower (has_type (fits_in_32 (ty_int ty)) (iadd x y)))
-  (rv_addw x y))
-
-(rule 0 (lower (has_type $I64 (iadd x y)))
+(rule 0 (lower (has_type (ty_int_ref_scalar_64 ty) (iadd x y)))
   (rv_add x y))
 
 ;; Special cases for when one operand is an immediate that fits in 12 bits.
@@ -122,9 +119,8 @@
   (if-let $true (ty_equal (lane_type half_ty) uext_ty))
   (rv_vwaddu_wx x y (unmasked) (vstate_mf2 half_ty)))
 
-(rule 20 (lower (has_type (ty_vec_fits_in_register ty) (iadd x y)))
-  (if-let y_imm (replicated_imm5 y))
-  (rv_vadd_vi x y_imm (unmasked) ty))
+(rule 11 (lower (has_type (ty_vec_fits_in_register ty) (iadd x (replicated_imm5 y))))
+  (rv_vadd_vi x y (unmasked) ty))
 
 
 (rule 12 (lower (has_type (ty_vec_fits_in_register ty) (iadd (splat x) y)))
@@ -140,9 +136,8 @@
   (if-let $true (ty_equal (lane_type half_ty) uext_ty))
   (rv_vwaddu_wx y x (unmasked) (vstate_mf2 half_ty)))
 
-(rule 21 (lower (has_type (ty_vec_fits_in_register ty) (iadd x y)))
-  (if-let x_imm (replicated_imm5 x))
-  (rv_vadd_vi y x_imm (unmasked) ty))
+(rule 14 (lower (has_type (ty_vec_fits_in_register ty) (iadd (replicated_imm5 x) y)))
+  (rv_vadd_vi y x (unmasked) ty))
 
 ;; Signed Widening Low Additions
 
@@ -299,28 +294,22 @@
   (rv_vnmsac_vx z y x (unmasked) ty))
 
 ;;; Rules for `uadd_overflow_trap` ;;;;;;;;;;;;;
-(rule 0 (lower (has_type (fits_in_32 ty) (uadd_overflow_trap x y tc)))
-  (let ((tmp_x XReg (zext x))
-        (tmp_y XReg (zext y))
-        (sum XReg (rv_add tmp_x tmp_y))
-        (test XReg (rv_srli sum (imm12_const (ty_bits ty))))
-        (_ InstOutput (gen_trapnz test tc)))
-    sum))
-
-(rule 1 (lower (has_type $I64 (uadd_overflow_trap x y tc)))
-  (let ((tmp XReg (rv_add x y))
-        (_ InstOutput (gen_trapif (IntCC.UnsignedLessThan) tmp x tc)))
-    tmp))
+(rule
+  (lower (has_type (fits_in_64 ty) (uadd_overflow_trap x y tc)))
+  (let ((res ValueRegs (lower_uadd_overflow x y ty))
+        (_ InstOutput (gen_trapnz (value_regs_get res 1) tc)))
+    (value_regs_get res 0)))
+
 
 ;;;; Rules for `isub` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Base case, simply subtracting things in registers.
 
-(rule 0 (lower (has_type (fits_in_32 (ty_int ty)) (isub x y)))
-  (rv_subw x y))
-
-(rule 1 (lower (has_type $I64 (isub x y)))
+(rule (lower (has_type (ty_int_ref_scalar_64 ty) (isub x y)))
   (rv_sub x y))
 
+(rule 1 (lower (has_type (fits_in_32 (ty_int ty)) (isub x y)))
+  (rv_subw x y))
+
 (rule 2 (lower (has_type $I128 (isub x y)))
   (i128_sub x y))
 
@@ -344,9 +333,8 @@
 (rule 6 (lower (has_type (ty_vec_fits_in_register ty) (isub (splat x) y)))
   (rv_vrsub_vx y x (unmasked) ty))
 
-(rule 7 (lower (has_type (ty_vec_fits_in_register ty) (isub x y)))
-  (if-let x_imm (replicated_imm5 x))
-  (rv_vrsub_vi y x_imm (unmasked) ty))
+(rule 7 (lower (has_type (ty_vec_fits_in_register ty) (isub (replicated_imm5 x) y)))
+  (rv_vrsub_vi y x (unmasked) ty))
 
 
 ;; Signed Widening Low Subtractions
@@ -483,7 +471,7 @@
 
 ;;;; Rules for `smulhi` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (rule 0 (lower (has_type (ty_int_ref_scalar_64 ty) (smulhi x y)))
-  (lower_smlhi ty (sext x) (sext y)))
+  (lower_smlhi ty (sext x ty $I64) (sext y ty $I64)))
 
 (rule 1 (lower (has_type (ty_vec_fits_in_register ty) (smulhi x y)))
   (rv_vmulh_vv x y (unmasked) ty))
@@ -495,172 +483,84 @@
   (rv_vmulh_vx x y (unmasked) ty))
 
 ;;;; Rules for `umulhi` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(rule 0 (lower (has_type (fits_in_32 ty) (umulhi x y)))
-  (let ((tmp XReg (rv_mul (zext x) (zext y))))
-    (rv_srli tmp (imm12_const (ty_bits ty)))))
-
-(rule 1 (lower (has_type $I64 (umulhi x y)))
-  (rv_mulhu x y))
+(rule 0 (lower (has_type (ty_int_ref_scalar_64 ty) (umulhi x y)))
+  (lower_umlhi ty (zext x ty $I64) (zext y ty $I64)))
 
-(rule 2 (lower (has_type (ty_vec_fits_in_register ty) (umulhi x y)))
+(rule 1 (lower (has_type (ty_vec_fits_in_register ty) (umulhi x y)))
   (rv_vmulhu_vv x y (unmasked) ty))
 
-(rule 3 (lower (has_type (ty_vec_fits_in_register ty) (umulhi (splat x) y)))
+(rule 2 (lower (has_type (ty_vec_fits_in_register ty) (umulhi (splat x) y)))
   (rv_vmulhu_vx y x (unmasked) ty))
 
-(rule 4 (lower (has_type (ty_vec_fits_in_register ty) (umulhi x (splat y))))
+(rule 3 (lower (has_type (ty_vec_fits_in_register ty) (umulhi x (splat y))))
   (rv_vmulhu_vx x y (unmasked) ty))
 
-;;;; Rules for `udiv` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(rule 0 (lower (has_type (fits_in_16 ty) (udiv x y)))
-  (if-let $true (has_m))
-  (rv_divuw (zext x) (nonzero_divisor (zext y))))
-
-(rule 1 (lower (has_type (fits_in_16 ty) (udiv x y @ (iconst imm))))
-  (if-let $true (has_m))
-  (if (safe_divisor_from_imm64 ty imm))
-  (rv_divuw (zext x) (zext y)))
-
-(rule 2 (lower (has_type $I32 (udiv x y)))
-  (if-let $true (has_m))
-  (rv_divuw x (nonzero_divisor (zext y))))
-
-(rule 3 (lower (has_type $I32 (udiv x y @ (iconst imm))))
-  (if-let $true (has_m))
-  (if (safe_divisor_from_imm64 $I32 imm))
-  (rv_divuw x y))
-
-(rule 2 (lower (has_type $I64 (udiv x y)))
-  (if-let $true (has_m))
-  (rv_divu x (nonzero_divisor y)))
-
-(rule 3 (lower (has_type $I64 (udiv x y @ (iconst imm))))
-  (if-let $true (has_m))
-  (if (safe_divisor_from_imm64 $I64 imm))
-  (rv_divu x y))
-
-;; Traps if the input register is zero, otherwise returns the same register.
-(decl nonzero_divisor (XReg) XReg)
-(rule (nonzero_divisor val)
-  (let ((_ InstOutput (gen_trapif (IntCC.Equal) val (zero_reg) (TrapCode.IntegerDivisionByZero))))
-    val))
-
-;;;; Rules for `sdiv` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(rule 0 (lower (has_type (fits_in_16 ty) (sdiv x y)))
-  (if-let $true (has_m))
-  (let ((x XReg (sext x)))
-    (rv_divw x (safe_sdiv_divisor ty x (sext y)))))
-
-(rule 1 (lower (has_type (fits_in_16 ty) (sdiv x y @ (iconst imm))))
-  (if-let $true (has_m))
-  (if (safe_divisor_from_imm64 ty imm))
-  (rv_divw (sext x) (sext y)))
-
-(rule 2 (lower (has_type $I32 (sdiv x y)))
-  (if-let $true (has_m))
-  (let ((x XReg (sext x)))
-    (rv_divw x (safe_sdiv_divisor $I32 x (sext y)))))
-
-(rule 3 (lower (has_type $I32 (sdiv x y @ (iconst imm))))
-  (if-let $true (has_m))
-  (if (safe_divisor_from_imm64 $I32 imm))
-  (rv_divw x y))
-
-(rule 2 (lower (has_type $I64 (sdiv x y)))
-  (if-let $true (has_m))
-  (rv_div x (safe_sdiv_divisor $I64 x y)))
-
-(rule 3 (lower (has_type $I64 (sdiv x y @ (iconst imm))))
-  (if-let $true (has_m))
-  (if (safe_divisor_from_imm64 $I64 imm))
-  (rv_div x y))
-
-;; Check for two trapping conditions:
-;;
-;; * the divisor is 0, or...
-;; * the divisor is -1 and the dividend is $ty::MIN
-(decl safe_sdiv_divisor (Type XReg XReg) XReg)
-(rule (safe_sdiv_divisor ty x y)
-  (let (
-      (y XReg (nonzero_divisor y))
-      (min XReg (imm $I64 (u64_shl 0xffffffff_ffffffff (u64_sub (ty_bits ty) 1))))
-      (x_is_not_min XReg (rv_xor x min))
-      (y_is_not_neg_one XReg (rv_not y))
-      (no_int_overflow XReg (rv_or x_is_not_min y_is_not_neg_one))
-      (_ InstOutput (gen_trapif
-                      (IntCC.Equal)
-                      no_int_overflow (zero_reg)
-                      (TrapCode.IntegerOverflow))))
-      y))
-
-;;;; Rules for `urem` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(rule 0 (lower (has_type (fits_in_16 ty) (urem x y)))
-  (if-let $true (has_m))
-  (rv_remuw (zext x) (nonzero_divisor (zext y))))
-
-(rule 1 (lower (has_type (fits_in_16 ty) (urem x y @ (iconst imm))))
-  (if-let $true (has_m))
-  (if (safe_divisor_from_imm64 ty imm))
-  (rv_remuw (zext x) (zext y)))
-
-(rule 2 (lower (has_type $I32 (urem x y)))
-  (if-let $true (has_m))
-  (rv_remuw x (nonzero_divisor (zext y))))
-
-(rule 3 (lower (has_type $I32 (urem x y @ (iconst imm))))
-  (if-let $true (has_m))
-  (if (safe_divisor_from_imm64 $I32 imm))
-  (rv_remuw x y))
-
-(rule 2 (lower (has_type $I64 (urem x y)))
-  (if-let $true (has_m))
-  (rv_remu x (nonzero_divisor y)))
-
-(rule 3 (lower (has_type $I64 (urem x y @ (iconst imm))))
-  (if-let $true (has_m))
-  (if (safe_divisor_from_imm64 $I64 imm))
-  (rv_remu x y))
-
-;;;; Rules for `srem` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(rule 0 (lower (has_type (fits_in_16 ty) (srem x y)))
-  (if-let $true (has_m))
-  (rv_remw (sext x) (nonzero_divisor (sext y))))
-
-(rule 1 (lower (has_type (fits_in_16 ty) (srem x y @ (iconst imm))))
-  (if-let $true (has_m))
-  (if (safe_divisor_from_imm64 ty imm))
-  (rv_remw (sext x) (sext y)))
-
-(rule 2 (lower (has_type $I32 (srem x y)))
-  (if-let $true (has_m))
-  (rv_remw x (nonzero_divisor (sext y))))
-
-(rule 3 (lower (has_type $I32 (srem x y @ (iconst imm))))
-  (if-let $true (has_m))
-  (if (safe_divisor_from_imm64 $I32 imm))
-  (rv_remw x y))
-
-(rule 2 (lower (has_type $I64 (srem x y)))
-  (if-let $true (has_m))
-  (rv_rem x (nonzero_divisor y)))
-
-(rule 3 (lower (has_type $I64 (srem x y @ (iconst imm))))
-  (if-let $true (has_m))
-  (if (safe_divisor_from_imm64 $I64 imm))
-  (rv_rem x y))
+;;;; Rules for `div` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;;;; Rules for `and` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(rule -1 (lower (has_type (fits_in_64 ty) (band x y)))
-  (rv_and x y))
+(rule -1 (lower (has_type (fits_in_32 ty) (udiv x y)))
+  (let
+    ((y2 XReg (zext y ty $I64))
+      (_ InstOutput (gen_div_by_zero y2)))
+    (rv_divuw (zext x ty $I64) y2)))
 
-(rule 0 (lower (has_type $I128 (band x y)))
-  (value_regs
-    (rv_and (value_regs_get x 0) (value_regs_get y 0))
-    (rv_and (value_regs_get x 1) (value_regs_get y 1))))
+(rule -1 (lower (has_type (fits_in_32 ty) (sdiv x y)))
+  (let
+    ((a XReg (sext x ty $I64))
+      (b XReg (sext y ty $I64))
+      (_ InstOutput (gen_div_overflow a b ty))
+      (_ InstOutput (gen_div_by_zero b)))
+    (rv_divw a b)))
+
+(rule (lower (has_type $I64 (sdiv x y)))
+  (let
+    ((_ InstOutput (gen_div_overflow x y $I64))
+      (_ InstOutput (gen_div_by_zero y))    )
+    (rv_div x y)))
+
+(rule (lower (has_type $I64 (udiv x y)))
+  (let
+    ((_ InstOutput (gen_div_by_zero y)))
+    (rv_divu x y)))
+
+;;;; Rules for `rem` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(rule -1 (lower (has_type (fits_in_16 ty) (urem x y)))
+  (let
+    ((y2 XReg (zext y ty $I64))
+      (_ InstOutput (gen_div_by_zero y2)))
+    (rv_remuw (zext x ty $I64) y2)))
+
+(rule -1 (lower (has_type (fits_in_16 ty) (srem x y)))
+  (let
+    ((y2 XReg (sext y ty $I64))
+      (_ InstOutput (gen_div_by_zero y2)))
+    (rv_remw (sext x ty $I64) y2)))
+
+(rule (lower (has_type $I32 (srem x y)))
+  (let
+    ((y2 XReg (sext y $I32 $I64))
+      (_ InstOutput (gen_div_by_zero y2)))
+   (rv_remw x y2)))
+
+(rule (lower (has_type $I32 (urem x y)))
+  (let
+    ((y2 XReg (zext y $I32 $I64))
+        (_ InstOutput (gen_div_by_zero y2)))
+    (rv_remuw x y2)))
+
+(rule (lower (has_type $I64 (srem x y)))
+  (let
+    ((_ InstOutput (gen_div_by_zero y)))
+    (rv_rem x y)))
+
+(rule (lower (has_type $I64 (urem x y)))
+  (let
+    ((_ InstOutput (gen_div_by_zero y)))
+    (rv_remu x y)))
+
+;;;; Rules for `and` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(rule 0 (lower (has_type (ty_int ty) (band x y)))
+  (gen_and ty x y))
 
 ;; Special cases for when one operand is an immediate that fits in 12 bits.
 (rule 1 (lower (has_type (fits_in_64 (ty_int ty)) (band x (imm12_from_value y))))
@@ -707,82 +607,12 @@
   (if (ty_vector_not_float ty))
   (rv_vand_vx y x (unmasked) ty))
 
-(rule 11 (lower (has_type (ty_vec_fits_in_register ty) (band x y)))
-  (if-let y_imm (replicated_imm5 y))
-  (rv_vand_vi x y_imm (unmasked) ty))
-
-(rule 12 (lower (has_type (ty_vec_fits_in_register ty) (band x y)))
-  (if-let x_imm (replicated_imm5 x))
-  (rv_vand_vi y x_imm (unmasked) ty))
-
-;; `bclr{,i}` specializations from `zbs`
-
-(rule 13 (lower (has_type (fits_in_32 ty) (band x (bnot (ishl (i64_from_iconst 1) y)))))
-  (if-let $true (has_zbs))
-  (rv_bclr x (rv_andi y (imm12_const (u8_sub (ty_bits ty) 1)))))
-(rule 14 (lower (has_type (fits_in_32 ty) (band (bnot (ishl (i64_from_iconst 1) y)) x)))
-  (if-let $true (has_zbs))
-  (rv_bclr x (rv_andi y (imm12_const (u8_sub (ty_bits ty) 1)))))
-
-(rule 15 (lower (has_type $I64 (band x (bnot (ishl (i64_from_iconst 1) y)))))
-  (if-let $true (has_zbs))
-  (rv_bclr x y))
-(rule 16 (lower (has_type $I64 (band (bnot (ishl (i64_from_iconst 1) y)) x)))
-  (if-let $true (has_zbs))
-  (rv_bclr x y))
-
-(rule 17 (lower (has_type (fits_in_64 ty) (band x (u64_from_iconst n))))
-  (if-let $true (has_zbs))
-  (if-let imm (bclr_imm ty n))
-  (rv_bclri x imm))
-(rule 18 (lower (has_type (fits_in_64 ty) (band (u64_from_iconst n) x)))
-  (if-let $true (has_zbs))
-  (if-let imm (bclr_imm ty n))
-  (rv_bclri x imm))
-
-(decl pure partial bclr_imm (Type u64) Imm12)
-(extern constructor bclr_imm bclr_imm)
-
-;; `bext{,i}` specializations from `zbs`
-
-(rule 19 (lower (has_type $I32 (band (ushr x y) (u64_from_iconst 1))))
-  (if-let $true (has_zbs))
-  (rv_bext x (rv_andi y (imm12_const 31))))
-(rule 19 (lower (has_type $I32 (band (sshr x y) (u64_from_iconst 1))))
-  (if-let $true (has_zbs))
-  (rv_bext x (rv_andi y (imm12_const 31))))
-(rule 19 (lower (has_type $I32 (band (u64_from_iconst 1) (ushr x y))))
-  (if-let $true (has_zbs))
-  (rv_bext x (rv_andi y (imm12_const 31))))
-(rule 19 (lower (has_type $I32 (band (u64_from_iconst 1) (sshr x y))))
-  (if-let $true (has_zbs))
-  (rv_bext x (rv_andi y (imm12_const 31))))
-
-(rule 19 (lower (has_type $I64 (band (ushr x y) (u64_from_iconst 1))))
-  (if-let $true (has_zbs))
-  (rv_bext x y))
-(rule 19 (lower (has_type $I64 (band (sshr x y) (u64_from_iconst 1))))
-  (if-let $true (has_zbs))
-  (rv_bext x y))
-(rule 19 (lower (has_type $I64 (band (u64_from_iconst 1) (ushr x y))))
-  (if-let $true (has_zbs))
-  (rv_bext x y))
-(rule 19 (lower (has_type $I64 (band (u64_from_iconst 1) (sshr x y))))
-  (if-let $true (has_zbs))
-  (rv_bext x y))
-
-(rule 20 (lower (has_type $I32 (band (ushr x (imm12_from_value y)) (u64_from_iconst 1))))
-  (if-let $true (has_zbs))
-  (rv_bexti x (imm12_and y 31)))
-(rule 20 (lower (has_type $I32 (band (sshr x (imm12_from_value y)) (u64_from_iconst 1))))
-  (if-let $true (has_zbs))
-  (rv_bexti x (imm12_and y 31)))
-(rule 20 (lower (has_type $I64 (band (ushr x (imm12_from_value y)) (u64_from_iconst 1))))
-  (if-let $true (has_zbs))
-  (rv_bexti x (imm12_and y 63)))
-(rule 20 (lower (has_type $I64 (band (sshr x (imm12_from_value y)) (u64_from_iconst 1))))
-  (if-let $true (has_zbs))
-  (rv_bexti x (imm12_and y 63)))
+(rule 11 (lower (has_type (ty_vec_fits_in_register ty) (band x (replicated_imm5 y))))
+  (rv_vand_vi x y (unmasked) ty))
+
+(rule 12 (lower (has_type (ty_vec_fits_in_register ty) (band (replicated_imm5 x) y)))
+  (rv_vand_vi y x (unmasked) ty))
+
 
 ;;;; Rules for `or` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (rule 0 (lower (has_type (ty_int ty) (bor x y)))
@@ -833,41 +663,12 @@
   (if (ty_vector_not_float ty))
   (rv_vor_vx y x (unmasked) ty))
 
-(rule 11 (lower (has_type (ty_vec_fits_in_register ty) (bor x y)))
-  (if-let y_imm (replicated_imm5 y))
-  (rv_vor_vi x y_imm (unmasked) ty))
-
-(rule 12 (lower (has_type (ty_vec_fits_in_register ty) (bor x y)))
-  (if-let x_imm (replicated_imm5 x))
-  (rv_vor_vi y x_imm (unmasked) ty))
-
-;; `bset{,i}` specializations from `zbs`
-
-(rule 13 (lower (has_type $I32 (bor x (ishl (i64_from_iconst 1) y))))
-  (if-let $true (has_zbs))
-  (rv_bset x (rv_andi y (imm12_const 31))))
-(rule 14 (lower (has_type $I32 (bor (ishl (i64_from_iconst 1) y) x)))
-  (if-let $true (has_zbs))
-  (rv_bset x (rv_andi y (imm12_const 31))))
-
-(rule 13 (lower (has_type $I64 (bor x (ishl (i64_from_iconst 1) y))))
-  (if-let $true (has_zbs))
-  (rv_bset x y))
-(rule 14 (lower (has_type $I64 (bor (ishl (i64_from_iconst 1) y) x)))
-  (if-let $true (has_zbs))
-  (rv_bset x y))
-
-(rule 15 (lower (has_type (fits_in_64 _) (bor x (u64_from_iconst n))))
-  (if-let $true (has_zbs))
-  (if-let imm (bseti_imm n))
-  (rv_bseti x imm))
-(rule 16 (lower (has_type (fits_in_64 _) (bor (u64_from_iconst n) x)))
-  (if-let $true (has_zbs))
-  (if-let imm (bseti_imm n))
-  (rv_bseti x imm))
-
-(decl pure partial bseti_imm (u64) Imm12)
-(extern constructor bseti_imm bseti_imm)
+(rule 11 (lower (has_type (ty_vec_fits_in_register ty) (bor x (replicated_imm5 y))))
+  (rv_vor_vi x y (unmasked) ty))
+
+(rule 12 (lower (has_type (ty_vec_fits_in_register ty) (bor (replicated_imm5 x) y)))
+  (rv_vor_vi y x (unmasked) ty))
+
 
 ;;;; Rules for `xor` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (rule 0 (lower (has_type (fits_in_64 (ty_int ty)) (bxor x y)))
@@ -897,90 +698,31 @@
   (if (ty_vector_not_float ty))
   (rv_vxor_vx y x (unmasked) ty))
 
-(rule 8 (lower (has_type (ty_vec_fits_in_register ty) (bxor x y)))
-  (if-let y_imm (replicated_imm5 y))
-  (rv_vxor_vi x y_imm (unmasked) ty))
-
-(rule 9 (lower (has_type (ty_vec_fits_in_register ty) (bxor x y)))
-  (if-let x_imm (replicated_imm5 x))
-  (rv_vxor_vi y x_imm (unmasked) ty))
-
-;; `binv{,i}` specializations from `zbs`
-
-(rule 13 (lower (has_type $I32 (bxor x (ishl (i64_from_iconst 1) y))))
-  (if-let $true (has_zbs))
-  (rv_binv x (rv_andi y (imm12_const 31))))
-(rule 14 (lower (has_type $I32 (bxor (ishl (i64_from_iconst 1) y) x)))
-  (if-let $true (has_zbs))
-  (rv_binv x (rv_andi y (imm12_const 31))))
-
-(rule 13 (lower (has_type $I64 (bxor x (ishl (i64_from_iconst 1) y))))
-  (if-let $true (has_zbs))
-  (rv_binv x y))
-(rule 14 (lower (has_type $I64 (bxor (ishl (i64_from_iconst 1) y) x)))
-  (if-let $true (has_zbs))
-  (rv_binv x y))
-
-(rule 15 (lower (has_type (fits_in_64 _) (bxor x (u64_from_iconst n))))
-  (if-let $true (has_zbs))
-  (if-let imm (binvi_imm n))
-  (rv_binvi x imm))
-(rule 16 (lower (has_type (fits_in_64 _) (bxor (u64_from_iconst n) x)))
-  (if-let $true (has_zbs))
-  (if-let imm (binvi_imm n))
-  (rv_binvi x imm))
-
-(decl pure partial binvi_imm (u64) Imm12)
-(extern constructor binvi_imm binvi_imm)
+(rule 8 (lower (has_type (ty_vec_fits_in_register ty) (bxor x (replicated_imm5 y))))
+  (rv_vxor_vi x y (unmasked) ty))
 
-;;;; Rules for `bnot` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(rule 0 (lower (has_type (ty_int_ref_scalar_64 _) (bnot x)))
-  (rv_not x))
+(rule 9 (lower (has_type (ty_vec_fits_in_register ty) (bxor (replicated_imm5 x) y)))
+  (rv_vxor_vi y x (unmasked) ty))
 
-(rule 1 (lower (has_type (ty_scalar_float ty) (bnot x)))
-  (move_x_to_f (rv_not (move_f_to_x x ty)) (float_int_of_same_size ty)))
 
-(rule 2 (lower (has_type $I128 (bnot x)))
-  (value_regs
-    (rv_not (value_regs_get x 0))
-    (rv_not (value_regs_get x 1))))
+;;;; Rules for `bnot` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(rule 0 (lower (has_type (ty_scalar ty) (bnot x)))
+  (gen_bnot ty x))
 
-(rule 3 (lower (has_type (ty_vec_fits_in_register ty) (bnot x)))
+(rule 1 (lower (has_type (ty_vec_fits_in_register ty) (bnot x)))
   (rv_vnot_v x (unmasked) ty))
 
-(rule 4 (lower (has_type (ty_int_ref_scalar_64 _) (bnot (bxor x y))))
-  (if-let $true (has_zbb))
-  (rv_xnor x y))
-
 ;;;; Rules for `bit_reverse` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(rule 0 (lower (has_type (ty_int_ref_scalar_64 ty) (bitrev x)))
-  (gen_bitrev ty x))
+(rule (lower (has_type (fits_in_64 (ty_int ty)) (bitrev x)))
+  (lower_bit_reverse x ty))
 
 (rule 1 (lower (has_type $I128 (bitrev x)))
-  (value_regs
-    (gen_bitrev $I64 (value_regs_get x 1))
-    (gen_bitrev $I64 (value_regs_get x 0))))
-
-
-;; Constructs a sequence of instructions that reverse all bits in `x` up to
-;; the given type width.
-(decl gen_bitrev (Type XReg) XReg)
-
-(rule 0 (gen_bitrev (ty_16_or_32 (ty_int ty)) x)
-  (if-let shift_amt (u64_to_imm12 (u64_sub 64 (ty_bits ty))))
-  (rv_srli (gen_bitrev $I64 x) shift_amt))
-
-(rule 1 (gen_bitrev $I8 x)
-  (gen_brev8 x $I8))
-
-(rule 1 (gen_bitrev $I64 x)
-  (gen_brev8 (gen_bswap $I64 x) $I64))
-
+  (let ((val ValueRegs x)
+    (lo_rev XReg (lower_bit_reverse (value_regs_get val 0) $I64))
+    (hi_rev XReg (lower_bit_reverse (value_regs_get val 1) $I64)))
+    (value_regs hi_rev lo_rev)))
 
 ;;;; Rules for `bswap` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
 (rule 1 (lower (has_type (fits_in_64 (ty_int ty)) (bswap x)))
   (gen_bswap ty x))
 
@@ -989,162 +731,76 @@
     (gen_bswap $I64 (value_regs_get x 1))
     (gen_bswap $I64 (value_regs_get x 0))))
 
-;; Builds a sequence of instructions that swaps the bytes in `x` up to the given
-;; type width.
-(decl gen_bswap (Type XReg) XReg)
-
-;; This is only here to make the rule below work. bswap.i8 isn't valid
-(rule 0 (gen_bswap $I8 x) x)
-(rule 1 (gen_bswap (ty_int_ref_16_to_64 ty) x)
-  (if-let half_ty (ty_half_width ty))
-  (if-let half_size (u64_to_imm12 (ty_bits half_ty)))
-  (let (;; This swaps the top bytes and zeroes the bottom bytes, so that
-        ;; we can or it with the bottom bytes later.
-        (swap_top XReg (gen_bswap half_ty x))
-        (top XReg (rv_slli swap_top half_size))
-
-        ;; Get the top half, swap it, and zero extend it so we can `or` it
-        ;; with the bottom half. Note that zero extension here already knows
-        ;; that `zbb` isn't available and that `half_ty` is not `$I64`, so this
-        ;; falls back to the shift-then-shift sequence.
-        (shifted XReg (rv_srli x half_size))
-        (swap_bot XReg (gen_bswap half_ty shifted))
-        (shift Imm12 (imm_from_bits (u64_sub 64 (ty_bits half_ty))))
-        (bot_shifted_left XReg (rv_slli swap_bot shift))
-        (bot XReg (rv_srli bot_shifted_left shift)))
-    (rv_or top bot)))
-
-(rule 2 (gen_bswap (ty_16_or_32 (ty_int ty)) x)
-  (if-let $true (has_zbb))
-  (if-let shift_amt (u64_to_imm12 (u64_sub 64 (ty_bits ty))))
-  (rv_srli (rv_rev8 x) shift_amt))
-
-(rule 3 (gen_bswap $I64 x)
-  (if-let $true (has_zbb))
-  (rv_rev8 x))
 
 ;;;; Rules for `ctz` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (rule (lower (has_type (fits_in_64 ty) (ctz x)))
   (lower_ctz ty x))
 
 (rule 1 (lower (has_type $I128 (ctz x)))
-  (let ((x_lo XReg (value_regs_get x 0))
-        (x_hi XReg (value_regs_get x 1))
-        ;; Count both halves
-        (high XReg (lower_ctz $I64 x_hi))
-        (low XReg (lower_ctz $I64 x_lo))
-        ;; Only add the top half if the bottom is zero
-        (high XReg (gen_select_xreg (cmp_eqz x_lo) high (zero_reg)))
-        (result XReg (rv_add low high)))
-    (value_regs result (imm $I64 0))))
+  (lower_ctz_128 x))
 
 ;;;; Rules for `clz` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(rule 0 (lower (has_type (fits_in_64 ty) (clz x)))
-  (gen_cltz $true x ty))
+(rule (lower (has_type (fits_in_64 ty) (clz x)))
+  (lower_clz ty x))
 
 (rule 1 (lower (has_type $I128 (clz x)))
-  (let ((x_lo XReg (value_regs_get x 0))
-        (x_hi XReg (value_regs_get x 1))
-        ;; Count both halves
-        (high XReg (gen_clz x_hi))
-        (low XReg (gen_clz x_lo))
-        ;; Only add the bottom zeros if the top half is zero
-        (low XReg (gen_select_xreg (cmp_eqz x_hi) low (zero_reg))))
-    (value_regs (rv_add high low) (imm $I64 0))))
-
-(rule 2 (lower (has_type (fits_in_16 ty) (clz x)))
-  (if-let $true (has_zbb))
-  (let ((tmp XReg (zext x))
-        (count XReg (rv_clz tmp)))
-    ;; We always do the operation on the full 64-bit register, so subtract 64 from the result.
-    (rv_addi count (imm12_const_add (ty_bits ty) -64))))
+  (lower_clz_i128 x))
 
-(rule 3 (lower (has_type $I32 (clz x)))
-  (if-let $true (has_zbb))
-  (rv_clzw x))
+;;;; Rules for `cls` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(rule (lower (has_type (fits_in_64 ty) (cls x)))
+  (lower_cls ty x))
 
-(rule 3 (lower (has_type $I64 (clz x)))
-  (if-let $true (has_zbb))
-  (rv_clz x))
+(rule 1 (lower (has_type $I128 (cls x)))
+  (lower_cls_i128 x))
 
-(decl gen_clz (XReg) XReg)
-(rule 0 (gen_clz rs)
-  (gen_cltz $true rs $I64))
-(rule 1 (gen_clz rs)
-  (if-let $true (has_zbb))
-  (rv_clz rs))
+;;;; Rules for `uextend` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(rule (lower (has_type out_ty (uextend val @ (value_type in_ty))))
+  (extend val (ExtendOp.Zero) in_ty out_ty))
 
-;;;; Rules for `cls` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; Rules for `sextend` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(rule (lower (has_type out_ty (sextend val @ (value_type in_ty))))
+  (extend val (ExtendOp.Signed) in_ty out_ty))
 
-(rule (lower (has_type (fits_in_64 ty) (cls x)))
-  (let ((tmp XReg (sext x))
-        (tmp2 XReg (gen_select_xreg (cmp_ltz tmp) (rv_not tmp) tmp))
-        (tmp3 XReg (gen_clz tmp2)))
-    ;; clz counted the full register width, so subtract (64-$width), and then
-    ;; additionally subtract one more, meaning here -65+width is added.
-    (rv_addi tmp3 (imm12_const_add (ty_bits ty) -65))))
-
-;; If the sign bit is set, we count the leading zeros of the inverted value.
-;; Otherwise we can just count the leading zeros of the original value.
-;; Subtract 1 since the sign bit does not count.
-(rule 1 (lower (has_type $I128 (cls x)))
-  (let ((low XReg (value_regs_get x 0))
-        (high XReg (value_regs_get x 1))
-        (low XReg (gen_select_xreg (cmp_ltz high) (rv_not low) low))
-        (high XReg (gen_select_xreg (cmp_ltz high) (rv_not high) high))
+;; The instructions below are present in RV64I and sign-extend the result to 64 bits.
 
-        ;; Count both halves
-        (high_cnt XReg (gen_clz high))
-        (low_cnt XReg (gen_clz low))
-        ;; Only add the bottom zeros if the top half is zero
-        (low_cnt XReg (gen_select_xreg (cmp_eqz high) low_cnt (zero_reg)))
-        (count XReg (rv_add high_cnt low_cnt))
-        (result XReg (rv_addi count (imm12_const -1))))
-    (value_regs result (imm $I64 0))))
+(rule 1 (lower (has_type $I64 (sextend (has_type $I32 (iadd x y)))))
+  (rv_addw x y))
 
+(rule 1 (lower (has_type $I64 (sextend (has_type $I32 (isub x y)))))
+  (rv_subw x y))
 
-;;;; Rules for `uextend` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(rule 0 (lower (has_type (fits_in_64 _) (uextend val)))
-  (zext val))
-(rule 1 (lower (has_type $I128 (uextend val)))
-  (value_regs (zext val) (imm $I64 0)))
+(rule 1 (lower (has_type $I64 (sextend (has_type $I32 (ishl x y)))))
+  (rv_sllw x (value_regs_get y 0)))
 
-;;;; Rules for `sextend` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(rule 0 (lower (has_type (fits_in_64 _) (sextend val @ (value_type in_ty))))
-  (sext val))
-(rule 1 (lower (has_type $I128 (sextend val @ (value_type in_ty))))
-  (let ((lo XReg (sext val)))
-    (value_regs lo (rv_srai lo (imm12_const 63)))))
+(rule 1 (lower (has_type $I64 (sextend (has_type $I32 (ushr x y)))))
+  (rv_srlw x (value_regs_get y 0)))
 
-;;;; Rules for `popcnt` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(rule 1 (lower (has_type $I64 (sextend (has_type $I32 (sshr x y)))))
+  (rv_sraw x (value_regs_get y 0)))
 
-(rule 0 (lower (has_type (fits_in_64 _) (popcnt x)))
-  (gen_popcnt (zext x)))
 
-(rule 1 (lower (has_type $I128 (popcnt x)))
-  (let
-    ((x ValueRegs x)
-     (low XReg (gen_popcnt (value_regs_get x 0)))
-     (high XReg (gen_popcnt (value_regs_get x 1)))
-     (result XReg (rv_add low high)))
-    (value_regs result (imm $I64 0))))
+(rule 2 (lower (has_type $I64 (sextend (has_type $I32 (iadd x (imm12_from_value y))))))
+  (rv_addiw x y))
 
-(rule 2 (lower (has_type (fits_in_64 _) (popcnt x)))
-  (if-let $true (has_zbb))
-  (rv_cpop (zext x)))
+(rule 3 (lower (has_type $I64 (sextend (has_type $I32 (iadd (imm12_from_value x) y)))))
+  (rv_addiw y x))
 
-(rule 3 (lower (has_type $I32 (popcnt x)))
-  (if-let $true (has_zbb))
-  (rv_cpopw x))
+(rule 2 (lower (has_type $I64 (sextend (has_type $I32 (ishl x (imm12_from_value y))))))
+  (rv_slliw x y))
 
-(rule 3 (lower (has_type $I128 (popcnt x)))
-  (if-let $true (has_zbb))
-  (let
-    ((x ValueRegs x)
-     (low XReg (rv_cpop (value_regs_get x 0)))
-     (high XReg (rv_cpop (value_regs_get x 1)))
-     (result XReg (rv_add low high)))
-    (value_regs result (imm $I64 0))))
+(rule 2 (lower (has_type $I64 (sextend (has_type $I32 (ushr x (imm12_from_value y))))))
+  (rv_srliw x y))
+
+(rule 2 (lower (has_type $I64 (sextend (has_type $I32 (sshr x (imm12_from_value y))))))
+  (rv_sraiw x y))
+
+;;;; Rules for `popcnt` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(rule 0 (lower (has_type (ty_int_ref_scalar_64 ty) (popcnt x)))
+  (lower_popcnt x ty))
+
+(rule 1 (lower (has_type $I128 (popcnt x)))
+  (lower_popcnt_i128 x))
 
 ;; Popcount using multiply.
 ;; This is popcount64c() from
@@ -1158,7 +814,7 @@
 ;;
 ;; TODO: LLVM generates a much better implementation for I8X16. See: https://godbolt.org/z/qr6vf9Gr3
 ;; For the other types it seems to be largely the same.
-(rule 4 (lower (has_type (ty_vec_fits_in_register ty) (popcnt x)))
+(rule 2 (lower (has_type (ty_vec_fits_in_register ty) (popcnt x)))
   (if-let one (u64_to_uimm5 1))
   (if-let two (u64_to_uimm5 2))
   (if-let four (u64_to_uimm5 4))
@@ -1227,17 +883,16 @@
         (low XReg (rv_sll (value_regs_get x 0) shamt))
         ;; high part.
         (high_part1 XReg (rv_srl (value_regs_get x 0) len_sub_shamt))
-        (high_part2 XReg (gen_select_xreg (cmp_eqz shamt) (zero_reg) high_part1))
+        (high_part2 XReg (gen_select_reg (IntCC.Equal) shamt (zero_reg) (zero_reg) high_part1))
         ;;
         (high_part3 XReg (rv_sll (value_regs_get x 1) shamt))
         (high XReg (rv_or high_part2 high_part3))
         ;;
         (const64 XReg (imm $I64 64))
         (shamt_128 XReg (rv_andi (value_regs_get y 0) (imm12_const 127))))
-    (gen_select_regs
-      (cmp_geu shamt_128 const64)
-      (value_regs (zero_reg) low)
-      (value_regs low high))))
+    (value_regs
+      (gen_select_reg (IntCC.UnsignedGreaterThanOrEqual) shamt_128 const64 (zero_reg) low)
+      (gen_select_reg (IntCC.UnsignedGreaterThanOrEqual) shamt_128 const64 low high))))
 
 ;; SIMD Cases
 ;; We don't need to mask anything since it is done by the instruction according to SEW.
@@ -1254,7 +909,7 @@
 ;; zero extended.
 (rule 0 (lower (has_type (ty_int (fits_in_16 ty)) (ushr x y)))
   (if-let mask (u64_to_imm12 (shift_mask ty)))
-  (rv_srlw (zext x) (rv_andi (value_regs_get y 0) mask)))
+  (rv_srlw (zext x ty $I64) (rv_andi (value_regs_get y 0) mask)))
 
 ;; Using the 32bit version of `srl` automatically masks the shift amount.
 (rule 1 (lower (has_type $I32 (ushr x y)))
@@ -1266,7 +921,7 @@
 
 ;; When the RHS is known we can just encode it in the instruction.
 (rule 2 (lower (has_type (ty_int (fits_in_16 ty)) (ushr x (maybe_uextend (imm12_from_value y)))))
-  (rv_srliw (zext x) (imm12_and y (shift_mask ty))))
+  (rv_srliw (zext x ty $I64) (imm12_and y (shift_mask ty))))
 
 (rule 3 (lower (has_type $I32 (ushr x (maybe_uextend (imm12_from_value y)))))
   (rv_srliw x y))
@@ -1280,7 +935,7 @@
         (len_sub_shamt XReg (value_regs_get tmp 1))
         ;; low part.
         (low_part1 XReg (rv_sll (value_regs_get x 1) len_sub_shamt))
-        (low_part2 XReg (gen_select_xreg (cmp_eqz shamt) (zero_reg) low_part1))
+        (low_part2 XReg (gen_select_reg (IntCC.Equal) shamt (zero_reg) (zero_reg) low_part1))
         ;;
         (low_part3 XReg (rv_srl (value_regs_get x 0) shamt))
         (low XReg (rv_or low_part2 low_part3))
@@ -1289,10 +944,9 @@
         ;;
         (high XReg (rv_srl (value_regs_get x 1) shamt))
         (shamt_128 XReg (rv_andi (value_regs_get y 0) (imm12_const 127))))
-    (gen_select_regs
-      (cmp_geu shamt_128 const64)
-      (value_regs high (zero_reg))
-      (value_regs low high))))
+    (value_regs
+      (gen_select_reg (IntCC.UnsignedGreaterThanOrEqual) shamt_128 const64 high low)
+      (gen_select_reg (IntCC.UnsignedGreaterThanOrEqual) shamt_128 const64 (zero_reg) high))))
 
 ;; SIMD Cases
 ;; We don't need to mask or extend anything since it is done by the instruction according to SEW.
@@ -1309,7 +963,7 @@
 ;; zero extended.
 (rule 0 (lower (has_type (ty_int (fits_in_16 ty)) (sshr x y)))
   (if-let mask (u64_to_imm12 (shift_mask ty)))
-  (rv_sraw (sext x) (rv_andi (value_regs_get y 0) mask)))
+  (rv_sraw (sext x ty $I64) (rv_andi (value_regs_get y 0) mask)))
 
 ;; Using the 32bit version of `sra` automatically masks the shift amount.
 (rule 1 (lower (has_type $I32 (sshr x y)))
@@ -1321,7 +975,7 @@
 
 ;; When the RHS is known we can just encode it in the instruction.
 (rule 2 (lower (has_type (ty_int (fits_in_16 ty)) (sshr x (maybe_uextend (imm12_from_value y)))))
-  (rv_sraiw (sext x) (imm12_and y (shift_mask ty))))
+  (rv_sraiw (sext x ty $I64) (imm12_and y (shift_mask ty))))
 
 (rule 3 (lower (has_type $I32 (sshr x (maybe_uextend (imm12_from_value y)))))
   (rv_sraiw x y))
@@ -1335,7 +989,7 @@
         (len_sub_shamt XReg (value_regs_get tmp 1))
         ;; low part.
         (low_part1 XReg (rv_sll (value_regs_get x 1) len_sub_shamt))
-        (low_part2 XReg (gen_select_xreg (cmp_eqz shamt) (zero_reg) low_part1))
+        (low_part2 XReg (gen_select_reg (IntCC.Equal) shamt (zero_reg) (zero_reg) low_part1))
         ;;
         (low_part3 XReg (rv_srl (value_regs_get x 0) shamt))
         (low XReg (rv_or low_part2 low_part3))
@@ -1346,13 +1000,12 @@
         ;;
         (const_neg_1 XReg (imm $I64 (i64_as_u64 -1)))
         ;;
-        (high_replacement XReg (gen_select_xreg (cmp_ltz (value_regs_get x 1)) const_neg_1 (zero_reg)))
+        (high_replacement XReg (gen_select_reg (IntCC.SignedLessThan) (value_regs_get x 1) (zero_reg) const_neg_1 (zero_reg)))
         (const64 XReg (imm $I64 64))
         (shamt_128 XReg (rv_andi (value_regs_get y 0) (imm12_const 127))))
-    (gen_select_regs
-      (cmp_geu shamt_128 const64)
-      (value_regs high high_replacement)
-      (value_regs low high))))
+    (value_regs
+      (gen_select_reg (IntCC.UnsignedGreaterThanOrEqual) shamt_128 const64 high low)
+      (gen_select_reg (IntCC.UnsignedGreaterThanOrEqual) shamt_128 const64 high_replacement high))))
 
 ;; SIMD Cases
 ;; We don't need to mask or extend anything since it is done by the instruction according to SEW.
@@ -1365,114 +1018,19 @@
 
 
 ;;;; Rules for `rotl` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(rule 0 (lower (has_type (fits_in_64 ty) (rotl rs amount)))
-  (let
-    ((rs XReg (zext rs))
-      (amount XReg (value_regs_get amount 0))
-      (x ValueRegs (gen_shamt ty amount))
-      (shamt XReg (value_regs_get x 0))
-      (len_sub_shamt Reg (value_regs_get x 1))
-      (part1 Reg (rv_sll rs shamt))
-      (part2 Reg (rv_srl rs len_sub_shamt))
-      (part3 Reg (gen_select_xreg (cmp_eqz shamt) (zero_reg) part2)))
-    (rv_or part1 part3)))
-
-(rule 1 (lower (has_type $I32 (rotl rs amount)))
-  (if-let $true (has_zbb))
-  (rv_rolw rs (value_regs_get amount 0)))
-
-(rule 2 (lower (has_type $I32 (rotl rs (u64_from_iconst n))))
-  (if-let $true (has_zbb))
-  (if-let (imm12_from_u64 imm) (u64_sub 32 (u64_and n 31)))
-  (rv_roriw rs imm))
-
-(rule 1 (lower (has_type $I64 (rotl rs amount)))
-  (if-let $true (has_zbb))
-  (rv_rol rs (value_regs_get amount 0)))
-
-(rule 2 (lower (has_type $I64 (rotl rs (u64_from_iconst n))))
-  (if-let $true (has_zbb))
-  (if-let (imm12_from_u64 imm) (u64_sub 64 (u64_and n 63)))
-  (rv_rori rs imm))
+(rule (lower (has_type (fits_in_64 ty) (rotl x y)))
+  (lower_rotl ty (zext x ty $I64) (value_regs_get y 0)))
 
 (rule 1 (lower (has_type $I128 (rotl x y)))
-  (let
-    ((tmp ValueRegs (gen_shamt $I128 (value_regs_get y 0)))
-      (shamt XReg (value_regs_get tmp 0))
-      (len_sub_shamt XReg (value_regs_get tmp 1))
-      (low_part1 XReg (rv_sll (value_regs_get x 0) shamt))
-      (low_part2 XReg (rv_srl (value_regs_get x 1) len_sub_shamt))
-      ;;; if shamt == 0 low_part2 will overflow we should zero instead.
-      (low_part3 XReg (gen_select_xreg (cmp_eqz shamt) (zero_reg) low_part2))
-      (low XReg (rv_or low_part1 low_part3))
-      (high_part1 XReg (rv_sll (value_regs_get x 1) shamt))
-      (high_part2 XReg (rv_srl (value_regs_get x 0) len_sub_shamt))
-      (high_part3 XReg (gen_select_xreg (cmp_eqz shamt) (zero_reg) high_part2))
-      (high XReg (rv_or high_part1 high_part3))
-      (const64 XReg (imm $I64 64))
-      (shamt_128 XReg (rv_andi (value_regs_get y 0) (imm12_const 127))))
-    ;; right now we only rotate less than 64 bits.
-    ;; if shamt is greater than or equal 64 , we should switch low and high.
-    (gen_select_regs
-      (cmp_geu shamt_128 const64)
-      (value_regs high low)
-      (value_regs low high)
-    )))
+  (lower_i128_rotl x y))
 
 ;;;; Rules for `rotr` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(rule (lower (has_type (fits_in_64 ty) (rotr rs amount)))
-  (let
-    ((rs XReg (zext rs))
-      (amount XReg (value_regs_get amount 0))
-      (x ValueRegs (gen_shamt ty amount))
-      (shamt XReg (value_regs_get x 0))
-      (len_sub_shamt XReg (value_regs_get x 1))
-      (part1 XReg (rv_srl rs shamt))
-      (part2 XReg (rv_sll rs len_sub_shamt))
-      (part3 XReg (gen_select_xreg (cmp_eqz shamt) (zero_reg) part2)))
-    (rv_or part1 part3)))
-
-(rule 1 (lower (has_type $I32 (rotr rs amount)))
-  (if-let $true (has_zbb))
-  (rv_rorw rs (value_regs_get amount 0)))
-
-(rule 2 (lower (has_type $I32 (rotr rs (imm12_from_value n))))
-  (if-let $true (has_zbb))
-  (rv_roriw rs n))
-
-(rule 1 (lower (has_type $I64 (rotr rs amount)))
-  (if-let $true (has_zbb))
-  (rv_ror rs (value_regs_get amount 0)))
-
-(rule 2 (lower (has_type $I64 (rotr rs (imm12_from_value n))))
-  (if-let $true (has_zbb))
-  (rv_rori rs n))
+(rule (lower (has_type (fits_in_64 ty) (rotr x y)))
+  (lower_rotr ty (zext x ty $I64) (value_regs_get y 0)))
 
 (rule 1 (lower (has_type $I128 (rotr x y)))
-  (let
-    ((tmp ValueRegs (gen_shamt $I128 (value_regs_get y 0)))
-      (shamt XReg (value_regs_get tmp 0))
-      (len_sub_shamt XReg (value_regs_get tmp 1))
-      (low_part1 XReg (rv_srl (value_regs_get x 0) shamt))
-      (low_part2 XReg (rv_sll (value_regs_get x 1) len_sub_shamt))
-      ;;; if shamt == 0 low_part2 will overflow we should zero instead.
-      (low_part3 XReg (gen_select_xreg (cmp_eqz shamt) (zero_reg) low_part2))
-      (low XReg (rv_or low_part1 low_part3))
-      (high_part1 XReg (rv_srl (value_regs_get x 1) shamt))
-      (high_part2 XReg (rv_sll (value_regs_get x 0) len_sub_shamt))
-      (high_part3 XReg (gen_select_xreg (cmp_eqz shamt) (zero_reg) high_part2))
-      (high XReg (rv_or high_part1 high_part3))
-      (const64 XReg (imm $I64 64))
-      (shamt_128 XReg (rv_andi (value_regs_get y 0) (imm12_const 127))))
-    ;; right now we only rotate less than 64 bits.
-    ;; if shamt is greater than or equal 64 , we should switch low and high.
-    (gen_select_regs
-      (cmp_geu shamt_128 const64)
-      (value_regs high low)
-      (value_regs low high)
-    )))
+  (lower_i128_rotr x y))
+
 
 ;;;; Rules for `fabs` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (rule 0 (lower (has_type (ty_scalar_float ty) (fabs x)))
@@ -1500,7 +1058,7 @@
 
 ;;;; Rules for `fma` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (rule 0 (lower (has_type (ty_scalar_float ty) (fma x y z)))
-  (rv_fmadd ty (FRM.RNE) x y z))
+  (rv_fmadd ty x y z))
 
 ;; (fma x y z) computes x * y + z
 ;; vfmacc computes vd[i] = +(vs1[i] * vs2[i]) + vd[i]
@@ -1539,7 +1097,7 @@
 
 ;;;; Rules for `sqrt` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (rule 0 (lower (has_type (ty_scalar_float ty) (sqrt x)))
-  (rv_fsqrt ty (FRM.RNE) x))
+  (rv_fsqrt ty x))
 
 (rule 1 (lower (has_type (ty_vec_fits_in_register ty) (sqrt x)))
   (rv_vfsqrt_v x (unmasked) ty))
@@ -1562,7 +1120,7 @@
 (rule 2
   (lower
     (has_type (valid_atomic_transaction (fits_in_16 ty)) (atomic_rmw flags (is_atomic_rmw_max_etc op $true) addr x)))
-  (gen_atomic_rmw_loop op ty addr (sext x)))
+  (gen_atomic_rmw_loop op ty addr (sext x ty $I64)))
 
 
 (rule 2
@@ -1570,7 +1128,7 @@
   (lower
     (has_type (valid_atomic_transaction (fits_in_16 ty)) (atomic_rmw flags (is_atomic_rmw_max_etc op $false) addr x)))
   ;;
-  (gen_atomic_rmw_loop op ty addr (zext x)))
+  (gen_atomic_rmw_loop op ty addr (zext x ty $I64)))
 
 ;;;;;  Rules for `AtomicRmwOp.Sub`
 (rule
@@ -1631,7 +1189,7 @@
   (let
     ((t0 WritableReg (temp_writable_reg ty))
       (dst WritableReg (temp_writable_reg ty))
-      (_ Unit (emit (MInst.AtomicCas (gen_atomic_offset p ty) t0 dst (zext e) (gen_atomic_p p ty) x ty))))
+      (_ Unit (emit (MInst.AtomicCas (gen_atomic_offset p ty) t0 dst (zext e ty $I64) (gen_atomic_p p ty) x ty))))
     (writable_reg_to_reg dst)))
 
 ;;;;;  Rules for `ireduce`;;;;;;;;;;;;;;;;;
@@ -1651,7 +1209,7 @@
 
 ;;;;;  Rules for `fdemote`;;;;;;;;;;;;;;;;;;
 (rule (lower (fdemote x))
-  (rv_fcvtsd (FRM.RNE) x))
+  (rv_fcvtsd x))
 
 ;;;;;  Rules for `fvdemote`;;;;;;;;;;;;;;;;;
 
@@ -1670,7 +1228,7 @@
 ;;;; Rules for `fadd` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (rule 0 (lower (has_type (ty_scalar_float ty) (fadd x y)))
-  (rv_fadd ty (FRM.RNE) x y))
+  (rv_fadd ty x y))
 
 (rule 1 (lower (has_type (ty_vec_fits_in_register ty) (fadd x y)))
   (rv_vfadd_vv x y (unmasked) ty))
@@ -1684,7 +1242,7 @@
 
 ;;;; Rules for `fsub` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (rule 0 (lower (has_type (ty_scalar_float ty) (fsub x y)))
-  (rv_fsub ty (FRM.RNE) x y))
+  (rv_fsub ty x y))
 
 (rule 1 (lower (has_type (ty_vec_fits_in_register ty) (fsub x y)))
   (rv_vfsub_vv x y (unmasked) ty))
@@ -1697,7 +1255,7 @@
 
 ;;;; Rules for `fmul` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (rule 0 (lower (has_type (ty_scalar_float ty) (fmul x y)))
-  (rv_fmul ty (FRM.RNE) x y))
+  (rv_fmul ty x y))
 
 (rule 1 (lower (has_type (ty_vec_fits_in_register ty) (fmul x y)))
   (rv_vfmul_vv x y (unmasked) ty))
@@ -1711,7 +1269,7 @@
 
 ;;;; Rules for `fdiv` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (rule 0 (lower (has_type (ty_scalar_float ty) (fdiv x y)))
-  (rv_fdiv ty (FRM.RNE) x y))
+  (rv_fdiv ty x y))
 
 (rule 1 (lower (has_type (ty_vec_fits_in_register ty) (fdiv x y)))
   (rv_vfdiv_vv x y (unmasked) ty))
@@ -1724,16 +1282,8 @@
 
 ;;;; Rules for `fmin` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;; RISC-V's `fmin` instruction returns the number input if one of inputs is a
-;; NaN. We handle this by manually checking if one of the inputs is a NaN
-;; and selecting based on that result.
 (rule 0 (lower (has_type (ty_scalar_float ty) (fmin x y)))
-  (let (;; Check if both inputs are not nan.
-        (is_ordered FloatCompare (fcmp_to_float_compare (FloatCC.Ordered) ty x y))
-        ;; `fadd` returns a nan if any of the inputs is a NaN.
-        (nan FReg (rv_fadd ty (FRM.RNE) x y))
-        (min FReg (rv_fmin ty x y)))
-    (gen_select_freg is_ordered min nan)))
+  (gen_float_select (FloatSelectOP.Min) x y ty))
 
 ;; vfmin does almost the right thing, but it does not handle NaN's correctly.
 ;; We should return a NaN if any of the inputs is a NaN, but vfmin returns the
@@ -1750,17 +1300,8 @@
 
 ;;;; Rules for `fmax` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;; RISC-V's `fmax` instruction returns the number input if one of inputs is a
-;; NaN. We handle this by manually checking if one of the inputs is a NaN
-;; and selecting based on that result.
 (rule 0 (lower (has_type (ty_scalar_float ty) (fmax x y)))
-  (let (;; Check if both inputs are not nan.
-        (is_ordered FloatCompare (fcmp_to_float_compare (FloatCC.Ordered) ty x y))
-        ;; `fadd` returns a NaN if any of the inputs is a NaN.
-        (nan FReg (rv_fadd ty (FRM.RNE) x y))
-        (max FReg (rv_fmax ty x y)))
-    (gen_select_freg is_ordered max nan)))
-
+  (gen_float_select (FloatSelectOP.Max) x y ty))
 
 ;; vfmax does almost the right thing, but it does not handle NaN's correctly.
 ;; We should return a NaN if any of the inputs is a NaN, but vfmax returns the
@@ -1793,17 +1334,15 @@
   (rv_seqz (rv_addi v (imm12_const 1))))
 
 ;;;;;  Rules for `select`;;;;;;;;;
-(rule 0 (lower (has_type (ty_int_ref_scalar_64 _) (select c x y)))
-  (gen_select_xreg (is_nonzero_cmp c) x y))
-
-(rule 1 (lower (has_type $I128 (select c x y)))
-  (gen_select_regs (is_nonzero_cmp c) x y))
-
-(rule 2 (lower (has_type (ty_vec_fits_in_register _) (select c x y)))
-  (gen_select_vreg (is_nonzero_cmp c) x y))
+(rule
+  (lower (has_type ty (select c @ (value_type cty) x y)))
+  (gen_select ty (truthy_to_reg cty (normalize_cmp_value cty c (ExtendOp.Zero))) x y))
 
-(rule 3 (lower (has_type (ty_scalar_float _) (select c x y)))
-  (gen_select_freg (is_nonzero_cmp c) x y))
+(rule 1
+  (lower (has_type (fits_in_64 ty) (select (icmp cc a b @ (value_type (fits_in_64 in_ty))) x y)))
+  (let ((a XReg (truthy_to_reg in_ty (normalize_cmp_value in_ty a (intcc_to_extend_op cc))))
+        (b XReg (truthy_to_reg in_ty (normalize_cmp_value in_ty b (intcc_to_extend_op cc)))))
+    (gen_select_reg cc a b x y)))
 
 ;;;;;  Rules for `bitselect`;;;;;;;;;
 
@@ -1817,7 +1356,7 @@
 ;; For vectors, we also do the same operation.
 ;; We can technically use any type in the bitwise operations, but prefer
 ;; using the type of the inputs so that we avoid emitting unnecessary
-;; `vsetvl` instructions. it's likeley that the vector unit is already
+;; `vsetvl` instructions. It's likeley that the vector unit is already
 ;; configured for that type.
 (rule 1 (lower (has_type (ty_vec_fits_in_register ty) (bitselect c x y)))
   (let ((tmp_x VReg (rv_vand_vv c x (unmasked) ty))
@@ -1865,78 +1404,58 @@
 
 ;;;;;  Rules for `smax`;;;;;;;;;
 
-(rule 0 (lower (has_type (fits_in_64 ty) (smax x y)))
-  (let ((x XReg (sext x))
-        (y XReg (sext y)))
-    (gen_select_xreg (cmp_gt x y) x y)))
-
-(rule 1 (lower (has_type $I128 (smax x y)))
-  (gen_select_regs (icmp_to_int_compare (IntCC.SignedGreaterThan) x y) x y))
+(rule 0 (lower (has_type (ty_int ty)  (smax x y)))
+  (gen_int_select ty (IntSelectOP.Smax) (ext_int_if_need $true x ty) (ext_int_if_need $true y ty)))
 
-(rule 2 (lower (has_type (ty_vec_fits_in_register ty) (smax x y)))
+(rule 1 (lower (has_type (ty_vec_fits_in_register ty) (smax x y)))
   (rv_vmax_vv x y (unmasked) ty))
 
-(rule 3 (lower (has_type (ty_vec_fits_in_register ty) (smax x (splat y))))
+(rule 2 (lower (has_type (ty_vec_fits_in_register ty) (smax x (splat y))))
   (rv_vmax_vx x y (unmasked) ty))
 
-(rule 4 (lower (has_type (ty_vec_fits_in_register ty) (smax (splat x) y)))
+(rule 3 (lower (has_type (ty_vec_fits_in_register ty) (smax (splat x) y)))
   (rv_vmax_vx y x (unmasked) ty))
 
 ;;;;;  Rules for `smin`;;;;;;;;;
 
-(rule 0 (lower (has_type (fits_in_64 ty) (smin x y)))
-  (let ((x XReg (sext x))
-        (y XReg (sext y)))
-    (gen_select_xreg (cmp_lt x y) x y)))
-
-(rule 1 (lower (has_type $I128 (smin x y)))
-  (gen_select_regs (icmp_to_int_compare (IntCC.SignedLessThan) x y) x y))
+(rule 0 (lower (has_type (ty_int ty)  (smin x y)))
+  (gen_int_select ty (IntSelectOP.Smin) (ext_int_if_need $true x ty) (ext_int_if_need $true y ty)))
 
-(rule 2 (lower (has_type (ty_vec_fits_in_register ty) (smin x y)))
+(rule 1 (lower (has_type (ty_vec_fits_in_register ty) (smin x y)))
   (rv_vmin_vv x y (unmasked) ty))
 
-(rule 3 (lower (has_type (ty_vec_fits_in_register ty) (smin x (splat y))))
+(rule 2 (lower (has_type (ty_vec_fits_in_register ty) (smin x (splat y))))
   (rv_vmin_vx x y (unmasked) ty))
 
-(rule 4 (lower (has_type (ty_vec_fits_in_register ty) (smin (splat x) y)))
+(rule 3 (lower (has_type (ty_vec_fits_in_register ty) (smin (splat x) y)))
   (rv_vmin_vx y x (unmasked) ty))
 
 ;;;;;  Rules for `umax`;;;;;;;;;
 
-(rule 0 (lower (has_type (fits_in_64 ty) (umax x y)))
-  (let ((x XReg (zext x))
-        (y XReg (zext y)))
-    (gen_select_xreg (cmp_gtu x y) x y)))
+(rule 0 (lower (has_type (ty_int ty)  (umax x y)))
+  (gen_int_select ty (IntSelectOP.Umax) (ext_int_if_need $false x ty) (ext_int_if_need $false y ty)))
 
-(rule 1 (lower (has_type $I128 (umax x y)))
-  (gen_select_regs (icmp_to_int_compare (IntCC.UnsignedGreaterThan) x y) x y))
-
-(rule 2 (lower (has_type (ty_vec_fits_in_register ty) (umax x y)))
+(rule 1 (lower (has_type (ty_vec_fits_in_register ty) (umax x y)))
   (rv_vmaxu_vv x y (unmasked) ty))
 
-(rule 3 (lower (has_type (ty_vec_fits_in_register ty) (umax x (splat y))))
+(rule 2 (lower (has_type (ty_vec_fits_in_register ty) (umax x (splat y))))
   (rv_vmaxu_vx x y (unmasked) ty))
 
-(rule 4 (lower (has_type (ty_vec_fits_in_register ty) (umax (splat x) y)))
+(rule 3 (lower (has_type (ty_vec_fits_in_register ty) (umax (splat x) y)))
   (rv_vmaxu_vx y x (unmasked) ty))
 
 ;;;;;  Rules for `umin`;;;;;;;;;
 
-(rule 0 (lower (has_type (fits_in_64 ty) (umin x y)))
-  (let ((x XReg (zext x))
-        (y XReg (zext y)))
-    (gen_select_xreg (cmp_ltu x y) x y)))
-
-(rule 1 (lower (has_type $I128 (umin x y)))
-  (gen_select_regs (icmp_to_int_compare (IntCC.UnsignedLessThan) x y) x y))
+(rule 0 (lower (has_type (ty_int ty) (umin x y)))
+  (gen_int_select ty (IntSelectOP.Umin) (ext_int_if_need $false x ty) (ext_int_if_need $false y ty)))
 
-(rule 2 (lower (has_type (ty_vec_fits_in_register ty) (umin x y)))
+(rule 1 (lower (has_type (ty_vec_fits_in_register ty) (umin x y)))
   (rv_vminu_vv x y (unmasked) ty))
 
-(rule 3 (lower (has_type (ty_vec_fits_in_register ty) (umin x (splat y))))
+(rule 2 (lower (has_type (ty_vec_fits_in_register ty) (umin x (splat y))))
   (rv_vminu_vx x y (unmasked) ty))
 
-(rule 4 (lower (has_type (ty_vec_fits_in_register ty) (umin (splat x) y)))
+(rule 3 (lower (has_type (ty_vec_fits_in_register ty) (umin (splat x) y)))
   (rv_vminu_vx y x (unmasked) ty))
 
 
@@ -1961,43 +1480,46 @@
   (udf code))
 
 ;;;;;  Rules for `uload8`;;;;;;;;;
-(rule (lower (uload8 flags addr offset))
-  (gen_load (amode addr offset $I8) (LoadOP.Lbu) flags))
-
+(rule
+  (lower (uload8 flags p @ (value_type (ty_addr64 _)) offset))
+  (gen_load p offset (int_load_op $false 8) flags $I64))
 ;;;;;  Rules for `sload8`;;;;;;;;;
-(rule (lower (sload8 flags addr offset))
-  (gen_load (amode addr offset $I8) (LoadOP.Lb) flags))
-
+(rule
+  (lower (sload8 flags p @ (value_type (ty_addr64 _)) offset))
+  (gen_load p offset (int_load_op $true 8) flags $I64))
 ;;;;;  Rules for `uload16`;;;;;;;;;
-(rule (lower (uload16 flags addr offset))
-  (gen_load (amode addr offset $I16) (LoadOP.Lhu) flags))
+(rule
+  (lower (uload16 flags p @ (value_type (ty_addr64 _)) offset))
+  (gen_load p offset (int_load_op $false 16) flags $I64))
 
 ;;;;;  Rules for `iload16`;;;;;;;;;
-(rule (lower (sload16 flags addr offset))
-  (gen_load (amode addr offset $I16) (LoadOP.Lh) flags))
+(rule
+  (lower (sload16 flags p @ (value_type (ty_addr64 _)) offset))
+  (gen_load p offset (int_load_op $true 16) flags $I64))
 
 ;;;;;  Rules for `uload32`;;;;;;;;;
-(rule (lower (uload32 flags addr offset))
-  (gen_load (amode addr offset $I32) (LoadOP.Lwu) flags))
-
-;;;;;  Rules for `sload32`;;;;;;;;;
-(rule (lower (sload32 flags addr offset))
-  (gen_load (amode addr offset $I32) (LoadOP.Lw) flags))
+(rule
+  (lower (uload32 flags p @ (value_type (ty_addr64 _)) offset))
+  (gen_load p offset (int_load_op $false 32) flags $I64))
 
-;;;;;  Rules for `load`;;;;;;;;;
-(rule (lower (has_type ty (load flags addr offset)))
-  (gen_load (amode addr offset ty) (load_op ty) flags))
+;;;;;  Rules for `iload16`;;;;;;;;;
+(rule
+  (lower (sload32 flags p @ (value_type (ty_addr64 _)) offset))
+  (gen_load p offset (int_load_op $true 32) flags $I64))
 
-(rule 1 (lower (has_type $I128 (load flags addr offset)))
-  (if-let offset_plus_8 (s32_add_fallible offset 8))
-  (let ((lo XReg (gen_load (amode addr offset $I64) (LoadOP.Ld) flags))
-        (hi XReg (gen_load (amode addr offset_plus_8 $I64) (LoadOP.Ld) flags)))
-    (value_regs lo hi)))
+(rule
+  (lower (has_type ty (load flags p @ (value_type (ty_addr64 _)) offset)))
+  (gen_load p offset (load_op ty) flags ty)
+)
+;;;; for I128
+(rule 1
+  (lower (has_type $I128 (load flags p @ (value_type (ty_addr64 _)) offset)))
+  (gen_load_128 p offset flags))
 
-(rule 2 (lower (has_type (ty_vec_fits_in_register ty) (load flags addr offset)))
-  (let ((eew VecElementWidth (element_width_from_type ty))
-        (amode AMode (amode addr offset ty)))
-    (vec_load eew (VecAMode.UnitStride amode) flags (unmasked) ty)))
+(rule 2
+  (lower (has_type (ty_vec_fits_in_register ty) (load flags p @ (value_type (ty_addr64 _)) offset)))
+  (let ((eew VecElementWidth (element_width_from_type ty)))
+    (vec_load eew (VecAMode.UnitStride (gen_amode p offset $I64)) flags (unmasked) ty)))
 
 ;;;;;  Rules for Load + Extend Combos ;;;;;;;;;
 
@@ -2006,221 +1528,92 @@
 ;; do a SEW/2 extension. This only reads half width elements from the source vector register
 ;; extends it, and writes the back the full register.
 
-(decl gen_load64_extend (Type ExtendOp MemFlags AMode) VReg)
+(decl gen_load64_extend (Type ExtendOp MemFlags XReg Offset32) VReg)
 
-(rule (gen_load64_extend ty (ExtendOp.Signed) flags amode)
+(rule (gen_load64_extend ty (ExtendOp.Signed) flags addr offset)
   (let ((eew VecElementWidth (element_width_from_type $I64))
         (load_state VState (vstate_from_type $I64))
-        (loaded VReg (vec_load eew (VecAMode.UnitStride amode) flags (unmasked) load_state)))
+        (loaded VReg (vec_load eew (VecAMode.UnitStride (gen_amode addr offset $I64)) flags (unmasked) load_state)))
     (rv_vsext_vf2 loaded (unmasked) ty)))
 
-(rule (gen_load64_extend ty (ExtendOp.Zero) flags amode)
+(rule (gen_load64_extend ty (ExtendOp.Zero) flags addr offset)
   (let ((eew VecElementWidth (element_width_from_type $I64))
         (load_state VState (vstate_from_type $I64))
-        (loaded VReg (vec_load eew (VecAMode.UnitStride amode) flags (unmasked) load_state)))
+        (loaded VReg (vec_load eew (VecAMode.UnitStride (gen_amode addr offset $I64)) flags (unmasked) load_state)))
     (rv_vzext_vf2 loaded (unmasked) ty)))
 
 ;;;;;  Rules for `uload8x8`;;;;;;;;;;
-(rule (lower (has_type (ty_vec_fits_in_register ty @ $I16X8) (uload8x8 flags addr offset)))
-  (gen_load64_extend ty (ExtendOp.Zero) flags (amode addr offset ty)))
+(rule (lower (has_type (ty_vec_fits_in_register ty @ $I16X8) (uload8x8 flags addr @ (value_type (ty_addr64 _)) offset)))
+  (gen_load64_extend ty (ExtendOp.Zero) flags addr offset))
 
 ;;;;;  Rules for `uload16x4`;;;;;;;;;
-(rule (lower (has_type (ty_vec_fits_in_register ty @ $I32X4) (uload16x4 flags addr offset)))
-  (gen_load64_extend ty (ExtendOp.Zero) flags (amode addr offset ty)))
+(rule (lower (has_type (ty_vec_fits_in_register ty @ $I32X4) (uload16x4 flags addr @ (value_type (ty_addr64 _)) offset)))
+  (gen_load64_extend ty (ExtendOp.Zero) flags addr offset))
 
 ;;;;;  Rules for `uload32x2`;;;;;;;;;
-(rule (lower (has_type (ty_vec_fits_in_register ty @ $I64X2) (uload32x2 flags addr offset)))
-  (gen_load64_extend ty (ExtendOp.Zero) flags (amode addr offset ty)))
+(rule (lower (has_type (ty_vec_fits_in_register ty @ $I64X2) (uload32x2 flags addr @ (value_type (ty_addr64 _)) offset)))
+  (gen_load64_extend ty (ExtendOp.Zero) flags addr offset))
 
 ;;;;;  Rules for `sload8x8`;;;;;;;;;;
-(rule (lower (has_type (ty_vec_fits_in_register ty @ $I16X8) (sload8x8 flags addr offset)))
-  (gen_load64_extend ty (ExtendOp.Signed) flags (amode addr offset ty)))
+(rule (lower (has_type (ty_vec_fits_in_register ty @ $I16X8) (sload8x8 flags addr @ (value_type (ty_addr64 _)) offset)))
+  (gen_load64_extend ty (ExtendOp.Signed) flags addr offset))
 
 ;;;;;  Rules for `sload16x4`;;;;;;;;;
-(rule (lower (has_type (ty_vec_fits_in_register ty @ $I32X4) (sload16x4 flags addr offset)))
-  (gen_load64_extend ty (ExtendOp.Signed) flags (amode addr offset ty)))
+(rule (lower (has_type (ty_vec_fits_in_register ty @ $I32X4) (sload16x4 flags addr @ (value_type (ty_addr64 _)) offset)))
+  (gen_load64_extend ty (ExtendOp.Signed) flags addr offset))
 
 ;;;;;  Rules for `sload32x2`;;;;;;;;;
-(rule (lower (has_type (ty_vec_fits_in_register ty @ $I64X2) (sload32x2 flags addr offset)))
-  (gen_load64_extend ty (ExtendOp.Signed) flags (amode addr offset ty)))
+(rule (lower (has_type (ty_vec_fits_in_register ty @ $I64X2) (sload32x2 flags addr @ (value_type (ty_addr64 _)) offset)))
+  (gen_load64_extend ty (ExtendOp.Signed) flags addr offset))
 
 ;;;;;  Rules for `istore8`;;;;;;;;;
-(rule (lower (istore8 flags src addr offset))
-  (gen_store (amode addr offset $I8) (StoreOP.Sb) flags src))
-
+(rule
+  (lower (istore8 flags x p @ (value_type (ty_addr64 _)) offset))
+  (gen_store p offset (StoreOP.Sb) flags x))
 ;;;;;  Rules for `istore16`;;;;;;;;;
-(rule (lower (istore16 flags src addr offset))
-  (gen_store (amode addr offset $I16) (StoreOP.Sh) flags src))
+(rule
+  (lower (istore16 flags x p @ (value_type (ty_addr64 _)) offset))
+  (gen_store p offset (StoreOP.Sh) flags x))
 
 ;;;;;  Rules for `istore32`;;;;;;;;;
-(rule (lower (istore32 flags src addr offset))
-  (gen_store (amode addr offset $I32) (StoreOP.Sw) flags src))
+(rule
+  (lower (istore32 flags x p @ (value_type (ty_addr64 _)) offset))
+  (gen_store p offset (StoreOP.Sw) flags x))
 
 ;;;;;  Rules for `store`;;;;;;;;;
-(rule (lower (store flags src @ (value_type ty) addr offset))
-  (gen_store (amode addr offset ty) (store_op ty) flags src))
+(rule
+  (lower (store flags x @ (value_type ty) p @ (value_type (ty_addr64 _)) offset))
+  (gen_store p offset (store_op ty) flags x))
 
-(rule 1 (lower (store flags src @ (value_type $I128) addr offset))
-  (if-let offset_plus_8 (s32_add_fallible offset 8))
-  (let ((_ InstOutput (gen_store (amode addr offset $I64) (StoreOP.Sd) flags (value_regs_get src 0))))
-    (gen_store (amode addr offset_plus_8 $I64) (StoreOP.Sd) flags (value_regs_get src 1))))
+;;; special for I128
+(rule 1
+  (lower (store flags x @ (value_type $I128 ) p @ (value_type (ty_addr64 _)) offset))
+  (gen_store_128 p offset flags x))
 
-(rule 2 (lower (store flags src @ (value_type (ty_vec_fits_in_register ty)) addr offset))
-  (let ((eew VecElementWidth (element_width_from_type ty))
-        (amode AMode (amode addr offset ty)))
-    (vec_store eew (VecAMode.UnitStride amode) src flags (unmasked) ty)))
+(rule 2
+  (lower (store flags x @ (value_type (ty_vec_fits_in_register ty)) p @ (value_type (ty_addr64 _)) offset))
+  (let ((eew VecElementWidth (element_width_from_type ty)))
+    (vec_store eew (VecAMode.UnitStride (gen_amode p offset $I64)) x flags (unmasked) ty)))
 
+(decl gen_icmp (IntCC ValueRegs ValueRegs Type) XReg)
+(rule
+  (gen_icmp cc x y ty)
+  (let
+    ((result WritableXReg (temp_writable_xreg))
+      (_ Unit (emit (MInst.Icmp cc result x y ty))))
+    result))
 
 ;;;;;  Rules for `icmp`;;;;;;;;;
+(rule 0 (lower (icmp cc x @ (value_type (ty_int ty)) y))
+  (lower_icmp cc x y ty))
 
-;; 8-64 bit comparisons. Mostly fall back onto `IntegerCompare` and then
-;; materializing that, but before that happens try to match some
-;; constant-related patterns
-
-(rule 0 (lower (icmp cc x @ (value_type (fits_in_64 ty)) y))
-  (lower_icmp cc x y))
-
-(decl lower_icmp (IntCC Value Value) XReg)
-(rule 0 (lower_icmp cc x y)
-  (lower_int_compare (icmp_to_int_compare cc x y)))
-
-;; a == $imm => seqz(xori(..))
-(rule 1 (lower_icmp (IntCC.Equal) x y)
-  (if-let (i64_from_iconst (i64_nonzero (imm12_from_i64 imm))) y)
-  (rv_seqz (rv_xori (sext x) imm)))
-(rule 2 (lower_icmp (IntCC.Equal) x y)
-  (if-let (i64_from_iconst (i64_nonzero (imm12_from_i64 imm))) x)
-  (rv_seqz (rv_xori (sext y) imm)))
-
-;; a != $imm => snez(xori(..))
-(rule 1 (lower_icmp (IntCC.NotEqual) x y)
-  (if-let (i64_from_iconst (i64_nonzero (imm12_from_i64 imm))) y)
-  (rv_snez (rv_xori (sext x) imm)))
-(rule 2 (lower_icmp (IntCC.NotEqual) x y)
-  (if-let (i64_from_iconst (i64_nonzero (imm12_from_i64 imm))) x)
-  (rv_snez (rv_xori (sext y) imm)))
-
-;; a < $imm => slti(..)
-(rule 1 (lower_icmp (IntCC.SignedLessThan) x y)
-  (if-let (i64_from_iconst (i64_nonzero (imm12_from_i64 imm))) y)
-  (rv_slti (sext x) imm))
-(rule 1 (lower_icmp (IntCC.SignedGreaterThan) x y)
-  (if-let (i64_from_iconst (i64_nonzero (imm12_from_i64 imm))) x)
-  (rv_slti (sext y) imm))
-(rule 1 (lower_icmp (IntCC.UnsignedLessThan) x y)
-  (if-let (u64_from_iconst (u64_nonzero (imm12_from_u64 imm))) y)
-  (rv_sltiu (zext x) imm))
-(rule 1 (lower_icmp (IntCC.UnsignedGreaterThan) x y)
-  (if-let (u64_from_iconst (u64_nonzero (imm12_from_u64 imm))) x)
-  (rv_sltiu (zext y) imm))
-
-;; a >= $imm => !(a < $imm)
-(rule 2 (lower_icmp cc @ (IntCC.SignedGreaterThanOrEqual) x y)
-  (if-let (i64_from_iconst (i64_nonzero (imm12_from_i64 _))) y)
-  (rv_xori (lower_icmp (intcc_complement cc) x y) (imm12_const 1)))
-(rule 2 (lower_icmp cc @ (IntCC.UnsignedGreaterThanOrEqual) x y)
-  (if-let (u64_from_iconst (u64_nonzero (imm12_from_u64 _))) y)
-  (rv_xori (lower_icmp (intcc_complement cc) x y) (imm12_const 1)))
-
-;; Materializes an `IntegerCompare` bundle directly into an `XReg` with a 0
-;; or 1 value.
-(decl lower_int_compare (IntegerCompare) XReg)
-
-;; x == y => x ^ y == 0
-(rule 0 (lower_int_compare (int_compare_decompose (IntCC.Equal) x y))
-  (rv_seqz (rv_xor x y)))
-(rule 1 (lower_int_compare (int_compare_decompose (IntCC.Equal) x (zero_reg)))
-  (rv_seqz x))
-(rule 2 (lower_int_compare (int_compare_decompose (IntCC.Equal) (zero_reg) y))
-  (rv_seqz y))
-;; x != y => x ^ y != 0
-(rule 0 (lower_int_compare (int_compare_decompose (IntCC.NotEqual) x y))
-  (rv_snez (rv_xor x y)))
-(rule 1 (lower_int_compare (int_compare_decompose (IntCC.NotEqual) x (zero_reg)))
-  (rv_snez x))
-(rule 2 (lower_int_compare (int_compare_decompose (IntCC.NotEqual) (zero_reg) x))
-  (rv_snez x))
-;; x < y => x < y
-(rule (lower_int_compare (int_compare_decompose (IntCC.SignedLessThan) x y))
-  (rv_slt x y))
-(rule (lower_int_compare (int_compare_decompose (IntCC.UnsignedLessThan) x y))
-  (rv_sltu x y))
-;; x > y => y < x
-(rule (lower_int_compare (int_compare_decompose (IntCC.SignedGreaterThan) x y))
-  (rv_slt y x))
-(rule (lower_int_compare (int_compare_decompose (IntCC.UnsignedGreaterThan) x y))
-  (rv_sltu y x))
-;; x <= y => !(y < x)
-(rule (lower_int_compare (int_compare_decompose (IntCC.SignedLessThanOrEqual) x y))
-  (rv_xori (rv_slt y x) (imm12_const 1)))
-(rule (lower_int_compare (int_compare_decompose (IntCC.UnsignedLessThanOrEqual) x y))
-  (rv_xori (rv_sltu y x) (imm12_const 1)))
-;; x >= y => !(x < y)
-(rule (lower_int_compare (int_compare_decompose (IntCC.SignedGreaterThanOrEqual) x y))
-  (rv_xori (rv_slt x y) (imm12_const 1)))
-(rule (lower_int_compare (int_compare_decompose (IntCC.UnsignedGreaterThanOrEqual) x y))
-  (rv_xori (rv_sltu x y) (imm12_const 1)))
-
-;; 128-bit comparisons.
-;;
-;; Currently only `==`, `!=`, and `<` are implemented, and everything else
-;; delegates to one of those.
-
-(rule 20 (lower (icmp cc x @ (value_type $I128) y))
-  (lower_icmp_i128 cc x y))
-
-(decl lower_icmp_i128 (IntCC ValueRegs ValueRegs) XReg)
-(rule 0 (lower_icmp_i128 (IntCC.Equal) x y)
-  (let ((lo XReg (rv_xor (value_regs_get x 0) (value_regs_get y 0)))
-        (hi XReg (rv_xor (value_regs_get x 1) (value_regs_get y 1))))
-    (rv_seqz (rv_or lo hi))))
-(rule 0 (lower_icmp_i128 (IntCC.NotEqual) x y)
-  (let ((lo XReg (rv_xor (value_regs_get x 0) (value_regs_get y 0)))
-        (hi XReg (rv_xor (value_regs_get x 1) (value_regs_get y 1))))
-    (rv_snez (rv_or lo hi))))
-
-;; swap args for `>` to use `<` instead
-(rule 0 (lower_icmp_i128 cc @ (IntCC.SignedGreaterThan) x y)
-  (lower_icmp_i128 (intcc_swap_args cc) y x))
-(rule 0 (lower_icmp_i128 cc @ (IntCC.UnsignedGreaterThan) x y)
-  (lower_icmp_i128 (intcc_swap_args cc) y x))
-
-;; complement `=`-related conditions to get ones that don't use `=`.
-(rule 0 (lower_icmp_i128 cc @ (IntCC.SignedLessThanOrEqual) x y)
-  (rv_xori (lower_icmp_i128 (intcc_complement cc) x y) (imm12_const 1)))
-(rule 0 (lower_icmp_i128 cc @ (IntCC.SignedGreaterThanOrEqual) x y)
-  (rv_xori (lower_icmp_i128 (intcc_complement cc) x y) (imm12_const 1)))
-(rule 0 (lower_icmp_i128 cc @ (IntCC.UnsignedLessThanOrEqual) x y)
-  (rv_xori (lower_icmp_i128 (intcc_complement cc) x y) (imm12_const 1)))
-(rule 0 (lower_icmp_i128 cc @ (IntCC.UnsignedGreaterThanOrEqual) x y)
-  (rv_xori (lower_icmp_i128 (intcc_complement cc) x y) (imm12_const 1)))
-
-;; Compare both the bottom and upper halves of the 128-bit values. If
-;; the top half is equal use the bottom comparison, otherwise use the upper
-;; comparison. Note that the lower comparison is always unsigned since if it's
-;; used the top halves are all zeros and the semantic values are positive.
-(rule 1 (lower_icmp_i128 cc x y)
-  (if-let (IntCC.UnsignedLessThan) (intcc_unsigned cc))
-  (let ((x_lo Reg (value_regs_get x 0))
-        (x_hi Reg (value_regs_get x 1))
-        (y_lo Reg (value_regs_get y 0))
-        (y_hi Reg (value_regs_get y 1))
-        (top_cmp XReg (lower_int_compare (int_compare cc x_hi y_hi)))
-        (bottom_cmp XReg (rv_sltu x_lo y_lo)))
-    (gen_select_xreg (cmp_eqz (rv_xor x_hi y_hi)) bottom_cmp top_cmp)))
-
-;; vector icmp comparisons
-
-(rule 30 (lower (icmp cc x @ (value_type (ty_vec_fits_in_register ty)) y))
+(rule 1 (lower (icmp cc x @ (value_type (ty_vec_fits_in_register ty)) y))
   (gen_expand_mask ty (gen_icmp_mask ty cc x y)))
 
+
 ;;;;;  Rules for `fcmp`;;;;;;;;;
 (rule 0 (lower (fcmp cc x @ (value_type (ty_scalar_float ty)) y))
-  (lower_float_compare (fcmp_to_float_compare cc ty x y)))
-
-(decl lower_float_compare (FloatCompare) XReg)
-(rule (lower_float_compare (FloatCompare.One r)) r)
-(rule (lower_float_compare (FloatCompare.Zero r)) (rv_seqz r))
+  (cmp_value (emit_fcmp cc ty x y)))
 
 (rule 1 (lower (fcmp cc x @ (value_type (ty_vec_fits_in_register ty)) y))
   (gen_expand_mask ty (gen_fcmp_mask ty cc x y)))
@@ -2231,81 +1624,17 @@
   (load_ext_name name 0))
 
 ;;;;;  Rules for `fcvt_to_uint`;;;;;;;;;
-
-;; RISC-V float-to-integer conversion does not trap, but Cranelift semantics are
-;; to trap. This manually performs checks for NaN and out-of-bounds values and
-;; traps in such cases.
-;;
-;; TODO: could this perhaps be more optimal through inspection of the `fcsr`?
-;; Unsure whether that needs to be preserved across function calls and/or would
-;; cause other problems. Also unsure whether it's actually more performant.
-(rule (lower (has_type ity (fcvt_to_uint v @ (value_type fty))))
-  (let ((_ InstOutput (gen_trapz (rv_feq fty v v) (TrapCode.BadConversionToInteger)))
-        (min FReg (imm fty (fcvt_umin_bound fty $false)))
-        (_ InstOutput (gen_trapnz (rv_fle fty v min) (TrapCode.IntegerOverflow)))
-        (max FReg (imm fty (fcvt_umax_bound fty ity $false)))
-        (_ InstOutput (gen_trapnz (rv_fge fty v max) (TrapCode.IntegerOverflow))))
-    (lower_inbounds_fcvt_to_uint ity fty v)))
-
-(decl lower_inbounds_fcvt_to_uint (Type Type FReg) XReg)
-(rule 0 (lower_inbounds_fcvt_to_uint (fits_in_32 _) fty v)
-  (rv_fcvtwu fty (FRM.RTZ) v))
-(rule 1 (lower_inbounds_fcvt_to_uint $I64 fty v)
-  (rv_fcvtlu fty (FRM.RTZ) v))
+(rule
+  (lower (has_type to (fcvt_to_uint v @ (value_type from))))
+  (gen_fcvt_int $false v $false from to))
 
 ;;;;;  Rules for `fcvt_to_sint`;;;;;;;;;
-
-;; NB: see above with `fcvt_to_uint` as this is similar
-(rule (lower (has_type ity (fcvt_to_sint v @ (value_type fty))))
-  (let ((_ InstOutput (gen_trapz (rv_feq fty v v) (TrapCode.BadConversionToInteger)))
-        (min FReg (imm fty (fcvt_smin_bound fty ity $false)))
-        (_ InstOutput (gen_trapnz (rv_fle fty v min) (TrapCode.IntegerOverflow)))
-        (max FReg (imm fty (fcvt_smax_bound fty ity $false)))
-        (_ InstOutput (gen_trapnz (rv_fge fty v max) (TrapCode.IntegerOverflow))))
-    (lower_inbounds_fcvt_to_sint ity fty v)))
-
-(decl lower_inbounds_fcvt_to_sint (Type Type FReg) XReg)
-(rule 0 (lower_inbounds_fcvt_to_sint (fits_in_32 _) fty v)
-  (rv_fcvtw fty (FRM.RTZ) v))
-(rule 1 (lower_inbounds_fcvt_to_sint $I64 fty v)
-  (rv_fcvtl fty (FRM.RTZ) v))
+(rule 0 (lower (has_type to (fcvt_to_sint v @ (value_type (ty_scalar_float from)))))
+  (gen_fcvt_int $false v $true from to))
 
 ;;;;;  Rules for `fcvt_to_sint_sat`;;;;;;;;;
-
 (rule 0 (lower (has_type to (fcvt_to_sint_sat v @ (value_type (ty_scalar_float from)))))
-  (handle_fcvt_to_int_nan from v (lower_fcvt_to_sint_sat from to v)))
-
-;; Lowers to a `rv_fcvt*` instruction but handles 8/16-bit cases where the
-;; float is clamped before the conversion.
-(decl lower_fcvt_to_sint_sat (Type Type FReg) XReg)
-(rule 0 (lower_fcvt_to_sint_sat ty (fits_in_16 out_ty) v)
-  (let ((max FReg (imm ty (fcvt_smax_bound ty out_ty $true)))
-        (min FReg (imm ty (fcvt_smin_bound ty out_ty $true)))
-        (clamped FReg (rv_fmin ty max (rv_fmax ty min v))))
-    (rv_fcvtw ty (FRM.RTZ) clamped)))
-(rule 1 (lower_fcvt_to_sint_sat ty $I32 v) (rv_fcvtw ty (FRM.RTZ) v))
-(rule 1 (lower_fcvt_to_sint_sat ty $I64 v) (rv_fcvtl ty (FRM.RTZ) v))
-
-(decl fcvt_smax_bound (Type Type bool) u64)
-(extern constructor fcvt_smax_bound fcvt_smax_bound)
-(decl fcvt_smin_bound (Type Type bool) u64)
-(extern constructor fcvt_smin_bound fcvt_smin_bound)
-
-;; RISC-V float-to-int conversions generate the same output for NaN and +Inf,
-;; but Cranelift semantics are to produce 0 for NaN instead. This helper
-;; translates these semantics by taking the float being converted (with the type
-;; specified) and the native RISC-V output as an `XReg`. The returned `XReg`
-;; will be zeroed out if the float is NaN.
-;;
-;; This is done by comparing the float to itself, generating 0 if it's NaN. This
-;; bit is then negated to become either all-ones or all-zeros which is then
-;; and-ed against the native output. That'll produce all zeros if the input is
-;; NaN or the native output otherwise.
-(decl handle_fcvt_to_int_nan (Type FReg XReg) XReg)
-(rule (handle_fcvt_to_int_nan ty freg xreg)
-  (let ((is_not_nan XReg (rv_feq ty freg freg))
-        (not_nan_mask XReg (rv_neg is_not_nan)))
-    (rv_and xreg not_nan_mask)))
+  (gen_fcvt_int $true v $true from to))
 
 (rule 1 (lower (has_type (ty_vec_fits_in_register _) (fcvt_to_sint_sat v @ (value_type from_ty))))
   (if-let zero (i8_to_imm5 0))
@@ -2314,25 +1643,8 @@
     (rv_vmerge_vim cvt zero is_nan from_ty)))
 
 ;;;;;  Rules for `fcvt_to_uint_sat`;;;;;;;;;
-
 (rule 0 (lower (has_type to (fcvt_to_uint_sat v @ (value_type (ty_scalar_float from)))))
-  (handle_fcvt_to_int_nan from v (lower_fcvt_to_uint_sat from to v)))
-
-;; Lowers to a `rv_fcvt*` instruction but handles 8/16-bit cases where the
-;; float is clamped before the conversion.
-(decl lower_fcvt_to_uint_sat (Type Type FReg) XReg)
-(rule 0 (lower_fcvt_to_uint_sat ty (fits_in_16 out_ty) v)
-  (let ((max FReg (imm ty (fcvt_umax_bound ty out_ty $true)))
-        (min FReg (rv_fmvdx (zero_reg)))
-        (clamped FReg (rv_fmin ty max (rv_fmax ty min v))))
-    (rv_fcvtwu ty (FRM.RTZ) clamped)))
-(rule 1 (lower_fcvt_to_uint_sat ty $I32 v) (rv_fcvtwu ty (FRM.RTZ) v))
-(rule 1 (lower_fcvt_to_uint_sat ty $I64 v) (rv_fcvtlu ty (FRM.RTZ) v))
-
-(decl fcvt_umax_bound (Type Type bool) u64)
-(extern constructor fcvt_umax_bound fcvt_umax_bound)
-(decl fcvt_umin_bound (Type bool) u64)
-(extern constructor fcvt_umin_bound fcvt_umin_bound)
+  (gen_fcvt_int $true v $false from to))
 
 (rule 1 (lower (has_type (ty_vec_fits_in_register _) (fcvt_to_uint_sat v @ (value_type from_ty))))
   (if-let zero (i8_to_imm5 0))
@@ -2341,47 +1653,21 @@
     (rv_vmerge_vim cvt zero is_nan from_ty)))
 
 ;;;;;  Rules for `fcvt_from_sint`;;;;;;;;;
-(rule 0 (lower (has_type $F32 (fcvt_from_sint v @ (value_type (fits_in_16 ty)))))
-  (rv_fcvtsl (FRM.RNE) (sext v)))
-
-(rule 1 (lower (has_type $F32 (fcvt_from_sint v @ (value_type $I32))))
-  (rv_fcvtsw (FRM.RNE) v))
-
-(rule 1 (lower (has_type $F32 (fcvt_from_sint v @ (value_type $I64))))
-  (rv_fcvtsl (FRM.RNE) v))
+(rule 0 (lower (has_type (ty_scalar_float to) (fcvt_from_sint v @ (value_type from_ty))))
+  (let ((float_op FpuOPRR (int_convert_2_float_op from_ty $true to))
+        (value XReg (normalize_fcvt_from_int v from_ty (ExtendOp.Signed))))
+    (fpu_rr float_op to value)))
 
-(rule 0 (lower (has_type $F64 (fcvt_from_sint v @ (value_type (fits_in_16 ty)))))
-  (rv_fcvtdl (FRM.RNE) (sext v)))
-
-(rule 1 (lower (has_type $F64 (fcvt_from_sint v @ (value_type $I32))))
-  (rv_fcvtdw v))
-
-(rule 1 (lower (has_type $F64 (fcvt_from_sint v @ (value_type $I64))))
-  (rv_fcvtdl (FRM.RNE) v))
-
-(rule 2 (lower (has_type (ty_vec_fits_in_register _) (fcvt_from_sint v @ (value_type from_ty))))
+(rule 1 (lower (has_type (ty_vec_fits_in_register _) (fcvt_from_sint v @ (value_type from_ty))))
   (rv_vfcvt_f_x_v v (unmasked) from_ty))
 
 ;;;;;  Rules for `fcvt_from_uint`;;;;;;;;;
-(rule 0 (lower (has_type $F32 (fcvt_from_uint v @ (value_type (fits_in_16 ty)))))
-  (rv_fcvtslu (FRM.RNE) (zext v)))
-
-(rule 1 (lower (has_type $F32 (fcvt_from_uint v @ (value_type $I32))))
-  (rv_fcvtswu (FRM.RNE) v))
-
-(rule 1 (lower (has_type $F32 (fcvt_from_uint v @ (value_type $I64))))
-  (rv_fcvtslu (FRM.RNE) v))
-
-(rule 0 (lower (has_type $F64 (fcvt_from_uint v @ (value_type (fits_in_16 ty)))))
-  (rv_fcvtdlu (FRM.RNE) (zext v)))
+(rule 0 (lower (has_type (ty_scalar_float to) (fcvt_from_uint v @ (value_type from_ty))))
+  (let ((float_op FpuOPRR (int_convert_2_float_op from_ty $false to))
+        (value XReg (normalize_fcvt_from_int v from_ty (ExtendOp.Zero))))
+    (fpu_rr float_op to value)))
 
-(rule 1 (lower (has_type $F64 (fcvt_from_uint v @ (value_type $I32))))
-  (rv_fcvtdwu v))
-
-(rule 1 (lower (has_type $F64 (fcvt_from_uint v @ (value_type $I64))))
-  (rv_fcvtdlu (FRM.RNE) v))
-
-(rule 2 (lower (has_type (ty_vec_fits_in_register _) (fcvt_from_uint v @ (value_type from_ty))))
+(rule 1 (lower (has_type (ty_vec_fits_in_register _) (fcvt_from_uint v @ (value_type from_ty))))
   (rv_vfcvt_f_xu_v v (unmasked) from_ty))
 
 ;;;;;  Rules for `symbol_value`;;;;;;;;;
@@ -2435,29 +1721,22 @@
 ;;
 ;; We don't have cmov's in RISC-V either, but we can emulate those using bitwise
 ;; operations, which is what we do below.
-
-;; Base case: use `gen_bmask` to generate a 0 mask or -1 mask from the value of
-;; `cmp`. This is then used with some bit twiddling to produce the final result.
-(rule 0 (lower (has_type (fits_in_64 _) (select_spectre_guard cmp x y)))
-  (let ((mask XReg (gen_bmask cmp)))
-    (rv_or (rv_and mask x) (rv_andn y mask))))
-(rule 1 (lower (has_type $I128 (select_spectre_guard cmp x y)))
-  (let ((mask XReg (gen_bmask cmp)))
-    (value_regs
-      (rv_or (rv_and mask (value_regs_get x 0)) (rv_andn (value_regs_get y 0) mask))
-      (rv_or (rv_and mask (value_regs_get x 1)) (rv_andn (value_regs_get y 1) mask)))))
-
-;; Special case when an argument is the constant zero as some ands and ors
-;; can be folded away.
-(rule 2 (lower (has_type (fits_in_64 _) (select_spectre_guard cmp (i64_from_iconst 0) y)))
-  (rv_andn y (gen_bmask cmp)))
-(rule 3 (lower (has_type (fits_in_64 _) (select_spectre_guard cmp x (i64_from_iconst 0))))
-  (rv_and x (gen_bmask cmp)))
+(rule (lower (has_type ty (select_spectre_guard cmp @ (value_type cmp_ty) x @ (value_type arg_ty) y)))
+  (let (;; Build a mask that is 0 or -1 depending on the input comparision value.
+        ;; `lower_bmask` handles normalizing the input.
+        (mask ValueRegs (lower_bmask arg_ty cmp_ty cmp))
+        ;; Using the mask above we can select either `x` or `y` by
+        ;; performing a bitwise `and` on both sides and then merging them
+        ;; together. We know that only the bits of one of the sides will be selected.
+        ;; TODO: We can use `andn` here if we have `Zbb`
+        (lhs ValueRegs (gen_and arg_ty x mask))
+        (rhs ValueRegs (gen_and arg_ty y (gen_bnot arg_ty mask))))
+    (gen_or arg_ty lhs rhs)))
 
 ;;;;;  Rules for `bmask`;;;;;;;;;
 (rule
-  (lower (has_type oty (bmask x)))
-  (lower_bmask x oty))
+  (lower (has_type oty (bmask x @ (value_type ity))))
+  (lower_bmask oty ity x))
 
 ;; N.B.: the Ret itself is generated by the ABI.
 (rule (lower (return args))
@@ -2482,9 +1761,9 @@
 ;;   neg a1, a0
 ;;   max a0, a0, a1
 (rule 0 (lower (has_type (ty_int_ref_scalar_64 ty) (iabs x)))
-  (let ((extended XReg (sext x))
+  (let ((extended XReg (sext x ty $I64))
         (negated XReg (rv_neg extended)))
-    (gen_select_xreg (cmp_gt extended negated) extended negated)))
+    (max $I64 extended negated)))
 
 ;; For vectors we generate the same code, but with vector instructions
 ;; we can skip the sign extension, since the vector unit will only process
@@ -2569,13 +1848,11 @@
 (rule 2 (lower (has_type (ty_vec_fits_in_register ty) (uadd_sat (splat x) y)))
   (rv_vsaddu_vx y x (unmasked) ty))
 
-(rule 3 (lower (has_type (ty_vec_fits_in_register ty) (uadd_sat x y)))
-  (if-let y_imm (replicated_imm5 y))
-  (rv_vsaddu_vi x y_imm (unmasked) ty))
+(rule 3 (lower (has_type (ty_vec_fits_in_register ty) (uadd_sat x (replicated_imm5 y))))
+  (rv_vsaddu_vi x y (unmasked) ty))
 
-(rule 4 (lower (has_type (ty_vec_fits_in_register ty) (uadd_sat x y)))
-  (if-let x_imm (replicated_imm5 x))
-  (rv_vsaddu_vi y x_imm (unmasked) ty))
+(rule 4 (lower (has_type (ty_vec_fits_in_register ty) (uadd_sat (replicated_imm5 x) y)))
+  (rv_vsaddu_vi y x (unmasked) ty))
 
 ;;;; Rules for `sadd_sat` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -2588,13 +1865,11 @@
 (rule 2 (lower (has_type (ty_vec_fits_in_register ty) (sadd_sat (splat x) y)))
   (rv_vsadd_vx y x (unmasked) ty))
 
-(rule 3 (lower (has_type (ty_vec_fits_in_register ty) (sadd_sat x y)))
-  (if-let y_imm (replicated_imm5 y))
-  (rv_vsadd_vi x y_imm (unmasked) ty))
+(rule 3 (lower (has_type (ty_vec_fits_in_register ty) (sadd_sat x (replicated_imm5 y))))
+  (rv_vsadd_vi x y (unmasked) ty))
 
-(rule 4 (lower (has_type (ty_vec_fits_in_register ty) (sadd_sat x y)))
-  (if-let x_imm (replicated_imm5 x))
-  (rv_vsadd_vi y x_imm (unmasked) ty))
+(rule 4 (lower (has_type (ty_vec_fits_in_register ty) (sadd_sat (replicated_imm5 x) y)))
+  (rv_vsadd_vi y x (unmasked) ty))
 
 ;;;; Rules for `usub_sat` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -2668,9 +1943,8 @@
 (rule 1 (lower (has_type (ty_vec_fits_in_register ty) (swizzle x (splat y))))
   (rv_vrgather_vx x y (unmasked) ty))
 
-(rule 2 (lower (has_type (ty_vec_fits_in_register ty) (swizzle x y)))
-  (if-let y_imm (replicated_uimm5 y))
-  (rv_vrgather_vi x y_imm (unmasked) ty))
+(rule 2 (lower (has_type (ty_vec_fits_in_register ty) (swizzle x (replicated_uimm5 y))))
+  (rv_vrgather_vi x y (unmasked) ty))
 
 ;;;; Rules for `shuffle` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -2792,23 +2066,18 @@
 
 ;;;; Rules for `scalar_to_vector` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(rule 0 (lower (has_type (ty_vec_fits_in_register ty) (scalar_to_vector x)))
-  (if (ty_vector_float ty))
-  (let ((zero VReg (rv_vmv_vx (zero_reg) ty))
-        (elem VReg (rv_vfmv_sf x ty))
-        (mask VReg (gen_vec_mask 1)))
-    (rv_vmerge_vvm zero elem mask ty)))
-
 (rule 1 (lower (has_type (ty_vec_fits_in_register ty) (scalar_to_vector x)))
   (if (ty_vector_not_float ty))
   (let ((zero VReg (rv_vmv_vx (zero_reg) ty))
         (mask VReg (gen_vec_mask 1)))
     (rv_vmerge_vxm zero x mask ty)))
 
-(rule 2 (lower (has_type (ty_vec_fits_in_register ty) (scalar_to_vector (imm5_from_value x))))
+(rule 0 (lower (has_type (ty_vec_fits_in_register ty) (scalar_to_vector x)))
+  (if (ty_vector_float ty))
   (let ((zero VReg (rv_vmv_vx (zero_reg) ty))
+        (elem VReg (rv_vfmv_sf x ty))
         (mask VReg (gen_vec_mask 1)))
-    (rv_vmerge_vim zero x mask ty)))
+    (rv_vmerge_vvm zero elem mask ty)))
 
 ;;;; Rules for `sqmul_round_sat` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
diff --git a/cranelift/codegen/src/isa/riscv64/lower/isle.rs b/cranelift/codegen/src/isa/riscv64/lower/isle.rs
index ab5c6ddf1299..c22fff8096ff 100644
--- a/cranelift/codegen/src/isa/riscv64/lower/isle.rs
+++ b/cranelift/codegen/src/isa/riscv64/lower/isle.rs
@@ -3,7 +3,7 @@
 // Pull in the ISLE generated code.
 #[allow(unused)]
 pub mod generated_code;
-use generated_code::{Context, MInst};
+use generated_code::{Context, ExtendOp, MInst};
 
 // Types that the generated ISLE code uses via `use super::*`.
 use self::generated_code::{VecAluOpRR, VecLmul};
@@ -167,6 +167,66 @@ impl generated_code::Context for RV64IsleContext<'_, '_, MInst, Riscv64Backend>
         *arg0
     }
 
+    fn vec_writable_to_regs(&mut self, val: &VecWritableReg) -> ValueRegs {
+        match val.len() {
+            1 => ValueRegs::one(val[0].to_reg()),
+            2 => ValueRegs::two(val[0].to_reg(), val[1].to_reg()),
+            _ => unreachable!(),
+        }
+    }
+    fn intcc_to_extend_op(&mut self, cc: &IntCC) -> ExtendOp {
+        use IntCC::*;
+        match *cc {
+            Equal
+            | NotEqual
+            | UnsignedLessThan
+            | UnsignedGreaterThanOrEqual
+            | UnsignedGreaterThan
+            | UnsignedLessThanOrEqual => ExtendOp::Zero,
+
+            SignedLessThan
+            | SignedGreaterThanOrEqual
+            | SignedGreaterThan
+            | SignedLessThanOrEqual => ExtendOp::Signed,
+        }
+    }
+    fn lower_cond_br(
+        &mut self,
+        cc: &IntCC,
+        a: ValueRegs,
+        targets: &VecMachLabel,
+        ty: Type,
+    ) -> Unit {
+        MInst::lower_br_icmp(
+            *cc,
+            a,
+            self.int_zero_reg(ty),
+            CondBrTarget::Label(targets[0]),
+            CondBrTarget::Label(targets[1]),
+            ty,
+        )
+        .iter()
+        .for_each(|i| self.emit(i));
+    }
+    fn lower_br_icmp(
+        &mut self,
+        cc: &IntCC,
+        a: ValueRegs,
+        b: ValueRegs,
+        targets: &VecMachLabel,
+        ty: Type,
+    ) -> Unit {
+        let test = generated_code::constructor_lower_icmp(self, cc, a, b, ty);
+        self.emit(&MInst::CondBr {
+            taken: CondBrTarget::Label(targets[0]),
+            not_taken: CondBrTarget::Label(targets[1]),
+            kind: IntegerCompare {
+                kind: IntCC::NotEqual,
+                rs1: test,
+                rs2: zero_reg(),
+            },
+        });
+    }
     fn load_ra(&mut self) -> Reg {
         if self.backend.flags.preserve_frame_pointers() {
             let tmp = self.temp_writable_reg(I64);
@@ -181,40 +241,47 @@ impl generated_code::Context for RV64IsleContext<'_, '_, MInst, Riscv64Backend>
             link_reg()
         }
     }
+    fn int_zero_reg(&mut self, ty: Type) -> ValueRegs {
+        assert!(ty.is_int(), "{:?}", ty);
+        if ty.bits() == 128 {
+            ValueRegs::two(self.zero_reg(), self.zero_reg())
+        } else {
+            ValueRegs::one(self.zero_reg())
+        }
+    }
+
+    fn vec_label_get(&mut self, val: &VecMachLabel, x: u8) -> MachLabel {
+        val[x as usize]
+    }
 
     fn label_to_br_target(&mut self, label: MachLabel) -> CondBrTarget {
         CondBrTarget::Label(label)
     }
 
-    fn imm12_and(&mut self, imm: Imm12, x: u64) -> Imm12 {
-        Imm12::from_i16(imm.as_i16() & (x as i16))
+    fn vec_writable_clone(&mut self, v: &VecWritableReg) -> VecWritableReg {
+        v.clone()
     }
 
-    fn i64_generate_imm(&mut self, imm: i64) -> Option<(Imm20, Imm12)> {
-        MInst::generate_imm(imm as u64)
+    fn imm12_and(&mut self, imm: Imm12, x: u64) -> Imm12 {
+        Imm12::from_i16(imm.as_i16() & (x as i16))
     }
 
-    fn i64_shift_for_lui(&mut self, imm: i64) -> Option<(u64, Imm12)> {
-        let trailing = imm.trailing_zeros();
-        if trailing < 12 {
-            return None;
+    fn alloc_vec_writable(&mut self, ty: Type) -> VecWritableReg {
+        if ty.is_int() || ty == R32 || ty == R64 {
+            if ty.bits() <= 64 {
+                vec![self.temp_writable_reg(I64)]
+            } else {
+                vec![self.temp_writable_reg(I64), self.temp_writable_reg(I64)]
+            }
+        } else if ty.is_float() || ty.is_vector() {
+            vec![self.temp_writable_reg(ty)]
+        } else {
+            unimplemented!("ty:{:?}", ty)
         }
-
-        let shift = Imm12::from_i16(trailing as i16 - 12);
-        let base = (imm as u64) >> trailing;
-        Some((base, shift))
     }
 
-    fn i64_shift(&mut self, imm: i64) -> Option<(i64, Imm12)> {
-        let trailing = imm.trailing_zeros();
-        // We can do without this condition but in this case there is no need to go further
-        if trailing == 0 {
-            return None;
-        }
-
-        let shift = Imm12::from_i16(trailing as i16);
-        let base = imm >> trailing;
-        Some((base, shift))
+    fn i64_generate_imm(&mut self, imm: i64) -> Option<(Imm20, Imm12)> {
+        MInst::generate_imm(imm as u64)
     }
 
     #[inline]
@@ -238,14 +305,6 @@ impl generated_code::Context for RV64IsleContext<'_, '_, MInst, Riscv64Backend>
         }
     }
 
-    #[inline]
-    fn imm20_from_u64(&mut self, arg0: u64) -> Option<Imm20> {
-        Imm20::maybe_from_u64(arg0)
-    }
-    #[inline]
-    fn imm20_from_i64(&mut self, arg0: i64) -> Option<Imm20> {
-        Imm20::maybe_from_i64(arg0)
-    }
     #[inline]
     fn imm20_is_zero(&mut self, imm: Imm20) -> Option<()> {
         if imm.as_i32() == 0 {
@@ -284,15 +343,8 @@ impl generated_code::Context for RV64IsleContext<'_, '_, MInst, Riscv64Backend>
         writable_zero_reg()
     }
     #[inline]
-    fn zero_reg(&mut self) -> XReg {
-        XReg::new(zero_reg()).unwrap()
-    }
-    fn is_zero_reg(&mut self, reg: XReg) -> Option<()> {
-        if reg == self.zero_reg() {
-            Some(())
-        } else {
-            None
-        }
+    fn zero_reg(&mut self) -> Reg {
+        zero_reg()
     }
     #[inline]
     fn imm_from_bits(&mut self, val: u64) -> Imm12 {
@@ -303,10 +355,29 @@ impl generated_code::Context for RV64IsleContext<'_, '_, MInst, Riscv64Backend>
         Imm12::maybe_from_i64(val).unwrap()
     }
 
+    fn gen_default_frm(&mut self) -> OptionFloatRoundingMode {
+        None
+    }
+
     fn frm_bits(&mut self, frm: &FRM) -> UImm5 {
         UImm5::maybe_from_u8(frm.bits()).unwrap()
     }
 
+    fn gen_select_reg(&mut self, cc: &IntCC, a: XReg, b: XReg, rs1: Reg, rs2: Reg) -> Reg {
+        let rd = self.temp_writable_reg(MInst::canonical_type_for_rc(rs1.class()));
+        self.emit(&MInst::SelectReg {
+            rd,
+            rs1,
+            rs2,
+            condition: IntegerCompare {
+                kind: *cc,
+                rs1: a.to_reg(),
+                rs2: b.to_reg(),
+            },
+        });
+        rd.to_reg()
+    }
+
     fn u8_as_i32(&mut self, x: u8) -> i32 {
         x as i32
     }
@@ -321,9 +392,6 @@ impl generated_code::Context for RV64IsleContext<'_, '_, MInst, Riscv64Backend>
     fn imm12_const_add(&mut self, val: i32, add: i32) -> Imm12 {
         Imm12::maybe_from_i64((val + add) as i64).unwrap()
     }
-    fn imm12_add(&mut self, val: Imm12, add: i32) -> Option<Imm12> {
-        Imm12::maybe_from_i64((i32::from(val.as_i16()) + add).into())
-    }
 
     //
     fn gen_shamt(&mut self, ty: Type, shamt: XReg) -> ValueRegs {
@@ -358,10 +426,6 @@ impl generated_code::Context for RV64IsleContext<'_, '_, MInst, Riscv64Backend>
         self.backend.isa_flags.has_v()
     }
 
-    fn has_m(&mut self) -> bool {
-        self.backend.isa_flags.has_m()
-    }
-
     fn has_zbkb(&mut self) -> bool {
         self.backend.isa_flags.has_zbkb()
     }
@@ -382,24 +446,16 @@ impl generated_code::Context for RV64IsleContext<'_, '_, MInst, Riscv64Backend>
         self.backend.isa_flags.has_zbs()
     }
 
-    fn gen_reg_offset_amode(&mut self, base: Reg, offset: i64, ty: Type) -> AMode {
-        AMode::RegOffset(base, offset, ty)
-    }
-
-    fn gen_sp_offset_amode(&mut self, offset: i64, ty: Type) -> AMode {
-        AMode::SPOffset(offset, ty)
+    fn default_memflags(&mut self) -> MemFlags {
+        MemFlags::new()
     }
 
-    fn gen_fp_offset_amode(&mut self, offset: i64, ty: Type) -> AMode {
-        AMode::FPOffset(offset, ty)
+    fn int_convert_2_float_op(&mut self, from: Type, is_signed: bool, to: Type) -> FpuOPRR {
+        FpuOPRR::int_convert_2_float_op(from, is_signed, to)
     }
 
-    fn gen_stack_slot_amode(&mut self, ss: StackSlot, offset: i64, ty: Type) -> AMode {
-        // Offset from beginning of stackslot area, which is at nominal SP (see
-        // [MemArg::NominalSPOffset] for more details on nominal SP tracking).
-        let stack_off = self.lower_ctx.abi().sized_stackslot_offsets()[ss] as i64;
-        let sp_off: i64 = stack_off + offset;
-        AMode::NominalSPOffset(sp_off, ty)
+    fn gen_amode(&mut self, base: Reg, offset: Offset32, ty: Type) -> AMode {
+        AMode::RegOffset(base, i64::from(offset), ty)
     }
 
     fn gen_const_amode(&mut self, c: VCodeConstant) -> AMode {
@@ -439,6 +495,10 @@ impl generated_code::Context for RV64IsleContext<'_, '_, MInst, Riscv64Backend>
         tmp.to_reg()
     }
 
+    fn offset32_add(&mut self, a: Offset32, adden: i64) -> Offset32 {
+        a.try_add_i64(adden).expect("offset exceed range.")
+    }
+
     fn gen_stack_addr(&mut self, slot: StackSlot, offset: Offset32) -> Reg {
         let result = self.temp_writable_reg(I64);
         let i = self
@@ -452,14 +512,14 @@ impl generated_code::Context for RV64IsleContext<'_, '_, MInst, Riscv64Backend>
         AMO::SeqCst
     }
 
-    fn lower_br_table(&mut self, index: Reg, targets: &[MachLabel]) -> Unit {
+    fn lower_br_table(&mut self, index: Reg, targets: &VecMachLabel) -> Unit {
         let tmp1 = self.temp_writable_reg(I64);
         let tmp2 = self.temp_writable_reg(I64);
         self.emit(&MInst::BrTable {
             index,
             tmp1,
             tmp2,
-            targets: targets.to_vec(),
+            targets: targets.clone(),
         });
     }
 
@@ -471,6 +531,22 @@ impl generated_code::Context for RV64IsleContext<'_, '_, MInst, Riscv64Backend>
         px_reg(2)
     }
 
+    fn shift_int_to_most_significant(&mut self, v: XReg, ty: Type) -> XReg {
+        assert!(ty.is_int() && ty.bits() <= 64);
+        if ty == I64 {
+            return v;
+        }
+        let tmp = self.temp_writable_reg(I64);
+        self.emit(&MInst::AluRRImm12 {
+            alu_op: AluOPRRI::Slli,
+            rd: tmp,
+            rs: v.to_reg(),
+            imm12: Imm12::from_i16((64 - ty.bits()) as i16),
+        });
+
+        self.xreg_new(tmp.to_reg())
+    }
+
     #[inline]
     fn int_compare(&mut self, kind: &IntCC, rs1: XReg, rs2: XReg) -> IntegerCompare {
         IntegerCompare {
@@ -480,11 +556,6 @@ impl generated_code::Context for RV64IsleContext<'_, '_, MInst, Riscv64Backend>
         }
     }
 
-    #[inline]
-    fn int_compare_decompose(&mut self, cmp: IntegerCompare) -> (IntCC, XReg, XReg) {
-        (cmp.kind, self.xreg_new(cmp.rs1), self.xreg_new(cmp.rs2))
-    }
-
     #[inline]
     fn vstate_from_type(&mut self, ty: Type) -> VState {
         VState::from_type(ty)
@@ -517,83 +588,6 @@ impl generated_code::Context for RV64IsleContext<'_, '_, MInst, Riscv64Backend>
     fn vec_alu_rr_dst_type(&mut self, op: &VecAluOpRR) -> Type {
         MInst::canonical_type_for_rc(op.dst_regclass())
     }
-
-    fn bclr_imm(&mut self, ty: Type, i: u64) -> Option<Imm12> {
-        // Only consider those bits in the immediate which are up to the width
-        // of `ty`.
-        let neg = !i & (u64::MAX >> (64 - ty.bits()));
-        if neg.count_ones() != 1 {
-            return None;
-        }
-        Imm12::maybe_from_u64(neg.trailing_zeros().into())
-    }
-
-    fn binvi_imm(&mut self, i: u64) -> Option<Imm12> {
-        if i.count_ones() != 1 {
-            return None;
-        }
-        Imm12::maybe_from_u64(i.trailing_zeros().into())
-    }
-    fn bseti_imm(&mut self, i: u64) -> Option<Imm12> {
-        self.binvi_imm(i)
-    }
-
-    fn fcvt_smin_bound(&mut self, float: Type, int: Type, saturating: bool) -> u64 {
-        match (int, float) {
-            // Saturating cases for larger integers are handled using the
-            // `fcvt.{w,d}.{s,d}` instruction directly, that automatically
-            // saturates up/down to the correct limit.
-            //
-            // NB: i32/i64 don't use this function because the native RISC-V
-            // instruction does everything we already need, so only cases for
-            // i8/i16 are listed here.
-            (I8, F32) if saturating => f32::from(i8::MIN).to_bits().into(),
-            (I8, F64) if saturating => f64::from(i8::MIN).to_bits(),
-            (I16, F32) if saturating => f32::from(i16::MIN).to_bits().into(),
-            (I16, F64) if saturating => f64::from(i16::MIN).to_bits(),
-
-            (_, F32) if !saturating => f32_cvt_to_int_bounds(true, int.bits()).0.to_bits().into(),
-            (_, F64) if !saturating => f64_cvt_to_int_bounds(true, int.bits()).0.to_bits(),
-            _ => unimplemented!(),
-        }
-    }
-
-    fn fcvt_smax_bound(&mut self, float: Type, int: Type, saturating: bool) -> u64 {
-        // NB: see `fcvt_smin_bound` for some more comments
-        match (int, float) {
-            (I8, F32) if saturating => f32::from(i8::MAX).to_bits().into(),
-            (I8, F64) if saturating => f64::from(i8::MAX).to_bits(),
-            (I16, F32) if saturating => f32::from(i16::MAX).to_bits().into(),
-            (I16, F64) if saturating => f64::from(i16::MAX).to_bits(),
-
-            (_, F32) if !saturating => f32_cvt_to_int_bounds(true, int.bits()).1.to_bits().into(),
-            (_, F64) if !saturating => f64_cvt_to_int_bounds(true, int.bits()).1.to_bits(),
-            _ => unimplemented!(),
-        }
-    }
-
-    fn fcvt_umax_bound(&mut self, float: Type, int: Type, saturating: bool) -> u64 {
-        // NB: see `fcvt_smin_bound` for some more comments
-        match (int, float) {
-            (I8, F32) if saturating => f32::from(u8::MAX).to_bits().into(),
-            (I8, F64) if saturating => f64::from(u8::MAX).to_bits(),
-            (I16, F32) if saturating => f32::from(u16::MAX).to_bits().into(),
-            (I16, F64) if saturating => f64::from(u16::MAX).to_bits(),
-
-            (_, F32) if !saturating => f32_cvt_to_int_bounds(false, int.bits()).1.to_bits().into(),
-            (_, F64) if !saturating => f64_cvt_to_int_bounds(false, int.bits()).1.to_bits(),
-            _ => unimplemented!(),
-        }
-    }
-
-    fn fcvt_umin_bound(&mut self, float: Type, saturating: bool) -> u64 {
-        assert!(!saturating);
-        match float {
-            F32 => (-1.0f32).to_bits().into(),
-            F64 => (-1.0f64).to_bits(),
-            _ => unimplemented!(),
-        }
-    }
 }
 
 /// The main entry point for lowering with ISLE.
diff --git a/cranelift/codegen/src/isa/s390x/inst.isle b/cranelift/codegen/src/isa/s390x/inst.isle
index 54b3649da86b..59f4003a8887 100644
--- a/cranelift/codegen/src/isa/s390x/inst.isle
+++ b/cranelift/codegen/src/isa/s390x/inst.isle
@@ -969,7 +969,7 @@
     ;; for rationale).
     (JTSequence
       (ridx Reg)
-      (targets BoxVecMachLabel))
+      (targets VecMachLabel))
 
     ;; Load an inline symbol reference with relocation.
     (LoadSymbolReloc
@@ -1539,6 +1539,11 @@
 (decl pure partial i64_nonequal (i64 i64) i64)
 (extern constructor i64_nonequal i64_nonequal)
 
+(decl pure partial i64_nonzero (i64) i64)
+(rule (i64_nonzero x)
+      (if (i64_nonequal x 0))
+      x)
+
 (decl pure partial i64_not_neg1 (i64) i64)
 (rule (i64_not_neg1 x)
       (if (i64_nonequal x -1))
@@ -1733,6 +1738,15 @@
 (extern extractor unsigned unsigned)
 
 
+;; Helpers for machine label vectors ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(decl vec_length_minus1 (VecMachLabel) u32)
+(extern constructor vec_length_minus1 vec_length_minus1)
+
+(decl vec_element (VecMachLabel u8) MachLabel)
+(extern constructor vec_element vec_element)
+
+
 ;; Helpers for memory arguments ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; Accessors for `Offset32`.
@@ -2703,7 +2717,7 @@
       (ConsumesFlags.ConsumesFlagsSideEffect (MInst.OneWayCondBr dest cond)))
 
 ;; Helper for emitting `MInst.JTSequence` instructions.
-(decl jt_sequence (Reg BoxVecMachLabel) SideEffectNoResult)
+(decl jt_sequence (Reg VecMachLabel) SideEffectNoResult)
 (rule (jt_sequence ridx targets)
       (SideEffectNoResult.Inst (MInst.JTSequence ridx targets)))
 
diff --git a/cranelift/codegen/src/isa/s390x/inst/emit.rs b/cranelift/codegen/src/isa/s390x/inst/emit.rs
index 7efb8b4dfc72..56dbacf2762e 100644
--- a/cranelift/codegen/src/isa/s390x/inst/emit.rs
+++ b/cranelift/codegen/src/isa/s390x/inst/emit.rs
@@ -3656,9 +3656,12 @@ impl Inst {
                 inst.emit(&[], sink, emit_info, state);
 
                 // Emit jump table (table of 32-bit offsets).
+                // The first entry is the default target, which is not emitted
+                // into the jump table, so we skip it here.  It is only in the
+                // list so MachTerminator will see the potential target.
                 sink.bind_label(table_label, &mut state.ctrl_plane);
                 let jt_off = sink.cur_offset();
-                for &target in targets.iter() {
+                for &target in targets.iter().skip(1) {
                     let word_off = sink.cur_offset();
                     let off_into_table = word_off - jt_off;
                     sink.use_label_at_offset(word_off, target, LabelUse::PCRel32);
diff --git a/cranelift/codegen/src/isa/s390x/inst/mod.rs b/cranelift/codegen/src/isa/s390x/inst/mod.rs
index bec240f8b960..0ece48c7b664 100644
--- a/cranelift/codegen/src/isa/s390x/inst/mod.rs
+++ b/cranelift/codegen/src/isa/s390x/inst/mod.rs
@@ -1064,10 +1064,6 @@ impl MachInst for Inst {
         }
     }
 
-    fn is_mem_access(&self) -> bool {
-        panic!("TODO FILL ME OUT")
-    }
-
     fn is_safepoint(&self) -> bool {
         match self {
             &Inst::Call { .. }
diff --git a/cranelift/codegen/src/isa/s390x/lower.isle b/cranelift/codegen/src/isa/s390x/lower.isle
index 6d6aa1e724e4..c7bfa335f8b6 100644
--- a/cranelift/codegen/src/isa/s390x/lower.isle
+++ b/cranelift/codegen/src/isa/s390x/lower.isle
@@ -7,7 +7,7 @@
 ;; A variant of the main lowering constructor term, used for branches.
 ;; The only difference is that it gets an extra argument holding a vector
 ;; of branch targets to be used.
-(decl partial lower_branch (Inst MachLabelSlice) Unit)
+(decl partial lower_branch (Inst VecMachLabel) Unit)
 
 
 ;;;; Rules for `iconst` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -3734,24 +3734,25 @@
 
 ;; Unconditional branch.  The target is found as first (and only) element in
 ;; the list of the current block's branch targets passed as `targets`.
-(rule (lower_branch (jump _) (single_target label))
-      (emit_side_effect (jump_impl label)))
+(rule (lower_branch (jump _) targets)
+      (emit_side_effect (jump_impl (vec_element targets 0))))
 
 
 ;;;; Rules for `br_table` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; Jump table.  `targets` contains the default target followed by the
 ;; list of branch targets per index value.
-(rule (lower_branch (br_table val_idx _) (jump_table_targets default targets))
+(rule (lower_branch (br_table val_idx _) targets)
       (let ((idx Reg (put_in_reg_zext64 val_idx))
             ;; Bounds-check the index and branch to default.
             ;; This is an internal branch that is not a terminator insn.
             ;; Instead, the default target is listed a potential target
             ;; in the final JTSequence, which is the block terminator.
             (cond ProducesBool
-              (bool (icmpu_uimm32 $I64 idx (jump_table_size targets))
+              (bool (icmpu_uimm32 $I64 idx (vec_length_minus1 targets))
                     (intcc_as_cond (IntCC.UnsignedGreaterThanOrEqual))))
-            (_ Unit (emit_side_effect (oneway_cond_br_bool cond default))))
+            (_ Unit (emit_side_effect (oneway_cond_br_bool cond
+                                        (vec_element targets 0)))))
         ;; Scale the index by the element size, and then emit the
         ;; compound instruction that does:
         ;;
@@ -3774,8 +3775,10 @@
 ;; Two-way conditional branch on nonzero.  `targets` contains:
 ;; - element 0: target if the condition is true (i.e. value is nonzero)
 ;; - element 1: target if the condition is false (i.e. value is zero)
-(rule (lower_branch (brif val_cond _ _) (two_targets then else))
-      (emit_side_effect (cond_br_bool (value_nonzero val_cond) then else)))
+(rule (lower_branch (brif val_cond _ _) targets)
+      (emit_side_effect (cond_br_bool (value_nonzero val_cond)
+                                      (vec_element targets 0)
+                                      (vec_element targets 1))))
 
 
 ;;;; Rules for `trap` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/cranelift/codegen/src/isa/s390x/lower/isle.rs b/cranelift/codegen/src/isa/s390x/lower/isle.rs
index cec975d06a15..bb90ed1a8447 100644
--- a/cranelift/codegen/src/isa/s390x/lower/isle.rs
+++ b/cranelift/codegen/src/isa/s390x/lower/isle.rs
@@ -737,6 +737,16 @@ impl generated_code::Context for IsleContext<'_, '_, MInst, S390xBackend> {
         }
     }
 
+    #[inline]
+    fn vec_length_minus1(&mut self, vec: &VecMachLabel) -> u32 {
+        u32::try_from(vec.len()).unwrap() - 1
+    }
+
+    #[inline]
+    fn vec_element(&mut self, vec: &VecMachLabel, index: u8) -> MachLabel {
+        vec[usize::from(index)]
+    }
+
     #[inline]
     fn zero_offset(&mut self) -> Offset32 {
         Offset32::new(0)
diff --git a/cranelift/codegen/src/isa/x64/abi.rs b/cranelift/codegen/src/isa/x64/abi.rs
index d99933500122..51758010162a 100644
--- a/cranelift/codegen/src/isa/x64/abi.rs
+++ b/cranelift/codegen/src/isa/x64/abi.rs
@@ -809,9 +809,9 @@ impl ABIMachineSpec for X64ABIMachineSpec {
 
     fn get_ext_mode(
         _call_conv: isa::CallConv,
-        specified: ir::ArgumentExtension,
+        _specified: ir::ArgumentExtension,
     ) -> ir::ArgumentExtension {
-        specified
+        ir::ArgumentExtension::None
     }
 
     fn compute_frame_layout(
@@ -1243,8 +1243,7 @@ fn create_reg_env_systemv(enable_pinned_reg: bool) -> MachineEnv {
                 preg(regs::r10()),
                 preg(regs::r11()),
             ],
-            // Preferred XMMs: the first 8, which can have smaller encodings
-            // with AVX instructions.
+            // Preferred XMMs: all of them.
             vec![
                 preg(regs::xmm0()),
                 preg(regs::xmm1()),
@@ -1254,6 +1253,14 @@ fn create_reg_env_systemv(enable_pinned_reg: bool) -> MachineEnv {
                 preg(regs::xmm5()),
                 preg(regs::xmm6()),
                 preg(regs::xmm7()),
+                preg(regs::xmm8()),
+                preg(regs::xmm9()),
+                preg(regs::xmm10()),
+                preg(regs::xmm11()),
+                preg(regs::xmm12()),
+                preg(regs::xmm13()),
+                preg(regs::xmm14()),
+                preg(regs::xmm15()),
             ],
             // The Vector Regclass is unused
             vec![],
@@ -1266,18 +1273,8 @@ fn create_reg_env_systemv(enable_pinned_reg: bool) -> MachineEnv {
                 preg(regs::r13()),
                 preg(regs::r14()),
             ],
-            // Non-preferred XMMs: the last 8 registers, which can have larger
-            // encodings with AVX instructions.
-            vec![
-                preg(regs::xmm8()),
-                preg(regs::xmm9()),
-                preg(regs::xmm10()),
-                preg(regs::xmm11()),
-                preg(regs::xmm12()),
-                preg(regs::xmm13()),
-                preg(regs::xmm14()),
-                preg(regs::xmm15()),
-            ],
+            // Non-preferred XMMs: none.
+            vec![],
             // The Vector Regclass is unused
             vec![],
         ],
diff --git a/cranelift/codegen/src/isa/x64/inst.isle b/cranelift/codegen/src/isa/x64/inst.isle
index e55867ab45ab..e9fb7779cadf 100644
--- a/cranelift/codegen/src/isa/x64/inst.isle
+++ b/cranelift/codegen/src/isa/x64/inst.isle
@@ -437,23 +437,6 @@
                  (dst WritableXmm)
                  (src_size OperandSize))
 
-       ;; Conversion from signed integers to floats, the `{v,}`cvtsi2s{s,d}`
-       ;; instructions.
-       ;;
-       ;; Note that this is special in that `src1` is an xmm/float register
-       ;; while `src2` is a general purpose register as this is converting an
-       ;; integer in a gpr to an equivalent float in an xmm reg.
-       (CvtIntToFloat (op SseOpcode)
-                      (src1 Xmm)
-                      (src2 GprMem)
-                      (dst WritableXmm)
-                      (src2_size OperandSize))
-       (CvtIntToFloatVex (op AvxOpcode)
-                         (src1 Xmm)
-                         (src2 GprMem)
-                         (dst WritableXmm)
-                         (src2_size OperandSize))
-
        ;; Converts an unsigned int64 to a float32/float64.
        (CvtUint64ToFloatSeq (dst_size OperandSize) ;; 4 or 8
                             (src Gpr)
@@ -728,6 +711,26 @@
 (type BoxCallInfo extern (enum))
 (type BoxReturnCallInfo extern (enum))
 
+(type BoxVecMachLabel extern (enum))
+
+(type MachLabelSlice extern (enum))
+
+;; The size of the jump table.
+(decl jump_table_size (BoxVecMachLabel) u32)
+(extern constructor jump_table_size jump_table_size)
+
+;; Extract a the target from a MachLabelSlice with exactly one target.
+(decl single_target (MachLabel) MachLabelSlice)
+(extern extractor single_target single_target)
+
+;; Extract a the targets from a MachLabelSlice with exactly two targets.
+(decl two_targets (MachLabel MachLabel) MachLabelSlice)
+(extern extractor two_targets two_targets)
+
+;; Extract the default target and jump table from a MachLabelSlice.
+(decl jump_table_targets (MachLabel BoxVecMachLabel) MachLabelSlice)
+(extern extractor jump_table_targets jump_table_targets)
+
 ;; Get the `OperandSize` for a given `Type`, rounding smaller types up to 32 bits.
 (decl operand_size_of_type_32_64 (Type) OperandSize)
 (extern constructor operand_size_of_type_32_64 operand_size_of_type_32_64)
@@ -1669,6 +1672,15 @@
 (decl xmi_imm (u32) XmmMemImm)
 (extern constructor xmi_imm xmi_imm)
 
+;;;; Helpers for Working With Integer Comparison Codes ;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+
+;; This is a direct import of `IntCC::without_equal`.
+;; Get the corresponding IntCC with the equal component removed.
+;; For conditions without a zero component, this is a no-op.
+(decl intcc_without_eq (IntCC) IntCC)
+(extern constructor intcc_without_eq intcc_without_eq)
+
 ;;;; Helpers for determining the register class of a value type ;;;;;;;;;;;;;;;;
 
 (type RegisterClass
@@ -2083,18 +2095,6 @@
             (_ Unit (emit (MInst.UnaryRmRImmVex size op src dst imm))))
         dst))
 
-(decl cvt_int_to_float (SseOpcode Xmm GprMem OperandSize) Xmm)
-(rule (cvt_int_to_float op src1 src2 size)
-      (let ((dst WritableXmm (temp_writable_xmm))
-            (_ Unit (emit (MInst.CvtIntToFloat op src1 src2 dst size))))
-        dst))
-
-(decl cvt_int_to_float_vex (AvxOpcode Xmm GprMem OperandSize) Xmm)
-(rule (cvt_int_to_float_vex op src1 src2 size)
-      (let ((dst WritableXmm (temp_writable_xmm))
-            (_ Unit (emit (MInst.CvtIntToFloatVex op src1 src2 dst size))))
-        dst))
-
 (decl cvt_u64_to_float_seq (Type Gpr) Xmm)
 (rule (cvt_u64_to_float_seq ty src)
       (let ((size OperandSize (raw_operand_size_of_type ty))
@@ -2163,7 +2163,7 @@
 ;; even not generate a zero-extended move in this case.
 (rule 1 (extend_to_gpr src @ (value_type $I32) $I64 (ExtendKind.Zero))
         (if-let $true (value32_zeros_upper32 src))
-        (add_range_fact src 64 0 0xffff_ffff))
+        src)
 
 (rule (extend_to_gpr (and val (value_type from_ty))
                      to_ty
@@ -4351,20 +4351,20 @@
         (xmm_unary_rm_r_vex (AvxOpcode.Vcvtdq2pd) x))
 
 ;; Helper for creating `cvtsi2ss` instructions.
-(decl x64_cvtsi2ss (Type Xmm GprMem) Xmm)
-(rule (x64_cvtsi2ss ty x y)
-      (cvt_int_to_float (SseOpcode.Cvtsi2ss) x y (raw_operand_size_of_type ty)))
-(rule 1 (x64_cvtsi2ss ty x y)
+(decl x64_cvtsi2ss (Type GprMem) Xmm)
+(rule (x64_cvtsi2ss ty x)
+      (gpr_to_xmm (SseOpcode.Cvtsi2ss) x (raw_operand_size_of_type ty)))
+(rule 1 (x64_cvtsi2ss ty x)
         (if-let $true (use_avx))
-        (cvt_int_to_float_vex (AvxOpcode.Vcvtsi2ss) x y (raw_operand_size_of_type ty)))
+        (gpr_to_xmm_vex (AvxOpcode.Vcvtsi2ss) x (raw_operand_size_of_type ty)))
 
 ;; Helper for creating `cvtsi2sd` instructions.
-(decl x64_cvtsi2sd (Type Xmm GprMem) Xmm)
-(rule (x64_cvtsi2sd ty x y)
-      (cvt_int_to_float (SseOpcode.Cvtsi2sd) x y (raw_operand_size_of_type ty)))
-(rule 1 (x64_cvtsi2sd ty x y)
+(decl x64_cvtsi2sd (Type GprMem) Xmm)
+(rule (x64_cvtsi2sd ty x)
+      (gpr_to_xmm (SseOpcode.Cvtsi2sd) x (raw_operand_size_of_type ty)))
+(rule 1 (x64_cvtsi2sd ty x)
         (if-let $true (use_avx))
-        (cvt_int_to_float_vex (AvxOpcode.Vcvtsi2sd) x y (raw_operand_size_of_type ty)))
+        (gpr_to_xmm_vex (AvxOpcode.Vcvtsi2sd) x (raw_operand_size_of_type ty)))
 
 ;; Helper for creating `cvttps2dq` instructions.
 (decl x64_cvttps2dq (XmmMem) Xmm)
diff --git a/cranelift/codegen/src/isa/x64/inst/args.rs b/cranelift/codegen/src/isa/x64/inst/args.rs
index d88f3a2ac16c..34ec6be1f186 100644
--- a/cranelift/codegen/src/isa/x64/inst/args.rs
+++ b/cranelift/codegen/src/isa/x64/inst/args.rs
@@ -3,7 +3,6 @@
 use super::regs::{self};
 use super::EmitState;
 use crate::ir::condcodes::{FloatCC, IntCC};
-use crate::ir::types::*;
 use crate::ir::{MemFlags, Type};
 use crate::isa::x64::inst::regs::pretty_print_reg;
 use crate::isa::x64::inst::Inst;
@@ -115,11 +114,6 @@ macro_rules! newtype_of_reg {
                     rm.0
                 }
             }
-            impl<'a> From<&'a $newtype_reg_mem> for &'a RegMem {
-                fn from(rm: &'a $newtype_reg_mem) -> &'a RegMem {
-                    &rm.0
-                }
-            }
 
             impl From<$newtype_reg> for $newtype_reg_mem {
                 fn from(r: $newtype_reg) -> Self {
@@ -181,11 +175,6 @@ macro_rules! newtype_of_reg {
                     rmi.0
                 }
             }
-            impl<'a> From<&'a $newtype_reg_mem_imm> for &'a RegMemImm {
-                fn from(rmi: &'a $newtype_reg_mem_imm) -> &'a RegMemImm {
-                    &rmi.0
-                }
-            }
 
             impl From<$newtype_reg> for $newtype_reg_mem_imm {
                 fn from(r: $newtype_reg) -> Self {
@@ -680,12 +669,6 @@ impl From<RegMem> for RegMemImm {
     }
 }
 
-impl From<Reg> for RegMemImm {
-    fn from(reg: Reg) -> Self {
-        RegMemImm::Reg { reg }
-    }
-}
-
 impl PrettyPrint for RegMemImm {
     fn pretty_print(&self, size: u8, allocs: &mut AllocationConsumer<'_>) -> String {
         match self {
@@ -1778,47 +1761,6 @@ impl AvxOpcode {
             }
         }
     }
-
-    /// Is the opcode known to be commutative?
-    ///
-    /// Note that this method is not exhaustive, and there may be commutative
-    /// opcodes that we don't recognize as commutative.
-    pub(crate) fn is_commutative(&self) -> bool {
-        match *self {
-            AvxOpcode::Vpaddb
-            | AvxOpcode::Vpaddw
-            | AvxOpcode::Vpaddd
-            | AvxOpcode::Vpaddq
-            | AvxOpcode::Vpaddsb
-            | AvxOpcode::Vpaddsw
-            | AvxOpcode::Vpaddusb
-            | AvxOpcode::Vpaddusw
-            | AvxOpcode::Vpand
-            | AvxOpcode::Vandps
-            | AvxOpcode::Vandpd
-            | AvxOpcode::Vpor
-            | AvxOpcode::Vorps
-            | AvxOpcode::Vorpd
-            | AvxOpcode::Vpxor
-            | AvxOpcode::Vxorps
-            | AvxOpcode::Vxorpd
-            | AvxOpcode::Vpmuldq
-            | AvxOpcode::Vpmuludq
-            | AvxOpcode::Vaddps
-            | AvxOpcode::Vaddpd
-            | AvxOpcode::Vmulps
-            | AvxOpcode::Vmulpd
-            | AvxOpcode::Vpcmpeqb
-            | AvxOpcode::Vpcmpeqw
-            | AvxOpcode::Vpcmpeqd
-            | AvxOpcode::Vpcmpeqq
-            | AvxOpcode::Vaddss
-            | AvxOpcode::Vaddsd
-            | AvxOpcode::Vmulss
-            | AvxOpcode::Vmulsd => true,
-            _ => false,
-        }
-    }
 }
 
 impl fmt::Display for AvxOpcode {
@@ -1941,15 +1883,6 @@ impl ExtMode {
             ExtMode::BQ | ExtMode::WQ | ExtMode::LQ => 8,
         }
     }
-
-    /// Source size, as an integer type.
-    pub(crate) fn src_type(&self) -> Type {
-        match self {
-            ExtMode::BL | ExtMode::BQ => I8,
-            ExtMode::WL | ExtMode::WQ => I16,
-            ExtMode::LQ => I32,
-        }
-    }
 }
 
 impl fmt::Debug for ExtMode {
@@ -2247,15 +2180,6 @@ impl OperandSize {
     pub(crate) fn to_bits(&self) -> u8 {
         self.to_bytes() * 8
     }
-
-    pub(crate) fn to_type(&self) -> Type {
-        match self {
-            Self::Size8 => I8,
-            Self::Size16 => I16,
-            Self::Size32 => I32,
-            Self::Size64 => I64,
-        }
-    }
 }
 
 /// An x64 memory fence kind.
diff --git a/cranelift/codegen/src/isa/x64/inst/emit.rs b/cranelift/codegen/src/isa/x64/inst/emit.rs
index 6bd65154eb23..853e24381a7c 100644
--- a/cranelift/codegen/src/isa/x64/inst/emit.rs
+++ b/cranelift/codegen/src/isa/x64/inst/emit.rs
@@ -32,14 +32,8 @@ fn emit_signed_cvt(
     } else {
         SseOpcode::Cvtsi2ss
     };
-    Inst::CvtIntToFloat {
-        op,
-        dst: Writable::from_reg(Xmm::new(dst.to_reg()).unwrap()),
-        src1: Xmm::new(dst.to_reg()).unwrap(),
-        src2: GprMem::new(RegMem::reg(src)).unwrap(),
-        src2_size: OperandSize::Size64,
-    }
-    .emit(&[], sink, info, state);
+    let inst = Inst::gpr_to_xmm(op, RegMem::reg(src), OperandSize::Size64, dst);
+    inst.emit(&[], sink, info, state);
 }
 
 /// Emits a one way conditional jump if CC is set (true).
@@ -2291,20 +2285,6 @@ pub(crate) fn emit(
             let src1 = allocs.next(src1.to_reg());
             let src2 = src2.clone().to_reg_mem_imm().with_allocs(allocs);
 
-            // When the opcode is commutative, src1 is xmm{0..7}, and src2 is
-            // xmm{8..15}, then we can swap the operands to save one byte on the
-            // instruction's encoding.
-            let (src1, src2) = match (src1, src2) {
-                (src1, RegMemImm::Reg { reg: src2 })
-                    if op.is_commutative()
-                        && src1.to_real_reg().unwrap().hw_enc() < 8
-                        && src2.to_real_reg().unwrap().hw_enc() >= 8 =>
-                {
-                    (src2, RegMemImm::Reg { reg: src1 })
-                }
-                (src1, src2) => (src1, src2),
-            };
-
             let src2 = match src2 {
                 // For opcodes where one of the operands is an immediate the
                 // encoding is a bit different, notably the usage of
@@ -2339,7 +2319,6 @@ pub(crate) fn emit(
                 }
                 RegMemImm::Mem { addr } => RegisterOrAmode::Amode(addr.finalize(state, sink)),
             };
-
             let (prefix, map, opcode) = match op {
                 AvxOpcode::Vminps => (LP::None, OM::_0F, 0x5D),
                 AvxOpcode::Vminpd => (LP::_66, OM::_0F, 0x5D),
@@ -2878,21 +2857,30 @@ pub(crate) fn emit(
             let (prefix, map, opcode) = match op {
                 // vmovd/vmovq are differentiated by `w`
                 AvxOpcode::Vmovd | AvxOpcode::Vmovq => (LegacyPrefixes::_66, OpcodeMap::_0F, 0x6E),
+                AvxOpcode::Vcvtsi2ss => (LegacyPrefixes::_F3, OpcodeMap::_0F, 0x2A),
+                AvxOpcode::Vcvtsi2sd => (LegacyPrefixes::_F2, OpcodeMap::_0F, 0x2A),
                 _ => unimplemented!("Opcode {:?} not implemented", op),
             };
             let w = match src_size {
                 OperandSize::Size64 => true,
                 _ => false,
             };
-            VexInstruction::new()
+            let mut insn = VexInstruction::new()
                 .length(VexVectorLength::V128)
                 .w(w)
                 .prefix(prefix)
                 .map(map)
                 .opcode(opcode)
                 .rm(src)
-                .reg(dst.to_real_reg().unwrap().hw_enc())
-                .encode(sink);
+                .reg(dst.to_real_reg().unwrap().hw_enc());
+            // These opcodes technically take a second operand which is the
+            // upper bits to preserve during the float conversion. We don't
+            // actually use this in this backend right now so reuse the
+            // destination register. This at least matches what LLVM does.
+            if let AvxOpcode::Vcvtsi2ss | AvxOpcode::Vcvtsi2sd = op {
+                insn = insn.vvvv(dst.to_real_reg().unwrap().hw_enc());
+            }
+            insn.encode(sink);
         }
 
         Inst::XmmRmREvex {
@@ -3197,6 +3185,8 @@ pub(crate) fn emit(
                 // Movd and movq use the same opcode; the presence of the REX prefix (set below)
                 // actually determines which is used.
                 SseOpcode::Movd | SseOpcode::Movq => (LegacyPrefixes::_66, 0x0F6E),
+                SseOpcode::Cvtsi2ss => (LegacyPrefixes::_F3, 0x0F2A),
+                SseOpcode::Cvtsi2sd => (LegacyPrefixes::_F2, 0x0F2A),
                 _ => panic!("unexpected opcode {:?}", op),
             };
             let rex = RexFlags::from(*src_size);
@@ -3234,72 +3224,6 @@ pub(crate) fn emit(
             }
         }
 
-        Inst::CvtIntToFloat {
-            op,
-            src1,
-            src2,
-            dst,
-            src2_size,
-        } => {
-            let src1 = allocs.next(src1.to_reg());
-            let dst = allocs.next(dst.to_reg().to_reg());
-            assert_eq!(src1, dst);
-            let src2 = src2.clone().to_reg_mem().with_allocs(allocs);
-
-            let (prefix, opcode) = match op {
-                SseOpcode::Cvtsi2ss => (LegacyPrefixes::_F3, 0x0F2A),
-                SseOpcode::Cvtsi2sd => (LegacyPrefixes::_F2, 0x0F2A),
-                _ => panic!("unexpected opcode {:?}", op),
-            };
-            let rex = RexFlags::from(*src2_size);
-            match src2 {
-                RegMem::Reg { reg: src2 } => {
-                    emit_std_reg_reg(sink, prefix, opcode, 2, dst, src2, rex);
-                }
-                RegMem::Mem { addr } => {
-                    let addr = &addr.finalize(state, sink);
-                    emit_std_reg_mem(sink, prefix, opcode, 2, dst, addr, rex, 0);
-                }
-            }
-        }
-
-        Inst::CvtIntToFloatVex {
-            op,
-            src1,
-            src2,
-            dst,
-            src2_size,
-        } => {
-            let dst = allocs.next(dst.to_reg().to_reg());
-            let src1 = allocs.next(src1.to_reg());
-            let src2 = match src2.clone().to_reg_mem().with_allocs(allocs) {
-                RegMem::Reg { reg } => {
-                    RegisterOrAmode::Register(reg.to_real_reg().unwrap().hw_enc().into())
-                }
-                RegMem::Mem { addr } => RegisterOrAmode::Amode(addr.finalize(state, sink)),
-            };
-
-            let (prefix, map, opcode) = match op {
-                AvxOpcode::Vcvtsi2ss => (LegacyPrefixes::_F3, OpcodeMap::_0F, 0x2A),
-                AvxOpcode::Vcvtsi2sd => (LegacyPrefixes::_F2, OpcodeMap::_0F, 0x2A),
-                _ => unimplemented!("Opcode {:?} not implemented", op),
-            };
-            let w = match src2_size {
-                OperandSize::Size64 => true,
-                _ => false,
-            };
-            VexInstruction::new()
-                .length(VexVectorLength::V128)
-                .w(w)
-                .prefix(prefix)
-                .map(map)
-                .opcode(opcode)
-                .rm(src2)
-                .reg(dst.to_real_reg().unwrap().hw_enc())
-                .vvvv(src1.to_real_reg().unwrap().hw_enc())
-                .encode(sink);
-        }
-
         Inst::CvtUint64ToFloatSeq {
             dst_size,
             src,
diff --git a/cranelift/codegen/src/isa/x64/inst/emit_tests.rs b/cranelift/codegen/src/isa/x64/inst/emit_tests.rs
index 147f61deb832..7144b0ab88de 100644
--- a/cranelift/codegen/src/isa/x64/inst/emit_tests.rs
+++ b/cranelift/codegen/src/isa/x64/inst/emit_tests.rs
@@ -13,7 +13,7 @@
 //!   -- isa::x64::inst::emit_tests::test_x64_emit
 
 use super::*;
-use crate::ir::{MemFlags, UserExternalNameRef};
+use crate::ir::UserExternalNameRef;
 use crate::isa::x64;
 use alloc::boxed::Box;
 use alloc::vec::Vec;
@@ -5051,6 +5051,26 @@ fn test_x64_emit() {
         "664C0F6EFF",
         "movq    %rdi, %xmm15",
     ));
+    insns.push((
+        Inst::gpr_to_xmm(
+            SseOpcode::Cvtsi2ss,
+            RegMem::reg(rdi),
+            OperandSize::Size32,
+            w_xmm15,
+        ),
+        "F3440F2AFF",
+        "cvtsi2ss %edi, %xmm15",
+    ));
+    insns.push((
+        Inst::gpr_to_xmm(
+            SseOpcode::Cvtsi2sd,
+            RegMem::reg(rsi),
+            OperandSize::Size64,
+            w_xmm1,
+        ),
+        "F2480F2ACE",
+        "cvtsi2sd %rsi, %xmm1",
+    ));
 
     // ========================================================
     // XmmRmi
@@ -5139,77 +5159,6 @@ fn test_x64_emit() {
         "roundpd $0, %xmm15, %xmm15",
     ));
 
-    // ========================================================
-    // XmmRmiRVex
-
-    // Standard instruction w/ XmmMemImm::Reg operand.
-    insns.push((
-        Inst::XmmRmiRVex {
-            op: AvxOpcode::Vpmaxub,
-            dst: Writable::from_reg(Xmm::new(xmm13).unwrap()),
-            src1: Xmm::new(xmm1).unwrap(),
-            src2: XmmMemImm::new(xmm12.into()).unwrap(),
-        },
-        "C44171DEEC",
-        "vpmaxub %xmm1, %xmm12, %xmm13",
-    ));
-
-    // Standard instruction w/ XmmMemImm::Mem operand.
-    insns.push((
-        Inst::XmmRmiRVex {
-            op: AvxOpcode::Vpmaxub,
-            dst: Writable::from_reg(Xmm::new(xmm13).unwrap()),
-            src1: Xmm::new(xmm1).unwrap(),
-            src2: XmmMemImm::new(RegMemImm::Mem {
-                addr: Amode::ImmReg {
-                    simm32: 10,
-                    base: rax,
-                    flags: MemFlags::trusted(),
-                }
-                .into(),
-            })
-            .unwrap(),
-        },
-        "C571DE680A",
-        "vpmaxub %xmm1, 10(%rax), %xmm13",
-    ));
-
-    // When there's an immediate.
-    insns.push((
-        Inst::XmmRmiRVex {
-            op: AvxOpcode::Vpsrlw,
-            dst: Writable::from_reg(Xmm::new(xmm13).unwrap()),
-            src1: Xmm::new(xmm1).unwrap(),
-            src2: XmmMemImm::new(RegMemImm::Imm { simm32: 36 }).unwrap(),
-        },
-        "C59171D124",
-        "vpsrlw  %xmm1, $36, %xmm13",
-    ));
-
-    // Certain commutative ops get their operands swapped to avoid relying on an
-    // extra prefix byte, when possible. Note that these two instructions encode
-    // to the same bytes, and are 4-byte encodings rather than 5-byte encodings.
-    insns.push((
-        Inst::XmmRmiRVex {
-            op: AvxOpcode::Vmulsd,
-            dst: Writable::from_reg(Xmm::new(xmm13).unwrap()),
-            src1: Xmm::new(xmm1).unwrap(),
-            src2: XmmMemImm::new(xmm12.into()).unwrap(),
-        },
-        "C51B59E9",
-        "vmulsd  %xmm1, %xmm12, %xmm13",
-    ));
-    insns.push((
-        Inst::XmmRmiRVex {
-            op: AvxOpcode::Vmulsd,
-            dst: Writable::from_reg(Xmm::new(xmm13).unwrap()),
-            src1: Xmm::new(xmm12).unwrap(),
-            src2: XmmMemImm::new(xmm1.into()).unwrap(),
-        },
-        "C51B59E9",
-        "vmulsd  %xmm12, %xmm1, %xmm13",
-    ));
-
     // ========================================================
     // XmmRmRImmVex
     insns.push((
diff --git a/cranelift/codegen/src/isa/x64/inst/mod.rs b/cranelift/codegen/src/isa/x64/inst/mod.rs
index 19bda166c19f..ca72a434bb87 100644
--- a/cranelift/codegen/src/isa/x64/inst/mod.rs
+++ b/cranelift/codegen/src/isa/x64/inst/mod.rs
@@ -178,8 +178,7 @@ impl Inst {
             | Inst::XmmToGprImm { op, .. }
             | Inst::XmmUnaryRmRImm { op, .. }
             | Inst::XmmUnaryRmRUnaligned { op, .. }
-            | Inst::XmmUnaryRmR { op, .. }
-            | Inst::CvtIntToFloat { op, .. } => smallvec![op.available_from()],
+            | Inst::XmmUnaryRmR { op, .. } => smallvec![op.available_from()],
 
             Inst::XmmUnaryRmREvex { op, .. }
             | Inst::XmmRmREvex { op, .. }
@@ -197,8 +196,7 @@ impl Inst {
             | Inst::XmmMovRMImmVex { op, .. }
             | Inst::XmmToGprImmVex { op, .. }
             | Inst::XmmToGprVex { op, .. }
-            | Inst::GprToXmmVex { op, .. }
-            | Inst::CvtIntToFloatVex { op, .. } => op.available_from(),
+            | Inst::GprToXmmVex { op, .. } => op.available_from(),
         }
     }
 }
@@ -1298,34 +1296,6 @@ impl PrettyPrint for Inst {
                 format!("{op} {src}, {dst}")
             }
 
-            Inst::CvtIntToFloat {
-                op,
-                src1,
-                src2,
-                dst,
-                src2_size,
-            } => {
-                let src1 = pretty_print_reg(src1.to_reg(), 8, allocs);
-                let dst = pretty_print_reg(*dst.to_reg(), 8, allocs);
-                let src2 = src2.pretty_print(src2_size.to_bytes(), allocs);
-                let op = ljustify(op.to_string());
-                format!("{op} {src1}, {src2}, {dst}")
-            }
-
-            Inst::CvtIntToFloatVex {
-                op,
-                src1,
-                src2,
-                dst,
-                src2_size,
-            } => {
-                let dst = pretty_print_reg(*dst.to_reg(), 8, allocs);
-                let src1 = pretty_print_reg(src1.to_reg(), 8, allocs);
-                let src2 = src2.pretty_print(src2_size.to_bytes(), allocs);
-                let op = ljustify(op.to_string());
-                format!("{op} {src1}, {src2}, {dst}")
-            }
-
             Inst::CvtUint64ToFloatSeq {
                 src,
                 dst,
@@ -2194,20 +2164,6 @@ fn x64_get_operands<F: Fn(VReg) -> VReg>(inst: &Inst, collector: &mut OperandCol
             collector.reg_def(dst.to_writable_reg());
             src.get_operands(collector);
         }
-        Inst::CvtIntToFloat {
-            src1, src2, dst, ..
-        } => {
-            collector.reg_use(src1.to_reg());
-            collector.reg_reuse_def(dst.to_writable_reg(), 0);
-            src2.get_operands(collector);
-        }
-        Inst::CvtIntToFloatVex {
-            src1, src2, dst, ..
-        } => {
-            collector.reg_def(dst.to_writable_reg());
-            collector.reg_use(src1.to_reg());
-            src2.get_operands(collector);
-        }
         Inst::CvtUint64ToFloatSeq {
             src,
             dst,
@@ -2584,10 +2540,6 @@ impl MachInst for Inst {
         }
     }
 
-    fn is_mem_access(&self) -> bool {
-        panic!("TODO FILL ME OUT")
-    }
-
     fn gen_move(dst_reg: Writable<Reg>, src_reg: Reg, ty: Type) -> Inst {
         trace!(
             "Inst::gen_move {:?} -> {:?} (type: {:?})",
diff --git a/cranelift/codegen/src/isa/x64/lower.isle b/cranelift/codegen/src/isa/x64/lower.isle
index e0d17fe627a4..69e9f229f15c 100644
--- a/cranelift/codegen/src/isa/x64/lower.isle
+++ b/cranelift/codegen/src/isa/x64/lower.isle
@@ -1265,27 +1265,6 @@
             (cmove ConsumesFlags (cmove ty (CC.S) src neg_result)))
         (with_flags_reg (produces_flags_ignore neg) cmove)))
 
-;; `i128`. Negate the low bits, `adc` to the higher bits, then negate high bits.
-(rule (lower (has_type $I128 (iabs x)))
-      ;; Get the high/low registers for `x`.
-      (let ((x_regs ValueRegs x)
-            (x_lo Gpr (value_regs_get_gpr x_regs 0))
-            (x_hi Gpr (value_regs_get_gpr x_regs 1))
-            ; negate low bits, then add 0 with carry to high bits.
-            (neg_lo ProducesFlags (x64_neg_paired $I64 x_lo))
-            (adc_hi ConsumesFlags (x64_adc_paired $I64 x_hi (imm $I64 0)))
-            (neg_adc_vals ValueRegs (with_flags neg_lo adc_hi))
-            ; negate high bits.
-            (neg_hi ProducesFlags (x64_neg_paired $I64 (value_regs_get neg_adc_vals 1)))
-            (neg_hi_flag_only ProducesFlags (produces_flags_ignore neg_hi))
-            ; cmove based on sign flag from hi negation.
-            (cmove_lo ConsumesFlags (cmove $I64 (CC.S) x_lo
-                                     (value_regs_get neg_adc_vals 0)))
-            (cmove_hi ConsumesFlags (cmove $I64 (CC.S) x_hi
-                                     (produces_flags_get_reg neg_hi)))
-            (cmoves ConsumesFlags (consumes_flags_concat cmove_lo cmove_hi)))
-        (with_flags neg_hi_flag_only cmoves)))
-
 ;;;; Rules for `fabs` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (rule (lower (has_type $F32 (fabs x)))
@@ -2082,7 +2061,8 @@
 ;; than one instruction for certain types (e.g., XMM-held, I128).
 
 (rule (lower (has_type ty (select (maybe_uextend (icmp cc a @ (value_type (fits_in_64 a_ty)) b)) x y)))
-      (lower_select_icmp ty (emit_cmp cc a b) x y))
+      (let ((size OperandSize (raw_operand_size_of_type a_ty)))
+           (with_flags (x64_cmp size b a) (cmove_from_values ty cc x y))))
 
 ;; Finally, we lower `select` from a condition value `c`. These rules are meant
 ;; to be the final, default lowerings if no other patterns matched above.
@@ -2098,10 +2078,6 @@
       (let ((cond_result IcmpCondResult (cmp_zero_i128 (CC.Z) c)))
         (select_icmp cond_result x y)))
 
-(decl lower_select_icmp (Type IcmpCondResult Value Value) InstOutput)
-(rule (lower_select_icmp ty (IcmpCondResult.Condition flags cc) x y)
-      (with_flags flags (cmove_from_values ty cc x y)))
-
 ;; Specializations for floating-point compares to generate a `mins*` or a
 ;; `maxs*` instruction. These are equivalent to the "pseudo-m{in,ax}"
 ;; specializations for vectors.
@@ -3360,40 +3336,23 @@
 
 ;; Rules for `fcvt_from_sint` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;; Note that the `cvtsi2s{s,d}` instruction is not just an int-to-float
-;; conversion instruction in isolation, it also takes the upper 64-bits of an
-;; xmm register and places it into the destination. We don't actually want that
-;; to happen as it could accidentally create a false dependency with a
-;; previous instruction defining the register's upper 64-bits. See #7085 for
-;; an instance of this.
-;;
-;; This means that the first operand to all of the int-to-float conversions here
-;; are `(xmm_zero)` operands which is a guaranteed zero register that has no
-;; dependencies on other instructions.
-;;
-;; Ideally this would be lifted out to a higher level to get deduplicated
-;; between consecutive int-to-float operations but that's not easy
-;; to do at this time. One possibility would be a mid-end rule which rewrites
-;; `fcvt_from_sint` to an x86-specific opcode using a zero constant which would
-;; be subject to normal LICM, but that's not feasible today.
-
 (rule 2 (lower (has_type $F32 (fcvt_from_sint a @ (value_type $I8))))
-      (x64_cvtsi2ss $I32 (xmm_zero $F32X4) (extend_to_gpr a $I32 (ExtendKind.Sign))))
+      (x64_cvtsi2ss $I32 (extend_to_gpr a $I32 (ExtendKind.Sign))))
 
 (rule 2 (lower (has_type $F32 (fcvt_from_sint a @ (value_type $I16))))
-      (x64_cvtsi2ss $I32 (xmm_zero $F32X4) (extend_to_gpr a $I32 (ExtendKind.Sign))))
+      (x64_cvtsi2ss $I32 (extend_to_gpr a $I32 (ExtendKind.Sign))))
 
 (rule 1 (lower (has_type $F32 (fcvt_from_sint a @ (value_type (ty_int (fits_in_64 ty))))))
-      (x64_cvtsi2ss ty (xmm_zero $F32X4) a))
+      (x64_cvtsi2ss ty a))
 
 (rule 2 (lower (has_type $F64 (fcvt_from_sint a @ (value_type $I8))))
-      (x64_cvtsi2sd $I32 (xmm_zero $F64X2) (extend_to_gpr a $I32 (ExtendKind.Sign))))
+      (x64_cvtsi2sd $I32 (extend_to_gpr a $I32 (ExtendKind.Sign))))
 
 (rule 2 (lower (has_type $F64 (fcvt_from_sint a @ (value_type $I16))))
-      (x64_cvtsi2sd $I32 (xmm_zero $F64X2) (extend_to_gpr a $I32 (ExtendKind.Sign))))
+      (x64_cvtsi2sd $I32 (extend_to_gpr a $I32 (ExtendKind.Sign))))
 
 (rule 1 (lower (has_type $F64 (fcvt_from_sint a @ (value_type (ty_int (fits_in_64 ty))))))
-      (x64_cvtsi2sd ty (xmm_zero $F64X2) a))
+      (x64_cvtsi2sd ty a))
 
 (rule 0 (lower (fcvt_from_sint a @ (value_type $I32X4)))
       (x64_cvtdq2ps a))
@@ -3404,10 +3363,10 @@
 ;; Rules for `fcvt_from_uint` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (rule 1 (lower (has_type $F32 (fcvt_from_uint val @ (value_type (fits_in_32 (ty_int ty))))))
-      (x64_cvtsi2ss $I64 (xmm_zero $F32X4) (extend_to_gpr val $I64 (ExtendKind.Zero))))
+      (x64_cvtsi2ss $I64 (extend_to_gpr val $I64 (ExtendKind.Zero))))
 
 (rule 1 (lower (has_type $F64 (fcvt_from_uint val @ (value_type (fits_in_32 (ty_int ty))))))
-      (x64_cvtsi2sd $I64 (xmm_zero $F64X2) (extend_to_gpr val $I64 (ExtendKind.Zero))))
+      (x64_cvtsi2sd $I64 (extend_to_gpr val $I64 (ExtendKind.Zero))))
 
 (rule (lower (has_type ty (fcvt_from_uint val @ (value_type $I64))))
       (cvt_u64_to_float_seq ty val))
diff --git a/cranelift/codegen/src/isa/x64/lower.rs b/cranelift/codegen/src/isa/x64/lower.rs
index 6b071c48ce34..c76a57f7c3fc 100644
--- a/cranelift/codegen/src/isa/x64/lower.rs
+++ b/cranelift/codegen/src/isa/x64/lower.rs
@@ -3,12 +3,10 @@
 // ISLE integration glue.
 pub(super) mod isle;
 
-use crate::ir::pcc::{FactContext, PccResult};
 use crate::ir::{types, ExternalName, Inst as IRInst, LibCall, Opcode, Type};
 use crate::isa::x64::abi::*;
 use crate::isa::x64::inst::args::*;
 use crate::isa::x64::inst::*;
-use crate::isa::x64::pcc;
 use crate::isa::{x64::X64Backend, CallConv};
 use crate::machinst::abi::SmallInstVec;
 use crate::machinst::lower::*;
@@ -339,13 +337,4 @@ impl LowerBackend for X64Backend {
     fn maybe_pinned_reg(&self) -> Option<Reg> {
         Some(regs::pinned_reg())
     }
-
-    fn check_fact(
-        &self,
-        ctx: &FactContext<'_>,
-        vcode: &mut VCode<Self::MInst>,
-        inst: InsnIndex,
-    ) -> PccResult<()> {
-        pcc::check(ctx, vcode, inst)
-    }
 }
diff --git a/cranelift/codegen/src/isa/x64/lower/isle.rs b/cranelift/codegen/src/isa/x64/lower/isle.rs
index 5908ad58aa61..000edbe3f490 100644
--- a/cranelift/codegen/src/isa/x64/lower/isle.rs
+++ b/cranelift/codegen/src/isa/x64/lower/isle.rs
@@ -36,11 +36,14 @@ use crate::{
 };
 use alloc::vec::Vec;
 use regalloc2::PReg;
+use smallvec::SmallVec;
 use std::boxed::Box;
 use std::convert::TryFrom;
 
 type BoxCallInfo = Box<CallInfo>;
 type BoxReturnCallInfo = Box<ReturnCallInfo>;
+type BoxVecMachLabel = Box<SmallVec<[MachLabel; 4]>>;
+type MachLabelSlice = [MachLabel];
 type VecArgPair = Vec<ArgPair>;
 
 pub struct SinkableLoad {
@@ -623,6 +626,11 @@ impl Context for IsleContext<'_, '_, MInst, X64Backend> {
         }
     }
 
+    #[inline]
+    fn intcc_without_eq(&mut self, x: &IntCC) -> IntCC {
+        x.without_equal()
+    }
+
     #[inline]
     fn intcc_to_cc(&mut self, intcc: &IntCC) -> CC {
         CC::from_intcc(*intcc)
@@ -748,6 +756,43 @@ impl Context for IsleContext<'_, '_, MInst, X64Backend> {
         output_reg.to_reg()
     }
 
+    #[inline]
+    fn single_target(&mut self, targets: &MachLabelSlice) -> Option<MachLabel> {
+        if targets.len() == 1 {
+            Some(targets[0])
+        } else {
+            None
+        }
+    }
+
+    #[inline]
+    fn two_targets(&mut self, targets: &MachLabelSlice) -> Option<(MachLabel, MachLabel)> {
+        if targets.len() == 2 {
+            Some((targets[0], targets[1]))
+        } else {
+            None
+        }
+    }
+
+    #[inline]
+    fn jump_table_targets(
+        &mut self,
+        targets: &MachLabelSlice,
+    ) -> Option<(MachLabel, BoxVecMachLabel)> {
+        if targets.is_empty() {
+            return None;
+        }
+
+        let default_label = targets[0];
+        let jt_targets = Box::new(SmallVec::from(&targets[1..]));
+        Some((default_label, jt_targets))
+    }
+
+    #[inline]
+    fn jump_table_size(&mut self, targets: &BoxVecMachLabel) -> u32 {
+        targets.len() as u32
+    }
+
     #[inline]
     fn vconst_all_ones_or_all_zeros(&mut self, constant: Constant) -> Option<()> {
         let const_data = self.lower_ctx.get_constant_data(constant);
diff --git a/cranelift/codegen/src/isa/x64/mod.rs b/cranelift/codegen/src/isa/x64/mod.rs
index 38a9c668c9d3..75fbe2980abb 100644
--- a/cranelift/codegen/src/isa/x64/mod.rs
+++ b/cranelift/codegen/src/isa/x64/mod.rs
@@ -24,7 +24,6 @@ mod abi;
 pub mod encoding;
 mod inst;
 mod lower;
-mod pcc;
 pub mod settings;
 
 /// An X64 backend.
diff --git a/cranelift/codegen/src/isa/x64/pcc.rs b/cranelift/codegen/src/isa/x64/pcc.rs
deleted file mode 100644
index 3991186c524a..000000000000
--- a/cranelift/codegen/src/isa/x64/pcc.rs
+++ /dev/null
@@ -1,816 +0,0 @@
-//! Proof-carrying-code validation for x64 VCode.
-
-use crate::ir::pcc::*;
-use crate::ir::types::*;
-use crate::ir::Type;
-use crate::isa::x64::inst::args::{
-    AluRmiROpcode, Amode, Gpr, Imm8Reg, RegMem, RegMemImm, ShiftKind, SyntheticAmode, ToWritableReg,
-};
-use crate::isa::x64::inst::Inst;
-use crate::machinst::pcc::*;
-use crate::machinst::{InsnIndex, VCode};
-use crate::machinst::{Reg, Writable};
-use crate::trace;
-
-fn undefined_result(
-    ctx: &FactContext,
-    vcode: &mut VCode<Inst>,
-    dst: Writable<Gpr>,
-    reg_bits: u16,
-    result_bits: u16,
-) -> PccResult<()> {
-    check_output(ctx, vcode, dst.to_writable_reg(), &[], |_vcode| {
-        clamp_range(ctx, reg_bits, result_bits, None)
-    })
-}
-
-fn ensure_no_fact(vcode: &VCode<Inst>, reg: Reg) -> PccResult<()> {
-    if vcode.vreg_fact(reg.into()).is_some() {
-        Err(PccError::UnsupportedFact)
-    } else {
-        Ok(())
-    }
-}
-
-pub(crate) fn check(
-    ctx: &FactContext,
-    vcode: &mut VCode<Inst>,
-    inst_idx: InsnIndex,
-) -> PccResult<()> {
-    trace!("Checking facts on inst: {:?}", vcode[inst_idx]);
-
-    match vcode[inst_idx] {
-        Inst::Nop { .. } => Ok(()),
-
-        Inst::Args { .. } => {
-            // Defs on the args have "axiomatic facts": we trust the
-            // ABI code to pass through the values unharmed, so the
-            // facts given to us in the CLIF should still be true.
-            Ok(())
-        }
-
-        Inst::AluRmiR {
-            size,
-            op: AluRmiROpcode::Add,
-            src1,
-            ref src2,
-            dst,
-        } => match *<&RegMemImm>::from(src2) {
-            RegMemImm::Reg { reg: src2 } => {
-                let bits = size.to_bits().into();
-                check_binop(
-                    ctx,
-                    vcode,
-                    64,
-                    dst.to_writable_reg(),
-                    src1.to_reg(),
-                    src2,
-                    |src1, src2| clamp_range(ctx, 64, bits, ctx.add(src1, src2, bits)),
-                )
-            }
-            RegMemImm::Imm { simm32 } => {
-                let bits = size.to_bits().into();
-                check_unop(
-                    ctx,
-                    vcode,
-                    64,
-                    dst.to_writable_reg(),
-                    src1.to_reg(),
-                    |src1| {
-                        let simm32: i64 = simm32.into();
-                        clamp_range(ctx, 64, bits, ctx.offset(src1, bits, simm32))
-                    },
-                )
-            }
-            RegMemImm::Mem { ref addr } => {
-                let bits: u16 = size.to_bits().into();
-                let loaded = check_load(ctx, None, addr, vcode, size.to_type(), bits)?;
-                check_unop(ctx, vcode, 64, dst.to_writable_reg(), src1.into(), |src1| {
-                    let sum = loaded.and_then(|loaded| ctx.add(src1, &loaded, bits));
-                    clamp_range(ctx, 64, bits, sum)
-                })
-            }
-        },
-
-        Inst::AluRmiR {
-            size,
-            op: AluRmiROpcode::Sub,
-            src1,
-            ref src2,
-            dst,
-        } => match *<&RegMemImm>::from(src2) {
-            RegMemImm::Imm { simm32 } => {
-                let bits = size.to_bits().into();
-                check_unop(
-                    ctx,
-                    vcode,
-                    64,
-                    dst.to_writable_reg(),
-                    src1.to_reg(),
-                    |src1| {
-                        let simm32: i64 = simm32.into();
-                        clamp_range(ctx, 64, bits, ctx.offset(src1, bits, -simm32))
-                    },
-                )
-            }
-            RegMemImm::Reg { .. } => {
-                let bits: u16 = size.to_bits().into();
-                check_output(ctx, vcode, dst.to_writable_reg(), &[], |_vcode| {
-                    clamp_range(ctx, 64, bits, None)
-                })
-            }
-            RegMemImm::Mem { ref addr } => {
-                let loaded = check_load(ctx, None, addr, vcode, size.to_type(), 64)?;
-                check_output(ctx, vcode, dst.to_writable_reg(), &[], |_vcode| {
-                    clamp_range(ctx, 64, size.to_bits().into(), loaded)
-                })
-            }
-        },
-
-        Inst::AluRmiR {
-            size,
-            ref src2,
-            dst,
-            ..
-        } => match <&RegMemImm>::from(src2) {
-            RegMemImm::Mem { ref addr } => {
-                let loaded = check_load(ctx, None, addr, vcode, size.to_type(), 64)?;
-                check_output(ctx, vcode, dst.to_writable_reg(), &[], |_vcode| {
-                    clamp_range(ctx, 64, size.to_bits().into(), loaded)
-                })
-            }
-            RegMemImm::Reg { .. } | RegMemImm::Imm { .. } => {
-                undefined_result(ctx, vcode, dst, 64, size.to_bits().into())
-            }
-        },
-
-        Inst::AluRM {
-            size,
-            op: _,
-            ref src1_dst,
-            src2: _,
-        } => {
-            check_load(ctx, None, src1_dst, vcode, size.to_type(), 64)?;
-            check_store(ctx, None, src1_dst, vcode, size.to_type())
-        }
-
-        Inst::AluRmRVex {
-            size,
-            ref src2,
-            dst,
-            ..
-        } => match <&RegMem>::from(src2) {
-            RegMem::Mem { ref addr } => {
-                let loaded = check_load(ctx, None, addr, vcode, size.to_type(), 64)?;
-                check_output(ctx, vcode, dst.to_writable_reg(), &[], |_vcode| {
-                    clamp_range(ctx, 64, size.to_bits().into(), loaded)
-                })
-            }
-            RegMem::Reg { .. } => undefined_result(ctx, vcode, dst, 64, size.to_bits().into()),
-        },
-
-        Inst::AluConstOp {
-            op: AluRmiROpcode::Xor,
-            dst,
-            ..
-        } => check_output(ctx, vcode, dst.to_writable_reg(), &[], |_vcode| {
-            Ok(Fact::constant(64, 0))
-        }),
-
-        Inst::AluConstOp { dst, .. } => undefined_result(ctx, vcode, dst, 64, 64),
-
-        Inst::UnaryRmR {
-            size, ref src, dst, ..
-        }
-        | Inst::UnaryRmRVex {
-            size, ref src, dst, ..
-        }
-        | Inst::UnaryRmRImmVex {
-            size, ref src, dst, ..
-        } => match <&RegMem>::from(src) {
-            RegMem::Mem { ref addr } => {
-                check_load(ctx, None, addr, vcode, size.to_type(), 64)?;
-                check_output(ctx, vcode, dst.to_writable_reg(), &[], |_vcode| {
-                    clamp_range(ctx, 64, size.to_bits().into(), None)
-                })
-            }
-            RegMem::Reg { .. } => undefined_result(ctx, vcode, dst, 64, size.to_bits().into()),
-        },
-
-        Inst::Not { size, dst, .. } | Inst::Neg { size, dst, .. } => {
-            undefined_result(ctx, vcode, dst, 64, size.to_bits().into())
-        }
-
-        Inst::Div {
-            size,
-            ref divisor,
-            dst_quotient,
-            dst_remainder,
-            ..
-        } => {
-            match <&RegMem>::from(divisor) {
-                RegMem::Mem { ref addr } => {
-                    check_load(ctx, None, addr, vcode, size.to_type(), 64)?;
-                }
-                RegMem::Reg { .. } => {}
-            }
-            undefined_result(ctx, vcode, dst_quotient, 64, 64)?;
-            undefined_result(ctx, vcode, dst_remainder, 64, 64)?;
-            Ok(())
-        }
-        Inst::Div8 {
-            dst, ref divisor, ..
-        } => {
-            match <&RegMem>::from(divisor) {
-                RegMem::Mem { ref addr } => {
-                    check_load(ctx, None, addr, vcode, I8, 64)?;
-                }
-                RegMem::Reg { .. } => {}
-            }
-            // 64-bit result width because result may be negative
-            // hence high bits set.
-            undefined_result(ctx, vcode, dst, 64, 64)?;
-            Ok(())
-        }
-        Inst::MulHi {
-            size,
-            dst_lo,
-            dst_hi,
-            ref src2,
-            ..
-        } => {
-            match <&RegMem>::from(src2) {
-                RegMem::Mem { ref addr } => {
-                    check_load(ctx, None, addr, vcode, size.to_type(), 64)?;
-                }
-                RegMem::Reg { .. } => {}
-            }
-            undefined_result(ctx, vcode, dst_lo, 64, 64)?;
-            undefined_result(ctx, vcode, dst_hi, 64, 64)?;
-            Ok(())
-        }
-        Inst::UMulLo {
-            size,
-            dst,
-            ref src2,
-            ..
-        } => {
-            match <&RegMem>::from(src2) {
-                RegMem::Mem { ref addr } => {
-                    check_load(ctx, None, addr, vcode, size.to_type(), 64)?;
-                }
-                RegMem::Reg { .. } => {}
-            }
-            undefined_result(ctx, vcode, dst, 64, 64)?;
-            Ok(())
-        }
-
-        Inst::CheckedSRemSeq {
-            dst_quotient,
-            dst_remainder,
-            ..
-        } => {
-            undefined_result(ctx, vcode, dst_quotient, 64, 64)?;
-            undefined_result(ctx, vcode, dst_remainder, 64, 64)?;
-            Ok(())
-        }
-
-        Inst::CheckedSRemSeq8 { dst, .. } => undefined_result(ctx, vcode, dst, 64, 64),
-
-        Inst::SignExtendData { dst, .. } => undefined_result(ctx, vcode, dst, 64, 64),
-
-        Inst::Imm { simm64, dst, .. } => {
-            check_output(ctx, vcode, dst.to_writable_reg(), &[], |_vcode| {
-                Ok(Fact::constant(64, simm64))
-            })
-        }
-
-        Inst::MovRR { size, dst, .. } => {
-            undefined_result(ctx, vcode, dst, 64, size.to_bits().into())
-        }
-
-        Inst::MovFromPReg { dst, .. } => undefined_result(ctx, vcode, dst, 64, 64),
-        Inst::MovToPReg { .. } => Ok(()),
-
-        Inst::MovzxRmR {
-            ref ext_mode,
-            ref src,
-            dst,
-        } => {
-            let from_bytes: u16 = ext_mode.src_size().into();
-            let to_bytes: u16 = ext_mode.dst_size().into();
-            match <&RegMem>::from(src) {
-                RegMem::Reg { reg } => {
-                    check_unop(ctx, vcode, 64, dst.to_writable_reg(), *reg, |src| {
-                        let extended = ctx.uextend(src, from_bytes * 8, to_bytes * 8);
-                        clamp_range(ctx, 64, from_bytes * 8, extended)
-                    })
-                }
-                RegMem::Mem { ref addr } => {
-                    let loaded = check_load(
-                        ctx,
-                        Some(dst.to_writable_reg()),
-                        addr,
-                        vcode,
-                        ext_mode.src_type(),
-                        64,
-                    )?;
-                    check_output(ctx, vcode, dst.to_writable_reg(), &[], |_vcode| {
-                        let extended = loaded
-                            .and_then(|loaded| ctx.uextend(&loaded, from_bytes * 8, to_bytes * 8));
-                        clamp_range(ctx, 64, from_bytes * 8, extended)
-                    })
-                }
-            }
-        }
-
-        Inst::Mov64MR { ref src, dst } => {
-            check_load(ctx, Some(dst.to_writable_reg()), src, vcode, I64, 64)?;
-            Ok(())
-        }
-
-        Inst::LoadEffectiveAddress {
-            ref addr,
-            dst,
-            size,
-        } => {
-            let addr = addr.clone();
-            let bits: u16 = size.to_bits().into();
-            check_output(ctx, vcode, dst.to_writable_reg(), &[], |vcode| {
-                clamp_range(ctx, 64, bits, compute_addr(ctx, vcode, &addr, bits))
-            })
-        }
-
-        Inst::MovsxRmR {
-            ref ext_mode,
-            ref src,
-            dst,
-        } => {
-            match <&RegMem>::from(src) {
-                RegMem::Mem { ref addr } => {
-                    check_load(ctx, None, addr, vcode, ext_mode.src_type(), 64)?;
-                }
-                RegMem::Reg { .. } => {}
-            }
-            undefined_result(ctx, vcode, dst, 64, 64)
-        }
-
-        Inst::MovImmM { size, ref dst, .. } => check_store(ctx, None, dst, vcode, size.to_type()),
-
-        Inst::MovRM { size, src, ref dst } => {
-            check_store(ctx, Some(src.to_reg()), dst, vcode, size.to_type())
-        }
-
-        Inst::ShiftR {
-            size,
-            kind: ShiftKind::ShiftLeft,
-            src,
-            ref num_bits,
-            dst,
-        } => match num_bits.clone().to_imm8_reg() {
-            Imm8Reg::Imm8 { imm } => {
-                check_unop(ctx, vcode, 64, dst.to_writable_reg(), src.to_reg(), |src| {
-                    clamp_range(
-                        ctx,
-                        64,
-                        size.to_bits().into(),
-                        ctx.shl(src, size.to_bits().into(), imm.into()),
-                    )
-                })
-            }
-            Imm8Reg::Reg { .. } => undefined_result(ctx, vcode, dst, 64, 64),
-        },
-
-        Inst::ShiftR { size, dst, .. } => {
-            undefined_result(ctx, vcode, dst, 64, size.to_bits().into())
-        }
-
-        Inst::XmmRmiReg { dst, ref src2, .. } => {
-            match <&RegMemImm>::from(src2) {
-                RegMemImm::Mem { ref addr } => {
-                    check_load(ctx, None, addr, vcode, I8X16, 128)?;
-                }
-                _ => {}
-            }
-            ensure_no_fact(vcode, dst.to_writable_reg().to_reg())
-        }
-
-        Inst::CmpRmiR { size, ref src, .. } => match <&RegMemImm>::from(src) {
-            RegMemImm::Mem { ref addr } => {
-                check_load(ctx, None, addr, vcode, size.to_type(), 64)?;
-                Ok(())
-            }
-            RegMemImm::Reg { .. } | RegMemImm::Imm { .. } => Ok(()),
-        },
-
-        Inst::Setcc { dst, .. } => undefined_result(ctx, vcode, dst, 64, 64),
-
-        Inst::Bswap { dst, .. } => undefined_result(ctx, vcode, dst, 64, 64),
-
-        Inst::Cmove {
-            size,
-            dst,
-            ref consequent,
-            ..
-        } => {
-            match <&RegMem>::from(consequent) {
-                RegMem::Mem { ref addr } => {
-                    check_load(ctx, None, addr, vcode, size.to_type(), 64)?;
-                }
-                RegMem::Reg { .. } => {}
-            }
-            undefined_result(ctx, vcode, dst, 64, 64)
-        }
-
-        Inst::XmmCmove {
-            dst,
-            ref consequent,
-            ..
-        } => {
-            match <&RegMem>::from(consequent) {
-                RegMem::Mem { ref addr } => {
-                    check_load(ctx, None, addr, vcode, I8X16, 128)?;
-                }
-                RegMem::Reg { .. } => {}
-            }
-            ensure_no_fact(vcode, dst.to_writable_reg().to_reg())
-        }
-
-        Inst::Push64 { ref src } => match <&RegMemImm>::from(src) {
-            RegMemImm::Mem { ref addr } => {
-                check_load(ctx, None, addr, vcode, I64, 64)?;
-                Ok(())
-            }
-            RegMemImm::Reg { .. } | RegMemImm::Imm { .. } => Ok(()),
-        },
-
-        Inst::Pop64 { dst } => undefined_result(ctx, vcode, dst, 64, 64),
-
-        Inst::StackProbeLoop { tmp, .. } => ensure_no_fact(vcode, tmp.to_reg()),
-
-        Inst::XmmRmR { dst, ref src2, .. }
-        | Inst::XmmRmRBlend { dst, ref src2, .. }
-        | Inst::XmmUnaryRmR {
-            dst, src: ref src2, ..
-        }
-        | Inst::XmmUnaryRmRImm {
-            dst, src: ref src2, ..
-        } => {
-            match <&RegMem>::from(src2) {
-                RegMem::Mem { ref addr } => {
-                    check_load(ctx, None, addr, vcode, I8X16, 128)?;
-                }
-                RegMem::Reg { .. } => {}
-            }
-            ensure_no_fact(vcode, dst.to_writable_reg().to_reg())
-        }
-
-        Inst::XmmRmRUnaligned { dst, ref src2, .. }
-        | Inst::XmmRmRImmVex { dst, ref src2, .. }
-        | Inst::XmmRmRVex3 {
-            dst,
-            src3: ref src2,
-            ..
-        }
-        | Inst::XmmRmRBlendVex { dst, ref src2, .. }
-        | Inst::XmmUnaryRmRVex {
-            dst, src: ref src2, ..
-        }
-        | Inst::XmmUnaryRmRImmVex {
-            dst, src: ref src2, ..
-        }
-        | Inst::XmmRmREvex { dst, ref src2, .. }
-        | Inst::XmmUnaryRmRImmEvex {
-            dst, src: ref src2, ..
-        }
-        | Inst::XmmRmREvex3 {
-            dst,
-            src3: ref src2,
-            ..
-        }
-        | Inst::XmmUnaryRmRUnaligned {
-            dst, src: ref src2, ..
-        }
-        | Inst::XmmUnaryRmREvex {
-            dst, src: ref src2, ..
-        } => {
-            match <&RegMem>::from(src2) {
-                RegMem::Mem { ref addr } => {
-                    check_load(ctx, None, addr, vcode, I8X16, 128)?;
-                }
-                RegMem::Reg { .. } => {}
-            }
-            ensure_no_fact(vcode, dst.to_writable_reg().to_reg())
-        }
-
-        Inst::XmmRmiRVex { dst, ref src2, .. } => {
-            match <&RegMemImm>::from(src2) {
-                RegMemImm::Mem { ref addr } => {
-                    check_load(ctx, None, addr, vcode, I8X16, 128)?;
-                }
-                RegMemImm::Reg { .. } | RegMemImm::Imm { .. } => {}
-            }
-            ensure_no_fact(vcode, dst.to_writable_reg().to_reg())
-        }
-
-        Inst::XmmVexPinsr { dst, ref src2, .. } => {
-            match <&RegMem>::from(src2) {
-                RegMem::Mem { ref addr } => {
-                    check_load(ctx, None, addr, vcode, I64, 64)?;
-                }
-                RegMem::Reg { .. } => {}
-            }
-            ensure_no_fact(vcode, dst.to_writable_reg().to_reg())
-        }
-
-        Inst::XmmMovRMVex { ref dst, .. } | Inst::XmmMovRMImmVex { ref dst, .. } => {
-            check_store(ctx, None, dst, vcode, I8X16)
-        }
-
-        Inst::XmmToGprImmVex { dst, .. } => ensure_no_fact(vcode, dst.to_writable_reg().to_reg()),
-
-        Inst::GprToXmmVex { dst, ref src, .. } | Inst::GprToXmm { dst, ref src, .. } => {
-            match <&RegMem>::from(src) {
-                RegMem::Mem { ref addr } => {
-                    check_load(ctx, None, addr, vcode, I64, 64)?;
-                }
-                RegMem::Reg { .. } => {}
-            }
-            ensure_no_fact(vcode, dst.to_writable_reg().to_reg())
-        }
-
-        Inst::XmmToGprVex { dst, .. } => undefined_result(ctx, vcode, dst, 64, 64),
-
-        Inst::XmmMovRM { ref dst, .. } | Inst::XmmMovRMImm { ref dst, .. } => {
-            check_store(ctx, None, dst, vcode, I8X16)?;
-            Ok(())
-        }
-
-        Inst::XmmToGpr { dst, .. } | Inst::XmmToGprImm { dst, .. } => {
-            undefined_result(ctx, vcode, dst, 64, 64)
-        }
-
-        Inst::CvtIntToFloat { dst, ref src2, .. }
-        | Inst::CvtIntToFloatVex { dst, ref src2, .. } => {
-            match <&RegMem>::from(src2) {
-                RegMem::Mem { ref addr } => {
-                    check_load(ctx, None, addr, vcode, I64, 64)?;
-                }
-                RegMem::Reg { .. } => {}
-            }
-            ensure_no_fact(vcode, dst.to_writable_reg().to_reg())
-        }
-
-        Inst::CvtUint64ToFloatSeq {
-            dst,
-            tmp_gpr1,
-            tmp_gpr2,
-            ..
-        } => {
-            ensure_no_fact(vcode, dst.to_writable_reg().to_reg())?;
-            ensure_no_fact(vcode, tmp_gpr1.to_writable_reg().to_reg())?;
-            ensure_no_fact(vcode, tmp_gpr2.to_writable_reg().to_reg())?;
-            Ok(())
-        }
-
-        Inst::CvtFloatToSintSeq {
-            dst,
-            tmp_gpr,
-            tmp_xmm,
-            ..
-        } => {
-            undefined_result(ctx, vcode, dst, 64, 64)?;
-            ensure_no_fact(vcode, tmp_gpr.to_writable_reg().to_reg())?;
-            ensure_no_fact(vcode, tmp_xmm.to_writable_reg().to_reg())?;
-            Ok(())
-        }
-
-        Inst::CvtFloatToUintSeq {
-            dst,
-            tmp_gpr,
-            tmp_xmm,
-            tmp_xmm2,
-            ..
-        } => {
-            undefined_result(ctx, vcode, dst, 64, 64)?;
-            ensure_no_fact(vcode, tmp_gpr.to_writable_reg().to_reg())?;
-            ensure_no_fact(vcode, tmp_xmm.to_writable_reg().to_reg())?;
-            ensure_no_fact(vcode, tmp_xmm2.to_writable_reg().to_reg())?;
-            Ok(())
-        }
-
-        Inst::XmmMinMaxSeq { dst, .. } => ensure_no_fact(vcode, dst.to_writable_reg().to_reg()),
-
-        Inst::XmmCmpRmR { ref src, .. } => match <&RegMem>::from(src) {
-            RegMem::Mem { ref addr } => {
-                check_load(ctx, None, addr, vcode, I8X16, 128)?;
-                Ok(())
-            }
-            RegMem::Reg { .. } => Ok(()),
-        },
-
-        Inst::XmmRmRImm { dst, ref src2, .. } => {
-            match <&RegMem>::from(src2) {
-                RegMem::Mem { ref addr } => {
-                    check_load(ctx, None, addr, vcode, I8X16, 128)?;
-                }
-                RegMem::Reg { .. } => {}
-            }
-            ensure_no_fact(vcode, dst.to_reg())
-        }
-
-        Inst::CallKnown { .. }
-        | Inst::ReturnCallKnown { .. }
-        | Inst::JmpKnown { .. }
-        | Inst::Ret { .. }
-        | Inst::JmpIf { .. }
-        | Inst::JmpCond { .. }
-        | Inst::TrapIf { .. }
-        | Inst::TrapIfAnd { .. }
-        | Inst::TrapIfOr { .. }
-        | Inst::Hlt {}
-        | Inst::Ud2 { .. } => Ok(()),
-        Inst::Rets { .. } => Ok(()),
-
-        Inst::CallUnknown { ref dest, .. }
-        | Inst::ReturnCallUnknown {
-            callee: ref dest, ..
-        }
-        | Inst::JmpUnknown {
-            target: ref dest, ..
-        } => match <&RegMem>::from(dest) {
-            RegMem::Mem { ref addr } => {
-                check_load(ctx, None, addr, vcode, I64, 64)?;
-                Ok(())
-            }
-            RegMem::Reg { .. } => Ok(()),
-        },
-
-        Inst::JmpTableSeq { tmp1, tmp2, .. } => {
-            ensure_no_fact(vcode, tmp1.to_reg())?;
-            ensure_no_fact(vcode, tmp2.to_reg())?;
-            Ok(())
-        }
-
-        Inst::LoadExtName { dst, .. } => {
-            ensure_no_fact(vcode, dst.to_reg())?;
-            Ok(())
-        }
-
-        Inst::LockCmpxchg {
-            ref mem, dst_old, ..
-        } => {
-            ensure_no_fact(vcode, dst_old.to_reg())?;
-            check_store(ctx, None, mem, vcode, I64)?;
-            Ok(())
-        }
-
-        Inst::AtomicRmwSeq {
-            ref mem,
-            temp,
-            dst_old,
-            ..
-        } => {
-            ensure_no_fact(vcode, dst_old.to_reg())?;
-            ensure_no_fact(vcode, temp.to_reg())?;
-            check_store(ctx, None, mem, vcode, I64)?;
-            Ok(())
-        }
-
-        Inst::Fence { .. } | Inst::VirtualSPOffsetAdj { .. } => Ok(()),
-
-        Inst::XmmUninitializedValue { dst } => {
-            ensure_no_fact(vcode, dst.to_writable_reg().to_reg())
-        }
-
-        Inst::ElfTlsGetAddr { dst, .. } | Inst::MachOTlsGetAddr { dst, .. } => {
-            ensure_no_fact(vcode, dst.to_writable_reg().to_reg())
-        }
-        Inst::CoffTlsGetAddr { dst, tmp, .. } => {
-            ensure_no_fact(vcode, dst.to_writable_reg().to_reg())?;
-            ensure_no_fact(vcode, tmp.to_writable_reg().to_reg())?;
-            Ok(())
-        }
-
-        Inst::Unwind { .. } | Inst::DummyUse { .. } => Ok(()),
-    }
-}
-
-fn check_load(
-    ctx: &FactContext,
-    dst: Option<Writable<Reg>>,
-    src: &SyntheticAmode,
-    vcode: &VCode<Inst>,
-    ty: Type,
-    to_bits: u16,
-) -> PccResult<Option<Fact>> {
-    let result_fact = dst.and_then(|dst| vcode.vreg_fact(dst.to_reg().into()));
-    let from_bits = u16::try_from(ty.bits()).unwrap();
-    check_mem(
-        ctx,
-        src,
-        vcode,
-        ty,
-        LoadOrStore::Load {
-            result_fact,
-            from_bits,
-            to_bits,
-        },
-    )
-}
-
-fn check_store(
-    ctx: &FactContext,
-    data: Option<Reg>,
-    dst: &SyntheticAmode,
-    vcode: &VCode<Inst>,
-    ty: Type,
-) -> PccResult<()> {
-    let stored_fact = data.and_then(|data| vcode.vreg_fact(data.into()));
-    check_mem(ctx, dst, vcode, ty, LoadOrStore::Store { stored_fact }).map(|_| ())
-}
-
-fn check_mem<'a>(
-    ctx: &FactContext,
-    amode: &SyntheticAmode,
-    vcode: &VCode<Inst>,
-    ty: Type,
-    op: LoadOrStore<'a>,
-) -> PccResult<Option<Fact>> {
-    match amode {
-        SyntheticAmode::Real(amode) if !amode.get_flags().checked() => return Ok(None),
-        SyntheticAmode::NominalSPOffset { .. } | SyntheticAmode::ConstantOffset(_) => {
-            return Ok(None)
-        }
-        _ => {}
-    }
-
-    let addr = compute_addr(ctx, vcode, amode, 64).ok_or(PccError::MissingFact)?;
-
-    match op {
-        LoadOrStore::Load {
-            result_fact,
-            from_bits,
-            to_bits,
-        } => {
-            let loaded_fact = clamp_range(ctx, to_bits, from_bits, ctx.load(&addr, ty)?.cloned())?;
-            trace!(
-                "loaded_fact = {:?} result_fact = {:?}",
-                loaded_fact,
-                result_fact
-            );
-            if ctx.subsumes_fact_optionals(Some(&loaded_fact), result_fact) {
-                Ok(Some(loaded_fact.clone()))
-            } else {
-                Err(PccError::UnsupportedFact)
-            }
-        }
-        LoadOrStore::Store { stored_fact } => {
-            ctx.store(&addr, ty, stored_fact)?;
-            Ok(None)
-        }
-    }
-}
-
-fn compute_addr(
-    ctx: &FactContext,
-    vcode: &VCode<Inst>,
-    amode: &SyntheticAmode,
-    bits: u16,
-) -> Option<Fact> {
-    trace!("compute_addr: {:?}", amode);
-    match *amode {
-        SyntheticAmode::Real(Amode::ImmReg { simm32, base, .. }) => {
-            let base = get_fact_or_default(vcode, base, bits);
-            trace!("base = {:?}", base);
-            let simm32: i64 = simm32.into();
-            let simm32: u64 = simm32 as u64;
-            let offset = Fact::constant(bits, simm32);
-            let sum = ctx.add(&base, &offset, bits)?;
-            trace!("sum = {:?}", sum);
-            Some(sum)
-        }
-        SyntheticAmode::Real(Amode::ImmRegRegShift {
-            simm32,
-            base,
-            index,
-            shift,
-            ..
-        }) => {
-            let base = get_fact_or_default(vcode, base.into(), bits);
-            let index = get_fact_or_default(vcode, index.into(), bits);
-            trace!("base = {:?} index = {:?}", base, index);
-            let shifted = ctx.shl(&index, bits, shift.into())?;
-            let sum = ctx.add(&base, &shifted, bits)?;
-            let simm32: i64 = simm32.into();
-            let simm32: u64 = simm32 as u64;
-            let offset = Fact::constant(bits, simm32);
-            let sum = ctx.add(&sum, &offset, bits)?;
-            trace!("sum = {:?}", sum);
-            Some(sum)
-        }
-        SyntheticAmode::Real(Amode::RipRelative { .. })
-        | SyntheticAmode::ConstantOffset(_)
-        | SyntheticAmode::NominalSPOffset { .. } => None,
-    }
-}
diff --git a/cranelift/codegen/src/isa/zkasm/inst/emit.rs b/cranelift/codegen/src/isa/zkasm/inst/emit.rs
index 5b2e3ed788fb..59a718d2676a 100644
--- a/cranelift/codegen/src/isa/zkasm/inst/emit.rs
+++ b/cranelift/codegen/src/isa/zkasm/inst/emit.rs
@@ -659,7 +659,7 @@ impl MachInstEmit for Inst {
                         // For now we only support calls.
                         assert!(info.opcode.is_call());
                         sink.add_call_site(info.opcode);
-                        sink.add_reloc(Reloc::RiscvCallPlt, &info.dest, 0);
+                        sink.add_reloc(Reloc::RiscvCall, &info.dest, 0);
                         // This will be patched externally to do a necessary jump.
                         put_string(&format!("; CALL {name}\n"), sink);
 
diff --git a/cranelift/codegen/src/isa/zkasm/inst/mod.rs b/cranelift/codegen/src/isa/zkasm/inst/mod.rs
index f29a7dfc208f..916e7b5e1a4a 100644
--- a/cranelift/codegen/src/isa/zkasm/inst/mod.rs
+++ b/cranelift/codegen/src/isa/zkasm/inst/mod.rs
@@ -669,10 +669,6 @@ impl MachInst for Inst {
             preferred: 4,
         }
     }
-
-    fn is_mem_access(&self) -> bool {
-        todo!("FILL ME OUT")
-    }
 }
 
 //=============================================================================
diff --git a/cranelift/codegen/src/isle_prelude.rs b/cranelift/codegen/src/isle_prelude.rs
index 450244274e70..fc1f902eb1f4 100644
--- a/cranelift/codegen/src/isle_prelude.rs
+++ b/cranelift/codegen/src/isle_prelude.rs
@@ -164,23 +164,11 @@ macro_rules! isle_common_prelude_methods {
             0 == value
         }
 
-        fn i64_is_zero(&mut self, value: i64) -> bool {
-            0 == value
-        }
-
         #[inline]
         fn u64_is_odd(&mut self, x: u64) -> bool {
             x & 1 == 1
         }
 
-        fn i64_shr(&mut self, a: i64, b: i64) -> i64 {
-            a >> b
-        }
-
-        fn i64_ctz(&mut self, a: i64) -> i64 {
-            a.trailing_zeros().into()
-        }
-
         #[inline]
         fn i64_sextend_u64(&mut self, ty: Type, x: u64) -> i64 {
             let shift_amt = std::cmp::max(0, 64 - ty.bits());
@@ -382,15 +370,6 @@ macro_rules! isle_common_prelude_methods {
             }
         }
 
-        #[inline]
-        fn ty_16_or_32(&mut self, ty: Type) -> Option<Type> {
-            if ty.bits() == 16 || ty.bits() == 32 {
-                Some(ty)
-            } else {
-                None
-            }
-        }
-
         #[inline]
         fn int_fits_in_32(&mut self, ty: Type) -> Option<Type> {
             match ty {
@@ -867,11 +846,6 @@ macro_rules! isle_common_prelude_methods {
             cc.complement()
         }
 
-        #[inline]
-        fn intcc_without_eq(&mut self, x: &IntCC) -> IntCC {
-            x.without_equal()
-        }
-
         #[inline]
         fn floatcc_swap_args(&mut self, cc: &FloatCC) -> FloatCC {
             cc.swap_args()
@@ -934,47 +908,5 @@ macro_rules! isle_common_prelude_methods {
         fn u64_as_u32(&mut self, val: u64) -> Option<u32> {
             u32::try_from(val).ok()
         }
-
-        fn u8_as_i8(&mut self, val: u8) -> i8 {
-            val as i8
-        }
-
-        fn u128_replicated_u64(&mut self, val: u128) -> Option<u64> {
-            let low64 = val as u64 as u128;
-            if (low64 | (low64 << 64)) == val {
-                Some(low64 as u64)
-            } else {
-                None
-            }
-        }
-
-        fn u64_replicated_u32(&mut self, val: u64) -> Option<u64> {
-            let low32 = val as u32 as u64;
-            if (low32 | (low32 << 32)) == val {
-                Some(low32)
-            } else {
-                None
-            }
-        }
-
-        fn u32_replicated_u16(&mut self, val: u64) -> Option<u64> {
-            let val = val as u32;
-            let low16 = val as u16 as u32;
-            if (low16 | (low16 << 16)) == val {
-                Some(low16.into())
-            } else {
-                None
-            }
-        }
-
-        fn u16_replicated_u8(&mut self, val: u64) -> Option<u8> {
-            let val = val as u16;
-            let low8 = val as u8 as u16;
-            if (low8 | (low8 << 8)) == val {
-                Some(low8 as u8)
-            } else {
-                None
-            }
-        }
     };
 }
diff --git a/cranelift/codegen/src/legalizer/globalvalue.rs b/cranelift/codegen/src/legalizer/globalvalue.rs
index 9837dd59278e..57fa29e1f5ab 100644
--- a/cranelift/codegen/src/legalizer/globalvalue.rs
+++ b/cranelift/codegen/src/legalizer/globalvalue.rs
@@ -4,7 +4,7 @@
 //! instruction into code that depends on the kind of global value referenced.
 
 use crate::cursor::{Cursor, FuncCursor};
-use crate::ir::{self, pcc::Fact, InstBuilder};
+use crate::ir::{self, InstBuilder};
 use crate::isa::TargetIsa;
 
 /// Expand a `global_value` instruction according to the definition of the global value.
@@ -21,7 +21,7 @@ pub fn expand_global_value(
     );
 
     match func.global_values[global_value] {
-        ir::GlobalValueData::VMContext => vmctx_addr(global_value, inst, func),
+        ir::GlobalValueData::VMContext => vmctx_addr(inst, func),
         ir::GlobalValueData::IAddImm {
             base,
             offset,
@@ -31,8 +31,8 @@ pub fn expand_global_value(
             base,
             offset,
             global_type,
-            flags,
-        } => load_addr(inst, func, base, offset, global_type, flags, isa),
+            readonly,
+        } => load_addr(inst, func, base, offset, global_type, readonly, isa),
         ir::GlobalValueData::Symbol { tls, .. } => symbol(inst, func, global_value, isa, tls),
         ir::GlobalValueData::DynScaleTargetConst { vector_type } => {
             const_vector_scale(inst, func, vector_type, isa)
@@ -52,7 +52,7 @@ fn const_vector_scale(inst: ir::Inst, func: &mut ir::Function, ty: ir::Type, isa
 }
 
 /// Expand a `global_value` instruction for a vmctx global.
-fn vmctx_addr(global_value: ir::GlobalValue, inst: ir::Inst, func: &mut ir::Function) {
+fn vmctx_addr(inst: ir::Inst, func: &mut ir::Function) {
     // Get the value representing the `vmctx` argument.
     let vmctx = func
         .special_param(ir::ArgumentPurpose::VMContext)
@@ -63,15 +63,6 @@ fn vmctx_addr(global_value: ir::GlobalValue, inst: ir::Inst, func: &mut ir::Func
     func.dfg.clear_results(inst);
     func.dfg.change_to_alias(result, vmctx);
     func.layout.remove_inst(inst);
-
-    // If there was a fact on the GV, then copy it to the vmctx arg
-    // blockparam def.
-    if let Some(fact) = &func.global_value_facts[global_value] {
-        if func.dfg.facts[vmctx].is_none() {
-            let fact = fact.clone();
-            func.dfg.facts[vmctx] = Some(fact);
-        }
-    }
 }
 
 /// Expand a `global_value` instruction for an iadd_imm global.
@@ -84,23 +75,18 @@ fn iadd_imm_addr(
 ) {
     let mut pos = FuncCursor::new(func).at_inst(inst);
 
-    // Get the value for the lhs.
-    let lhs = pos.ins().global_value(global_type, base);
-    if let Some(fact) = &pos.func.global_value_facts[base] {
-        pos.func.dfg.facts[lhs] = Some(fact.clone());
-    }
-
-    // Generate the constant and attach a fact to the constant if
-    // there is a fact on the base.
-    let constant = pos.ins().iconst(global_type, offset);
-    if pos.func.global_value_facts[base].is_some() {
-        let bits = u16::try_from(global_type.bits()).unwrap();
-        let unsigned_offset = offset as u64; // Safety: reinterpret i64 bits as u64.
-        pos.func.dfg.facts[constant] = Some(Fact::constant(bits, unsigned_offset));
-    }
+    // Get the value for the lhs. For tidiness, expand VMContext here so that we avoid
+    // `vmctx_addr` which creates an otherwise unneeded value alias.
+    let lhs = if let ir::GlobalValueData::VMContext = pos.func.global_values[base] {
+        pos.func
+            .special_param(ir::ArgumentPurpose::VMContext)
+            .expect("Missing vmctx parameter")
+    } else {
+        pos.ins().global_value(global_type, base)
+    };
 
     // Simply replace the `global_value` instruction with an `iadd_imm`, reusing the result value.
-    pos.func.dfg.replace(inst).iadd(lhs, constant);
+    pos.func.dfg.replace(inst).iadd_imm(lhs, offset);
 }
 
 /// Expand a `global_value` instruction for a load global.
@@ -110,7 +96,7 @@ fn load_addr(
     base: ir::GlobalValue,
     offset: ir::immediates::Offset32,
     global_type: ir::Type,
-    flags: ir::MemFlags,
+    readonly: bool,
     isa: &dyn TargetIsa,
 ) {
     // We need to load a pointer from the `base` global value, so insert a new `global_value`
@@ -120,17 +106,27 @@ fn load_addr(
     let mut pos = FuncCursor::new(func).at_inst(inst);
     pos.use_srcloc(inst);
 
-    // Get the value for the base.
-    let base_addr = pos.ins().global_value(ptr_ty, base);
-    if let Some(fact) = &pos.func.global_value_facts[base] {
-        pos.func.dfg.facts[base_addr] = Some(fact.clone());
+    // Get the value for the base. For tidiness, expand VMContext here so that we avoid
+    // `vmctx_addr` which creates an otherwise unneeded value alias.
+    let base_addr = if let ir::GlobalValueData::VMContext = pos.func.global_values[base] {
+        pos.func
+            .special_param(ir::ArgumentPurpose::VMContext)
+            .expect("Missing vmctx parameter")
+    } else {
+        pos.ins().global_value(ptr_ty, base)
+    };
+
+    // Global-value loads are always notrap and aligned. They may be readonly.
+    let mut mflags = ir::MemFlags::trusted();
+    if readonly {
+        mflags.set_readonly();
     }
 
     // Perform the load.
     pos.func
         .dfg
         .replace(inst)
-        .load(global_type, flags, base_addr, offset);
+        .load(global_type, mflags, base_addr, offset);
 }
 
 /// Expand a `global_value` instruction for a symbolic name global.
diff --git a/cranelift/codegen/src/machinst/abi.rs b/cranelift/codegen/src/machinst/abi.rs
index afeedec7dd15..536f8886d272 100644
--- a/cranelift/codegen/src/machinst/abi.rs
+++ b/cranelift/codegen/src/machinst/abi.rs
@@ -1319,7 +1319,7 @@ fn generate_gv<M: ABIMachineSpec>(
             base,
             offset,
             global_type: _,
-            flags: _,
+            readonly: _,
         } => {
             let base = generate_gv::<M>(f, sigs, sig, base, insts);
             let into_reg = Writable::from_reg(M::get_stacklimit_reg(f.stencil.signature.call_conv));
@@ -1559,7 +1559,7 @@ impl<M: ABIMachineSpec> Callee<M> {
                 // We need to dereference the pointer.
                 let base = match &pointer {
                     &ABIArgSlot::Reg { reg, ty, .. } => {
-                        let tmp = vregs.alloc_with_deferred_error(ty).only_reg().unwrap();
+                        let tmp = vregs.alloc(ty).unwrap().only_reg().unwrap();
                         self.reg_args.push(ArgPair {
                             vreg: Writable::from_reg(tmp),
                             preg: reg.into(),
@@ -1621,10 +1621,9 @@ impl<M: ABIMachineSpec> Callee<M> {
                                     if n < word_bits =>
                                 {
                                     let signed = ext == ir::ArgumentExtension::Sext;
-                                    let dst =
-                                        writable_value_regs(vregs.alloc_with_deferred_error(ty))
-                                            .only_reg()
-                                            .unwrap();
+                                    let dst = writable_value_regs(vregs.alloc(ty).unwrap())
+                                        .only_reg()
+                                        .unwrap();
                                     ret.push(M::gen_extend(
                                         dst, from_reg, signed, from_bits,
                                         /* to_bits = */ word_bits,
@@ -1665,10 +1664,9 @@ impl<M: ABIMachineSpec> Callee<M> {
                                 {
                                     assert_eq!(M::word_reg_class(), from_reg.class());
                                     let signed = ext == ir::ArgumentExtension::Sext;
-                                    let dst =
-                                        writable_value_regs(vregs.alloc_with_deferred_error(ty))
-                                            .only_reg()
-                                            .unwrap();
+                                    let dst = writable_value_regs(vregs.alloc(ty).unwrap())
+                                        .only_reg()
+                                        .unwrap();
                                     ret.push(M::gen_extend(
                                         dst, from_reg, signed, from_bits,
                                         /* to_bits = */ word_bits,
diff --git a/cranelift/codegen/src/machinst/compile.rs b/cranelift/codegen/src/machinst/compile.rs
index 4c42e61ca3c4..07440489a91c 100644
--- a/cranelift/codegen/src/machinst/compile.rs
+++ b/cranelift/codegen/src/machinst/compile.rs
@@ -1,13 +1,11 @@
 //! Compilation backend pipeline: optimized IR to VCode / binemit.
 
 use crate::dominator_tree::DominatorTree;
-use crate::ir::pcc;
 use crate::ir::Function;
 use crate::isa::TargetIsa;
 use crate::machinst::*;
 use crate::timing;
 use crate::trace;
-use crate::CodegenError;
 
 use regalloc2::RegallocOptions;
 
@@ -26,11 +24,10 @@ pub fn compile<B: LowerBackend + TargetIsa>(
     let block_order = BlockLoweringOrder::new(f, domtree, ctrl_plane);
 
     // Build the lowering context.
-    let lower =
-        crate::machinst::Lower::new(f, abi, emit_info, block_order, sigs, b.flags().clone())?;
+    let lower = crate::machinst::Lower::new(f, abi, emit_info, block_order, sigs)?;
 
     // Lower the IR.
-    let mut vcode = {
+    let vcode = {
         log::debug!(
             "Number of CLIF instructions to lower: {}",
             f.dfg.num_insts()
@@ -48,11 +45,6 @@ pub fn compile<B: LowerBackend + TargetIsa>(
     log::debug!("Number of lowered vcode blocks: {}", vcode.num_blocks());
     trace!("vcode from lowering: \n{:?}", vcode);
 
-    // Perform validation of proof-carrying-code facts, if requested.
-    if b.flags().enable_pcc() {
-        pcc::check_vcode_facts(f, &mut vcode, b).map_err(CodegenError::Pcc)?;
-    }
-
     // Perform register allocation.
     let regalloc_result = {
         let _tt = timing::regalloc();
diff --git a/cranelift/codegen/src/machinst/isle.rs b/cranelift/codegen/src/machinst/isle.rs
index 1fb41f9c7325..e06cb94e3192 100644
--- a/cranelift/codegen/src/machinst/isle.rs
+++ b/cranelift/codegen/src/machinst/isle.rs
@@ -32,8 +32,6 @@ pub type InstOutput = SmallVec<[ValueRegs; 2]>;
 pub type InstOutputBuilder = Cell<InstOutput>;
 pub type BoxExternalName = Box<ExternalName>;
 pub type Range = (usize, usize);
-pub type MachLabelSlice = [MachLabel];
-pub type BoxVecMachLabel = Box<Vec<MachLabel>>;
 
 pub enum RangeView {
     Empty,
@@ -63,16 +61,6 @@ macro_rules! isle_lower_prelude_methods {
             ValueRegs::two(r1, r2)
         }
 
-        #[inline]
-        fn writable_value_regs(&mut self, r1: WritableReg, r2: WritableReg) -> WritableValueRegs {
-            WritableValueRegs::two(r1, r2)
-        }
-
-        #[inline]
-        fn writable_value_reg(&mut self, r: WritableReg) -> WritableValueRegs {
-            WritableValueRegs::one(r)
-        }
-
         #[inline]
         fn value_regs_invalid(&mut self) -> ValueRegs {
             ValueRegs::invalid()
@@ -649,45 +637,6 @@ macro_rules! isle_lower_prelude_methods {
                 Some(bits as u64)
             }
         }
-
-        fn single_target(&mut self, targets: &MachLabelSlice) -> Option<MachLabel> {
-            if targets.len() == 1 {
-                Some(targets[0])
-            } else {
-                None
-            }
-        }
-
-        fn two_targets(&mut self, targets: &MachLabelSlice) -> Option<(MachLabel, MachLabel)> {
-            if targets.len() == 2 {
-                Some((targets[0], targets[1]))
-            } else {
-                None
-            }
-        }
-
-        fn jump_table_targets(
-            &mut self,
-            targets: &MachLabelSlice,
-        ) -> Option<(MachLabel, BoxVecMachLabel)> {
-            use std::boxed::Box;
-            if targets.is_empty() {
-                return None;
-            }
-
-            let default_label = targets[0];
-            let jt_targets = Box::new(targets[1..].to_vec());
-            Some((default_label, jt_targets))
-        }
-
-        fn jump_table_size(&mut self, targets: &BoxVecMachLabel) -> u32 {
-            targets.len() as u32
-        }
-
-        fn add_range_fact(&mut self, reg: Reg, bits: u16, min: u64, max: u64) -> Reg {
-            self.lower_ctx.add_range_fact(reg, bits, min, max);
-            reg
-        }
     };
 }
 
diff --git a/cranelift/codegen/src/machinst/lower.rs b/cranelift/codegen/src/machinst/lower.rs
index bed1a3989a5e..e35a6bbb2bf7 100644
--- a/cranelift/codegen/src/machinst/lower.rs
+++ b/cranelift/codegen/src/machinst/lower.rs
@@ -8,18 +8,16 @@
 use crate::entity::SecondaryMap;
 use crate::fx::{FxHashMap, FxHashSet};
 use crate::inst_predicates::{has_lowering_side_effect, is_constant_64bit};
-use crate::ir::pcc::{Fact, FactContext, PccError, PccResult};
 use crate::ir::{
     ArgumentPurpose, Block, Constant, ConstantData, DataFlowGraph, ExternalName, Function,
     GlobalValue, GlobalValueData, Immediate, Inst, InstructionData, MemFlags, RelSourceLoc, Type,
     Value, ValueDef, ValueLabelAssignments, ValueLabelStart,
 };
 use crate::machinst::{
-    writable_value_regs, BlockIndex, BlockLoweringOrder, Callee, InsnIndex, LoweredBlock,
-    MachLabel, Reg, SigSet, VCode, VCodeBuilder, VCodeConstant, VCodeConstantData, VCodeConstants,
-    VCodeInst, ValueRegs, Writable,
+    writable_value_regs, BlockIndex, BlockLoweringOrder, Callee, LoweredBlock, MachLabel, Reg,
+    SigSet, VCode, VCodeBuilder, VCodeConstant, VCodeConstantData, VCodeConstants, VCodeInst,
+    ValueRegs, Writable,
 };
-use crate::settings::Flags;
 use crate::{trace, CodegenResult};
 use alloc::vec::Vec;
 use cranelift_control::ControlPlane;
@@ -147,18 +145,6 @@ pub trait LowerBackend {
     fn maybe_pinned_reg(&self) -> Option<Reg> {
         None
     }
-
-    /// Check any facts about an instruction, given VCode with facts
-    /// on VRegs. Takes mutable `VCode` so that it can propagate some
-    /// kinds of facts automatically.
-    fn check_fact(
-        &self,
-        _ctx: &FactContext<'_>,
-        _vcode: &mut VCode<Self::MInst>,
-        _inst: InsnIndex,
-    ) -> PccResult<()> {
-        Err(PccError::UnimplementedBackend)
-    }
 }
 
 /// Machine-independent lowering driver / machine-instruction container. Maintains a correspondence
@@ -220,9 +206,6 @@ pub struct Lower<'func, I: VCodeInst> {
 
     /// The register to use for GetPinnedReg, if any, on this architecture.
     pinned_reg: Option<Reg>,
-
-    /// Compilation flags.
-    flags: Flags,
 }
 
 /// How is a value used in the IR?
@@ -346,7 +329,6 @@ impl<'func, I: VCodeInst> Lower<'func, I> {
         emit_info: I::Info,
         block_order: BlockLoweringOrder,
         sigs: SigSet,
-        flags: Flags,
     ) -> CodegenResult<Self> {
         let constants = VCodeConstants::with_capacity(f.dfg.constants.len());
         let vcode = VCodeBuilder::new(
@@ -367,7 +349,7 @@ impl<'func, I: VCodeInst> Lower<'func, I> {
             for &param in f.dfg.block_params(bb) {
                 let ty = f.dfg.value_type(param);
                 if value_regs[param].is_invalid() {
-                    let regs = vregs.alloc_with_maybe_fact(ty, f.dfg.facts[param].clone())?;
+                    let regs = vregs.alloc(ty)?;
                     value_regs[param] = regs;
                     trace!("bb {} param {}: regs {:?}", bb, param, regs);
                 }
@@ -376,7 +358,7 @@ impl<'func, I: VCodeInst> Lower<'func, I> {
                 for &result in f.dfg.inst_results(inst) {
                     let ty = f.dfg.value_type(result);
                     if value_regs[result].is_invalid() && !ty.is_invalid() {
-                        let regs = vregs.alloc_with_maybe_fact(ty, f.dfg.facts[result].clone())?;
+                        let regs = vregs.alloc(ty)?;
                         value_regs[result] = regs;
                         trace!(
                             "bb {} inst {} ({:?}): result {} regs {:?}",
@@ -461,7 +443,6 @@ impl<'func, I: VCodeInst> Lower<'func, I> {
             cur_inst: None,
             ir_insts: vec![],
             pinned_reg: None,
-            flags,
         })
     }
 
@@ -783,19 +764,6 @@ impl<'func, I: VCodeInst> Lower<'func, I> {
                     debug_assert_eq!(regs.len(), dsts.len());
                     for (dst, temp) in dsts.regs().iter().zip(regs.regs().iter()) {
                         self.set_vreg_alias(*dst, *temp);
-
-                        // If there was any PCC fact about the
-                        // original VReg, move it to the aliased reg
-                        // instead. Lookup goes through the alias, but
-                        // we want to preserve whatever was stated
-                        // about the vreg before its producer was
-                        // lowered.
-                        if let Some(fact) =
-                            self.vregs.take_fact(dst.to_virtual_reg().unwrap().into())
-                        {
-                            self.vregs
-                                .set_fact(temp.to_virtual_reg().unwrap().into(), fact);
-                        }
                     }
                 }
             }
@@ -988,7 +956,7 @@ impl<'func, I: VCodeInst> Lower<'func, I> {
                 let arg = self.f.dfg.resolve_aliases(arg);
                 let regs = self.put_value_in_regs(arg);
                 for &vreg in regs.regs() {
-                    let vreg = self.vcode.vcode.resolve_vreg_alias(vreg.into());
+                    let vreg = self.vcode.resolve_vreg_alias(vreg.into());
                     branch_arg_vregs.push(vreg.into());
                 }
             }
@@ -1101,12 +1069,6 @@ impl<'func, I: VCodeInst> Lower<'func, I> {
             }
 
             self.finish_bb();
-
-            // Check for any deferred vreg-temp allocation errors, and
-            // bubble one up at this time if it exists.
-            if let Some(e) = self.vregs.take_deferred_error() {
-                return Err(e);
-            }
         }
 
         // Now that we've emitted all instructions into the
@@ -1357,7 +1319,7 @@ impl<'func, I: VCodeInst> Lower<'func, I> {
 impl<'func, I: VCodeInst> Lower<'func, I> {
     /// Get a new temp.
     pub fn alloc_tmp(&mut self, ty: Type) -> ValueRegs<Writable<Reg>> {
-        writable_value_regs(self.vregs.alloc_with_deferred_error(ty))
+        writable_value_regs(self.vregs.alloc(ty).unwrap())
     }
 
     /// Emit a machine instruction.
@@ -1422,18 +1384,4 @@ impl<'func, I: VCodeInst> Lower<'func, I> {
         trace!("set vreg alias: from {:?} to {:?}", from, to);
         self.vcode.set_vreg_alias(from, to);
     }
-
-    /// Add a range fact to a register, if no other fact is present.
-    pub fn add_range_fact(&mut self, reg: Reg, bit_width: u16, min: u64, max: u64) {
-        if self.flags.enable_pcc() {
-            self.vregs.set_fact_if_missing(
-                reg.to_virtual_reg().unwrap(),
-                Fact::Range {
-                    bit_width,
-                    min,
-                    max,
-                },
-            );
-        }
-    }
 }
diff --git a/cranelift/codegen/src/machinst/mod.rs b/cranelift/codegen/src/machinst/mod.rs
index 285a1c1474ca..ff0e6910f795 100644
--- a/cranelift/codegen/src/machinst/mod.rs
+++ b/cranelift/codegen/src/machinst/mod.rs
@@ -85,7 +85,6 @@ pub use inst_common::*;
 pub mod valueregs;
 pub use reg::*;
 pub use valueregs::*;
-pub mod pcc;
 pub mod reg;
 
 /// A machine instruction.
@@ -113,9 +112,6 @@ pub trait MachInst: Clone + Debug {
     /// Should this instruction be included in the clobber-set?
     fn is_included_in_clobbers(&self) -> bool;
 
-    /// Does this instruction access memory?
-    fn is_mem_access(&self) -> bool;
-
     /// Generate a move.
     fn gen_move(to_reg: Writable<Reg>, from_reg: Reg, ty: Type) -> Self;
 
diff --git a/cranelift/codegen/src/machinst/pcc.rs b/cranelift/codegen/src/machinst/pcc.rs
deleted file mode 100644
index db1bf3256533..000000000000
--- a/cranelift/codegen/src/machinst/pcc.rs
+++ /dev/null
@@ -1,160 +0,0 @@
-//! Common helpers for ISA-specific proof-carrying-code implementations.
-
-use crate::ir::pcc::{Fact, FactContext, PccError, PccResult};
-use crate::machinst::{Reg, VCode, VCodeInst, Writable};
-use crate::trace;
-
-pub(crate) fn get_fact_or_default<I: VCodeInst>(vcode: &VCode<I>, reg: Reg, width: u16) -> Fact {
-    trace!(
-        "get_fact_or_default: reg v{} -> {:?}",
-        reg.to_virtual_reg().unwrap().index(),
-        vcode.vreg_fact(reg.into())
-    );
-    vcode
-        .vreg_fact(reg.into())
-        .map(|f| f.clone())
-        .unwrap_or_else(|| Fact::max_range_for_width(width))
-}
-
-pub(crate) fn has_fact<I: VCodeInst>(vcode: &VCode<I>, reg: Reg) -> bool {
-    vcode.vreg_fact(reg.into()).is_some()
-}
-
-pub(crate) fn fail_if_missing(fact: Option<Fact>) -> PccResult<Fact> {
-    fact.ok_or(PccError::UnsupportedFact)
-}
-
-pub(crate) fn clamp_range(
-    ctx: &FactContext,
-    to_bits: u16,
-    from_bits: u16,
-    fact: Option<Fact>,
-) -> PccResult<Fact> {
-    let max = if from_bits == 64 {
-        u64::MAX
-    } else {
-        (1u64 << from_bits) - 1
-    };
-    trace!(
-        "clamp_range: fact {:?} from {} to {}",
-        fact,
-        from_bits,
-        to_bits
-    );
-    Ok(fact
-        .and_then(|f| ctx.uextend(&f, from_bits, to_bits))
-        .unwrap_or_else(|| {
-            let result = Fact::Range {
-                bit_width: to_bits,
-                min: 0,
-                max,
-            };
-            trace!(" -> clamping to {:?}", result);
-            result
-        }))
-}
-
-pub(crate) fn check_subsumes(ctx: &FactContext, subsumer: &Fact, subsumee: &Fact) -> PccResult<()> {
-    trace!(
-        "checking if derived fact {:?} subsumes stated fact {:?}",
-        subsumer,
-        subsumee
-    );
-
-    if ctx.subsumes(subsumer, subsumee) {
-        Ok(())
-    } else {
-        Err(PccError::UnsupportedFact)
-    }
-}
-
-pub(crate) fn check_output<I: VCodeInst, F: FnOnce(&VCode<I>) -> PccResult<Fact>>(
-    ctx: &FactContext,
-    vcode: &mut VCode<I>,
-    out: Writable<Reg>,
-    ins: &[Reg],
-    f: F,
-) -> PccResult<()> {
-    if let Some(fact) = vcode.vreg_fact(out.to_reg().into()) {
-        let result = f(vcode)?;
-        check_subsumes(ctx, &result, fact)
-    } else if ins.iter().any(|r| {
-        vcode
-            .vreg_fact(r.into())
-            .map(|fact| fact.propagates())
-            .unwrap_or(false)
-    }) {
-        if let Ok(fact) = f(vcode) {
-            trace!("setting vreg {:?} to {:?}", out, fact);
-            vcode.set_vreg_fact(out.to_reg().into(), fact);
-        }
-        Ok(())
-    } else {
-        Ok(())
-    }
-}
-
-pub(crate) fn check_unop<I: VCodeInst, F: FnOnce(&Fact) -> PccResult<Fact>>(
-    ctx: &FactContext,
-    vcode: &mut VCode<I>,
-    reg_width: u16,
-    out: Writable<Reg>,
-    ra: Reg,
-    f: F,
-) -> PccResult<()> {
-    check_output(ctx, vcode, out, &[ra], |vcode| {
-        let ra = get_fact_or_default(vcode, ra, reg_width);
-        f(&ra)
-    })
-}
-
-pub(crate) fn check_binop<I: VCodeInst, F: FnOnce(&Fact, &Fact) -> PccResult<Fact>>(
-    ctx: &FactContext,
-    vcode: &mut VCode<I>,
-    reg_width: u16,
-    out: Writable<Reg>,
-    ra: Reg,
-    rb: Reg,
-    f: F,
-) -> PccResult<()> {
-    check_output(ctx, vcode, out, &[ra, rb], |vcode| {
-        let ra = get_fact_or_default(vcode, ra, reg_width);
-        let rb = get_fact_or_default(vcode, rb, reg_width);
-        f(&ra, &rb)
-    })
-}
-
-pub(crate) fn check_constant<I: VCodeInst>(
-    ctx: &FactContext,
-    vcode: &mut VCode<I>,
-    out: Writable<Reg>,
-    bit_width: u16,
-    value: u64,
-) -> PccResult<()> {
-    let result = Fact::constant(bit_width, value);
-    if let Some(fact) = vcode.vreg_fact(out.to_reg().into()) {
-        check_subsumes(ctx, &result, fact)
-    } else {
-        trace!("setting vreg {:?} to {:?}", out, result);
-        vcode.set_vreg_fact(out.to_reg().into(), result);
-        Ok(())
-    }
-}
-
-/// The operation we're checking against an amode: either
-///
-/// - a *load*, and we need to validate that the field's fact subsumes
-///   the load result's fact, OR
-///
-/// - a *store*, and we need to validate that the stored data's fact
-///   subsumes the field's fact.
-pub(crate) enum LoadOrStore<'a> {
-    Load {
-        result_fact: Option<&'a Fact>,
-        from_bits: u16,
-        to_bits: u16,
-    },
-    Store {
-        stored_fact: Option<&'a Fact>,
-    },
-}
diff --git a/cranelift/codegen/src/machinst/reg.rs b/cranelift/codegen/src/machinst/reg.rs
index 8aadc11b540e..4fd9b1e177c4 100644
--- a/cranelift/codegen/src/machinst/reg.rs
+++ b/cranelift/codegen/src/machinst/reg.rs
@@ -219,11 +219,6 @@ impl std::convert::From<Reg> for regalloc2::VReg {
         reg.0
     }
 }
-impl std::convert::From<&Reg> for regalloc2::VReg {
-    fn from(reg: &Reg) -> regalloc2::VReg {
-        reg.0
-    }
-}
 
 impl std::convert::From<VirtualReg> for regalloc2::VReg {
     fn from(reg: VirtualReg) -> regalloc2::VReg {
diff --git a/cranelift/codegen/src/machinst/vcode.rs b/cranelift/codegen/src/machinst/vcode.rs
index dd80d6c2ab48..adb52c8609ae 100644
--- a/cranelift/codegen/src/machinst/vcode.rs
+++ b/cranelift/codegen/src/machinst/vcode.rs
@@ -19,7 +19,6 @@
 
 use crate::fx::FxHashMap;
 use crate::fx::FxHashSet;
-use crate::ir::pcc::*;
 use crate::ir::RelSourceLoc;
 use crate::ir::{self, types, Constant, ConstantData, DynamicStackSlot, ValueLabel};
 use crate::machinst::*;
@@ -173,9 +172,6 @@ pub struct VCode<I: VCodeInst> {
     debug_value_labels: Vec<(VReg, InsnIndex, InsnIndex, u32)>,
 
     pub(crate) sigs: SigSet,
-
-    /// Facts on VRegs, for proof-carrying code verification.
-    facts: Vec<Option<Fact>>,
 }
 
 /// The result of `VCode::emit`. Contains all information computed
@@ -408,12 +404,37 @@ impl<I: VCodeInst> VCodeBuilder<I> {
 
     pub fn set_vreg_alias(&mut self, from: Reg, to: Reg) {
         let from = from.into();
-        let resolved_to = self.vcode.resolve_vreg_alias(to.into());
+        let resolved_to = self.resolve_vreg_alias(to.into());
         // Disallow cycles (see below).
         assert_ne!(resolved_to, from);
         self.vcode.vreg_aliases.insert(from, resolved_to);
     }
 
+    pub fn resolve_vreg_alias(&self, from: regalloc2::VReg) -> regalloc2::VReg {
+        Self::resolve_vreg_alias_impl(&self.vcode.vreg_aliases, from)
+    }
+
+    fn resolve_vreg_alias_impl(
+        aliases: &FxHashMap<regalloc2::VReg, regalloc2::VReg>,
+        from: regalloc2::VReg,
+    ) -> regalloc2::VReg {
+        // We prevent cycles from existing by resolving targets of
+        // aliases eagerly before setting them. If the target resolves
+        // to the origin of the alias, then a cycle would be created
+        // and the alias is disallowed. Because of the structure of
+        // SSA code (one instruction can refer to another's defs but
+        // not vice-versa, except indirectly through
+        // phis/blockparams), cycles should not occur as we use
+        // aliases to redirect vregs to the temps that actually define
+        // them.
+
+        let mut vreg = from;
+        while let Some(to) = aliases.get(&vreg) {
+            vreg = *to;
+        }
+        vreg
+    }
+
     /// Access the constants.
     pub fn constants(&mut self) -> &mut VCodeConstants {
         &mut self.vcode.constants
@@ -495,7 +516,7 @@ impl<I: VCodeInst> VCodeBuilder<I> {
         // Generate debug-value labels based on per-label maps.
         for (label, tuples) in &self.debug_info {
             for &(start, end, vreg) in tuples {
-                let vreg = self.vcode.resolve_vreg_alias(vreg);
+                let vreg = self.resolve_vreg_alias(vreg);
                 let fwd_start = translate(end);
                 let fwd_end = translate(start);
                 self.vcode
@@ -528,7 +549,7 @@ impl<I: VCodeInst> VCodeBuilder<I> {
             let allocatable = PRegSet::from(self.vcode.machine_env());
             let mut op_collector =
                 OperandCollector::new(&mut self.vcode.operands, allocatable, |vreg| {
-                    VCode::<I>::resolve_vreg_alias_impl(vreg_aliases, vreg)
+                    Self::resolve_vreg_alias_impl(vreg_aliases, vreg)
                 });
             insn.get_operands(&mut op_collector);
             let (ops, clobbers) = op_collector.finish();
@@ -556,7 +577,7 @@ impl<I: VCodeInst> VCodeBuilder<I> {
 
         // Translate blockparam args via the vreg aliases table as well.
         for arg in &mut self.vcode.branch_block_args {
-            let new_arg = VCode::<I>::resolve_vreg_alias_impl(&self.vcode.vreg_aliases, *arg);
+            let new_arg = Self::resolve_vreg_alias_impl(&self.vcode.vreg_aliases, *arg);
             trace!("operandcollector: block arg {:?} -> {:?}", arg, new_arg);
             *arg = new_arg;
         }
@@ -565,7 +586,6 @@ impl<I: VCodeInst> VCodeBuilder<I> {
     /// Build the final VCode.
     pub fn build(mut self, vregs: VRegAllocator<I>) -> VCode<I> {
         self.vcode.vreg_types = vregs.vreg_types;
-        self.vcode.facts = vregs.facts;
         self.vcode.reftyped_vregs = vregs.reftyped_vregs;
 
         if self.direction == VCodeBuildDirection::Backward {
@@ -581,7 +601,7 @@ impl<I: VCodeInst> VCodeBuilder<I> {
         // Also note that `reftyped_vregs` can't have duplicates, so after the
         // aliases are applied duplicates are removed.
         for reg in self.vcode.reftyped_vregs.iter_mut() {
-            *reg = VCode::<I>::resolve_vreg_alias_impl(&self.vcode.vreg_aliases, *reg);
+            *reg = Self::resolve_vreg_alias_impl(&self.vcode.vreg_aliases, *reg);
         }
         self.vcode.reftyped_vregs.sort();
         self.vcode.reftyped_vregs.dedup();
@@ -634,7 +654,6 @@ impl<I: VCodeInst> VCode<I> {
             constants,
             debug_value_labels: vec![],
             vreg_aliases: FxHashMap::with_capacity_and_hasher(10 * n_blocks, Default::default()),
-            facts: vec![],
         }
     }
 
@@ -1237,34 +1256,6 @@ impl<I: VCodeInst> VCode<I> {
         self.block_order.lowered_order()[block.index()].orig_block()
     }
 
-    pub fn resolve_vreg_alias(&self, from: regalloc2::VReg) -> regalloc2::VReg {
-        Self::resolve_vreg_alias_impl(&self.vreg_aliases, from)
-    }
-
-    /// Implementation of alias resolution. Separate helper that does
-    /// not borrow `self` in order to allow working around borrowing
-    /// restrictions.
-    fn resolve_vreg_alias_impl(
-        aliases: &FxHashMap<regalloc2::VReg, regalloc2::VReg>,
-        from: regalloc2::VReg,
-    ) -> regalloc2::VReg {
-        // We prevent cycles from existing by resolving targets of
-        // aliases eagerly before setting them. If the target resolves
-        // to the origin of the alias, then a cycle would be created
-        // and the alias is disallowed. Because of the structure of
-        // SSA code (one instruction can refer to another's defs but
-        // not vice-versa, except indirectly through
-        // phis/blockparams), cycles should not occur as we use
-        // aliases to redirect vregs to the temps that actually define
-        // them.
-
-        let mut vreg = from;
-        while let Some(to) = aliases.get(&vreg) {
-            vreg = *to;
-        }
-        vreg
-    }
-
     #[inline]
     fn assert_no_vreg_aliases<'a>(&self, list: &'a [VReg]) -> &'a [VReg] {
         for vreg in list {
@@ -1275,7 +1266,7 @@ impl<I: VCodeInst> VCode<I> {
 
     #[inline]
     fn assert_not_vreg_alias(&self, vreg: VReg) -> VReg {
-        debug_assert!(self.resolve_vreg_alias(vreg) == vreg);
+        debug_assert!(VCodeBuilder::<I>::resolve_vreg_alias_impl(&self.vreg_aliases, vreg) == vreg);
         vreg
     }
 
@@ -1287,40 +1278,6 @@ impl<I: VCodeInst> VCode<I> {
         self.assert_not_vreg_alias(op.vreg());
         op
     }
-
-    /// Get the type of a VReg.
-    pub fn vreg_type(&self, vreg: VReg) -> Type {
-        self.vreg_types[vreg.vreg()]
-    }
-
-    /// Get the fact, if any, for a given VReg.
-    pub fn vreg_fact(&self, vreg: VReg) -> Option<&Fact> {
-        let vreg = self.resolve_vreg_alias(vreg);
-        self.facts[vreg.vreg()].as_ref()
-    }
-
-    /// Set the fact for a given VReg.
-    pub fn set_vreg_fact(&mut self, vreg: VReg, fact: Fact) {
-        let vreg = self.resolve_vreg_alias(vreg);
-        trace!("set fact on {}: {:?}", vreg, fact);
-        self.facts[vreg.vreg()] = Some(fact);
-    }
-
-    /// Does a given instruction define any facts?
-    pub fn inst_defines_facts(&self, inst: InsnIndex) -> bool {
-        self.inst_operands(inst)
-            .iter()
-            .filter(|o| o.kind() == OperandKind::Def)
-            .map(|o| o.vreg())
-            .any(|vreg| self.facts[vreg.vreg()].is_some())
-    }
-}
-
-impl<I: VCodeInst> std::ops::Index<InsnIndex> for VCode<I> {
-    type Output = I;
-    fn index(&self, idx: InsnIndex) -> &Self::Output {
-        &self.insts[idx.index()]
-    }
 }
 
 impl<I: VCodeInst> RegallocFunction for VCode<I> {
@@ -1475,13 +1432,6 @@ impl<I: VCodeInst> fmt::Debug for VCode<I> {
                     inst,
                     self.insts[inst].pretty_print_inst(&[], &mut state)
                 )?;
-                for operand in self.inst_operands(InsnIndex::new(inst)) {
-                    if operand.kind() == OperandKind::Def {
-                        if let Some(fact) = &self.facts[operand.vreg().vreg()] {
-                            writeln!(f, "    v{} ! {}", operand.vreg().vreg(), fact)?;
-                        }
-                    }
-                }
             }
         }
 
@@ -1507,15 +1457,6 @@ pub struct VRegAllocator<I> {
     /// reftype-status of each vreg) for efficient iteration.
     reftyped_vregs: Vec<VReg>,
 
-    /// A deferred error, to be bubbled up to the top level of the
-    /// lowering algorithm. We take this approach because we cannot
-    /// currently propagate a `Result` upward through ISLE code (the
-    /// lowering rules) or some ABI code.
-    deferred_error: Option<CodegenError>,
-
-    /// Facts on VRegs, for proof-carrying code.
-    facts: Vec<Option<Fact>>,
-
     /// The type of instruction that this allocator makes registers for.
     _inst: core::marker::PhantomData<I>,
 }
@@ -1526,19 +1467,14 @@ impl<I: VCodeInst> VRegAllocator<I> {
         Self {
             next_vreg: first_user_vreg_index(),
             vreg_types: vec![],
-            facts: vec![],
             reftyped_vregs_set: FxHashSet::default(),
             reftyped_vregs: vec![],
-            deferred_error: None,
             _inst: core::marker::PhantomData::default(),
         }
     }
 
     /// Allocate a fresh ValueRegs.
     pub fn alloc(&mut self, ty: Type) -> CodegenResult<ValueRegs<Reg>> {
-        if self.deferred_error.is_some() {
-            return Err(CodegenError::CodeTooLarge);
-        }
         let v = self.next_vreg;
         let (regclasses, tys) = I::rc_for_type(ty)?;
         self.next_vreg += regclasses.len();
@@ -1557,46 +1493,9 @@ impl<I: VCodeInst> VRegAllocator<I> {
         for (&reg_ty, &reg) in tys.iter().zip(regs.regs().iter()) {
             self.set_vreg_type(reg.to_virtual_reg().unwrap(), reg_ty);
         }
-
-        // Create empty facts for each allocated vreg.
-        self.facts
-            .resize(usize::try_from(self.next_vreg).unwrap(), None);
-
         Ok(regs)
     }
 
-    /// Allocate a fresh ValueRegs, deferring any out-of-vregs
-    /// errors. This is useful in places where we cannot bubble a
-    /// `CodegenResult` upward easily, and which are known to be
-    /// invoked from within the lowering loop that checks the deferred
-    /// error status below.
-    pub fn alloc_with_deferred_error(&mut self, ty: Type) -> ValueRegs<Reg> {
-        match self.alloc(ty) {
-            Ok(x) => x,
-            Err(e) => {
-                self.deferred_error = Some(e);
-                self.bogus_for_deferred_error(ty)
-            }
-        }
-    }
-
-    /// Take any deferred error that was accumulated by `alloc_with_deferred_error`.
-    pub fn take_deferred_error(&mut self) -> Option<CodegenError> {
-        self.deferred_error.take()
-    }
-
-    /// Produce an bogus VReg placeholder with the proper number of
-    /// registers for the given type. This is meant to be used with
-    /// deferred allocation errors (see `Lower::alloc_tmp()`).
-    fn bogus_for_deferred_error(&self, ty: Type) -> ValueRegs<Reg> {
-        let (regclasses, _tys) = I::rc_for_type(ty).expect("must have valid type");
-        match regclasses {
-            &[rc0] => ValueRegs::one(VReg::new(0, rc0).into()),
-            &[rc0, rc1] => ValueRegs::two(VReg::new(0, rc0).into(), VReg::new(1, rc1).into()),
-            _ => panic!("Value must reside in 1 or 2 registers"),
-        }
-    }
-
     /// Set the type of this virtual register.
     pub fn set_vreg_type(&mut self, vreg: VirtualReg, ty: Type) {
         if self.vreg_types.len() <= vreg.index() {
@@ -1610,48 +1509,6 @@ impl<I: VCodeInst> VRegAllocator<I> {
             }
         }
     }
-
-    /// Set the proof-carrying code fact on a given virtual register.
-    ///
-    /// Returns the old fact, if any (only one fact can be stored).
-    pub fn set_fact(&mut self, vreg: VirtualReg, fact: Fact) -> Option<Fact> {
-        trace!("vreg {:?} has fact: {:?}", vreg, fact);
-        self.facts[vreg.index()].replace(fact)
-    }
-
-    /// Take (and remove) a fact about a VReg. Used when setting up
-    /// aliases: we want to move a fact from the alias vreg to the
-    /// aliased vreg, to preserve facts about a value that were stated
-    /// before we lowered its producer.
-    pub fn take_fact(&mut self, vreg: VirtualReg) -> Option<Fact> {
-        self.facts[vreg.index()].take()
-    }
-
-    /// Set a fact only if one doesn't already exist.
-    pub fn set_fact_if_missing(&mut self, vreg: VirtualReg, fact: Fact) {
-        if self.facts[vreg.index()].is_none() {
-            self.set_fact(vreg, fact);
-        }
-    }
-
-    /// Allocate a fresh ValueRegs, with a given fact to apply if
-    /// the value fits in one VReg.
-    pub fn alloc_with_maybe_fact(
-        &mut self,
-        ty: Type,
-        fact: Option<Fact>,
-    ) -> CodegenResult<ValueRegs<Reg>> {
-        let result = self.alloc(ty)?;
-
-        // Ensure that we don't lose a fact on a value that splits
-        // into multiple VRegs.
-        assert!(result.len() == 1 || fact.is_none());
-        if let Some(fact) = fact {
-            self.set_fact(result.regs()[0].to_virtual_reg().unwrap(), fact);
-        }
-
-        Ok(result)
-    }
 }
 
 /// This structure tracks the large constants used in VCode that will be emitted separately by the
diff --git a/cranelift/codegen/src/opts/bitops.isle b/cranelift/codegen/src/opts/bitops.isle
index df0029c04442..7e454902af09 100644
--- a/cranelift/codegen/src/opts/bitops.isle
+++ b/cranelift/codegen/src/opts/bitops.isle
@@ -145,54 +145,3 @@
 
 ;; (bitrev (bitrev x)) == x
 (rule (simplify (bitrev ty (bitrev ty x))) (subsume x))
-
-;; WebAssembly doesn't have a native byte-swapping instruction at this time so
-;; languages which have a byte-swapping operation will compile it down to bit
-;; shifting and twiddling. This attempts to pattern match what LLVM currently
-;; generates today for the Rust code `a.swap_bytes()`. This might be a bit
-;; brittle over time and/or with other possible LLVM backend optimizations, but
-;; it's at least one way to generate a byte swap.
-;;
-;; Technically this could be permuted quite a few ways and currently there's no
-;; easy way to match all of them, so only one is matched here.
-(rule (simplify (bor ty @ $I32
-    (bor ty
-      (ishl ty x (iconst ty (u64_from_imm64 24)))
-      (ishl ty
-        (band ty x (iconst ty (u64_from_imm64 0xff00)))
-        (iconst ty (u64_from_imm64 8))))
-    (bor ty
-      (band ty
-        (ushr ty x (iconst ty (u64_from_imm64 8)))
-        (iconst ty (u64_from_imm64 0xff00)))
-      (ushr ty x (iconst ty (u64_from_imm64 24))))))
-  (bswap ty x))
-
-(rule (simplify (bor ty @ $I64
-    (bor ty
-      (bor ty
-        (ishl ty x (iconst ty (u64_from_imm64 56)))
-        (ishl ty
-          (band ty x (iconst ty (u64_from_imm64 0xff00)))
-          (iconst ty (u64_from_imm64 40))))
-      (bor ty
-        (ishl ty
-          (band ty x (iconst ty (u64_from_imm64 0xff_0000)))
-          (iconst ty (u64_from_imm64 24)))
-        (ishl ty
-          (band ty x (iconst ty (u64_from_imm64 0xff00_0000)))
-          (iconst ty (u64_from_imm64 8)))))
-    (bor ty
-      (bor ty
-        (band ty
-          (ushr ty x (iconst ty (u64_from_imm64 8)))
-          (iconst ty (u64_from_imm64 0xff00_0000)))
-        (band ty
-          (ushr ty x (iconst ty (u64_from_imm64 24)))
-          (iconst ty (u64_from_imm64 0xff_0000))))
-      (bor ty
-        (band ty
-          (ushr ty x (iconst ty (u64_from_imm64 40)))
-          (iconst ty (u64_from_imm64 0xff00)))
-        (ushr ty x (iconst ty (u64_from_imm64 56)))))))
-  (bswap ty x))
diff --git a/cranelift/codegen/src/prelude.isle b/cranelift/codegen/src/prelude.isle
index f5546ca2c938..0df4ce6a6ff2 100644
--- a/cranelift/codegen/src/prelude.isle
+++ b/cranelift/codegen/src/prelude.isle
@@ -77,9 +77,6 @@
 
 ;;;; Primitive Type Conversions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(decl pure u8_as_i8 (u8) i8)
-(extern constructor u8_as_i8 u8_as_i8)
-
 (decl pure u8_as_u32 (u8) u32)
 (extern constructor u8_as_u32 u8_as_u32)
 (convert u8 u32 u8_as_u32)
@@ -191,12 +188,6 @@
 (decl pure u64_lt (u64 u64) bool)
 (extern constructor u64_lt u64_lt)
 
-(decl pure i64_shr (i64 i64) i64)
-(extern constructor i64_shr i64_shr)
-
-(decl pure i64_ctz (i64) i64)
-(extern constructor i64_ctz i64_ctz)
-
 ;; Sign extends a u64 from ty bits up to 64bits
 (decl pure i64_sextend_u64 (Type u64) i64)
 (extern constructor i64_sextend_u64 i64_sextend_u64)
@@ -213,32 +204,15 @@
 (decl u64_is_zero (bool) u64)
 (extern extractor infallible u64_is_zero u64_is_zero)
 
-(decl i64_is_zero (bool) i64)
-(extern extractor infallible i64_is_zero i64_is_zero)
-
 (decl u64_zero () u64)
 (extractor (u64_zero) (u64_is_zero $true))
 
 (decl u64_nonzero (u64) u64)
 (extractor (u64_nonzero x) (and (u64_is_zero $false) x))
 
-(decl i64_nonzero (i64) i64)
-(extractor (i64_nonzero x) (and (i64_is_zero $false) x))
-
 (decl pure u64_is_odd (u64) bool)
 (extern constructor u64_is_odd u64_is_odd)
 
-;; Each of these extractors tests whether the upper half of the input equals the
-;; lower half of the input
-(decl u128_replicated_u64 (u64) u128)
-(extern extractor u128_replicated_u64 u128_replicated_u64)
-(decl u64_replicated_u32 (u64) u64)
-(extern extractor u64_replicated_u32 u64_replicated_u32)
-(decl u32_replicated_u16 (u64) u64)
-(extern extractor u32_replicated_u16 u32_replicated_u16)
-(decl u16_replicated_u8 (u8) u64)
-(extern extractor u16_replicated_u8 u16_replicated_u8)
-
 ;;;; `cranelift_codegen::ir::Type` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (extern const $I8 Type)
@@ -343,12 +317,6 @@
 (decl intcc_complement (IntCC) IntCC)
 (extern constructor intcc_complement intcc_complement)
 
-;; This is a direct import of `IntCC::without_equal`.
-;; Get the corresponding IntCC with the equal component removed.
-;; For conditions without a zero component, this is a no-op.
-(decl pure intcc_without_eq (IntCC) IntCC)
-(extern constructor intcc_without_eq intcc_without_eq)
-
 ;; Swap args of a FloatCC flag.
 (decl floatcc_swap_args (FloatCC) FloatCC)
 (extern constructor floatcc_swap_args floatcc_swap_args)
@@ -431,10 +399,6 @@
 (decl ty_8_or_16 (Type) Type)
 (extern extractor ty_8_or_16 ty_8_or_16)
 
-;; An extractor that matches 16- and 32-bit types only.
-(decl ty_16_or_32 (Type) Type)
-(extern extractor ty_16_or_32 ty_16_or_32)
-
 ;; An extractor that matches int types that fit in 32 bits.
 (decl int_fits_in_32 (Type) Type)
 (extern extractor int_fits_in_32 int_fits_in_32)
diff --git a/cranelift/codegen/src/prelude_lower.isle b/cranelift/codegen/src/prelude_lower.isle
index d90286e88a6f..133f98b01d45 100644
--- a/cranelift/codegen/src/prelude_lower.isle
+++ b/cranelift/codegen/src/prelude_lower.isle
@@ -40,18 +40,10 @@
 (decl value_reg (Reg) ValueRegs)
 (extern constructor value_reg value_reg)
 
-;; Construct a `WritableValueRegs` of one register.
-(decl writable_value_reg (WritableReg) WritableValueRegs)
-(extern constructor writable_value_reg writable_value_reg)
-
 ;; Construct a `ValueRegs` of two registers.
 (decl value_regs (Reg Reg) ValueRegs)
 (extern constructor value_regs value_regs)
 
-;; Construct a `WritableValueRegs` of two registers.
-(decl writable_value_regs (WritableReg WritableReg) WritableValueRegs)
-(extern constructor writable_value_regs writable_value_regs)
-
 ;; Construct an empty `ValueRegs` containing only invalid register sentinels.
 (decl value_regs_invalid () ValueRegs)
 (extern constructor value_regs_invalid value_regs_invalid)
@@ -138,7 +130,7 @@
 (extern constructor value_regs_get value_regs_get)
 
 ;; Get the number of registers in a `ValueRegs`.
-(decl pure value_regs_len (ValueRegs) usize)
+(decl value_regs_len (ValueRegs) usize)
 (extern constructor value_regs_len value_regs_len)
 
 ;; Get a range for the number of regs in a `ValueRegs`.
@@ -178,11 +170,6 @@
 (rule (multi_reg_to_single (MultiReg.One a))
       (value_reg a))
 
-;; Add a range fact to a register, when compiling with
-;; proof-carrying-code enabled.
-(decl add_range_fact (Reg u16 u64 u64) Reg)
-(extern constructor add_range_fact add_range_fact)
-
 ;;;; Common Mach Types ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (type MachLabel (primitive MachLabel))
@@ -194,24 +181,6 @@
 (type VecArgPair extern (enum))
 (type VecRetPair extern (enum))
 (type CallArgList extern (enum))
-(type MachLabelSlice extern (enum))
-(type BoxVecMachLabel extern (enum))
-
-;; Extract a the target from a MachLabelSlice with exactly one target.
-(decl single_target (MachLabel) MachLabelSlice)
-(extern extractor single_target single_target)
-
-;; Extract a the targets from a MachLabelSlice with exactly two targets.
-(decl two_targets (MachLabel MachLabel) MachLabelSlice)
-(extern extractor two_targets two_targets)
-
-;; Extract the default target and jump table from a MachLabelSlice.
-(decl jump_table_targets (MachLabel BoxVecMachLabel) MachLabelSlice)
-(extern extractor jump_table_targets jump_table_targets)
-
-;; The size of the jump table.
-(decl jump_table_size (BoxVecMachLabel) u32)
-(extern constructor jump_table_size jump_table_size)
 
 ;;;; Helper Clif Extractors ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -1050,7 +1019,6 @@
 
 (convert Inst Value def_inst)
 (convert Reg ValueRegs value_reg)
-(convert WritableReg WritableValueRegs writable_value_reg)
 (convert Value Reg put_in_reg)
 (convert Value ValueRegs put_in_regs)
 (convert WritableReg Reg writable_reg_to_reg)
diff --git a/cranelift/codegen/src/print_errors.rs b/cranelift/codegen/src/print_errors.rs
index 679ce12a26fc..e3fe7366165f 100644
--- a/cranelift/codegen/src/print_errors.rs
+++ b/cranelift/codegen/src/print_errors.rs
@@ -4,7 +4,6 @@ use crate::entity::SecondaryMap;
 use crate::ir;
 use crate::ir::entities::{AnyEntity, Block, Inst, Value};
 use crate::ir::function::Function;
-use crate::ir::pcc::Fact;
 use crate::result::CodegenError;
 use crate::verifier::{VerifierError, VerifierErrors};
 use crate::write::{decorate_function, FuncWriter, PlainWriter};
@@ -72,9 +71,8 @@ impl<'a> FuncWriter for PrettyVerifierError<'a> {
         func: &Function,
         entity: AnyEntity,
         value: &dyn fmt::Display,
-        maybe_fact: Option<&Fact>,
     ) -> fmt::Result {
-        pretty_preamble_error(w, func, entity, value, maybe_fact, &mut *self.0, self.1)
+        pretty_preamble_error(w, func, entity, value, &mut *self.0, self.1)
     }
 }
 
@@ -158,12 +156,11 @@ fn pretty_preamble_error(
     func: &Function,
     entity: AnyEntity,
     value: &dyn fmt::Display,
-    maybe_fact: Option<&Fact>,
     func_w: &mut dyn FuncWriter,
     errors: &mut Vec<VerifierError>,
 ) -> fmt::Result {
     let mut s = String::new();
-    func_w.write_entity_definition(&mut s, func, entity, value, maybe_fact)?;
+    func_w.write_entity_definition(&mut s, func, entity, value)?;
     write!(w, "{}", s)?;
 
     // TODO: Use drain_filter here when it gets stabilized
diff --git a/cranelift/codegen/src/result.rs b/cranelift/codegen/src/result.rs
index 9cbef7979551..d14049c0b6b9 100644
--- a/cranelift/codegen/src/result.rs
+++ b/cranelift/codegen/src/result.rs
@@ -2,7 +2,6 @@
 
 use regalloc2::checker::CheckerErrors;
 
-use crate::ir::pcc::PccError;
 use crate::{ir::Function, verifier::VerifierErrors};
 use std::string::String;
 
@@ -42,9 +41,6 @@ pub enum CodegenError {
 
     /// Register allocator internal error discovered by the symbolic checker.
     Regalloc(CheckerErrors),
-
-    /// Proof-carrying-code validation error.
-    Pcc(PccError),
 }
 
 /// A convenient alias for a `Result` that uses `CodegenError` as the error type.
@@ -62,7 +58,6 @@ impl std::error::Error for CodegenError {
             #[cfg(feature = "unwind")]
             CodegenError::RegisterMappingError { .. } => None,
             CodegenError::Regalloc(..) => None,
-            CodegenError::Pcc(..) => None,
         }
     }
 }
@@ -77,7 +72,6 @@ impl std::fmt::Display for CodegenError {
             #[cfg(feature = "unwind")]
             CodegenError::RegisterMappingError(_0) => write!(f, "Register mapping error"),
             CodegenError::Regalloc(errors) => write!(f, "Regalloc validation errors: {:?}", errors),
-            CodegenError::Pcc(e) => write!(f, "Proof-carrying-code validation error: {:?}", e),
         }
     }
 }
diff --git a/cranelift/codegen/src/scoped_hash_map.rs b/cranelift/codegen/src/scoped_hash_map.rs
index 7f64ae3c302b..1b8fde1a544e 100644
--- a/cranelift/codegen/src/scoped_hash_map.rs
+++ b/cranelift/codegen/src/scoped_hash_map.rs
@@ -188,6 +188,19 @@ where
             .checked_sub(1)
             .expect("generation_by_depth cannot be empty")
     }
+
+    /// Remote an entry.
+    pub fn remove(&mut self, key: &K) -> Option<V> {
+        self.map.remove(key).and_then(|val| {
+            let entry_generation = val.generation;
+            let entry_depth = val.level as usize;
+            if self.generation_by_depth.get(entry_depth).cloned() == Some(entry_generation) {
+                Some(val.value)
+            } else {
+                None
+            }
+        })
+    }
 }
 
 #[cfg(test)]
diff --git a/cranelift/codegen/src/settings.rs b/cranelift/codegen/src/settings.rs
index 9c52203365cf..bb4af16d1fb6 100644
--- a/cranelift/codegen/src/settings.rs
+++ b/cranelift/codegen/src/settings.rs
@@ -530,7 +530,6 @@ regalloc_checker = false
 regalloc_verbose_logs = false
 enable_alias_analysis = true
 enable_verifier = true
-enable_pcc = false
 is_pic = false
 use_colocated_libcalls = false
 enable_float = true
diff --git a/cranelift/codegen/src/verifier/mod.rs b/cranelift/codegen/src/verifier/mod.rs
index 608d0ac050ed..5eaecaa190fa 100644
--- a/cranelift/codegen/src/verifier/mod.rs
+++ b/cranelift/codegen/src/verifier/mod.rs
@@ -47,12 +47,6 @@
 //! - Detect cycles in global values.
 //! - Detect use of 'vmctx' global value when no corresponding parameter is defined.
 //!
-//! Memory types
-//!
-//! - Ensure that struct fields are in offset order.
-//! - Ensure that struct fields are completely within the overall
-//!   struct size, and do not overlap.
-//!
 //! TODO:
 //! Ad hoc checking
 //!
@@ -72,8 +66,7 @@ use crate::ir::instructions::{CallInfo, InstructionFormat, ResolvedConstraint};
 use crate::ir::{self, ArgumentExtension};
 use crate::ir::{
     types, ArgumentPurpose, Block, Constant, DynamicStackSlot, FuncRef, Function, GlobalValue,
-    Inst, JumpTable, MemFlags, MemoryTypeData, Opcode, SigRef, StackSlot, Type, Value, ValueDef,
-    ValueList,
+    Inst, JumpTable, MemFlags, Opcode, SigRef, StackSlot, Type, Value, ValueDef, ValueList,
 };
 use crate::isa::TargetIsa;
 use crate::iterators::IteratorExtras;
@@ -410,53 +403,6 @@ impl<'a> Verifier<'a> {
         Ok(())
     }
 
-    fn verify_memory_types(&self, errors: &mut VerifierErrors) -> VerifierStepResult<()> {
-        // Verify that all fields are statically-sized and lie within
-        // the struct, do not overlap, and are in offset order
-        for (mt, mt_data) in &self.func.memory_types {
-            match mt_data {
-                MemoryTypeData::Struct { size, fields } => {
-                    let mut last_offset = 0;
-                    for field in fields {
-                        if field.offset < last_offset {
-                            errors.report((
-                                mt,
-                                format!(
-                                    "memory type {} has a field at offset {}, which is out-of-order",
-                                    mt, field.offset
-                                ),
-                            ));
-                        }
-                        last_offset = match field.offset.checked_add(u64::from(field.ty.bytes())) {
-                            Some(o) => o,
-                            None => {
-                                errors.report((
-                                        mt,
-                                        format!(
-                                            "memory type {} has a field at offset {} of size {}; offset plus size overflows a u64",
-                                            mt, field.offset, field.ty.bytes()),
-                                ));
-                                break;
-                            }
-                        };
-
-                        if last_offset > *size {
-                            errors.report((
-                                        mt,
-                                        format!(
-                                            "memory type {} has a field at offset {} of size {} that overflows the struct size {}",
-                                            mt, field.offset, field.ty.bytes(), *size),
-                                          ));
-                        }
-                    }
-                }
-                _ => {}
-            }
-        }
-
-        Ok(())
-    }
-
     fn verify_tables(&self, errors: &mut VerifierErrors) -> VerifierStepResult<()> {
         if let Some(isa) = self.isa {
             for (table, table_data) in &self.func.tables {
@@ -1808,7 +1754,6 @@ impl<'a> Verifier<'a> {
 
     pub fn run(&self, errors: &mut VerifierErrors) -> VerifierStepResult<()> {
         self.verify_global_values(errors)?;
-        self.verify_memory_types(errors)?;
         self.verify_tables(errors)?;
         self.typecheck_entry_block_params(errors)?;
         self.check_entry_not_cold(errors)?;
diff --git a/cranelift/codegen/src/write.rs b/cranelift/codegen/src/write.rs
index 3bfc4d7707d8..39025fd7addc 100644
--- a/cranelift/codegen/src/write.rs
+++ b/cranelift/codegen/src/write.rs
@@ -5,7 +5,6 @@
 
 use crate::entity::SecondaryMap;
 use crate::ir::entities::AnyEntity;
-use crate::ir::pcc::Fact;
 use crate::ir::{Block, DataFlowGraph, Function, Inst, SigRef, Type, Value, ValueDef};
 use crate::packed_option::ReservedValue;
 use alloc::string::{String, ToString};
@@ -44,29 +43,23 @@ pub trait FuncWriter {
 
         for (ss, slot) in func.dynamic_stack_slots.iter() {
             any = true;
-            self.write_entity_definition(w, func, ss.into(), slot, None)?;
+            self.write_entity_definition(w, func, ss.into(), slot)?;
         }
 
         for (ss, slot) in func.sized_stack_slots.iter() {
             any = true;
-            self.write_entity_definition(w, func, ss.into(), slot, None)?;
+            self.write_entity_definition(w, func, ss.into(), slot)?;
         }
 
         for (gv, gv_data) in &func.global_values {
             any = true;
-            let maybe_fact = func.global_value_facts[gv].as_ref();
-            self.write_entity_definition(w, func, gv.into(), gv_data, maybe_fact)?;
-        }
-
-        for (mt, mt_data) in &func.memory_types {
-            any = true;
-            self.write_entity_definition(w, func, mt.into(), mt_data, None)?;
+            self.write_entity_definition(w, func, gv.into(), gv_data)?;
         }
 
         for (table, table_data) in &func.tables {
             if !table_data.index_type.is_invalid() {
                 any = true;
-                self.write_entity_definition(w, func, table.into(), table_data, None)?;
+                self.write_entity_definition(w, func, table.into(), table_data)?;
             }
         }
 
@@ -74,7 +67,7 @@ pub trait FuncWriter {
         // signatures.
         for (sig, sig_data) in &func.dfg.signatures {
             any = true;
-            self.write_entity_definition(w, func, sig.into(), &sig_data, None)?;
+            self.write_entity_definition(w, func, sig.into(), &sig_data)?;
         }
 
         for (fnref, ext_func) in &func.dfg.ext_funcs {
@@ -85,19 +78,18 @@ pub trait FuncWriter {
                     func,
                     fnref.into(),
                     &ext_func.display(Some(&func.params)),
-                    None,
                 )?;
             }
         }
 
         for (&cref, cval) in func.dfg.constants.iter() {
             any = true;
-            self.write_entity_definition(w, func, cref.into(), cval, None)?;
+            self.write_entity_definition(w, func, cref.into(), cval)?;
         }
 
         if let Some(limit) = func.stack_limit {
             any = true;
-            self.write_entity_definition(w, func, AnyEntity::StackLimit, &limit, None)?;
+            self.write_entity_definition(w, func, AnyEntity::StackLimit, &limit)?;
         }
 
         Ok(any)
@@ -110,9 +102,8 @@ pub trait FuncWriter {
         func: &Function,
         entity: AnyEntity,
         value: &dyn fmt::Display,
-        maybe_fact: Option<&Fact>,
     ) -> fmt::Result {
-        self.super_entity_definition(w, func, entity, value, maybe_fact)
+        self.super_entity_definition(w, func, entity, value)
     }
 
     /// Default impl of `write_entity_definition`
@@ -123,13 +114,8 @@ pub trait FuncWriter {
         func: &Function,
         entity: AnyEntity,
         value: &dyn fmt::Display,
-        maybe_fact: Option<&Fact>,
     ) -> fmt::Result {
-        if let Some(fact) = maybe_fact {
-            writeln!(w, "    {} ! {} = {}", entity, fact, value)
-        } else {
-            writeln!(w, "    {} = {}", entity, value)
-        }
+        writeln!(w, "    {} = {}", entity, value)
     }
 }
 
@@ -213,12 +199,7 @@ fn write_spec(w: &mut dyn Write, func: &Function) -> fmt::Result {
 // Basic blocks
 
 fn write_arg(w: &mut dyn Write, func: &Function, arg: Value) -> fmt::Result {
-    let ty = func.dfg.value_type(arg);
-    if let Some(f) = &func.dfg.facts[arg] {
-        write!(w, "{} ! {}: {}", arg, f, ty)
-    } else {
-        write!(w, "{}: {}", arg, ty)
-    }
+    write!(w, "{}: {}", arg, func.dfg.value_type(arg))
 }
 
 /// Write out the basic block header, outdented:
@@ -365,9 +346,6 @@ fn write_instruction(
         } else {
             write!(w, ", {}", r)?;
         }
-        if let Some(f) = &func.dfg.facts[*r] {
-            write!(w, " ! {}", f)?;
-        }
     }
     if has_results {
         write!(w, " = ")?;
diff --git a/cranelift/control/Cargo.toml b/cranelift/control/Cargo.toml
index 08b5d0ece510..006afd14420d 100644
--- a/cranelift/control/Cargo.toml
+++ b/cranelift/control/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-control"
-version = "0.102.0"
+version = "0.101.0"
 description = "White-box fuzz testing framework"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"
@@ -10,7 +10,7 @@ keywords = ["fuzz", "test"]
 edition.workspace = true
 
 [dependencies]
-arbitrary = { workspace = true }
+arbitrary = { version = "1.3.0" }
 
 [features]
 
diff --git a/cranelift/entity/Cargo.toml b/cranelift/entity/Cargo.toml
index c0f08dde9847..5740ce49538f 100644
--- a/cranelift/entity/Cargo.toml
+++ b/cranelift/entity/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-entity"
-version = "0.102.0"
+version = "0.101.0"
 description = "Data structures using entity references as mapping keys"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-entity"
diff --git a/cranelift/filetests/Cargo.toml b/cranelift/filetests/Cargo.toml
index ca5329dc1505..58965bbc4bbb 100644
--- a/cranelift/filetests/Cargo.toml
+++ b/cranelift/filetests/Cargo.toml
@@ -28,7 +28,7 @@ num_cpus = "1.8.0"
 target-lexicon = { workspace = true }
 thiserror = { workspace = true }
 anyhow = { workspace = true }
-similar = { workspace = true }
+similar ={ workspace = true }
 wat.workspace = true
 toml = { workspace = true }
 serde = { workspace = true }
@@ -36,6 +36,5 @@ serde_derive = { workspace = true }
 cranelift-wasm.workspace = true
 wasmparser.workspace = true
 cranelift.workspace = true
-smallvec = { workspace = true }
 env_logger = { workspace = true }
 expect-test = { workspace = true }
diff --git a/cranelift/filetests/filetests/egraph/licm.clif b/cranelift/filetests/filetests/egraph/licm.clif
index 51fdf38a5fb5..f2f84c58302c 100644
--- a/cranelift/filetests/filetests/egraph/licm.clif
+++ b/cranelift/filetests/filetests/egraph/licm.clif
@@ -20,21 +20,21 @@ block2(v9: i32):
 }
 
 ; check:  block0(v0: i32, v1: i32):
-; check:      jump block1(v0)
+; nextln:     jump block1(v0)
 
 ; check:  block1(v2: i32):
-;; constants are rematerialized in each block where used
-; check:      v10 = iconst.i32 40
-; check:      v11 = icmp eq v2, v10
-; check:      v12 = iconst.i32 1
-; check:      v13 = iadd v2, v12
-; check:      brif v11, block2, block1(v13)
+;; constants are not lifted; they are rematerialized in each block where used
+; check:      v5 = iconst.i32 40
+; check:      v6 = icmp eq v2, v5
+; check:      v3 = iconst.i32 1
+; check:      v8 = iadd v2, v3
+; check:      brif v6, block2, block1(v8)
 
 
 ; check:  block2:
-; check:      v14 = iconst.i32 1
-; check:      v15 = iadd.i32 v1, v14
-; check:      return v15
+; check:      v10 = iconst.i32 1
+; check:      v4 = iadd.i32 v1, v10
+; check:      return v4
 
 function %f(i64x2, i32) -> i64x2 {
 block0(v0: i64x2, v1: i32):
@@ -52,14 +52,14 @@ block2(v8: i64x2):
 }
 
 ; check:  block0(v0: i64x2, v1: i32):
-; check:      v4 = vconst.i64x2 const0
+; nextln:     v4 = vconst.i64x2 const0
 ; nextln:     jump block1(v0, v1)
 ; check:  block1(v2: i64x2, v3: i32):
-; check:      v9 = iconst.i32 1
-; check:      v10 = isub v3, v9
+; check:      v6 = iconst.i32 1
+; check:      v7 = isub v3, v6
 ; check:      v5 = iadd v2, v4
 ; check:      v8 -> v5
-; check:      brif v10, block1(v5, v10), block2
+; check:      brif v7, block1(v5, v7), block2
 ; check:  block2:
 ; check:      return v5
 
@@ -94,50 +94,13 @@ block4:
 ; check:      v8 = vconst.i64x2 const0
 ; check:      jump block2(v3, v1)
 ; check:  block2(v6: i64x2, v7: i32):
-; check:      v15 = iconst.i32 1
-; check:      v16 = isub v7, v15
+; check:      v10 = iconst.i32 1
+; check:      v11 = isub v7, v10
 ; check:      v9 = iadd v6, v8
-; check:      brif v16, block2(v9, v16), block3
+; check:      brif v11, block2(v9, v11), block3
 ; check:  block3:
-; check:      v17 = iconst.i32 1
-; check:      v18 = isub.i32 v5, v17
-; check:      brif v18, block1(v9, v18), block4
+; check:      v15 = iconst.i32 1
+; check:      v14 = isub.i32 v5, v15
+; check:      brif v14, block1(v9, v14), block4
 ; check:  block4:
 ; check:      return v9
-
-;; Don't let a rematerialized iconst inhibit (or even reverse)
-;; LICM. See issue #7283.
-
-function %f(i64, i64) {
-block0(v0: i64, v1: i64):
-    ;; Create a loop-invariant value `v10` which is some operation which
-    ;; includes a constant somewhere.
-    v8 = load.f64 v0+100
-    v9 = f64const 0x1.0000000000000p1
-    v10 = fdiv v8, v9
-
-    ;; jump to the loop
-    v3 = iconst.i64 0
-    jump block2(v3)  ; v3 = 0
-
-block2(v11: i64):
-    ;; store the loop-invariant `v10` to memory "somewhere"
-    v15 = iadd v0, v11
-    store.f64 v10, v15
-
-    ;; loop breakout condition
-    v17 = iadd_imm v11, 1
-    v19 = icmp_imm ne v17, 100
-    brif v19, block2(v17), block1
-
-block1:
-    return
-}
-
-; check: load
-; check: f64const
-; check: fdiv
-; check: block2(v11: i64)
-; check: iadd
-; check: store
-; check: brif
diff --git a/cranelift/filetests/filetests/egraph/load-hoist.clif b/cranelift/filetests/filetests/egraph/load-hoist.clif
index 37cf9ad360ee..f52a1995c434 100644
--- a/cranelift/filetests/filetests/egraph/load-hoist.clif
+++ b/cranelift/filetests/filetests/egraph/load-hoist.clif
@@ -41,4 +41,4 @@ function %foo(i64 vmctx, i64, i32, i32) -> i32 fast {
 ; check: block2(v6: i32, v7: i32, v15: i32):
 ; check:    v10 = iadd.i64 v9, v8
 ; check:    v11 = load.i32 little heap v10
-; check:    brif v19, block2(v12, v21, v19), block4
+; check:    brif v17, block2(v12, v14, v17), block4
diff --git a/cranelift/filetests/filetests/egraph/remat.clif b/cranelift/filetests/filetests/egraph/remat.clif
index a1be556ce2c0..861e4a8cdd9e 100644
--- a/cranelift/filetests/filetests/egraph/remat.clif
+++ b/cranelift/filetests/filetests/egraph/remat.clif
@@ -26,6 +26,7 @@ block2:
 ; check:      v13 = iadd.i32 v0, v11
 ; check:      return v13
 ; check:   block2:
-; check:      v15 = iadd.i32 v0, v1
-; check:      return v15
+; check:      v15 = iconst.i32 42
+; check:      v16 = iadd.i32 v0, v15
+; check:      return v16
 
diff --git a/cranelift/filetests/filetests/isa/aarch64/bti.clif b/cranelift/filetests/filetests/isa/aarch64/bti.clif
index d5e7841bf0d8..e132c493c0a1 100644
--- a/cranelift/filetests/filetests/isa/aarch64/bti.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/bti.clif
@@ -32,7 +32,7 @@ block5(v5: i32):
 ; block0:
 ;   emit_island 44
 ;   subs wzr, w0, #3
-;   b.hs label4 ; csel x11, xzr, x0, hs ; csdb ; adr x10, pc+16 ; ldrsw x11, [x10, x11, uxtw #2] ; add x10, x10, x11 ; br x10 ; jt_entries [MachLabel(3), MachLabel(2), MachLabel(1)]
+;   b.hs label4 ; csel x11, xzr, x0, hs ; csdb ; adr x10, pc+16 ; ldrsw x11, [x10, x11, uxtw #2] ; add x10, x10, x11 ; br x10 ; jt_entries [Label(MachLabel(3)), Label(MachLabel(2)), Label(MachLabel(1))]
 ; block1:
 ;   bti j
 ;   movz w5, #3
@@ -107,7 +107,7 @@ block2:
 ;   mov x8, x5
 ;   emit_island 36
 ;   subs wzr, w0, #1
-;   b.hs label2 ; csel x7, xzr, x0, hs ; csdb ; adr x6, pc+16 ; ldrsw x7, [x6, x7, uxtw #2] ; add x6, x6, x7 ; br x6 ; jt_entries [MachLabel(1)]
+;   b.hs label2 ; csel x7, xzr, x0, hs ; csdb ; adr x6, pc+16 ; ldrsw x7, [x6, x7, uxtw #2] ; add x6, x6, x7 ; br x6 ; jt_entries [Label(MachLabel(1))]
 ; block1:
 ;   bti j
 ;   mov x0, x8
diff --git a/cranelift/filetests/filetests/isa/aarch64/call.clif b/cranelift/filetests/filetests/isa/aarch64/call.clif
index 649feef71613..7f371334e244 100644
--- a/cranelift/filetests/filetests/isa/aarch64/call.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/call.clif
@@ -707,8 +707,8 @@ block0(v0: i128, v1: i64):
 ;   mov x5, x1
 ;   load_ext_name x10, TestCase(%f14)+0
 ;   mov x0, x4
-;   mov x1, x5
 ;   mov x2, x4
+;   mov x1, x5
 ;   mov x3, x5
 ;   blr x10
 ;   add sp, sp, #16
@@ -732,8 +732,8 @@ block0(v0: i128, v1: i64):
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %f14 0
 ;   .byte 0x00, 0x00, 0x00, 0x00
 ;   mov x0, x4
-;   mov x1, x5
 ;   mov x2, x4
+;   mov x1, x5
 ;   mov x3, x5
 ;   blr x10
 ;   add sp, sp, #0x10
@@ -785,8 +785,8 @@ block0(v0: i128, v1: i64):
 ;   mov x5, x1
 ;   load_ext_name x10, TestCase(%f15)+0
 ;   mov x0, x4
-;   mov x1, x5
 ;   mov x2, x4
+;   mov x1, x5
 ;   mov x3, x5
 ;   blr x10
 ;   add sp, sp, #16
@@ -810,8 +810,8 @@ block0(v0: i128, v1: i64):
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %f15 0
 ;   .byte 0x00, 0x00, 0x00, 0x00
 ;   mov x0, x4
-;   mov x1, x5
 ;   mov x2, x4
+;   mov x1, x5
 ;   mov x3, x5
 ;   blr x10
 ;   add sp, sp, #0x10
diff --git a/cranelift/filetests/filetests/isa/aarch64/iabs.clif b/cranelift/filetests/filetests/isa/aarch64/iabs.clif
index b76916e8bba7..c559a2313e11 100644
--- a/cranelift/filetests/filetests/isa/aarch64/iabs.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/iabs.clif
@@ -190,27 +190,3 @@ block0(v0: i64):
 ;   cneg x0, x0, le
 ;   ret
 
-function %f11(i128) -> i128 {
-block0(v0: i128):
-  v1 = iabs v0
-  return v1
-}
-
-; VCode:
-; block0:
-;   asr x3, x1, #63
-;   eor x5, x1, x3
-;   eor x7, x0, x3
-;   subs x0, x7, x3
-;   sbc x1, x5, x3
-;   ret
-; 
-; Disassembled:
-; block0: ; offset 0x0
-;   asr x3, x1, #0x3f
-;   eor x5, x1, x3
-;   eor x7, x0, x3
-;   subs x0, x7, x3
-;   sbc x1, x5, x3
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/aarch64/jumptable.clif b/cranelift/filetests/filetests/isa/aarch64/jumptable.clif
index d400f74eda5f..8a885e6e77d3 100644
--- a/cranelift/filetests/filetests/isa/aarch64/jumptable.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/jumptable.clif
@@ -31,7 +31,7 @@ block5(v5: i32):
 ; block0:
 ;   emit_island 44
 ;   subs wzr, w0, #3
-;   b.hs label4 ; csel x11, xzr, x0, hs ; csdb ; adr x10, pc+16 ; ldrsw x11, [x10, x11, uxtw #2] ; add x10, x10, x11 ; br x10 ; jt_entries [MachLabel(3), MachLabel(2), MachLabel(1)]
+;   b.hs label4 ; csel x11, xzr, x0, hs ; csdb ; adr x10, pc+16 ; ldrsw x11, [x10, x11, uxtw #2] ; add x10, x10, x11 ; br x10 ; jt_entries [Label(MachLabel(3)), Label(MachLabel(2)), Label(MachLabel(1))]
 ; block1:
 ;   movz w5, #3
 ;   b label5
diff --git a/cranelift/filetests/filetests/isa/aarch64/reftypes.clif b/cranelift/filetests/filetests/isa/aarch64/reftypes.clif
index f35508a3df87..55bc5678e184 100644
--- a/cranelift/filetests/filetests/isa/aarch64/reftypes.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/reftypes.clif
@@ -106,8 +106,8 @@ block3(v7: r64, v8: r64):
 ;   uxtb w12, w0
 ;   cbnz x12, label2 ; b label1
 ; block1:
-;   ldr x0, [sp, #16]
 ;   mov x1, x24
+;   ldr x0, [sp, #16]
 ;   b label3
 ; block2:
 ;   mov x0, x24
@@ -144,8 +144,8 @@ block3(v7: r64, v8: r64):
 ;   uxtb w12, w0
 ;   cbnz x12, #0x58
 ; block2: ; offset 0x4c
-;   ldur x0, [sp, #0x10]
 ;   mov x1, x24
+;   ldur x0, [sp, #0x10]
 ;   b #0x60
 ; block3: ; offset 0x58
 ;   mov x0, x24
diff --git a/cranelift/filetests/filetests/isa/aarch64/simd-narrow.clif b/cranelift/filetests/filetests/isa/aarch64/simd-narrow.clif
index da19dff51b0f..f8bb1410c2a5 100644
--- a/cranelift/filetests/filetests/isa/aarch64/simd-narrow.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/simd-narrow.clif
@@ -10,14 +10,16 @@ block0(v0: i16x4, v1: i16x4):
 
 ; VCode:
 ; block0:
-;   mov v0.d[1], v0.d[1], v1.d[0]
-;   sqxtn v0.8b, v0.8h
+;   mov v3.16b, v0.16b
+;   mov v3.d[1], v3.d[1], v1.d[0]
+;   sqxtn v0.8b, v3.8h
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   mov v0.d[1], v1.d[0]
-;   sqxtn v0.8b, v0.8h
+;   mov v3.16b, v0.16b
+;   mov v3.d[1], v1.d[0]
+;   sqxtn v0.8b, v3.8h
 ;   ret
 
 function %snarrow_i16x8(i16x8, i16x8) -> i8x16 {
@@ -46,14 +48,16 @@ block0(v0: i32x2, v1: i32x2):
 
 ; VCode:
 ; block0:
-;   mov v0.d[1], v0.d[1], v1.d[0]
-;   sqxtn v0.4h, v0.4s
+;   mov v3.16b, v0.16b
+;   mov v3.d[1], v3.d[1], v1.d[0]
+;   sqxtn v0.4h, v3.4s
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   mov v0.d[1], v1.d[0]
-;   sqxtn v0.4h, v0.4s
+;   mov v3.16b, v0.16b
+;   mov v3.d[1], v1.d[0]
+;   sqxtn v0.4h, v3.4s
 ;   ret
 
 function %snarrow_i32x4(i32x4, i32x4) -> i16x8 {
@@ -100,14 +104,16 @@ block0(v0: i16x4, v1: i16x4):
 
 ; VCode:
 ; block0:
-;   mov v0.d[1], v0.d[1], v1.d[0]
-;   sqxtun v0.8b, v0.8h
+;   mov v3.16b, v0.16b
+;   mov v3.d[1], v3.d[1], v1.d[0]
+;   sqxtun v0.8b, v3.8h
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   mov v0.d[1], v1.d[0]
-;   sqxtun v0.8b, v0.8h
+;   mov v3.16b, v0.16b
+;   mov v3.d[1], v1.d[0]
+;   sqxtun v0.8b, v3.8h
 ;   ret
 
 function %unarrow_i16x8(i16x8, i16x8) -> i8x16 {
@@ -136,14 +142,16 @@ block0(v0: i32x2, v1: i32x2):
 
 ; VCode:
 ; block0:
-;   mov v0.d[1], v0.d[1], v1.d[0]
-;   sqxtun v0.4h, v0.4s
+;   mov v3.16b, v0.16b
+;   mov v3.d[1], v3.d[1], v1.d[0]
+;   sqxtun v0.4h, v3.4s
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   mov v0.d[1], v1.d[0]
-;   sqxtun v0.4h, v0.4s
+;   mov v3.16b, v0.16b
+;   mov v3.d[1], v1.d[0]
+;   sqxtun v0.4h, v3.4s
 ;   ret
 
 function %unarrow_i32x4(i32x4, i32x4) -> i16x8 {
@@ -190,14 +198,16 @@ block0(v0: i16x4, v1: i16x4):
 
 ; VCode:
 ; block0:
-;   mov v0.d[1], v0.d[1], v1.d[0]
-;   uqxtn v0.8b, v0.8h
+;   mov v3.16b, v0.16b
+;   mov v3.d[1], v3.d[1], v1.d[0]
+;   uqxtn v0.8b, v3.8h
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   mov v0.d[1], v1.d[0]
-;   uqxtn v0.8b, v0.8h
+;   mov v3.16b, v0.16b
+;   mov v3.d[1], v1.d[0]
+;   uqxtn v0.8b, v3.8h
 ;   ret
 
 function %uunarrow_i16x8(i16x8, i16x8) -> i8x16 {
@@ -226,14 +236,16 @@ block0(v0: i32x2, v1: i32x2):
 
 ; VCode:
 ; block0:
-;   mov v0.d[1], v0.d[1], v1.d[0]
-;   uqxtn v0.4h, v0.4s
+;   mov v3.16b, v0.16b
+;   mov v3.d[1], v3.d[1], v1.d[0]
+;   uqxtn v0.4h, v3.4s
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   mov v0.d[1], v1.d[0]
-;   uqxtn v0.4h, v0.4s
+;   mov v3.16b, v0.16b
+;   mov v3.d[1], v1.d[0]
+;   uqxtn v0.4h, v3.4s
 ;   ret
 
 function %uunarrow_i32x4(i32x4, i32x4) -> i16x8 {
diff --git a/cranelift/filetests/filetests/isa/aarch64/stack.clif b/cranelift/filetests/filetests/isa/aarch64/stack.clif
index cd2fd150b9cb..8369c5efc419 100644
--- a/cranelift/filetests/filetests/isa/aarch64/stack.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/stack.clif
@@ -479,8 +479,8 @@ block0(v0: i8):
 ;   add x14, x14, #37
 ;   ldr x15, [sp, #1144]
 ;   add x15, x15, #39
-;   ldr x1, [sp, #1136]
 ;   ldr x3, [sp, #1128]
+;   ldr x1, [sp, #1136]
 ;   add x1, x1, x3
 ;   ldr x2, [sp, #1112]
 ;   ldr x6, [sp, #1120]
@@ -500,8 +500,8 @@ block0(v0: i8):
 ;   ldr x23, [sp, #1032]
 ;   ldr x24, [sp, #1040]
 ;   add x23, x24, x23
-;   ldr x24, [sp, #1024]
 ;   ldr x25, [sp, #1016]
+;   ldr x24, [sp, #1024]
 ;   add x24, x24, x25
 ;   ldr x25, [sp, #1008]
 ;   add x25, x25, x26
@@ -657,8 +657,8 @@ block0(v0: i8):
 ;   add x14, x14, #0x25
 ;   ldr x15, [sp, #0x478]
 ;   add x15, x15, #0x27
-;   ldr x1, [sp, #0x470]
 ;   ldr x3, [sp, #0x468]
+;   ldr x1, [sp, #0x470]
 ;   add x1, x1, x3
 ;   ldr x2, [sp, #0x458]
 ;   ldr x6, [sp, #0x460]
@@ -678,8 +678,8 @@ block0(v0: i8):
 ;   ldr x23, [sp, #0x408]
 ;   ldr x24, [sp, #0x410]
 ;   add x23, x24, x23
-;   ldr x24, [sp, #0x400]
 ;   ldr x25, [sp, #0x3f8]
+;   ldr x24, [sp, #0x400]
 ;   add x24, x24, x25
 ;   ldr x25, [sp, #0x3f0]
 ;   add x25, x25, x26
diff --git a/cranelift/filetests/filetests/isa/aarch64/tls-elf-gd.clif b/cranelift/filetests/filetests/isa/aarch64/tls-elf-gd.clif
index e3761f258d74..9aec19e6867a 100644
--- a/cranelift/filetests/filetests/isa/aarch64/tls-elf-gd.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/tls-elf-gd.clif
@@ -13,11 +13,21 @@ block0(v0: i32):
 ; VCode:
 ;   stp fp, lr, [sp, #-16]!
 ;   mov fp, sp
+;   str x24, [sp, #-16]!
+;   stp d14, d15, [sp, #-16]!
+;   stp d12, d13, [sp, #-16]!
+;   stp d10, d11, [sp, #-16]!
+;   stp d8, d9, [sp, #-16]!
 ; block0:
-;   mov x5, x0
-;   elf_tls_get_addr x0, x3, userextname0
+;   mov x24, x0
+;   elf_tls_get_addr x0, userextname0
 ;   mov x1, x0
-;   mov x0, x5
+;   mov x0, x24
+;   ldp d8, d9, [sp], #16
+;   ldp d10, d11, [sp], #16
+;   ldp d12, d13, [sp], #16
+;   ldp d14, d15, [sp], #16
+;   ldr x24, [sp], #16
 ;   ldp fp, lr, [sp], #16
 ;   ret
 ;
@@ -25,16 +35,24 @@ block0(v0: i32):
 ; block0: ; offset 0x0
 ;   stp x29, x30, [sp, #-0x10]!
 ;   mov x29, sp
-; block1: ; offset 0x8
-;   mov x5, x0
-;   adrp x0, #0 ; reloc_external Aarch64TlsDescAdrPage21 u1:0 0
-;   ldr x3, [x0] ; reloc_external Aarch64TlsDescLd64Lo12 u1:0 0
-;   add x0, x0, #0 ; reloc_external Aarch64TlsDescAddLo12 u1:0 0
-;   blr x3 ; reloc_external Aarch64TlsDescCall u1:0 0
-;   mrs x3, tpidr_el0
-;   add x0, x0, x3
+;   str x24, [sp, #-0x10]!
+;   stp d14, d15, [sp, #-0x10]!
+;   stp d12, d13, [sp, #-0x10]!
+;   stp d10, d11, [sp, #-0x10]!
+;   stp d8, d9, [sp, #-0x10]!
+; block1: ; offset 0x1c
+;   mov x24, x0
+;   adrp x0, #0 ; reloc_external Aarch64TlsGdAdrPage21 u1:0 0
+;   add x0, x0, #0 ; reloc_external Aarch64TlsGdAddLo12Nc u1:0 0
+;   bl #0x28 ; reloc_external Call %ElfTlsGetAddr 0
+;   nop
 ;   mov x1, x0
-;   mov x0, x5
+;   mov x0, x24
+;   ldp d8, d9, [sp], #0x10
+;   ldp d10, d11, [sp], #0x10
+;   ldp d12, d13, [sp], #0x10
+;   ldp d14, d15, [sp], #0x10
+;   ldr x24, [sp], #0x10
 ;   ldp x29, x30, [sp], #0x10
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/aarch64/uext-sext-handling.clif b/cranelift/filetests/filetests/isa/aarch64/uext-sext-handling.clif
deleted file mode 100644
index 473f3b7f1692..000000000000
--- a/cranelift/filetests/filetests/isa/aarch64/uext-sext-handling.clif
+++ /dev/null
@@ -1,36 +0,0 @@
-test compile
-target aarch64
-
-; The aapcs64 call conv ignores the uext and sext flags
-function u0:0(i8) system_v {
-    sig0 = (i8 uext) system_v
-    fn0 = u0:0 sig0
-
-block0(v0: i8):
-    call fn0(v0)
-    return
-}
-
-; check: stp fp, lr, [sp, #-16]!
-; nextln: mov fp, sp
-; nextln: block0:
-; check-not: uxtb w0, w0
-; nextln: load_ext_name x2, User(userextname0)+0
-; nextln: blr x2
-
-; The aaple aarch64 call conv respects the uext and sext flags
-function u0:0(i8) apple_aarch64 {
-    sig0 = (i8 uext) apple_aarch64
-    fn0 = u0:0 sig0
-
-block0(v0: i8):
-    call fn0(v0)
-    return
-}
-
-; check: stp fp, lr, [sp, #-16]!
-; nextln: mov fp, sp
-; nextln: block0:
-; nextln: uxtb w0, w0
-; nextln: load_ext_name x4, User(userextname0)+0
-; nextln: blr x4
diff --git a/cranelift/filetests/filetests/isa/riscv64/amodes-fp.clif b/cranelift/filetests/filetests/isa/riscv64/amodes-fp.clif
deleted file mode 100644
index 1252ed3b6897..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/amodes-fp.clif
+++ /dev/null
@@ -1,37 +0,0 @@
-test compile precise-output
-set unwind_info=false
-set preserve_frame_pointers=true
-target riscv64
-
-function %load_from_get_frame_pointer() -> i64 {
-block0:
-  v0 = get_frame_pointer.i64
-  v1 = load.i64 v0+24
-  return v1
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-; block0:
-;   ld a0,24(fp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-; block1: ; offset 0x10
-;   ld a0, 0x18(s0)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/amodes.clif b/cranelift/filetests/filetests/isa/riscv64/amodes.clif
index 0c6743ac0cb0..c2882cd77c26 100644
--- a/cranelift/filetests/filetests/isa/riscv64/amodes.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/amodes.clif
@@ -116,16 +116,18 @@ block0(v0: i64, v1: i64, v2: i64):
 
 ; VCode:
 ; block0:
-;   add a0,a0,a1
-;   add a0,a0,a2
-;   lw a0,48(a0)
+;   add a1,a0,a1
+;   add a1,a1,a2
+;   addi a1,a1,48
+;   lw a0,0(a1)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   add a0, a0, a1
-;   add a0, a0, a2
-;   lw a0, 0x30(a0)
+;   add a1, a0, a1
+;   add a1, a1, a2
+;   addi a1, a1, 0x30
+;   lw a0, 0(a1)
 ;   ret
 
 function %f10(i64, i64, i64) -> i32 {
@@ -140,19 +142,22 @@ block0(v0: i64, v1: i64, v2: i64):
 
 ; VCode:
 ; block0:
-;   add a0,a0,a1
-;   add a0,a0,a2
-;   lw a0,4100(a0)
+;   lui a3,1
+;   addi a4,a3,4
+;   add a3,a0,a1
+;   add a3,a3,a2
+;   add a3,a3,a4
+;   lw a0,0(a3)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   add a0, a0, a1
-;   add a0, a0, a2
-;   lui t6, 1
-;   addi t6, t6, 4
-;   add t6, t6, a0
-;   lw a0, 0(t6)
+;   lui a3, 1
+;   addi a4, a3, 4
+;   add a3, a0, a1
+;   add a3, a3, a2
+;   add a3, a3, a4
+;   lw a0, 0(a3)
 ;   ret
 
 function %f10() -> i32 {
@@ -184,14 +189,16 @@ block0(v0: i64):
 
 ; VCode:
 ; block0:
-;   lw a0,8388608(a0)
+;   lui a4,2048
+;   add a4,a0,a4
+;   lw a0,0(a4)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   lui t6, 0x800
-;   add t6, t6, a0
-;   lw a0, 0(t6)
+;   lui a4, 0x800
+;   add a4, a0, a4
+;   lw a0, 0(a4)
 ;   ret
 
 function %f12(i64) -> i32 {
@@ -204,12 +211,14 @@ block0(v0: i64):
 
 ; VCode:
 ; block0:
-;   lw a0,-4(a0)
+;   addi a3,a0,-4
+;   lw a0,0(a3)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   lw a0, -4(a0)
+;   addi a3, a0, -4
+;   lw a0, 0(a3)
 ;   ret
 
 function %f13(i64) -> i32 {
@@ -222,15 +231,18 @@ block0(v0: i64):
 
 ; VCode:
 ; block0:
-;   lw a0,1000000000(a0)
+;   lui a4,244141
+;   addi a1,a4,-1536
+;   add a5,a0,a1
+;   lw a0,0(a5)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   lui t6, 0x3b9ad
-;   addi t6, t6, -0x600
-;   add t6, t6, a0
-;   lw a0, 0(t6)
+;   lui a4, 0x3b9ad
+;   addi a1, a4, -0x600
+;   add a5, a0, a1
+;   lw a0, 0(a5)
 ;   ret
 
 function %f14(i32) -> i32 {
@@ -495,22 +507,20 @@ block0(v0: i64):
 
 ; VCode:
 ; block0:
-;   ld a2,32(a0)
-;   mv a4,a2
-;   ld a1,40(a0)
-;   sd a2,32(a0)
-;   sd a1,40(a0)
-;   mv a0,a4
+;   addi a4,a0,32
+;   ld a0,0(a4)
+;   ld a1,8(a4)
+;   sd a0,0(a4)
+;   sd a1,8(a4)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   ld a2, 0x20(a0)
-;   mv a4, a2
-;   ld a1, 0x28(a0)
-;   sd a2, 0x20(a0)
-;   sd a1, 0x28(a0)
-;   mv a0, a4
+;   addi a4, a0, 0x20
+;   ld a0, 0(a4)
+;   ld a1, 8(a4)
+;   sd a0, 0(a4)
+;   sd a1, 8(a4)
 ;   ret
 
 function %i128_32bit_sextend_simple(i32) -> i128 {
@@ -552,41 +562,22 @@ block0(v0: i64, v1: i32):
 ; VCode:
 ; block0:
 ;   sext.w a1,a1
-;   add a0,a0,a1
-;   ld a5,24(a0)
-;   mv a2,a5
-;   ld a1,32(a0)
-;   sd a5,24(a0)
-;   sd a1,32(a0)
-;   mv a0,a2
+;   add a1,a0,a1
+;   addi a2,a1,24
+;   ld a0,0(a2)
+;   ld a1,8(a2)
+;   sd a0,0(a2)
+;   sd a1,8(a2)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sext.w a1, a1
-;   add a0, a0, a1
-;   ld a5, 0x18(a0)
-;   mv a2, a5
-;   ld a1, 0x20(a0)
-;   sd a5, 0x18(a0)
-;   sd a1, 0x20(a0)
-;   mv a0, a2
-;   ret
-
-function %load_from_get_stack_pointer() -> i64 {
-block0:
-  v0 = get_stack_pointer.i64
-  v1 = load.i64 v0+8
-  return v1
-}
-
-; VCode:
-; block0:
-;   ld a0,8(sp)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   ld a0, 8(sp)
+;   add a1, a0, a1
+;   addi a2, a1, 0x18
+;   ld a0, 0(a2)
+;   ld a1, 8(a2)
+;   sd a0, 0(a2)
+;   sd a1, 8(a2)
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/arithmetic.clif b/cranelift/filetests/filetests/isa/riscv64/arithmetic.clif
index 070d7e178b0e..a04b3b8cfefe 100644
--- a/cranelift/filetests/filetests/isa/riscv64/arithmetic.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/arithmetic.clif
@@ -90,27 +90,35 @@ block0(v0: i64, v1: i64):
 
 ; VCode:
 ; block0:
+;   li a3,-1
+;   li a5,1
+;   slli a2,a5,63
+;   eq a3,a3,a1##ty=i64
+;   eq a5,a2,a0##ty=i64
+;   and a2,a3,a5
+;   trap_if int_ovf##(a2 ne zero)
 ;   trap_if int_divz##(a1 eq zero)
-;   lui a4,1
-;   slli a2,a4,51
-;   xor a2,a0,a2
-;   not a4,a1
-;   or a2,a2,a4
-;   trap_if int_ovf##(a2 eq zero)
 ;   div a0,a0,a1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   addi a3, zero, -1
+;   addi a5, zero, 1
+;   slli a2, a5, 0x3f
+;   bne a3, a1, 0xc
+;   addi a3, zero, 1
+;   j 8
+;   mv a3, zero
+;   bne a2, a0, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
+;   and a2, a3, a5
+;   beqz a2, 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
 ;   bnez a1, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_divz
-;   lui a4, 1
-;   slli a2, a4, 0x33
-;   xor a2, a0, a2
-;   not a4, a1
-;   or a2, a2, a4
-;   bnez a2, 8
-;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
 ;   div a0, a0, a1
 ;   ret
 
@@ -124,12 +132,36 @@ block0(v0: i64):
 ; VCode:
 ; block0:
 ;   li a3,2
+;   li a4,-1
+;   li a5,1
+;   slli a1,a5,63
+;   eq a4,a4,a3##ty=i64
+;   eq a5,a1,a0##ty=i64
+;   and a1,a4,a5
+;   trap_if int_ovf##(a1 ne zero)
+;   trap_if int_divz##(a3 eq zero)
 ;   div a0,a0,a3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a3, zero, 2
+;   addi a4, zero, -1
+;   addi a5, zero, 1
+;   slli a1, a5, 0x3f
+;   bne a4, a3, 0xc
+;   addi a4, zero, 1
+;   j 8
+;   mv a4, zero
+;   bne a1, a0, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
+;   and a1, a4, a5
+;   beqz a1, 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
+;   bnez a3, 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_divz
 ;   div a0, a0, a3
 ;   ret
 
@@ -162,12 +194,15 @@ block0(v0: i64):
 ; VCode:
 ; block0:
 ;   li a3,2
+;   trap_if int_divz##(a3 eq zero)
 ;   divu a0,a0,a3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a3, zero, 2
+;   bnez a3, 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_divz
 ;   divu a0, a0, a3
 ;   ret
 
@@ -219,12 +254,15 @@ block0(v0: i32, v1: i32):
 ; block0:
 ;   sext.w a3,a0
 ;   sext.w a5,a1
+;   li a1,-1
+;   li a4,1
+;   slli a0,a4,63
+;   slli a2,a3,32
+;   eq a4,a1,a5##ty=i32
+;   eq a0,a0,a2##ty=i32
+;   and a1,a4,a0
+;   trap_if int_ovf##(a1 ne zero)
 ;   trap_if int_divz##(a5 eq zero)
-;   lui a2,-524288
-;   xor a4,a3,a2
-;   not a0,a5
-;   or a2,a4,a0
-;   trap_if int_ovf##(a2 eq zero)
 ;   divw a0,a3,a5
 ;   ret
 ;
@@ -232,14 +270,23 @@ block0(v0: i32, v1: i32):
 ; block0: ; offset 0x0
 ;   sext.w a3, a0
 ;   sext.w a5, a1
+;   addi a1, zero, -1
+;   addi a4, zero, 1
+;   slli a0, a4, 0x3f
+;   slli a2, a3, 0x20
+;   bne a1, a5, 0xc
+;   addi a4, zero, 1
+;   j 8
+;   mv a4, zero
+;   bne a0, a2, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
+;   and a1, a4, a0
+;   beqz a1, 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
 ;   bnez a5, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_divz
-;   lui a2, 0x80000
-;   xor a4, a3, a2
-;   not a0, a5
-;   or a2, a4, a0
-;   bnez a2, 8
-;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
 ;   divw a0, a3, a5
 ;   ret
 
@@ -252,14 +299,46 @@ block0(v0: i32):
 
 ; VCode:
 ; block0:
-;   li a3,2
-;   divw a0,a0,a3
+;   mv a2,a0
+;   li a0,2
+;   sext.w a3,a2
+;   sext.w a5,a0
+;   li a1,-1
+;   li a4,1
+;   slli a0,a4,63
+;   slli a2,a3,32
+;   eq a4,a1,a5##ty=i32
+;   eq a0,a0,a2##ty=i32
+;   and a1,a4,a0
+;   trap_if int_ovf##(a1 ne zero)
+;   trap_if int_divz##(a5 eq zero)
+;   divw a0,a3,a5
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi a3, zero, 2
-;   divw a0, a0, a3
+;   mv a2, a0
+;   addi a0, zero, 2
+;   sext.w a3, a2
+;   sext.w a5, a0
+;   addi a1, zero, -1
+;   addi a4, zero, 1
+;   slli a0, a4, 0x3f
+;   slli a2, a3, 0x20
+;   bne a1, a5, 0xc
+;   addi a4, zero, 1
+;   j 8
+;   mv a4, zero
+;   bne a0, a2, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
+;   and a1, a4, a0
+;   beqz a1, 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
+;   bnez a5, 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_divz
+;   divw a0, a3, a5
 ;   ret
 
 function %f14(i32, i32) -> i32 {
@@ -273,7 +352,9 @@ block0(v0: i32, v1: i32):
 ;   slli a3,a1,32
 ;   srli a5,a3,32
 ;   trap_if int_divz##(a5 eq zero)
-;   divuw a0,a0,a5
+;   slli a2,a0,32
+;   srli a4,a2,32
+;   divuw a0,a4,a5
 ;   ret
 ;
 ; Disassembled:
@@ -282,7 +363,9 @@ block0(v0: i32, v1: i32):
 ;   srli a5, a3, 0x20
 ;   bnez a5, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_divz
-;   divuw a0, a0, a5
+;   slli a2, a0, 0x20
+;   srli a4, a2, 0x20
+;   divuw a0, a4, a5
 ;   ret
 
 function %f15(i32) -> i32 {
@@ -294,14 +377,25 @@ block0(v0: i32):
 
 ; VCode:
 ; block0:
-;   li a3,2
-;   divuw a0,a0,a3
+;   li a1,2
+;   slli a3,a1,32
+;   srli a5,a3,32
+;   trap_if int_divz##(a5 eq zero)
+;   slli a2,a0,32
+;   srli a4,a2,32
+;   divuw a0,a4,a5
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi a3, zero, 2
-;   divuw a0, a0, a3
+;   addi a1, zero, 2
+;   slli a3, a1, 0x20
+;   srli a5, a3, 0x20
+;   bnez a5, 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_divz
+;   slli a2, a0, 0x20
+;   srli a4, a2, 0x20
+;   divuw a0, a4, a5
 ;   ret
 
 function %f16(i32, i32) -> i32 {
@@ -618,13 +712,13 @@ block0(v0: i32, v1: i32, v2: i32):
 ; VCode:
 ; block0:
 ;   mulw a5,a1,a2
-;   addw a0,a5,a0
+;   add a0,a5,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   mulw a5, a1, a2
-;   addw a0, a5, a0
+;   add a0, a5, a0
 ;   ret
 
 function %msub_i32(i32, i32, i32) -> i32 {
@@ -713,12 +807,15 @@ block0(v0: i64):
 ; VCode:
 ; block0:
 ;   li a3,2
+;   trap_if int_divz##(a3 eq zero)
 ;   rem a0,a0,a3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a3, zero, 2
+;   bnez a3, 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_divz
 ;   rem a0, a0, a3
 ;   ret
 
@@ -732,12 +829,15 @@ block0(v0: i64):
 ; VCode:
 ; block0:
 ;   li a3,2
+;   trap_if int_divz##(a3 eq zero)
 ;   remu a0,a0,a3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a3, zero, 2
+;   bnez a3, 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_divz
 ;   remu a0, a0, a3
 ;   ret
 
@@ -750,30 +850,38 @@ block0(v0: i64):
 
 ; VCode:
 ; block0:
-;   li a2,-1
-;   trap_if int_divz##(a2 eq zero)
-;   lui a4,1
-;   slli a1,a4,51
-;   xor a3,a0,a1
-;   not a4,a2
-;   or a1,a3,a4
-;   trap_if int_ovf##(a1 eq zero)
-;   div a0,a0,a2
+;   li a3,-1
+;   li a4,-1
+;   li a5,1
+;   slli a1,a5,63
+;   eq a4,a4,a3##ty=i64
+;   eq a5,a1,a0##ty=i64
+;   and a1,a4,a5
+;   trap_if int_ovf##(a1 ne zero)
+;   trap_if int_divz##(a3 eq zero)
+;   div a0,a0,a3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi a2, zero, -1
-;   bnez a2, 8
-;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_divz
-;   lui a4, 1
-;   slli a1, a4, 0x33
-;   xor a3, a0, a1
-;   not a4, a2
-;   or a1, a3, a4
-;   bnez a1, 8
+;   addi a3, zero, -1
+;   addi a4, zero, -1
+;   addi a5, zero, 1
+;   slli a1, a5, 0x3f
+;   bne a4, a3, 0xc
+;   addi a4, zero, 1
+;   j 8
+;   mv a4, zero
+;   bne a1, a0, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
+;   and a1, a4, a5
+;   beqz a1, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
-;   div a0, a0, a2
+;   bnez a3, 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_divz
+;   div a0, a0, a3
 ;   ret
 
 function %i8_iadd_const_neg1(i8) -> i8 {
diff --git a/cranelift/filetests/filetests/isa/riscv64/bitops.clif b/cranelift/filetests/filetests/isa/riscv64/bitops.clif
index 768f58302116..a8bcd7c2c6af 100644
--- a/cranelift/filetests/filetests/isa/riscv64/bitops.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/bitops.clif
@@ -2,6 +2,289 @@ test compile precise-output
 set unwind_info=false
 target riscv64
 
+function %a(i8) -> i8 {
+block0(v0: i8):
+    v1 = bitrev v0
+    return v1
+}
+
+; VCode:
+; block0:
+;   mv a1,a0
+;   brev8 a0,a1##tmp=a2 tmp2=a3 step=a4 ty=i8
+;   ret
+;
+; Disassembled:
+; block0: ; offset 0x0
+;   mv a1, a0
+;   mv a0, zero
+;   addi a4, zero, 8
+;   addi a2, zero, 1
+;   slli a2, a2, 7
+;   addi a3, zero, 1
+;   slli a3, a3, 0
+;   blez a4, 0x34
+;   and t5, a2, a1
+;   beq zero, t5, 8
+;   or a0, a0, a3
+;   addi a4, a4, -1
+;   srli a2, a2, 1
+;   addi t5, zero, 8
+;   rem t5, a4, t5
+;   bnez t5, 0xc
+;   srli a3, a3, 0xf
+;   j -0x28
+;   slli a3, a3, 1
+;   j -0x30
+;   ret
+
+function %a(i16) -> i16 {
+block0(v0: i16):
+    v1 = bitrev v0
+    return v1
+}
+
+; VCode:
+; block0:
+;   brev8 a5,a0##tmp=a2 tmp2=a3 step=a4 ty=i16
+;   rev8 a1,a5##step=a3 tmp=a2
+;   srli a0,a1,48
+;   ret
+;
+; Disassembled:
+; block0: ; offset 0x0
+;   mv a5, zero
+;   addi a4, zero, 0x10
+;   addi a2, zero, 1
+;   slli a2, a2, 0xf
+;   addi a3, zero, 1
+;   slli a3, a3, 8
+;   blez a4, 0x34
+;   and t5, a2, a0
+;   beq zero, t5, 8
+;   or a5, a5, a3
+;   addi a4, a4, -1
+;   srli a2, a2, 1
+;   addi t5, zero, 8
+;   rem t5, a4, t5
+;   bnez t5, 0xc
+;   srli a3, a3, 0xf
+;   j -0x28
+;   slli a3, a3, 1
+;   j -0x30
+;   mv a1, zero
+;   mv a2, a5
+;   addi a3, zero, 0x38
+;   bltz a3, 0x1c
+;   andi t6, a2, 0xff
+;   sll t6, t6, a3
+;   or a1, a1, t6
+;   addi a3, a3, -8
+;   srli a2, a2, 8
+;   j -0x18
+;   srli a0, a1, 0x30
+;   ret
+
+function %a(i32) -> i32 {
+block0(v0: i32):
+    v1 = bitrev v0
+    return v1
+}
+
+; VCode:
+; block0:
+;   brev8 a5,a0##tmp=a2 tmp2=a3 step=a4 ty=i32
+;   rev8 a1,a5##step=a3 tmp=a2
+;   srli a0,a1,32
+;   ret
+;
+; Disassembled:
+; block0: ; offset 0x0
+;   mv a5, zero
+;   addi a4, zero, 0x20
+;   addi a2, zero, 1
+;   slli a2, a2, 0x1f
+;   addi a3, zero, 1
+;   slli a3, a3, 0x18
+;   blez a4, 0x34
+;   and t5, a2, a0
+;   beq zero, t5, 8
+;   or a5, a5, a3
+;   addi a4, a4, -1
+;   srli a2, a2, 1
+;   addi t5, zero, 8
+;   rem t5, a4, t5
+;   bnez t5, 0xc
+;   srli a3, a3, 0xf
+;   j -0x28
+;   slli a3, a3, 1
+;   j -0x30
+;   mv a1, zero
+;   mv a2, a5
+;   addi a3, zero, 0x38
+;   bltz a3, 0x1c
+;   andi t6, a2, 0xff
+;   sll t6, t6, a3
+;   or a1, a1, t6
+;   addi a3, a3, -8
+;   srli a2, a2, 8
+;   j -0x18
+;   srli a0, a1, 0x20
+;   ret
+
+function %a(i64) -> i64 {
+block0(v0: i64):
+    v1 = bitrev v0
+    return v1
+}
+
+; VCode:
+; block0:
+;   rev8 a5,a0##step=a4 tmp=a3
+;   brev8 a0,a5##tmp=a3 tmp2=a1 step=a2 ty=i64
+;   ret
+;
+; Disassembled:
+; block0: ; offset 0x0
+;   mv a5, zero
+;   mv a3, a0
+;   addi a4, zero, 0x38
+;   bltz a4, 0x1c
+;   andi t6, a3, 0xff
+;   sll t6, t6, a4
+;   or a5, a5, t6
+;   addi a4, a4, -8
+;   srli a3, a3, 8
+;   j -0x18
+;   mv a0, zero
+;   addi a2, zero, 0x40
+;   addi a3, zero, 1
+;   slli a3, a3, 0x3f
+;   addi a1, zero, 1
+;   slli a1, a1, 0x38
+;   blez a2, 0x34
+;   and t5, a3, a5
+;   beq zero, t5, 8
+;   or a0, a0, a1
+;   addi a2, a2, -1
+;   srli a3, a3, 1
+;   addi t5, zero, 8
+;   rem t5, a2, t5
+;   bnez t5, 0xc
+;   srli a1, a1, 0xf
+;   j -0x28
+;   slli a1, a1, 1
+;   j -0x30
+;   ret
+
+function %a(i128) -> i128 {
+block0(v0: i128):
+    v1 = bitrev v0
+    return v1
+}
+
+; VCode:
+;   add sp,-16
+;   sd ra,8(sp)
+;   sd fp,0(sp)
+;   mv fp,sp
+;   sd s6,-8(sp)
+;   sd s11,-16(sp)
+;   add sp,-16
+; block0:
+;   mv s11,a1
+;   mv a1,a0
+;   rev8 a0,a1##step=a5 tmp=a4
+;   brev8 a1,a0##tmp=a4 tmp2=a2 step=a3 ty=i64
+;   mv a4,s11
+;   rev8 s6,a4##step=a2 tmp=a3
+;   brev8 a0,s6##tmp=a4 tmp2=a5 step=a2 ty=i64
+;   add sp,+16
+;   ld s6,-8(sp)
+;   ld s11,-16(sp)
+;   ld ra,8(sp)
+;   ld fp,0(sp)
+;   add sp,+16
+;   ret
+;
+; Disassembled:
+; block0: ; offset 0x0
+;   addi sp, sp, -0x10
+;   sd ra, 8(sp)
+;   sd s0, 0(sp)
+;   mv s0, sp
+;   sd s6, -8(sp)
+;   sd s11, -0x10(sp)
+;   addi sp, sp, -0x10
+; block1: ; offset 0x1c
+;   mv s11, a1
+;   mv a1, a0
+;   mv a0, zero
+;   mv a4, a1
+;   addi a5, zero, 0x38
+;   bltz a5, 0x1c
+;   andi t6, a4, 0xff
+;   sll t6, t6, a5
+;   or a0, a0, t6
+;   addi a5, a5, -8
+;   srli a4, a4, 8
+;   j -0x18
+;   mv a1, zero
+;   addi a3, zero, 0x40
+;   addi a4, zero, 1
+;   slli a4, a4, 0x3f
+;   addi a2, zero, 1
+;   slli a2, a2, 0x38
+;   blez a3, 0x34
+;   and t5, a4, a0
+;   beq zero, t5, 8
+;   or a1, a1, a2
+;   addi a3, a3, -1
+;   srli a4, a4, 1
+;   addi t5, zero, 8
+;   rem t5, a3, t5
+;   bnez t5, 0xc
+;   srli a2, a2, 0xf
+;   j -0x28
+;   slli a2, a2, 1
+;   j -0x30
+;   mv a4, s11
+;   mv s6, zero
+;   mv a3, a4
+;   addi a2, zero, 0x38
+;   bltz a2, 0x1c
+;   andi t6, a3, 0xff
+;   sll t6, t6, a2
+;   or s6, s6, t6
+;   addi a2, a2, -8
+;   srli a3, a3, 8
+;   j -0x18
+;   mv a0, zero
+;   addi a2, zero, 0x40
+;   addi a4, zero, 1
+;   slli a4, a4, 0x3f
+;   addi a5, zero, 1
+;   slli a5, a5, 0x38
+;   blez a2, 0x34
+;   and t5, a4, s6
+;   beq zero, t5, 8
+;   or a0, a0, a5
+;   addi a2, a2, -1
+;   srli a4, a4, 1
+;   addi t5, zero, 8
+;   rem t5, a2, t5
+;   bnez t5, 0xc
+;   srli a5, a5, 0xf
+;   j -0x28
+;   slli a5, a5, 1
+;   j -0x30
+;   addi sp, sp, 0x10
+;   ld s6, -8(sp)
+;   ld s11, -0x10(sp)
+;   ld ra, 8(sp)
+;   ld s0, 0(sp)
+;   addi sp, sp, 0x10
+;   ret
 
 function %b(i8) -> i8 {
 block0(v0: i8):
@@ -125,7 +408,7 @@ block0(v0: i128):
 ; block0:
 ;   clz a5,a1##ty=i64 tmp=a3 step=a4
 ;   clz a3,a0##ty=i64 tmp=a4 step=a2
-;   select a0,a3,zero##condition=(a1 eq zero)
+;   select_reg a0,a3,zero##condition=(a1 eq zero)
 ;   add a0,a5,a0
 ;   li a1,0
 ;   ret
@@ -154,10 +437,10 @@ block0(v0: i128):
 ;   addi a2, a2, -1
 ;   srli a4, a4, 1
 ;   j -0x18
-;   bnez a1, 0xc
-;   mv a0, a3
-;   j 8
+;   beqz a1, 0xc
 ;   mv a0, zero
+;   j 8
+;   mv a0, a3
 ;   add a0, a5, a0
 ;   mv a1, zero
 ;   ret
@@ -173,9 +456,9 @@ block0(v0: i8):
 ;   slli a2,a0,56
 ;   srai a4,a2,56
 ;   not a0,a4
-;   select a2,a0,a4##condition=(a4 slt zero)
-;   clz a0,a2##ty=i64 tmp=a4 step=a5
-;   addi a0,a0,-57
+;   select_reg a2,a0,a4##condition=(a4 slt zero)
+;   clz a0,a2##ty=i8 tmp=a4 step=a5
+;   addi a0,a0,-1
 ;   ret
 ;
 ; Disassembled:
@@ -183,14 +466,14 @@ block0(v0: i8):
 ;   slli a2, a0, 0x38
 ;   srai a4, a2, 0x38
 ;   not a0, a4
-;   bgez a4, 0xc
-;   mv a2, a0
-;   j 8
+;   bltz a4, 0xc
 ;   mv a2, a4
+;   j 8
+;   mv a2, a0
 ;   mv a0, zero
-;   addi a5, zero, 0x40
+;   addi a5, zero, 8
 ;   addi a4, zero, 1
-;   slli a4, a4, 0x3f
+;   slli a4, a4, 7
 ;   blez a5, 0x1c
 ;   and t5, a4, a2
 ;   bne zero, t5, 0x14
@@ -198,7 +481,7 @@ block0(v0: i8):
 ;   addi a5, a5, -1
 ;   srli a4, a4, 1
 ;   j -0x18
-;   addi a0, a0, -0x39
+;   addi a0, a0, -1
 ;   ret
 
 function %c(i16) -> i16 {
@@ -212,9 +495,9 @@ block0(v0: i16):
 ;   slli a2,a0,48
 ;   srai a4,a2,48
 ;   not a0,a4
-;   select a2,a0,a4##condition=(a4 slt zero)
-;   clz a0,a2##ty=i64 tmp=a4 step=a5
-;   addi a0,a0,-49
+;   select_reg a2,a0,a4##condition=(a4 slt zero)
+;   clz a0,a2##ty=i16 tmp=a4 step=a5
+;   addi a0,a0,-1
 ;   ret
 ;
 ; Disassembled:
@@ -222,14 +505,14 @@ block0(v0: i16):
 ;   slli a2, a0, 0x30
 ;   srai a4, a2, 0x30
 ;   not a0, a4
-;   bgez a4, 0xc
-;   mv a2, a0
-;   j 8
+;   bltz a4, 0xc
 ;   mv a2, a4
+;   j 8
+;   mv a2, a0
 ;   mv a0, zero
-;   addi a5, zero, 0x40
+;   addi a5, zero, 0x10
 ;   addi a4, zero, 1
-;   slli a4, a4, 0x3f
+;   slli a4, a4, 0xf
 ;   blez a5, 0x1c
 ;   and t5, a4, a2
 ;   bne zero, t5, 0x14
@@ -237,7 +520,7 @@ block0(v0: i16):
 ;   addi a5, a5, -1
 ;   srli a4, a4, 1
 ;   j -0x18
-;   addi a0, a0, -0x31
+;   addi a0, a0, -1
 ;   ret
 
 function %c(i32) -> i32 {
@@ -250,23 +533,23 @@ block0(v0: i32):
 ; block0:
 ;   sext.w a2,a0
 ;   not a4,a2
-;   select a0,a4,a2##condition=(a2 slt zero)
-;   clz a4,a0##ty=i64 tmp=a2 step=a3
-;   addi a0,a4,-33
+;   select_reg a0,a4,a2##condition=(a2 slt zero)
+;   clz a4,a0##ty=i32 tmp=a2 step=a3
+;   addi a0,a4,-1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sext.w a2, a0
 ;   not a4, a2
-;   bgez a2, 0xc
-;   mv a0, a4
-;   j 8
+;   bltz a2, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a4
 ;   mv a4, zero
-;   addi a3, zero, 0x40
+;   addi a3, zero, 0x20
 ;   addi a2, zero, 1
-;   slli a2, a2, 0x3f
+;   slli a2, a2, 0x1f
 ;   blez a3, 0x1c
 ;   and t5, a2, a0
 ;   bne zero, t5, 0x14
@@ -274,7 +557,7 @@ block0(v0: i32):
 ;   addi a3, a3, -1
 ;   srli a2, a2, 1
 ;   j -0x18
-;   addi a0, a4, -0x21
+;   addi a0, a4, -1
 ;   ret
 
 function %c(i64) -> i64 {
@@ -286,7 +569,7 @@ block0(v0: i64):
 ; VCode:
 ; block0:
 ;   not a2,a0
-;   select a4,a2,a0##condition=(a0 slt zero)
+;   select_reg a4,a2,a0##condition=(a0 slt zero)
 ;   clz a2,a4##ty=i64 tmp=a0 step=a1
 ;   addi a0,a2,-1
 ;   ret
@@ -294,10 +577,10 @@ block0(v0: i64):
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   not a2, a0
-;   bgez a0, 0xc
-;   mv a4, a2
-;   j 8
+;   bltz a0, 0xc
 ;   mv a4, a0
+;   j 8
+;   mv a4, a2
 ;   mv a2, zero
 ;   addi a1, zero, 0x40
 ;   addi a0, zero, 1
@@ -321,13 +604,14 @@ block0(v0: i128):
 ; VCode:
 ; block0:
 ;   not a3,a0
-;   select a5,a3,a0##condition=(a1 slt zero)
+;   select_reg a5,a3,a0##condition=(a1 slt zero)
 ;   not a2,a1
-;   select a3,a2,a1##condition=(a1 slt zero)
+;   select_reg a3,a2,a1##condition=(a1 slt zero)
 ;   clz a1,a3##ty=i64 tmp=a2 step=a0
 ;   clz a0,a5##ty=i64 tmp=a2 step=a4
-;   select a2,a0,zero##condition=(a3 eq zero)
+;   select_reg a2,a0,zero##condition=(a3 eq zero)
 ;   add a3,a1,a2
+;   li a5,0
 ;   addi a0,a3,-1
 ;   li a1,0
 ;   ret
@@ -335,15 +619,15 @@ block0(v0: i128):
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   not a3, a0
-;   bgez a1, 0xc
-;   mv a5, a3
-;   j 8
+;   bltz a1, 0xc
 ;   mv a5, a0
-;   not a2, a1
-;   bgez a1, 0xc
-;   mv a3, a2
 ;   j 8
+;   mv a5, a3
+;   not a2, a1
+;   bltz a1, 0xc
 ;   mv a3, a1
+;   j 8
+;   mv a3, a2
 ;   mv a1, zero
 ;   addi a0, zero, 0x40
 ;   addi a2, zero, 1
@@ -366,11 +650,12 @@ block0(v0: i128):
 ;   addi a4, a4, -1
 ;   srli a2, a2, 1
 ;   j -0x18
-;   bnez a3, 0xc
-;   mv a2, a0
-;   j 8
+;   beqz a3, 0xc
 ;   mv a2, zero
+;   j 8
+;   mv a2, a0
 ;   add a3, a1, a2
+;   mv a5, zero
 ;   addi a0, a3, -1
 ;   mv a1, zero
 ;   ret
@@ -493,7 +778,7 @@ block0(v0: i128):
 ; block0:
 ;   ctz a5,a1##ty=i64 tmp=a3 step=a4
 ;   ctz a3,a0##ty=i64 tmp=a1 step=a2
-;   select a5,a5,zero##condition=(a0 eq zero)
+;   select_reg a5,a5,zero##condition=(a0 eq zero)
 ;   add a0,a3,a5
 ;   li a1,0
 ;   ret
@@ -604,24 +889,22 @@ block0(v0: i32):
 
 ; VCode:
 ; block0:
-;   slli a2,a0,32
-;   srli a4,a2,32
-;   popcnt a0,a4##ty=i64 tmp=a2 step=a1
+;   mv a5,a0
+;   popcnt a0,a5##ty=i32 tmp=a2 step=a3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slli a2, a0, 0x20
-;   srli a4, a2, 0x20
+;   mv a5, a0
 ;   mv a0, zero
-;   addi a1, zero, 0x40
+;   addi a3, zero, 0x20
 ;   addi a2, zero, 1
-;   slli a2, a2, 0x3f
-;   blez a1, 0x1c
-;   and t5, a2, a4
+;   slli a2, a2, 0x1f
+;   blez a3, 0x1c
+;   and t5, a2, a5
 ;   beq zero, t5, 8
 ;   addi a0, a0, 1
-;   addi a1, a1, -1
+;   addi a3, a3, -1
 ;   srli a2, a2, 1
 ;   j -0x18
 ;   ret
@@ -634,24 +917,22 @@ block0(v0: i16):
 
 ; VCode:
 ; block0:
-;   slli a2,a0,48
-;   srli a4,a2,48
-;   popcnt a0,a4##ty=i64 tmp=a2 step=a1
+;   mv a5,a0
+;   popcnt a0,a5##ty=i16 tmp=a2 step=a3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slli a2, a0, 0x30
-;   srli a4, a2, 0x30
+;   mv a5, a0
 ;   mv a0, zero
-;   addi a1, zero, 0x40
+;   addi a3, zero, 0x10
 ;   addi a2, zero, 1
-;   slli a2, a2, 0x3f
-;   blez a1, 0x1c
-;   and t5, a2, a4
+;   slli a2, a2, 0xf
+;   blez a3, 0x1c
+;   and t5, a2, a5
 ;   beq zero, t5, 8
 ;   addi a0, a0, 1
-;   addi a1, a1, -1
+;   addi a3, a3, -1
 ;   srli a2, a2, 1
 ;   j -0x18
 ;   ret
@@ -664,23 +945,23 @@ block0(v0: i8):
 
 ; VCode:
 ; block0:
-;   andi a2,a0,255
-;   popcnt a0,a2##ty=i64 tmp=a4 step=a5
+;   mv a5,a0
+;   popcnt a0,a5##ty=i8 tmp=a2 step=a3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   andi a2, a0, 0xff
+;   mv a5, a0
 ;   mv a0, zero
-;   addi a5, zero, 0x40
-;   addi a4, zero, 1
-;   slli a4, a4, 0x3f
-;   blez a5, 0x1c
-;   and t5, a4, a2
+;   addi a3, zero, 8
+;   addi a2, zero, 1
+;   slli a2, a2, 7
+;   blez a3, 0x1c
+;   and t5, a2, a5
 ;   beq zero, t5, 8
 ;   addi a0, a0, 1
-;   addi a5, a5, -1
-;   srli a4, a4, 1
+;   addi a3, a3, -1
+;   srli a2, a2, 1
 ;   j -0x18
 ;   ret
 
@@ -1442,12 +1723,13 @@ block0(v0: i128, v1: i8):
 ;   sub a3,a3,a5
 ;   sll a4,a0,a5
 ;   srl a0,a0,a3
-;   select a3,zero,a0##condition=(a5 eq zero)
+;   select_reg a3,zero,a0##condition=(a5 eq zero)
 ;   sll a5,a1,a5
-;   or a5,a3,a5
+;   or a1,a3,a5
 ;   li a3,64
-;   andi a2,a2,127
-;   select [a0,a1],[zero,a4],[a4,a5]##condition=(a2 uge a3)
+;   andi a5,a2,127
+;   select_reg a0,zero,a4##condition=(a5 uge a3)
+;   select_reg a1,a4,a1##condition=(a5 uge a3)
 ;   ret
 ;
 ; Disassembled:
@@ -1457,20 +1739,21 @@ block0(v0: i128, v1: i8):
 ;   sub a3, a3, a5
 ;   sll a4, a0, a5
 ;   srl a0, a0, a3
-;   bnez a5, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a5, 0xc
 ;   mv a3, a0
+;   j 8
+;   mv a3, zero
 ;   sll a5, a1, a5
-;   or a5, a3, a5
+;   or a1, a3, a5
 ;   addi a3, zero, 0x40
-;   andi a2, a2, 0x7f
-;   bltu a2, a3, 0x10
+;   andi a5, a2, 0x7f
+;   bgeu a5, a3, 0xc
+;   mv a0, a4
+;   j 8
 ;   mv a0, zero
+;   bgeu a5, a3, 8
+;   j 8
 ;   mv a1, a4
-;   j 0xc
-;   mv a0, a4
-;   mv a1, a5
 ;   ret
 
 function %ishl_i128_i128(i128, i128) -> i128 {
@@ -1488,12 +1771,13 @@ block0(v0: i128, v1: i128):
 ;   mv a4,a5
 ;   sll a5,a4,a0
 ;   srl a3,a4,a3
-;   select a3,zero,a3##condition=(a0 eq zero)
+;   select_reg a3,zero,a3##condition=(a0 eq zero)
 ;   sll a0,a1,a0
-;   or a4,a3,a0
+;   or a1,a3,a0
 ;   li a3,64
 ;   andi a2,a2,127
-;   select [a0,a1],[zero,a5],[a5,a4]##condition=(a2 uge a3)
+;   select_reg a0,zero,a5##condition=(a2 uge a3)
+;   select_reg a1,a5,a1##condition=(a2 uge a3)
 ;   ret
 ;
 ; Disassembled:
@@ -1505,18 +1789,20 @@ block0(v0: i128, v1: i128):
 ;   mv a4, a5
 ;   sll a5, a4, a0
 ;   srl a3, a4, a3
-;   bnez a0, 8
+;   beqz a0, 8
+;   j 8
 ;   mv a3, zero
 ;   sll a0, a1, a0
-;   or a4, a3, a0
+;   or a1, a3, a0
 ;   addi a3, zero, 0x40
 ;   andi a2, a2, 0x7f
-;   bltu a2, a3, 0x10
+;   bgeu a2, a3, 0xc
+;   mv a0, a5
+;   j 8
 ;   mv a0, zero
+;   bgeu a2, a3, 8
+;   j 8
 ;   mv a1, a5
-;   j 0xc
-;   mv a0, a5
-;   mv a1, a4
 ;   ret
 
 function %ushr_i128_i8(i128, i8) -> i128 {
@@ -1531,13 +1817,14 @@ block0(v0: i128, v1: i8):
 ;   li a3,64
 ;   sub a3,a3,a4
 ;   sll a5,a1,a3
-;   select a3,zero,a5##condition=(a4 eq zero)
+;   select_reg a3,zero,a5##condition=(a4 eq zero)
 ;   srl a5,a0,a4
 ;   or a5,a3,a5
 ;   li t0,64
 ;   srl a3,a1,a4
 ;   andi a4,a2,127
-;   select [a0,a1],[a3,zero],[a5,a3]##condition=(a4 uge t0)
+;   select_reg a0,a3,a5##condition=(a4 uge t0)
+;   select_reg a1,zero,a3##condition=(a4 uge t0)
 ;   ret
 ;
 ; Disassembled:
@@ -1546,21 +1833,23 @@ block0(v0: i128, v1: i8):
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a4
 ;   sll a5, a1, a3
-;   bnez a4, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a4, 0xc
 ;   mv a3, a5
+;   j 8
+;   mv a3, zero
 ;   srl a5, a0, a4
 ;   or a5, a3, a5
 ;   addi t0, zero, 0x40
 ;   srl a3, a1, a4
 ;   andi a4, a2, 0x7f
-;   bltu a4, t0, 0x10
-;   mv a0, a3
-;   mv a1, zero
-;   j 0xc
+;   bgeu a4, t0, 0xc
 ;   mv a0, a5
+;   j 8
+;   mv a0, a3
+;   bgeu a4, t0, 0xc
 ;   mv a1, a3
+;   j 8
+;   mv a1, zero
 ;   ret
 
 function %ushr_i128_i128(i128, i128) -> i128 {
@@ -1570,62 +1859,42 @@ block0(v0: i128, v1: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   sd s11,-8(sp)
-;   addi sp,sp,-16
 ; block0:
 ;   andi a5,a2,63
 ;   li a3,64
 ;   sub a3,a3,a5
 ;   sll a3,a1,a3
-;   select a3,zero,a3##condition=(a5 eq zero)
+;   select_reg a3,zero,a3##condition=(a5 eq zero)
 ;   srl a4,a0,a5
-;   or s11,a3,a4
+;   or a0,a3,a4
 ;   li a3,64
 ;   srl a4,a1,a5
 ;   andi a5,a2,127
-;   select [a0,a1],[a4,zero],[s11,a4]##condition=(a5 uge a3)
-;   addi sp,sp,16
-;   ld s11,-8(sp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
+;   select_reg a0,a4,a0##condition=(a5 uge a3)
+;   select_reg a1,zero,a4##condition=(a5 uge a3)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-;   sd s11, -8(sp)
-;   addi sp, sp, -0x10
-; block1: ; offset 0x18
 ;   andi a5, a2, 0x3f
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a5
 ;   sll a3, a1, a3
-;   bnez a5, 8
+;   beqz a5, 8
+;   j 8
 ;   mv a3, zero
 ;   srl a4, a0, a5
-;   or s11, a3, a4
+;   or a0, a3, a4
 ;   addi a3, zero, 0x40
 ;   srl a4, a1, a5
 ;   andi a5, a2, 0x7f
-;   bltu a5, a3, 0x10
+;   bgeu a5, a3, 8
+;   j 8
 ;   mv a0, a4
-;   mv a1, zero
-;   j 0xc
-;   mv a0, s11
+;   bgeu a5, a3, 0xc
 ;   mv a1, a4
-;   addi sp, sp, 0x10
-;   ld s11, -8(sp)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
+;   j 8
+;   mv a1, zero
 ;   ret
 
 function %sshr_i128_i8(i128, i8) -> i128 {
@@ -1640,16 +1909,17 @@ block0(v0: i128, v1: i8):
 ;   li a3,64
 ;   sub a3,a3,a4
 ;   sll a5,a1,a3
-;   select a3,zero,a5##condition=(a4 eq zero)
+;   select_reg a3,zero,a5##condition=(a4 eq zero)
 ;   srl a5,a0,a4
 ;   or a5,a3,a5
 ;   li a0,64
 ;   sra a3,a1,a4
 ;   li a4,-1
-;   select t4,a4,zero##condition=(a1 slt zero)
+;   select_reg a1,a4,zero##condition=(a1 slt zero)
 ;   li a4,64
 ;   andi a2,a2,127
-;   select [a0,a1],[a3,t4],[a5,a3]##condition=(a2 uge a4)
+;   select_reg a0,a3,a5##condition=(a2 uge a4)
+;   select_reg a1,a1,a3##condition=(a2 uge a4)
 ;   ret
 ;
 ; Disassembled:
@@ -1658,26 +1928,26 @@ block0(v0: i128, v1: i8):
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a4
 ;   sll a5, a1, a3
-;   bnez a4, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a4, 0xc
 ;   mv a3, a5
+;   j 8
+;   mv a3, zero
 ;   srl a5, a0, a4
 ;   or a5, a3, a5
 ;   addi a0, zero, 0x40
 ;   sra a3, a1, a4
 ;   addi a4, zero, -1
-;   bgez a1, 0xc
-;   mv t4, a4
+;   bltz a1, 0xc
+;   mv a1, zero
 ;   j 8
-;   mv t4, zero
+;   mv a1, a4
 ;   addi a4, zero, 0x40
 ;   andi a2, a2, 0x7f
-;   bltu a2, a4, 0x10
-;   mv a0, a3
-;   mv a1, t4
-;   j 0xc
+;   bgeu a2, a4, 0xc
 ;   mv a0, a5
+;   j 8
+;   mv a0, a3
+;   bgeu a2, a4, 8
 ;   mv a1, a3
 ;   ret
 
@@ -1688,68 +1958,48 @@ block0(v0: i128, v1: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   sd s11,-8(sp)
-;   addi sp,sp,-16
 ; block0:
 ;   andi a5,a2,63
 ;   li a3,64
 ;   sub a3,a3,a5
 ;   sll a3,a1,a3
-;   select a3,zero,a3##condition=(a5 eq zero)
+;   select_reg a3,zero,a3##condition=(a5 eq zero)
 ;   srl a4,a0,a5
-;   or s11,a3,a4
+;   or a0,a3,a4
 ;   li a3,64
 ;   sra a3,a1,a5
 ;   li a5,-1
-;   select a5,a5,zero##condition=(a1 slt zero)
+;   select_reg a1,a5,zero##condition=(a1 slt zero)
 ;   li a4,64
-;   andi a2,a2,127
-;   select [a0,a1],[a3,a5],[s11,a3]##condition=(a2 uge a4)
-;   addi sp,sp,16
-;   ld s11,-8(sp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
+;   andi a5,a2,127
+;   select_reg a0,a3,a0##condition=(a5 uge a4)
+;   select_reg a1,a1,a3##condition=(a5 uge a4)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-;   sd s11, -8(sp)
-;   addi sp, sp, -0x10
-; block1: ; offset 0x18
 ;   andi a5, a2, 0x3f
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a5
 ;   sll a3, a1, a3
-;   bnez a5, 8
+;   beqz a5, 8
+;   j 8
 ;   mv a3, zero
 ;   srl a4, a0, a5
-;   or s11, a3, a4
+;   or a0, a3, a4
 ;   addi a3, zero, 0x40
 ;   sra a3, a1, a5
 ;   addi a5, zero, -1
-;   bltz a1, 8
-;   mv a5, zero
+;   bltz a1, 0xc
+;   mv a1, zero
+;   j 8
+;   mv a1, a5
 ;   addi a4, zero, 0x40
-;   andi a2, a2, 0x7f
-;   bltu a2, a4, 0x10
+;   andi a5, a2, 0x7f
+;   bgeu a5, a4, 8
+;   j 8
 ;   mv a0, a3
-;   mv a1, a5
-;   j 0xc
-;   mv a0, s11
+;   bgeu a5, a4, 8
 ;   mv a1, a3
-;   addi sp, sp, 0x10
-;   ld s11, -8(sp)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/bitrev-zbb-zbkb.clif b/cranelift/filetests/filetests/isa/riscv64/bitrev-zbb-zbkb.clif
deleted file mode 100644
index 84d16bfea213..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/bitrev-zbb-zbkb.clif
+++ /dev/null
@@ -1,104 +0,0 @@
-test compile precise-output
-set unwind_info=false
-target riscv64 has_zbkb has_zbb
-
-function %bitrev_i8(i8) -> i8 {
-block0(v0: i8):
-    v1 = bitrev v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   brev8 a0,a0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x13, 0x55, 0x75, 0x68
-;   ret
-
-function %bitrev_i16(i16) -> i16 {
-block0(v0: i16):
-    v1 = bitrev v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   rev8 a2,a0
-;   brev8 a4,a2
-;   srli a0,a4,48
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x13, 0x56, 0x85, 0x6b
-;   .byte 0x13, 0x57, 0x76, 0x68
-;   srli a0, a4, 0x30
-;   ret
-
-function %bitrev_i32(i32) -> i32 {
-block0(v0: i32):
-    v1 = bitrev v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   rev8 a2,a0
-;   brev8 a4,a2
-;   srli a0,a4,32
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x13, 0x56, 0x85, 0x6b
-;   .byte 0x13, 0x57, 0x76, 0x68
-;   srli a0, a4, 0x20
-;   ret
-
-function %bitrev_i64(i64) -> i64 {
-block0(v0: i64):
-    v1 = bitrev v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   rev8 a2,a0
-;   brev8 a0,a2
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x13, 0x56, 0x85, 0x6b
-;   .byte 0x13, 0x55, 0x76, 0x68
-;   ret
-
-function %bitrev_i128(i128) -> i128 {
-block0(v0: i128):
-    v1 = bitrev v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   mv a2,a0
-;   rev8 a3,a1
-;   brev8 a0,a3
-;   mv a3,a2
-;   rev8 a1,a3
-;   brev8 a1,a1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   mv a2, a0
-;   .byte 0x93, 0xd6, 0x85, 0x6b
-;   .byte 0x13, 0xd5, 0x76, 0x68
-;   mv a3, a2
-;   .byte 0x93, 0xd5, 0x86, 0x6b
-;   .byte 0x93, 0xd5, 0x75, 0x68
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/bitrev.clif b/cranelift/filetests/filetests/isa/riscv64/bitrev.clif
deleted file mode 100644
index 968b94bb3e26..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/bitrev.clif
+++ /dev/null
@@ -1,577 +0,0 @@
-test compile precise-output
-set unwind_info=false
-target riscv64
-
-function %bitrev_i8(i8) -> i8 {
-block0(v0: i8):
-    v1 = bitrev v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   mv a1,a0
-;   brev8 a0,a1##tmp=a2 tmp2=a3 step=a4 ty=i8
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   mv a1, a0
-;   mv a0, zero
-;   addi a4, zero, 8
-;   addi a2, zero, 1
-;   slli a2, a2, 7
-;   addi a3, zero, 1
-;   slli a3, a3, 0
-;   blez a4, 0x34
-;   and t5, a2, a1
-;   beq zero, t5, 8
-;   or a0, a0, a3
-;   addi a4, a4, -1
-;   srli a2, a2, 1
-;   addi t5, zero, 8
-;   rem t5, a4, t5
-;   bnez t5, 0xc
-;   srli a3, a3, 0xf
-;   j -0x28
-;   slli a3, a3, 1
-;   j -0x30
-;   ret
-
-function %bitrev_i16(i16) -> i16 {
-block0(v0: i16):
-    v1 = bitrev v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   slli a2,a0,8
-;   srli a4,a0,8
-;   slli a1,a4,56
-;   srli a3,a1,56
-;   or a4,a2,a3
-;   slli a1,a4,16
-;   srli a2,a0,16
-;   slli a4,a2,8
-;   srli a2,a2,8
-;   slli a2,a2,56
-;   srli a5,a2,56
-;   or a2,a4,a5
-;   slli a2,a2,48
-;   srli a4,a2,48
-;   or a1,a1,a4
-;   slli a2,a1,32
-;   srli a5,a0,32
-;   slli a0,a5,8
-;   srli a3,a5,8
-;   slli a4,a3,56
-;   srli a1,a4,56
-;   or a3,a0,a1
-;   slli a4,a3,16
-;   srli a0,a5,16
-;   slli a3,a0,8
-;   srli a5,a0,8
-;   slli a0,a5,56
-;   srli a5,a0,56
-;   or a5,a3,a5
-;   slli a0,a5,48
-;   srli a3,a0,48
-;   or a4,a4,a3
-;   slli a0,a4,32
-;   srli a3,a0,32
-;   or a4,a2,a3
-;   brev8 a3,a4##tmp=a0 tmp2=a1 step=a2 ty=i64
-;   srli a0,a3,48
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   slli a2, a0, 8
-;   srli a4, a0, 8
-;   slli a1, a4, 0x38
-;   srli a3, a1, 0x38
-;   or a4, a2, a3
-;   slli a1, a4, 0x10
-;   srli a2, a0, 0x10
-;   slli a4, a2, 8
-;   srli a2, a2, 8
-;   slli a2, a2, 0x38
-;   srli a5, a2, 0x38
-;   or a2, a4, a5
-;   slli a2, a2, 0x30
-;   srli a4, a2, 0x30
-;   or a1, a1, a4
-;   slli a2, a1, 0x20
-;   srli a5, a0, 0x20
-;   slli a0, a5, 8
-;   srli a3, a5, 8
-;   slli a4, a3, 0x38
-;   srli a1, a4, 0x38
-;   or a3, a0, a1
-;   slli a4, a3, 0x10
-;   srli a0, a5, 0x10
-;   slli a3, a0, 8
-;   srli a5, a0, 8
-;   slli a0, a5, 0x38
-;   srli a5, a0, 0x38
-;   or a5, a3, a5
-;   slli a0, a5, 0x30
-;   srli a3, a0, 0x30
-;   or a4, a4, a3
-;   slli a0, a4, 0x20
-;   srli a3, a0, 0x20
-;   or a4, a2, a3
-;   mv a3, zero
-;   addi a2, zero, 0x40
-;   addi a0, zero, 1
-;   slli a0, a0, 0x3f
-;   addi a1, zero, 1
-;   slli a1, a1, 0x38
-;   blez a2, 0x34
-;   and t5, a0, a4
-;   beq zero, t5, 8
-;   or a3, a3, a1
-;   addi a2, a2, -1
-;   srli a0, a0, 1
-;   addi t5, zero, 8
-;   rem t5, a2, t5
-;   bnez t5, 0xc
-;   srli a1, a1, 0xf
-;   j -0x28
-;   slli a1, a1, 1
-;   j -0x30
-;   srli a0, a3, 0x30
-;   ret
-
-function %bitrev_i32(i32) -> i32 {
-block0(v0: i32):
-    v1 = bitrev v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   slli a2,a0,8
-;   srli a4,a0,8
-;   slli a1,a4,56
-;   srli a3,a1,56
-;   or a4,a2,a3
-;   slli a1,a4,16
-;   srli a2,a0,16
-;   slli a4,a2,8
-;   srli a2,a2,8
-;   slli a2,a2,56
-;   srli a5,a2,56
-;   or a2,a4,a5
-;   slli a2,a2,48
-;   srli a4,a2,48
-;   or a1,a1,a4
-;   slli a2,a1,32
-;   srli a5,a0,32
-;   slli a0,a5,8
-;   srli a3,a5,8
-;   slli a4,a3,56
-;   srli a1,a4,56
-;   or a3,a0,a1
-;   slli a4,a3,16
-;   srli a0,a5,16
-;   slli a3,a0,8
-;   srli a5,a0,8
-;   slli a0,a5,56
-;   srli a5,a0,56
-;   or a5,a3,a5
-;   slli a0,a5,48
-;   srli a3,a0,48
-;   or a4,a4,a3
-;   slli a0,a4,32
-;   srli a3,a0,32
-;   or a4,a2,a3
-;   brev8 a3,a4##tmp=a0 tmp2=a1 step=a2 ty=i64
-;   srli a0,a3,32
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   slli a2, a0, 8
-;   srli a4, a0, 8
-;   slli a1, a4, 0x38
-;   srli a3, a1, 0x38
-;   or a4, a2, a3
-;   slli a1, a4, 0x10
-;   srli a2, a0, 0x10
-;   slli a4, a2, 8
-;   srli a2, a2, 8
-;   slli a2, a2, 0x38
-;   srli a5, a2, 0x38
-;   or a2, a4, a5
-;   slli a2, a2, 0x30
-;   srli a4, a2, 0x30
-;   or a1, a1, a4
-;   slli a2, a1, 0x20
-;   srli a5, a0, 0x20
-;   slli a0, a5, 8
-;   srli a3, a5, 8
-;   slli a4, a3, 0x38
-;   srli a1, a4, 0x38
-;   or a3, a0, a1
-;   slli a4, a3, 0x10
-;   srli a0, a5, 0x10
-;   slli a3, a0, 8
-;   srli a5, a0, 8
-;   slli a0, a5, 0x38
-;   srli a5, a0, 0x38
-;   or a5, a3, a5
-;   slli a0, a5, 0x30
-;   srli a3, a0, 0x30
-;   or a4, a4, a3
-;   slli a0, a4, 0x20
-;   srli a3, a0, 0x20
-;   or a4, a2, a3
-;   mv a3, zero
-;   addi a2, zero, 0x40
-;   addi a0, zero, 1
-;   slli a0, a0, 0x3f
-;   addi a1, zero, 1
-;   slli a1, a1, 0x38
-;   blez a2, 0x34
-;   and t5, a0, a4
-;   beq zero, t5, 8
-;   or a3, a3, a1
-;   addi a2, a2, -1
-;   srli a0, a0, 1
-;   addi t5, zero, 8
-;   rem t5, a2, t5
-;   bnez t5, 0xc
-;   srli a1, a1, 0xf
-;   j -0x28
-;   slli a1, a1, 1
-;   j -0x30
-;   srli a0, a3, 0x20
-;   ret
-
-function %bitrev_i64(i64) -> i64 {
-block0(v0: i64):
-    v1 = bitrev v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   slli a2,a0,8
-;   srli a4,a0,8
-;   slli a1,a4,56
-;   srli a3,a1,56
-;   or a4,a2,a3
-;   slli a1,a4,16
-;   srli a2,a0,16
-;   slli a4,a2,8
-;   srli a2,a2,8
-;   slli a2,a2,56
-;   srli a5,a2,56
-;   or a2,a4,a5
-;   slli a2,a2,48
-;   srli a4,a2,48
-;   or a1,a1,a4
-;   slli a2,a1,32
-;   srli a5,a0,32
-;   slli a0,a5,8
-;   srli a3,a5,8
-;   slli a4,a3,56
-;   srli a1,a4,56
-;   or a3,a0,a1
-;   slli a4,a3,16
-;   srli a0,a5,16
-;   slli a3,a0,8
-;   srli a5,a0,8
-;   slli a0,a5,56
-;   srli a5,a0,56
-;   or a5,a3,a5
-;   slli a0,a5,48
-;   srli a3,a0,48
-;   or a4,a4,a3
-;   slli a0,a4,32
-;   srli a3,a0,32
-;   or a4,a2,a3
-;   brev8 a0,a4##tmp=a3 tmp2=a1 step=a2 ty=i64
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   slli a2, a0, 8
-;   srli a4, a0, 8
-;   slli a1, a4, 0x38
-;   srli a3, a1, 0x38
-;   or a4, a2, a3
-;   slli a1, a4, 0x10
-;   srli a2, a0, 0x10
-;   slli a4, a2, 8
-;   srli a2, a2, 8
-;   slli a2, a2, 0x38
-;   srli a5, a2, 0x38
-;   or a2, a4, a5
-;   slli a2, a2, 0x30
-;   srli a4, a2, 0x30
-;   or a1, a1, a4
-;   slli a2, a1, 0x20
-;   srli a5, a0, 0x20
-;   slli a0, a5, 8
-;   srli a3, a5, 8
-;   slli a4, a3, 0x38
-;   srli a1, a4, 0x38
-;   or a3, a0, a1
-;   slli a4, a3, 0x10
-;   srli a0, a5, 0x10
-;   slli a3, a0, 8
-;   srli a5, a0, 8
-;   slli a0, a5, 0x38
-;   srli a5, a0, 0x38
-;   or a5, a3, a5
-;   slli a0, a5, 0x30
-;   srli a3, a0, 0x30
-;   or a4, a4, a3
-;   slli a0, a4, 0x20
-;   srli a3, a0, 0x20
-;   or a4, a2, a3
-;   mv a0, zero
-;   addi a2, zero, 0x40
-;   addi a3, zero, 1
-;   slli a3, a3, 0x3f
-;   addi a1, zero, 1
-;   slli a1, a1, 0x38
-;   blez a2, 0x34
-;   and t5, a3, a4
-;   beq zero, t5, 8
-;   or a0, a0, a1
-;   addi a2, a2, -1
-;   srli a3, a3, 1
-;   addi t5, zero, 8
-;   rem t5, a2, t5
-;   bnez t5, 0xc
-;   srli a1, a1, 0xf
-;   j -0x28
-;   slli a1, a1, 1
-;   j -0x30
-;   ret
-
-function %bitrev_i128(i128) -> i128 {
-block0(v0: i128):
-    v1 = bitrev v0
-    return v1
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   sd s3,-8(sp)
-;   addi sp,sp,-16
-; block0:
-;   slli a3,a1,8
-;   srli a5,a1,8
-;   slli a2,a5,56
-;   srli a4,a2,56
-;   or a5,a3,a4
-;   slli a2,a5,16
-;   srli a3,a1,16
-;   slli a5,a3,8
-;   srli a3,a3,8
-;   slli a3,a3,56
-;   srli a3,a3,56
-;   or a3,a5,a3
-;   slli a3,a3,48
-;   srli a5,a3,48
-;   or a2,a2,a5
-;   slli a3,a2,32
-;   srli a1,a1,32
-;   slli a2,a1,8
-;   srli a4,a1,8
-;   slli a5,a4,56
-;   srli a4,a5,56
-;   or a4,a2,a4
-;   slli a5,a4,16
-;   srli a1,a1,16
-;   slli a4,a1,8
-;   srli a1,a1,8
-;   slli a1,a1,56
-;   srli a1,a1,56
-;   or a1,a4,a1
-;   slli a1,a1,48
-;   srli a4,a1,48
-;   or a5,a5,a4
-;   slli a1,a5,32
-;   srli a4,a1,32
-;   or a5,a3,a4
-;   brev8 a4,a5##tmp=a1 tmp2=a2 step=a3 ty=i64
-;   mv s3,a4
-;   slli a1,a0,8
-;   srli a2,a0,8
-;   slli a4,a2,56
-;   srli a2,a4,56
-;   or a2,a1,a2
-;   slli a4,a2,16
-;   srli a1,a0,16
-;   slli a2,a1,8
-;   srli a5,a1,8
-;   slli a1,a5,56
-;   srli a3,a1,56
-;   or a5,a2,a3
-;   slli a1,a5,48
-;   srli a2,a1,48
-;   or a4,a4,a2
-;   slli a1,a4,32
-;   srli a3,a0,32
-;   slli a4,a3,8
-;   srli a0,a3,8
-;   slli a2,a0,56
-;   srli a5,a2,56
-;   or a0,a4,a5
-;   slli a2,a0,16
-;   srli a4,a3,16
-;   slli a0,a4,8
-;   srli a3,a4,8
-;   slli a4,a3,56
-;   srli a3,a4,56
-;   or a3,a0,a3
-;   slli a4,a3,48
-;   srli a0,a4,48
-;   or a2,a2,a0
-;   slli a4,a2,32
-;   srli a0,a4,32
-;   or a2,a1,a0
-;   brev8 a1,a2##tmp=a4 tmp2=a5 step=a0 ty=i64
-;   mv a0,s3
-;   addi sp,sp,16
-;   ld s3,-8(sp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-;   sd s3, -8(sp)
-;   addi sp, sp, -0x10
-; block1: ; offset 0x18
-;   slli a3, a1, 8
-;   srli a5, a1, 8
-;   slli a2, a5, 0x38
-;   srli a4, a2, 0x38
-;   or a5, a3, a4
-;   slli a2, a5, 0x10
-;   srli a3, a1, 0x10
-;   slli a5, a3, 8
-;   srli a3, a3, 8
-;   slli a3, a3, 0x38
-;   srli a3, a3, 0x38
-;   or a3, a5, a3
-;   slli a3, a3, 0x30
-;   srli a5, a3, 0x30
-;   or a2, a2, a5
-;   slli a3, a2, 0x20
-;   srli a1, a1, 0x20
-;   slli a2, a1, 8
-;   srli a4, a1, 8
-;   slli a5, a4, 0x38
-;   srli a4, a5, 0x38
-;   or a4, a2, a4
-;   slli a5, a4, 0x10
-;   srli a1, a1, 0x10
-;   slli a4, a1, 8
-;   srli a1, a1, 8
-;   slli a1, a1, 0x38
-;   srli a1, a1, 0x38
-;   or a1, a4, a1
-;   slli a1, a1, 0x30
-;   srli a4, a1, 0x30
-;   or a5, a5, a4
-;   slli a1, a5, 0x20
-;   srli a4, a1, 0x20
-;   or a5, a3, a4
-;   mv a4, zero
-;   addi a3, zero, 0x40
-;   addi a1, zero, 1
-;   slli a1, a1, 0x3f
-;   addi a2, zero, 1
-;   slli a2, a2, 0x38
-;   blez a3, 0x34
-;   and t5, a1, a5
-;   beq zero, t5, 8
-;   or a4, a4, a2
-;   addi a3, a3, -1
-;   srli a1, a1, 1
-;   addi t5, zero, 8
-;   rem t5, a3, t5
-;   bnez t5, 0xc
-;   srli a2, a2, 0xf
-;   j -0x28
-;   slli a2, a2, 1
-;   j -0x30
-;   mv s3, a4
-;   slli a1, a0, 8
-;   srli a2, a0, 8
-;   slli a4, a2, 0x38
-;   srli a2, a4, 0x38
-;   or a2, a1, a2
-;   slli a4, a2, 0x10
-;   srli a1, a0, 0x10
-;   slli a2, a1, 8
-;   srli a5, a1, 8
-;   slli a1, a5, 0x38
-;   srli a3, a1, 0x38
-;   or a5, a2, a3
-;   slli a1, a5, 0x30
-;   srli a2, a1, 0x30
-;   or a4, a4, a2
-;   slli a1, a4, 0x20
-;   srli a3, a0, 0x20
-;   slli a4, a3, 8
-;   srli a0, a3, 8
-;   slli a2, a0, 0x38
-;   srli a5, a2, 0x38
-;   or a0, a4, a5
-;   slli a2, a0, 0x10
-;   srli a4, a3, 0x10
-;   slli a0, a4, 8
-;   srli a3, a4, 8
-;   slli a4, a3, 0x38
-;   srli a3, a4, 0x38
-;   or a3, a0, a3
-;   slli a4, a3, 0x30
-;   srli a0, a4, 0x30
-;   or a2, a2, a0
-;   slli a4, a2, 0x20
-;   srli a0, a4, 0x20
-;   or a2, a1, a0
-;   mv a1, zero
-;   addi a0, zero, 0x40
-;   addi a4, zero, 1
-;   slli a4, a4, 0x3f
-;   addi a5, zero, 1
-;   slli a5, a5, 0x38
-;   blez a0, 0x34
-;   and t5, a4, a2
-;   beq zero, t5, 8
-;   or a1, a1, a5
-;   addi a0, a0, -1
-;   srli a4, a4, 1
-;   addi t5, zero, 8
-;   rem t5, a0, t5
-;   bnez t5, 0xc
-;   srli a5, a5, 0xf
-;   j -0x28
-;   slli a5, a5, 1
-;   j -0x30
-;   mv a0, s3
-;   addi sp, sp, 0x10
-;   ld s3, -8(sp)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/br_table.clif b/cranelift/filetests/filetests/isa/riscv64/br_table.clif
index 38bf96b51498..8c5bde3ef46a 100644
--- a/cranelift/filetests/filetests/isa/riscv64/br_table.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/br_table.clif
@@ -47,7 +47,7 @@ block5(v5: i32):
 ;   li a5,4
 ;   j label7
 ; block7:
-;   addw a0,a0,a5
+;   add a0,a0,a5
 ;   ret
 ;
 ; Disassembled:
@@ -84,6 +84,6 @@ block5(v5: i32):
 ; block5: ; offset 0x64
 ;   addi a5, zero, 4
 ; block6: ; offset 0x68
-;   addw a0, a0, a5
+;   add a0, a0, a5
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/brif.clif b/cranelift/filetests/filetests/isa/riscv64/brif.clif
deleted file mode 100644
index aee4456047d7..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/brif.clif
+++ /dev/null
@@ -1,453 +0,0 @@
-test compile precise-output
-set unwind_info=false
-target riscv64
-
-
-function %brif_i8(i8) -> i8 {
-block0(v0: i8):
-  brif v0, block1, block2
-
-block1:
-  v1 = iconst.i8 1
-  return v1
-
-block2:
-  v2 = iconst.i8 0
-  return v2
-}
-
-; VCode:
-; block0:
-;   andi a4,a0,255
-;   bne a4,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   andi a4, a0, 0xff
-;   bnez a4, 0xc
-; block1: ; offset 0x8
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x10
-;   addi a0, zero, 1
-;   ret
-
-function %brif_i16(i16) -> i8 {
-block0(v0: i16):
-  brif v0, block1, block2
-
-block1:
-  v1 = iconst.i8 1
-  return v1
-
-block2:
-  v2 = iconst.i8 0
-  return v2
-}
-
-; VCode:
-; block0:
-;   slli a4,a0,48
-;   srai a0,a4,48
-;   bne a0,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   slli a4, a0, 0x30
-;   srai a0, a4, 0x30
-;   bnez a0, 0xc
-; block1: ; offset 0xc
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x14
-;   addi a0, zero, 1
-;   ret
-
-function %brif_i32(i32) -> i8 {
-block0(v0: i32):
-  brif v0, block1, block2
-
-block1:
-  v1 = iconst.i8 1
-  return v1
-
-block2:
-  v2 = iconst.i8 0
-  return v2
-}
-
-; VCode:
-; block0:
-;   sext.w a4,a0
-;   bne a4,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   sext.w a4, a0
-;   bnez a4, 0xc
-; block1: ; offset 0x8
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x10
-;   addi a0, zero, 1
-;   ret
-
-function %brif_i64(i64) -> i8 {
-block0(v0: i64):
-  brif v0, block1, block2
-
-block1:
-  v1 = iconst.i8 1
-  return v1
-
-block2:
-  v2 = iconst.i8 0
-  return v2
-}
-
-; VCode:
-; block0:
-;   bne a0,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   bnez a0, 0xc
-; block1: ; offset 0x4
-;   mv a0, zero
-;   ret
-; block2: ; offset 0xc
-;   addi a0, zero, 1
-;   ret
-
-function %brif_i128(i128) -> i8 {
-block0(v0: i128):
-  brif v0, block1, block2
-
-block1:
-  v1 = iconst.i8 1
-  return v1
-
-block2:
-  v2 = iconst.i8 0
-  return v2
-}
-
-; VCode:
-; block0:
-;   or a5,a0,a1
-;   bne a5,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   or a5, a0, a1
-;   bnez a5, 0xc
-; block1: ; offset 0x8
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x10
-;   addi a0, zero, 1
-;   ret
-
-function %brif_icmp_i8(i8, i8) -> i8 {
-block0(v0: i8, v1: i8):
-  v2 = icmp eq v0, v1
-  brif v2, block1, block2
-
-block1:
-  v3 = iconst.i8 1
-  return v3
-
-block2:
-  v4 = iconst.i8 0
-  return v4
-}
-
-; VCode:
-; block0:
-;   andi a5,a0,255
-;   andi a1,a1,255
-;   beq a5,a1,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   andi a5, a0, 0xff
-;   andi a1, a1, 0xff
-;   beq a5, a1, 0xc
-; block1: ; offset 0xc
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x14
-;   addi a0, zero, 1
-;   ret
-
-function %brif_icmp_i16(i16, i16) -> i8 {
-block0(v0: i16, v1: i16):
-  v2 = icmp ne v0, v1
-  brif v2, block1, block2
-
-block1:
-  v3 = iconst.i8 1
-  return v3
-
-block2:
-  v4 = iconst.i8 0
-  return v4
-}
-
-; VCode:
-; block0:
-;   mv a3,a1
-;   slli a5,a0,48
-;   srai a1,a5,48
-;   mv a5,a3
-;   slli a3,a5,48
-;   srai a5,a3,48
-;   bne a1,a5,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   mv a3, a1
-;   slli a5, a0, 0x30
-;   srai a1, a5, 0x30
-;   mv a5, a3
-;   slli a3, a5, 0x30
-;   srai a5, a3, 0x30
-;   bne a1, a5, 0xc
-; block1: ; offset 0x1c
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x24
-;   addi a0, zero, 1
-;   ret
-
-function %brif_icmp_i32(i32, i32) -> i8 {
-block0(v0: i32, v1: i32):
-  v2 = icmp slt v0, v1
-  brif v2, block1, block2
-
-block1:
-  v3 = iconst.i8 1
-  return v3
-
-block2:
-  v4 = iconst.i8 0
-  return v4
-}
-
-; VCode:
-; block0:
-;   sext.w a5,a0
-;   sext.w a1,a1
-;   blt a5,a1,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   sext.w a5, a0
-;   sext.w a1, a1
-;   blt a5, a1, 0xc
-; block1: ; offset 0xc
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x14
-;   addi a0, zero, 1
-;   ret
-
-function %brif_icmp_i64(i64, i64) -> i8 {
-block0(v0: i64, v1: i64):
-  v2 = icmp uge v0, v1
-  brif v2, block1, block2
-
-block1:
-  v3 = iconst.i8 1
-  return v3
-
-block2:
-  v4 = iconst.i8 0
-  return v4
-}
-
-; VCode:
-; block0:
-;   bgeu a0,a1,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   bgeu a0, a1, 0xc
-; block1: ; offset 0x4
-;   mv a0, zero
-;   ret
-; block2: ; offset 0xc
-;   addi a0, zero, 1
-;   ret
-
-function %brif_icmp_i128(i128, i128) -> i8 {
-block0(v0: i128, v1: i128):
-  v2 = icmp sgt v0, v1
-  brif v2, block1, block2
-
-block1:
-  v3 = iconst.i8 1
-  return v3
-
-block2:
-  v4 = iconst.i8 0
-  return v4
-}
-
-; VCode:
-; block0:
-;   slt a5,a3,a1
-;   sltu a4,a2,a0
-;   xor a0,a3,a1
-;   select a1,a4,a5##condition=(a0 eq zero)
-;   bne a1,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   slt a5, a3, a1
-;   sltu a4, a2, a0
-;   xor a0, a3, a1
-;   bnez a0, 0xc
-;   mv a1, a4
-;   j 8
-;   mv a1, a5
-;   bnez a1, 0xc
-; block1: ; offset 0x20
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x28
-;   addi a0, zero, 1
-;   ret
-
-function %brif_fcmp_f32(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-  v2 = fcmp lt v0, v1
-  brif v2, block1, block2
-
-block1:
-  v3 = iconst.i8 1
-  return v3
-
-block2:
-  v4 = iconst.i8 0
-  return v4
-}
-
-; VCode:
-; block0:
-;   flt.s a5,fa0,fa1
-;   bne a5,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   flt.s a5, fa0, fa1
-;   bnez a5, 0xc
-; block1: ; offset 0x8
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x10
-;   addi a0, zero, 1
-;   ret
-
-function %brif_fcmp_f64(f64, f64) -> i8 {
-block0(v0: f64, v1: f64):
-  v2 = fcmp uge v0, v1
-  brif v2, block1, block2
-
-block1:
-  v3 = iconst.i8 1
-  return v3
-
-block2:
-  v4 = iconst.i8 0
-  return v4
-}
-
-; VCode:
-; block0:
-;   flt.d a5,fa0,fa1
-;   beq a5,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   flt.d a5, fa0, fa1
-;   beqz a5, 0xc
-; block1: ; offset 0x8
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x10
-;   addi a0, zero, 1
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/bswap.clif b/cranelift/filetests/filetests/isa/riscv64/bswap.clif
index cbcfe12e57c0..020da5644da7 100644
--- a/cranelift/filetests/filetests/isa/riscv64/bswap.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/bswap.clif
@@ -12,18 +12,16 @@ block0(v0: i16):
 ; block0:
 ;   slli a2,a0,8
 ;   srli a4,a0,8
-;   slli a0,a4,56
-;   srli a3,a0,56
-;   or a0,a2,a3
+;   andi a0,a4,255
+;   or a0,a2,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   slli a2, a0, 8
 ;   srli a4, a0, 8
-;   slli a0, a4, 0x38
-;   srli a3, a0, 0x38
-;   or a0, a2, a3
+;   andi a0, a4, 0xff
+;   or a0, a2, a0
 ;   ret
 
 function %bswap_i32(i32) -> i32 {
@@ -36,38 +34,34 @@ block0(v0: i32):
 ; block0:
 ;   slli a2,a0,8
 ;   srli a4,a0,8
-;   slli a1,a4,56
-;   srli a3,a1,56
-;   or a4,a2,a3
-;   slli a1,a4,16
-;   srli a2,a0,16
-;   slli a4,a2,8
-;   srli a0,a2,8
-;   slli a2,a0,56
-;   srli a5,a2,56
-;   or a0,a4,a5
-;   slli a2,a0,48
-;   srli a4,a2,48
-;   or a0,a1,a4
+;   andi a1,a4,255
+;   or a2,a2,a1
+;   slli a4,a2,16
+;   srli a0,a0,16
+;   slli a2,a0,8
+;   srli a5,a0,8
+;   andi a0,a5,255
+;   or a2,a2,a0
+;   slli a5,a2,48
+;   srli a0,a5,48
+;   or a0,a4,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   slli a2, a0, 8
 ;   srli a4, a0, 8
-;   slli a1, a4, 0x38
-;   srli a3, a1, 0x38
-;   or a4, a2, a3
-;   slli a1, a4, 0x10
-;   srli a2, a0, 0x10
-;   slli a4, a2, 8
-;   srli a0, a2, 8
-;   slli a2, a0, 0x38
-;   srli a5, a2, 0x38
-;   or a0, a4, a5
-;   slli a2, a0, 0x30
-;   srli a4, a2, 0x30
-;   or a0, a1, a4
+;   andi a1, a4, 0xff
+;   or a2, a2, a1
+;   slli a4, a2, 0x10
+;   srli a0, a0, 0x10
+;   slli a2, a0, 8
+;   srli a5, a0, 8
+;   andi a0, a5, 0xff
+;   or a2, a2, a0
+;   slli a5, a2, 0x30
+;   srli a0, a5, 0x30
+;   or a0, a4, a0
 ;   ret
 
 function %bswap_i64(i64) -> i64 {
@@ -80,78 +74,70 @@ block0(v0: i64):
 ; block0:
 ;   slli a2,a0,8
 ;   srli a4,a0,8
-;   slli a1,a4,56
-;   srli a3,a1,56
-;   or a4,a2,a3
-;   slli a1,a4,16
-;   srli a2,a0,16
-;   slli a4,a2,8
-;   srli a2,a2,8
-;   slli a2,a2,56
-;   srli a5,a2,56
-;   or a2,a4,a5
-;   slli a2,a2,48
-;   srli a4,a2,48
-;   or a1,a1,a4
-;   slli a2,a1,32
-;   srli a5,a0,32
-;   slli a0,a5,8
-;   srli a3,a5,8
-;   slli a4,a3,56
-;   srli a1,a4,56
-;   or a3,a0,a1
-;   slli a4,a3,16
-;   srli a0,a5,16
-;   slli a3,a0,8
+;   andi a1,a4,255
+;   or a2,a2,a1
+;   slli a4,a2,16
+;   srli a1,a0,16
+;   slli a2,a1,8
+;   srli a5,a1,8
+;   andi a1,a5,255
+;   or a2,a2,a1
+;   slli a5,a2,48
+;   srli a1,a5,48
+;   or a2,a4,a1
+;   slli a4,a2,32
+;   srli a0,a0,32
+;   slli a2,a0,8
 ;   srli a5,a0,8
-;   slli a0,a5,56
-;   srli a5,a0,56
-;   or a5,a3,a5
-;   slli a0,a5,48
-;   srli a3,a0,48
-;   or a4,a4,a3
-;   slli a0,a4,32
-;   srli a3,a0,32
-;   or a0,a2,a3
+;   andi a1,a5,255
+;   or a2,a2,a1
+;   slli a5,a2,16
+;   srli a0,a0,16
+;   slli a2,a0,8
+;   srli a0,a0,8
+;   andi a0,a0,255
+;   or a2,a2,a0
+;   slli a0,a2,48
+;   srli a0,a0,48
+;   or a2,a5,a0
+;   slli a5,a2,32
+;   srli a0,a5,32
+;   or a0,a4,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   slli a2, a0, 8
 ;   srli a4, a0, 8
-;   slli a1, a4, 0x38
-;   srli a3, a1, 0x38
-;   or a4, a2, a3
-;   slli a1, a4, 0x10
-;   srli a2, a0, 0x10
-;   slli a4, a2, 8
-;   srli a2, a2, 8
-;   slli a2, a2, 0x38
-;   srli a5, a2, 0x38
-;   or a2, a4, a5
-;   slli a2, a2, 0x30
-;   srli a4, a2, 0x30
-;   or a1, a1, a4
-;   slli a2, a1, 0x20
-;   srli a5, a0, 0x20
-;   slli a0, a5, 8
-;   srli a3, a5, 8
-;   slli a4, a3, 0x38
-;   srli a1, a4, 0x38
-;   or a3, a0, a1
-;   slli a4, a3, 0x10
-;   srli a0, a5, 0x10
-;   slli a3, a0, 8
+;   andi a1, a4, 0xff
+;   or a2, a2, a1
+;   slli a4, a2, 0x10
+;   srli a1, a0, 0x10
+;   slli a2, a1, 8
+;   srli a5, a1, 8
+;   andi a1, a5, 0xff
+;   or a2, a2, a1
+;   slli a5, a2, 0x30
+;   srli a1, a5, 0x30
+;   or a2, a4, a1
+;   slli a4, a2, 0x20
+;   srli a0, a0, 0x20
+;   slli a2, a0, 8
 ;   srli a5, a0, 8
-;   slli a0, a5, 0x38
-;   srli a5, a0, 0x38
-;   or a5, a3, a5
-;   slli a0, a5, 0x30
-;   srli a3, a0, 0x30
-;   or a4, a4, a3
-;   slli a0, a4, 0x20
-;   srli a3, a0, 0x20
-;   or a0, a2, a3
+;   andi a1, a5, 0xff
+;   or a2, a2, a1
+;   slli a5, a2, 0x10
+;   srli a0, a0, 0x10
+;   slli a2, a0, 8
+;   srli a0, a0, 8
+;   andi a0, a0, 0xff
+;   or a2, a2, a0
+;   slli a0, a2, 0x30
+;   srli a0, a0, 0x30
+;   or a2, a5, a0
+;   slli a5, a2, 0x20
+;   srli a0, a5, 0x20
+;   or a0, a4, a0
 ;   ret
 
 function %bswap_i128(i128) -> i128 {
@@ -161,154 +147,161 @@ block0(v0: i128):
 }
 
 ; VCode:
+;   add sp,-16
+;   sd ra,8(sp)
+;   sd fp,0(sp)
+;   mv fp,sp
+;   sd s5,-8(sp)
+;   add sp,-16
 ; block0:
 ;   slli a3,a1,8
 ;   srli a5,a1,8
-;   slli a2,a5,56
-;   srli a4,a2,56
-;   or a5,a3,a4
+;   andi a2,a5,255
+;   or a3,a3,a2
+;   slli a5,a3,16
+;   srli a2,a1,16
+;   slli a3,a2,8
+;   srli a2,a2,8
+;   andi a2,a2,255
+;   or a3,a3,a2
+;   slli a2,a3,48
+;   srli a2,a2,48
+;   or a3,a5,a2
+;   slli a5,a3,32
+;   srli a2,a1,32
+;   slli a3,a2,8
+;   srli a1,a2,8
+;   andi a1,a1,255
+;   or a3,a3,a1
+;   slli a1,a3,16
+;   srli a2,a2,16
+;   slli a3,a2,8
+;   srli a2,a2,8
+;   andi a2,a2,255
+;   or a3,a3,a2
+;   slli a2,a3,48
+;   srli a2,a2,48
+;   or a3,a1,a2
+;   slli a1,a3,32
+;   srli a1,a1,32
+;   or a3,a5,a1
+;   mv s5,a3
+;   slli a5,a0,8
+;   srli a1,a0,8
+;   andi a3,a1,255
+;   or a5,a5,a3
+;   slli a1,a5,16
+;   srli a3,a0,16
+;   slli a5,a3,8
+;   srli a2,a3,8
+;   andi a3,a2,255
+;   or a5,a5,a3
+;   slli a2,a5,48
+;   srli a3,a2,48
+;   or a5,a1,a3
+;   slli a1,a5,32
+;   srli a3,a0,32
+;   slli a5,a3,8
+;   srli a2,a3,8
+;   andi a4,a2,255
+;   or a5,a5,a4
 ;   slli a2,a5,16
-;   srli a3,a1,16
+;   srli a3,a3,16
 ;   slli a5,a3,8
 ;   srli a3,a3,8
-;   slli a3,a3,56
-;   srli a3,a3,56
-;   or a3,a5,a3
-;   slli a3,a3,48
-;   srli a5,a3,48
-;   or a2,a2,a5
-;   slli a3,a2,32
-;   srli a1,a1,32
-;   slli a2,a1,8
-;   srli a4,a1,8
-;   slli a5,a4,56
-;   srli a4,a5,56
-;   or a4,a2,a4
-;   slli a5,a4,16
-;   srli a1,a1,16
-;   slli a4,a1,8
-;   srli a1,a1,8
-;   slli a1,a1,56
-;   srli a1,a1,56
-;   or a1,a4,a1
-;   slli a1,a1,48
-;   srli a4,a1,48
-;   or a5,a5,a4
-;   slli a1,a5,32
-;   srli a4,a1,32
-;   or a5,a3,a4
-;   mv t1,a5
-;   slli a1,a0,8
-;   srli a3,a0,8
-;   slli a5,a3,56
-;   srli a2,a5,56
-;   or a3,a1,a2
-;   slli a5,a3,16
-;   srli a1,a0,16
-;   slli a3,a1,8
-;   srli a1,a1,8
-;   slli a1,a1,56
-;   srli a4,a1,56
-;   or a1,a3,a4
-;   slli a1,a1,48
-;   srli a3,a1,48
+;   andi a3,a3,255
 ;   or a5,a5,a3
-;   slli a1,a5,32
-;   srli a4,a0,32
-;   slli a5,a4,8
-;   srli a2,a4,8
-;   slli a3,a2,56
-;   srli a0,a3,56
-;   or a2,a5,a0
-;   slli a3,a2,16
-;   srli a5,a4,16
-;   slli a2,a5,8
-;   srli a4,a5,8
-;   slli a5,a4,56
-;   srli a4,a5,56
-;   or a4,a2,a4
-;   slli a5,a4,48
-;   srli a2,a5,48
-;   or a3,a3,a2
-;   slli a5,a3,32
-;   srli a2,a5,32
-;   or a1,a1,a2
-;   mv a0,t1
+;   slli a3,a5,48
+;   srli a3,a3,48
+;   or a5,a2,a3
+;   slli a2,a5,32
+;   srli a3,a2,32
+;   or a1,a1,a3
+;   mv a0,s5
+;   add sp,+16
+;   ld s5,-8(sp)
+;   ld ra,8(sp)
+;   ld fp,0(sp)
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   addi sp, sp, -0x10
+;   sd ra, 8(sp)
+;   sd s0, 0(sp)
+;   mv s0, sp
+;   sd s5, -8(sp)
+;   addi sp, sp, -0x10
+; block1: ; offset 0x18
 ;   slli a3, a1, 8
 ;   srli a5, a1, 8
-;   slli a2, a5, 0x38
-;   srli a4, a2, 0x38
-;   or a5, a3, a4
+;   andi a2, a5, 0xff
+;   or a3, a3, a2
+;   slli a5, a3, 0x10
+;   srli a2, a1, 0x10
+;   slli a3, a2, 8
+;   srli a2, a2, 8
+;   andi a2, a2, 0xff
+;   or a3, a3, a2
+;   slli a2, a3, 0x30
+;   srli a2, a2, 0x30
+;   or a3, a5, a2
+;   slli a5, a3, 0x20
+;   srli a2, a1, 0x20
+;   slli a3, a2, 8
+;   srli a1, a2, 8
+;   andi a1, a1, 0xff
+;   or a3, a3, a1
+;   slli a1, a3, 0x10
+;   srli a2, a2, 0x10
+;   slli a3, a2, 8
+;   srli a2, a2, 8
+;   andi a2, a2, 0xff
+;   or a3, a3, a2
+;   slli a2, a3, 0x30
+;   srli a2, a2, 0x30
+;   or a3, a1, a2
+;   slli a1, a3, 0x20
+;   srli a1, a1, 0x20
+;   or a3, a5, a1
+;   mv s5, a3
+;   slli a5, a0, 8
+;   srli a1, a0, 8
+;   andi a3, a1, 0xff
+;   or a5, a5, a3
+;   slli a1, a5, 0x10
+;   srli a3, a0, 0x10
+;   slli a5, a3, 8
+;   srli a2, a3, 8
+;   andi a3, a2, 0xff
+;   or a5, a5, a3
+;   slli a2, a5, 0x30
+;   srli a3, a2, 0x30
+;   or a5, a1, a3
+;   slli a1, a5, 0x20
+;   srli a3, a0, 0x20
+;   slli a5, a3, 8
+;   srli a2, a3, 8
+;   andi a4, a2, 0xff
+;   or a5, a5, a4
 ;   slli a2, a5, 0x10
-;   srli a3, a1, 0x10
+;   srli a3, a3, 0x10
 ;   slli a5, a3, 8
 ;   srli a3, a3, 8
-;   slli a3, a3, 0x38
-;   srli a3, a3, 0x38
-;   or a3, a5, a3
-;   slli a3, a3, 0x30
-;   srli a5, a3, 0x30
-;   or a2, a2, a5
-;   slli a3, a2, 0x20
-;   srli a1, a1, 0x20
-;   slli a2, a1, 8
-;   srli a4, a1, 8
-;   slli a5, a4, 0x38
-;   srli a4, a5, 0x38
-;   or a4, a2, a4
-;   slli a5, a4, 0x10
-;   srli a1, a1, 0x10
-;   slli a4, a1, 8
-;   srli a1, a1, 8
-;   slli a1, a1, 0x38
-;   srli a1, a1, 0x38
-;   or a1, a4, a1
-;   slli a1, a1, 0x30
-;   srli a4, a1, 0x30
-;   or a5, a5, a4
-;   slli a1, a5, 0x20
-;   srli a4, a1, 0x20
-;   or a5, a3, a4
-;   mv t1, a5
-;   slli a1, a0, 8
-;   srli a3, a0, 8
-;   slli a5, a3, 0x38
-;   srli a2, a5, 0x38
-;   or a3, a1, a2
-;   slli a5, a3, 0x10
-;   srli a1, a0, 0x10
-;   slli a3, a1, 8
-;   srli a1, a1, 8
-;   slli a1, a1, 0x38
-;   srli a4, a1, 0x38
-;   or a1, a3, a4
-;   slli a1, a1, 0x30
-;   srli a3, a1, 0x30
+;   andi a3, a3, 0xff
 ;   or a5, a5, a3
-;   slli a1, a5, 0x20
-;   srli a4, a0, 0x20
-;   slli a5, a4, 8
-;   srli a2, a4, 8
-;   slli a3, a2, 0x38
-;   srli a0, a3, 0x38
-;   or a2, a5, a0
-;   slli a3, a2, 0x10
-;   srli a5, a4, 0x10
-;   slli a2, a5, 8
-;   srli a4, a5, 8
-;   slli a5, a4, 0x38
-;   srli a4, a5, 0x38
-;   or a4, a2, a4
-;   slli a5, a4, 0x30
-;   srli a2, a5, 0x30
-;   or a3, a3, a2
-;   slli a5, a3, 0x20
-;   srli a2, a5, 0x20
-;   or a1, a1, a2
-;   mv a0, t1
+;   slli a3, a5, 0x30
+;   srli a3, a3, 0x30
+;   or a5, a2, a3
+;   slli a2, a5, 0x20
+;   srli a3, a2, 0x20
+;   or a1, a1, a3
+;   mv a0, s5
+;   addi sp, sp, 0x10
+;   ld s5, -8(sp)
+;   ld ra, 8(sp)
+;   ld s0, 0(sp)
+;   addi sp, sp, 0x10
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/call-indirect.clif b/cranelift/filetests/filetests/isa/riscv64/call-indirect.clif
index 8747d9b2ecba..01b2d3343a86 100644
--- a/cranelift/filetests/filetests/isa/riscv64/call-indirect.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/call-indirect.clif
@@ -10,7 +10,7 @@ block0(v0: i64, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -18,7 +18,7 @@ block0(v0: i64, v1: i64):
 ;   callind a1
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/call.clif b/cranelift/filetests/filetests/isa/riscv64/call.clif
index 2c11c7712a3d..8fa3cad65681 100644
--- a/cranelift/filetests/filetests/isa/riscv64/call.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/call.clif
@@ -11,7 +11,7 @@ block0(v0: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -20,7 +20,7 @@ block0(v0: i64):
 ;   callind a3
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -60,7 +60,7 @@ block0(v0: i32):
 ;   callind a5
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -108,7 +108,7 @@ block0(v0: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -118,7 +118,7 @@ block0(v0: i32):
 ;   callind a5
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -167,15 +167,15 @@ block0(v0: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ;   sd s3,-8(sp)
-;   addi sp,sp,-16
+;   add sp,-16
 ; block0:
 ;   li a7,42
-;   addi sp,sp,-16
+;   add sp,-16
 ;   virtual_sp_offset_adj +16
 ;   slli a5,a0,56; srai a5,a5,56
 ;   sd a5,0(sp)
@@ -188,13 +188,13 @@ block0(v0: i8):
 ;   mv a5,a7
 ;   mv a6,a7
 ;   callind s3
-;   addi sp,sp,16
+;   add sp,+16
 ;   virtual_sp_offset_adj -16
-;   addi sp,sp,16
+;   add sp,+16
 ;   ld s3,-8(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -290,14 +290,14 @@ block0:
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ;   fsd fs0,-8(sp)
 ;   fsd fs2,-16(sp)
 ;   fsd fs3,-24(sp)
-;   addi sp,sp,-32
+;   add sp,-32
 ; block0:
 ;   load_sym a3,%g0+0
 ;   callind a3
@@ -319,13 +319,13 @@ block0:
 ;   load_sym a0,%g4+0
 ;   fmv.d fa0,fs3
 ;   callind a0
-;   addi sp,sp,32
+;   add sp,+32
 ;   fld fs0,-8(sp)
 ;   fld fs2,-16(sp)
 ;   fld fs3,-24(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -423,7 +423,7 @@ block0(v0: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -435,7 +435,7 @@ block0(v0: i64):
 ;   callind a4
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -486,7 +486,7 @@ block0(v0: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -498,7 +498,7 @@ block0(v0: i64):
 ;   callind a4
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -549,7 +549,7 @@ block0(v0: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -561,7 +561,7 @@ block0(v0: i64):
 ;   callind a4
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -591,7 +591,7 @@ block0(v0: i128, v1: i128, v2: i128, v3: i64, v4: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -600,7 +600,7 @@ block0(v0: i128, v1: i128, v2: i128, v3: i64, v4: i128):
 ;   ld a1,16(fp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -626,33 +626,33 @@ block0(v0: i128, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ;   sd s3,-8(sp)
-;   addi sp,sp,-16
+;   add sp,-16
 ; block0:
-;   mv a6,a2
 ;   mv a7,a0
-;   addi sp,sp,-16
+;   mv a6,a2
+;   add sp,-16
 ;   virtual_sp_offset_adj +16
 ;   sd a1,0(sp)
 ;   mv a5,a1
 ;   load_sym s3,%f14+0
-;   mv a0,a7
 ;   mv a1,a5
-;   mv a2,a7
 ;   mv a3,a5
+;   mv a0,a7
+;   mv a2,a7
 ;   mv a4,a7
 ;   callind s3
-;   addi sp,sp,16
+;   add sp,+16
 ;   virtual_sp_offset_adj -16
-;   addi sp,sp,16
+;   add sp,+16
 ;   ld s3,-8(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -664,8 +664,8 @@ block0(v0: i128, v1: i64):
 ;   sd s3, -8(sp)
 ;   addi sp, sp, -0x10
 ; block1: ; offset 0x18
-;   mv a6, a2
 ;   mv a7, a0
+;   mv a6, a2
 ;   addi sp, sp, -0x10
 ;   sd a1, 0(sp)
 ;   mv a5, a1
@@ -674,10 +674,10 @@ block0(v0: i128, v1: i64):
 ;   j 0xc
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %f14 0
 ;   .byte 0x00, 0x00, 0x00, 0x00
-;   mv a0, a7
 ;   mv a1, a5
-;   mv a2, a7
 ;   mv a3, a5
+;   mv a0, a7
+;   mv a2, a7
 ;   mv a4, a7
 ;   jalr s3
 ;   addi sp, sp, 0x10
@@ -694,7 +694,7 @@ block0(v0: i128, v1: i128, v2: i128, v3: i64, v4: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -703,7 +703,7 @@ block0(v0: i128, v1: i128, v2: i128, v3: i64, v4: i128):
 ;   ld a1,16(fp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -729,33 +729,33 @@ block0(v0: i128, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ;   sd s3,-8(sp)
-;   addi sp,sp,-16
+;   add sp,-16
 ; block0:
-;   mv a6,a2
 ;   mv a7,a0
-;   addi sp,sp,-16
+;   mv a6,a2
+;   add sp,-16
 ;   virtual_sp_offset_adj +16
 ;   sd a1,0(sp)
 ;   mv a5,a1
 ;   load_sym s3,%f15+0
-;   mv a0,a7
 ;   mv a1,a5
-;   mv a2,a7
 ;   mv a3,a5
+;   mv a0,a7
+;   mv a2,a7
 ;   mv a4,a7
 ;   callind s3
-;   addi sp,sp,16
+;   add sp,+16
 ;   virtual_sp_offset_adj -16
-;   addi sp,sp,16
+;   add sp,+16
 ;   ld s3,-8(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -767,8 +767,8 @@ block0(v0: i128, v1: i64):
 ;   sd s3, -8(sp)
 ;   addi sp, sp, -0x10
 ; block1: ; offset 0x18
-;   mv a6, a2
 ;   mv a7, a0
+;   mv a6, a2
 ;   addi sp, sp, -0x10
 ;   sd a1, 0(sp)
 ;   mv a5, a1
@@ -777,10 +777,10 @@ block0(v0: i128, v1: i64):
 ;   j 0xc
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %f15 0
 ;   .byte 0x00, 0x00, 0x00, 0x00
-;   mv a0, a7
 ;   mv a1, a5
-;   mv a2, a7
 ;   mv a3, a5
+;   mv a0, a7
+;   mv a2, a7
 ;   mv a4, a7
 ;   jalr s3
 ;   addi sp, sp, 0x10
@@ -820,21 +820,21 @@ block0(v0: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ;   sd s1,-8(sp)
-;   addi sp,sp,-16
+;   add sp,-16
 ; block0:
 ;   mv s1,a0
 ;   call userextname0
 ;   mv a0,s1
-;   addi sp,sp,16
+;   add sp,+16
 ;   ld s1,-8(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -847,7 +847,7 @@ block0(v0: i16):
 ;   addi sp, sp, -0x10
 ; block1: ; offset 0x18
 ;   mv s1, a0
-;   auipc ra, 0 ; reloc_external RiscvCallPlt u0:0 0
+;   auipc ra, 0 ; reloc_external RiscvCall u0:0 0
 ;   jalr ra
 ;   mv a0, s1
 ;   addi sp, sp, 0x10
diff --git a/cranelift/filetests/filetests/isa/riscv64/cls-zbb.clif b/cranelift/filetests/filetests/isa/riscv64/cls-zbb.clif
index 1477bb8ba5d4..eb5e98021ad2 100644
--- a/cranelift/filetests/filetests/isa/riscv64/cls-zbb.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/cls-zbb.clif
@@ -13,21 +13,25 @@ block0(v0: i8):
 ; block0:
 ;   sext.b a2,a0
 ;   not a4,a2
-;   select a0,a4,a2##condition=(a2 slt zero)
-;   clz a2,a0
-;   addi a0,a2,-57
+;   select_reg a0,a4,a2##condition=(a2 slt zero)
+;   andi a2,a0,255
+;   clz a4,a2
+;   addi a0,a4,-56
+;   addi a0,a0,-1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   .byte 0x13, 0x16, 0x45, 0x60
 ;   not a4, a2
-;   bgez a2, 0xc
-;   mv a0, a4
-;   j 8
+;   bltz a2, 0xc
 ;   mv a0, a2
-;   .byte 0x13, 0x16, 0x05, 0x60
-;   addi a0, a2, -0x39
+;   j 8
+;   mv a0, a4
+;   andi a2, a0, 0xff
+;   .byte 0x13, 0x17, 0x06, 0x60
+;   addi a0, a4, -0x38
+;   addi a0, a0, -1
 ;   ret
 
 function %cls_i16(i16) -> i16 {
@@ -40,21 +44,25 @@ block0(v0: i16):
 ; block0:
 ;   sext.h a2,a0
 ;   not a4,a2
-;   select a0,a4,a2##condition=(a2 slt zero)
-;   clz a2,a0
-;   addi a0,a2,-49
+;   select_reg a0,a4,a2##condition=(a2 slt zero)
+;   zext.h a2,a0
+;   clz a4,a2
+;   addi a0,a4,-48
+;   addi a0,a0,-1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   .byte 0x13, 0x16, 0x55, 0x60
 ;   not a4, a2
-;   bgez a2, 0xc
-;   mv a0, a4
-;   j 8
+;   bltz a2, 0xc
 ;   mv a0, a2
-;   .byte 0x13, 0x16, 0x05, 0x60
-;   addi a0, a2, -0x31
+;   j 8
+;   mv a0, a4
+;   .byte 0x3b, 0x46, 0x05, 0x08
+;   .byte 0x13, 0x17, 0x06, 0x60
+;   addi a0, a4, -0x30
+;   addi a0, a0, -1
 ;   ret
 
 function %cls_i32(i32) -> i32 {
@@ -67,21 +75,21 @@ block0(v0: i32):
 ; block0:
 ;   sext.w a2,a0
 ;   not a4,a2
-;   select a0,a4,a2##condition=(a2 slt zero)
-;   clz a2,a0
-;   addi a0,a2,-33
+;   select_reg a0,a4,a2##condition=(a2 slt zero)
+;   clzw a2,a0
+;   addi a0,a2,-1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sext.w a2, a0
 ;   not a4, a2
-;   bgez a2, 0xc
-;   mv a0, a4
-;   j 8
+;   bltz a2, 0xc
 ;   mv a0, a2
-;   .byte 0x13, 0x16, 0x05, 0x60
-;   addi a0, a2, -0x21
+;   j 8
+;   mv a0, a4
+;   .byte 0x1b, 0x16, 0x05, 0x60
+;   addi a0, a2, -1
 ;   ret
 
 function %cls_i64(i64) -> i64 {
@@ -93,7 +101,7 @@ block0(v0: i64):
 ; VCode:
 ; block0:
 ;   not a2,a0
-;   select a4,a2,a0##condition=(a0 slt zero)
+;   select_reg a4,a2,a0##condition=(a0 slt zero)
 ;   clz a0,a4
 ;   addi a0,a0,-1
 ;   ret
@@ -101,10 +109,10 @@ block0(v0: i64):
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   not a2, a0
-;   bgez a0, 0xc
-;   mv a4, a2
-;   j 8
+;   bltz a0, 0xc
 ;   mv a4, a0
+;   j 8
+;   mv a4, a2
 ;   .byte 0x13, 0x15, 0x07, 0x60
 ;   addi a0, a0, -1
 ;   ret
@@ -118,13 +126,14 @@ block0(v0: i128):
 ; VCode:
 ; block0:
 ;   not a3,a0
-;   select a5,a3,a0##condition=(a1 slt zero)
+;   select_reg a5,a3,a0##condition=(a1 slt zero)
 ;   not a2,a1
-;   select a3,a2,a1##condition=(a1 slt zero)
+;   select_reg a3,a2,a1##condition=(a1 slt zero)
 ;   clz a0,a3
 ;   clz a1,a5
-;   select a3,a1,zero##condition=(a3 eq zero)
+;   select_reg a3,a1,zero##condition=(a3 eq zero)
 ;   add a5,a0,a3
+;   li a1,0
 ;   addi a0,a5,-1
 ;   li a1,0
 ;   ret
@@ -132,22 +141,23 @@ block0(v0: i128):
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   not a3, a0
-;   bgez a1, 0xc
-;   mv a5, a3
-;   j 8
+;   bltz a1, 0xc
 ;   mv a5, a0
-;   not a2, a1
-;   bgez a1, 0xc
-;   mv a3, a2
 ;   j 8
+;   mv a5, a3
+;   not a2, a1
+;   bltz a1, 0xc
 ;   mv a3, a1
+;   j 8
+;   mv a3, a2
 ;   .byte 0x13, 0x95, 0x06, 0x60
 ;   .byte 0x93, 0x95, 0x07, 0x60
-;   bnez a3, 0xc
-;   mv a3, a1
-;   j 8
+;   beqz a3, 0xc
 ;   mv a3, zero
+;   j 8
+;   mv a3, a1
 ;   add a5, a0, a3
+;   mv a1, zero
 ;   addi a0, a5, -1
 ;   mv a1, zero
 ;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/clz-zbb.clif b/cranelift/filetests/filetests/isa/riscv64/clz-zbb.clif
index fda9f412930d..714ca6a33aac 100644
--- a/cranelift/filetests/filetests/isa/riscv64/clz-zbb.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/clz-zbb.clif
@@ -84,7 +84,7 @@ block0(v0: i128):
 ; block0:
 ;   clz a3,a1
 ;   clz a5,a0
-;   select a1,a5,zero##condition=(a1 eq zero)
+;   select_reg a1,a5,zero##condition=(a1 eq zero)
 ;   add a0,a3,a1
 ;   li a1,0
 ;   ret
@@ -93,10 +93,10 @@ block0(v0: i128):
 ; block0: ; offset 0x0
 ;   .byte 0x93, 0x96, 0x05, 0x60
 ;   .byte 0x93, 0x17, 0x05, 0x60
-;   bnez a1, 0xc
-;   mv a1, a5
-;   j 8
+;   beqz a1, 0xc
 ;   mv a1, zero
+;   j 8
+;   mv a1, a5
 ;   add a0, a3, a1
 ;   mv a1, zero
 ;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/cold-blocks.clif b/cranelift/filetests/filetests/isa/riscv64/cold-blocks.clif
index 98db409e8a61..771a4e9635f3 100644
--- a/cranelift/filetests/filetests/isa/riscv64/cold-blocks.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/cold-blocks.clif
@@ -16,8 +16,9 @@ block2:
 
 ; VCode:
 ; block0:
-;   sext.w a5,a0
-;   bne a5,zero,taken(label1),not_taken(label2)
+;   slli a5,a0,32
+;   srli a1,a5,32
+;   bne a1,zero,taken(label1),not_taken(label2)
 ; block1:
 ;   j label3
 ; block2:
@@ -28,11 +29,12 @@ block2:
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   sext.w a5, a0
-;   bnez a5, 8
-; block1: ; offset 0x8
+;   slli a5, a0, 0x20
+;   srli a1, a5, 0x20
+;   bnez a1, 8
+; block1: ; offset 0xc
 ;   addi a0, zero, 0x61
-; block2: ; offset 0xc
+; block2: ; offset 0x10
 ;   ret
 
 function %cold_annotation(i32) -> i32 {
@@ -49,8 +51,9 @@ block2 cold:
 
 ; VCode:
 ; block0:
-;   sext.w a5,a0
-;   bne a5,zero,taken(label1),not_taken(label2)
+;   slli a5,a0,32
+;   srli a1,a5,32
+;   bne a1,zero,taken(label1),not_taken(label2)
 ; block1:
 ;   j label3
 ; block3:
@@ -61,11 +64,12 @@ block2 cold:
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   sext.w a5, a0
-;   beqz a5, 8
-; block1: ; offset 0x8
+;   slli a5, a0, 0x20
+;   srli a1, a5, 0x20
+;   beqz a1, 8
+; block1: ; offset 0xc
 ;   ret
-; block2: ; offset 0xc
+; block2: ; offset 0x10
 ;   addi a0, zero, 0x61
 ;   j -8
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/condbr.clif b/cranelift/filetests/filetests/isa/riscv64/condbr.clif
index 9ac16eec16ad..e9d9d9d9addb 100644
--- a/cranelift/filetests/filetests/isa/riscv64/condbr.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/condbr.clif
@@ -10,14 +10,15 @@ block0(v0: i64, v1: i64):
 
 ; VCode:
 ; block0:
-;   xor a3,a0,a1
-;   seqz a0,a3
+;   eq a0,a0,a1##ty=i64
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   xor a3, a0, a1
-;   seqz a0, a3
+;   bne a0, a1, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
 ;   ret
 
 function %icmp_eq_i128(i128, i128) -> i8 {
@@ -28,18 +29,16 @@ block0(v0: i128, v1: i128):
 
 ; VCode:
 ; block0:
-;   xor a5,a0,a2
-;   xor a1,a1,a3
-;   or a3,a5,a1
-;   seqz a0,a3
+;   eq a0,[a0,a1],[a2,a3]##ty=i128
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   xor a5, a0, a2
-;   xor a1, a1, a3
-;   or a3, a5, a1
-;   seqz a0, a3
+;   bne a1, a3, 0x10
+;   bne a0, a2, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
 ;   ret
 
 function %icmp_ne_i128(i128, i128) -> i8 {
@@ -50,18 +49,16 @@ block0(v0: i128, v1: i128):
 
 ; VCode:
 ; block0:
-;   xor a5,a0,a2
-;   xor a1,a1,a3
-;   or a3,a5,a1
-;   sltu a0,zero,a3
+;   ne a0,[a0,a1],[a2,a3]##ty=i128
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   xor a5, a0, a2
-;   xor a1, a1, a3
-;   or a3, a5, a1
-;   snez a0, a3
+;   bne a1, a3, 8
+;   beq a0, a2, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
 ;   ret
 
 function %icmp_slt_i128(i128, i128) -> i8 {
@@ -72,21 +69,17 @@ block0(v0: i128, v1: i128):
 
 ; VCode:
 ; block0:
-;   slt a5,a1,a3
-;   sltu a2,a0,a2
-;   xor a3,a1,a3
-;   select a0,a2,a5##condition=(a3 eq zero)
+;   slt a0,[a0,a1],[a2,a3]##ty=i128
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slt a5, a1, a3
-;   sltu a2, a0, a2
-;   xor a3, a1, a3
-;   bnez a3, 0xc
-;   mv a0, a2
+;   blt a1, a3, 0xc
+;   bne a1, a3, 0x10
+;   bgeu a0, a2, 0xc
+;   addi a0, zero, 1
 ;   j 8
-;   mv a0, a5
+;   mv a0, zero
 ;   ret
 
 function %icmp_ult_i128(i128, i128) -> i8 {
@@ -97,21 +90,17 @@ block0(v0: i128, v1: i128):
 
 ; VCode:
 ; block0:
-;   sltu a5,a1,a3
-;   sltu a2,a0,a2
-;   xor a3,a1,a3
-;   select a0,a2,a5##condition=(a3 eq zero)
+;   ult a0,[a0,a1],[a2,a3]##ty=i128
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   sltu a5, a1, a3
-;   sltu a2, a0, a2
-;   xor a3, a1, a3
-;   bnez a3, 0xc
-;   mv a0, a2
+;   bltu a1, a3, 0xc
+;   bne a1, a3, 0x10
+;   bgeu a0, a2, 0xc
+;   addi a0, zero, 1
 ;   j 8
-;   mv a0, a5
+;   mv a0, zero
 ;   ret
 
 function %icmp_sle_i128(i128, i128) -> i8 {
@@ -122,21 +111,17 @@ block0(v0: i128, v1: i128):
 
 ; VCode:
 ; block0:
-;   slt a5,a3,a1
-;   sltu a2,a2,a0
-;   xor a3,a3,a1
-;   select a5,a2,a5##condition=(a3 eq zero)
-;   xori a0,a5,1
+;   sle a0,[a0,a1],[a2,a3]##ty=i128
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slt a5, a3, a1
-;   sltu a2, a2, a0
-;   xor a3, a3, a1
-;   bnez a3, 8
-;   mv a5, a2
-;   xori a0, a5, 1
+;   blt a1, a3, 0xc
+;   bne a1, a3, 0x10
+;   bltu a2, a0, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
 ;   ret
 
 function %icmp_ule_i128(i128, i128) -> i8 {
@@ -147,21 +132,17 @@ block0(v0: i128, v1: i128):
 
 ; VCode:
 ; block0:
-;   sltu a5,a3,a1
-;   sltu a2,a2,a0
-;   xor a3,a3,a1
-;   select a5,a2,a5##condition=(a3 eq zero)
-;   xori a0,a5,1
+;   ule a0,[a0,a1],[a2,a3]##ty=i128
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   sltu a5, a3, a1
-;   sltu a2, a2, a0
-;   xor a3, a3, a1
-;   bnez a3, 8
-;   mv a5, a2
-;   xori a0, a5, 1
+;   bltu a1, a3, 0xc
+;   bne a1, a3, 0x10
+;   bltu a2, a0, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
 ;   ret
 
 function %icmp_sgt_i128(i128, i128) -> i8 {
@@ -172,21 +153,17 @@ block0(v0: i128, v1: i128):
 
 ; VCode:
 ; block0:
-;   slt a5,a3,a1
-;   sltu a2,a2,a0
-;   xor a3,a3,a1
-;   select a0,a2,a5##condition=(a3 eq zero)
+;   sgt a0,[a0,a1],[a2,a3]##ty=i128
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slt a5, a3, a1
-;   sltu a2, a2, a0
-;   xor a3, a3, a1
-;   bnez a3, 0xc
-;   mv a0, a2
+;   blt a3, a1, 0xc
+;   bne a1, a3, 0x10
+;   bgeu a2, a0, 0xc
+;   addi a0, zero, 1
 ;   j 8
-;   mv a0, a5
+;   mv a0, zero
 ;   ret
 
 function %icmp_ugt_i128(i128, i128) -> i8 {
@@ -197,21 +174,17 @@ block0(v0: i128, v1: i128):
 
 ; VCode:
 ; block0:
-;   sltu a5,a3,a1
-;   sltu a2,a2,a0
-;   xor a3,a3,a1
-;   select a0,a2,a5##condition=(a3 eq zero)
+;   ugt a0,[a0,a1],[a2,a3]##ty=i128
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   sltu a5, a3, a1
-;   sltu a2, a2, a0
-;   xor a3, a3, a1
-;   bnez a3, 0xc
-;   mv a0, a2
+;   bltu a3, a1, 0xc
+;   bne a1, a3, 0x10
+;   bgeu a2, a0, 0xc
+;   addi a0, zero, 1
 ;   j 8
-;   mv a0, a5
+;   mv a0, zero
 ;   ret
 
 function %icmp_sge_i128(i128, i128) -> i8 {
@@ -222,21 +195,17 @@ block0(v0: i128, v1: i128):
 
 ; VCode:
 ; block0:
-;   slt a5,a1,a3
-;   sltu a2,a0,a2
-;   xor a3,a1,a3
-;   select a5,a2,a5##condition=(a3 eq zero)
-;   xori a0,a5,1
+;   sge a0,[a0,a1],[a2,a3]##ty=i128
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slt a5, a1, a3
-;   sltu a2, a0, a2
-;   xor a3, a1, a3
-;   bnez a3, 8
-;   mv a5, a2
-;   xori a0, a5, 1
+;   blt a3, a1, 0xc
+;   bne a1, a3, 0x10
+;   bltu a0, a2, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
 ;   ret
 
 function %icmp_uge_i128(i128, i128) -> i8 {
@@ -247,21 +216,17 @@ block0(v0: i128, v1: i128):
 
 ; VCode:
 ; block0:
-;   sltu a5,a1,a3
-;   sltu a2,a0,a2
-;   xor a3,a1,a3
-;   select a5,a2,a5##condition=(a3 eq zero)
-;   xori a0,a5,1
+;   uge a0,[a0,a1],[a2,a3]##ty=i128
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   sltu a5, a1, a3
-;   sltu a2, a0, a2
-;   xor a3, a1, a3
-;   bnez a3, 8
-;   mv a5, a2
-;   xori a0, a5, 1
+;   bltu a3, a1, 0xc
+;   bne a1, a3, 0x10
+;   bltu a0, a2, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
 ;   ret
 
 function %f(i64, i64) -> i64 {
@@ -280,7 +245,8 @@ block2:
 
 ; VCode:
 ; block0:
-;   beq a0,a1,taken(label2),not_taken(label1)
+;   eq a5,a0,a1##ty=i64
+;   bne a5,zero,taken(label2),not_taken(label1)
 ; block1:
 ;   li a0,2
 ;   ret
@@ -290,11 +256,15 @@ block2:
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   beq a0, a1, 0xc
-; block1: ; offset 0x4
+;   bne a0, a1, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
+;   bnez a5, 0xc
+; block1: ; offset 0x14
 ;   addi a0, zero, 2
 ;   ret
-; block2: ; offset 0xc
+; block2: ; offset 0x1c
 ;   addi a0, zero, 1
 ;   ret
 
@@ -310,7 +280,8 @@ block1:
 
 ; VCode:
 ; block0:
-;   beq a0,a1,taken(label1),not_taken(label2)
+;   eq a4,a0,a1##ty=i64
+;   bne a4,zero,taken(label1),not_taken(label2)
 ; block1:
 ;   j label3
 ; block2:
@@ -321,6 +292,11 @@ block1:
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   bne a0, a1, 0xc
+;   addi a4, zero, 1
+;   j 8
+;   mv a4, zero
+; block1: ; offset 0x10
 ;   addi a0, zero, 1
 ;   ret
 
@@ -335,7 +311,7 @@ block1:
 
 ; VCode:
 ; block0:
-;   or a3,a0,a1
+;   ne a3,[a0,a1],[zerozero]##ty=i128
 ;   bne a3,zero,taken(label1),not_taken(label2)
 ; block1:
 ;   j label3
@@ -346,8 +322,12 @@ block1:
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   or a3, a0, a1
-; block1: ; offset 0x4
+;   bnez a1, 8
+;   beqz a0, 0xc
+;   addi a3, zero, 1
+;   j 8
+;   mv a3, zero
+; block1: ; offset 0x14
 ;   ret
 
 function %i128_bricmp_eq(i128, i128) {
@@ -361,10 +341,7 @@ block1:
 
 ; VCode:
 ; block0:
-;   xor a5,a0,a2
-;   xor a1,a1,a3
-;   or a3,a5,a1
-;   seqz a5,a3
+;   eq a5,[a0,a1],[a2,a3]##ty=i128
 ;   bne a5,zero,taken(label1),not_taken(label2)
 ; block1:
 ;   j label3
@@ -375,11 +352,12 @@ block1:
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   xor a5, a0, a2
-;   xor a1, a1, a3
-;   or a3, a5, a1
-;   seqz a5, a3
-; block1: ; offset 0x10
+;   bne a1, a3, 0x10
+;   bne a0, a2, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
+; block1: ; offset 0x14
 ;   ret
 
 function %i128_bricmp_ne(i128, i128) {
@@ -393,10 +371,7 @@ block1:
 
 ; VCode:
 ; block0:
-;   xor a5,a0,a2
-;   xor a1,a1,a3
-;   or a3,a5,a1
-;   sltu a5,zero,a3
+;   ne a5,[a0,a1],[a2,a3]##ty=i128
 ;   bne a5,zero,taken(label1),not_taken(label2)
 ; block1:
 ;   j label3
@@ -407,11 +382,12 @@ block1:
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   xor a5, a0, a2
-;   xor a1, a1, a3
-;   or a3, a5, a1
-;   snez a5, a3
-; block1: ; offset 0x10
+;   bne a1, a3, 8
+;   beq a0, a2, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
+; block1: ; offset 0x14
 ;   ret
 
 function %i128_bricmp_slt(i128, i128) {
@@ -425,10 +401,7 @@ block1:
 
 ; VCode:
 ; block0:
-;   slt a5,a1,a3
-;   sltu a2,a0,a2
-;   xor a3,a1,a3
-;   select a5,a2,a5##condition=(a3 eq zero)
+;   slt a5,[a0,a1],[a2,a3]##ty=i128
 ;   bne a5,zero,taken(label1),not_taken(label2)
 ; block1:
 ;   j label3
@@ -439,12 +412,13 @@ block1:
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slt a5, a1, a3
-;   sltu a2, a0, a2
-;   xor a3, a1, a3
-;   bnez a3, 8
-;   mv a5, a2
-; block1: ; offset 0x14
+;   blt a1, a3, 0xc
+;   bne a1, a3, 0x10
+;   bgeu a0, a2, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
+; block1: ; offset 0x18
 ;   ret
 
 function %i128_bricmp_ult(i128, i128) {
@@ -458,10 +432,7 @@ block1:
 
 ; VCode:
 ; block0:
-;   sltu a5,a1,a3
-;   sltu a2,a0,a2
-;   xor a3,a1,a3
-;   select a5,a2,a5##condition=(a3 eq zero)
+;   ult a5,[a0,a1],[a2,a3]##ty=i128
 ;   bne a5,zero,taken(label1),not_taken(label2)
 ; block1:
 ;   j label3
@@ -472,12 +443,13 @@ block1:
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   sltu a5, a1, a3
-;   sltu a2, a0, a2
-;   xor a3, a1, a3
-;   bnez a3, 8
-;   mv a5, a2
-; block1: ; offset 0x14
+;   bltu a1, a3, 0xc
+;   bne a1, a3, 0x10
+;   bgeu a0, a2, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
+; block1: ; offset 0x18
 ;   ret
 
 function %i128_bricmp_sle(i128, i128) {
@@ -491,12 +463,8 @@ block1:
 
 ; VCode:
 ; block0:
-;   slt a5,a3,a1
-;   sltu a2,a2,a0
-;   xor a3,a3,a1
-;   select a5,a2,a5##condition=(a3 eq zero)
-;   xori a1,a5,1
-;   bne a1,zero,taken(label1),not_taken(label2)
+;   sle a5,[a0,a1],[a2,a3]##ty=i128
+;   bne a5,zero,taken(label1),not_taken(label2)
 ; block1:
 ;   j label3
 ; block2:
@@ -506,12 +474,12 @@ block1:
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slt a5, a3, a1
-;   sltu a2, a2, a0
-;   xor a3, a3, a1
-;   bnez a3, 8
-;   mv a5, a2
-;   xori a1, a5, 1
+;   blt a1, a3, 0xc
+;   bne a1, a3, 0x10
+;   bltu a2, a0, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
 ; block1: ; offset 0x18
 ;   ret
 
@@ -526,12 +494,8 @@ block1:
 
 ; VCode:
 ; block0:
-;   sltu a5,a3,a1
-;   sltu a2,a2,a0
-;   xor a3,a3,a1
-;   select a5,a2,a5##condition=(a3 eq zero)
-;   xori a1,a5,1
-;   bne a1,zero,taken(label1),not_taken(label2)
+;   ule a5,[a0,a1],[a2,a3]##ty=i128
+;   bne a5,zero,taken(label1),not_taken(label2)
 ; block1:
 ;   j label3
 ; block2:
@@ -541,12 +505,12 @@ block1:
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   sltu a5, a3, a1
-;   sltu a2, a2, a0
-;   xor a3, a3, a1
-;   bnez a3, 8
-;   mv a5, a2
-;   xori a1, a5, 1
+;   bltu a1, a3, 0xc
+;   bne a1, a3, 0x10
+;   bltu a2, a0, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
 ; block1: ; offset 0x18
 ;   ret
 
@@ -561,10 +525,7 @@ block1:
 
 ; VCode:
 ; block0:
-;   slt a5,a3,a1
-;   sltu a2,a2,a0
-;   xor a3,a3,a1
-;   select a5,a2,a5##condition=(a3 eq zero)
+;   sgt a5,[a0,a1],[a2,a3]##ty=i128
 ;   bne a5,zero,taken(label1),not_taken(label2)
 ; block1:
 ;   j label3
@@ -575,12 +536,13 @@ block1:
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slt a5, a3, a1
-;   sltu a2, a2, a0
-;   xor a3, a3, a1
-;   bnez a3, 8
-;   mv a5, a2
-; block1: ; offset 0x14
+;   blt a3, a1, 0xc
+;   bne a1, a3, 0x10
+;   bgeu a2, a0, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
+; block1: ; offset 0x18
 ;   ret
 
 function %i128_bricmp_ugt(i128, i128) {
@@ -594,10 +556,7 @@ block1:
 
 ; VCode:
 ; block0:
-;   sltu a5,a3,a1
-;   sltu a2,a2,a0
-;   xor a3,a3,a1
-;   select a5,a2,a5##condition=(a3 eq zero)
+;   ugt a5,[a0,a1],[a2,a3]##ty=i128
 ;   bne a5,zero,taken(label1),not_taken(label2)
 ; block1:
 ;   j label3
@@ -608,12 +567,13 @@ block1:
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   sltu a5, a3, a1
-;   sltu a2, a2, a0
-;   xor a3, a3, a1
-;   bnez a3, 8
-;   mv a5, a2
-; block1: ; offset 0x14
+;   bltu a3, a1, 0xc
+;   bne a1, a3, 0x10
+;   bgeu a2, a0, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
+; block1: ; offset 0x18
 ;   ret
 
 function %i128_bricmp_sge(i128, i128) {
@@ -627,12 +587,8 @@ block1:
 
 ; VCode:
 ; block0:
-;   slt a5,a1,a3
-;   sltu a2,a0,a2
-;   xor a3,a1,a3
-;   select a5,a2,a5##condition=(a3 eq zero)
-;   xori a1,a5,1
-;   bne a1,zero,taken(label1),not_taken(label2)
+;   sge a5,[a0,a1],[a2,a3]##ty=i128
+;   bne a5,zero,taken(label1),not_taken(label2)
 ; block1:
 ;   j label3
 ; block2:
@@ -642,12 +598,12 @@ block1:
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slt a5, a1, a3
-;   sltu a2, a0, a2
-;   xor a3, a1, a3
-;   bnez a3, 8
-;   mv a5, a2
-;   xori a1, a5, 1
+;   blt a3, a1, 0xc
+;   bne a1, a3, 0x10
+;   bltu a0, a2, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
 ; block1: ; offset 0x18
 ;   ret
 
@@ -662,12 +618,8 @@ block1:
 
 ; VCode:
 ; block0:
-;   sltu a5,a1,a3
-;   sltu a2,a0,a2
-;   xor a3,a1,a3
-;   select a5,a2,a5##condition=(a3 eq zero)
-;   xori a1,a5,1
-;   bne a1,zero,taken(label1),not_taken(label2)
+;   uge a5,[a0,a1],[a2,a3]##ty=i128
+;   bne a5,zero,taken(label1),not_taken(label2)
 ; block1:
 ;   j label3
 ; block2:
@@ -677,12 +629,12 @@ block1:
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   sltu a5, a1, a3
-;   sltu a2, a0, a2
-;   xor a3, a1, a3
-;   bnez a3, 8
-;   mv a5, a2
-;   xori a1, a5, 1
+;   bltu a3, a1, 0xc
+;   bne a1, a3, 0x10
+;   bltu a0, a2, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
 ; block1: ; offset 0x18
 ;   ret
 
@@ -724,7 +676,7 @@ block1:
 ; VCode:
 ; block0:
 ;   slli a2,a0,48
-;   srai a4,a2,48
+;   srli a4,a2,48
 ;   bne a4,zero,taken(label1),not_taken(label2)
 ; block1:
 ;   j label3
@@ -736,7 +688,7 @@ block1:
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   slli a2, a0, 0x30
-;   srai a4, a2, 0x30
+;   srli a4, a2, 0x30
 ; block1: ; offset 0x8
 ;   ret
 
@@ -751,8 +703,9 @@ block1:
 
 ; VCode:
 ; block0:
-;   sext.w a2,a0
-;   bne a2,zero,taken(label1),not_taken(label2)
+;   slli a2,a0,32
+;   srli a4,a2,32
+;   bne a4,zero,taken(label1),not_taken(label2)
 ; block1:
 ;   j label3
 ; block2:
@@ -762,8 +715,9 @@ block1:
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   sext.w a2, a0
-; block1: ; offset 0x4
+;   slli a2, a0, 0x20
+;   srli a4, a2, 0x20
+; block1: ; offset 0x8
 ;   ret
 
 function %i64_brif(i64){
diff --git a/cranelift/filetests/filetests/isa/riscv64/condops.clif b/cranelift/filetests/filetests/isa/riscv64/condops.clif
index 16c736d8c8f6..578e27556a6a 100644
--- a/cranelift/filetests/filetests/isa/riscv64/condops.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/condops.clif
@@ -15,7 +15,7 @@ block0(v0: i8, v1: i64, v2: i64):
 ;   li a3,42
 ;   andi a5,a0,255
 ;   andi a3,a3,255
-;   select a0,a1,a2##condition=(a5 eq a3)
+;   select_reg a0,a1,a2##condition=(a5 eq a3)
 ;   ret
 ;
 ; Disassembled:
@@ -23,10 +23,10 @@ block0(v0: i8, v1: i64, v2: i64):
 ;   addi a3, zero, 0x2a
 ;   andi a5, a0, 0xff
 ;   andi a3, a3, 0xff
-;   bne a5, a3, 0xc
-;   mv a0, a1
-;   j 8
+;   beq a5, a3, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a1
 ;   ret
 
 function %g(i8) -> i8 {
@@ -38,18 +38,21 @@ block0(v0: i8):
 
 ; VCode:
 ; block0:
-;   slli a2,a0,56
-;   srai a4,a2,56
-;   xori a0,a4,42
-;   seqz a0,a0
+;   li a5,42
+;   andi a3,a0,255
+;   andi a5,a5,255
+;   eq a0,a3,a5##ty=i8
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slli a2, a0, 0x38
-;   srai a4, a2, 0x38
-;   xori a0, a4, 0x2a
-;   seqz a0, a0
+;   addi a5, zero, 0x2a
+;   andi a3, a0, 0xff
+;   andi a5, a5, 0xff
+;   bne a3, a5, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
 ;   ret
 
 function %h(i8, i8, i8) -> i8 {
@@ -83,7 +86,7 @@ block0(v0: i8, v1: i8, v2: i8):
 ; VCode:
 ; block0:
 ;   andi a4,a0,255
-;   select a0,a1,a2##condition=(a4 ne zero)
+;   select_i8 a0,a1,a2##condition=a4
 ;   ret
 ;
 ; Disassembled:
@@ -106,20 +109,24 @@ block0(v0: i32, v1: i8, v2: i8):
 ; VCode:
 ; block0:
 ;   li a3,42
-;   sext.w a5,a0
-;   sext.w a3,a3
-;   select a0,a1,a2##condition=(a5 eq a3)
+;   slli a5,a0,32
+;   srli a4,a5,32
+;   slli a3,a3,32
+;   srli a5,a3,32
+;   select_reg a0,a1,a2##condition=(a4 eq a5)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a3, zero, 0x2a
-;   sext.w a5, a0
-;   sext.w a3, a3
-;   bne a5, a3, 0xc
-;   mv a0, a1
-;   j 8
+;   slli a5, a0, 0x20
+;   srli a4, a5, 0x20
+;   slli a3, a3, 0x20
+;   srli a5, a3, 0x20
+;   beq a4, a5, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a1
 ;   ret
 
 function %i128_select(i8, i128, i128) -> i128 {
@@ -129,21 +136,21 @@ block0(v0: i8, v1: i128, v2: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ;   sd s4,-8(sp)
-;   addi sp,sp,-16
+;   add sp,-16
 ; block0:
 ;   mv s4,a1
 ;   andi a5,a0,255
-;   select [a0,a1],[s4,a2],[a3,a4]##condition=(a5 ne zero)
-;   addi sp,sp,16
+;   select_i128 [a0,a1],[s4,a2],[a3,a4]##condition=a5
+;   add sp,+16
 ;   ld s4,-8(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/constants.clif b/cranelift/filetests/filetests/isa/riscv64/constants.clif
index 3a159071e434..5ede28732228 100644
--- a/cranelift/filetests/filetests/isa/riscv64/constants.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/constants.clif
@@ -76,15 +76,17 @@ block0:
 
 ; VCode:
 ; block0:
-;   lui a0,65535
-;   slli a0,a0,4
+;   ld a0,[const(0)]
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   lui a0, 0xffff
-;   slli a0, a0, 4
+;   auipc a0, 0
+;   ld a0, 0x10(a0)
 ;   ret
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0xff, 0xff
+;   .byte 0x00, 0x00, 0x00, 0x00
 
 function %f() -> i64 {
 block0:
@@ -94,15 +96,17 @@ block0:
 
 ; VCode:
 ; block0:
-;   lui a0,65535
-;   slli a0,a0,20
+;   ld a0,[const(0)]
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   lui a0, 0xffff
-;   slli a0, a0, 0x14
+;   auipc a0, 0
+;   ld a0, 0x10(a0)
 ;   ret
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0xff, 0xff, 0x00, 0x00
 
 function %f() -> i64 {
 block0:
@@ -112,15 +116,17 @@ block0:
 
 ; VCode:
 ; block0:
-;   lui a0,65535
-;   slli a0,a0,36
+;   ld a0,[const(0)]
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   lui a0, 0xffff
-;   slli a0, a0, 0x24
+;   auipc a0, 0
+;   ld a0, 0x10(a0)
 ;   ret
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0xff, 0xff
 
 function %f() -> i64 {
 block0:
@@ -350,17 +356,18 @@ block0:
 
 ; VCode:
 ; block0:
-;   lui a0,1023
-;   slli a2,a0,40
-;   fmv.d.x fa0,a2
+;   ld a0,[const(0)]
+;   fmv.d.x fa0,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   lui a0, 0x3ff
-;   slli a2, a0, 0x28
-;   fmv.d.x fa0, a2
+;   auipc a0, 0
+;   ld a0, 0x10(a0)
+;   fmv.d.x fa0, a0
 ;   ret
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0xf0, 0x3f
 
 function %f() -> f32 {
 block0:
@@ -388,17 +395,18 @@ block0:
 
 ; VCode:
 ; block0:
-;   lui a0,16457
-;   slli a2,a0,36
-;   fmv.d.x fa0,a2
+;   ld a0,[const(0)]
+;   fmv.d.x fa0,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   lui a0, 0x4049
-;   slli a2, a0, 0x24
-;   fmv.d.x fa0, a2
+;   auipc a0, 0
+;   ld a0, 0x10(a0)
+;   fmv.d.x fa0, a0
 ;   ret
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0x49, 0x40
 
 function %f() -> f32 {
 block0:
@@ -462,17 +470,18 @@ block0:
 
 ; VCode:
 ; block0:
-;   lui a0,3075
-;   slli a2,a0,40
-;   fmv.d.x fa0,a2
+;   ld a0,[const(0)]
+;   fmv.d.x fa0,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   lui a0, 0xc03
-;   slli a2, a0, 0x28
-;   fmv.d.x fa0, a2
+;   auipc a0, 0
+;   ld a0, 0x10(a0)
+;   fmv.d.x fa0, a0
 ;   ret
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0x30, 0xc0
 
 function %f() -> f32 {
 block0:
diff --git a/cranelift/filetests/filetests/isa/riscv64/ctz-zbb.clif b/cranelift/filetests/filetests/isa/riscv64/ctz-zbb.clif
index d5959eb63d3c..ab4a4d16a184 100644
--- a/cranelift/filetests/filetests/isa/riscv64/ctz-zbb.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/ctz-zbb.clif
@@ -83,7 +83,7 @@ block0(v0: i128):
 ; block0:
 ;   ctz a3,a1
 ;   ctz a5,a0
-;   select a1,a3,zero##condition=(a0 eq zero)
+;   select_reg a1,a3,zero##condition=(a0 eq zero)
 ;   add a0,a5,a1
 ;   li a1,0
 ;   ret
@@ -92,10 +92,10 @@ block0(v0: i128):
 ; block0: ; offset 0x0
 ;   .byte 0x93, 0x96, 0x15, 0x60
 ;   .byte 0x93, 0x17, 0x15, 0x60
-;   bnez a0, 0xc
-;   mv a1, a3
-;   j 8
+;   beqz a0, 0xc
 ;   mv a1, zero
+;   j 8
+;   mv a1, a3
 ;   add a0, a5, a1
 ;   mv a1, zero
 ;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/extend.clif b/cranelift/filetests/filetests/isa/riscv64/extend.clif
index 445671f2c8af..604e31ea5fe9 100644
--- a/cranelift/filetests/filetests/isa/riscv64/extend.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/extend.clif
@@ -258,21 +258,3 @@ block0(v0: i8, v1: i64):
 ;   add a0, a0, a1
 ;   ret
 
-
-function %extend_fcmp(f64, f64) -> i64 {
-block0(v0: f64, v1: f64):
-  v3 = fcmp.f64 lt v0, v1
-  v4 = sextend.i64 v3
-  return v4
-}
-
-; VCode:
-; block0:
-;   flt.d a0,fa0,fa1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   flt.d a0, fa0, fa1
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/fcmp.clif b/cranelift/filetests/filetests/isa/riscv64/fcmp.clif
index 01b569b0fdf8..38217b9d398d 100644
--- a/cranelift/filetests/filetests/isa/riscv64/fcmp.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/fcmp.clif
@@ -17,7 +17,7 @@ block1:
 ;   li a1,0
 ;   fmv.d.x fa3,a1
 ;   fle.d a2,fa3,fa3
-;   beq a2,zero,taken(label1),not_taken(label2)
+;   bne a2,zero,taken(label2),not_taken(label1)
 ; block1:
 ;   j label3
 ; block2:
@@ -48,7 +48,7 @@ block1:
 ;   li a1,0
 ;   fmv.d.x fa3,a1
 ;   fle.d a2,fa3,fa3
-;   beq a2,zero,taken(label1),not_taken(label2)
+;   bne a2,zero,taken(label2),not_taken(label1)
 ; block1:
 ;   j label3
 ; block2:
@@ -64,749 +64,3 @@ block1:
 ; block1: ; offset 0xc
 ;   ret
 
-function %ord(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp ord v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   feq.s a3,fa0,fa0
-;   feq.s a5,fa1,fa1
-;   and a0,a3,a5
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   feq.s a3, fa0, fa0
-;   feq.s a5, fa1, fa1
-;   and a0, a3, a5
-;   ret
-
-function %uno(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp uno v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   feq.s a3,fa0,fa0
-;   feq.s a5,fa1,fa1
-;   and a1,a3,a5
-;   seqz a0,a1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   feq.s a3, fa0, fa0
-;   feq.s a5, fa1, fa1
-;   and a1, a3, a5
-;   seqz a0, a1
-;   ret
-
-function %eq(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp eq v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   feq.s a0,fa0,fa1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   feq.s a0, fa0, fa1
-;   ret
-
-function %ne(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp ne v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   feq.s a3,fa0,fa1
-;   seqz a0,a3
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   feq.s a3, fa0, fa1
-;   seqz a0, a3
-;   ret
-
-function %one(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp one v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   flt.s a3,fa0,fa1
-;   flt.s a5,fa1,fa0
-;   or a0,a3,a5
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   flt.s a3, fa0, fa1
-;   flt.s a5, fa1, fa0
-;   or a0, a3, a5
-;   ret
-
-function %ueq(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp ueq v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   flt.s a3,fa0,fa1
-;   flt.s a5,fa1,fa0
-;   or a1,a3,a5
-;   seqz a0,a1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   flt.s a3, fa0, fa1
-;   flt.s a5, fa1, fa0
-;   or a1, a3, a5
-;   seqz a0, a1
-;   ret
-
-function %lt(f64, f64) -> i8 {
-block0(v0: f64, v1: f64):
-    v2 = fcmp lt v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   flt.d a0,fa0,fa1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   flt.d a0, fa0, fa1
-;   ret
-
-function %le(f64, f64) -> i8 {
-block0(v0: f64, v1: f64):
-    v2 = fcmp le v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   fle.d a0,fa0,fa1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   fle.d a0, fa0, fa1
-;   ret
-
-function %gt(f64, f64) -> i8 {
-block0(v0: f64, v1: f64):
-    v2 = fcmp gt v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   flt.d a0,fa1,fa0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   flt.d a0, fa1, fa0
-;   ret
-
-function %ge(f64, f64) -> i8 {
-block0(v0: f64, v1: f64):
-    v2 = fcmp ge v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   fle.d a0,fa1,fa0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   fle.d a0, fa1, fa0
-;   ret
-
-function %ult(f64, f64) -> i8 {
-block0(v0: f64, v1: f64):
-    v2 = fcmp ult v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   fle.d a3,fa1,fa0
-;   seqz a0,a3
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   fle.d a3, fa1, fa0
-;   seqz a0, a3
-;   ret
-
-function %ule(f64, f64) -> i8 {
-block0(v0: f64, v1: f64):
-    v2 = fcmp ule v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   flt.d a3,fa1,fa0
-;   seqz a0,a3
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   flt.d a3, fa1, fa0
-;   seqz a0, a3
-;   ret
-
-function %ugt(f64, f64) -> i8 {
-block0(v0: f64, v1: f64):
-    v2 = fcmp ugt v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   fle.d a3,fa0,fa1
-;   seqz a0,a3
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   fle.d a3, fa0, fa1
-;   seqz a0, a3
-;   ret
-
-function %uge(f64, f64) -> i8 {
-block0(v0: f64, v1: f64):
-    v2 = fcmp uge v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   flt.d a3,fa0,fa1
-;   seqz a0,a3
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   flt.d a3, fa0, fa1
-;   seqz a0, a3
-;   ret
-
-function %br_ord(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp ord v0, v1
-    brif v2, block1, block2
-block1:
-    v3 = iconst.i8 1
-    return v3
-block2:
-    v4 = iconst.i8 0
-    return v4
-}
-
-; VCode:
-; block0:
-;   feq.s a5,fa0,fa0
-;   feq.s a1,fa1,fa1
-;   and a3,a5,a1
-;   bne a3,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   feq.s a5, fa0, fa0
-;   feq.s a1, fa1, fa1
-;   and a3, a5, a1
-;   bnez a3, 0xc
-; block1: ; offset 0x10
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x18
-;   addi a0, zero, 1
-;   ret
-
-function %br_uno(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp uno v0, v1
-    brif v2, block1, block2
-block1:
-    v3 = iconst.i8 1
-    return v3
-block2:
-    v4 = iconst.i8 0
-    return v4
-}
-
-; VCode:
-; block0:
-;   feq.s a5,fa0,fa0
-;   feq.s a1,fa1,fa1
-;   and a3,a5,a1
-;   beq a3,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   feq.s a5, fa0, fa0
-;   feq.s a1, fa1, fa1
-;   and a3, a5, a1
-;   beqz a3, 0xc
-; block1: ; offset 0x10
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x18
-;   addi a0, zero, 1
-;   ret
-
-function %br_eq(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp eq v0, v1
-    brif v2, block1, block2
-block1:
-    v3 = iconst.i8 1
-    return v3
-block2:
-    v4 = iconst.i8 0
-    return v4
-}
-
-; VCode:
-; block0:
-;   feq.s a5,fa0,fa1
-;   bne a5,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   feq.s a5, fa0, fa1
-;   bnez a5, 0xc
-; block1: ; offset 0x8
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x10
-;   addi a0, zero, 1
-;   ret
-
-function %br_ne(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp ne v0, v1
-    brif v2, block1, block2
-block1:
-    v3 = iconst.i8 1
-    return v3
-block2:
-    v4 = iconst.i8 0
-    return v4
-}
-
-; VCode:
-; block0:
-;   feq.s a5,fa0,fa1
-;   beq a5,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   feq.s a5, fa0, fa1
-;   beqz a5, 0xc
-; block1: ; offset 0x8
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x10
-;   addi a0, zero, 1
-;   ret
-
-function %br_one(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp one v0, v1
-    brif v2, block1, block2
-block1:
-    v3 = iconst.i8 1
-    return v3
-block2:
-    v4 = iconst.i8 0
-    return v4
-}
-
-; VCode:
-; block0:
-;   flt.s a5,fa0,fa1
-;   flt.s a1,fa1,fa0
-;   or a3,a5,a1
-;   bne a3,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   flt.s a5, fa0, fa1
-;   flt.s a1, fa1, fa0
-;   or a3, a5, a1
-;   bnez a3, 0xc
-; block1: ; offset 0x10
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x18
-;   addi a0, zero, 1
-;   ret
-
-function %br_ueq(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp ueq v0, v1
-    brif v2, block1, block2
-block1:
-    v3 = iconst.i8 1
-    return v3
-block2:
-    v4 = iconst.i8 0
-    return v4
-}
-
-; VCode:
-; block0:
-;   flt.s a5,fa0,fa1
-;   flt.s a1,fa1,fa0
-;   or a3,a5,a1
-;   beq a3,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   flt.s a5, fa0, fa1
-;   flt.s a1, fa1, fa0
-;   or a3, a5, a1
-;   beqz a3, 0xc
-; block1: ; offset 0x10
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x18
-;   addi a0, zero, 1
-;   ret
-
-function %br_lt(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp lt v0, v1
-    brif v2, block1, block2
-block1:
-    v3 = iconst.i8 1
-    return v3
-block2:
-    v4 = iconst.i8 0
-    return v4
-}
-
-; VCode:
-; block0:
-;   flt.s a5,fa0,fa1
-;   bne a5,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   flt.s a5, fa0, fa1
-;   bnez a5, 0xc
-; block1: ; offset 0x8
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x10
-;   addi a0, zero, 1
-;   ret
-
-function %br_gt(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp gt v0, v1
-    brif v2, block1, block2
-block1:
-    v3 = iconst.i8 1
-    return v3
-block2:
-    v4 = iconst.i8 0
-    return v4
-}
-
-; VCode:
-; block0:
-;   flt.s a5,fa1,fa0
-;   bne a5,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   flt.s a5, fa1, fa0
-;   bnez a5, 0xc
-; block1: ; offset 0x8
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x10
-;   addi a0, zero, 1
-;   ret
-
-function %br_le(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp le v0, v1
-    brif v2, block1, block2
-block1:
-    v3 = iconst.i8 1
-    return v3
-block2:
-    v4 = iconst.i8 0
-    return v4
-}
-
-; VCode:
-; block0:
-;   fle.s a5,fa0,fa1
-;   bne a5,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   fle.s a5, fa0, fa1
-;   bnez a5, 0xc
-; block1: ; offset 0x8
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x10
-;   addi a0, zero, 1
-;   ret
-
-function %br_ge(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp ge v0, v1
-    brif v2, block1, block2
-block1:
-    v3 = iconst.i8 1
-    return v3
-block2:
-    v4 = iconst.i8 0
-    return v4
-}
-
-; VCode:
-; block0:
-;   fle.s a5,fa1,fa0
-;   bne a5,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   fle.s a5, fa1, fa0
-;   bnez a5, 0xc
-; block1: ; offset 0x8
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x10
-;   addi a0, zero, 1
-;   ret
-
-function %br_ult(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp ult v0, v1
-    brif v2, block1, block2
-block1:
-    v3 = iconst.i8 1
-    return v3
-block2:
-    v4 = iconst.i8 0
-    return v4
-}
-
-; VCode:
-; block0:
-;   fle.s a5,fa1,fa0
-;   beq a5,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   fle.s a5, fa1, fa0
-;   beqz a5, 0xc
-; block1: ; offset 0x8
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x10
-;   addi a0, zero, 1
-;   ret
-
-function %br_ugt(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp ugt v0, v1
-    brif v2, block1, block2
-block1:
-    v3 = iconst.i8 1
-    return v3
-block2:
-    v4 = iconst.i8 0
-    return v4
-}
-
-; VCode:
-; block0:
-;   fle.s a5,fa0,fa1
-;   beq a5,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   fle.s a5, fa0, fa1
-;   beqz a5, 0xc
-; block1: ; offset 0x8
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x10
-;   addi a0, zero, 1
-;   ret
-
-function %br_ule(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp ule v0, v1
-    brif v2, block1, block2
-block1:
-    v3 = iconst.i8 1
-    return v3
-block2:
-    v4 = iconst.i8 0
-    return v4
-}
-
-; VCode:
-; block0:
-;   flt.s a5,fa1,fa0
-;   beq a5,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   flt.s a5, fa1, fa0
-;   beqz a5, 0xc
-; block1: ; offset 0x8
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x10
-;   addi a0, zero, 1
-;   ret
-
-function %br_uge(f32, f32) -> i8 {
-block0(v0: f32, v1: f32):
-    v2 = fcmp uge v0, v1
-    brif v2, block1, block2
-block1:
-    v3 = iconst.i8 1
-    return v3
-block2:
-    v4 = iconst.i8 0
-    return v4
-}
-
-; VCode:
-; block0:
-;   flt.s a5,fa0,fa1
-;   beq a5,zero,taken(label2),not_taken(label1)
-; block1:
-;   li a0,0
-;   ret
-; block2:
-;   li a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   flt.s a5, fa0, fa1
-;   beqz a5, 0xc
-; block1: ; offset 0x8
-;   mv a0, zero
-;   ret
-; block2: ; offset 0x10
-;   addi a0, zero, 1
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/fcvt-small.clif b/cranelift/filetests/filetests/isa/riscv64/fcvt-small.clif
index 24ec8d5ea02f..26745e25a37c 100644
--- a/cranelift/filetests/filetests/isa/riscv64/fcvt-small.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/fcvt-small.clif
@@ -11,13 +11,13 @@ block0(v0: i8):
 ; VCode:
 ; block0:
 ;   andi a2,a0,255
-;   fcvt.s.lu fa0,a2,rne
+;   fcvt.s.lu fa0,a2
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   andi a2, a0, 0xff
-;   fcvt.s.lu fa0, a2, rne
+;   fcvt.s.lu fa0, a2
 ;   ret
 
 function u0:0(i8) -> f64 {
@@ -29,13 +29,13 @@ block0(v0: i8):
 ; VCode:
 ; block0:
 ;   andi a2,a0,255
-;   fcvt.d.lu fa0,a2,rne
+;   fcvt.d.lu fa0,a2
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   andi a2, a0, 0xff
-;   fcvt.d.lu fa0, a2, rne
+;   fcvt.d.lu fa0, a2
 ;   ret
 
 function u0:0(i16) -> f32 {
@@ -48,14 +48,14 @@ block0(v0: i16):
 ; block0:
 ;   slli a2,a0,48
 ;   srli a4,a2,48
-;   fcvt.s.lu fa0,a4,rne
+;   fcvt.s.lu fa0,a4
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   slli a2, a0, 0x30
 ;   srli a4, a2, 0x30
-;   fcvt.s.lu fa0, a4, rne
+;   fcvt.s.lu fa0, a4
 ;   ret
 
 function u0:0(i16) -> f64 {
@@ -68,14 +68,14 @@ block0(v0: i16):
 ; block0:
 ;   slli a2,a0,48
 ;   srli a4,a2,48
-;   fcvt.d.lu fa0,a4,rne
+;   fcvt.d.lu fa0,a4
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   slli a2, a0, 0x30
 ;   srli a4, a2, 0x30
-;   fcvt.d.lu fa0, a4, rne
+;   fcvt.d.lu fa0, a4
 ;   ret
 
 function u0:0(f32) -> i8 {
@@ -86,35 +86,29 @@ block0(v0: f32):
 
 ; VCode:
 ; block0:
-;   feq.s a2,fa0,fa0
-;   trap_if bad_toint##(a2 eq zero)
-;   lui a5,-264192
-;   fmv.w.x fa1,a5
-;   fle.s a3,fa0,fa1
-;   trap_if int_ovf##(a3 ne zero)
-;   lui a0,276480
-;   fmv.w.x fa2,a0
-;   fle.s a4,fa2,fa0
-;   trap_if int_ovf##(a4 ne zero)
-;   fcvt.wu.s a0,fa0,rtz
+;   fcvt_to_uint.i8 a0,fa0##in_ty=f32 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   feq.s a2, fa0, fa0
-;   bnez a2, 8
-;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
-;   lui a5, 0xbf800
-;   fmv.w.x fa1, a5
-;   fle.s a3, fa0, fa1
-;   beqz a3, 8
+;   feq.s a0, fa0, fa0
+;   beqz a0, 0x40
+;   auipc t6, 0
+;   lw t6, 0xc(t6)
+;   j 8
+;   .byte 0x00, 0x00, 0x80, 0xbf
+;   fmv.w.x fa3, t6
+;   fle.s a0, fa0, fa3
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
-;   lui a0, 0x43800
-;   fmv.w.x fa2, a0
-;   fle.s a4, fa2, fa0
-;   beqz a4, 8
+;   lui t6, 0x43800
+;   fmv.w.x fa3, t6
+;   fle.s a0, fa3, fa0
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
 ;   fcvt.wu.s a0, fa0, rtz
+;   j 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
 ;   ret
 
 function u0:0(f64) -> i8 {
@@ -125,39 +119,34 @@ block0(v0: f64):
 
 ; VCode:
 ; block0:
-;   feq.d a2,fa0,fa0
-;   trap_if bad_toint##(a2 eq zero)
-;   lui a5,3071
-;   slli a1,a5,40
-;   fmv.d.x fa3,a1
-;   fle.d a5,fa0,fa3
-;   trap_if int_ovf##(a5 ne zero)
-;   lui a2,1031
-;   slli a4,a2,40
-;   fmv.d.x fa1,a4
-;   fle.d a2,fa1,fa0
-;   trap_if int_ovf##(a2 ne zero)
-;   fcvt.wu.d a0,fa0,rtz
+;   fcvt_to_uint.i8 a0,fa0##in_ty=f64 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   feq.d a2, fa0, fa0
-;   bnez a2, 8
-;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
-;   lui a5, 0xbff
-;   slli a1, a5, 0x28
-;   fmv.d.x fa3, a1
-;   fle.d a5, fa0, fa3
-;   beqz a5, 8
+;   feq.d a0, fa0, fa0
+;   beqz a0, 0x54
+;   auipc t6, 0
+;   ld t6, 0xc(t6)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0xf0, 0xbf
+;   fmv.d.x fa3, t6
+;   fle.d a0, fa0, fa3
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
-;   lui a2, 0x407
-;   slli a4, a2, 0x28
-;   fmv.d.x fa1, a4
-;   fle.d a2, fa1, fa0
-;   beqz a2, 8
+;   auipc t6, 0
+;   ld t6, 0xc(t6)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0x70, 0x40
+;   fmv.d.x fa3, t6
+;   fle.d a0, fa3, fa0
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
 ;   fcvt.wu.d a0, fa0, rtz
+;   j 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
 ;   ret
 
 function u0:0(f32) -> i16 {
@@ -168,35 +157,29 @@ block0(v0: f32):
 
 ; VCode:
 ; block0:
-;   feq.s a2,fa0,fa0
-;   trap_if bad_toint##(a2 eq zero)
-;   lui a5,-264192
-;   fmv.w.x fa1,a5
-;   fle.s a3,fa0,fa1
-;   trap_if int_ovf##(a3 ne zero)
-;   lui a0,292864
-;   fmv.w.x fa2,a0
-;   fle.s a4,fa2,fa0
-;   trap_if int_ovf##(a4 ne zero)
-;   fcvt.wu.s a0,fa0,rtz
+;   fcvt_to_uint.i16 a0,fa0##in_ty=f32 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   feq.s a2, fa0, fa0
-;   bnez a2, 8
-;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
-;   lui a5, 0xbf800
-;   fmv.w.x fa1, a5
-;   fle.s a3, fa0, fa1
-;   beqz a3, 8
+;   feq.s a0, fa0, fa0
+;   beqz a0, 0x40
+;   auipc t6, 0
+;   lw t6, 0xc(t6)
+;   j 8
+;   .byte 0x00, 0x00, 0x80, 0xbf
+;   fmv.w.x fa3, t6
+;   fle.s a0, fa0, fa3
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
-;   lui a0, 0x47800
-;   fmv.w.x fa2, a0
-;   fle.s a4, fa2, fa0
-;   beqz a4, 8
+;   lui t6, 0x47800
+;   fmv.w.x fa3, t6
+;   fle.s a0, fa3, fa0
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
 ;   fcvt.wu.s a0, fa0, rtz
+;   j 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
 ;   ret
 
 function u0:0(f64) -> i16 {
@@ -207,38 +190,33 @@ block0(v0: f64):
 
 ; VCode:
 ; block0:
-;   feq.d a2,fa0,fa0
-;   trap_if bad_toint##(a2 eq zero)
-;   lui a5,3071
-;   slli a1,a5,40
-;   fmv.d.x fa3,a1
-;   fle.d a5,fa0,fa3
-;   trap_if int_ovf##(a5 ne zero)
-;   lui a2,1039
-;   slli a4,a2,40
-;   fmv.d.x fa1,a4
-;   fle.d a2,fa1,fa0
-;   trap_if int_ovf##(a2 ne zero)
-;   fcvt.wu.d a0,fa0,rtz
+;   fcvt_to_uint.i16 a0,fa0##in_ty=f64 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   feq.d a2, fa0, fa0
-;   bnez a2, 8
-;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
-;   lui a5, 0xbff
-;   slli a1, a5, 0x28
-;   fmv.d.x fa3, a1
-;   fle.d a5, fa0, fa3
-;   beqz a5, 8
+;   feq.d a0, fa0, fa0
+;   beqz a0, 0x54
+;   auipc t6, 0
+;   ld t6, 0xc(t6)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0xf0, 0xbf
+;   fmv.d.x fa3, t6
+;   fle.d a0, fa0, fa3
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
-;   lui a2, 0x40f
-;   slli a4, a2, 0x28
-;   fmv.d.x fa1, a4
-;   fle.d a2, fa1, fa0
-;   beqz a2, 8
+;   auipc t6, 0
+;   ld t6, 0xc(t6)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0xf0, 0x40
+;   fmv.d.x fa3, t6
+;   fle.d a0, fa3, fa0
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
 ;   fcvt.wu.d a0, fa0, rtz
+;   j 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/float.clif b/cranelift/filetests/filetests/isa/riscv64/float.clif
index dae86033df6c..2b5cd9564023 100644
--- a/cranelift/filetests/filetests/isa/riscv64/float.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/float.clif
@@ -10,12 +10,12 @@ block0(v0: f32, v1: f32):
 
 ; VCode:
 ; block0:
-;   fadd.s fa0,fa0,fa1,rne
+;   fadd.s fa0,fa0,fa1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fadd.s fa0, fa0, fa1, rne
+;   fadd.s fa0, fa0, fa1
 ;   ret
 
 function %f2(f64, f64) -> f64 {
@@ -26,12 +26,12 @@ block0(v0: f64, v1: f64):
 
 ; VCode:
 ; block0:
-;   fadd.d fa0,fa0,fa1,rne
+;   fadd.d fa0,fa0,fa1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fadd.d fa0, fa0, fa1, rne
+;   fadd.d fa0, fa0, fa1
 ;   ret
 
 function %f3(f32, f32) -> f32 {
@@ -42,12 +42,12 @@ block0(v0: f32, v1: f32):
 
 ; VCode:
 ; block0:
-;   fsub.s fa0,fa0,fa1,rne
+;   fsub.s fa0,fa0,fa1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fsub.s fa0, fa0, fa1, rne
+;   fsub.s fa0, fa0, fa1
 ;   ret
 
 function %f4(f64, f64) -> f64 {
@@ -58,12 +58,12 @@ block0(v0: f64, v1: f64):
 
 ; VCode:
 ; block0:
-;   fsub.d fa0,fa0,fa1,rne
+;   fsub.d fa0,fa0,fa1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fsub.d fa0, fa0, fa1, rne
+;   fsub.d fa0, fa0, fa1
 ;   ret
 
 function %f5(f32, f32) -> f32 {
@@ -74,12 +74,12 @@ block0(v0: f32, v1: f32):
 
 ; VCode:
 ; block0:
-;   fmul.s fa0,fa0,fa1,rne
+;   fmul.s fa0,fa0,fa1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fmul.s fa0, fa0, fa1, rne
+;   fmul.s fa0, fa0, fa1
 ;   ret
 
 function %f6(f64, f64) -> f64 {
@@ -90,12 +90,12 @@ block0(v0: f64, v1: f64):
 
 ; VCode:
 ; block0:
-;   fmul.d fa0,fa0,fa1,rne
+;   fmul.d fa0,fa0,fa1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fmul.d fa0, fa0, fa1, rne
+;   fmul.d fa0, fa0, fa1
 ;   ret
 
 function %f7(f32, f32) -> f32 {
@@ -106,12 +106,12 @@ block0(v0: f32, v1: f32):
 
 ; VCode:
 ; block0:
-;   fdiv.s fa0,fa0,fa1,rne
+;   fdiv.s fa0,fa0,fa1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fdiv.s fa0, fa0, fa1, rne
+;   fdiv.s fa0, fa0, fa1
 ;   ret
 
 function %f8(f64, f64) -> f64 {
@@ -122,12 +122,160 @@ block0(v0: f64, v1: f64):
 
 ; VCode:
 ; block0:
-;   fdiv.d fa0,fa0,fa1,rne
+;   fdiv.d fa0,fa0,fa1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fdiv.d fa0, fa0, fa1, rne
+;   fdiv.d fa0, fa0, fa1
+;   ret
+
+function %f9(f32, f32) -> f32 {
+block0(v0: f32, v1: f32):
+  v2 = fmin v0, v1
+  return v2
+}
+
+; VCode:
+; block0:
+;   fmv.d fa5,fa0
+;   fmin.s fa0,fa5,fa1##tmp=a4 ty=f32
+;   ret
+;
+; Disassembled:
+; block0: ; offset 0x0
+;   fmv.d fa5, fa0
+;   feq.s a4, fa5, fa5
+;   beqz a4, 0x3c
+;   feq.s a4, fa1, fa1
+;   beqz a4, 0x34
+;   fmin.s fa0, fa5, fa1
+;   fclass.s a4, fa5
+;   andi a4, a4, 0x18
+;   beqz a4, 0x34
+;   fclass.s a4, fa1
+;   andi a4, a4, 0x18
+;   beqz a4, 0x28
+;   fmv.x.w a4, fa5
+;   fmv.x.w t6, fa1
+;   or a4, a4, t6
+;   fmv.w.x fa0, a4
+;   j 0x14
+;   addi a4, zero, -1
+;   srli a4, a4, 0x16
+;   slli a4, a4, 0x16
+;   fmv.w.x fa0, a4
+;   ret
+
+function %f10(f64, f64) -> f64 {
+block0(v0: f64, v1: f64):
+  v2 = fmin v0, v1
+  return v2
+}
+
+; VCode:
+; block0:
+;   fmv.d fa5,fa0
+;   fmin.d fa0,fa5,fa1##tmp=a4 ty=f64
+;   ret
+;
+; Disassembled:
+; block0: ; offset 0x0
+;   fmv.d fa5, fa0
+;   feq.d a4, fa5, fa5
+;   beqz a4, 0x3c
+;   feq.d a4, fa1, fa1
+;   beqz a4, 0x34
+;   fmin.d fa0, fa5, fa1
+;   fclass.d a4, fa5
+;   andi a4, a4, 0x18
+;   beqz a4, 0x34
+;   fclass.d a4, fa1
+;   andi a4, a4, 0x18
+;   beqz a4, 0x28
+;   fmv.x.d a4, fa5
+;   fmv.x.d t6, fa1
+;   or a4, a4, t6
+;   fmv.d.x fa0, a4
+;   j 0x14
+;   addi a4, zero, -1
+;   srli a4, a4, 0x33
+;   slli a4, a4, 0x33
+;   fmv.d.x fa0, a4
+;   ret
+
+function %f11(f32, f32) -> f32 {
+block0(v0: f32, v1: f32):
+  v2 = fmax v0, v1
+  return v2
+}
+
+; VCode:
+; block0:
+;   fmv.d fa5,fa0
+;   fmax.s fa0,fa5,fa1##tmp=a4 ty=f32
+;   ret
+;
+; Disassembled:
+; block0: ; offset 0x0
+;   fmv.d fa5, fa0
+;   feq.s a4, fa5, fa5
+;   beqz a4, 0x3c
+;   feq.s a4, fa1, fa1
+;   beqz a4, 0x34
+;   fmax.s fa0, fa5, fa1
+;   fclass.s a4, fa5
+;   andi a4, a4, 0x18
+;   beqz a4, 0x34
+;   fclass.s a4, fa1
+;   andi a4, a4, 0x18
+;   beqz a4, 0x28
+;   fmv.x.w a4, fa5
+;   fmv.x.w t6, fa1
+;   and a4, a4, t6
+;   fmv.w.x fa0, a4
+;   j 0x14
+;   addi a4, zero, -1
+;   srli a4, a4, 0x16
+;   slli a4, a4, 0x16
+;   fmv.w.x fa0, a4
+;   ret
+
+function %f12(f64, f64) -> f64 {
+block0(v0: f64, v1: f64):
+  v2 = fmax v0, v1
+  return v2
+}
+
+; VCode:
+; block0:
+;   fmv.d fa5,fa0
+;   fmax.d fa0,fa5,fa1##tmp=a4 ty=f64
+;   ret
+;
+; Disassembled:
+; block0: ; offset 0x0
+;   fmv.d fa5, fa0
+;   feq.d a4, fa5, fa5
+;   beqz a4, 0x3c
+;   feq.d a4, fa1, fa1
+;   beqz a4, 0x34
+;   fmax.d fa0, fa5, fa1
+;   fclass.d a4, fa5
+;   andi a4, a4, 0x18
+;   beqz a4, 0x34
+;   fclass.d a4, fa1
+;   andi a4, a4, 0x18
+;   beqz a4, 0x28
+;   fmv.x.d a4, fa5
+;   fmv.x.d t6, fa1
+;   and a4, a4, t6
+;   fmv.d.x fa0, a4
+;   j 0x14
+;   addi a4, zero, -1
+;   srli a4, a4, 0x33
+;   slli a4, a4, 0x33
+;   fmv.d.x fa0, a4
 ;   ret
 
 function %f13(f32) -> f32 {
@@ -138,12 +286,12 @@ block0(v0: f32):
 
 ; VCode:
 ; block0:
-;   fsqrt.s fa0,fa0,rne
+;   fsqrt.s fa0,fa0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fsqrt.s fa0, fa0, rne
+;   fsqrt.s fa0, fa0
 ;   ret
 
 function %f15(f64) -> f64 {
@@ -154,12 +302,12 @@ block0(v0: f64):
 
 ; VCode:
 ; block0:
-;   fsqrt.d fa0,fa0,rne
+;   fsqrt.d fa0,fa0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fsqrt.d fa0, fa0, rne
+;   fsqrt.d fa0, fa0
 ;   ret
 
 function %f16(f32) -> f32 {
@@ -234,12 +382,12 @@ block0(v0: f32):
 
 ; VCode:
 ; block0:
-;   fcvt.d.s fa0,fa0,rne
+;   fcvt.d.s fa0,fa0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fcvt.d.s fa0, fa0
+;   .byte 0x53, 0x75, 0x05, 0x42
 ;   ret
 
 function %f21(f64) -> f32 {
@@ -250,12 +398,12 @@ block0(v0: f64):
 
 ; VCode:
 ; block0:
-;   fcvt.s.d fa0,fa0,rne
+;   fcvt.s.d fa0,fa0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fcvt.s.d fa0, fa0, rne
+;   fcvt.s.d fa0, fa0
 ;   ret
 
 function %f22(f32) -> f32 {
@@ -284,7 +432,7 @@ block0(v0: f32):
 ;   fcvt.s.l fa0, a3, rup
 ;   fsgnj.s fa0, fa0, fa5
 ;   j 0x10
-;   fadd.s fa0, fa5, fa5, rne
+;   fadd.s fa0, fa5, fa5
 ;   j 8
 ;   fmv.s fa0, fa5
 ;   ret
@@ -319,7 +467,7 @@ block0(v0: f64):
 ;   fcvt.d.l fa0, a3, rup
 ;   fsgnj.d fa0, fa0, fa5
 ;   j 0x10
-;   fadd.d fa0, fa5, fa5, rne
+;   fadd.d fa0, fa5, fa5
 ;   j 8
 ;   fmv.d fa0, fa5
 ;   ret
@@ -350,7 +498,7 @@ block0(v0: f32):
 ;   fcvt.s.l fa0, a3, rdn
 ;   fsgnj.s fa0, fa0, fa5
 ;   j 0x10
-;   fadd.s fa0, fa5, fa5, rne
+;   fadd.s fa0, fa5, fa5
 ;   j 8
 ;   fmv.s fa0, fa5
 ;   ret
@@ -385,7 +533,7 @@ block0(v0: f64):
 ;   fcvt.d.l fa0, a3, rdn
 ;   fsgnj.d fa0, fa0, fa5
 ;   j 0x10
-;   fadd.d fa0, fa5, fa5, rne
+;   fadd.d fa0, fa5, fa5
 ;   j 8
 ;   fmv.d fa0, fa5
 ;   ret
@@ -416,7 +564,7 @@ block0(v0: f32):
 ;   fcvt.s.l fa0, a3, rtz
 ;   fsgnj.s fa0, fa0, fa5
 ;   j 0x10
-;   fadd.s fa0, fa5, fa5, rne
+;   fadd.s fa0, fa5, fa5
 ;   j 8
 ;   fmv.s fa0, fa5
 ;   ret
@@ -451,7 +599,7 @@ block0(v0: f64):
 ;   fcvt.d.l fa0, a3, rtz
 ;   fsgnj.d fa0, fa0, fa5
 ;   j 0x10
-;   fadd.d fa0, fa5, fa5, rne
+;   fadd.d fa0, fa5, fa5
 ;   j 8
 ;   fmv.d fa0, fa5
 ;   ret
@@ -482,7 +630,7 @@ block0(v0: f32):
 ;   fcvt.s.l fa0, a3, rne
 ;   fsgnj.s fa0, fa0, fa5
 ;   j 0x10
-;   fadd.s fa0, fa5, fa5, rne
+;   fadd.s fa0, fa5, fa5
 ;   j 8
 ;   fmv.s fa0, fa5
 ;   ret
@@ -517,7 +665,7 @@ block0(v0: f64):
 ;   fcvt.d.l fa0, a3, rne
 ;   fsgnj.d fa0, fa0, fa5
 ;   j 0x10
-;   fadd.d fa0, fa5, fa5, rne
+;   fadd.d fa0, fa5, fa5
 ;   j 8
 ;   fmv.d fa0, fa5
 ;   ret
@@ -530,12 +678,12 @@ block0(v0: f32, v1: f32, v2: f32):
 
 ; VCode:
 ; block0:
-;   fmadd.s fa0,fa0,fa1,fa2,rne
+;   fmadd.s fa0,fa0,fa1,fa2
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fmadd.s fa0, fa0, fa1, fa2, rne
+;   fmadd.s fa0, fa0, fa1, fa2
 ;   ret
 
 function %f30(f64, f64, f64) -> f64 {
@@ -546,12 +694,12 @@ block0(v0: f64, v1: f64, v2: f64):
 
 ; VCode:
 ; block0:
-;   fmadd.d fa0,fa0,fa1,fa2,rne
+;   fmadd.d fa0,fa0,fa1,fa2
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fmadd.d fa0, fa0, fa1, fa2, rne
+;   fmadd.d fa0, fa0, fa1, fa2
 ;   ret
 
 function %f31(f32, f32) -> f32 {
@@ -594,35 +742,29 @@ block0(v0: f32):
 
 ; VCode:
 ; block0:
-;   feq.s a2,fa0,fa0
-;   trap_if bad_toint##(a2 eq zero)
-;   lui a5,-264192
-;   fmv.w.x fa1,a5
-;   fle.s a3,fa0,fa1
-;   trap_if int_ovf##(a3 ne zero)
-;   lui a0,325632
-;   fmv.w.x fa2,a0
-;   fle.s a4,fa2,fa0
-;   trap_if int_ovf##(a4 ne zero)
-;   fcvt.wu.s a0,fa0,rtz
+;   fcvt_to_uint.i32 a0,fa0##in_ty=f32 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   feq.s a2, fa0, fa0
-;   bnez a2, 8
-;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
-;   lui a5, 0xbf800
-;   fmv.w.x fa1, a5
-;   fle.s a3, fa0, fa1
-;   beqz a3, 8
+;   feq.s a0, fa0, fa0
+;   beqz a0, 0x40
+;   auipc t6, 0
+;   lw t6, 0xc(t6)
+;   j 8
+;   .byte 0x00, 0x00, 0x80, 0xbf
+;   fmv.w.x fa3, t6
+;   fle.s a0, fa0, fa3
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
-;   lui a0, 0x4f800
-;   fmv.w.x fa2, a0
-;   fle.s a4, fa2, fa0
-;   beqz a4, 8
+;   lui t6, 0x4f800
+;   fmv.w.x fa3, t6
+;   fle.s a0, fa3, fa0
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
 ;   fcvt.wu.s a0, fa0, rtz
+;   j 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
 ;   ret
 
 function %f34(f32) -> i32 {
@@ -633,37 +775,29 @@ block0(v0: f32):
 
 ; VCode:
 ; block0:
-;   feq.s a2,fa0,fa0
-;   trap_if bad_toint##(a2 eq zero)
-;   lui a5,-200704
-;   addi a1,a5,1
-;   fmv.w.x fa3,a1
-;   fle.s a5,fa0,fa3
-;   trap_if int_ovf##(a5 ne zero)
-;   lui a2,323584
-;   fmv.w.x fa4,a2
-;   fle.s a0,fa4,fa0
-;   trap_if int_ovf##(a0 ne zero)
-;   fcvt.w.s a0,fa0,rtz
+;   fcvt_to_sint.i32 a0,fa0##in_ty=f32 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   feq.s a2, fa0, fa0
-;   bnez a2, 8
-;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
-;   lui a5, 0xcf000
-;   addi a1, a5, 1
-;   fmv.w.x fa3, a1
-;   fle.s a5, fa0, fa3
-;   beqz a5, 8
+;   feq.s a0, fa0, fa0
+;   beqz a0, 0x40
+;   auipc t6, 0
+;   lw t6, 0xc(t6)
+;   j 8
+;   .byte 0x01, 0x00, 0x00, 0xcf
+;   fmv.w.x fa3, t6
+;   fle.s a0, fa0, fa3
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
-;   lui a2, 0x4f000
-;   fmv.w.x fa4, a2
-;   fle.s a0, fa4, fa0
+;   lui t6, 0x4f000
+;   fmv.w.x fa3, t6
+;   fle.s a0, fa3, fa0
 ;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
 ;   fcvt.w.s a0, fa0, rtz
+;   j 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
 ;   ret
 
 function %f35(f32) -> i64 {
@@ -674,35 +808,29 @@ block0(v0: f32):
 
 ; VCode:
 ; block0:
-;   feq.s a2,fa0,fa0
-;   trap_if bad_toint##(a2 eq zero)
-;   lui a5,-264192
-;   fmv.w.x fa1,a5
-;   fle.s a3,fa0,fa1
-;   trap_if int_ovf##(a3 ne zero)
-;   lui a0,391168
-;   fmv.w.x fa2,a0
-;   fle.s a4,fa2,fa0
-;   trap_if int_ovf##(a4 ne zero)
-;   fcvt.lu.s a0,fa0,rtz
+;   fcvt_to_uint.i64 a0,fa0##in_ty=f32 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   feq.s a2, fa0, fa0
-;   bnez a2, 8
-;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
-;   lui a5, 0xbf800
-;   fmv.w.x fa1, a5
-;   fle.s a3, fa0, fa1
-;   beqz a3, 8
+;   feq.s a0, fa0, fa0
+;   beqz a0, 0x40
+;   auipc t6, 0
+;   lw t6, 0xc(t6)
+;   j 8
+;   .byte 0x00, 0x00, 0x80, 0xbf
+;   fmv.w.x fa3, t6
+;   fle.s a0, fa0, fa3
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
-;   lui a0, 0x5f800
-;   fmv.w.x fa2, a0
-;   fle.s a4, fa2, fa0
-;   beqz a4, 8
+;   lui t6, 0x5f800
+;   fmv.w.x fa3, t6
+;   fle.s a0, fa3, fa0
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
 ;   fcvt.lu.s a0, fa0, rtz
+;   j 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
 ;   ret
 
 function %f36(f32) -> i64 {
@@ -713,37 +841,29 @@ block0(v0: f32):
 
 ; VCode:
 ; block0:
-;   feq.s a2,fa0,fa0
-;   trap_if bad_toint##(a2 eq zero)
-;   lui a5,-135168
-;   addi a1,a5,1
-;   fmv.w.x fa3,a1
-;   fle.s a5,fa0,fa3
-;   trap_if int_ovf##(a5 ne zero)
-;   lui a2,389120
-;   fmv.w.x fa4,a2
-;   fle.s a0,fa4,fa0
-;   trap_if int_ovf##(a0 ne zero)
-;   fcvt.l.s a0,fa0,rtz
+;   fcvt_to_sint.i64 a0,fa0##in_ty=f32 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   feq.s a2, fa0, fa0
-;   bnez a2, 8
-;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
-;   lui a5, 0xdf000
-;   addi a1, a5, 1
-;   fmv.w.x fa3, a1
-;   fle.s a5, fa0, fa3
-;   beqz a5, 8
+;   feq.s a0, fa0, fa0
+;   beqz a0, 0x40
+;   auipc t6, 0
+;   lw t6, 0xc(t6)
+;   j 8
+;   .byte 0x01, 0x00, 0x00, 0xdf
+;   fmv.w.x fa3, t6
+;   fle.s a0, fa0, fa3
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
-;   lui a2, 0x5f000
-;   fmv.w.x fa4, a2
-;   fle.s a0, fa4, fa0
+;   lui t6, 0x5f000
+;   fmv.w.x fa3, t6
+;   fle.s a0, fa3, fa0
 ;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
 ;   fcvt.l.s a0, fa0, rtz
+;   j 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
 ;   ret
 
 function %f37(f64) -> i32 {
@@ -754,39 +874,34 @@ block0(v0: f64):
 
 ; VCode:
 ; block0:
-;   feq.d a2,fa0,fa0
-;   trap_if bad_toint##(a2 eq zero)
-;   lui a5,3071
-;   slli a1,a5,40
-;   fmv.d.x fa3,a1
-;   fle.d a5,fa0,fa3
-;   trap_if int_ovf##(a5 ne zero)
-;   lui a2,1055
-;   slli a4,a2,40
-;   fmv.d.x fa1,a4
-;   fle.d a2,fa1,fa0
-;   trap_if int_ovf##(a2 ne zero)
-;   fcvt.wu.d a0,fa0,rtz
+;   fcvt_to_uint.i32 a0,fa0##in_ty=f64 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   feq.d a2, fa0, fa0
-;   bnez a2, 8
-;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
-;   lui a5, 0xbff
-;   slli a1, a5, 0x28
-;   fmv.d.x fa3, a1
-;   fle.d a5, fa0, fa3
-;   beqz a5, 8
+;   feq.d a0, fa0, fa0
+;   beqz a0, 0x54
+;   auipc t6, 0
+;   ld t6, 0xc(t6)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0xf0, 0xbf
+;   fmv.d.x fa3, t6
+;   fle.d a0, fa0, fa3
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
-;   lui a2, 0x41f
-;   slli a4, a2, 0x28
-;   fmv.d.x fa1, a4
-;   fle.d a2, fa1, fa0
-;   beqz a2, 8
+;   auipc t6, 0
+;   ld t6, 0xc(t6)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0xf0, 0x41
+;   fmv.d.x fa3, t6
+;   fle.d a0, fa3, fa0
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
 ;   fcvt.wu.d a0, fa0, rtz
+;   j 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
 ;   ret
 
 function %f38(f64) -> i32 {
@@ -797,42 +912,35 @@ block0(v0: f64):
 
 ; VCode:
 ; block0:
-;   feq.d a2,fa0,fa0
-;   trap_if bad_toint##(a2 eq zero)
-;   ld a5,[const(0)]
-;   fmv.d.x fa1,a5
-;   fle.d a3,fa0,fa1
-;   trap_if int_ovf##(a3 ne zero)
-;   lui a0,527
-;   slli a2,a0,41
-;   fmv.d.x fa4,a2
-;   fle.d a0,fa4,fa0
-;   trap_if int_ovf##(a0 ne zero)
-;   fcvt.w.d a0,fa0,rtz
+;   fcvt_to_sint.i32 a0,fa0##in_ty=f64 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   feq.d a2, fa0, fa0
-;   bnez a2, 8
-;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
-;   auipc a5, 0
-;   ld a5, 0x3c(a5)
-;   fmv.d.x fa1, a5
-;   fle.d a3, fa0, fa1
-;   beqz a3, 8
+;   feq.d a0, fa0, fa0
+;   beqz a0, 0x54
+;   auipc t6, 0
+;   ld t6, 0xc(t6)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x20, 0x00
+;   .byte 0x00, 0x00, 0xe0, 0xc1
+;   fmv.d.x fa3, t6
+;   fle.d a0, fa0, fa3
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
-;   lui a0, 0x20f
-;   slli a2, a0, 0x29
-;   fmv.d.x fa4, a2
-;   fle.d a0, fa4, fa0
+;   auipc t6, 0
+;   ld t6, 0xc(t6)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0xe0, 0x41
+;   fmv.d.x fa3, t6
+;   fle.d a0, fa3, fa0
 ;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
 ;   fcvt.w.d a0, fa0, rtz
+;   j 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
 ;   ret
-;   .byte 0x00, 0x00, 0x00, 0x00
-;   .byte 0x00, 0x00, 0x20, 0x00
-;   .byte 0x00, 0x00, 0xe0, 0xc1
 
 function %f39(f64) -> i64 {
 block0(v0: f64):
@@ -842,39 +950,34 @@ block0(v0: f64):
 
 ; VCode:
 ; block0:
-;   feq.d a2,fa0,fa0
-;   trap_if bad_toint##(a2 eq zero)
-;   lui a5,3071
-;   slli a1,a5,40
-;   fmv.d.x fa3,a1
-;   fle.d a5,fa0,fa3
-;   trap_if int_ovf##(a5 ne zero)
-;   lui a2,1087
-;   slli a4,a2,40
-;   fmv.d.x fa1,a4
-;   fle.d a2,fa1,fa0
-;   trap_if int_ovf##(a2 ne zero)
-;   fcvt.lu.d a0,fa0,rtz
+;   fcvt_to_uint.i64 a0,fa0##in_ty=f64 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   feq.d a2, fa0, fa0
-;   bnez a2, 8
-;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
-;   lui a5, 0xbff
-;   slli a1, a5, 0x28
-;   fmv.d.x fa3, a1
-;   fle.d a5, fa0, fa3
-;   beqz a5, 8
+;   feq.d a0, fa0, fa0
+;   beqz a0, 0x54
+;   auipc t6, 0
+;   ld t6, 0xc(t6)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0xf0, 0xbf
+;   fmv.d.x fa3, t6
+;   fle.d a0, fa0, fa3
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
-;   lui a2, 0x43f
-;   slli a4, a2, 0x28
-;   fmv.d.x fa1, a4
-;   fle.d a2, fa1, fa0
-;   beqz a2, 8
+;   auipc t6, 0
+;   ld t6, 0xc(t6)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0xf0, 0x43
+;   fmv.d.x fa3, t6
+;   fle.d a0, fa3, fa0
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
 ;   fcvt.lu.d a0, fa0, rtz
+;   j 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
 ;   ret
 
 function %f40(f64) -> i64 {
@@ -885,42 +988,35 @@ block0(v0: f64):
 
 ; VCode:
 ; block0:
-;   feq.d a2,fa0,fa0
-;   trap_if bad_toint##(a2 eq zero)
-;   ld a5,[const(0)]
-;   fmv.d.x fa1,a5
-;   fle.d a3,fa0,fa1
-;   trap_if int_ovf##(a3 ne zero)
-;   lui a0,543
-;   slli a2,a0,41
-;   fmv.d.x fa4,a2
-;   fle.d a0,fa4,fa0
-;   trap_if int_ovf##(a0 ne zero)
-;   fcvt.l.d a0,fa0,rtz
+;   fcvt_to_sint.i64 a0,fa0##in_ty=f64 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   feq.d a2, fa0, fa0
-;   bnez a2, 8
-;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
-;   auipc a5, 0
-;   ld a5, 0x3c(a5)
-;   fmv.d.x fa1, a5
-;   fle.d a3, fa0, fa1
-;   beqz a3, 8
+;   feq.d a0, fa0, fa0
+;   beqz a0, 0x54
+;   auipc t6, 0
+;   ld t6, 0xc(t6)
+;   j 0xc
+;   .byte 0x01, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0xe0, 0xc3
+;   fmv.d.x fa3, t6
+;   fle.d a0, fa0, fa3
+;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
-;   lui a0, 0x21f
-;   slli a2, a0, 0x29
-;   fmv.d.x fa4, a2
-;   fle.d a0, fa4, fa0
+;   auipc t6, 0
+;   ld t6, 0xc(t6)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0xe0, 0x43
+;   fmv.d.x fa3, t6
+;   fle.d a0, fa3, fa0
 ;   beqz a0, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: int_ovf
 ;   fcvt.l.d a0, fa0, rtz
+;   j 8
+;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: bad_toint
 ;   ret
-;   .byte 0x00, 0x00, 0x00, 0x00
-;   .byte 0x01, 0x00, 0x00, 0x00
-;   .byte 0x00, 0x00, 0xe0, 0xc3
 
 function %f41(i32) -> f32 {
 block0(v0: i32):
@@ -930,12 +1026,12 @@ block0(v0: i32):
 
 ; VCode:
 ; block0:
-;   fcvt.s.wu fa0,a0,rne
+;   fcvt.s.wu fa0,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fcvt.s.wu fa0, a0, rne
+;   fcvt.s.wu fa0, a0
 ;   ret
 
 function %f42(i32) -> f32 {
@@ -946,12 +1042,12 @@ block0(v0: i32):
 
 ; VCode:
 ; block0:
-;   fcvt.s.w fa0,a0,rne
+;   fcvt.s.w fa0,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fcvt.s.w fa0, a0, rne
+;   fcvt.s.w fa0, a0
 ;   ret
 
 function %f43(i64) -> f32 {
@@ -962,12 +1058,12 @@ block0(v0: i64):
 
 ; VCode:
 ; block0:
-;   fcvt.s.lu fa0,a0,rne
+;   fcvt.s.lu fa0,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fcvt.s.lu fa0, a0, rne
+;   fcvt.s.lu fa0, a0
 ;   ret
 
 function %f44(i64) -> f32 {
@@ -978,12 +1074,12 @@ block0(v0: i64):
 
 ; VCode:
 ; block0:
-;   fcvt.s.l fa0,a0,rne
+;   fcvt.s.l fa0,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fcvt.s.l fa0, a0, rne
+;   fcvt.s.l fa0, a0
 ;   ret
 
 function %f45(i32) -> f64 {
@@ -1015,7 +1111,7 @@ block0(v0: i32):
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fcvt.d.w fa0, a0
+;   .byte 0x53, 0x75, 0x05, 0xd2
 ;   ret
 
 function %f47(i64) -> f64 {
@@ -1026,12 +1122,12 @@ block0(v0: i64):
 
 ; VCode:
 ; block0:
-;   fcvt.d.lu fa0,a0,rne
+;   fcvt.d.lu fa0,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fcvt.d.lu fa0, a0, rne
+;   fcvt.d.lu fa0, a0
 ;   ret
 
 function %f48(i64) -> f64 {
@@ -1042,12 +1138,12 @@ block0(v0: i64):
 
 ; VCode:
 ; block0:
-;   fcvt.d.l fa0,a0,rne
+;   fcvt.d.l fa0,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fcvt.d.l fa0, a0, rne
+;   fcvt.d.l fa0, a0
 ;   ret
 
 function %f49(f32) -> i32 {
@@ -1058,18 +1154,16 @@ block0(v0: f32):
 
 ; VCode:
 ; block0:
-;   fcvt.wu.s a2,fa0,rtz
-;   feq.s a4,fa0,fa0
-;   sub a0,zero,a4
-;   and a0,a2,a0
+;   fcvt_to_uint_sat.i32 a0,fa0##in_ty=f32 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fcvt.wu.s a2, fa0, rtz
-;   feq.s a4, fa0, fa0
-;   neg a0, a4
-;   and a0, a2, a0
+;   feq.s a0, fa0, fa0
+;   beqz a0, 0xc
+;   fcvt.wu.s a0, fa0, rtz
+;   j 8
+;   mv a0, zero
 ;   ret
 
 function %f50(f32) -> i32 {
@@ -1080,18 +1174,16 @@ block0(v0: f32):
 
 ; VCode:
 ; block0:
-;   fcvt.w.s a2,fa0,rtz
-;   feq.s a4,fa0,fa0
-;   sub a0,zero,a4
-;   and a0,a2,a0
+;   fcvt_to_sint_sat.i32 a0,fa0##in_ty=f32 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fcvt.w.s a2, fa0, rtz
-;   feq.s a4, fa0, fa0
-;   neg a0, a4
-;   and a0, a2, a0
+;   feq.s a0, fa0, fa0
+;   beqz a0, 0xc
+;   fcvt.w.s a0, fa0, rtz
+;   j 8
+;   mv a0, zero
 ;   ret
 
 function %f51(f32) -> i64 {
@@ -1102,18 +1194,16 @@ block0(v0: f32):
 
 ; VCode:
 ; block0:
-;   fcvt.lu.s a2,fa0,rtz
-;   feq.s a4,fa0,fa0
-;   sub a0,zero,a4
-;   and a0,a2,a0
+;   fcvt_to_uint_sat.i64 a0,fa0##in_ty=f32 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fcvt.lu.s a2, fa0, rtz
-;   feq.s a4, fa0, fa0
-;   neg a0, a4
-;   and a0, a2, a0
+;   feq.s a0, fa0, fa0
+;   beqz a0, 0xc
+;   fcvt.lu.s a0, fa0, rtz
+;   j 8
+;   mv a0, zero
 ;   ret
 
 function %f52(f32) -> i64 {
@@ -1124,18 +1214,16 @@ block0(v0: f32):
 
 ; VCode:
 ; block0:
-;   fcvt.l.s a2,fa0,rtz
-;   feq.s a4,fa0,fa0
-;   sub a0,zero,a4
-;   and a0,a2,a0
+;   fcvt_to_sint_sat.i64 a0,fa0##in_ty=f32 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fcvt.l.s a2, fa0, rtz
-;   feq.s a4, fa0, fa0
-;   neg a0, a4
-;   and a0, a2, a0
+;   feq.s a0, fa0, fa0
+;   beqz a0, 0xc
+;   fcvt.l.s a0, fa0, rtz
+;   j 8
+;   mv a0, zero
 ;   ret
 
 function %f53(f64) -> i32 {
@@ -1146,18 +1234,16 @@ block0(v0: f64):
 
 ; VCode:
 ; block0:
-;   fcvt.wu.d a2,fa0,rtz
-;   feq.d a4,fa0,fa0
-;   sub a0,zero,a4
-;   and a0,a2,a0
+;   fcvt_to_uint_sat.i32 a0,fa0##in_ty=f64 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fcvt.wu.d a2, fa0, rtz
-;   feq.d a4, fa0, fa0
-;   neg a0, a4
-;   and a0, a2, a0
+;   feq.d a0, fa0, fa0
+;   beqz a0, 0xc
+;   fcvt.wu.d a0, fa0, rtz
+;   j 8
+;   mv a0, zero
 ;   ret
 
 function %f54(f64) -> i32 {
@@ -1168,18 +1254,16 @@ block0(v0: f64):
 
 ; VCode:
 ; block0:
-;   fcvt.w.d a2,fa0,rtz
-;   feq.d a4,fa0,fa0
-;   sub a0,zero,a4
-;   and a0,a2,a0
+;   fcvt_to_sint_sat.i32 a0,fa0##in_ty=f64 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fcvt.w.d a2, fa0, rtz
-;   feq.d a4, fa0, fa0
-;   neg a0, a4
-;   and a0, a2, a0
+;   feq.d a0, fa0, fa0
+;   beqz a0, 0xc
+;   fcvt.w.d a0, fa0, rtz
+;   j 8
+;   mv a0, zero
 ;   ret
 
 function %f55(f64) -> i64 {
@@ -1190,18 +1274,16 @@ block0(v0: f64):
 
 ; VCode:
 ; block0:
-;   fcvt.lu.d a2,fa0,rtz
-;   feq.d a4,fa0,fa0
-;   sub a0,zero,a4
-;   and a0,a2,a0
+;   fcvt_to_uint_sat.i64 a0,fa0##in_ty=f64 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fcvt.lu.d a2, fa0, rtz
-;   feq.d a4, fa0, fa0
-;   neg a0, a4
-;   and a0, a2, a0
+;   feq.d a0, fa0, fa0
+;   beqz a0, 0xc
+;   fcvt.lu.d a0, fa0, rtz
+;   j 8
+;   mv a0, zero
 ;   ret
 
 function %f56(f64) -> i64 {
@@ -1212,17 +1294,15 @@ block0(v0: f64):
 
 ; VCode:
 ; block0:
-;   fcvt.l.d a2,fa0,rtz
-;   feq.d a4,fa0,fa0
-;   sub a0,zero,a4
-;   and a0,a2,a0
+;   fcvt_to_sint_sat.i64 a0,fa0##in_ty=f64 tmp=fa3
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   fcvt.l.d a2, fa0, rtz
-;   feq.d a4, fa0, fa0
-;   neg a0, a4
-;   and a0, a2, a0
+;   feq.d a0, fa0, fa0
+;   beqz a0, 0xc
+;   fcvt.l.d a0, fa0, rtz
+;   j 8
+;   mv a0, zero
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/fmax.clif b/cranelift/filetests/filetests/isa/riscv64/fmax.clif
deleted file mode 100644
index c7939f36b57e..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/fmax.clif
+++ /dev/null
@@ -1,62 +0,0 @@
-test compile precise-output
-set unwind_info=false
-target riscv64
-
-function %fmax_f32(f32, f32) -> f32 {
-block0(v0: f32, v1: f32):
-    v2 = fmax v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   feq.s a3,fa0,fa0
-;   feq.s a5,fa1,fa1
-;   and a1,a3,a5
-;   fadd.s fa3,fa0,fa1,rne
-;   fmax.s fa5,fa0,fa1
-;   select fa0,fa5,fa3##condition=(a1 ne zero)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   feq.s a3, fa0, fa0
-;   feq.s a5, fa1, fa1
-;   and a1, a3, a5
-;   fadd.s fa3, fa0, fa1, rne
-;   fmax.s fa5, fa0, fa1
-;   beqz a1, 0xc
-;   fmv.d fa0, fa5
-;   j 8
-;   fmv.d fa0, fa3
-;   ret
-
-function %fmax_f64(f64, f64) -> f64 {
-block0(v0: f64, v1: f64):
-    v2 = fmax v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   feq.d a3,fa0,fa0
-;   feq.d a5,fa1,fa1
-;   and a1,a3,a5
-;   fadd.d fa3,fa0,fa1,rne
-;   fmax.d fa5,fa0,fa1
-;   select fa0,fa5,fa3##condition=(a1 ne zero)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   feq.d a3, fa0, fa0
-;   feq.d a5, fa1, fa1
-;   and a1, a3, a5
-;   fadd.d fa3, fa0, fa1, rne
-;   fmax.d fa5, fa0, fa1
-;   beqz a1, 0xc
-;   fmv.d fa0, fa5
-;   j 8
-;   fmv.d fa0, fa3
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/fmin.clif b/cranelift/filetests/filetests/isa/riscv64/fmin.clif
deleted file mode 100644
index cdc3b15bbdf2..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/fmin.clif
+++ /dev/null
@@ -1,62 +0,0 @@
-test compile precise-output
-set unwind_info=false
-target riscv64
-
-function %fmin_f32(f32, f32) -> f32 {
-block0(v0: f32, v1: f32):
-    v2 = fmin v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   feq.s a3,fa0,fa0
-;   feq.s a5,fa1,fa1
-;   and a1,a3,a5
-;   fadd.s fa3,fa0,fa1,rne
-;   fmin.s fa5,fa0,fa1
-;   select fa0,fa5,fa3##condition=(a1 ne zero)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   feq.s a3, fa0, fa0
-;   feq.s a5, fa1, fa1
-;   and a1, a3, a5
-;   fadd.s fa3, fa0, fa1, rne
-;   fmin.s fa5, fa0, fa1
-;   beqz a1, 0xc
-;   fmv.d fa0, fa5
-;   j 8
-;   fmv.d fa0, fa3
-;   ret
-
-function %fmin_f64(f64, f64) -> f64 {
-block0(v0: f64, v1: f64):
-    v2 = fmin v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   feq.d a3,fa0,fa0
-;   feq.d a5,fa1,fa1
-;   and a1,a3,a5
-;   fadd.d fa3,fa0,fa1,rne
-;   fmin.d fa5,fa0,fa1
-;   select fa0,fa5,fa3##condition=(a1 ne zero)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   feq.d a3, fa0, fa0
-;   feq.d a5, fa1, fa1
-;   and a1, a3, a5
-;   fadd.d fa3, fa0, fa1, rne
-;   fmin.d fa5, fa0, fa1
-;   beqz a1, 0xc
-;   fmv.d fa0, fa5
-;   j 8
-;   fmv.d fa0, fa3
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/fuzzbug-60035.clif b/cranelift/filetests/filetests/isa/riscv64/fuzzbug-60035.clif
index f549de8670a0..4b3dd6167907 100644
--- a/cranelift/filetests/filetests/isa/riscv64/fuzzbug-60035.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/fuzzbug-60035.clif
@@ -13,7 +13,7 @@ block0:
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -38,7 +38,7 @@ block0:
 ;   fsd fs9,-152(sp)
 ;   fsd fs10,-160(sp)
 ;   fsd fs11,-168(sp)
-;   addi sp,sp,-192
+;   add sp,-192
 ; block0:
 ;   load_sym t0,userextname0+0
 ;   sd t0,0(nominal_sp)
@@ -46,7 +46,7 @@ block0:
 ;   callind t0
 ;   ld t0,0(nominal_sp)
 ;   callind t0
-;   addi sp,sp,192
+;   add sp,+192
 ;   ld s1,-8(sp)
 ;   ld s2,-16(sp)
 ;   ld s3,-24(sp)
@@ -70,7 +70,7 @@ block0:
 ;   fld fs11,-168(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/i128-bmask.clif b/cranelift/filetests/filetests/isa/riscv64/i128-bmask.clif
index a258225f5217..2171a16ba752 100644
--- a/cranelift/filetests/filetests/isa/riscv64/i128-bmask.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/i128-bmask.clif
@@ -132,17 +132,19 @@ block0(v0: i32):
 
 ; VCode:
 ; block0:
-;   sext.w a2,a0
-;   sltu a4,zero,a2
-;   sub a1,zero,a4
+;   slli a2,a0,32
+;   srli a4,a2,32
+;   sltu a0,zero,a4
+;   sub a1,zero,a0
 ;   mv a0,a1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   sext.w a2, a0
-;   snez a4, a2
-;   neg a1, a4
+;   slli a2, a0, 0x20
+;   srli a4, a2, 0x20
+;   snez a0, a4
+;   neg a1, a0
 ;   mv a0, a1
 ;   ret
 
@@ -155,7 +157,7 @@ block0(v0: i16):
 ; VCode:
 ; block0:
 ;   slli a2,a0,48
-;   srai a4,a2,48
+;   srli a4,a2,48
 ;   sltu a0,zero,a4
 ;   sub a1,zero,a0
 ;   mv a0,a1
@@ -164,7 +166,7 @@ block0(v0: i16):
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   slli a2, a0, 0x30
-;   srai a4, a2, 0x30
+;   srli a4, a2, 0x30
 ;   snez a0, a4
 ;   neg a1, a0
 ;   mv a0, a1
@@ -178,19 +180,17 @@ block0(v0: i8):
 
 ; VCode:
 ; block0:
-;   slli a2,a0,56
-;   srai a4,a2,56
-;   sltu a0,zero,a4
-;   sub a1,zero,a0
+;   andi a2,a0,255
+;   sltu a4,zero,a2
+;   sub a1,zero,a4
 ;   mv a0,a1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slli a2, a0, 0x38
-;   srai a4, a2, 0x38
-;   snez a0, a4
-;   neg a1, a0
+;   andi a2, a0, 0xff
+;   snez a4, a2
+;   neg a1, a4
 ;   mv a0, a1
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/iabs.clif b/cranelift/filetests/filetests/isa/riscv64/iabs.clif
index 6a91b7cb1dde..8ff903a910b2 100644
--- a/cranelift/filetests/filetests/isa/riscv64/iabs.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/iabs.clif
@@ -12,7 +12,7 @@ block0(v0: i8):
 ;   slli a2,a0,56
 ;   srai a4,a2,56
 ;   sub a0,zero,a4
-;   select a0,a4,a0##condition=(a4 sgt a0)
+;   select_reg a0,a4,a0##condition=(a4 sgt a0)
 ;   ret
 ;
 ; Disassembled:
@@ -20,7 +20,8 @@ block0(v0: i8):
 ;   slli a2, a0, 0x38
 ;   srai a4, a2, 0x38
 ;   neg a0, a4
-;   bge a0, a4, 8
+;   blt a0, a4, 8
+;   j 8
 ;   mv a0, a4
 ;   ret
 
@@ -35,7 +36,7 @@ block0(v0: i16):
 ;   slli a2,a0,48
 ;   srai a4,a2,48
 ;   sub a0,zero,a4
-;   select a0,a4,a0##condition=(a4 sgt a0)
+;   select_reg a0,a4,a0##condition=(a4 sgt a0)
 ;   ret
 ;
 ; Disassembled:
@@ -43,7 +44,8 @@ block0(v0: i16):
 ;   slli a2, a0, 0x30
 ;   srai a4, a2, 0x30
 ;   neg a0, a4
-;   bge a0, a4, 8
+;   blt a0, a4, 8
+;   j 8
 ;   mv a0, a4
 ;   ret
 
@@ -57,17 +59,17 @@ block0(v0: i32):
 ; block0:
 ;   sext.w a2,a0
 ;   sub a4,zero,a2
-;   select a0,a2,a4##condition=(a2 sgt a4)
+;   select_reg a0,a2,a4##condition=(a2 sgt a4)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sext.w a2, a0
 ;   neg a4, a2
-;   bge a4, a2, 0xc
-;   mv a0, a2
-;   j 8
+;   blt a4, a2, 0xc
 ;   mv a0, a4
+;   j 8
+;   mv a0, a2
 ;   ret
 
 function %iabs_i64(i64) -> i64 {
@@ -79,7 +81,7 @@ block0(v0: i64):
 ; VCode:
 ; block0:
 ;   sub a2,zero,a0
-;   select a0,a0,a2##condition=(a0 sgt a2)
+;   select_reg a0,a0,a2##condition=(a0 sgt a2)
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/iconst-icmp-small.clif b/cranelift/filetests/filetests/isa/riscv64/iconst-icmp-small.clif
index 49ef59eb2640..bbb8be09d181 100644
--- a/cranelift/filetests/filetests/isa/riscv64/iconst-icmp-small.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/iconst-icmp-small.clif
@@ -12,445 +12,26 @@ block0:
 
 ; VCode:
 ; block0:
-;   lui a0,-2
-;   addi a2,a0,-564
-;   slli a3,a2,48
-;   srai a4,a3,48
-;   slli a0,a2,48
-;   srai a2,a0,48
-;   xor a4,a4,a2
-;   sltu a0,zero,a4
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   lui a0, 0xffffe
-;   addi a2, a0, -0x234
-;   slli a3, a2, 0x30
-;   srai a4, a3, 0x30
-;   slli a0, a2, 0x30
-;   srai a2, a0, 0x30
-;   xor a4, a4, a2
-;   snez a0, a4
-;   ret
-
-function %seq_const0(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm eq v0, 0
-    return v2
-}
-
-; VCode:
-; block0:
-;   seqz a0,a0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   seqz a0, a0
-;   ret
-
-function %sne_const0(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm ne v0, 0
-    return v2
-}
-
-; VCode:
-; block0:
-;   sltu a0,zero,a0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   snez a0, a0
-;   ret
-
-function %slt_const0(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm slt v0, 0
-    return v2
-}
-
-; VCode:
-; block0:
-;   slt a0,a0,zero
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   sltz a0, a0
-;   ret
-
-function %sgt_const0(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm sgt v0, 0
-    return v2
-}
-
-; VCode:
-; block0:
-;   slt a0,zero,a0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   sgtz a0, a0
-;   ret
-
-function %ult_const0(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm ult v0, 0
-    return v2
-}
-
-; VCode:
-; block0:
-;   sltu a0,a0,zero
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   sltu a0, a0, zero
-;   ret
-
-function %ugt_const0(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm ugt v0, 0
-    return v2
-}
-
-; VCode:
-; block0:
-;   sltu a0,zero,a0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   snez a0, a0
-;   ret
-
-function %seq_const1(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm eq v0, 1
-    return v2
-}
-
-; VCode:
-; block0:
-;   xori a2,a0,1
-;   seqz a0,a2
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   xori a2, a0, 1
-;   seqz a0, a2
-;   ret
-
-function %sne_const1(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm ne v0, 1
-    return v2
-}
-
-; VCode:
-; block0:
-;   xori a2,a0,1
-;   sltu a0,zero,a2
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   xori a2, a0, 1
-;   snez a0, a2
-;   ret
-
-function %slt_const1(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm slt v0, 1
-    return v2
-}
-
-; VCode:
-; block0:
-;   slti a0,a0,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   slti a0, a0, 1
-;   ret
-
-function %sgt_const1(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm sgt v0, 1
-    return v2
-}
-
-; VCode:
-; block0:
-;   li a3,1
-;   slt a0,a3,a0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi a3, zero, 1
-;   slt a0, a3, a0
-;   ret
-
-function %ult_const1(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm ult v0, 1
-    return v2
-}
-
-; VCode:
-; block0:
-;   seqz a0,a0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   seqz a0, a0
-;   ret
-
-function %ugt_const1(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm ugt v0, 1
-    return v2
-}
-
-; VCode:
-; block0:
-;   li a3,1
-;   sltu a0,a3,a0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi a3, zero, 1
-;   sltu a0, a3, a0
-;   ret
-
-function %seq_const2(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm eq v0, 2
-    return v2
-}
-
-; VCode:
-; block0:
-;   xori a2,a0,2
-;   seqz a0,a2
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   xori a2, a0, 2
-;   seqz a0, a2
-;   ret
-
-function %sne_const2(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm ne v0, 2
-    return v2
-}
-
-; VCode:
-; block0:
-;   xori a2,a0,2
-;   sltu a0,zero,a2
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   xori a2, a0, 2
-;   snez a0, a2
-;   ret
-
-function %slt_const2(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm slt v0, 2
-    return v2
-}
-
-; VCode:
-; block0:
-;   slti a0,a0,2
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   slti a0, a0, 2
-;   ret
-
-function %sgt_const2(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm sgt v0, 2
-    return v2
-}
-
-; VCode:
-; block0:
-;   li a3,2
-;   slt a0,a3,a0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi a3, zero, 2
-;   slt a0, a3, a0
-;   ret
-
-function %ult_const2(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm ult v0, 2
-    return v2
-}
-
-; VCode:
-; block0:
-;   sltiu a0,a0,2
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   sltiu a0, a0, 2
-;   ret
-
-function %ugt_const2(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm ugt v0, 2
-    return v2
-}
-
-; VCode:
-; block0:
-;   li a3,2
-;   sltu a0,a3,a0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi a3, zero, 2
-;   sltu a0, a3, a0
-;   ret
-
-function %sle_const2(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm sle v0, 2
-    return v2
-}
-
-; VCode:
-; block0:
-;   li a4,2
-;   slt a3,a4,a0
-;   xori a0,a3,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi a4, zero, 2
-;   slt a3, a4, a0
-;   xori a0, a3, 1
-;   ret
-
-function %sle_const_2046(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm sle v0, 2046
-    return v2
-}
-
-; VCode:
-; block0:
-;   li a4,2046
-;   slt a3,a4,a0
-;   xori a0,a3,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi a4, zero, 0x7fe
-;   slt a3, a4, a0
-;   xori a0, a3, 1
-;   ret
-
-function %sle_const_2047(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm sle v0, 2047
-    return v2
-}
-
-; VCode:
-; block0:
-;   li a4,2047
-;   slt a3,a4,a0
-;   xori a0,a3,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi a4, zero, 0x7ff
-;   slt a3, a4, a0
-;   xori a0, a3, 1
-;   ret
-
-function %sge_const2(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm sge v0, 2
-    return v2
-}
-
-; VCode:
-; block0:
-;   slti a2,a0,2
-;   xori a0,a2,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   slti a2, a0, 2
-;   xori a0, a2, 1
-;   ret
-
-function %ule_const2(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm ule v0, 2
-    return v2
-}
-
-; VCode:
-; block0:
-;   li a4,2
-;   sltu a3,a4,a0
-;   xori a0,a3,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi a4, zero, 2
-;   sltu a3, a4, a0
-;   xori a0, a3, 1
-;   ret
-
-function %uge_const2(i64) -> i8 system_v {
-block0(v0: i64):
-    v2 = icmp_imm uge v0, 2
-    return v2
-}
-
-; VCode:
-; block0:
-;   sltiu a2,a0,2
-;   xori a0,a2,1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   sltiu a2, a0, 2
-;   xori a0, a2, 1
+;   lui a5,-2
+;   addi a1,a5,-564
+;   slli a2,a1,48
+;   srli a4,a2,48
+;   slli a0,a1,48
+;   srli a2,a0,48
+;   ne a0,a4,a2##ty=i16
+;   ret
+;
+; Disassembled:
+; block0: ; offset 0x0
+;   lui a5, 0xffffe
+;   addi a1, a5, -0x234
+;   slli a2, a1, 0x30
+;   srli a4, a2, 0x30
+;   slli a0, a1, 0x30
+;   srli a2, a0, 0x30
+;   beq a4, a2, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/ishl-const.clif b/cranelift/filetests/filetests/isa/riscv64/ishl-const.clif
index c46b536daa88..3e2fe0c7cdca 100644
--- a/cranelift/filetests/filetests/isa/riscv64/ishl-const.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/ishl-const.clif
@@ -362,12 +362,13 @@ block0(v0: i128):
 ;   sub a2,a2,a5
 ;   sll a4,a0,a5
 ;   srl a0,a0,a2
-;   select a2,zero,a0##condition=(a5 eq zero)
+;   select_reg a2,zero,a0##condition=(a5 eq zero)
 ;   sll a5,a1,a5
-;   or a5,a2,a5
+;   or a1,a2,a5
 ;   li a2,64
-;   andi a3,a3,127
-;   select [a0,a1],[zero,a4],[a4,a5]##condition=(a3 uge a2)
+;   andi a5,a3,127
+;   select_reg a0,zero,a4##condition=(a5 uge a2)
+;   select_reg a1,a4,a1##condition=(a5 uge a2)
 ;   ret
 ;
 ; Disassembled:
@@ -378,20 +379,21 @@ block0(v0: i128):
 ;   sub a2, a2, a5
 ;   sll a4, a0, a5
 ;   srl a0, a0, a2
-;   bnez a5, 0xc
-;   mv a2, zero
-;   j 8
+;   beqz a5, 0xc
 ;   mv a2, a0
+;   j 8
+;   mv a2, zero
 ;   sll a5, a1, a5
-;   or a5, a2, a5
+;   or a1, a2, a5
 ;   addi a2, zero, 0x40
-;   andi a3, a3, 0x7f
-;   bltu a3, a2, 0x10
+;   andi a5, a3, 0x7f
+;   bgeu a5, a2, 0xc
+;   mv a0, a4
+;   j 8
 ;   mv a0, zero
+;   bgeu a5, a2, 8
+;   j 8
 ;   mv a1, a4
-;   j 0xc
-;   mv a0, a4
-;   mv a1, a5
 ;   ret
 
 function %ishl_i128_const_i16(i128) -> i128 {
@@ -409,12 +411,13 @@ block0(v0: i128):
 ;   sub a2,a2,a5
 ;   sll a4,a0,a5
 ;   srl a0,a0,a2
-;   select a2,zero,a0##condition=(a5 eq zero)
+;   select_reg a2,zero,a0##condition=(a5 eq zero)
 ;   sll a5,a1,a5
-;   or a5,a2,a5
+;   or a1,a2,a5
 ;   li a2,64
-;   andi a3,a3,127
-;   select [a0,a1],[zero,a4],[a4,a5]##condition=(a3 uge a2)
+;   andi a5,a3,127
+;   select_reg a0,zero,a4##condition=(a5 uge a2)
+;   select_reg a1,a4,a1##condition=(a5 uge a2)
 ;   ret
 ;
 ; Disassembled:
@@ -425,20 +428,21 @@ block0(v0: i128):
 ;   sub a2, a2, a5
 ;   sll a4, a0, a5
 ;   srl a0, a0, a2
-;   bnez a5, 0xc
-;   mv a2, zero
-;   j 8
+;   beqz a5, 0xc
 ;   mv a2, a0
+;   j 8
+;   mv a2, zero
 ;   sll a5, a1, a5
-;   or a5, a2, a5
+;   or a1, a2, a5
 ;   addi a2, zero, 0x40
-;   andi a3, a3, 0x7f
-;   bltu a3, a2, 0x10
+;   andi a5, a3, 0x7f
+;   bgeu a5, a2, 0xc
+;   mv a0, a4
+;   j 8
 ;   mv a0, zero
+;   bgeu a5, a2, 8
+;   j 8
 ;   mv a1, a4
-;   j 0xc
-;   mv a0, a4
-;   mv a1, a5
 ;   ret
 
 function %ishl_i128_const_i32(i128) -> i128 {
@@ -456,12 +460,13 @@ block0(v0: i128):
 ;   sub a2,a2,a5
 ;   sll a4,a0,a5
 ;   srl a0,a0,a2
-;   select a2,zero,a0##condition=(a5 eq zero)
+;   select_reg a2,zero,a0##condition=(a5 eq zero)
 ;   sll a5,a1,a5
-;   or a5,a2,a5
+;   or a1,a2,a5
 ;   li a2,64
-;   andi a3,a3,127
-;   select [a0,a1],[zero,a4],[a4,a5]##condition=(a3 uge a2)
+;   andi a5,a3,127
+;   select_reg a0,zero,a4##condition=(a5 uge a2)
+;   select_reg a1,a4,a1##condition=(a5 uge a2)
 ;   ret
 ;
 ; Disassembled:
@@ -472,20 +477,21 @@ block0(v0: i128):
 ;   sub a2, a2, a5
 ;   sll a4, a0, a5
 ;   srl a0, a0, a2
-;   bnez a5, 0xc
-;   mv a2, zero
-;   j 8
+;   beqz a5, 0xc
 ;   mv a2, a0
+;   j 8
+;   mv a2, zero
 ;   sll a5, a1, a5
-;   or a5, a2, a5
+;   or a1, a2, a5
 ;   addi a2, zero, 0x40
-;   andi a3, a3, 0x7f
-;   bltu a3, a2, 0x10
+;   andi a5, a3, 0x7f
+;   bgeu a5, a2, 0xc
+;   mv a0, a4
+;   j 8
 ;   mv a0, zero
+;   bgeu a5, a2, 8
+;   j 8
 ;   mv a1, a4
-;   j 0xc
-;   mv a0, a4
-;   mv a1, a5
 ;   ret
 
 function %ishl_i128_const_i64(i128) -> i128 {
@@ -503,12 +509,13 @@ block0(v0: i128):
 ;   sub a2,a2,a5
 ;   sll a4,a0,a5
 ;   srl a0,a0,a2
-;   select a2,zero,a0##condition=(a5 eq zero)
+;   select_reg a2,zero,a0##condition=(a5 eq zero)
 ;   sll a5,a1,a5
-;   or a5,a2,a5
+;   or a1,a2,a5
 ;   li a2,64
-;   andi a3,a3,127
-;   select [a0,a1],[zero,a4],[a4,a5]##condition=(a3 uge a2)
+;   andi a5,a3,127
+;   select_reg a0,zero,a4##condition=(a5 uge a2)
+;   select_reg a1,a4,a1##condition=(a5 uge a2)
 ;   ret
 ;
 ; Disassembled:
@@ -519,20 +526,21 @@ block0(v0: i128):
 ;   sub a2, a2, a5
 ;   sll a4, a0, a5
 ;   srl a0, a0, a2
-;   bnez a5, 0xc
-;   mv a2, zero
-;   j 8
+;   beqz a5, 0xc
 ;   mv a2, a0
+;   j 8
+;   mv a2, zero
 ;   sll a5, a1, a5
-;   or a5, a2, a5
+;   or a1, a2, a5
 ;   addi a2, zero, 0x40
-;   andi a3, a3, 0x7f
-;   bltu a3, a2, 0x10
+;   andi a5, a3, 0x7f
+;   bgeu a5, a2, 0xc
+;   mv a0, a4
+;   j 8
 ;   mv a0, zero
+;   bgeu a5, a2, 8
+;   j 8
 ;   mv a1, a4
-;   j 0xc
-;   mv a0, a4
-;   mv a1, a5
 ;   ret
 
 function %ishl_i128_const_i128(i128) -> i128 {
@@ -552,12 +560,13 @@ block0(v0: i128):
 ;   sub a3,a3,a2
 ;   sll a5,a0,a2
 ;   srl a3,a0,a3
-;   select a3,zero,a3##condition=(a2 eq zero)
+;   select_reg a3,zero,a3##condition=(a2 eq zero)
 ;   sll a0,a1,a2
-;   or a2,a3,a0
+;   or a1,a3,a0
 ;   li a3,64
-;   andi a4,a4,127
-;   select [a0,a1],[zero,a5],[a5,a2]##condition=(a4 uge a3)
+;   andi a2,a4,127
+;   select_reg a0,zero,a5##condition=(a2 uge a3)
+;   select_reg a1,a5,a1##condition=(a2 uge a3)
 ;   ret
 ;
 ; Disassembled:
@@ -569,17 +578,19 @@ block0(v0: i128):
 ;   sub a3, a3, a2
 ;   sll a5, a0, a2
 ;   srl a3, a0, a3
-;   bnez a2, 8
+;   beqz a2, 8
+;   j 8
 ;   mv a3, zero
 ;   sll a0, a1, a2
-;   or a2, a3, a0
+;   or a1, a3, a0
 ;   addi a3, zero, 0x40
-;   andi a4, a4, 0x7f
-;   bltu a4, a3, 0x10
+;   andi a2, a4, 0x7f
+;   bgeu a2, a3, 0xc
+;   mv a0, a5
+;   j 8
 ;   mv a0, zero
+;   bgeu a2, a3, 8
+;   j 8
 ;   mv a1, a5
-;   j 0xc
-;   mv a0, a5
-;   mv a1, a2
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/ishl.clif b/cranelift/filetests/filetests/isa/riscv64/ishl.clif
index 3dbb73cdd11b..7f3c5d090ab7 100644
--- a/cranelift/filetests/filetests/isa/riscv64/ishl.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/ishl.clif
@@ -356,12 +356,13 @@ block0(v0: i128, v1: i8):
 ;   sub a3,a3,a5
 ;   sll a4,a0,a5
 ;   srl a0,a0,a3
-;   select a3,zero,a0##condition=(a5 eq zero)
+;   select_reg a3,zero,a0##condition=(a5 eq zero)
 ;   sll a5,a1,a5
-;   or a5,a3,a5
+;   or a1,a3,a5
 ;   li a3,64
-;   andi a2,a2,127
-;   select [a0,a1],[zero,a4],[a4,a5]##condition=(a2 uge a3)
+;   andi a5,a2,127
+;   select_reg a0,zero,a4##condition=(a5 uge a3)
+;   select_reg a1,a4,a1##condition=(a5 uge a3)
 ;   ret
 ;
 ; Disassembled:
@@ -371,20 +372,21 @@ block0(v0: i128, v1: i8):
 ;   sub a3, a3, a5
 ;   sll a4, a0, a5
 ;   srl a0, a0, a3
-;   bnez a5, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a5, 0xc
 ;   mv a3, a0
+;   j 8
+;   mv a3, zero
 ;   sll a5, a1, a5
-;   or a5, a3, a5
+;   or a1, a3, a5
 ;   addi a3, zero, 0x40
-;   andi a2, a2, 0x7f
-;   bltu a2, a3, 0x10
+;   andi a5, a2, 0x7f
+;   bgeu a5, a3, 0xc
+;   mv a0, a4
+;   j 8
 ;   mv a0, zero
+;   bgeu a5, a3, 8
+;   j 8
 ;   mv a1, a4
-;   j 0xc
-;   mv a0, a4
-;   mv a1, a5
 ;   ret
 
 function %ishl_i128_i16(i128, i16) -> i128 {
@@ -400,12 +402,13 @@ block0(v0: i128, v1: i16):
 ;   sub a3,a3,a5
 ;   sll a4,a0,a5
 ;   srl a0,a0,a3
-;   select a3,zero,a0##condition=(a5 eq zero)
+;   select_reg a3,zero,a0##condition=(a5 eq zero)
 ;   sll a5,a1,a5
-;   or a5,a3,a5
+;   or a1,a3,a5
 ;   li a3,64
-;   andi a2,a2,127
-;   select [a0,a1],[zero,a4],[a4,a5]##condition=(a2 uge a3)
+;   andi a5,a2,127
+;   select_reg a0,zero,a4##condition=(a5 uge a3)
+;   select_reg a1,a4,a1##condition=(a5 uge a3)
 ;   ret
 ;
 ; Disassembled:
@@ -415,20 +418,21 @@ block0(v0: i128, v1: i16):
 ;   sub a3, a3, a5
 ;   sll a4, a0, a5
 ;   srl a0, a0, a3
-;   bnez a5, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a5, 0xc
 ;   mv a3, a0
+;   j 8
+;   mv a3, zero
 ;   sll a5, a1, a5
-;   or a5, a3, a5
+;   or a1, a3, a5
 ;   addi a3, zero, 0x40
-;   andi a2, a2, 0x7f
-;   bltu a2, a3, 0x10
+;   andi a5, a2, 0x7f
+;   bgeu a5, a3, 0xc
+;   mv a0, a4
+;   j 8
 ;   mv a0, zero
+;   bgeu a5, a3, 8
+;   j 8
 ;   mv a1, a4
-;   j 0xc
-;   mv a0, a4
-;   mv a1, a5
 ;   ret
 
 function %ishl_i128_i32(i128, i32) -> i128 {
@@ -444,12 +448,13 @@ block0(v0: i128, v1: i32):
 ;   sub a3,a3,a5
 ;   sll a4,a0,a5
 ;   srl a0,a0,a3
-;   select a3,zero,a0##condition=(a5 eq zero)
+;   select_reg a3,zero,a0##condition=(a5 eq zero)
 ;   sll a5,a1,a5
-;   or a5,a3,a5
+;   or a1,a3,a5
 ;   li a3,64
-;   andi a2,a2,127
-;   select [a0,a1],[zero,a4],[a4,a5]##condition=(a2 uge a3)
+;   andi a5,a2,127
+;   select_reg a0,zero,a4##condition=(a5 uge a3)
+;   select_reg a1,a4,a1##condition=(a5 uge a3)
 ;   ret
 ;
 ; Disassembled:
@@ -459,20 +464,21 @@ block0(v0: i128, v1: i32):
 ;   sub a3, a3, a5
 ;   sll a4, a0, a5
 ;   srl a0, a0, a3
-;   bnez a5, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a5, 0xc
 ;   mv a3, a0
+;   j 8
+;   mv a3, zero
 ;   sll a5, a1, a5
-;   or a5, a3, a5
+;   or a1, a3, a5
 ;   addi a3, zero, 0x40
-;   andi a2, a2, 0x7f
-;   bltu a2, a3, 0x10
+;   andi a5, a2, 0x7f
+;   bgeu a5, a3, 0xc
+;   mv a0, a4
+;   j 8
 ;   mv a0, zero
+;   bgeu a5, a3, 8
+;   j 8
 ;   mv a1, a4
-;   j 0xc
-;   mv a0, a4
-;   mv a1, a5
 ;   ret
 
 function %ishl_i128_i64(i128, i64) -> i128 {
@@ -488,12 +494,13 @@ block0(v0: i128, v1: i64):
 ;   sub a3,a3,a5
 ;   sll a4,a0,a5
 ;   srl a0,a0,a3
-;   select a3,zero,a0##condition=(a5 eq zero)
+;   select_reg a3,zero,a0##condition=(a5 eq zero)
 ;   sll a5,a1,a5
-;   or a5,a3,a5
+;   or a1,a3,a5
 ;   li a3,64
-;   andi a2,a2,127
-;   select [a0,a1],[zero,a4],[a4,a5]##condition=(a2 uge a3)
+;   andi a5,a2,127
+;   select_reg a0,zero,a4##condition=(a5 uge a3)
+;   select_reg a1,a4,a1##condition=(a5 uge a3)
 ;   ret
 ;
 ; Disassembled:
@@ -503,20 +510,21 @@ block0(v0: i128, v1: i64):
 ;   sub a3, a3, a5
 ;   sll a4, a0, a5
 ;   srl a0, a0, a3
-;   bnez a5, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a5, 0xc
 ;   mv a3, a0
+;   j 8
+;   mv a3, zero
 ;   sll a5, a1, a5
-;   or a5, a3, a5
+;   or a1, a3, a5
 ;   addi a3, zero, 0x40
-;   andi a2, a2, 0x7f
-;   bltu a2, a3, 0x10
+;   andi a5, a2, 0x7f
+;   bgeu a5, a3, 0xc
+;   mv a0, a4
+;   j 8
 ;   mv a0, zero
+;   bgeu a5, a3, 8
+;   j 8
 ;   mv a1, a4
-;   j 0xc
-;   mv a0, a4
-;   mv a1, a5
 ;   ret
 
 function %ishl_i128_i128(i128, i128) -> i128 {
@@ -534,12 +542,13 @@ block0(v0: i128, v1: i128):
 ;   mv a4,a5
 ;   sll a5,a4,a0
 ;   srl a3,a4,a3
-;   select a3,zero,a3##condition=(a0 eq zero)
+;   select_reg a3,zero,a3##condition=(a0 eq zero)
 ;   sll a0,a1,a0
-;   or a4,a3,a0
+;   or a1,a3,a0
 ;   li a3,64
 ;   andi a2,a2,127
-;   select [a0,a1],[zero,a5],[a5,a4]##condition=(a2 uge a3)
+;   select_reg a0,zero,a5##condition=(a2 uge a3)
+;   select_reg a1,a5,a1##condition=(a2 uge a3)
 ;   ret
 ;
 ; Disassembled:
@@ -551,17 +560,19 @@ block0(v0: i128, v1: i128):
 ;   mv a4, a5
 ;   sll a5, a4, a0
 ;   srl a3, a4, a3
-;   bnez a0, 8
+;   beqz a0, 8
+;   j 8
 ;   mv a3, zero
 ;   sll a0, a1, a0
-;   or a4, a3, a0
+;   or a1, a3, a0
 ;   addi a3, zero, 0x40
 ;   andi a2, a2, 0x7f
-;   bltu a2, a3, 0x10
+;   bgeu a2, a3, 0xc
+;   mv a0, a5
+;   j 8
 ;   mv a0, zero
+;   bgeu a2, a3, 8
+;   j 8
 ;   mv a1, a5
-;   j 0xc
-;   mv a0, a5
-;   mv a1, a4
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/issue-6954.clif b/cranelift/filetests/filetests/isa/riscv64/issue-6954.clif
index dbc320b54af8..6cce49e7f4f3 100644
--- a/cranelift/filetests/filetests/isa/riscv64/issue-6954.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/issue-6954.clif
@@ -119,168 +119,256 @@ block0(v0: i16, v1: f32, v2: f64x2, v3: i32, v4: i8, v5: i64x2, v6: i8, v7: f32x
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   addi sp,sp,-384
+;   sd s1,-8(sp)
+;   sd s2,-16(sp)
+;   sd s3,-24(sp)
+;   sd s4,-32(sp)
+;   sd s5,-40(sp)
+;   sd s6,-48(sp)
+;   sd s7,-56(sp)
+;   sd s8,-64(sp)
+;   sd s9,-72(sp)
+;   sd s10,-80(sp)
+;   sd s11,-88(sp)
+;   add sp,-480
 ; block0:
 ;   vle8.v v11,16(fp) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   vle8.v v15,32(fp) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   vle8.v v10,48(fp) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   vle8.v v12,64(fp) #avl=16, #vtype=(e8, m1, ta, ma)
-;   li a2,0
-;   li a3,0
 ;   li a4,0
 ;   li a0,0
-;   sd a4,0(nominal_sp)
-;   sd a0,8(nominal_sp)
-;   sd a4,16(nominal_sp)
-;   sd a0,24(nominal_sp)
-;   sd a4,32(nominal_sp)
-;   sd a0,40(nominal_sp)
-;   sd a4,48(nominal_sp)
-;   sd a0,56(nominal_sp)
-;   sd a4,64(nominal_sp)
-;   sd a0,72(nominal_sp)
-;   sd a4,80(nominal_sp)
-;   sd a0,88(nominal_sp)
-;   sd a4,96(nominal_sp)
-;   sd a0,104(nominal_sp)
-;   sd a4,112(nominal_sp)
-;   sw a3,120(nominal_sp)
-;   sh a2,124(nominal_sp)
-;   sd a4,128(nominal_sp)
-;   sd a0,136(nominal_sp)
-;   sd a4,144(nominal_sp)
-;   sd a0,152(nominal_sp)
-;   sd a4,160(nominal_sp)
-;   sd a0,168(nominal_sp)
-;   sd a4,176(nominal_sp)
-;   sd a0,184(nominal_sp)
-;   sd a4,192(nominal_sp)
-;   sd a0,200(nominal_sp)
-;   sd a4,208(nominal_sp)
-;   sd a0,216(nominal_sp)
-;   sd a4,224(nominal_sp)
-;   sd a0,232(nominal_sp)
-;   sd a4,240(nominal_sp)
-;   sw a3,248(nominal_sp)
-;   sh a2,252(nominal_sp)
-;   sd a4,256(nominal_sp)
-;   sd a0,264(nominal_sp)
-;   sd a4,272(nominal_sp)
-;   sd a0,280(nominal_sp)
-;   sd a4,288(nominal_sp)
-;   sd a0,296(nominal_sp)
-;   sd a4,304(nominal_sp)
-;   sd a0,312(nominal_sp)
-;   sd a4,320(nominal_sp)
-;   sd a0,328(nominal_sp)
-;   sd a4,336(nominal_sp)
-;   sd a0,344(nominal_sp)
-;   sd a4,352(nominal_sp)
-;   sd a0,360(nominal_sp)
-;   sd a4,368(nominal_sp)
-;   sw a3,376(nominal_sp)
-;   sh a2,380(nominal_sp)
-;   sext.w a4,a1
-;   select v12,v12,v12##condition=(a4 ne zero)
-;   sext.w a4,a1
-;   select v12,v12,v12##condition=(a4 ne zero)
-;   sext.w a4,a1
-;   select v13,v12,v12##condition=(a4 ne zero)
-;   vfsqrt.v v11,v11 #avl=2, #vtype=(e64, m1, ta, ma)
-;   lui a3,4095
-;   slli a0,a3,39
-;   fmv.d.x fa1,a0
-;   vfmv.v.f v12,fa1 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vmfne.vv v0,v11,v11 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vmerge.vvm v14,v11,v12,v0.t #avl=2, #vtype=(e64, m1, ta, ma)
-;   vfsqrt.v v11,v14 #avl=2, #vtype=(e64, m1, ta, ma)
-;   lui a3,4095
-;   slli a0,a3,39
-;   fmv.d.x fa1,a0
-;   vfmv.v.f v14,fa1 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vmfne.vv v0,v11,v11 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vmerge.vvm v12,v11,v14,v0.t #avl=2, #vtype=(e64, m1, ta, ma)
-;   sext.w a4,a1
-;   select v13,v13,v13##condition=(a4 ne zero)
-;   sext.w a4,a1
-;   select v13,v13,v13##condition=(a4 ne zero)
-;   sext.w a4,a1
-;   select v13,v13,v13##condition=(a4 ne zero)
-;   sext.w a4,a1
-;   select v13,v13,v13##condition=(a4 ne zero)
-;   sext.w a4,a1
-;   select v13,v13,v13##condition=(a4 ne zero)
-;   sext.w a4,a1
-;   select v13,v13,v13##condition=(a4 ne zero)
-;   sext.w a4,a1
-;   select v13,v13,v13##condition=(a4 ne zero)
-;   sext.w a4,a1
-;   select v13,v13,v13##condition=(a4 ne zero)
-;   addw a0,a1,a1
-;   select v11,v13,v13##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v13,v11,v11##condition=(a0 ne zero)
-;   vmax.vv v11,v15,v15 #avl=2, #vtype=(e64, m1, ta, ma)
-;   select v13,v13,v13##condition=(a0 ne zero)
-;   load_addr a1,3(nominal_sp)
-;   addi a1,a1,0
-;   andi a3,a1,3
-;   slli a2,a3,3
-;   andi a1,a1,-4
-;   atomic_rmw.i8 and a4,a5,(a1)##t0=a3 offset=a2
-;   mv a5,a4
-;   select v10,v13,v13##condition=(a0 ne zero)
-;   select v10,v10,v10##condition=(a0 ne zero)
-;   select v10,v10,v10##condition=(a0 ne zero)
-;   select v10,v10,v10##condition=(a0 ne zero)
-;   select v10,v10,v10##condition=(a0 ne zero)
-;   select v10,v10,v10##condition=(a0 ne zero)
-;   select v10,v10,v10##condition=(a0 ne zero)
-;   vse64.v v11,33(nominal_sp) #avl=2, #vtype=(e64, m1, ta, ma)
-;   select v11,v10,v10##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   select v11,v11,v11##condition=(a0 ne zero)
-;   vse8.v v12,0(a6) #avl=16, #vtype=(e8, m1, ta, ma)
-;   vse8.v v11,16(a6) #avl=16, #vtype=(e8, m1, ta, ma)
-;   vse8.v v12,32(a6) #avl=16, #vtype=(e8, m1, ta, ma)
-;   vse8.v v11,48(a6) #avl=16, #vtype=(e8, m1, ta, ma)
-;   vse8.v v11,64(a6) #avl=16, #vtype=(e8, m1, ta, ma)
-;   vse8.v v11,80(a6) #avl=16, #vtype=(e8, m1, ta, ma)
-;   vse8.v v11,96(a6) #avl=16, #vtype=(e8, m1, ta, ma)
-;   mv a0,a5
-;   addi sp,sp,384
+;   li a2,0
+;   li a3,0
+;   load_addr s4,0(nominal_sp)
+;   sd a2,0(s4)
+;   sd a3,8(s4)
+;   load_addr s6,16(nominal_sp)
+;   sd a2,0(s6)
+;   sd a3,8(s6)
+;   load_addr s8,32(nominal_sp)
+;   sd a2,0(s8)
+;   sd a3,8(s8)
+;   load_addr s10,48(nominal_sp)
+;   sd a2,0(s10)
+;   sd a3,8(s10)
+;   load_addr t0,64(nominal_sp)
+;   sd a2,0(t0)
+;   sd a3,8(t0)
+;   load_addr t2,80(nominal_sp)
+;   sd a2,0(t2)
+;   sd a3,8(t2)
+;   load_addr a7,96(nominal_sp)
+;   sd a2,0(a7)
+;   sd a3,8(a7)
+;   load_addr t4,112(nominal_sp)
+;   sd a2,0(t4)
+;   load_addr s1,120(nominal_sp)
+;   sw a0,0(s1)
+;   load_addr s2,124(nominal_sp)
+;   sh a4,0(s2)
+;   load_addr s3,128(nominal_sp)
+;   sd a2,0(s3)
+;   sd a3,8(s3)
+;   load_addr s5,144(nominal_sp)
+;   sd a2,0(s5)
+;   sd a3,8(s5)
+;   load_addr s7,160(nominal_sp)
+;   sd a2,0(s7)
+;   sd a3,8(s7)
+;   load_addr s9,176(nominal_sp)
+;   sd a2,0(s9)
+;   sd a3,8(s9)
+;   load_addr s11,192(nominal_sp)
+;   sd a2,0(s11)
+;   sd a3,8(s11)
+;   load_addr t1,208(nominal_sp)
+;   sd a2,0(t1)
+;   sd a3,8(t1)
+;   load_addr a7,224(nominal_sp)
+;   sd a2,0(a7)
+;   sd a3,8(a7)
+;   load_addr t3,240(nominal_sp)
+;   sd a2,0(t3)
+;   load_addr t4,248(nominal_sp)
+;   sw a0,0(t4)
+;   load_addr s1,252(nominal_sp)
+;   sh a4,0(s1)
+;   load_addr s2,256(nominal_sp)
+;   sd a2,0(s2)
+;   sd a3,8(s2)
+;   load_addr s4,272(nominal_sp)
+;   sd a2,0(s4)
+;   sd a3,8(s4)
+;   load_addr s6,288(nominal_sp)
+;   sd a2,0(s6)
+;   sd a3,8(s6)
+;   load_addr s8,304(nominal_sp)
+;   sd a2,0(s8)
+;   sd a3,8(s8)
+;   load_addr s10,320(nominal_sp)
+;   sd a2,0(s10)
+;   sd a3,8(s10)
+;   load_addr t0,336(nominal_sp)
+;   sd a2,0(t0)
+;   sd a3,8(t0)
+;   load_addr t2,352(nominal_sp)
+;   sd a2,0(t2)
+;   sd a3,8(t2)
+;   load_addr a3,368(nominal_sp)
+;   sd a2,0(a3)
+;   load_addr a2,376(nominal_sp)
+;   sw a0,0(a2)
+;   load_addr a0,380(nominal_sp)
+;   sh a4,0(a0)
+;   zext.w a0,a1
+;   select_i16x8 v8,v12,v12##condition=a0
+;   zext.w a0,a1
+;   select_i16x8 v10,v8,v8##condition=a0
+;   zext.w a0,a1
+;   select_i16x8 v9,v10,v10##condition=a0
+;   vfsqrt.v v8,v11 #avl=2, #vtype=(e64, m1, ta, ma)
+;   ld a0,[const(0)]
+;   fmv.d.x fa2,a0
+;   vfmv.v.f v10,fa2 #avl=2, #vtype=(e64, m1, ta, ma)
+;   vmfne.vv v0,v8,v8 #avl=2, #vtype=(e64, m1, ta, ma)
+;   vmerge.vvm v11,v8,v10,v0.t #avl=2, #vtype=(e64, m1, ta, ma)
+;   vfsqrt.v v10,v11 #avl=2, #vtype=(e64, m1, ta, ma)
+;   ld a0,[const(0)]
+;   fmv.d.x fa2,a0
+;   vfmv.v.f v11,fa2 #avl=2, #vtype=(e64, m1, ta, ma)
+;   vmfne.vv v0,v10,v10 #avl=2, #vtype=(e64, m1, ta, ma)
+;   vmerge.vvm v8,v10,v11,v0.t #avl=2, #vtype=(e64, m1, ta, ma)
+;   zext.w a0,a1
+;   select_i16x8 v10,v9,v9##condition=a0
+;   zext.w a0,a1
+;   select_i16x8 v9,v10,v10##condition=a0
+;   zext.w a0,a1
+;   select_i16x8 v10,v9,v9##condition=a0
+;   zext.w a0,a1
+;   select_i16x8 v9,v10,v10##condition=a0
+;   zext.w a0,a1
+;   select_i16x8 v10,v9,v9##condition=a0
+;   zext.w a0,a1
+;   select_i16x8 v9,v10,v10##condition=a0
+;   zext.w a0,a1
+;   select_i16x8 v10,v9,v9##condition=a0
+;   zext.w a0,a1
+;   select_i16x8 v9,v10,v10##condition=a0
+;   add a1,a1,a1
+;   zext.w a0,a1
+;   select_i16x8 v10,v9,v9##condition=a0
+;   zext.w a0,a1
+;   select_i16x8 v9,v10,v10##condition=a0
+;   zext.w a0,a1
+;   select_i16x8 v10,v9,v9##condition=a0
+;   zext.w a0,a1
+;   select_i16x8 v9,v10,v10##condition=a0
+;   zext.w a0,a1
+;   select_i16x8 v10,v9,v9##condition=a0
+;   vmax.vv v15,v15,v15 #avl=2, #vtype=(e64, m1, ta, ma)
+;   zext.w a0,a1
+;   select_i16x8 v9,v10,v10##condition=a0
+;   load_addr a2,3(nominal_sp)
+;   addi a2,a2,0
+;   andi a0,a2,3
+;   slli a3,a0,3
+;   andi a4,a2,-4
+;   atomic_rmw.i8 and a0,a5,(a4)##t0=a2 offset=a3
+;   zext.w a5,a1
+;   select_i16x8 v10,v9,v9##condition=a5
+;   zext.w a5,a1
+;   select_i16x8 v9,v10,v10##condition=a5
+;   zext.w a5,a1
+;   select_i16x8 v10,v9,v9##condition=a5
+;   zext.w a5,a1
+;   select_i16x8 v9,v10,v10##condition=a5
+;   zext.w a5,a1
+;   select_i16x8 v10,v9,v9##condition=a5
+;   zext.w a5,a1
+;   select_i16x8 v11,v10,v10##condition=a5
+;   zext.w a5,a1
+;   select_i16x8 v9,v11,v11##condition=a5
+;   load_addr a2,33(nominal_sp)
+;   vse64.v v15,0(a2) #avl=2, #vtype=(e64, m1, ta, ma)
+;   zext.w a2,a1
+;   select_i16x8 v10,v9,v9##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v9,v10,v10##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v10,v9,v9##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v9,v10,v10##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v10,v9,v9##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v9,v10,v10##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v10,v9,v9##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v9,v10,v10##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v10,v9,v9##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v9,v10,v10##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v10,v9,v9##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v9,v10,v10##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v10,v9,v9##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v9,v10,v10##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v10,v9,v9##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v9,v10,v10##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v10,v9,v9##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v9,v10,v10##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v10,v9,v9##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v9,v10,v10##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v10,v9,v9##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v9,v10,v10##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v10,v9,v9##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v9,v10,v10##condition=a2
+;   zext.w a2,a1
+;   select_i16x8 v10,v9,v9##condition=a2
+;   zext.w a1,a1
+;   select_i16x8 v9,v10,v10##condition=a1
+;   vse8.v v8,0(a6) #avl=16, #vtype=(e8, m1, ta, ma)
+;   vse8.v v9,16(a6) #avl=16, #vtype=(e8, m1, ta, ma)
+;   vse8.v v8,32(a6) #avl=16, #vtype=(e8, m1, ta, ma)
+;   vse8.v v9,48(a6) #avl=16, #vtype=(e8, m1, ta, ma)
+;   vse8.v v9,64(a6) #avl=16, #vtype=(e8, m1, ta, ma)
+;   vse8.v v9,80(a6) #avl=16, #vtype=(e8, m1, ta, ma)
+;   vse8.v v9,96(a6) #avl=16, #vtype=(e8, m1, ta, ma)
+;   add sp,+480
+;   ld s1,-8(sp)
+;   ld s2,-16(sp)
+;   ld s3,-24(sp)
+;   ld s4,-32(sp)
+;   ld s5,-40(sp)
+;   ld s6,-48(sp)
+;   ld s7,-56(sp)
+;   ld s8,-64(sp)
+;   ld s9,-72(sp)
+;   ld s10,-80(sp)
+;   ld s11,-88(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -289,8 +377,19 @@ block0(v0: i16, v1: f32, v2: f64x2, v3: i32, v4: i8, v5: i64x2, v6: i8, v7: f32x
 ;   sd ra, 8(sp)
 ;   sd s0, 0(sp)
 ;   mv s0, sp
-;   addi sp, sp, -0x180
-; block1: ; offset 0x14
+;   sd s1, -8(sp)
+;   sd s2, -0x10(sp)
+;   sd s3, -0x18(sp)
+;   sd s4, -0x20(sp)
+;   sd s5, -0x28(sp)
+;   sd s6, -0x30(sp)
+;   sd s7, -0x38(sp)
+;   sd s8, -0x40(sp)
+;   sd s9, -0x48(sp)
+;   sd s10, -0x50(sp)
+;   sd s11, -0x58(sp)
+;   addi sp, sp, -0x1e0
+; block1: ; offset 0x40
 ;   .byte 0x57, 0x70, 0x08, 0xcc
 ;   addi t6, s0, 0x10
 ;   .byte 0x87, 0x85, 0x0f, 0x02
@@ -300,149 +399,409 @@ block0(v0: i16, v1: f32, v2: f64x2, v3: i32, v4: i8, v5: i64x2, v6: i8, v7: f32x
 ;   .byte 0x07, 0x85, 0x0f, 0x02
 ;   addi t6, s0, 0x40
 ;   .byte 0x07, 0x86, 0x0f, 0x02
-;   mv a2, zero
-;   mv a3, zero
 ;   mv a4, zero
 ;   mv a0, zero
-;   sd a4, 0(sp)
-;   sd a0, 8(sp)
-;   sd a4, 0x10(sp)
-;   sd a0, 0x18(sp)
-;   sd a4, 0x20(sp)
-;   sd a0, 0x28(sp)
-;   sd a4, 0x30(sp)
-;   sd a0, 0x38(sp)
-;   sd a4, 0x40(sp)
-;   sd a0, 0x48(sp)
-;   sd a4, 0x50(sp)
-;   sd a0, 0x58(sp)
-;   sd a4, 0x60(sp)
-;   sd a0, 0x68(sp)
-;   sd a4, 0x70(sp)
-;   sw a3, 0x78(sp)
-;   sh a2, 0x7c(sp)
-;   sd a4, 0x80(sp)
-;   sd a0, 0x88(sp)
-;   sd a4, 0x90(sp)
-;   sd a0, 0x98(sp)
-;   sd a4, 0xa0(sp)
-;   sd a0, 0xa8(sp)
-;   sd a4, 0xb0(sp)
-;   sd a0, 0xb8(sp)
-;   sd a4, 0xc0(sp)
-;   sd a0, 0xc8(sp)
-;   sd a4, 0xd0(sp)
-;   sd a0, 0xd8(sp)
-;   sd a4, 0xe0(sp)
-;   sd a0, 0xe8(sp)
-;   sd a4, 0xf0(sp)
-;   sw a3, 0xf8(sp)
-;   sh a2, 0xfc(sp)
-;   sd a4, 0x100(sp)
-;   sd a0, 0x108(sp)
-;   sd a4, 0x110(sp)
-;   sd a0, 0x118(sp)
-;   sd a4, 0x120(sp)
-;   sd a0, 0x128(sp)
-;   sd a4, 0x130(sp)
-;   sd a0, 0x138(sp)
-;   sd a4, 0x140(sp)
-;   sd a0, 0x148(sp)
-;   sd a4, 0x150(sp)
-;   sd a0, 0x158(sp)
-;   sd a4, 0x160(sp)
-;   sd a0, 0x168(sp)
-;   sd a4, 0x170(sp)
-;   sw a3, 0x178(sp)
-;   sh a2, 0x17c(sp)
-;   sext.w a4, a1
-;   sext.w a4, a1
-;   sext.w a4, a1
-;   beqz a4, 0xc
-;   .byte 0xd7, 0x36, 0xc0, 0x9e
-;   j 8
-;   .byte 0xd7, 0x36, 0xc0, 0x9e
+;   mv a2, zero
+;   mv a3, zero
+;   mv s4, sp
+;   sd a2, 0(s4)
+;   sd a3, 8(s4)
+;   addi s6, sp, 0x10
+;   sd a2, 0(s6)
+;   sd a3, 8(s6)
+;   addi s8, sp, 0x20
+;   sd a2, 0(s8)
+;   sd a3, 8(s8)
+;   addi s10, sp, 0x30
+;   sd a2, 0(s10)
+;   sd a3, 8(s10)
+;   addi t0, sp, 0x40
+;   sd a2, 0(t0)
+;   sd a3, 8(t0)
+;   addi t2, sp, 0x50
+;   sd a2, 0(t2)
+;   sd a3, 8(t2)
+;   addi a7, sp, 0x60
+;   sd a2, 0(a7)
+;   sd a3, 8(a7)
+;   addi t4, sp, 0x70
+;   sd a2, 0(t4)
+;   addi s1, sp, 0x78
+;   sw a0, 0(s1)
+;   addi s2, sp, 0x7c
+;   sh a4, 0(s2)
+;   addi s3, sp, 0x80
+;   sd a2, 0(s3)
+;   sd a3, 8(s3)
+;   addi s5, sp, 0x90
+;   sd a2, 0(s5)
+;   sd a3, 8(s5)
+;   addi s7, sp, 0xa0
+;   sd a2, 0(s7)
+;   sd a3, 8(s7)
+;   addi s9, sp, 0xb0
+;   sd a2, 0(s9)
+;   sd a3, 8(s9)
+;   addi s11, sp, 0xc0
+;   sd a2, 0(s11)
+;   sd a3, 8(s11)
+;   addi t1, sp, 0xd0
+;   sd a2, 0(t1)
+;   sd a3, 8(t1)
+;   addi a7, sp, 0xe0
+;   sd a2, 0(a7)
+;   sd a3, 8(a7)
+;   addi t3, sp, 0xf0
+;   sd a2, 0(t3)
+;   addi t4, sp, 0xf8
+;   sw a0, 0(t4)
+;   addi s1, sp, 0xfc
+;   sh a4, 0(s1)
+;   addi s2, sp, 0x100
+;   sd a2, 0(s2)
+;   sd a3, 8(s2)
+;   addi s4, sp, 0x110
+;   sd a2, 0(s4)
+;   sd a3, 8(s4)
+;   addi s6, sp, 0x120
+;   sd a2, 0(s6)
+;   sd a3, 8(s6)
+;   addi s8, sp, 0x130
+;   sd a2, 0(s8)
+;   sd a3, 8(s8)
+;   addi s10, sp, 0x140
+;   sd a2, 0(s10)
+;   sd a3, 8(s10)
+;   addi t0, sp, 0x150
+;   sd a2, 0(t0)
+;   sd a3, 8(t0)
+;   addi t2, sp, 0x160
+;   sd a2, 0(t2)
+;   sd a3, 8(t2)
+;   addi a3, sp, 0x170
+;   sd a2, 0(a3)
+;   addi a2, sp, 0x178
+;   sw a0, 0(a2)
+;   addi a0, sp, 0x17c
+;   sh a4, 0(a0)
+;   .byte 0x3b, 0x85, 0x05, 0x08
+;   beqz a0, 0xc
+;   .byte 0x57, 0x34, 0xc0, 0x9e
+;   j 8
+;   .byte 0x57, 0x34, 0xc0, 0x9e
+;   .byte 0x3b, 0x85, 0x05, 0x08
+;   beqz a0, 0xc
+;   .byte 0x57, 0x35, 0x80, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x80, 0x9e
+;   .byte 0x3b, 0x85, 0x05, 0x08
+;   beqz a0, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
 ;   .byte 0x57, 0x70, 0x81, 0xcd
-;   .byte 0xd7, 0x15, 0xb0, 0x4e
-;   lui a3, 0xfff
-;   slli a0, a3, 0x27
-;   fmv.d.x fa1, a0
-;   .byte 0x57, 0xd6, 0x05, 0x5e
-;   .byte 0x57, 0x90, 0xb5, 0x72
-;   .byte 0x57, 0x07, 0xb6, 0x5c
-;   .byte 0xd7, 0x15, 0xe0, 0x4e
-;   lui a3, 0xfff
-;   slli a0, a3, 0x27
-;   fmv.d.x fa1, a0
-;   .byte 0x57, 0xd7, 0x05, 0x5e
-;   .byte 0x57, 0x90, 0xb5, 0x72
-;   .byte 0x57, 0x06, 0xb7, 0x5c
-;   sext.w a4, a1
-;   sext.w a4, a1
-;   sext.w a4, a1
-;   sext.w a4, a1
-;   sext.w a4, a1
-;   sext.w a4, a1
-;   sext.w a4, a1
-;   sext.w a4, a1
-;   addw a0, a1, a1
+;   .byte 0x57, 0x14, 0xb0, 0x4e
+;   auipc a0, 0
+;   ld a0, 0x4b4(a0)
+;   fmv.d.x fa2, a0
+;   .byte 0x57, 0x55, 0x06, 0x5e
+;   .byte 0x57, 0x10, 0x84, 0x72
+;   .byte 0xd7, 0x05, 0x85, 0x5c
+;   .byte 0x57, 0x15, 0xb0, 0x4e
+;   auipc a0, 0
+;   ld a0, 0x498(a0)
+;   fmv.d.x fa2, a0
+;   .byte 0xd7, 0x55, 0x06, 0x5e
+;   .byte 0x57, 0x10, 0xa5, 0x72
+;   .byte 0x57, 0x84, 0xa5, 0x5c
+;   .byte 0x3b, 0x85, 0x05, 0x08
+;   beqz a0, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0x3b, 0x85, 0x05, 0x08
+;   beqz a0, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0x3b, 0x85, 0x05, 0x08
+;   beqz a0, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0x3b, 0x85, 0x05, 0x08
+;   beqz a0, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0x3b, 0x85, 0x05, 0x08
+;   beqz a0, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0x3b, 0x85, 0x05, 0x08
+;   beqz a0, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0x3b, 0x85, 0x05, 0x08
+;   beqz a0, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0x3b, 0x85, 0x05, 0x08
+;   beqz a0, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   add a1, a1, a1
+;   .byte 0x3b, 0x85, 0x05, 0x08
+;   beqz a0, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0x3b, 0x85, 0x05, 0x08
+;   beqz a0, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0x3b, 0x85, 0x05, 0x08
+;   beqz a0, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0x3b, 0x85, 0x05, 0x08
 ;   beqz a0, 0xc
-;   .byte 0xd7, 0x35, 0xd0, 0x9e
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
 ;   j 8
-;   .byte 0xd7, 0x35, 0xd0, 0x9e
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0x3b, 0x85, 0x05, 0x08
 ;   beqz a0, 0xc
-;   .byte 0xd7, 0x36, 0xb0, 0x9e
-;   j 8
-;   .byte 0xd7, 0x36, 0xb0, 0x9e
-;   .byte 0xd7, 0x85, 0xf7, 0x1e
-;   addi a1, sp, 3
-;   mv a1, a1
-;   andi a3, a1, 3
-;   slli a2, a3, 3
-;   andi a1, a1, -4
-;   lr.w.aqrl a4, (a1)
-;   srl a4, a4, a2
-;   andi a4, a4, 0xff
-;   and a3, a4, a5
-;   lr.w.aqrl t5, (a1)
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0xd7, 0x87, 0xf7, 0x1e
+;   .byte 0x3b, 0x85, 0x05, 0x08
+;   beqz a0, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   addi a2, sp, 3
+;   mv a2, a2
+;   andi a0, a2, 3
+;   slli a3, a0, 3
+;   andi a4, a2, -4
+;   lr.w.aqrl a0, (a4)
+;   srl a0, a0, a3
+;   andi a0, a0, 0xff
+;   and a2, a0, a5
+;   lr.w.aqrl t5, (a4)
 ;   addi t6, zero, 0xff
-;   sll t6, t6, a2
+;   sll t6, t6, a3
 ;   not t6, t6
 ;   and t5, t5, t6
-;   andi t6, a3, 0xff
-;   sll t6, t6, a2
+;   andi t6, a2, 0xff
+;   sll t6, t6, a3
 ;   or t5, t5, t6
-;   sc.w.aqrl a3, t5, (a1)
-;   bnez a3, -0x34
-;   mv a5, a4
-;   beqz a0, 0xc
-;   .byte 0x57, 0x35, 0xd0, 0x9e
+;   sc.w.aqrl a2, t5, (a4)
+;   bnez a2, -0x34
+;   .byte 0xbb, 0x87, 0x05, 0x08
+;   beqz a5, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
 ;   j 8
-;   .byte 0x57, 0x35, 0xd0, 0x9e
-;   addi t6, sp, 0x21
-;   .byte 0xa7, 0xf5, 0x0f, 0x02
-;   beqz a0, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0xbb, 0x87, 0x05, 0x08
+;   beqz a5, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0xbb, 0x87, 0x05, 0x08
+;   beqz a5, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0xbb, 0x87, 0x05, 0x08
+;   beqz a5, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0xbb, 0x87, 0x05, 0x08
+;   beqz a5, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0xbb, 0x87, 0x05, 0x08
+;   beqz a5, 0xc
 ;   .byte 0xd7, 0x35, 0xa0, 0x9e
 ;   j 8
 ;   .byte 0xd7, 0x35, 0xa0, 0x9e
+;   .byte 0xbb, 0x87, 0x05, 0x08
+;   beqz a5, 0xc
+;   .byte 0xd7, 0x34, 0xb0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xb0, 0x9e
+;   addi a2, sp, 0x21
+;   .byte 0xa7, 0x77, 0x06, 0x02
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   .byte 0x3b, 0x86, 0x05, 0x08
+;   beqz a2, 0xc
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   j 8
+;   .byte 0x57, 0x35, 0x90, 0x9e
+;   .byte 0xbb, 0x85, 0x05, 0x08
+;   beqz a1, 0xc
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   j 8
+;   .byte 0xd7, 0x34, 0xa0, 0x9e
 ;   .byte 0x57, 0x70, 0x08, 0xcc
-;   .byte 0x27, 0x06, 0x08, 0x02
+;   .byte 0x27, 0x04, 0x08, 0x02
 ;   addi t6, a6, 0x10
-;   .byte 0xa7, 0x85, 0x0f, 0x02
+;   .byte 0xa7, 0x84, 0x0f, 0x02
 ;   addi t6, a6, 0x20
-;   .byte 0x27, 0x86, 0x0f, 0x02
+;   .byte 0x27, 0x84, 0x0f, 0x02
 ;   addi t6, a6, 0x30
-;   .byte 0xa7, 0x85, 0x0f, 0x02
+;   .byte 0xa7, 0x84, 0x0f, 0x02
 ;   addi t6, a6, 0x40
-;   .byte 0xa7, 0x85, 0x0f, 0x02
+;   .byte 0xa7, 0x84, 0x0f, 0x02
 ;   addi t6, a6, 0x50
-;   .byte 0xa7, 0x85, 0x0f, 0x02
+;   .byte 0xa7, 0x84, 0x0f, 0x02
 ;   addi t6, a6, 0x60
-;   .byte 0xa7, 0x85, 0x0f, 0x02
-;   mv a0, a5
-;   addi sp, sp, 0x180
+;   .byte 0xa7, 0x84, 0x0f, 0x02
+;   addi sp, sp, 0x1e0
+;   ld s1, -8(sp)
+;   ld s2, -0x10(sp)
+;   ld s3, -0x18(sp)
+;   ld s4, -0x20(sp)
+;   ld s5, -0x28(sp)
+;   ld s6, -0x30(sp)
+;   ld s7, -0x38(sp)
+;   ld s8, -0x40(sp)
+;   ld s9, -0x48(sp)
+;   ld s10, -0x50(sp)
+;   ld s11, -0x58(sp)
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
 ;   addi sp, sp, 0x10
 ;   ret
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0xf8, 0x7f
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/narrow-arithmetic.clif b/cranelift/filetests/filetests/isa/riscv64/narrow-arithmetic.clif
index 05b39aeea943..6223052f8bff 100644
--- a/cranelift/filetests/filetests/isa/riscv64/narrow-arithmetic.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/narrow-arithmetic.clif
@@ -10,12 +10,12 @@ block0(v0: i8, v1: i8):
 
 ; VCode:
 ; block0:
-;   addw a0,a0,a1
+;   add a0,a0,a1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addw a0, a0, a1
+;   add a0, a0, a1
 ;   ret
 
 function %add16(i16, i16) -> i16 {
@@ -26,12 +26,12 @@ block0(v0: i16, v1: i16):
 
 ; VCode:
 ; block0:
-;   addw a0,a0,a1
+;   add a0,a0,a1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addw a0, a0, a1
+;   add a0, a0, a1
 ;   ret
 
 function %add32(i32, i32) -> i32 {
@@ -42,12 +42,12 @@ block0(v0: i32, v1: i32):
 
 ; VCode:
 ; block0:
-;   addw a0,a0,a1
+;   add a0,a0,a1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addw a0, a0, a1
+;   add a0, a0, a1
 ;   ret
 
 function %add32_8(i32, i8) -> i32 {
@@ -61,14 +61,14 @@ block0(v0: i32, v1: i8):
 ; block0:
 ;   slli a4,a1,56
 ;   srai a1,a4,56
-;   addw a0,a0,a1
+;   add a0,a0,a1
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   slli a4, a1, 0x38
 ;   srai a1, a4, 0x38
-;   addw a0, a0, a1
+;   add a0, a0, a1
 ;   ret
 
 function %add64_32(i64, i32) -> i64 {
diff --git a/cranelift/filetests/filetests/isa/riscv64/popcnt.clif b/cranelift/filetests/filetests/isa/riscv64/popcnt.clif
deleted file mode 100644
index cb4b2847d861..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/popcnt.clif
+++ /dev/null
@@ -1,94 +0,0 @@
-test compile precise-output
-set unwind_info=false
-target riscv64 has_zbb
-
-function %popcnt8(i8) -> i8 {
-block0(v0: i8):
-    v1 = popcnt v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   andi a2,a0,255
-;   cpop a0,a2
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   andi a2, a0, 0xff
-;   .byte 0x13, 0x15, 0x26, 0x60
-;   ret
-
-function %popcnt16(i16) -> i16 {
-block0(v0: i16):
-    v1 = popcnt v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   zext.h a2,a0
-;   cpop a0,a2
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x3b, 0x46, 0x05, 0x08
-;   .byte 0x13, 0x15, 0x26, 0x60
-;   ret
-
-function %popcnt32(i32) -> i32 {
-block0(v0: i32):
-    v1 = popcnt v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   cpopw a0,a0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x1b, 0x15, 0x25, 0x60
-;   ret
-
-function %popcnt64(i64) -> i64 {
-block0(v0: i64):
-    v1 = popcnt v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   cpop a0,a0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x13, 0x15, 0x25, 0x60
-;   ret
-
-function %popcnt128(i128) -> i128 {
-block0(v0: i128):
-    v1 = popcnt v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   cpop a3,a0
-;   cpop a5,a1
-;   add a0,a3,a5
-;   li a1,0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x93, 0x16, 0x25, 0x60
-;   .byte 0x93, 0x97, 0x25, 0x60
-;   add a0, a3, a5
-;   mv a1, zero
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/prologue.clif b/cranelift/filetests/filetests/isa/riscv64/prologue.clif
index 9a611af5d50e..1d865a133a52 100644
--- a/cranelift/filetests/filetests/isa/riscv64/prologue.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/prologue.clif
@@ -76,7 +76,7 @@ block0(v0: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -91,71 +91,71 @@ block0(v0: f64):
 ;   fsd fs9,-72(sp)
 ;   fsd fs10,-80(sp)
 ;   fsd fs11,-88(sp)
-;   addi sp,sp,-96
+;   add sp,-96
 ; block0:
-;   fadd.d fa3,fa0,fa0,rne
-;   fadd.d fa4,fa0,fa0,rne
-;   fadd.d fa5,fa0,fa0,rne
-;   fadd.d fa1,fa0,fa0,rne
-;   fadd.d fa2,fa0,fa0,rne
-;   fadd.d ft9,fa0,fa0,rne
-;   fadd.d ft10,fa0,fa0,rne
-;   fadd.d ft11,fa0,fa0,rne
-;   fadd.d fs0,fa0,fa0,rne
-;   fadd.d fs1,fa0,fa0,rne
-;   fadd.d fs2,fa0,fa0,rne
-;   fadd.d fs3,fa0,fa0,rne
-;   fadd.d fs4,fa0,fa0,rne
-;   fadd.d fs5,fa0,fa0,rne
-;   fadd.d fs6,fa0,fa0,rne
-;   fadd.d fs7,fa0,fa0,rne
-;   fadd.d fs8,fa0,fa0,rne
-;   fadd.d fs9,fa0,fa0,rne
-;   fadd.d fs10,fa0,fa0,rne
-;   fadd.d fs11,fa0,fa0,rne
-;   fadd.d ft0,fa0,fa0,rne
-;   fadd.d ft1,fa0,fa0,rne
-;   fadd.d ft2,fa0,fa0,rne
-;   fadd.d ft3,fa0,fa0,rne
-;   fadd.d ft4,fa0,fa0,rne
-;   fadd.d ft5,fa0,fa0,rne
-;   fadd.d ft6,fa0,fa0,rne
-;   fadd.d ft7,fa0,fa0,rne
-;   fadd.d fa6,fa0,fa0,rne
-;   fadd.d fa7,fa0,fa0,rne
-;   fadd.d ft8,fa0,fa0,rne
-;   fadd.d fa3,fa0,fa3,rne
-;   fadd.d fa4,fa4,fa5,rne
-;   fadd.d fa5,fa1,fa2,rne
-;   fadd.d fa0,ft9,ft10,rne
-;   fadd.d fa1,ft11,fs0,rne
-;   fadd.d fa2,fs1,fs2,rne
-;   fadd.d ft9,fs3,fs4,rne
-;   fadd.d ft10,fs5,fs6,rne
-;   fadd.d ft11,fs7,fs8,rne
-;   fadd.d fs0,fs9,fs10,rne
-;   fadd.d fs1,fs11,ft0,rne
-;   fadd.d fs2,ft1,ft2,rne
-;   fadd.d fs3,ft3,ft4,rne
-;   fadd.d fs4,ft5,ft6,rne
-;   fadd.d fs5,ft7,fa6,rne
-;   fadd.d fs6,fa7,ft8,rne
-;   fadd.d fa3,fa3,fa4,rne
-;   fadd.d fa4,fa5,fa0,rne
-;   fadd.d fa5,fa1,fa2,rne
-;   fadd.d fa0,ft9,ft10,rne
-;   fadd.d fa1,ft11,fs0,rne
-;   fadd.d fa2,fs1,fs2,rne
-;   fadd.d ft9,fs3,fs4,rne
-;   fadd.d ft10,fs5,fs6,rne
-;   fadd.d fa3,fa3,fa4,rne
-;   fadd.d fa4,fa5,fa0,rne
-;   fadd.d fa5,fa1,fa2,rne
-;   fadd.d fa0,ft9,ft10,rne
-;   fadd.d fa3,fa3,fa4,rne
-;   fadd.d fa4,fa5,fa0,rne
-;   fadd.d fa0,fa3,fa4,rne
-;   addi sp,sp,96
+;   fadd.d fa3,fa0,fa0
+;   fadd.d fa4,fa0,fa0
+;   fadd.d fa5,fa0,fa0
+;   fadd.d fa1,fa0,fa0
+;   fadd.d fa2,fa0,fa0
+;   fadd.d ft9,fa0,fa0
+;   fadd.d ft10,fa0,fa0
+;   fadd.d ft11,fa0,fa0
+;   fadd.d fs0,fa0,fa0
+;   fadd.d fs1,fa0,fa0
+;   fadd.d fs2,fa0,fa0
+;   fadd.d fs3,fa0,fa0
+;   fadd.d fs4,fa0,fa0
+;   fadd.d fs5,fa0,fa0
+;   fadd.d fs6,fa0,fa0
+;   fadd.d fs7,fa0,fa0
+;   fadd.d fs8,fa0,fa0
+;   fadd.d fs9,fa0,fa0
+;   fadd.d fs10,fa0,fa0
+;   fadd.d fs11,fa0,fa0
+;   fadd.d ft0,fa0,fa0
+;   fadd.d ft1,fa0,fa0
+;   fadd.d ft2,fa0,fa0
+;   fadd.d ft3,fa0,fa0
+;   fadd.d ft4,fa0,fa0
+;   fadd.d ft5,fa0,fa0
+;   fadd.d ft6,fa0,fa0
+;   fadd.d ft7,fa0,fa0
+;   fadd.d fa6,fa0,fa0
+;   fadd.d fa7,fa0,fa0
+;   fadd.d ft8,fa0,fa0
+;   fadd.d fa3,fa0,fa3
+;   fadd.d fa4,fa4,fa5
+;   fadd.d fa5,fa1,fa2
+;   fadd.d fa0,ft9,ft10
+;   fadd.d fa1,ft11,fs0
+;   fadd.d fa2,fs1,fs2
+;   fadd.d ft9,fs3,fs4
+;   fadd.d ft10,fs5,fs6
+;   fadd.d ft11,fs7,fs8
+;   fadd.d fs0,fs9,fs10
+;   fadd.d fs1,fs11,ft0
+;   fadd.d fs2,ft1,ft2
+;   fadd.d fs3,ft3,ft4
+;   fadd.d fs4,ft5,ft6
+;   fadd.d fs5,ft7,fa6
+;   fadd.d fs6,fa7,ft8
+;   fadd.d fa3,fa3,fa4
+;   fadd.d fa4,fa5,fa0
+;   fadd.d fa5,fa1,fa2
+;   fadd.d fa0,ft9,ft10
+;   fadd.d fa1,ft11,fs0
+;   fadd.d fa2,fs1,fs2
+;   fadd.d ft9,fs3,fs4
+;   fadd.d ft10,fs5,fs6
+;   fadd.d fa3,fa3,fa4
+;   fadd.d fa4,fa5,fa0
+;   fadd.d fa5,fa1,fa2
+;   fadd.d fa0,ft9,ft10
+;   fadd.d fa3,fa3,fa4
+;   fadd.d fa4,fa5,fa0
+;   fadd.d fa0,fa3,fa4
+;   add sp,+96
 ;   fld fs0,-8(sp)
 ;   fld fs2,-16(sp)
 ;   fld fs3,-24(sp)
@@ -169,7 +169,7 @@ block0(v0: f64):
 ;   fld fs11,-88(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -191,68 +191,68 @@ block0(v0: f64):
 ;   fsd fs11, -0x58(sp)
 ;   addi sp, sp, -0x60
 ; block1: ; offset 0x40
-;   fadd.d fa3, fa0, fa0, rne
-;   fadd.d fa4, fa0, fa0, rne
-;   fadd.d fa5, fa0, fa0, rne
-;   fadd.d fa1, fa0, fa0, rne
-;   fadd.d fa2, fa0, fa0, rne
-;   fadd.d ft9, fa0, fa0, rne
-;   fadd.d ft10, fa0, fa0, rne
-;   fadd.d ft11, fa0, fa0, rne
-;   fadd.d fs0, fa0, fa0, rne
-;   fadd.d fs1, fa0, fa0, rne
-;   fadd.d fs2, fa0, fa0, rne
-;   fadd.d fs3, fa0, fa0, rne
-;   fadd.d fs4, fa0, fa0, rne
-;   fadd.d fs5, fa0, fa0, rne
-;   fadd.d fs6, fa0, fa0, rne
-;   fadd.d fs7, fa0, fa0, rne
-;   fadd.d fs8, fa0, fa0, rne
-;   fadd.d fs9, fa0, fa0, rne
-;   fadd.d fs10, fa0, fa0, rne
-;   fadd.d fs11, fa0, fa0, rne
-;   fadd.d ft0, fa0, fa0, rne
-;   fadd.d ft1, fa0, fa0, rne
-;   fadd.d ft2, fa0, fa0, rne
-;   fadd.d ft3, fa0, fa0, rne
-;   fadd.d ft4, fa0, fa0, rne
-;   fadd.d ft5, fa0, fa0, rne
-;   fadd.d ft6, fa0, fa0, rne
-;   fadd.d ft7, fa0, fa0, rne
-;   fadd.d fa6, fa0, fa0, rne
-;   fadd.d fa7, fa0, fa0, rne
-;   fadd.d ft8, fa0, fa0, rne
-;   fadd.d fa3, fa0, fa3, rne
-;   fadd.d fa4, fa4, fa5, rne
-;   fadd.d fa5, fa1, fa2, rne
-;   fadd.d fa0, ft9, ft10, rne
-;   fadd.d fa1, ft11, fs0, rne
-;   fadd.d fa2, fs1, fs2, rne
-;   fadd.d ft9, fs3, fs4, rne
-;   fadd.d ft10, fs5, fs6, rne
-;   fadd.d ft11, fs7, fs8, rne
-;   fadd.d fs0, fs9, fs10, rne
-;   fadd.d fs1, fs11, ft0, rne
-;   fadd.d fs2, ft1, ft2, rne
-;   fadd.d fs3, ft3, ft4, rne
-;   fadd.d fs4, ft5, ft6, rne
-;   fadd.d fs5, ft7, fa6, rne
-;   fadd.d fs6, fa7, ft8, rne
-;   fadd.d fa3, fa3, fa4, rne
-;   fadd.d fa4, fa5, fa0, rne
-;   fadd.d fa5, fa1, fa2, rne
-;   fadd.d fa0, ft9, ft10, rne
-;   fadd.d fa1, ft11, fs0, rne
-;   fadd.d fa2, fs1, fs2, rne
-;   fadd.d ft9, fs3, fs4, rne
-;   fadd.d ft10, fs5, fs6, rne
-;   fadd.d fa3, fa3, fa4, rne
-;   fadd.d fa4, fa5, fa0, rne
-;   fadd.d fa5, fa1, fa2, rne
-;   fadd.d fa0, ft9, ft10, rne
-;   fadd.d fa3, fa3, fa4, rne
-;   fadd.d fa4, fa5, fa0, rne
-;   fadd.d fa0, fa3, fa4, rne
+;   fadd.d fa3, fa0, fa0
+;   fadd.d fa4, fa0, fa0
+;   fadd.d fa5, fa0, fa0
+;   fadd.d fa1, fa0, fa0
+;   fadd.d fa2, fa0, fa0
+;   fadd.d ft9, fa0, fa0
+;   fadd.d ft10, fa0, fa0
+;   fadd.d ft11, fa0, fa0
+;   fadd.d fs0, fa0, fa0
+;   fadd.d fs1, fa0, fa0
+;   fadd.d fs2, fa0, fa0
+;   fadd.d fs3, fa0, fa0
+;   fadd.d fs4, fa0, fa0
+;   fadd.d fs5, fa0, fa0
+;   fadd.d fs6, fa0, fa0
+;   fadd.d fs7, fa0, fa0
+;   fadd.d fs8, fa0, fa0
+;   fadd.d fs9, fa0, fa0
+;   fadd.d fs10, fa0, fa0
+;   fadd.d fs11, fa0, fa0
+;   fadd.d ft0, fa0, fa0
+;   fadd.d ft1, fa0, fa0
+;   fadd.d ft2, fa0, fa0
+;   fadd.d ft3, fa0, fa0
+;   fadd.d ft4, fa0, fa0
+;   fadd.d ft5, fa0, fa0
+;   fadd.d ft6, fa0, fa0
+;   fadd.d ft7, fa0, fa0
+;   fadd.d fa6, fa0, fa0
+;   fadd.d fa7, fa0, fa0
+;   fadd.d ft8, fa0, fa0
+;   fadd.d fa3, fa0, fa3
+;   fadd.d fa4, fa4, fa5
+;   fadd.d fa5, fa1, fa2
+;   fadd.d fa0, ft9, ft10
+;   fadd.d fa1, ft11, fs0
+;   fadd.d fa2, fs1, fs2
+;   fadd.d ft9, fs3, fs4
+;   fadd.d ft10, fs5, fs6
+;   fadd.d ft11, fs7, fs8
+;   fadd.d fs0, fs9, fs10
+;   fadd.d fs1, fs11, ft0
+;   fadd.d fs2, ft1, ft2
+;   fadd.d fs3, ft3, ft4
+;   fadd.d fs4, ft5, ft6
+;   fadd.d fs5, ft7, fa6
+;   fadd.d fs6, fa7, ft8
+;   fadd.d fa3, fa3, fa4
+;   fadd.d fa4, fa5, fa0
+;   fadd.d fa5, fa1, fa2
+;   fadd.d fa0, ft9, ft10
+;   fadd.d fa1, ft11, fs0
+;   fadd.d fa2, fs1, fs2
+;   fadd.d ft9, fs3, fs4
+;   fadd.d ft10, fs5, fs6
+;   fadd.d fa3, fa3, fa4
+;   fadd.d fa4, fa5, fa0
+;   fadd.d fa5, fa1, fa2
+;   fadd.d fa0, ft9, ft10
+;   fadd.d fa3, fa3, fa4
+;   fadd.d fa4, fa5, fa0
+;   fadd.d fa0, fa3, fa4
 ;   addi sp, sp, 0x60
 ;   fld fs0, -8(sp)
 ;   fld fs2, -0x10(sp)
@@ -317,7 +317,7 @@ block0(v0: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -328,7 +328,7 @@ block0(v0: i64):
 ;   sd s5,-40(sp)
 ;   sd s6,-48(sp)
 ;   sd s7,-56(sp)
-;   addi sp,sp,-64
+;   add sp,-64
 ; block0:
 ;   add a1,a0,a0
 ;   add a2,a0,a1
@@ -366,7 +366,7 @@ block0(v0: i64):
 ;   add a2,a3,a4
 ;   add a1,a5,a1
 ;   add a0,a2,a1
-;   addi sp,sp,64
+;   add sp,+64
 ;   ld s1,-8(sp)
 ;   ld s2,-16(sp)
 ;   ld s3,-24(sp)
@@ -376,7 +376,7 @@ block0(v0: i64):
 ;   ld s7,-56(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/reftypes.clif b/cranelift/filetests/filetests/isa/riscv64/reftypes.clif
index afaa9ec53953..95ec9d58e841 100644
--- a/cranelift/filetests/filetests/isa/riscv64/reftypes.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/reftypes.clif
@@ -86,44 +86,46 @@ block3(v7: r64, v8: r64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   sd s5,-8(sp)
-;   sd s9,-16(sp)
-;   addi sp,sp,-48
+;   sd s7,-8(sp)
+;   sd s11,-16(sp)
+;   add sp,-48
 ; block0:
-;   mv a3,a0
-;   mv s5,a2
 ;   sd a1,16(nominal_sp)
-;   mv a3,a0
-;   mv s9,a3
-;   load_sym a5,%f+0
-;   sd s9,8(nominal_sp)
-;   callind a5
-;   mv a3,s9
-;   sd a3,0(nominal_sp)
-;   andi a5,a0,255
-;   bne a5,zero,taken(label2),not_taken(label1)
+;   mv s7,a2
+;   mv a1,a0
+;   mv a1,a0
+;   mv s11,a1
+;   load_sym a1,%f+0
+;   sd s11,8(nominal_sp)
+;   callind a1
+;   load_addr a2,0(nominal_sp)
+;   mv a1,s11
+;   sd a1,0(a2)
+;   andi a1,a0,255
+;   bne a1,zero,taken(label2),not_taken(label1)
 ; block1:
+;   mv a1,s11
 ;   ld a0,16(nominal_sp)
-;   mv a1,s9
 ;   j label3
 ; block2:
-;   mv a0,s9
+;   mv a0,s11
 ;   ld a1,16(nominal_sp)
 ;   j label3
 ; block3:
-;   ld a2,0(nominal_sp)
-;   mv a3,s5
-;   sd a2,0(a3)
-;   addi sp,sp,48
-;   ld s5,-8(sp)
-;   ld s9,-16(sp)
+;   load_addr a4,0(nominal_sp)
+;   ld a4,0(a4)
+;   mv a2,s7
+;   sd a4,0(a2)
+;   add sp,+48
+;   ld s7,-8(sp)
+;   ld s11,-16(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -132,40 +134,42 @@ block3(v7: r64, v8: r64):
 ;   sd ra, 8(sp)
 ;   sd s0, 0(sp)
 ;   mv s0, sp
-;   sd s5, -8(sp)
-;   sd s9, -0x10(sp)
+;   sd s7, -8(sp)
+;   sd s11, -0x10(sp)
 ;   addi sp, sp, -0x30
 ; block1: ; offset 0x1c
-;   mv a3, a0
-;   mv s5, a2
 ;   sd a1, 0x10(sp)
-;   mv a0, a3
-;   mv s9, a3
-;   auipc a5, 0
-;   ld a5, 0xc(a5)
+;   mv s7, a2
+;   mv a1, a0
+;   mv a0, a1
+;   mv s11, a1
+;   auipc a1, 0
+;   ld a1, 0xc(a1)
 ;   j 0xc
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %f 0
 ;   .byte 0x00, 0x00, 0x00, 0x00
-;   sd s9, 8(sp)
-;   jalr a5
-;   mv a3, s9
-;   sd a3, 0(sp)
-;   andi a5, a0, 0xff
-;   bnez a5, 0x10
-; block2: ; offset 0x5c
+;   sd s11, 8(sp)
+;   jalr a1
+;   mv a2, sp
+;   mv a1, s11
+;   sd a1, 0(a2)
+;   andi a1, a0, 0xff
+;   bnez a1, 0x10
+; block2: ; offset 0x60
+;   mv a1, s11
 ;   ld a0, 0x10(sp)
-;   mv a1, s9
 ;   j 0xc
-; block3: ; offset 0x68
-;   mv a0, s9
+; block3: ; offset 0x6c
+;   mv a0, s11
 ;   ld a1, 0x10(sp)
-; block4: ; offset 0x70
-;   ld a2, 0(sp)
-;   mv a3, s5
-;   sd a2, 0(a3)
+; block4: ; offset 0x74
+;   mv a4, sp
+;   ld a4, 0(a4)
+;   mv a2, s7
+;   sd a4, 0(a2)
 ;   addi sp, sp, 0x30
-;   ld s5, -8(sp)
-;   ld s9, -0x10(sp)
+;   ld s7, -8(sp)
+;   ld s11, -0x10(sp)
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
 ;   addi sp, sp, 0x10
diff --git a/cranelift/filetests/filetests/isa/riscv64/return-call.clif b/cranelift/filetests/filetests/isa/riscv64/return-call.clif
index 2ea34afb40d8..123f6dc0a395 100644
--- a/cranelift/filetests/filetests/isa/riscv64/return-call.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/return-call.clif
@@ -28,7 +28,7 @@ block0(v0: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -64,7 +64,7 @@ block0(v0: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -82,7 +82,7 @@ block0(v0: i64):
 ;   ld t6, 0(s0)
 ;   addi sp, s0, 0x10
 ;   mv s0, t6
-;   auipc t6, 0 ; reloc_external RiscvCallPlt %callee_i64 0
+;   auipc t6, 0 ; reloc_external RiscvCall %callee_i64 0
 ;   jr t6
 
 ;;;; Test passing `f64`s ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -96,19 +96,21 @@ block0(v0: f64):
 
 ; VCode:
 ; block0:
-;   lui a3,1027
-;   slli a5,a3,40
-;   fmv.d.x fa1,a5
-;   fadd.d ft0,ft0,fa1,rne
+;   ld a3,[const(0)]
+;   fmv.d.x fa5,a3
+;   fadd.d ft0,ft0,fa5
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   lui a3, 0x403
-;   slli a5, a3, 0x28
-;   fmv.d.x fa1, a5
-;   fadd.d ft0, ft0, fa1, rne
+;   auipc a3, 0
+;   ld a3, 0x18(a3)
+;   fmv.d.x fa5, a3
+;   fadd.d ft0, ft0, fa5
 ;   ret
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0x30, 0x40
 
 function %call_f64(f64) -> f64 tail {
     fn0 = %callee_f64(f64) -> f64 tail
@@ -118,7 +120,7 @@ block0(v0: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -155,14 +157,21 @@ block0(v0: i8):
 
 ; VCode:
 ; block0:
-;   andi a2,s1,255
-;   seqz s1,a2
+;   li a5,0
+;   andi a3,s1,255
+;   andi a5,a5,255
+;   eq s1,a3,a5##ty=i8
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   andi a2, s1, 0xff
-;   seqz s1, a2
+;   mv a5, zero
+;   andi a3, s1, 0xff
+;   andi a5, a5, 0xff
+;   bne a3, a5, 0xc
+;   addi s1, zero, 1
+;   j 8
+;   mv s1, zero
 ;   ret
 
 function %call_i8(i8) -> i8 tail {
@@ -173,7 +182,7 @@ block0(v0: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -207,7 +216,7 @@ block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64, v6: i64, v7: i64, v
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -219,8 +228,8 @@ block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64, v6: i64, v7: i64, v
 ;   ld s1,48(fp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
-;   addi sp,sp,48
+;   add sp,+16
+;   add sp,+48
 ;   ret
 ;
 ; Disassembled:
@@ -275,11 +284,11 @@ block0:
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   addi sp,sp,-16
+;   add sp,-16
 ; block0:
 ;   li s1,10
 ;   sd s1,8(nominal_sp)
@@ -309,7 +318,7 @@ block0:
 ;   li t2,125
 ;   li s1,130
 ;   li a0,135
-;   addi sp,sp,-48
+;   add sp,-48
 ;   virtual_sp_offset_adj +48
 ;   sd t0,0(sp)
 ;   sd t1,8(sp)
@@ -317,8 +326,8 @@ block0:
 ;   sd s1,24(sp)
 ;   sd a0,32(sp)
 ;   load_sym t0,%tail_callee_stack_args+0
-;   ld s1,8(nominal_sp)
 ;   ld a0,0(nominal_sp)
+;   ld s1,8(nominal_sp)
 ;   return_call_ind t0 old_stack_arg_size:0 new_stack_arg_size:48 s1=s1 a0=a0 a1=a1 a2=a2 a3=a3 a4=a4 a5=a5 a6=a6 a7=a7 s2=s2 s3=s3 s4=s4 s5=s5 s6=s6 s7=s7 s8=s8 s9=s9 s10=s10 s11=s11 t3=t3 t4=t4
 ;
 ; Disassembled:
@@ -368,8 +377,8 @@ block0:
 ;   j 0xc
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %tail_callee_stack_args 0
 ;   .byte 0x00, 0x00, 0x00, 0x00
-;   ld s1, 0x38(sp)
 ;   ld a0, 0x30(sp)
+;   ld s1, 0x38(sp)
 ;   ld ra, 8(s0)
 ;   ld t6, 0(s0)
 ;   ld t5, 0x28(sp)
@@ -396,7 +405,7 @@ block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64, v6: i64, v7: i64, v
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -408,8 +417,8 @@ block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64, v6: i64, v7: i64, v
 ;   ld s1,48(fp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
-;   addi sp,sp,48
+;   add sp,+16
+;   add sp,+48
 ;   ret
 ;
 ; Disassembled:
@@ -436,7 +445,7 @@ block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64, v6: i64, v7: i64, v
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -449,8 +458,8 @@ block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64, v6: i64, v7: i64, v
 ;   ld s1,56(fp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
-;   addi sp,sp,48
+;   add sp,+16
+;   add sp,+48
 ;   ret
 ;
 ; Disassembled:
@@ -514,11 +523,11 @@ block2:
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   addi sp,sp,-32
+;   add sp,-32
 ; block0:
 ;   li a0,10
 ;   sd a0,16(nominal_sp)
@@ -552,7 +561,7 @@ block2:
 ;   bne s1,zero,taken(label2),not_taken(label1)
 ; block1:
 ;   li s1,140
-;   addi sp,sp,-48
+;   add sp,-48
 ;   virtual_sp_offset_adj +48
 ;   sd a1,0(sp)
 ;   sd a0,8(sp)
@@ -561,13 +570,13 @@ block2:
 ;   sd t0,32(sp)
 ;   sd s1,40(sp)
 ;   load_sym t0,%different_callee2+0
-;   ld s1,16(nominal_sp)
-;   ld a0,8(nominal_sp)
 ;   ld a1,0(nominal_sp)
+;   ld a0,8(nominal_sp)
+;   ld s1,16(nominal_sp)
 ;   return_call_ind t0 old_stack_arg_size:0 new_stack_arg_size:48 s1=s1 a0=a0 a1=a1 a2=a2 a3=a3 a4=a4 a5=a5 a6=a6 a7=a7 s2=s2 s3=s3 s4=s4 s5=s5 s6=s6 s7=s7 s8=s8 s9=s9 s10=s10 s11=s11 t3=t3 t4=t4
 ; block2:
 ;   ld s1,16(nominal_sp)
-;   addi sp,sp,-48
+;   add sp,-48
 ;   virtual_sp_offset_adj +48
 ;   sd a1,0(sp)
 ;   sd a0,8(sp)
@@ -575,8 +584,8 @@ block2:
 ;   sd t1,24(sp)
 ;   sd t0,32(sp)
 ;   load_sym t0,%different_callee1+0
-;   ld a0,8(nominal_sp)
 ;   ld a1,0(nominal_sp)
+;   ld a0,8(nominal_sp)
 ;   return_call_ind t0 old_stack_arg_size:0 new_stack_arg_size:48 s1=s1 a0=a0 a1=a1 a2=a2 a3=a3 a4=a4 a5=a5 a6=a6 a7=a7 s2=s2 s3=s3 s4=s4 s5=s5 s6=s6 s7=s7 s8=s8 s9=s9 s10=s10 s11=s11 t3=t3 t4=t4
 ;
 ; Disassembled:
@@ -631,9 +640,9 @@ block2:
 ;   j 0xc
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %different_callee2 0
 ;   .byte 0x00, 0x00, 0x00, 0x00
-;   ld s1, 0x40(sp)
-;   ld a0, 0x38(sp)
 ;   ld a1, 0x30(sp)
+;   ld a0, 0x38(sp)
+;   ld s1, 0x40(sp)
 ;   ld ra, 8(s0)
 ;   ld t6, 0(s0)
 ;   ld t5, 0x28(sp)
@@ -664,8 +673,8 @@ block2:
 ;   j 0xc
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %different_callee1 0
 ;   .byte 0x00, 0x00, 0x00, 0x00
-;   ld a0, 0x38(sp)
 ;   ld a1, 0x30(sp)
+;   ld a0, 0x38(sp)
 ;   ld ra, 8(s0)
 ;   ld t6, 0(s0)
 ;   ld t5, 0x28(sp)
diff --git a/cranelift/filetests/filetests/isa/riscv64/rotl.clif b/cranelift/filetests/filetests/isa/riscv64/rotl.clif
index f9783ed2a01b..8c1220226284 100644
--- a/cranelift/filetests/filetests/isa/riscv64/rotl.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/rotl.clif
@@ -9,34 +9,35 @@ block0(v0: i128, v1: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ;   sd s7,-8(sp)
-;   sd s9,-16(sp)
-;   addi sp,sp,-16
+;   add sp,-16
 ; block0:
 ;   andi a5,a2,63
 ;   li a3,64
-;   sub a4,a3,a5
-;   sll a3,a0,a5
-;   srl s7,a1,a4
-;   select s9,zero,s7##condition=(a5 eq zero)
-;   or a3,a3,s9
-;   sll a1,a1,a5
-;   srl a4,a0,a4
-;   select a5,zero,a4##condition=(a5 eq zero)
-;   or a5,a1,a5
+;   sub a3,a3,a5
+;   sll a4,a0,a5
+;   srl s7,a1,a3
+;   mv t2,a1
+;   select_reg a1,zero,s7##condition=(a5 eq zero)
+;   or a1,a4,a1
+;   mv a4,t2
+;   sll a4,a4,a5
+;   srl a3,a0,a3
+;   select_reg a5,zero,a3##condition=(a5 eq zero)
+;   or a3,a4,a5
 ;   li a4,64
-;   andi a2,a2,127
-;   select [a0,a1],[a5,a3],[a3,a5]##condition=(a2 uge a4)
-;   addi sp,sp,16
+;   andi a5,a2,127
+;   select_reg a0,a3,a1##condition=(a5 uge a4)
+;   select_reg a1,a1,a3##condition=(a5 uge a4)
+;   add sp,+16
 ;   ld s7,-8(sp)
-;   ld s9,-16(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -46,37 +47,37 @@ block0(v0: i128, v1: i128):
 ;   sd s0, 0(sp)
 ;   mv s0, sp
 ;   sd s7, -8(sp)
-;   sd s9, -0x10(sp)
 ;   addi sp, sp, -0x10
-; block1: ; offset 0x1c
+; block1: ; offset 0x18
 ;   andi a5, a2, 0x3f
 ;   addi a3, zero, 0x40
-;   sub a4, a3, a5
-;   sll a3, a0, a5
-;   srl s7, a1, a4
-;   bnez a5, 0xc
-;   mv s9, zero
+;   sub a3, a3, a5
+;   sll a4, a0, a5
+;   srl s7, a1, a3
+;   mv t2, a1
+;   beqz a5, 0xc
+;   mv a1, s7
 ;   j 8
-;   mv s9, s7
-;   or a3, a3, s9
-;   sll a1, a1, a5
-;   srl a4, a0, a4
-;   bnez a5, 0xc
-;   mv a5, zero
+;   mv a1, zero
+;   or a1, a4, a1
+;   mv a4, t2
+;   sll a4, a4, a5
+;   srl a3, a0, a3
+;   beqz a5, 0xc
+;   mv a5, a3
 ;   j 8
-;   mv a5, a4
-;   or a5, a1, a5
+;   mv a5, zero
+;   or a3, a4, a5
 ;   addi a4, zero, 0x40
-;   andi a2, a2, 0x7f
-;   bltu a2, a4, 0x10
-;   mv a0, a5
-;   mv a1, a3
-;   j 0xc
+;   andi a5, a2, 0x7f
+;   bgeu a5, a4, 0xc
+;   mv a0, a1
+;   j 8
 ;   mv a0, a3
-;   mv a1, a5
+;   bgeu a5, a4, 8
+;   mv a1, a3
 ;   addi sp, sp, 0x10
 ;   ld s7, -8(sp)
-;   ld s9, -0x10(sp)
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
 ;   addi sp, sp, 0x10
@@ -95,7 +96,7 @@ block0(v0: i64, v1: i64):
 ;   sub a1,a5,a3
 ;   sll a4,a0,a3
 ;   srl a5,a0,a1
-;   select a1,zero,a5##condition=(a3 eq zero)
+;   select_reg a1,zero,a5##condition=(a3 eq zero)
 ;   or a0,a4,a1
 ;   ret
 ;
@@ -106,10 +107,10 @@ block0(v0: i64, v1: i64):
 ;   sub a1, a5, a3
 ;   sll a4, a0, a3
 ;   srl a5, a0, a1
-;   bnez a3, 0xc
-;   mv a1, zero
-;   j 8
+;   beqz a3, 0xc
 ;   mv a1, a5
+;   j 8
+;   mv a1, zero
 ;   or a0, a4, a1
 ;   ret
 
@@ -128,7 +129,7 @@ block0(v0: i32, v1: i32):
 ;   sub a0,a3,a1
 ;   sll a2,a5,a1
 ;   srl a3,a5,a0
-;   select a5,zero,a3##condition=(a1 eq zero)
+;   select_reg a5,zero,a3##condition=(a1 eq zero)
 ;   or a0,a2,a5
 ;   ret
 ;
@@ -141,10 +142,10 @@ block0(v0: i32, v1: i32):
 ;   sub a0, a3, a1
 ;   sll a2, a5, a1
 ;   srl a3, a5, a0
-;   bnez a1, 0xc
-;   mv a5, zero
-;   j 8
+;   beqz a1, 0xc
 ;   mv a5, a3
+;   j 8
+;   mv a5, zero
 ;   or a0, a2, a5
 ;   ret
 
@@ -163,7 +164,7 @@ block0(v0: i16, v1: i16):
 ;   sub a0,a3,a1
 ;   sll a2,a5,a1
 ;   srl a3,a5,a0
-;   select a5,zero,a3##condition=(a1 eq zero)
+;   select_reg a5,zero,a3##condition=(a1 eq zero)
 ;   or a0,a2,a5
 ;   ret
 ;
@@ -176,10 +177,10 @@ block0(v0: i16, v1: i16):
 ;   sub a0, a3, a1
 ;   sll a2, a5, a1
 ;   srl a3, a5, a0
-;   bnez a1, 0xc
-;   mv a5, zero
-;   j 8
+;   beqz a1, 0xc
 ;   mv a5, a3
+;   j 8
+;   mv a5, zero
 ;   or a0, a2, a5
 ;   ret
 
@@ -197,7 +198,7 @@ block0(v0: i8, v1: i8):
 ;   sub a4,a1,a5
 ;   sll a0,a3,a5
 ;   srl a1,a3,a4
-;   select a3,zero,a1##condition=(a5 eq zero)
+;   select_reg a3,zero,a1##condition=(a5 eq zero)
 ;   or a0,a0,a3
 ;   ret
 ;
@@ -209,10 +210,10 @@ block0(v0: i8, v1: i8):
 ;   sub a4, a1, a5
 ;   sll a0, a3, a5
 ;   srl a1, a3, a4
-;   bnez a5, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a5, 0xc
 ;   mv a3, a1
+;   j 8
+;   mv a3, zero
 ;   or a0, a0, a3
 ;   ret
 
@@ -231,7 +232,7 @@ block0(v0: i64):
 ;   sub a1,a5,a3
 ;   sll a4,a0,a3
 ;   srl a5,a0,a1
-;   select a1,zero,a5##condition=(a3 eq zero)
+;   select_reg a1,zero,a5##condition=(a3 eq zero)
 ;   or a0,a4,a1
 ;   ret
 ;
@@ -243,10 +244,10 @@ block0(v0: i64):
 ;   sub a1, a5, a3
 ;   sll a4, a0, a3
 ;   srl a5, a0, a1
-;   bnez a3, 0xc
-;   mv a1, zero
-;   j 8
+;   beqz a3, 0xc
 ;   mv a1, a5
+;   j 8
+;   mv a1, zero
 ;   or a0, a4, a1
 ;   ret
 
@@ -267,7 +268,7 @@ block0(v0: i32):
 ;   sub a0,a3,a1
 ;   sll a2,a5,a1
 ;   srl a3,a5,a0
-;   select a5,zero,a3##condition=(a1 eq zero)
+;   select_reg a5,zero,a3##condition=(a1 eq zero)
 ;   or a0,a2,a5
 ;   ret
 ;
@@ -281,10 +282,10 @@ block0(v0: i32):
 ;   sub a0, a3, a1
 ;   sll a2, a5, a1
 ;   srl a3, a5, a0
-;   bnez a1, 0xc
-;   mv a5, zero
-;   j 8
+;   beqz a1, 0xc
 ;   mv a5, a3
+;   j 8
+;   mv a5, zero
 ;   or a0, a2, a5
 ;   ret
 
@@ -305,7 +306,7 @@ block0(v0: i16):
 ;   sub a0,a3,a1
 ;   sll a2,a5,a1
 ;   srl a3,a5,a0
-;   select a5,zero,a3##condition=(a1 eq zero)
+;   select_reg a5,zero,a3##condition=(a1 eq zero)
 ;   or a0,a2,a5
 ;   ret
 ;
@@ -319,10 +320,10 @@ block0(v0: i16):
 ;   sub a0, a3, a1
 ;   sll a2, a5, a1
 ;   srl a3, a5, a0
-;   bnez a1, 0xc
-;   mv a5, zero
-;   j 8
+;   beqz a1, 0xc
 ;   mv a5, a3
+;   j 8
+;   mv a5, zero
 ;   or a0, a2, a5
 ;   ret
 
@@ -342,7 +343,7 @@ block0(v0: i8):
 ;   sub a4,a1,a5
 ;   sll a0,a3,a5
 ;   srl a1,a3,a4
-;   select a3,zero,a1##condition=(a5 eq zero)
+;   select_reg a3,zero,a1##condition=(a5 eq zero)
 ;   or a0,a0,a3
 ;   ret
 ;
@@ -355,10 +356,10 @@ block0(v0: i8):
 ;   sub a4, a1, a5
 ;   sll a0, a3, a5
 ;   srl a1, a3, a4
-;   bnez a5, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a5, 0xc
 ;   mv a3, a1
+;   j 8
+;   mv a3, zero
 ;   or a0, a0, a3
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/rotr.clif b/cranelift/filetests/filetests/isa/riscv64/rotr.clif
index 2cc1ae825001..950fa9bec3ee 100644
--- a/cranelift/filetests/filetests/isa/riscv64/rotr.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/rotr.clif
@@ -9,34 +9,35 @@ block0(v0: i128, v1: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ;   sd s7,-8(sp)
-;   sd s9,-16(sp)
-;   addi sp,sp,-16
+;   add sp,-16
 ; block0:
 ;   andi a5,a2,63
 ;   li a3,64
-;   sub a4,a3,a5
-;   srl a3,a0,a5
-;   sll s7,a1,a4
-;   select s9,zero,s7##condition=(a5 eq zero)
-;   or a3,a3,s9
-;   srl a1,a1,a5
-;   sll a4,a0,a4
-;   select a5,zero,a4##condition=(a5 eq zero)
-;   or a5,a1,a5
+;   sub a3,a3,a5
+;   srl a4,a0,a5
+;   sll s7,a1,a3
+;   mv t2,a1
+;   select_reg a1,zero,s7##condition=(a5 eq zero)
+;   or a1,a4,a1
+;   mv a4,t2
+;   srl a4,a4,a5
+;   sll a3,a0,a3
+;   select_reg a5,zero,a3##condition=(a5 eq zero)
+;   or a3,a4,a5
 ;   li a4,64
-;   andi a2,a2,127
-;   select [a0,a1],[a5,a3],[a3,a5]##condition=(a2 uge a4)
-;   addi sp,sp,16
+;   andi a5,a2,127
+;   select_reg a0,a3,a1##condition=(a5 uge a4)
+;   select_reg a1,a1,a3##condition=(a5 uge a4)
+;   add sp,+16
 ;   ld s7,-8(sp)
-;   ld s9,-16(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -46,37 +47,37 @@ block0(v0: i128, v1: i128):
 ;   sd s0, 0(sp)
 ;   mv s0, sp
 ;   sd s7, -8(sp)
-;   sd s9, -0x10(sp)
 ;   addi sp, sp, -0x10
-; block1: ; offset 0x1c
+; block1: ; offset 0x18
 ;   andi a5, a2, 0x3f
 ;   addi a3, zero, 0x40
-;   sub a4, a3, a5
-;   srl a3, a0, a5
-;   sll s7, a1, a4
-;   bnez a5, 0xc
-;   mv s9, zero
+;   sub a3, a3, a5
+;   srl a4, a0, a5
+;   sll s7, a1, a3
+;   mv t2, a1
+;   beqz a5, 0xc
+;   mv a1, s7
 ;   j 8
-;   mv s9, s7
-;   or a3, a3, s9
-;   srl a1, a1, a5
-;   sll a4, a0, a4
-;   bnez a5, 0xc
-;   mv a5, zero
+;   mv a1, zero
+;   or a1, a4, a1
+;   mv a4, t2
+;   srl a4, a4, a5
+;   sll a3, a0, a3
+;   beqz a5, 0xc
+;   mv a5, a3
 ;   j 8
-;   mv a5, a4
-;   or a5, a1, a5
+;   mv a5, zero
+;   or a3, a4, a5
 ;   addi a4, zero, 0x40
-;   andi a2, a2, 0x7f
-;   bltu a2, a4, 0x10
-;   mv a0, a5
-;   mv a1, a3
-;   j 0xc
+;   andi a5, a2, 0x7f
+;   bgeu a5, a4, 0xc
+;   mv a0, a1
+;   j 8
 ;   mv a0, a3
-;   mv a1, a5
+;   bgeu a5, a4, 8
+;   mv a1, a3
 ;   addi sp, sp, 0x10
 ;   ld s7, -8(sp)
-;   ld s9, -0x10(sp)
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
 ;   addi sp, sp, 0x10
@@ -95,7 +96,7 @@ block0(v0: i64, v1: i64):
 ;   sub a1,a5,a3
 ;   srl a4,a0,a3
 ;   sll a5,a0,a1
-;   select a1,zero,a5##condition=(a3 eq zero)
+;   select_reg a1,zero,a5##condition=(a3 eq zero)
 ;   or a0,a4,a1
 ;   ret
 ;
@@ -106,10 +107,10 @@ block0(v0: i64, v1: i64):
 ;   sub a1, a5, a3
 ;   srl a4, a0, a3
 ;   sll a5, a0, a1
-;   bnez a3, 0xc
-;   mv a1, zero
-;   j 8
+;   beqz a3, 0xc
 ;   mv a1, a5
+;   j 8
+;   mv a1, zero
 ;   or a0, a4, a1
 ;   ret
 
@@ -128,7 +129,7 @@ block0(v0: i32, v1: i32):
 ;   sub a0,a3,a1
 ;   srl a2,a5,a1
 ;   sll a3,a5,a0
-;   select a5,zero,a3##condition=(a1 eq zero)
+;   select_reg a5,zero,a3##condition=(a1 eq zero)
 ;   or a0,a2,a5
 ;   ret
 ;
@@ -141,10 +142,10 @@ block0(v0: i32, v1: i32):
 ;   sub a0, a3, a1
 ;   srl a2, a5, a1
 ;   sll a3, a5, a0
-;   bnez a1, 0xc
-;   mv a5, zero
-;   j 8
+;   beqz a1, 0xc
 ;   mv a5, a3
+;   j 8
+;   mv a5, zero
 ;   or a0, a2, a5
 ;   ret
 
@@ -163,7 +164,7 @@ block0(v0: i16, v1: i16):
 ;   sub a0,a3,a1
 ;   srl a2,a5,a1
 ;   sll a3,a5,a0
-;   select a5,zero,a3##condition=(a1 eq zero)
+;   select_reg a5,zero,a3##condition=(a1 eq zero)
 ;   or a0,a2,a5
 ;   ret
 ;
@@ -176,10 +177,10 @@ block0(v0: i16, v1: i16):
 ;   sub a0, a3, a1
 ;   srl a2, a5, a1
 ;   sll a3, a5, a0
-;   bnez a1, 0xc
-;   mv a5, zero
-;   j 8
+;   beqz a1, 0xc
 ;   mv a5, a3
+;   j 8
+;   mv a5, zero
 ;   or a0, a2, a5
 ;   ret
 
@@ -197,7 +198,7 @@ block0(v0: i8, v1: i8):
 ;   sub a4,a1,a5
 ;   srl a0,a3,a5
 ;   sll a1,a3,a4
-;   select a3,zero,a1##condition=(a5 eq zero)
+;   select_reg a3,zero,a1##condition=(a5 eq zero)
 ;   or a0,a0,a3
 ;   ret
 ;
@@ -209,10 +210,10 @@ block0(v0: i8, v1: i8):
 ;   sub a4, a1, a5
 ;   srl a0, a3, a5
 ;   sll a1, a3, a4
-;   bnez a5, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a5, 0xc
 ;   mv a3, a1
+;   j 8
+;   mv a3, zero
 ;   or a0, a0, a3
 ;   ret
 
@@ -231,7 +232,7 @@ block0(v0: i64):
 ;   sub a1,a5,a3
 ;   srl a4,a0,a3
 ;   sll a5,a0,a1
-;   select a1,zero,a5##condition=(a3 eq zero)
+;   select_reg a1,zero,a5##condition=(a3 eq zero)
 ;   or a0,a4,a1
 ;   ret
 ;
@@ -243,10 +244,10 @@ block0(v0: i64):
 ;   sub a1, a5, a3
 ;   srl a4, a0, a3
 ;   sll a5, a0, a1
-;   bnez a3, 0xc
-;   mv a1, zero
-;   j 8
+;   beqz a3, 0xc
 ;   mv a1, a5
+;   j 8
+;   mv a1, zero
 ;   or a0, a4, a1
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/select-float.clif b/cranelift/filetests/filetests/isa/riscv64/select-float.clif
index 684fd934fc46..1a6ba5fc36c2 100644
--- a/cranelift/filetests/filetests/isa/riscv64/select-float.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/select-float.clif
@@ -16,7 +16,7 @@ block0(v0: i8, v1: f32, v2: f32):
 ;   li a1,42
 ;   andi a5,a0,255
 ;   andi a1,a1,255
-;   select fa0,fa0,fa1##condition=(a5 eq a1)
+;   select_reg fa0,fa0,fa1##condition=(a5 eq a1)
 ;   ret
 ;
 ; Disassembled:
@@ -41,7 +41,7 @@ block0(v0: i8, v1: f64, v2: f64):
 ;   li a1,42
 ;   andi a5,a0,255
 ;   andi a1,a1,255
-;   select fa0,fa0,fa1##condition=(a5 eq a1)
+;   select_reg fa0,fa0,fa1##condition=(a5 eq a1)
 ;   ret
 ;
 ; Disassembled:
@@ -65,19 +65,19 @@ block0(v0: i16, v1: f32, v2: f32):
 ; block0:
 ;   li a3,42
 ;   slli a5,a0,48
-;   srai a1,a5,48
+;   srli a1,a5,48
 ;   slli a3,a3,48
-;   srai a5,a3,48
-;   select fa0,fa0,fa1##condition=(a1 eq a5)
+;   srli a5,a3,48
+;   select_reg fa0,fa0,fa1##condition=(a1 eq a5)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a3, zero, 0x2a
 ;   slli a5, a0, 0x30
-;   srai a1, a5, 0x30
+;   srli a1, a5, 0x30
 ;   slli a3, a3, 0x30
-;   srai a5, a3, 0x30
+;   srli a5, a3, 0x30
 ;   beq a1, a5, 8
 ;   fmv.d fa0, fa1
 ;   ret
@@ -94,19 +94,19 @@ block0(v0: i16, v1: f64, v2: f64):
 ; block0:
 ;   li a3,42
 ;   slli a5,a0,48
-;   srai a1,a5,48
+;   srli a1,a5,48
 ;   slli a3,a3,48
-;   srai a5,a3,48
-;   select fa0,fa0,fa1##condition=(a1 eq a5)
+;   srli a5,a3,48
+;   select_reg fa0,fa0,fa1##condition=(a1 eq a5)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a3, zero, 0x2a
 ;   slli a5, a0, 0x30
-;   srai a1, a5, 0x30
+;   srli a1, a5, 0x30
 ;   slli a3, a3, 0x30
-;   srai a5, a3, 0x30
+;   srli a5, a3, 0x30
 ;   beq a1, a5, 8
 ;   fmv.d fa0, fa1
 ;   ret
@@ -121,18 +121,22 @@ block0(v0: i32, v1: f32, v2: f32):
 
 ; VCode:
 ; block0:
-;   li a1,42
-;   sext.w a5,a0
-;   sext.w a1,a1
-;   select fa0,fa0,fa1##condition=(a5 eq a1)
+;   li a3,42
+;   slli a5,a0,32
+;   srli a1,a5,32
+;   slli a3,a3,32
+;   srli a5,a3,32
+;   select_reg fa0,fa0,fa1##condition=(a1 eq a5)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi a1, zero, 0x2a
-;   sext.w a5, a0
-;   sext.w a1, a1
-;   beq a5, a1, 8
+;   addi a3, zero, 0x2a
+;   slli a5, a0, 0x20
+;   srli a1, a5, 0x20
+;   slli a3, a3, 0x20
+;   srli a5, a3, 0x20
+;   beq a1, a5, 8
 ;   fmv.d fa0, fa1
 ;   ret
 
@@ -146,18 +150,22 @@ block0(v0: i32, v1: f64, v2: f64):
 
 ; VCode:
 ; block0:
-;   li a1,42
-;   sext.w a5,a0
-;   sext.w a1,a1
-;   select fa0,fa0,fa1##condition=(a5 eq a1)
+;   li a3,42
+;   slli a5,a0,32
+;   srli a1,a5,32
+;   slli a3,a3,32
+;   srli a5,a3,32
+;   select_reg fa0,fa0,fa1##condition=(a1 eq a5)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi a1, zero, 0x2a
-;   sext.w a5, a0
-;   sext.w a1, a1
-;   beq a5, a1, 8
+;   addi a3, zero, 0x2a
+;   slli a5, a0, 0x20
+;   srli a1, a5, 0x20
+;   slli a3, a3, 0x20
+;   srli a5, a3, 0x20
+;   beq a1, a5, 8
 ;   fmv.d fa0, fa1
 ;   ret
 
@@ -172,7 +180,7 @@ block0(v0: i64, v1: f32, v2: f32):
 ; VCode:
 ; block0:
 ;   li a5,42
-;   select fa0,fa0,fa1##condition=(a0 eq a5)
+;   select_reg fa0,fa0,fa1##condition=(a0 eq a5)
 ;   ret
 ;
 ; Disassembled:
@@ -193,7 +201,7 @@ block0(v0: i64, v1: f64, v2: f64):
 ; VCode:
 ; block0:
 ;   li a5,42
-;   select fa0,fa0,fa1##condition=(a0 eq a5)
+;   select_reg fa0,fa0,fa1##condition=(a0 eq a5)
 ;   ret
 ;
 ; Disassembled:
@@ -214,24 +222,28 @@ block0(v0: i128, v1: f32, v2: f32):
 
 ; VCode:
 ; block0:
-;   li a5,42
-;   li a2,0
-;   xor a3,a0,a5
-;   xor a4,a1,a2
-;   or a0,a3,a4
-;   seqz a2,a0
-;   select fa0,fa0,fa1##condition=(a2 ne zero)
+;   fmv.d fa2,fa0
+;   li a3,42
+;   li a4,0
+;   eq a3,[a0,a1],[a3,a4]##ty=i128
+;   andi a2,a3,255
+;   select_f32 fa0,fa2,fa1##condition=a2
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi a5, zero, 0x2a
-;   mv a2, zero
-;   xor a3, a0, a5
-;   xor a4, a1, a2
-;   or a0, a3, a4
-;   seqz a2, a0
-;   bnez a2, 8
+;   fmv.d fa2, fa0
+;   addi a3, zero, 0x2a
+;   mv a4, zero
+;   bne a1, a4, 0x10
+;   bne a0, a3, 0xc
+;   addi a3, zero, 1
+;   j 8
+;   mv a3, zero
+;   andi a2, a3, 0xff
+;   beqz a2, 0xc
+;   fmv.d fa0, fa2
+;   j 8
 ;   fmv.d fa0, fa1
 ;   ret
 
@@ -246,24 +258,28 @@ block0(v0: i128, v1: f64, v2: f64):
 
 ; VCode:
 ; block0:
-;   li a5,42
-;   li a2,0
-;   xor a3,a0,a5
-;   xor a4,a1,a2
-;   or a0,a3,a4
-;   seqz a2,a0
-;   select fa0,fa0,fa1##condition=(a2 ne zero)
+;   fmv.d fa2,fa0
+;   li a3,42
+;   li a4,0
+;   eq a3,[a0,a1],[a3,a4]##ty=i128
+;   andi a2,a3,255
+;   select_f64 fa0,fa2,fa1##condition=a2
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi a5, zero, 0x2a
-;   mv a2, zero
-;   xor a3, a0, a5
-;   xor a4, a1, a2
-;   or a0, a3, a4
-;   seqz a2, a0
-;   bnez a2, 8
+;   fmv.d fa2, fa0
+;   addi a3, zero, 0x2a
+;   mv a4, zero
+;   bne a1, a4, 0x10
+;   bne a0, a3, 0xc
+;   addi a3, zero, 1
+;   j 8
+;   mv a3, zero
+;   andi a2, a3, 0xff
+;   beqz a2, 0xc
+;   fmv.d fa0, fa2
+;   j 8
 ;   fmv.d fa0, fa1
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/select.clif b/cranelift/filetests/filetests/isa/riscv64/select.clif
index 0368713a07a4..ef3011860af4 100644
--- a/cranelift/filetests/filetests/isa/riscv64/select.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/select.clif
@@ -15,7 +15,7 @@ block0(v0: i8, v1: i8, v2: i8):
 ;   li a3,42
 ;   andi a5,a0,255
 ;   andi a3,a3,255
-;   select a0,a1,a2##condition=(a5 eq a3)
+;   select_reg a0,a1,a2##condition=(a5 eq a3)
 ;   ret
 ;
 ; Disassembled:
@@ -23,10 +23,10 @@ block0(v0: i8, v1: i8, v2: i8):
 ;   addi a3, zero, 0x2a
 ;   andi a5, a0, 0xff
 ;   andi a3, a3, 0xff
-;   bne a5, a3, 0xc
-;   mv a0, a1
-;   j 8
+;   beq a5, a3, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a1
 ;   ret
 
 function %select_icmp_i8_i16(i8, i16, i16) -> i16 {
@@ -42,7 +42,7 @@ block0(v0: i8, v1: i16, v2: i16):
 ;   li a3,42
 ;   andi a5,a0,255
 ;   andi a3,a3,255
-;   select a0,a1,a2##condition=(a5 eq a3)
+;   select_reg a0,a1,a2##condition=(a5 eq a3)
 ;   ret
 ;
 ; Disassembled:
@@ -50,10 +50,10 @@ block0(v0: i8, v1: i16, v2: i16):
 ;   addi a3, zero, 0x2a
 ;   andi a5, a0, 0xff
 ;   andi a3, a3, 0xff
-;   bne a5, a3, 0xc
-;   mv a0, a1
-;   j 8
+;   beq a5, a3, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a1
 ;   ret
 
 function %select_icmp_i8_i32(i8, i32, i32) -> i32 {
@@ -69,7 +69,7 @@ block0(v0: i8, v1: i32, v2: i32):
 ;   li a3,42
 ;   andi a5,a0,255
 ;   andi a3,a3,255
-;   select a0,a1,a2##condition=(a5 eq a3)
+;   select_reg a0,a1,a2##condition=(a5 eq a3)
 ;   ret
 ;
 ; Disassembled:
@@ -77,10 +77,10 @@ block0(v0: i8, v1: i32, v2: i32):
 ;   addi a3, zero, 0x2a
 ;   andi a5, a0, 0xff
 ;   andi a3, a3, 0xff
-;   bne a5, a3, 0xc
-;   mv a0, a1
-;   j 8
+;   beq a5, a3, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a1
 ;   ret
 
 function %select_icmp_i8_i64(i8, i64, i64) -> i64 {
@@ -96,7 +96,7 @@ block0(v0: i8, v1: i64, v2: i64):
 ;   li a3,42
 ;   andi a5,a0,255
 ;   andi a3,a3,255
-;   select a0,a1,a2##condition=(a5 eq a3)
+;   select_reg a0,a1,a2##condition=(a5 eq a3)
 ;   ret
 ;
 ; Disassembled:
@@ -104,10 +104,10 @@ block0(v0: i8, v1: i64, v2: i64):
 ;   addi a3, zero, 0x2a
 ;   andi a5, a0, 0xff
 ;   andi a3, a3, 0xff
-;   bne a5, a3, 0xc
-;   mv a0, a1
-;   j 8
+;   beq a5, a3, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a1
 ;   ret
 
 function %select_icmp_i8_i128(i8, i128, i128) -> i128 {
@@ -119,53 +119,35 @@ block0(v0: i8, v1: i128, v2: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   sd s1,-8(sp)
-;   sd s8,-16(sp)
-;   addi sp,sp,-16
 ; block0:
-;   mv s8,a1
-;   li a5,42
-;   andi s1,a0,255
+;   mv a5,a0
+;   mv t2,a1
+;   li a0,42
 ;   andi a5,a5,255
-;   select [a0,a1],[s8,a2],[a3,a4]##condition=(s1 eq a5)
-;   addi sp,sp,16
-;   ld s1,-8(sp)
-;   ld s8,-16(sp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
+;   andi a0,a0,255
+;   eq a5,a5,a0##ty=i8
+;   andi a5,a5,255
+;   select_i128 [a0,a1],[t2,a2],[a3,a4]##condition=a5
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-;   sd s1, -8(sp)
-;   sd s8, -0x10(sp)
-;   addi sp, sp, -0x10
-; block1: ; offset 0x1c
-;   mv s8, a1
-;   addi a5, zero, 0x2a
-;   andi s1, a0, 0xff
+;   mv a5, a0
+;   mv t2, a1
+;   addi a0, zero, 0x2a
 ;   andi a5, a5, 0xff
-;   bne s1, a5, 0x10
-;   mv a0, s8
+;   andi a0, a0, 0xff
+;   bne a5, a0, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
+;   andi a5, a5, 0xff
+;   beqz a5, 0x10
+;   mv a0, t2
 ;   mv a1, a2
 ;   j 0xc
 ;   mv a0, a3
 ;   mv a1, a4
-;   addi sp, sp, 0x10
-;   ld s1, -8(sp)
-;   ld s8, -0x10(sp)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
 ;   ret
 
 function %select_icmp_i16_i8(i16, i8, i8) -> i8 {
@@ -180,23 +162,23 @@ block0(v0: i16, v1: i8, v2: i8):
 ; block0:
 ;   li a3,42
 ;   slli a5,a0,48
-;   srai a4,a5,48
+;   srli a4,a5,48
 ;   slli a3,a3,48
-;   srai a5,a3,48
-;   select a0,a1,a2##condition=(a4 eq a5)
+;   srli a5,a3,48
+;   select_reg a0,a1,a2##condition=(a4 eq a5)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a3, zero, 0x2a
 ;   slli a5, a0, 0x30
-;   srai a4, a5, 0x30
+;   srli a4, a5, 0x30
 ;   slli a3, a3, 0x30
-;   srai a5, a3, 0x30
-;   bne a4, a5, 0xc
-;   mv a0, a1
-;   j 8
+;   srli a5, a3, 0x30
+;   beq a4, a5, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a1
 ;   ret
 
 function %select_icmp_i16_i16(i16, i16, i16) -> i16 {
@@ -211,23 +193,23 @@ block0(v0: i16, v1: i16, v2: i16):
 ; block0:
 ;   li a3,42
 ;   slli a5,a0,48
-;   srai a4,a5,48
+;   srli a4,a5,48
 ;   slli a3,a3,48
-;   srai a5,a3,48
-;   select a0,a1,a2##condition=(a4 eq a5)
+;   srli a5,a3,48
+;   select_reg a0,a1,a2##condition=(a4 eq a5)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a3, zero, 0x2a
 ;   slli a5, a0, 0x30
-;   srai a4, a5, 0x30
+;   srli a4, a5, 0x30
 ;   slli a3, a3, 0x30
-;   srai a5, a3, 0x30
-;   bne a4, a5, 0xc
-;   mv a0, a1
-;   j 8
+;   srli a5, a3, 0x30
+;   beq a4, a5, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a1
 ;   ret
 
 function %select_icmp_i16_i32(i16, i32, i32) -> i32 {
@@ -242,23 +224,23 @@ block0(v0: i16, v1: i32, v2: i32):
 ; block0:
 ;   li a3,42
 ;   slli a5,a0,48
-;   srai a4,a5,48
+;   srli a4,a5,48
 ;   slli a3,a3,48
-;   srai a5,a3,48
-;   select a0,a1,a2##condition=(a4 eq a5)
+;   srli a5,a3,48
+;   select_reg a0,a1,a2##condition=(a4 eq a5)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a3, zero, 0x2a
 ;   slli a5, a0, 0x30
-;   srai a4, a5, 0x30
+;   srli a4, a5, 0x30
 ;   slli a3, a3, 0x30
-;   srai a5, a3, 0x30
-;   bne a4, a5, 0xc
-;   mv a0, a1
-;   j 8
+;   srli a5, a3, 0x30
+;   beq a4, a5, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a1
 ;   ret
 
 function %select_icmp_i16_i64(i16, i64, i64) -> i64 {
@@ -273,23 +255,23 @@ block0(v0: i16, v1: i64, v2: i64):
 ; block0:
 ;   li a3,42
 ;   slli a5,a0,48
-;   srai a4,a5,48
+;   srli a4,a5,48
 ;   slli a3,a3,48
-;   srai a5,a3,48
-;   select a0,a1,a2##condition=(a4 eq a5)
+;   srli a5,a3,48
+;   select_reg a0,a1,a2##condition=(a4 eq a5)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a3, zero, 0x2a
 ;   slli a5, a0, 0x30
-;   srai a4, a5, 0x30
+;   srli a4, a5, 0x30
 ;   slli a3, a3, 0x30
-;   srai a5, a3, 0x30
-;   bne a4, a5, 0xc
-;   mv a0, a1
-;   j 8
+;   srli a5, a3, 0x30
+;   beq a4, a5, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a1
 ;   ret
 
 function %select_icmp_i16_i128(i16, i128, i128) -> i128 {
@@ -301,57 +283,37 @@ block0(v0: i16, v1: i128, v2: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   sd s6,-8(sp)
-;   sd s7,-16(sp)
-;   addi sp,sp,-16
 ; block0:
-;   mv t0,a1
-;   li s6,42
-;   slli a1,a0,48
-;   srai a5,a1,48
-;   slli a0,s6,48
-;   srai s7,a0,48
-;   select [a0,a1],[t0,a2],[a3,a4]##condition=(a5 eq s7)
-;   addi sp,sp,16
-;   ld s6,-8(sp)
-;   ld s7,-16(sp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
+;   mv a7,a1
+;   li a5,42
+;   slli a0,a0,48
+;   srli a0,a0,48
+;   slli a5,a5,48
+;   srli a5,a5,48
+;   eq a0,a0,a5##ty=i16
+;   andi a5,a0,255
+;   select_i128 [a0,a1],[a7,a2],[a3,a4]##condition=a5
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-;   sd s6, -8(sp)
-;   sd s7, -0x10(sp)
-;   addi sp, sp, -0x10
-; block1: ; offset 0x1c
-;   mv t0, a1
-;   addi s6, zero, 0x2a
-;   slli a1, a0, 0x30
-;   srai a5, a1, 0x30
-;   slli a0, s6, 0x30
-;   srai s7, a0, 0x30
-;   bne a5, s7, 0x10
-;   mv a0, t0
+;   mv a7, a1
+;   addi a5, zero, 0x2a
+;   slli a0, a0, 0x30
+;   srli a0, a0, 0x30
+;   slli a5, a5, 0x30
+;   srli a5, a5, 0x30
+;   bne a0, a5, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
+;   andi a5, a0, 0xff
+;   beqz a5, 0x10
+;   mv a0, a7
 ;   mv a1, a2
 ;   j 0xc
 ;   mv a0, a3
 ;   mv a1, a4
-;   addi sp, sp, 0x10
-;   ld s6, -8(sp)
-;   ld s7, -0x10(sp)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
 ;   ret
 
 function %select_icmp_i32_i8(i32, i8, i8) -> i8 {
@@ -365,20 +327,24 @@ block0(v0: i32, v1: i8, v2: i8):
 ; VCode:
 ; block0:
 ;   li a3,42
-;   sext.w a5,a0
-;   sext.w a3,a3
-;   select a0,a1,a2##condition=(a5 eq a3)
+;   slli a5,a0,32
+;   srli a4,a5,32
+;   slli a3,a3,32
+;   srli a5,a3,32
+;   select_reg a0,a1,a2##condition=(a4 eq a5)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a3, zero, 0x2a
-;   sext.w a5, a0
-;   sext.w a3, a3
-;   bne a5, a3, 0xc
-;   mv a0, a1
-;   j 8
+;   slli a5, a0, 0x20
+;   srli a4, a5, 0x20
+;   slli a3, a3, 0x20
+;   srli a5, a3, 0x20
+;   beq a4, a5, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a1
 ;   ret
 
 function %select_icmp_i32_i16(i32, i16, i16) -> i16 {
@@ -392,20 +358,24 @@ block0(v0: i32, v1: i16, v2: i16):
 ; VCode:
 ; block0:
 ;   li a3,42
-;   sext.w a5,a0
-;   sext.w a3,a3
-;   select a0,a1,a2##condition=(a5 eq a3)
+;   slli a5,a0,32
+;   srli a4,a5,32
+;   slli a3,a3,32
+;   srli a5,a3,32
+;   select_reg a0,a1,a2##condition=(a4 eq a5)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a3, zero, 0x2a
-;   sext.w a5, a0
-;   sext.w a3, a3
-;   bne a5, a3, 0xc
-;   mv a0, a1
-;   j 8
+;   slli a5, a0, 0x20
+;   srli a4, a5, 0x20
+;   slli a3, a3, 0x20
+;   srli a5, a3, 0x20
+;   beq a4, a5, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a1
 ;   ret
 
 function %select_icmp_i32_i32(i32, i32, i32) -> i32 {
@@ -419,20 +389,24 @@ block0(v0: i32, v1: i32, v2: i32):
 ; VCode:
 ; block0:
 ;   li a3,42
-;   sext.w a5,a0
-;   sext.w a3,a3
-;   select a0,a1,a2##condition=(a5 eq a3)
+;   slli a5,a0,32
+;   srli a4,a5,32
+;   slli a3,a3,32
+;   srli a5,a3,32
+;   select_reg a0,a1,a2##condition=(a4 eq a5)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a3, zero, 0x2a
-;   sext.w a5, a0
-;   sext.w a3, a3
-;   bne a5, a3, 0xc
-;   mv a0, a1
-;   j 8
+;   slli a5, a0, 0x20
+;   srli a4, a5, 0x20
+;   slli a3, a3, 0x20
+;   srli a5, a3, 0x20
+;   beq a4, a5, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a1
 ;   ret
 
 function %select_icmp_i32_i64(i32, i64, i64) -> i64 {
@@ -446,20 +420,24 @@ block0(v0: i32, v1: i64, v2: i64):
 ; VCode:
 ; block0:
 ;   li a3,42
-;   sext.w a5,a0
-;   sext.w a3,a3
-;   select a0,a1,a2##condition=(a5 eq a3)
+;   slli a5,a0,32
+;   srli a4,a5,32
+;   slli a3,a3,32
+;   srli a5,a3,32
+;   select_reg a0,a1,a2##condition=(a4 eq a5)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a3, zero, 0x2a
-;   sext.w a5, a0
-;   sext.w a3, a3
-;   bne a5, a3, 0xc
-;   mv a0, a1
-;   j 8
+;   slli a5, a0, 0x20
+;   srli a4, a5, 0x20
+;   slli a3, a3, 0x20
+;   srli a5, a3, 0x20
+;   beq a4, a5, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a1
 ;   ret
 
 function %select_icmp_i32_i128(i32, i128, i128) -> i128 {
@@ -471,53 +449,37 @@ block0(v0: i32, v1: i128, v2: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   sd s1,-8(sp)
-;   sd s8,-16(sp)
-;   addi sp,sp,-16
 ; block0:
-;   mv s8,a1
+;   mv a7,a1
 ;   li a5,42
-;   sext.w s1,a0
-;   sext.w a5,a5
-;   select [a0,a1],[s8,a2],[a3,a4]##condition=(s1 eq a5)
-;   addi sp,sp,16
-;   ld s1,-8(sp)
-;   ld s8,-16(sp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
+;   slli a0,a0,32
+;   srli a0,a0,32
+;   slli a5,a5,32
+;   srli a5,a5,32
+;   eq a0,a0,a5##ty=i32
+;   andi a5,a0,255
+;   select_i128 [a0,a1],[a7,a2],[a3,a4]##condition=a5
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-;   sd s1, -8(sp)
-;   sd s8, -0x10(sp)
-;   addi sp, sp, -0x10
-; block1: ; offset 0x1c
-;   mv s8, a1
+;   mv a7, a1
 ;   addi a5, zero, 0x2a
-;   sext.w s1, a0
-;   sext.w a5, a5
-;   bne s1, a5, 0x10
-;   mv a0, s8
+;   slli a0, a0, 0x20
+;   srli a0, a0, 0x20
+;   slli a5, a5, 0x20
+;   srli a5, a5, 0x20
+;   bne a0, a5, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
+;   andi a5, a0, 0xff
+;   beqz a5, 0x10
+;   mv a0, a7
 ;   mv a1, a2
 ;   j 0xc
 ;   mv a0, a3
 ;   mv a1, a4
-;   addi sp, sp, 0x10
-;   ld s1, -8(sp)
-;   ld s8, -0x10(sp)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
 ;   ret
 
 function %select_icmp_i64_i8(i64, i8, i8) -> i8 {
@@ -531,16 +493,16 @@ block0(v0: i64, v1: i8, v2: i8):
 ; VCode:
 ; block0:
 ;   li a5,42
-;   select a0,a1,a2##condition=(a0 eq a5)
+;   select_reg a0,a1,a2##condition=(a0 eq a5)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a5, zero, 0x2a
-;   bne a0, a5, 0xc
-;   mv a0, a1
-;   j 8
+;   beq a0, a5, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a1
 ;   ret
 
 function %select_icmp_i64_i16(i64, i16, i16) -> i16 {
@@ -554,16 +516,16 @@ block0(v0: i64, v1: i16, v2: i16):
 ; VCode:
 ; block0:
 ;   li a5,42
-;   select a0,a1,a2##condition=(a0 eq a5)
+;   select_reg a0,a1,a2##condition=(a0 eq a5)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a5, zero, 0x2a
-;   bne a0, a5, 0xc
-;   mv a0, a1
-;   j 8
+;   beq a0, a5, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a1
 ;   ret
 
 function %select_icmp_i64_i32(i64, i32, i32) -> i32 {
@@ -577,16 +539,16 @@ block0(v0: i64, v1: i32, v2: i32):
 ; VCode:
 ; block0:
 ;   li a5,42
-;   select a0,a1,a2##condition=(a0 eq a5)
+;   select_reg a0,a1,a2##condition=(a0 eq a5)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a5, zero, 0x2a
-;   bne a0, a5, 0xc
-;   mv a0, a1
-;   j 8
+;   beq a0, a5, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a1
 ;   ret
 
 function %select_icmp_i64_i64(i64, i64, i64) -> i64 {
@@ -600,16 +562,16 @@ block0(v0: i64, v1: i64, v2: i64):
 ; VCode:
 ; block0:
 ;   li a5,42
-;   select a0,a1,a2##condition=(a0 eq a5)
+;   select_reg a0,a1,a2##condition=(a0 eq a5)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a5, zero, 0x2a
-;   bne a0, a5, 0xc
-;   mv a0, a1
-;   j 8
+;   beq a0, a5, 0xc
 ;   mv a0, a2
+;   j 8
+;   mv a0, a1
 ;   ret
 
 function %select_icmp_i64_i128(i64, i128, i128) -> i128 {
@@ -621,24 +583,23 @@ block0(v0: i64, v1: i128, v2: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   sd s4,-8(sp)
-;   sd s6,-16(sp)
-;   addi sp,sp,-16
+;   sd s8,-8(sp)
+;   add sp,-16
 ; block0:
-;   mv s4,a1
-;   mv s6,a0
+;   mv s8,a1
 ;   li a5,42
-;   select [a0,a1],[s4,a2],[a3,a4]##condition=(s6 eq a5)
-;   addi sp,sp,16
-;   ld s4,-8(sp)
-;   ld s6,-16(sp)
+;   eq a5,a0,a5##ty=i64
+;   andi a5,a5,255
+;   select_i128 [a0,a1],[s8,a2],[a3,a4]##condition=a5
+;   add sp,+16
+;   ld s8,-8(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -647,22 +608,24 @@ block0(v0: i64, v1: i128, v2: i128):
 ;   sd ra, 8(sp)
 ;   sd s0, 0(sp)
 ;   mv s0, sp
-;   sd s4, -8(sp)
-;   sd s6, -0x10(sp)
+;   sd s8, -8(sp)
 ;   addi sp, sp, -0x10
-; block1: ; offset 0x1c
-;   mv s4, a1
-;   mv s6, a0
+; block1: ; offset 0x18
+;   mv s8, a1
 ;   addi a5, zero, 0x2a
-;   bne s6, a5, 0x10
-;   mv a0, s4
+;   bne a0, a5, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
+;   andi a5, a5, 0xff
+;   beqz a5, 0x10
+;   mv a0, s8
 ;   mv a1, a2
 ;   j 0xc
 ;   mv a0, a3
 ;   mv a1, a4
 ;   addi sp, sp, 0x10
-;   ld s4, -8(sp)
-;   ld s6, -0x10(sp)
+;   ld s8, -8(sp)
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
 ;   addi sp, sp, 0x10
@@ -679,23 +642,23 @@ block0(v0: i128, v1: i8, v2: i8):
 
 ; VCode:
 ; block0:
-;   li a5,42
-;   li a4,0
-;   xor a5,a0,a5
-;   xor a4,a1,a4
-;   or a0,a5,a4
-;   seqz a4,a0
-;   select a0,a2,a3##condition=(a4 ne zero)
+;   li a4,42
+;   li a5,0
+;   eq a4,[a0,a1],[a4,a5]##ty=i128
+;   andi a4,a4,255
+;   select_i8 a0,a2,a3##condition=a4
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi a5, zero, 0x2a
+;   addi a4, zero, 0x2a
+;   mv a5, zero
+;   bne a1, a5, 0x10
+;   bne a0, a4, 0xc
+;   addi a4, zero, 1
+;   j 8
 ;   mv a4, zero
-;   xor a5, a0, a5
-;   xor a4, a1, a4
-;   or a0, a5, a4
-;   seqz a4, a0
+;   andi a4, a4, 0xff
 ;   beqz a4, 0xc
 ;   mv a0, a2
 ;   j 8
@@ -713,23 +676,23 @@ block0(v0: i128, v1: i16, v2: i16):
 
 ; VCode:
 ; block0:
-;   li a5,42
-;   li a4,0
-;   xor a5,a0,a5
-;   xor a4,a1,a4
-;   or a0,a5,a4
-;   seqz a4,a0
-;   select a0,a2,a3##condition=(a4 ne zero)
+;   li a4,42
+;   li a5,0
+;   eq a4,[a0,a1],[a4,a5]##ty=i128
+;   andi a4,a4,255
+;   select_i16 a0,a2,a3##condition=a4
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi a5, zero, 0x2a
+;   addi a4, zero, 0x2a
+;   mv a5, zero
+;   bne a1, a5, 0x10
+;   bne a0, a4, 0xc
+;   addi a4, zero, 1
+;   j 8
 ;   mv a4, zero
-;   xor a5, a0, a5
-;   xor a4, a1, a4
-;   or a0, a5, a4
-;   seqz a4, a0
+;   andi a4, a4, 0xff
 ;   beqz a4, 0xc
 ;   mv a0, a2
 ;   j 8
@@ -747,23 +710,23 @@ block0(v0: i128, v1: i32, v2: i32):
 
 ; VCode:
 ; block0:
-;   li a5,42
-;   li a4,0
-;   xor a5,a0,a5
-;   xor a4,a1,a4
-;   or a0,a5,a4
-;   seqz a4,a0
-;   select a0,a2,a3##condition=(a4 ne zero)
+;   li a4,42
+;   li a5,0
+;   eq a4,[a0,a1],[a4,a5]##ty=i128
+;   andi a4,a4,255
+;   select_i32 a0,a2,a3##condition=a4
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi a5, zero, 0x2a
+;   addi a4, zero, 0x2a
+;   mv a5, zero
+;   bne a1, a5, 0x10
+;   bne a0, a4, 0xc
+;   addi a4, zero, 1
+;   j 8
 ;   mv a4, zero
-;   xor a5, a0, a5
-;   xor a4, a1, a4
-;   or a0, a5, a4
-;   seqz a4, a0
+;   andi a4, a4, 0xff
 ;   beqz a4, 0xc
 ;   mv a0, a2
 ;   j 8
@@ -781,23 +744,23 @@ block0(v0: i128, v1: i64, v2: i64):
 
 ; VCode:
 ; block0:
-;   li a5,42
-;   li a4,0
-;   xor a5,a0,a5
-;   xor a4,a1,a4
-;   or a0,a5,a4
-;   seqz a4,a0
-;   select a0,a2,a3##condition=(a4 ne zero)
+;   li a4,42
+;   li a5,0
+;   eq a4,[a0,a1],[a4,a5]##ty=i128
+;   andi a4,a4,255
+;   select_i64 a0,a2,a3##condition=a4
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi a5, zero, 0x2a
+;   addi a4, zero, 0x2a
+;   mv a5, zero
+;   bne a1, a5, 0x10
+;   bne a0, a4, 0xc
+;   addi a4, zero, 1
+;   j 8
 ;   mv a4, zero
-;   xor a5, a0, a5
-;   xor a4, a1, a4
-;   or a0, a5, a4
-;   seqz a4, a0
+;   andi a4, a4, 0xff
 ;   beqz a4, 0xc
 ;   mv a0, a2
 ;   j 8
@@ -814,30 +777,27 @@ block0(v0: i128, v1: i128, v2: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   sd s7,-8(sp)
-;   sd s8,-16(sp)
-;   sd s9,-24(sp)
-;   addi sp,sp,-32
+;   sd s4,-8(sp)
+;   sd s6,-16(sp)
+;   sd s7,-24(sp)
+;   add sp,-32
 ; block0:
-;   li s8,42
-;   li s9,0
-;   xor a0,a0,s8
-;   xor a1,a1,s9
-;   or a0,a0,a1
-;   seqz a0,a0
-;   select [s7,a1],[a2,a3],[a4,a5]##condition=(a0 ne zero)
-;   mv a0,s7
-;   addi sp,sp,32
-;   ld s7,-8(sp)
-;   ld s8,-16(sp)
-;   ld s9,-24(sp)
+;   li s6,42
+;   li s7,0
+;   eq a0,[a0,a1],[s6,s7]##ty=i128
+;   andi s4,a0,255
+;   select_i128 [a0,a1],[a2,a3],[a4,a5]##condition=s4
+;   add sp,+32
+;   ld s4,-8(sp)
+;   ld s6,-16(sp)
+;   ld s7,-24(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -846,28 +806,29 @@ block0(v0: i128, v1: i128, v2: i128):
 ;   sd ra, 8(sp)
 ;   sd s0, 0(sp)
 ;   mv s0, sp
-;   sd s7, -8(sp)
-;   sd s8, -0x10(sp)
-;   sd s9, -0x18(sp)
+;   sd s4, -8(sp)
+;   sd s6, -0x10(sp)
+;   sd s7, -0x18(sp)
 ;   addi sp, sp, -0x20
 ; block1: ; offset 0x20
-;   addi s8, zero, 0x2a
-;   mv s9, zero
-;   xor a0, a0, s8
-;   xor a1, a1, s9
-;   or a0, a0, a1
-;   seqz a0, a0
-;   beqz a0, 0x10
-;   mv s7, a2
+;   addi s6, zero, 0x2a
+;   mv s7, zero
+;   bne a1, s7, 0x10
+;   bne a0, s6, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
+;   andi s4, a0, 0xff
+;   beqz s4, 0x10
+;   mv a0, a2
 ;   mv a1, a3
 ;   j 0xc
-;   mv s7, a4
+;   mv a0, a4
 ;   mv a1, a5
-;   mv a0, s7
 ;   addi sp, sp, 0x20
-;   ld s7, -8(sp)
-;   ld s8, -0x10(sp)
-;   ld s9, -0x18(sp)
+;   ld s4, -8(sp)
+;   ld s6, -0x10(sp)
+;   ld s7, -0x18(sp)
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
 ;   addi sp, sp, 0x10
diff --git a/cranelift/filetests/filetests/isa/riscv64/select_spectre_guard.clif b/cranelift/filetests/filetests/isa/riscv64/select_spectre_guard.clif
index 99ddb596831e..dec1cc69cfd1 100644
--- a/cranelift/filetests/filetests/isa/riscv64/select_spectre_guard.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/select_spectre_guard.clif
@@ -12,28 +12,35 @@ block0(v0: i8, v1: i8, v2: i8):
 
 ; VCode:
 ; block0:
-;   slli a3,a0,56
-;   srai a5,a3,56
-;   xori a3,a5,42
-;   seqz a3,a3
-;   sub a3,zero,a3
-;   and a4,a3,a1
-;   not a0,a3
-;   and a2,a2,a0
-;   or a0,a4,a2
+;   li a3,42
+;   andi a0,a0,255
+;   andi a3,a3,255
+;   eq a4,a0,a3##ty=i8
+;   andi a3,a4,255
+;   sltu a4,zero,a3
+;   sub a0,zero,a4
+;   and a3,a1,a0
+;   not a4,a0
+;   and a0,a2,a4
+;   or a0,a3,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slli a3, a0, 0x38
-;   srai a5, a3, 0x38
-;   xori a3, a5, 0x2a
-;   seqz a3, a3
-;   neg a3, a3
-;   and a4, a3, a1
-;   not a0, a3
-;   and a2, a2, a0
-;   or a0, a4, a2
+;   addi a3, zero, 0x2a
+;   andi a0, a0, 0xff
+;   andi a3, a3, 0xff
+;   bne a0, a3, 0xc
+;   addi a4, zero, 1
+;   j 8
+;   mv a4, zero
+;   andi a3, a4, 0xff
+;   snez a4, a3
+;   neg a0, a4
+;   and a3, a1, a0
+;   not a4, a0
+;   and a0, a2, a4
+;   or a0, a3, a0
 ;   ret
 
 function %f(i8, i16, i16) -> i16 {
@@ -46,28 +53,35 @@ block0(v0: i8, v1: i16, v2: i16):
 
 ; VCode:
 ; block0:
-;   slli a3,a0,56
-;   srai a5,a3,56
-;   xori a3,a5,42
-;   seqz a3,a3
-;   sub a3,zero,a3
-;   and a4,a3,a1
-;   not a0,a3
-;   and a2,a2,a0
-;   or a0,a4,a2
+;   li a3,42
+;   andi a0,a0,255
+;   andi a3,a3,255
+;   eq a4,a0,a3##ty=i8
+;   andi a3,a4,255
+;   sltu a4,zero,a3
+;   sub a0,zero,a4
+;   and a3,a1,a0
+;   not a4,a0
+;   and a0,a2,a4
+;   or a0,a3,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slli a3, a0, 0x38
-;   srai a5, a3, 0x38
-;   xori a3, a5, 0x2a
-;   seqz a3, a3
-;   neg a3, a3
-;   and a4, a3, a1
-;   not a0, a3
-;   and a2, a2, a0
-;   or a0, a4, a2
+;   addi a3, zero, 0x2a
+;   andi a0, a0, 0xff
+;   andi a3, a3, 0xff
+;   bne a0, a3, 0xc
+;   addi a4, zero, 1
+;   j 8
+;   mv a4, zero
+;   andi a3, a4, 0xff
+;   snez a4, a3
+;   neg a0, a4
+;   and a3, a1, a0
+;   not a4, a0
+;   and a0, a2, a4
+;   or a0, a3, a0
 ;   ret
 
 function %f(i8, i32, i32) -> i32 {
@@ -80,28 +94,35 @@ block0(v0: i8, v1: i32, v2: i32):
 
 ; VCode:
 ; block0:
-;   slli a3,a0,56
-;   srai a5,a3,56
-;   xori a3,a5,42
-;   seqz a3,a3
-;   sub a3,zero,a3
-;   and a4,a3,a1
-;   not a0,a3
-;   and a2,a2,a0
-;   or a0,a4,a2
+;   li a3,42
+;   andi a0,a0,255
+;   andi a3,a3,255
+;   eq a4,a0,a3##ty=i8
+;   andi a3,a4,255
+;   sltu a4,zero,a3
+;   sub a0,zero,a4
+;   and a3,a1,a0
+;   not a4,a0
+;   and a0,a2,a4
+;   or a0,a3,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slli a3, a0, 0x38
-;   srai a5, a3, 0x38
-;   xori a3, a5, 0x2a
-;   seqz a3, a3
-;   neg a3, a3
-;   and a4, a3, a1
-;   not a0, a3
-;   and a2, a2, a0
-;   or a0, a4, a2
+;   addi a3, zero, 0x2a
+;   andi a0, a0, 0xff
+;   andi a3, a3, 0xff
+;   bne a0, a3, 0xc
+;   addi a4, zero, 1
+;   j 8
+;   mv a4, zero
+;   andi a3, a4, 0xff
+;   snez a4, a3
+;   neg a0, a4
+;   and a3, a1, a0
+;   not a4, a0
+;   and a0, a2, a4
+;   or a0, a3, a0
 ;   ret
 
 function %f(i8, i64, i64) -> i64 {
@@ -114,28 +135,35 @@ block0(v0: i8, v1: i64, v2: i64):
 
 ; VCode:
 ; block0:
-;   slli a3,a0,56
-;   srai a5,a3,56
-;   xori a3,a5,42
-;   seqz a3,a3
-;   sub a3,zero,a3
-;   and a4,a3,a1
-;   not a0,a3
-;   and a2,a2,a0
-;   or a0,a4,a2
+;   li a3,42
+;   andi a0,a0,255
+;   andi a3,a3,255
+;   eq a4,a0,a3##ty=i8
+;   andi a3,a4,255
+;   sltu a4,zero,a3
+;   sub a0,zero,a4
+;   and a3,a1,a0
+;   not a4,a0
+;   and a0,a2,a4
+;   or a0,a3,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slli a3, a0, 0x38
-;   srai a5, a3, 0x38
-;   xori a3, a5, 0x2a
-;   seqz a3, a3
-;   neg a3, a3
-;   and a4, a3, a1
-;   not a0, a3
-;   and a2, a2, a0
-;   or a0, a4, a2
+;   addi a3, zero, 0x2a
+;   andi a0, a0, 0xff
+;   andi a3, a3, 0xff
+;   bne a0, a3, 0xc
+;   addi a4, zero, 1
+;   j 8
+;   mv a4, zero
+;   andi a3, a4, 0xff
+;   snez a4, a3
+;   neg a0, a4
+;   and a3, a1, a0
+;   not a4, a0
+;   and a0, a2, a4
+;   or a0, a3, a0
 ;   ret
 
 function %f(i8, i128, i128) -> i128 {
@@ -147,37 +175,67 @@ block0(v0: i8, v1: i128, v2: i128):
 }
 
 ; VCode:
+;   add sp,-16
+;   sd ra,8(sp)
+;   sd fp,0(sp)
+;   mv fp,sp
+;   sd s8,-8(sp)
+;   add sp,-16
 ; block0:
-;   slli a5,a0,56
-;   srai a5,a5,56
-;   xori a5,a5,42
-;   seqz a5,a5
-;   sub a5,zero,a5
-;   and a0,a5,a1
-;   not a1,a5
-;   and a1,a3,a1
-;   or a0,a0,a1
-;   and a2,a5,a2
-;   not a5,a5
-;   and a1,a4,a5
-;   or a1,a2,a1
+;   li a5,42
+;   andi a0,a0,255
+;   andi a5,a5,255
+;   eq a5,a0,a5##ty=i8
+;   andi a5,a5,255
+;   sltu a0,zero,a5
+;   sub s8,zero,a0
+;   and a5,a1,s8
+;   and a1,a2,s8
+;   not a0,s8
+;   not a2,s8
+;   and a0,a3,a0
+;   and a2,a4,a2
+;   or a0,a5,a0
+;   or a1,a1,a2
+;   add sp,+16
+;   ld s8,-8(sp)
+;   ld ra,8(sp)
+;   ld fp,0(sp)
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slli a5, a0, 0x38
-;   srai a5, a5, 0x38
-;   xori a5, a5, 0x2a
-;   seqz a5, a5
-;   neg a5, a5
-;   and a0, a5, a1
-;   not a1, a5
-;   and a1, a3, a1
-;   or a0, a0, a1
-;   and a2, a5, a2
-;   not a5, a5
-;   and a1, a4, a5
-;   or a1, a2, a1
+;   addi sp, sp, -0x10
+;   sd ra, 8(sp)
+;   sd s0, 0(sp)
+;   mv s0, sp
+;   sd s8, -8(sp)
+;   addi sp, sp, -0x10
+; block1: ; offset 0x18
+;   addi a5, zero, 0x2a
+;   andi a0, a0, 0xff
+;   andi a5, a5, 0xff
+;   bne a0, a5, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
+;   andi a5, a5, 0xff
+;   snez a0, a5
+;   neg s8, a0
+;   and a5, a1, s8
+;   and a1, a2, s8
+;   not a0, s8
+;   not a2, s8
+;   and a0, a3, a0
+;   and a2, a4, a2
+;   or a0, a5, a0
+;   or a1, a1, a2
+;   addi sp, sp, 0x10
+;   ld s8, -8(sp)
+;   ld ra, 8(sp)
+;   ld s0, 0(sp)
+;   addi sp, sp, 0x10
 ;   ret
 
 function %f(i16, i8, i8) -> i8 {
@@ -190,12 +248,16 @@ block0(v0: i16, v1: i8, v2: i8):
 
 ; VCode:
 ; block0:
-;   slli a3,a0,48
-;   srai a5,a3,48
-;   xori a3,a5,42
-;   seqz a3,a3
-;   sub a3,zero,a3
-;   and a4,a3,a1
+;   li a4,42
+;   slli a0,a0,48
+;   srli a3,a0,48
+;   slli a4,a4,48
+;   srli a0,a4,48
+;   eq a3,a3,a0##ty=i16
+;   andi a4,a3,255
+;   sltu a0,zero,a4
+;   sub a3,zero,a0
+;   and a4,a1,a3
 ;   not a0,a3
 ;   and a2,a2,a0
 ;   or a0,a4,a2
@@ -203,12 +265,19 @@ block0(v0: i16, v1: i8, v2: i8):
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slli a3, a0, 0x30
-;   srai a5, a3, 0x30
-;   xori a3, a5, 0x2a
-;   seqz a3, a3
-;   neg a3, a3
-;   and a4, a3, a1
+;   addi a4, zero, 0x2a
+;   slli a0, a0, 0x30
+;   srli a3, a0, 0x30
+;   slli a4, a4, 0x30
+;   srli a0, a4, 0x30
+;   bne a3, a0, 0xc
+;   addi a3, zero, 1
+;   j 8
+;   mv a3, zero
+;   andi a4, a3, 0xff
+;   snez a0, a4
+;   neg a3, a0
+;   and a4, a1, a3
 ;   not a0, a3
 ;   and a2, a2, a0
 ;   or a0, a4, a2
@@ -224,12 +293,16 @@ block0(v0: i16, v1: i16, v2: i16):
 
 ; VCode:
 ; block0:
-;   slli a3,a0,48
-;   srai a5,a3,48
-;   xori a3,a5,42
-;   seqz a3,a3
-;   sub a3,zero,a3
-;   and a4,a3,a1
+;   li a4,42
+;   slli a0,a0,48
+;   srli a3,a0,48
+;   slli a4,a4,48
+;   srli a0,a4,48
+;   eq a3,a3,a0##ty=i16
+;   andi a4,a3,255
+;   sltu a0,zero,a4
+;   sub a3,zero,a0
+;   and a4,a1,a3
 ;   not a0,a3
 ;   and a2,a2,a0
 ;   or a0,a4,a2
@@ -237,12 +310,19 @@ block0(v0: i16, v1: i16, v2: i16):
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slli a3, a0, 0x30
-;   srai a5, a3, 0x30
-;   xori a3, a5, 0x2a
-;   seqz a3, a3
-;   neg a3, a3
-;   and a4, a3, a1
+;   addi a4, zero, 0x2a
+;   slli a0, a0, 0x30
+;   srli a3, a0, 0x30
+;   slli a4, a4, 0x30
+;   srli a0, a4, 0x30
+;   bne a3, a0, 0xc
+;   addi a3, zero, 1
+;   j 8
+;   mv a3, zero
+;   andi a4, a3, 0xff
+;   snez a0, a4
+;   neg a3, a0
+;   and a4, a1, a3
 ;   not a0, a3
 ;   and a2, a2, a0
 ;   or a0, a4, a2
@@ -258,12 +338,16 @@ block0(v0: i16, v1: i32, v2: i32):
 
 ; VCode:
 ; block0:
-;   slli a3,a0,48
-;   srai a5,a3,48
-;   xori a3,a5,42
-;   seqz a3,a3
-;   sub a3,zero,a3
-;   and a4,a3,a1
+;   li a4,42
+;   slli a0,a0,48
+;   srli a3,a0,48
+;   slli a4,a4,48
+;   srli a0,a4,48
+;   eq a3,a3,a0##ty=i16
+;   andi a4,a3,255
+;   sltu a0,zero,a4
+;   sub a3,zero,a0
+;   and a4,a1,a3
 ;   not a0,a3
 ;   and a2,a2,a0
 ;   or a0,a4,a2
@@ -271,12 +355,19 @@ block0(v0: i16, v1: i32, v2: i32):
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slli a3, a0, 0x30
-;   srai a5, a3, 0x30
-;   xori a3, a5, 0x2a
-;   seqz a3, a3
-;   neg a3, a3
-;   and a4, a3, a1
+;   addi a4, zero, 0x2a
+;   slli a0, a0, 0x30
+;   srli a3, a0, 0x30
+;   slli a4, a4, 0x30
+;   srli a0, a4, 0x30
+;   bne a3, a0, 0xc
+;   addi a3, zero, 1
+;   j 8
+;   mv a3, zero
+;   andi a4, a3, 0xff
+;   snez a0, a4
+;   neg a3, a0
+;   and a4, a1, a3
 ;   not a0, a3
 ;   and a2, a2, a0
 ;   or a0, a4, a2
@@ -292,12 +383,16 @@ block0(v0: i16, v1: i64, v2: i64):
 
 ; VCode:
 ; block0:
-;   slli a3,a0,48
-;   srai a5,a3,48
-;   xori a3,a5,42
-;   seqz a3,a3
-;   sub a3,zero,a3
-;   and a4,a3,a1
+;   li a4,42
+;   slli a0,a0,48
+;   srli a3,a0,48
+;   slli a4,a4,48
+;   srli a0,a4,48
+;   eq a3,a3,a0##ty=i16
+;   andi a4,a3,255
+;   sltu a0,zero,a4
+;   sub a3,zero,a0
+;   and a4,a1,a3
 ;   not a0,a3
 ;   and a2,a2,a0
 ;   or a0,a4,a2
@@ -305,12 +400,19 @@ block0(v0: i16, v1: i64, v2: i64):
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slli a3, a0, 0x30
-;   srai a5, a3, 0x30
-;   xori a3, a5, 0x2a
-;   seqz a3, a3
-;   neg a3, a3
-;   and a4, a3, a1
+;   addi a4, zero, 0x2a
+;   slli a0, a0, 0x30
+;   srli a3, a0, 0x30
+;   slli a4, a4, 0x30
+;   srli a0, a4, 0x30
+;   bne a3, a0, 0xc
+;   addi a3, zero, 1
+;   j 8
+;   mv a3, zero
+;   andi a4, a3, 0xff
+;   snez a0, a4
+;   neg a3, a0
+;   and a4, a1, a3
 ;   not a0, a3
 ;   and a2, a2, a0
 ;   or a0, a4, a2
@@ -326,36 +428,47 @@ block0(v0: i16, v1: i128, v2: i128):
 
 ; VCode:
 ; block0:
-;   slli a5,a0,48
-;   srai a5,a5,48
-;   xori a5,a5,42
-;   seqz a5,a5
+;   li a5,42
+;   slli a0,a0,48
+;   srli a0,a0,48
+;   slli a5,a5,48
+;   srli a5,a5,48
+;   eq a5,a0,a5##ty=i16
+;   andi a0,a5,255
+;   sltu a5,zero,a0
 ;   sub a5,zero,a5
-;   and a0,a5,a1
+;   and a0,a1,a5
+;   and a2,a2,a5
+;   not a7,a5
 ;   not a1,a5
-;   and a1,a3,a1
-;   or a0,a0,a1
-;   and a2,a5,a2
-;   not a5,a5
-;   and a1,a4,a5
-;   or a1,a2,a1
+;   and a3,a3,a7
+;   and a4,a4,a1
+;   or a0,a0,a3
+;   or a1,a2,a4
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   slli a5, a0, 0x30
-;   srai a5, a5, 0x30
-;   xori a5, a5, 0x2a
-;   seqz a5, a5
+;   addi a5, zero, 0x2a
+;   slli a0, a0, 0x30
+;   srli a0, a0, 0x30
+;   slli a5, a5, 0x30
+;   srli a5, a5, 0x30
+;   bne a0, a5, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
+;   andi a0, a5, 0xff
+;   snez a5, a0
 ;   neg a5, a5
-;   and a0, a5, a1
+;   and a0, a1, a5
+;   and a2, a2, a5
+;   not a7, a5
 ;   not a1, a5
-;   and a1, a3, a1
-;   or a0, a0, a1
-;   and a2, a5, a2
-;   not a5, a5
-;   and a1, a4, a5
-;   or a1, a2, a1
+;   and a3, a3, a7
+;   and a4, a4, a1
+;   or a0, a0, a3
+;   or a1, a2, a4
 ;   ret
 
 function %f(i32, i8, i8) -> i8 {
@@ -368,26 +481,39 @@ block0(v0: i32, v1: i8, v2: i8):
 
 ; VCode:
 ; block0:
-;   sext.w a3,a0
-;   xori a5,a3,42
-;   seqz a3,a5
-;   sub a4,zero,a3
-;   and a3,a4,a1
-;   not a5,a4
-;   and a1,a2,a5
-;   or a0,a3,a1
+;   li a4,42
+;   slli a0,a0,32
+;   srli a3,a0,32
+;   slli a4,a4,32
+;   srli a0,a4,32
+;   eq a3,a3,a0##ty=i32
+;   andi a4,a3,255
+;   sltu a0,zero,a4
+;   sub a3,zero,a0
+;   and a4,a1,a3
+;   not a0,a3
+;   and a2,a2,a0
+;   or a0,a4,a2
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   sext.w a3, a0
-;   xori a5, a3, 0x2a
-;   seqz a3, a5
-;   neg a4, a3
-;   and a3, a4, a1
-;   not a5, a4
-;   and a1, a2, a5
-;   or a0, a3, a1
+;   addi a4, zero, 0x2a
+;   slli a0, a0, 0x20
+;   srli a3, a0, 0x20
+;   slli a4, a4, 0x20
+;   srli a0, a4, 0x20
+;   bne a3, a0, 0xc
+;   addi a3, zero, 1
+;   j 8
+;   mv a3, zero
+;   andi a4, a3, 0xff
+;   snez a0, a4
+;   neg a3, a0
+;   and a4, a1, a3
+;   not a0, a3
+;   and a2, a2, a0
+;   or a0, a4, a2
 ;   ret
 
 function %f(i32, i16, i16) -> i16 {
@@ -400,26 +526,39 @@ block0(v0: i32, v1: i16, v2: i16):
 
 ; VCode:
 ; block0:
-;   sext.w a3,a0
-;   xori a5,a3,42
-;   seqz a3,a5
-;   sub a4,zero,a3
-;   and a3,a4,a1
-;   not a5,a4
-;   and a1,a2,a5
-;   or a0,a3,a1
+;   li a4,42
+;   slli a0,a0,32
+;   srli a3,a0,32
+;   slli a4,a4,32
+;   srli a0,a4,32
+;   eq a3,a3,a0##ty=i32
+;   andi a4,a3,255
+;   sltu a0,zero,a4
+;   sub a3,zero,a0
+;   and a4,a1,a3
+;   not a0,a3
+;   and a2,a2,a0
+;   or a0,a4,a2
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   sext.w a3, a0
-;   xori a5, a3, 0x2a
-;   seqz a3, a5
-;   neg a4, a3
-;   and a3, a4, a1
-;   not a5, a4
-;   and a1, a2, a5
-;   or a0, a3, a1
+;   addi a4, zero, 0x2a
+;   slli a0, a0, 0x20
+;   srli a3, a0, 0x20
+;   slli a4, a4, 0x20
+;   srli a0, a4, 0x20
+;   bne a3, a0, 0xc
+;   addi a3, zero, 1
+;   j 8
+;   mv a3, zero
+;   andi a4, a3, 0xff
+;   snez a0, a4
+;   neg a3, a0
+;   and a4, a1, a3
+;   not a0, a3
+;   and a2, a2, a0
+;   or a0, a4, a2
 ;   ret
 
 function %f(i32, i32, i32) -> i32 {
@@ -432,26 +571,39 @@ block0(v0: i32, v1: i32, v2: i32):
 
 ; VCode:
 ; block0:
-;   sext.w a3,a0
-;   xori a5,a3,42
-;   seqz a3,a5
-;   sub a4,zero,a3
-;   and a3,a4,a1
-;   not a5,a4
-;   and a1,a2,a5
-;   or a0,a3,a1
+;   li a4,42
+;   slli a0,a0,32
+;   srli a3,a0,32
+;   slli a4,a4,32
+;   srli a0,a4,32
+;   eq a3,a3,a0##ty=i32
+;   andi a4,a3,255
+;   sltu a0,zero,a4
+;   sub a3,zero,a0
+;   and a4,a1,a3
+;   not a0,a3
+;   and a2,a2,a0
+;   or a0,a4,a2
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   sext.w a3, a0
-;   xori a5, a3, 0x2a
-;   seqz a3, a5
-;   neg a4, a3
-;   and a3, a4, a1
-;   not a5, a4
-;   and a1, a2, a5
-;   or a0, a3, a1
+;   addi a4, zero, 0x2a
+;   slli a0, a0, 0x20
+;   srli a3, a0, 0x20
+;   slli a4, a4, 0x20
+;   srli a0, a4, 0x20
+;   bne a3, a0, 0xc
+;   addi a3, zero, 1
+;   j 8
+;   mv a3, zero
+;   andi a4, a3, 0xff
+;   snez a0, a4
+;   neg a3, a0
+;   and a4, a1, a3
+;   not a0, a3
+;   and a2, a2, a0
+;   or a0, a4, a2
 ;   ret
 
 function %f(i32, i64, i64) -> i64 {
@@ -464,26 +616,39 @@ block0(v0: i32, v1: i64, v2: i64):
 
 ; VCode:
 ; block0:
-;   sext.w a3,a0
-;   xori a5,a3,42
-;   seqz a3,a5
-;   sub a4,zero,a3
-;   and a3,a4,a1
-;   not a5,a4
-;   and a1,a2,a5
-;   or a0,a3,a1
+;   li a4,42
+;   slli a0,a0,32
+;   srli a3,a0,32
+;   slli a4,a4,32
+;   srli a0,a4,32
+;   eq a3,a3,a0##ty=i32
+;   andi a4,a3,255
+;   sltu a0,zero,a4
+;   sub a3,zero,a0
+;   and a4,a1,a3
+;   not a0,a3
+;   and a2,a2,a0
+;   or a0,a4,a2
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   sext.w a3, a0
-;   xori a5, a3, 0x2a
-;   seqz a3, a5
-;   neg a4, a3
-;   and a3, a4, a1
-;   not a5, a4
-;   and a1, a2, a5
-;   or a0, a3, a1
+;   addi a4, zero, 0x2a
+;   slli a0, a0, 0x20
+;   srli a3, a0, 0x20
+;   slli a4, a4, 0x20
+;   srli a0, a4, 0x20
+;   bne a3, a0, 0xc
+;   addi a3, zero, 1
+;   j 8
+;   mv a3, zero
+;   andi a4, a3, 0xff
+;   snez a0, a4
+;   neg a3, a0
+;   and a4, a1, a3
+;   not a0, a3
+;   and a2, a2, a0
+;   or a0, a4, a2
 ;   ret
 
 function %f(i32, i128, i128) -> i128 {
@@ -496,34 +661,47 @@ block0(v0: i32, v1: i128, v2: i128):
 
 ; VCode:
 ; block0:
-;   sext.w a5,a0
-;   xori a5,a5,42
-;   seqz a5,a5
+;   li a5,42
+;   slli a0,a0,32
+;   srli a0,a0,32
+;   slli a5,a5,32
+;   srli a5,a5,32
+;   eq a5,a0,a5##ty=i32
+;   andi a0,a5,255
+;   sltu a5,zero,a0
 ;   sub a5,zero,a5
-;   and a0,a5,a1
+;   and a0,a1,a5
+;   and a2,a2,a5
+;   not a7,a5
 ;   not a1,a5
-;   and a3,a3,a1
+;   and a3,a3,a7
+;   and a4,a4,a1
 ;   or a0,a0,a3
-;   and a1,a5,a2
-;   not a3,a5
-;   and a5,a4,a3
-;   or a1,a1,a5
+;   or a1,a2,a4
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   sext.w a5, a0
-;   xori a5, a5, 0x2a
-;   seqz a5, a5
+;   addi a5, zero, 0x2a
+;   slli a0, a0, 0x20
+;   srli a0, a0, 0x20
+;   slli a5, a5, 0x20
+;   srli a5, a5, 0x20
+;   bne a0, a5, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
+;   andi a0, a5, 0xff
+;   snez a5, a0
 ;   neg a5, a5
-;   and a0, a5, a1
+;   and a0, a1, a5
+;   and a2, a2, a5
+;   not a7, a5
 ;   not a1, a5
-;   and a3, a3, a1
+;   and a3, a3, a7
+;   and a4, a4, a1
 ;   or a0, a0, a3
-;   and a1, a5, a2
-;   not a3, a5
-;   and a5, a4, a3
-;   or a1, a1, a5
+;   or a1, a2, a4
 ;   ret
 
 function %f(i64, i8, i8) -> i8 {
@@ -536,24 +714,31 @@ block0(v0: i64, v1: i8, v2: i8):
 
 ; VCode:
 ; block0:
-;   xori a3,a0,42
-;   seqz a5,a3
-;   sub a0,zero,a5
-;   and a3,a0,a1
-;   not a4,a0
-;   and a0,a2,a4
-;   or a0,a3,a0
+;   li a3,42
+;   eq a0,a0,a3##ty=i64
+;   andi a0,a0,255
+;   sltu a3,zero,a0
+;   sub a4,zero,a3
+;   and a0,a1,a4
+;   not a3,a4
+;   and a4,a2,a3
+;   or a0,a0,a4
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   xori a3, a0, 0x2a
-;   seqz a5, a3
-;   neg a0, a5
-;   and a3, a0, a1
-;   not a4, a0
-;   and a0, a2, a4
-;   or a0, a3, a0
+;   addi a3, zero, 0x2a
+;   bne a0, a3, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
+;   andi a0, a0, 0xff
+;   snez a3, a0
+;   neg a4, a3
+;   and a0, a1, a4
+;   not a3, a4
+;   and a4, a2, a3
+;   or a0, a0, a4
 ;   ret
 
 function %f(i64, i16, i16) -> i16 {
@@ -566,24 +751,31 @@ block0(v0: i64, v1: i16, v2: i16):
 
 ; VCode:
 ; block0:
-;   xori a3,a0,42
-;   seqz a5,a3
-;   sub a0,zero,a5
-;   and a3,a0,a1
-;   not a4,a0
-;   and a0,a2,a4
-;   or a0,a3,a0
+;   li a3,42
+;   eq a0,a0,a3##ty=i64
+;   andi a0,a0,255
+;   sltu a3,zero,a0
+;   sub a4,zero,a3
+;   and a0,a1,a4
+;   not a3,a4
+;   and a4,a2,a3
+;   or a0,a0,a4
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   xori a3, a0, 0x2a
-;   seqz a5, a3
-;   neg a0, a5
-;   and a3, a0, a1
-;   not a4, a0
-;   and a0, a2, a4
-;   or a0, a3, a0
+;   addi a3, zero, 0x2a
+;   bne a0, a3, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
+;   andi a0, a0, 0xff
+;   snez a3, a0
+;   neg a4, a3
+;   and a0, a1, a4
+;   not a3, a4
+;   and a4, a2, a3
+;   or a0, a0, a4
 ;   ret
 
 function %f(i64, i32, i32) -> i32 {
@@ -596,24 +788,31 @@ block0(v0: i64, v1: i32, v2: i32):
 
 ; VCode:
 ; block0:
-;   xori a3,a0,42
-;   seqz a5,a3
-;   sub a0,zero,a5
-;   and a3,a0,a1
-;   not a4,a0
-;   and a0,a2,a4
-;   or a0,a3,a0
+;   li a3,42
+;   eq a0,a0,a3##ty=i64
+;   andi a0,a0,255
+;   sltu a3,zero,a0
+;   sub a4,zero,a3
+;   and a0,a1,a4
+;   not a3,a4
+;   and a4,a2,a3
+;   or a0,a0,a4
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   xori a3, a0, 0x2a
-;   seqz a5, a3
-;   neg a0, a5
-;   and a3, a0, a1
-;   not a4, a0
-;   and a0, a2, a4
-;   or a0, a3, a0
+;   addi a3, zero, 0x2a
+;   bne a0, a3, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
+;   andi a0, a0, 0xff
+;   snez a3, a0
+;   neg a4, a3
+;   and a0, a1, a4
+;   not a3, a4
+;   and a4, a2, a3
+;   or a0, a0, a4
 ;   ret
 
 function %f(i64, i64, i64) -> i64 {
@@ -626,24 +825,31 @@ block0(v0: i64, v1: i64, v2: i64):
 
 ; VCode:
 ; block0:
-;   xori a3,a0,42
-;   seqz a5,a3
-;   sub a0,zero,a5
-;   and a3,a0,a1
-;   not a4,a0
-;   and a0,a2,a4
-;   or a0,a3,a0
+;   li a3,42
+;   eq a0,a0,a3##ty=i64
+;   andi a0,a0,255
+;   sltu a3,zero,a0
+;   sub a4,zero,a3
+;   and a0,a1,a4
+;   not a3,a4
+;   and a4,a2,a3
+;   or a0,a0,a4
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   xori a3, a0, 0x2a
-;   seqz a5, a3
-;   neg a0, a5
-;   and a3, a0, a1
-;   not a4, a0
-;   and a0, a2, a4
-;   or a0, a3, a0
+;   addi a3, zero, 0x2a
+;   bne a0, a3, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
+;   andi a0, a0, 0xff
+;   snez a3, a0
+;   neg a4, a3
+;   and a0, a1, a4
+;   not a3, a4
+;   and a4, a2, a3
+;   or a0, a0, a4
 ;   ret
 
 function %f(i64, i128, i128) -> i128 {
@@ -655,31 +861,31 @@ block0(v0: i64, v1: i128, v2: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   sd s11,-8(sp)
-;   addi sp,sp,-16
+;   sd s6,-8(sp)
+;   add sp,-16
 ; block0:
-;   mv s11,a3
-;   xori a3,a0,42
-;   seqz a5,a3
-;   sub a3,zero,a5
-;   and a5,a3,a1
-;   not a0,a3
-;   mv a1,s11
-;   and a0,a1,a0
-;   or a0,a5,a0
-;   and a1,a3,a2
-;   not a2,a3
-;   and a4,a4,a2
-;   or a1,a1,a4
-;   addi sp,sp,16
-;   ld s11,-8(sp)
+;   li a5,42
+;   eq a0,a0,a5##ty=i64
+;   andi a5,a0,255
+;   sltu a5,zero,a5
+;   sub s6,zero,a5
+;   and a0,a1,s6
+;   and a5,a2,s6
+;   not a2,s6
+;   not a1,s6
+;   and a2,a3,a2
+;   and a1,a4,a1
+;   or a0,a0,a2
+;   or a1,a5,a1
+;   add sp,+16
+;   ld s6,-8(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -688,24 +894,27 @@ block0(v0: i64, v1: i128, v2: i128):
 ;   sd ra, 8(sp)
 ;   sd s0, 0(sp)
 ;   mv s0, sp
-;   sd s11, -8(sp)
+;   sd s6, -8(sp)
 ;   addi sp, sp, -0x10
 ; block1: ; offset 0x18
-;   mv s11, a3
-;   xori a3, a0, 0x2a
-;   seqz a5, a3
-;   neg a3, a5
-;   and a5, a3, a1
-;   not a0, a3
-;   mv a1, s11
-;   and a0, a1, a0
-;   or a0, a5, a0
-;   and a1, a3, a2
-;   not a2, a3
-;   and a4, a4, a2
-;   or a1, a1, a4
+;   addi a5, zero, 0x2a
+;   bne a0, a5, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
+;   andi a5, a0, 0xff
+;   snez a5, a5
+;   neg s6, a5
+;   and a0, a1, s6
+;   and a5, a2, s6
+;   not a2, s6
+;   not a1, s6
+;   and a2, a3, a2
+;   and a1, a4, a1
+;   or a0, a0, a2
+;   or a1, a5, a1
 ;   addi sp, sp, 0x10
-;   ld s11, -8(sp)
+;   ld s6, -8(sp)
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
 ;   addi sp, sp, 0x10
@@ -724,30 +933,32 @@ block0(v0: i128, v1: i8, v2: i8):
 ; block0:
 ;   li a4,42
 ;   li a5,0
-;   xor a0,a0,a4
-;   xor a4,a1,a5
-;   or a4,a0,a4
-;   seqz a0,a4
-;   sub a5,zero,a0
-;   and a1,a5,a2
-;   not a4,a5
-;   and a5,a3,a4
-;   or a0,a1,a5
+;   eq a4,[a0,a1],[a4,a5]##ty=i128
+;   andi a4,a4,255
+;   sltu a4,zero,a4
+;   sub a0,zero,a4
+;   and a2,a2,a0
+;   not a4,a0
+;   and a0,a3,a4
+;   or a0,a2,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a4, zero, 0x2a
 ;   mv a5, zero
-;   xor a0, a0, a4
-;   xor a4, a1, a5
-;   or a4, a0, a4
-;   seqz a0, a4
-;   neg a5, a0
-;   and a1, a5, a2
-;   not a4, a5
-;   and a5, a3, a4
-;   or a0, a1, a5
+;   bne a1, a5, 0x10
+;   bne a0, a4, 0xc
+;   addi a4, zero, 1
+;   j 8
+;   mv a4, zero
+;   andi a4, a4, 0xff
+;   snez a4, a4
+;   neg a0, a4
+;   and a2, a2, a0
+;   not a4, a0
+;   and a0, a3, a4
+;   or a0, a2, a0
 ;   ret
 
 function %f(i128, i16, i16) -> i16 {
@@ -763,30 +974,32 @@ block0(v0: i128, v1: i16, v2: i16):
 ; block0:
 ;   li a4,42
 ;   li a5,0
-;   xor a0,a0,a4
-;   xor a4,a1,a5
-;   or a4,a0,a4
-;   seqz a0,a4
-;   sub a5,zero,a0
-;   and a1,a5,a2
-;   not a4,a5
-;   and a5,a3,a4
-;   or a0,a1,a5
+;   eq a4,[a0,a1],[a4,a5]##ty=i128
+;   andi a4,a4,255
+;   sltu a4,zero,a4
+;   sub a0,zero,a4
+;   and a2,a2,a0
+;   not a4,a0
+;   and a0,a3,a4
+;   or a0,a2,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a4, zero, 0x2a
 ;   mv a5, zero
-;   xor a0, a0, a4
-;   xor a4, a1, a5
-;   or a4, a0, a4
-;   seqz a0, a4
-;   neg a5, a0
-;   and a1, a5, a2
-;   not a4, a5
-;   and a5, a3, a4
-;   or a0, a1, a5
+;   bne a1, a5, 0x10
+;   bne a0, a4, 0xc
+;   addi a4, zero, 1
+;   j 8
+;   mv a4, zero
+;   andi a4, a4, 0xff
+;   snez a4, a4
+;   neg a0, a4
+;   and a2, a2, a0
+;   not a4, a0
+;   and a0, a3, a4
+;   or a0, a2, a0
 ;   ret
 
 function %f(i128, i32, i32) -> i32 {
@@ -802,30 +1015,32 @@ block0(v0: i128, v1: i32, v2: i32):
 ; block0:
 ;   li a4,42
 ;   li a5,0
-;   xor a0,a0,a4
-;   xor a4,a1,a5
-;   or a4,a0,a4
-;   seqz a0,a4
-;   sub a5,zero,a0
-;   and a1,a5,a2
-;   not a4,a5
-;   and a5,a3,a4
-;   or a0,a1,a5
+;   eq a4,[a0,a1],[a4,a5]##ty=i128
+;   andi a4,a4,255
+;   sltu a4,zero,a4
+;   sub a0,zero,a4
+;   and a2,a2,a0
+;   not a4,a0
+;   and a0,a3,a4
+;   or a0,a2,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a4, zero, 0x2a
 ;   mv a5, zero
-;   xor a0, a0, a4
-;   xor a4, a1, a5
-;   or a4, a0, a4
-;   seqz a0, a4
-;   neg a5, a0
-;   and a1, a5, a2
-;   not a4, a5
-;   and a5, a3, a4
-;   or a0, a1, a5
+;   bne a1, a5, 0x10
+;   bne a0, a4, 0xc
+;   addi a4, zero, 1
+;   j 8
+;   mv a4, zero
+;   andi a4, a4, 0xff
+;   snez a4, a4
+;   neg a0, a4
+;   and a2, a2, a0
+;   not a4, a0
+;   and a0, a3, a4
+;   or a0, a2, a0
 ;   ret
 
 function %f(i128, i64, i64) -> i64 {
@@ -841,30 +1056,32 @@ block0(v0: i128, v1: i64, v2: i64):
 ; block0:
 ;   li a4,42
 ;   li a5,0
-;   xor a0,a0,a4
-;   xor a4,a1,a5
-;   or a4,a0,a4
-;   seqz a0,a4
-;   sub a5,zero,a0
-;   and a1,a5,a2
-;   not a4,a5
-;   and a5,a3,a4
-;   or a0,a1,a5
+;   eq a4,[a0,a1],[a4,a5]##ty=i128
+;   andi a4,a4,255
+;   sltu a4,zero,a4
+;   sub a0,zero,a4
+;   and a2,a2,a0
+;   not a4,a0
+;   and a0,a3,a4
+;   or a0,a2,a0
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   addi a4, zero, 0x2a
 ;   mv a5, zero
-;   xor a0, a0, a4
-;   xor a4, a1, a5
-;   or a4, a0, a4
-;   seqz a0, a4
-;   neg a5, a0
-;   and a1, a5, a2
-;   not a4, a5
-;   and a5, a3, a4
-;   or a0, a1, a5
+;   bne a1, a5, 0x10
+;   bne a0, a4, 0xc
+;   addi a4, zero, 1
+;   j 8
+;   mv a4, zero
+;   andi a4, a4, 0xff
+;   snez a4, a4
+;   neg a0, a4
+;   and a2, a2, a0
+;   not a4, a0
+;   and a0, a3, a4
+;   or a0, a2, a0
 ;   ret
 
 function %f(i128, i128, i128) -> i128 {
@@ -877,40 +1094,65 @@ block0(v0: i128, v1: i128, v2: i128):
 }
 
 ; VCode:
+;   add sp,-16
+;   sd ra,8(sp)
+;   sd fp,0(sp)
+;   mv fp,sp
+;   sd s8,-8(sp)
+;   add sp,-16
 ; block0:
-;   li a6,42
-;   li a7,0
-;   xor a0,a0,a6
-;   xor a1,a1,a7
-;   or a0,a0,a1
-;   seqz a0,a0
-;   sub a1,zero,a0
-;   and a0,a1,a2
-;   not a2,a1
-;   and a2,a4,a2
-;   or a0,a0,a2
-;   and a2,a1,a3
-;   not a1,a1
-;   and a3,a5,a1
+;   li t2,42
+;   li a6,0
+;   eq a0,[a0,a1],[t2,a6]##ty=i128
+;   andi a0,a0,255
+;   sltu a0,zero,a0
+;   sub s8,zero,a0
+;   and a1,a2,s8
+;   and a2,a3,s8
+;   not a0,s8
+;   not a3,s8
+;   and a0,a4,a0
+;   and a3,a5,a3
+;   or a0,a1,a0
 ;   or a1,a2,a3
+;   add sp,+16
+;   ld s8,-8(sp)
+;   ld ra,8(sp)
+;   ld fp,0(sp)
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi a6, zero, 0x2a
-;   mv a7, zero
-;   xor a0, a0, a6
-;   xor a1, a1, a7
-;   or a0, a0, a1
-;   seqz a0, a0
-;   neg a1, a0
-;   and a0, a1, a2
-;   not a2, a1
-;   and a2, a4, a2
-;   or a0, a0, a2
-;   and a2, a1, a3
-;   not a1, a1
-;   and a3, a5, a1
+;   addi sp, sp, -0x10
+;   sd ra, 8(sp)
+;   sd s0, 0(sp)
+;   mv s0, sp
+;   sd s8, -8(sp)
+;   addi sp, sp, -0x10
+; block1: ; offset 0x18
+;   addi t2, zero, 0x2a
+;   mv a6, zero
+;   bne a1, a6, 0x10
+;   bne a0, t2, 0xc
+;   addi a0, zero, 1
+;   j 8
+;   mv a0, zero
+;   andi a0, a0, 0xff
+;   snez a0, a0
+;   neg s8, a0
+;   and a1, a2, s8
+;   and a2, a3, s8
+;   not a0, s8
+;   not a3, s8
+;   and a0, a4, a0
+;   and a3, a5, a3
+;   or a0, a1, a0
 ;   or a1, a2, a3
+;   addi sp, sp, 0x10
+;   ld s8, -8(sp)
+;   ld ra, 8(sp)
+;   ld s0, 0(sp)
+;   addi sp, sp, 0x10
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-abi-large-spill.clif b/cranelift/filetests/filetests/isa/riscv64/simd-abi-large-spill.clif
index bf0a2939a721..f8412ce89cde 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-abi-large-spill.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-abi-large-spill.clif
@@ -16,12 +16,12 @@ block0:
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ;   sd s1,-8(sp)
-;   addi sp,sp,-1040
+;   add sp,-1040
 ; block0:
 ;   mv s1,a0
 ;   vle16.v v11,[const(0)] #avl=8, #vtype=(e16, m1, ta, ma)
@@ -30,11 +30,11 @@ block0:
 ;   mv a0,s1
 ;   vle8.v v11,0(nominal_sp) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
-;   addi sp,sp,1040
+;   add sp,+1040
 ;   ld s1,-8(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -53,7 +53,7 @@ block0:
 ;   .byte 0x87, 0xd5, 0x0f, 0x02
 ;   .byte 0x57, 0x70, 0x08, 0xcc
 ;   .byte 0xa7, 0x05, 0x01, 0x02
-;   auipc ra, 0 ; reloc_external RiscvCallPlt u2:0 0
+;   auipc ra, 0 ; reloc_external RiscvCall u2:0 0
 ;   jalr ra
 ;   mv a0, s1
 ;   .byte 0x87, 0x05, 0x01, 0x02
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-abi.clif b/cranelift/filetests/filetests/isa/riscv64/simd-abi.clif
index a34e5c9f4704..745a584e81d8 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-abi.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-abi.clif
@@ -33,11 +33,11 @@ block0(
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   addi sp,sp,-256
+;   add sp,-256
 ; block0:
 ;   vle8.v v11,16(fp) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   vse8.v v11,0(nominal_sp) #avl=16, #vtype=(e8, m1, ta, ma)
@@ -111,10 +111,10 @@ block0(
 ;   vse8.v v13,512(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   vle8.v v11,0(nominal_sp) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   vse8.v v11,528(a0) #avl=16, #vtype=(e8, m1, ta, ma)
-;   addi sp,sp,256
+;   add sp,+256
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-avg_round.clif b/cranelift/filetests/filetests/isa/riscv64/simd-avg_round.clif
index 9b15551d687b..177fd2faf081 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-avg_round.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-avg_round.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -23,7 +23,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -55,7 +55,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -69,7 +69,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -103,7 +103,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -117,7 +117,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -151,7 +151,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -165,7 +165,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-band.clif b/cranelift/filetests/filetests/isa/riscv64/simd-band.clif
index ca7fc4897e7c..1949e2e1f65d 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-band.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-band.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -61,7 +61,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -92,7 +92,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -134,7 +134,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -178,7 +178,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -188,7 +188,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -217,7 +217,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -227,7 +227,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -258,7 +258,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -268,7 +268,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -299,7 +299,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -309,7 +309,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -339,7 +339,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -349,7 +349,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -377,7 +377,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -387,7 +387,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -417,7 +417,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -427,7 +427,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -457,7 +457,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -467,7 +467,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -498,7 +498,7 @@ block0(v0: f32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -510,7 +510,7 @@ block0(v0: f32x4, v1: i32):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -543,7 +543,7 @@ block0(v0: f64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -555,7 +555,7 @@ block0(v0: f64x2, v1: i64):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-bitselect.clif b/cranelift/filetests/filetests/isa/riscv64/simd-bitselect.clif
index 28c0092ac845..de99095ca401 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-bitselect.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-bitselect.clif
@@ -9,7 +9,7 @@ block0(v0: i64x2, v1: i64x2, v2: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -24,7 +24,7 @@ block0(v0: i64x2, v1: i64x2, v2: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -60,7 +60,7 @@ block0(v0: i32x4, v1: i32x4, v2: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -75,7 +75,7 @@ block0(v0: i32x4, v1: i32x4, v2: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -111,7 +111,7 @@ block0(v0: i16x8, v1: i16x8, v2: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -126,7 +126,7 @@ block0(v0: i16x8, v1: i16x8, v2: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -162,7 +162,7 @@ block0(v0: i8x16, v1: i8x16, v2: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -177,7 +177,7 @@ block0(v0: i8x16, v1: i8x16, v2: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -212,7 +212,7 @@ block0(v0: i64x2, v1: i64x2, v2: i64x2, v3: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -226,7 +226,7 @@ block0(v0: i64x2, v1: i64x2, v2: i64x2, v3: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -263,7 +263,7 @@ block0(v0: f64x2, v1: f64x2, v2: i64x2, v3: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -277,7 +277,7 @@ block0(v0: f64x2, v1: f64x2, v2: i64x2, v3: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -315,7 +315,7 @@ block0(v0: f64x2, v1: f64x2, v2: f64x2, v3: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -329,7 +329,7 @@ block0(v0: f64x2, v1: f64x2, v2: f64x2, v3: f64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -367,7 +367,7 @@ block0(v0: i64x2, v1: i64x2, v2: f64x2, v3: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -381,7 +381,7 @@ block0(v0: i64x2, v1: i64x2, v2: f64x2, v3: f64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-bnot.clif b/cranelift/filetests/filetests/isa/riscv64/simd-bnot.clif
index 5294220a7026..3f68009af0a4 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-bnot.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-bnot.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -20,7 +20,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -47,7 +47,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -57,7 +57,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -86,7 +86,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -96,7 +96,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -125,7 +125,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -135,7 +135,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-bor.clif b/cranelift/filetests/filetests/isa/riscv64/simd-bor.clif
index 28548799d0eb..c8a8572b6873 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-bor.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-bor.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -61,7 +61,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -92,7 +92,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -134,7 +134,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -178,7 +178,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -188,7 +188,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -217,7 +217,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -227,7 +227,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -258,7 +258,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -268,7 +268,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -299,7 +299,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -309,7 +309,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -339,7 +339,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -349,7 +349,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -377,7 +377,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -387,7 +387,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -417,7 +417,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -427,7 +427,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -457,7 +457,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -467,7 +467,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -498,7 +498,7 @@ block0(v0: f32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -510,7 +510,7 @@ block0(v0: f32x4, v1: i32):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -543,7 +543,7 @@ block0(v0: f64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -555,7 +555,7 @@ block0(v0: f64x2, v1: i64):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -579,41 +579,3 @@ block0(v0: f64x2, v1: i64):
 ;   addi sp, sp, 0x10
 ;   ret
 
-function %vi_format_with_vconst1(i8x16) -> i8x16 {
-block0(v0: i8x16):
-    v1 = vconst.i8x16 0x05050505050505050505050505050505
-    v2 = bor v0, v1
-    return v2
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-; block0:
-;   vle8.v v9,16(fp) #avl=16, #vtype=(e8, m1, ta, ma)
-;   vor.vi v12,v9,5 #avl=16, #vtype=(e8, m1, ta, ma)
-;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-; block1: ; offset 0x10
-;   .byte 0x57, 0x70, 0x08, 0xcc
-;   addi t6, s0, 0x10
-;   .byte 0x87, 0x84, 0x0f, 0x02
-;   .byte 0x57, 0xb6, 0x92, 0x2a
-;   .byte 0x27, 0x06, 0x05, 0x02
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-bxor.clif b/cranelift/filetests/filetests/isa/riscv64/simd-bxor.clif
index e0ddfbecd2e7..f8bb79bc8cb0 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-bxor.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-bxor.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -61,7 +61,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -92,7 +92,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -134,7 +134,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -178,7 +178,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -188,7 +188,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -217,7 +217,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -227,7 +227,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -258,7 +258,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -268,7 +268,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -299,7 +299,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -309,7 +309,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -339,7 +339,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -349,7 +349,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -377,7 +377,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -387,7 +387,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -417,7 +417,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -427,7 +427,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -457,7 +457,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -467,7 +467,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -498,7 +498,7 @@ block0(v0: f32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -510,7 +510,7 @@ block0(v0: f32x4, v1: i32):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -543,7 +543,7 @@ block0(v0: f64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -555,7 +555,7 @@ block0(v0: f64x2, v1: i64):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-ceil.clif b/cranelift/filetests/filetests/isa/riscv64/simd-ceil.clif
index fe097eab4f09..c6984a03561c 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-ceil.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-ceil.clif
@@ -10,7 +10,7 @@ block0(v0: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -31,7 +31,7 @@ block0(v0: f32x4):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -71,29 +71,28 @@ block0(v0: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ; block0:
 ;   vle8.v v9,16(fp) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   vfabs.v v12,v9 #avl=2, #vtype=(e64, m1, ta, ma)
-;   lui a1,1075
-;   slli a2,a1,40
-;   fmv.d.x fa4,a2
-;   vmflt.vf v0,v12,fa4 #avl=2, #vtype=(e64, m1, ta, ma)
-;   fsrmi a2,3
-;   vfcvt.x.f.v v8,v9 #avl=2, #vtype=(e64, m1, ta, ma)
-;   fsrm a2
-;   vfcvt.f.x.v v11,v8 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vfsgnj.vv v13,v11,v9 #avl=2, #vtype=(e64, m1, ta, ma)
-;   fmv.d.x fa5,zero
-;   vfadd.vf v9,v9,fa5 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vmerge.vvm v11,v9,v13,v0.t #avl=2, #vtype=(e64, m1, ta, ma)
-;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
+;   ld a1,[const(0)]
+;   fmv.d.x fa2,a1
+;   vmflt.vf v0,v12,fa2 #avl=2, #vtype=(e64, m1, ta, ma)
+;   fsrmi a1,3
+;   vfcvt.x.f.v v14,v9 #avl=2, #vtype=(e64, m1, ta, ma)
+;   fsrm a1
+;   vfcvt.f.x.v v10,v14 #avl=2, #vtype=(e64, m1, ta, ma)
+;   vfsgnj.vv v11,v10,v9 #avl=2, #vtype=(e64, m1, ta, ma)
+;   fmv.d.x fa3,zero
+;   vfadd.vf v15,v9,fa3 #avl=2, #vtype=(e64, m1, ta, ma)
+;   vmerge.vvm v9,v15,v11,v0.t #avl=2, #vtype=(e64, m1, ta, ma)
+;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -108,22 +107,25 @@ block0(v0: f64x2):
 ;   .byte 0x87, 0x84, 0x0f, 0x02
 ;   .byte 0x57, 0x70, 0x81, 0xcd
 ;   .byte 0x57, 0x96, 0x94, 0x2a
-;   lui a1, 0x433
-;   slli a2, a1, 0x28
-;   fmv.d.x fa4, a2
-;   .byte 0x57, 0x50, 0xc7, 0x6e
-;   fsrmi a2, 3
-;   .byte 0x57, 0x94, 0x90, 0x4a
-;   fsrm a2
-;   .byte 0xd7, 0x95, 0x81, 0x4a
-;   .byte 0xd7, 0x96, 0xb4, 0x22
-;   fmv.d.x fa5, zero
-;   .byte 0xd7, 0xd4, 0x97, 0x02
-;   .byte 0xd7, 0x85, 0x96, 0x5c
+;   auipc a1, 0
+;   ld a1, 0x4c(a1)
+;   fmv.d.x fa2, a1
+;   .byte 0x57, 0x50, 0xc6, 0x6e
+;   fsrmi a1, 3
+;   .byte 0x57, 0x97, 0x90, 0x4a
+;   fsrm a1
+;   .byte 0x57, 0x95, 0xe1, 0x4a
+;   .byte 0xd7, 0x95, 0xa4, 0x22
+;   fmv.d.x fa3, zero
+;   .byte 0xd7, 0xd7, 0x96, 0x02
+;   .byte 0xd7, 0x84, 0xf5, 0x5c
 ;   .byte 0x57, 0x70, 0x08, 0xcc
-;   .byte 0xa7, 0x05, 0x05, 0x02
+;   .byte 0xa7, 0x04, 0x05, 0x02
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
 ;   addi sp, sp, 0x10
 ;   ret
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0x30, 0x43
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-extractlane.clif b/cranelift/filetests/filetests/isa/riscv64/simd-extractlane.clif
index 2c4d7442faff..9909d80ef20a 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-extractlane.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-extractlane.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -18,7 +18,7 @@ block0(v0: i8x16):
 ;   vmv.x.s a0,v8 #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -44,7 +44,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -53,7 +53,7 @@ block0(v0: i16x8):
 ;   vmv.x.s a0,v8 #avl=8, #vtype=(e16, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -80,7 +80,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -89,7 +89,7 @@ block0(v0: i32x4):
 ;   vmv.x.s a0,v8 #avl=4, #vtype=(e32, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -116,7 +116,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -125,7 +125,7 @@ block0(v0: i64x2):
 ;   vmv.x.s a0,v8 #avl=2, #vtype=(e64, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -152,7 +152,7 @@ block0(v0: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -161,7 +161,7 @@ block0(v0: f32x4):
 ;   vfmv.f.s fa0,v8 #avl=4, #vtype=(e32, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -188,7 +188,7 @@ block0(v0: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -197,7 +197,7 @@ block0(v0: f64x2):
 ;   vfmv.f.s fa0,v8 #avl=2, #vtype=(e64, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -224,7 +224,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -234,7 +234,7 @@ block0(v0: i8x16):
 ;   vmv.x.s a0,v10 #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -261,7 +261,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -271,7 +271,7 @@ block0(v0: i16x8):
 ;   vmv.x.s a0,v10 #avl=8, #vtype=(e16, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -299,7 +299,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -309,7 +309,7 @@ block0(v0: i32x4):
 ;   vmv.x.s a0,v10 #avl=4, #vtype=(e32, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -337,7 +337,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -347,7 +347,7 @@ block0(v0: i64x2):
 ;   vmv.x.s a0,v10 #avl=2, #vtype=(e64, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -375,7 +375,7 @@ block0(v0: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -385,7 +385,7 @@ block0(v0: f32x4):
 ;   vfmv.f.s fa0,v10 #avl=4, #vtype=(e32, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -413,7 +413,7 @@ block0(v0: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -423,7 +423,7 @@ block0(v0: f64x2):
 ;   vfmv.f.s fa0,v10 #avl=2, #vtype=(e64, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fabs.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fabs.clif
index 01c7ceb2fa4f..00b86eb6435c 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fabs.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fabs.clif
@@ -10,7 +10,7 @@ block0(v0: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -20,7 +20,7 @@ block0(v0: f32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -49,7 +49,7 @@ block0(v0: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -59,7 +59,7 @@ block0(v0: f64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fadd.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fadd.clif
index 1f5d0c441856..05fda7b7bda4 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fadd.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fadd.clif
@@ -10,7 +10,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -53,7 +53,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -63,7 +63,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -93,7 +93,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -132,7 +132,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -143,7 +143,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -175,7 +175,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -185,7 +185,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -215,7 +215,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -225,7 +225,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-eq.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-eq.clif
index b4172f85d38c..390dd4222088 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-eq.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-eq.clif
@@ -9,7 +9,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -56,7 +56,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -68,7 +68,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -100,7 +100,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -112,7 +112,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -143,7 +143,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -156,7 +156,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -190,7 +190,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -202,7 +202,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -234,7 +234,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -246,7 +246,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ge.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ge.clif
index 71153719e33e..a3065e0c635f 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ge.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ge.clif
@@ -9,7 +9,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -56,7 +56,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -68,7 +68,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -100,7 +100,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -112,7 +112,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -143,7 +143,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -156,7 +156,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -190,7 +190,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -202,7 +202,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -234,7 +234,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -246,7 +246,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-gt.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-gt.clif
index b7324078a922..c32517bacd53 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-gt.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-gt.clif
@@ -9,7 +9,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -56,7 +56,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -68,7 +68,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -100,7 +100,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -112,7 +112,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -143,7 +143,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -156,7 +156,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -190,7 +190,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -202,7 +202,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -234,7 +234,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -246,7 +246,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-le.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-le.clif
index 81fba540ad74..46b36e8cf4fc 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-le.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-le.clif
@@ -9,7 +9,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -56,7 +56,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -68,7 +68,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -100,7 +100,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -112,7 +112,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -143,7 +143,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -156,7 +156,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -190,7 +190,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -202,7 +202,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -234,7 +234,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -246,7 +246,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-lt.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-lt.clif
index 0f6d6a055afc..7f8598a6f7a3 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-lt.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-lt.clif
@@ -9,7 +9,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -56,7 +56,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -68,7 +68,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -100,7 +100,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -112,7 +112,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -143,7 +143,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -156,7 +156,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -190,7 +190,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -202,7 +202,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -234,7 +234,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -246,7 +246,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ne.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ne.clif
index c18bdeb8af33..a4de7165366c 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ne.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ne.clif
@@ -9,7 +9,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -56,7 +56,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -68,7 +68,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -100,7 +100,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -112,7 +112,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -143,7 +143,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -156,7 +156,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -190,7 +190,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -202,7 +202,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -234,7 +234,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -246,7 +246,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-one.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-one.clif
index 1a52672a82e1..1e7133dc3122 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-one.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-one.clif
@@ -9,7 +9,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -24,7 +24,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -60,7 +60,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -74,7 +74,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -108,7 +108,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -122,7 +122,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -155,7 +155,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -170,7 +170,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -206,7 +206,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -220,7 +220,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -254,7 +254,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -268,7 +268,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ord.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ord.clif
index 05570df2d465..bb205fa4bb15 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ord.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ord.clif
@@ -9,7 +9,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -24,7 +24,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -60,7 +60,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -75,7 +75,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -110,7 +110,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -125,7 +125,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -159,7 +159,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -174,7 +174,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -210,7 +210,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -225,7 +225,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -260,7 +260,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -275,7 +275,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ueq.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ueq.clif
index ea09d580f0c0..d72aa86b8680 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ueq.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ueq.clif
@@ -9,7 +9,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -24,7 +24,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -60,7 +60,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -74,7 +74,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -108,7 +108,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -122,7 +122,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -155,7 +155,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -170,7 +170,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -206,7 +206,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -220,7 +220,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -254,7 +254,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -268,7 +268,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-uge.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-uge.clif
index 6f41f5c049eb..ea013e1cc11e 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-uge.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-uge.clif
@@ -9,7 +9,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -23,7 +23,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -58,7 +58,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -71,7 +71,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -104,7 +104,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -117,7 +117,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -149,7 +149,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -163,7 +163,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -198,7 +198,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -211,7 +211,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -244,7 +244,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -257,7 +257,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ugt.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ugt.clif
index 4e1699a4037c..4d4b66e0d492 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ugt.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ugt.clif
@@ -9,7 +9,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -23,7 +23,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -58,7 +58,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -71,7 +71,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -104,7 +104,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -117,7 +117,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -149,7 +149,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -163,7 +163,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -198,7 +198,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -211,7 +211,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -244,7 +244,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -257,7 +257,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ule.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ule.clif
index 82c6afbf6e96..f681473ba5cf 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ule.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ule.clif
@@ -9,7 +9,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -23,7 +23,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -58,7 +58,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -71,7 +71,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -104,7 +104,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -117,7 +117,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -149,7 +149,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -163,7 +163,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -198,7 +198,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -211,7 +211,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -244,7 +244,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -257,7 +257,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ult.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ult.clif
index 4eba6dd736ba..55f1717560f4 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ult.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-ult.clif
@@ -9,7 +9,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -23,7 +23,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -58,7 +58,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -71,7 +71,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -104,7 +104,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -117,7 +117,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -149,7 +149,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -163,7 +163,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -198,7 +198,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -211,7 +211,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -244,7 +244,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -257,7 +257,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-uno.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-uno.clif
index 215290eb433f..3e53a4b08a1b 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-uno.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcmp-uno.clif
@@ -9,7 +9,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -24,7 +24,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -60,7 +60,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -75,7 +75,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -110,7 +110,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -125,7 +125,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -159,7 +159,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -174,7 +174,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -210,7 +210,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -225,7 +225,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -260,7 +260,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -275,7 +275,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcopysign.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcopysign.clif
index 96c92b6e4218..e0713247ef11 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcopysign.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcopysign.clif
@@ -10,7 +10,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -53,7 +53,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -63,7 +63,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -92,7 +92,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -135,7 +135,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -145,7 +145,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcvt-from-sint.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcvt-from-sint.clif
index a47ca2bf1755..f147616965cc 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcvt-from-sint.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcvt-from-sint.clif
@@ -9,7 +9,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -19,7 +19,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcvt-from-uint.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcvt-from-uint.clif
index 291ccddfb325..7c9d707b135b 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcvt-from-uint.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcvt-from-uint.clif
@@ -9,7 +9,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -19,7 +19,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcvt-to-sint-sat.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcvt-to-sint-sat.clif
index 115480850070..486b19c7aff3 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcvt-to-sint-sat.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcvt-to-sint-sat.clif
@@ -9,7 +9,7 @@ block0(v0:f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0:f32x4):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fcvt-to-uint-sat.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fcvt-to-uint-sat.clif
index 25cd7ccea2da..28c2054a8f8c 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fcvt-to-uint-sat.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fcvt-to-uint-sat.clif
@@ -9,7 +9,7 @@ block0(v0:f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0:f32x4):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fdiv.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fdiv.clif
index 6de269362ca1..d8697b6d92bc 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fdiv.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fdiv.clif
@@ -10,7 +10,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -53,7 +53,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -63,7 +63,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -93,7 +93,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -132,7 +132,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -143,7 +143,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -175,7 +175,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -185,7 +185,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -215,7 +215,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -225,7 +225,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-floor.clif b/cranelift/filetests/filetests/isa/riscv64/simd-floor.clif
index 1068497f1c4f..3f577bcc0908 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-floor.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-floor.clif
@@ -10,7 +10,7 @@ block0(v0: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -31,7 +31,7 @@ block0(v0: f32x4):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -71,29 +71,28 @@ block0(v0: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ; block0:
 ;   vle8.v v9,16(fp) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   vfabs.v v12,v9 #avl=2, #vtype=(e64, m1, ta, ma)
-;   lui a1,1075
-;   slli a2,a1,40
-;   fmv.d.x fa4,a2
-;   vmflt.vf v0,v12,fa4 #avl=2, #vtype=(e64, m1, ta, ma)
-;   fsrmi a2,2
-;   vfcvt.x.f.v v8,v9 #avl=2, #vtype=(e64, m1, ta, ma)
-;   fsrm a2
-;   vfcvt.f.x.v v11,v8 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vfsgnj.vv v13,v11,v9 #avl=2, #vtype=(e64, m1, ta, ma)
-;   fmv.d.x fa5,zero
-;   vfadd.vf v9,v9,fa5 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vmerge.vvm v11,v9,v13,v0.t #avl=2, #vtype=(e64, m1, ta, ma)
-;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
+;   ld a1,[const(0)]
+;   fmv.d.x fa2,a1
+;   vmflt.vf v0,v12,fa2 #avl=2, #vtype=(e64, m1, ta, ma)
+;   fsrmi a1,2
+;   vfcvt.x.f.v v14,v9 #avl=2, #vtype=(e64, m1, ta, ma)
+;   fsrm a1
+;   vfcvt.f.x.v v10,v14 #avl=2, #vtype=(e64, m1, ta, ma)
+;   vfsgnj.vv v11,v10,v9 #avl=2, #vtype=(e64, m1, ta, ma)
+;   fmv.d.x fa3,zero
+;   vfadd.vf v15,v9,fa3 #avl=2, #vtype=(e64, m1, ta, ma)
+;   vmerge.vvm v9,v15,v11,v0.t #avl=2, #vtype=(e64, m1, ta, ma)
+;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -108,22 +107,25 @@ block0(v0: f64x2):
 ;   .byte 0x87, 0x84, 0x0f, 0x02
 ;   .byte 0x57, 0x70, 0x81, 0xcd
 ;   .byte 0x57, 0x96, 0x94, 0x2a
-;   lui a1, 0x433
-;   slli a2, a1, 0x28
-;   fmv.d.x fa4, a2
-;   .byte 0x57, 0x50, 0xc7, 0x6e
-;   fsrmi a2, 2
-;   .byte 0x57, 0x94, 0x90, 0x4a
-;   fsrm a2
-;   .byte 0xd7, 0x95, 0x81, 0x4a
-;   .byte 0xd7, 0x96, 0xb4, 0x22
-;   fmv.d.x fa5, zero
-;   .byte 0xd7, 0xd4, 0x97, 0x02
-;   .byte 0xd7, 0x85, 0x96, 0x5c
+;   auipc a1, 0
+;   ld a1, 0x4c(a1)
+;   fmv.d.x fa2, a1
+;   .byte 0x57, 0x50, 0xc6, 0x6e
+;   fsrmi a1, 2
+;   .byte 0x57, 0x97, 0x90, 0x4a
+;   fsrm a1
+;   .byte 0x57, 0x95, 0xe1, 0x4a
+;   .byte 0xd7, 0x95, 0xa4, 0x22
+;   fmv.d.x fa3, zero
+;   .byte 0xd7, 0xd7, 0x96, 0x02
+;   .byte 0xd7, 0x84, 0xf5, 0x5c
 ;   .byte 0x57, 0x70, 0x08, 0xcc
-;   .byte 0xa7, 0x05, 0x05, 0x02
+;   .byte 0xa7, 0x04, 0x05, 0x02
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
 ;   addi sp, sp, 0x10
 ;   ret
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0x30, 0x43
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fma.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fma.clif
index 4516a7b3b378..2c9e1f8e852c 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fma.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fma.clif
@@ -9,7 +9,7 @@ block0(v0: f64x2, v1: f64x2, v2: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: f64x2, v1: f64x2, v2: f64x2):
 ;   vse8.v v15,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -55,7 +55,7 @@ block0(v0: f64, v1: f64x2, v2: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -66,7 +66,7 @@ block0(v0: f64, v1: f64x2, v2: f64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -98,7 +98,7 @@ block0(v0: f64x2, v1: f64x2, v2: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -110,7 +110,7 @@ block0(v0: f64x2, v1: f64x2, v2: f64x2):
 ;   vse8.v v15,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -145,7 +145,7 @@ block0(v0: f64, v1: f64x2, v2: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -156,7 +156,7 @@ block0(v0: f64, v1: f64x2, v2: f64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -189,7 +189,7 @@ block0(v0: f64x2, v1: f64x2, v2: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -201,7 +201,7 @@ block0(v0: f64x2, v1: f64x2, v2: f64x2):
 ;   vse8.v v15,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -237,7 +237,7 @@ block0(v0: f64, v1: f64x2, v2: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -248,7 +248,7 @@ block0(v0: f64, v1: f64x2, v2: f64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -280,7 +280,7 @@ block0(v0: f64x2, v1: f64x2, v2: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -292,7 +292,7 @@ block0(v0: f64x2, v1: f64x2, v2: f64x2):
 ;   vse8.v v15,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -327,7 +327,7 @@ block0(v0: f64, v1: f64x2, v2: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -338,7 +338,7 @@ block0(v0: f64, v1: f64x2, v2: f64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fmax.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fmax.clif
index 2194f700b4f1..8280e98eee98 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fmax.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fmax.clif
@@ -9,7 +9,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -19,15 +19,14 @@ block0(v0: f64x2, v1: f64x2):
 ;   vmfeq.vv v14,v9,v9 #avl=2, #vtype=(e64, m1, ta, ma)
 ;   vmfeq.vv v8,v11,v11 #avl=2, #vtype=(e64, m1, ta, ma)
 ;   vmand.mm v0,v14,v8 #avl=2, #vtype=(e64, m1, ta, ma)
-;   lui a1,4095
-;   slli a2,a1,39
-;   vmv.v.x v8,a2 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vfmax.vv v10,v9,v11 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vmerge.vvm v12,v8,v10,v0.t #avl=2, #vtype=(e64, m1, ta, ma)
-;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
+;   ld a1,[const(0)]
+;   vmv.v.x v14,a1 #avl=2, #vtype=(e64, m1, ta, ma)
+;   vfmax.vv v8,v9,v11 #avl=2, #vtype=(e64, m1, ta, ma)
+;   vmerge.vvm v10,v14,v8,v0.t #avl=2, #vtype=(e64, m1, ta, ma)
+;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -46,17 +45,19 @@ block0(v0: f64x2, v1: f64x2):
 ;   .byte 0x57, 0x97, 0x94, 0x62
 ;   .byte 0x57, 0x94, 0xb5, 0x62
 ;   .byte 0x57, 0x20, 0xe4, 0x66
-;   lui a1, 0xfff
-;   slli a2, a1, 0x27
-;   .byte 0x57, 0x44, 0x06, 0x5e
-;   .byte 0x57, 0x95, 0x95, 0x1a
-;   .byte 0x57, 0x06, 0x85, 0x5c
+;   auipc a1, 0
+;   ld a1, 0x2c(a1)
+;   .byte 0x57, 0xc7, 0x05, 0x5e
+;   .byte 0x57, 0x94, 0x95, 0x1a
+;   .byte 0x57, 0x05, 0xe4, 0x5c
 ;   .byte 0x57, 0x70, 0x08, 0xcc
-;   .byte 0x27, 0x06, 0x05, 0x02
+;   .byte 0x27, 0x05, 0x05, 0x02
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
 ;   addi sp, sp, 0x10
 ;   ret
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0xf8, 0x7f
 
 function %fmax_f32x4(f32x4, f32x4) -> f32x4 {
 block0(v0: f32x4, v1: f32x4):
@@ -65,7 +66,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -82,7 +83,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fmin.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fmin.clif
index d5f05594ea32..c802bf396652 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fmin.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fmin.clif
@@ -9,7 +9,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -19,15 +19,14 @@ block0(v0: f64x2, v1: f64x2):
 ;   vmfeq.vv v14,v9,v9 #avl=2, #vtype=(e64, m1, ta, ma)
 ;   vmfeq.vv v8,v11,v11 #avl=2, #vtype=(e64, m1, ta, ma)
 ;   vmand.mm v0,v14,v8 #avl=2, #vtype=(e64, m1, ta, ma)
-;   lui a1,4095
-;   slli a2,a1,39
-;   vmv.v.x v8,a2 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vfmin.vv v10,v9,v11 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vmerge.vvm v12,v8,v10,v0.t #avl=2, #vtype=(e64, m1, ta, ma)
-;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
+;   ld a1,[const(0)]
+;   vmv.v.x v14,a1 #avl=2, #vtype=(e64, m1, ta, ma)
+;   vfmin.vv v8,v9,v11 #avl=2, #vtype=(e64, m1, ta, ma)
+;   vmerge.vvm v10,v14,v8,v0.t #avl=2, #vtype=(e64, m1, ta, ma)
+;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -46,17 +45,19 @@ block0(v0: f64x2, v1: f64x2):
 ;   .byte 0x57, 0x97, 0x94, 0x62
 ;   .byte 0x57, 0x94, 0xb5, 0x62
 ;   .byte 0x57, 0x20, 0xe4, 0x66
-;   lui a1, 0xfff
-;   slli a2, a1, 0x27
-;   .byte 0x57, 0x44, 0x06, 0x5e
-;   .byte 0x57, 0x95, 0x95, 0x12
-;   .byte 0x57, 0x06, 0x85, 0x5c
+;   auipc a1, 0
+;   ld a1, 0x2c(a1)
+;   .byte 0x57, 0xc7, 0x05, 0x5e
+;   .byte 0x57, 0x94, 0x95, 0x12
+;   .byte 0x57, 0x05, 0xe4, 0x5c
 ;   .byte 0x57, 0x70, 0x08, 0xcc
-;   .byte 0x27, 0x06, 0x05, 0x02
+;   .byte 0x27, 0x05, 0x05, 0x02
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
 ;   addi sp, sp, 0x10
 ;   ret
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0xf8, 0x7f
 
 function %fmin_f32x4(f32x4, f32x4) -> f32x4 {
 block0(v0: f32x4, v1: f32x4):
@@ -65,7 +66,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -82,7 +83,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fmul.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fmul.clif
index e7a648854ed2..0f2cfe700fb3 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fmul.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fmul.clif
@@ -10,7 +10,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -53,7 +53,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -63,7 +63,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -93,7 +93,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -132,7 +132,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -143,7 +143,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -175,7 +175,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -185,7 +185,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -215,7 +215,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -225,7 +225,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fneg.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fneg.clif
index a8831d185d1f..7fdfe5e957fb 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fneg.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fneg.clif
@@ -10,7 +10,7 @@ block0(v0: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -20,7 +20,7 @@ block0(v0: f32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -49,7 +49,7 @@ block0(v0: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -59,7 +59,7 @@ block0(v0: f64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fsub.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fsub.clif
index 9fd0a65f8d9d..236a509525ea 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fsub.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fsub.clif
@@ -10,7 +10,7 @@ block0(v0: f32x4, v1: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: f32x4, v1: f32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -53,7 +53,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -63,7 +63,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -93,7 +93,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -132,7 +132,7 @@ block0(v0: f64x2, v1: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -143,7 +143,7 @@ block0(v0: f64x2, v1: f64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -175,7 +175,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -185,7 +185,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -215,7 +215,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -225,7 +225,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fvdemote.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fvdemote.clif
index 596ac1cae1ac..7f679b97f14b 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fvdemote.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fvdemote.clif
@@ -9,7 +9,7 @@ block0(v0: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: f64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-fvpromote-low.clif b/cranelift/filetests/filetests/isa/riscv64/simd-fvpromote-low.clif
index d96df57403db..663abbdfe313 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-fvpromote-low.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-fvpromote-low.clif
@@ -9,7 +9,7 @@ block0(v0: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -19,7 +19,7 @@ block0(v0: f32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-iabs.clif b/cranelift/filetests/filetests/isa/riscv64/simd-iabs.clif
index 768a3719c4c5..4b1df26d4f11 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-iabs.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-iabs.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -20,7 +20,7 @@ block0(v0: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -48,7 +48,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -59,7 +59,7 @@ block0(v0: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -89,7 +89,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -100,7 +100,7 @@ block0(v0: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -130,7 +130,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -141,7 +141,7 @@ block0(v0: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-iadd-big.clif b/cranelift/filetests/filetests/isa/riscv64/simd-iadd-big.clif
index 8940f4595009..80bc76d5f8b2 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-iadd-big.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-iadd-big.clif
@@ -11,7 +11,7 @@ block0(v0:i64x4, v1:i64x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0:i64x4, v1:i64x4):
 ;   vse16.v v14,0(a0) #avl=16, #vtype=(e16, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -53,7 +53,7 @@ block0(v0:i64x8, v1:i64x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -64,7 +64,7 @@ block0(v0:i64x8, v1:i64x8):
 ;   vse32.v v14,0(a0) #avl=16, #vtype=(e32, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-iadd-small.clif b/cranelift/filetests/filetests/isa/riscv64/simd-iadd-small.clif
index 0caed54df132..44ed615b2dcd 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-iadd-small.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-iadd-small.clif
@@ -10,7 +10,7 @@ block0(v0:i8x8, v1:i8x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0:i8x8, v1:i8x8):
 ;   vse8.v v14,0(a0) #avl=8, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0:i16x4, v1:i16x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -61,7 +61,7 @@ block0(v0:i16x4, v1:i16x4):
 ;   vse8.v v14,0(a0) #avl=8, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -92,7 +92,7 @@ block0(v0:i32x2, v1:i32x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0:i32x2, v1:i32x2):
 ;   vse8.v v14,0(a0) #avl=8, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-iadd-splat-extend.clif b/cranelift/filetests/filetests/isa/riscv64/simd-iadd-splat-extend.clif
index 71ae5a208757..1b4566fa6c2e 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-iadd-splat-extend.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-iadd-splat-extend.clif
@@ -11,7 +11,7 @@ block0(v0: i16x8, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i16x8, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -52,7 +52,7 @@ block0(v0: i32x4, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -62,7 +62,7 @@ block0(v0: i32x4, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -93,7 +93,7 @@ block0(v0: i64x2, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: i64x2, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -134,7 +134,7 @@ block0(v0: i16x8, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -144,7 +144,7 @@ block0(v0: i16x8, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -175,7 +175,7 @@ block0(v0: i32x4, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -185,7 +185,7 @@ block0(v0: i32x4, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -216,7 +216,7 @@ block0(v0: i64x2, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -226,7 +226,7 @@ block0(v0: i64x2, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-iadd-swiden-high.clif b/cranelift/filetests/filetests/isa/riscv64/simd-iadd-swiden-high.clif
index 1ab8dae43ab9..9dde4aeb2c30 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-iadd-swiden-high.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-iadd-swiden-high.clif
@@ -11,7 +11,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -24,7 +24,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -60,7 +60,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -73,7 +73,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -109,7 +109,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -122,7 +122,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -158,7 +158,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -169,7 +169,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -203,7 +203,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -214,7 +214,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -248,7 +248,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -259,7 +259,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -290,7 +290,7 @@ block0(v0: i32x4, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -302,7 +302,7 @@ block0(v0: i32x4, v1: i64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -336,7 +336,7 @@ block0(v0: i16x8, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -348,7 +348,7 @@ block0(v0: i16x8, v1: i32x4):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -382,7 +382,7 @@ block0(v0: i8x16, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -394,7 +394,7 @@ block0(v0: i8x16, v1: i16x8):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-iadd-swiden-low.clif b/cranelift/filetests/filetests/isa/riscv64/simd-iadd-swiden-low.clif
index 937b9c1f1c41..0c945c0b4f63 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-iadd-swiden-low.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-iadd-swiden-low.clif
@@ -11,7 +11,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -55,7 +55,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -66,7 +66,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -99,7 +99,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -110,7 +110,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -144,7 +144,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -154,7 +154,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -186,7 +186,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -196,7 +196,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -228,7 +228,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -238,7 +238,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -268,7 +268,7 @@ block0(v0: i32x4, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -279,7 +279,7 @@ block0(v0: i32x4, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -311,7 +311,7 @@ block0(v0: i16x8, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -322,7 +322,7 @@ block0(v0: i16x8, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -354,7 +354,7 @@ block0(v0: i8x16, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -365,7 +365,7 @@ block0(v0: i8x16, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -397,7 +397,7 @@ block0(v0: i8x16, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -408,7 +408,7 @@ block0(v0: i8x16, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-iadd-swiden-mix.clif b/cranelift/filetests/filetests/isa/riscv64/simd-iadd-swiden-mix.clif
index 64c92bd494f0..994101d965f3 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-iadd-swiden-mix.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-iadd-swiden-mix.clif
@@ -11,7 +11,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -23,7 +23,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -58,7 +58,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -70,7 +70,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -105,7 +105,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -117,7 +117,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -151,7 +151,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -163,7 +163,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -198,7 +198,7 @@ block0(v0: i16x8, v1:i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -210,7 +210,7 @@ block0(v0: i16x8, v1:i16x8):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -245,7 +245,7 @@ block0(v0: i8x16, v1:i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -257,7 +257,7 @@ block0(v0: i8x16, v1:i8x16):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-iadd-uwiden-high.clif b/cranelift/filetests/filetests/isa/riscv64/simd-iadd-uwiden-high.clif
index dba35943c253..b421b79b3707 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-iadd-uwiden-high.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-iadd-uwiden-high.clif
@@ -12,7 +12,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -25,7 +25,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -61,7 +61,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -74,7 +74,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -110,7 +110,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -123,7 +123,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -159,7 +159,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -170,7 +170,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -204,7 +204,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -215,7 +215,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -249,7 +249,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -260,7 +260,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -291,7 +291,7 @@ block0(v0: i32x4, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -303,7 +303,7 @@ block0(v0: i32x4, v1: i64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -337,7 +337,7 @@ block0(v0: i16x8, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -349,7 +349,7 @@ block0(v0: i16x8, v1: i32x4):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -383,7 +383,7 @@ block0(v0: i8x16, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -395,7 +395,7 @@ block0(v0: i8x16, v1: i16x8):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-iadd-uwiden-low.clif b/cranelift/filetests/filetests/isa/riscv64/simd-iadd-uwiden-low.clif
index e8472ab9c08b..e12f9e37bc14 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-iadd-uwiden-low.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-iadd-uwiden-low.clif
@@ -12,7 +12,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -23,7 +23,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -56,7 +56,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -67,7 +67,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -100,7 +100,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -111,7 +111,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -145,7 +145,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -155,7 +155,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -187,7 +187,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -197,7 +197,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -229,7 +229,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -239,7 +239,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -269,7 +269,7 @@ block0(v0: i32x4, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -280,7 +280,7 @@ block0(v0: i32x4, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -312,7 +312,7 @@ block0(v0: i16x8, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -323,7 +323,7 @@ block0(v0: i16x8, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -355,7 +355,7 @@ block0(v0: i8x16, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -366,7 +366,7 @@ block0(v0: i8x16, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-iadd-uwiden-mix.clif b/cranelift/filetests/filetests/isa/riscv64/simd-iadd-uwiden-mix.clif
index 23434503bf98..268a2446841c 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-iadd-uwiden-mix.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-iadd-uwiden-mix.clif
@@ -13,7 +13,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -25,7 +25,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -60,7 +60,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -72,7 +72,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -107,7 +107,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -119,7 +119,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -153,7 +153,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -165,7 +165,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -200,7 +200,7 @@ block0(v0: i16x8, v1:i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -212,7 +212,7 @@ block0(v0: i16x8, v1:i16x8):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -247,7 +247,7 @@ block0(v0: i8x16, v1:i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -259,7 +259,7 @@ block0(v0: i8x16, v1:i8x16):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-iadd.clif b/cranelift/filetests/filetests/isa/riscv64/simd-iadd.clif
index 709b8729c8e1..a348e3639c31 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-iadd.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-iadd.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -61,7 +61,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -92,7 +92,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -134,7 +134,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -178,7 +178,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -188,7 +188,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -217,7 +217,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -227,7 +227,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -258,7 +258,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -268,7 +268,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -299,7 +299,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -309,7 +309,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -339,7 +339,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -349,7 +349,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -377,7 +377,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -387,7 +387,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -417,7 +417,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -427,7 +427,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -457,7 +457,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -467,7 +467,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-iadd_pairwise.clif b/cranelift/filetests/filetests/isa/riscv64/simd-iadd_pairwise.clif
index 097059268bfb..dbf3f4b4e0e9 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-iadd_pairwise.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-iadd_pairwise.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -30,7 +30,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -80,7 +80,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -101,7 +101,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -151,7 +151,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -172,7 +172,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-eq.clif b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-eq.clif
index 916c5ee0a43b..0facac260b13 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-eq.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-eq.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -53,7 +53,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -66,7 +66,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -99,7 +99,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -112,7 +112,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -158,7 +158,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -192,7 +192,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -204,7 +204,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v9,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -236,7 +236,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -248,7 +248,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v9,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -281,7 +281,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -293,7 +293,7 @@ block0(v0: i64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -326,7 +326,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -338,7 +338,7 @@ block0(v0: i64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-ne.clif b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-ne.clif
index ec0c9e4f1af1..954f5745bfb3 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-ne.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-ne.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -53,7 +53,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -66,7 +66,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -99,7 +99,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -112,7 +112,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -158,7 +158,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -192,7 +192,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -204,7 +204,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v9,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -236,7 +236,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -248,7 +248,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v9,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -281,7 +281,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -293,7 +293,7 @@ block0(v0: i64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -326,7 +326,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -338,7 +338,7 @@ block0(v0: i64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-sge.clif b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-sge.clif
index 30ef1e7d3cec..6c901cf7ee4e 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-sge.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-sge.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -53,7 +53,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -66,7 +66,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -99,7 +99,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -112,7 +112,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -158,7 +158,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -192,7 +192,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -205,7 +205,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v10,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -238,7 +238,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -250,7 +250,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v9,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -283,7 +283,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -296,7 +296,7 @@ block0(v0: i64x2):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -330,7 +330,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -342,7 +342,7 @@ block0(v0: i64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-sgt.clif b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-sgt.clif
index c93a978cbaf2..4bef12eb57e3 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-sgt.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-sgt.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -53,7 +53,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -66,7 +66,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -99,7 +99,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -112,7 +112,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -158,7 +158,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -192,7 +192,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -204,7 +204,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v9,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -236,7 +236,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -248,7 +248,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v9,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -281,7 +281,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -293,7 +293,7 @@ block0(v0: i64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -326,7 +326,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -339,7 +339,7 @@ block0(v0: i64x2):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-sle.clif b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-sle.clif
index 1f0c95503f46..9fc9ca183154 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-sle.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-sle.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -53,7 +53,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -66,7 +66,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -99,7 +99,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -112,7 +112,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -158,7 +158,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -192,7 +192,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -204,7 +204,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v9,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -236,7 +236,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -249,7 +249,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v10,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -283,7 +283,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -295,7 +295,7 @@ block0(v0: i64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -328,7 +328,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -341,7 +341,7 @@ block0(v0: i64x2):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-slt.clif b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-slt.clif
index ef9b3adde8cf..bb00daef7743 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-slt.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-slt.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -53,7 +53,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -66,7 +66,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -99,7 +99,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -112,7 +112,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -158,7 +158,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -192,7 +192,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -204,7 +204,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v9,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -236,7 +236,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -248,7 +248,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v9,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -281,7 +281,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -294,7 +294,7 @@ block0(v0: i64x2):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -328,7 +328,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -340,7 +340,7 @@ block0(v0: i64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-uge.clif b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-uge.clif
index f4ad821dc7ef..038204e521b4 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-uge.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-uge.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -53,7 +53,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -66,7 +66,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -99,7 +99,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -112,7 +112,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -158,7 +158,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -192,7 +192,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -205,7 +205,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v10,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -238,7 +238,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -250,7 +250,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v9,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -283,7 +283,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -296,7 +296,7 @@ block0(v0: i64x2):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -330,7 +330,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -342,7 +342,7 @@ block0(v0: i64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-ugt.clif b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-ugt.clif
index ccecba0d3ff2..9596c6ff5e5e 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-ugt.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-ugt.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -53,7 +53,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -66,7 +66,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -99,7 +99,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -112,7 +112,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -158,7 +158,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -192,7 +192,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -204,7 +204,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v9,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -236,7 +236,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -248,7 +248,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v9,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -281,7 +281,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -293,7 +293,7 @@ block0(v0: i64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -326,7 +326,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -339,7 +339,7 @@ block0(v0: i64x2):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-ule.clif b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-ule.clif
index ec107e01bba5..5d0955e2fa31 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-ule.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-ule.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -53,7 +53,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -66,7 +66,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -99,7 +99,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -112,7 +112,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -158,7 +158,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -192,7 +192,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -204,7 +204,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v9,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -236,7 +236,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -249,7 +249,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v10,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -283,7 +283,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -295,7 +295,7 @@ block0(v0: i64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -328,7 +328,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -341,7 +341,7 @@ block0(v0: i64x2):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-ult.clif b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-ult.clif
index ea7b28513deb..3c364d68709b 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-icmp-ult.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-icmp-ult.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -53,7 +53,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -66,7 +66,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -99,7 +99,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -112,7 +112,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -158,7 +158,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -192,7 +192,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -204,7 +204,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v9,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -236,7 +236,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -248,7 +248,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v9,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -281,7 +281,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -294,7 +294,7 @@ block0(v0: i64x2):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -328,7 +328,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -340,7 +340,7 @@ block0(v0: i64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-ifma.clif b/cranelift/filetests/filetests/isa/riscv64/simd-ifma.clif
index 527da27d25db..53233fc827bd 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-ifma.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-ifma.clif
@@ -11,7 +11,7 @@ block0(v0: i64x2, v1: i64x2, v2: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -23,7 +23,7 @@ block0(v0: i64x2, v1: i64x2, v2: i64x2):
 ;   vse8.v v15,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -58,7 +58,7 @@ block0(v0: i64x2, v1: i64x2, v2: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -70,7 +70,7 @@ block0(v0: i64x2, v1: i64x2, v2: i64):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -104,7 +104,7 @@ block0(v0: i64x2, v1: i64x2, v2: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -116,7 +116,7 @@ block0(v0: i64x2, v1: i64x2, v2: i64x2):
 ;   vse8.v v15,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -152,7 +152,7 @@ block0(v0: i64x2, v1: i64x2, v2: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -164,7 +164,7 @@ block0(v0: i64x2, v1: i64x2, v2: i64):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -197,7 +197,7 @@ block0(v0: i64x2, v1: i64x2, v2: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -210,7 +210,7 @@ block0(v0: i64x2, v1: i64x2, v2: i64x2):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -246,7 +246,7 @@ block0(v0: i64x2, v1: i64x2, v2: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -258,7 +258,7 @@ block0(v0: i64x2, v1: i64x2, v2: i64):
 ;   vse8.v v8,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-imul.clif b/cranelift/filetests/filetests/isa/riscv64/simd-imul.clif
index 35648587fdda..14409bfa0353 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-imul.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-imul.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -61,7 +61,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -92,7 +92,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -134,7 +134,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -177,7 +177,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -187,7 +187,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -215,7 +215,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -225,7 +225,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -255,7 +255,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -265,7 +265,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -295,7 +295,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -305,7 +305,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-ineg.clif b/cranelift/filetests/filetests/isa/riscv64/simd-ineg.clif
index 19dfd4bc2278..7b3b74a5d2c1 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-ineg.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-ineg.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -20,7 +20,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -47,7 +47,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -57,7 +57,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -86,7 +86,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -96,7 +96,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -125,7 +125,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -135,7 +135,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-insertlane.clif b/cranelift/filetests/filetests/isa/riscv64/simd-insertlane.clif
index 5f61ca6efc7f..5c920d65ff48 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-insertlane.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-insertlane.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v10,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -52,7 +52,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -64,7 +64,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v10,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -96,7 +96,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -107,7 +107,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -138,7 +138,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -149,7 +149,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -179,7 +179,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -190,7 +190,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v15,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -220,7 +220,7 @@ block0(v0: f64x2, v1: f64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -231,7 +231,7 @@ block0(v0: f64x2, v1: f64):
 ;   vse8.v v15,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -261,7 +261,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -272,7 +272,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v15,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -303,7 +303,7 @@ block0(v0: f32x4, v1: f32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -314,7 +314,7 @@ block0(v0: f32x4, v1: f32):
 ;   vse8.v v15,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -346,7 +346,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -358,7 +358,7 @@ block0(v0: i8x16):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -390,7 +390,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -402,7 +402,7 @@ block0(v0: i16x8):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -435,7 +435,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -446,7 +446,7 @@ block0(v0: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -478,7 +478,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -489,7 +489,7 @@ block0(v0: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-ishl-const.clif b/cranelift/filetests/filetests/isa/riscv64/simd-ishl-const.clif
index 7d7e7cdf4311..5ec336f0be3b 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-ishl-const.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-ishl-const.clif
@@ -11,7 +11,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -49,7 +49,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -59,7 +59,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -87,7 +87,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -97,7 +97,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -125,7 +125,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -135,7 +135,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -164,7 +164,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -174,7 +174,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -202,7 +202,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -212,7 +212,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -242,7 +242,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -252,7 +252,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -282,7 +282,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -292,7 +292,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -322,7 +322,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -332,7 +332,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -363,7 +363,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -373,7 +373,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -403,7 +403,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -413,7 +413,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -443,7 +443,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -453,7 +453,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -483,7 +483,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -493,7 +493,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -523,7 +523,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -533,7 +533,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -564,7 +564,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -574,7 +574,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -604,7 +604,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -614,7 +614,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -644,7 +644,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -654,7 +654,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -684,7 +684,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -694,7 +694,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -724,7 +724,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -734,7 +734,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -765,7 +765,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -775,7 +775,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-ishl.clif b/cranelift/filetests/filetests/isa/riscv64/simd-ishl.clif
index c509e3583b95..a115b8ea1532 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-ishl.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-ishl.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -19,7 +19,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -46,7 +46,7 @@ block0(v0: i8x16, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -56,7 +56,7 @@ block0(v0: i8x16, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -83,7 +83,7 @@ block0(v0: i8x16, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -93,7 +93,7 @@ block0(v0: i8x16, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -120,7 +120,7 @@ block0(v0: i8x16, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -130,7 +130,7 @@ block0(v0: i8x16, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -157,7 +157,7 @@ block0(v0: i8x16, v1: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -167,7 +167,7 @@ block0(v0: i8x16, v1: i128):
 ;   vse8.v v14,0(a2) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -194,7 +194,7 @@ block0(v0: i16x8, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -204,7 +204,7 @@ block0(v0: i16x8, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -233,7 +233,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -243,7 +243,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -272,7 +272,7 @@ block0(v0: i16x8, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -282,7 +282,7 @@ block0(v0: i16x8, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -311,7 +311,7 @@ block0(v0: i16x8, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -321,7 +321,7 @@ block0(v0: i16x8, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -350,7 +350,7 @@ block0(v0: i16x8, v1: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -360,7 +360,7 @@ block0(v0: i16x8, v1: i128):
 ;   vse8.v v14,0(a2) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -389,7 +389,7 @@ block0(v0: i32x4, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -399,7 +399,7 @@ block0(v0: i32x4, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -428,7 +428,7 @@ block0(v0: i32x4, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -438,7 +438,7 @@ block0(v0: i32x4, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -467,7 +467,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -477,7 +477,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -506,7 +506,7 @@ block0(v0: i32x4, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -516,7 +516,7 @@ block0(v0: i32x4, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -545,7 +545,7 @@ block0(v0: i32x4, v1: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -555,7 +555,7 @@ block0(v0: i32x4, v1: i128):
 ;   vse8.v v14,0(a2) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -584,7 +584,7 @@ block0(v0: i64x2, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -594,7 +594,7 @@ block0(v0: i64x2, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -623,7 +623,7 @@ block0(v0: i64x2, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -633,7 +633,7 @@ block0(v0: i64x2, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -662,7 +662,7 @@ block0(v0: i64x2, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -672,7 +672,7 @@ block0(v0: i64x2, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -701,7 +701,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -711,7 +711,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -740,7 +740,7 @@ block0(v0: i64x2, v1: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -750,7 +750,7 @@ block0(v0: i64x2, v1: i128):
 ;   vse8.v v14,0(a2) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-isub-splat.clif b/cranelift/filetests/filetests/isa/riscv64/simd-isub-splat.clif
index 7cd34b766378..37df496405f4 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-isub-splat.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-isub-splat.clif
@@ -11,7 +11,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -49,7 +49,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -59,7 +59,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -89,7 +89,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -99,7 +99,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -129,7 +129,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -139,7 +139,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -169,7 +169,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -179,7 +179,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -207,7 +207,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -217,7 +217,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -247,7 +247,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -257,7 +257,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -287,7 +287,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -297,7 +297,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -328,7 +328,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -339,7 +339,7 @@ block0(v0: i8x16):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -369,7 +369,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -380,7 +380,7 @@ block0(v0: i16x8):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -412,7 +412,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -423,7 +423,7 @@ block0(v0: i32x4):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -455,7 +455,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -466,7 +466,7 @@ block0(v0: i64x2):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -498,7 +498,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -508,7 +508,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -537,7 +537,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -547,7 +547,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -578,7 +578,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -588,7 +588,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -619,7 +619,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -629,7 +629,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -660,7 +660,7 @@ block0(v0: i16x8, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -670,7 +670,7 @@ block0(v0: i16x8, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -701,7 +701,7 @@ block0(v0: i32x4, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -711,7 +711,7 @@ block0(v0: i32x4, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -742,7 +742,7 @@ block0(v0: i64x2, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -752,7 +752,7 @@ block0(v0: i64x2, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -783,7 +783,7 @@ block0(v0: i16x8, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -793,7 +793,7 @@ block0(v0: i16x8, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -824,7 +824,7 @@ block0(v0: i32x4, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -834,7 +834,7 @@ block0(v0: i32x4, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -865,7 +865,7 @@ block0(v0: i64x2, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -875,7 +875,7 @@ block0(v0: i64x2, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-isub-swiden-high.clif b/cranelift/filetests/filetests/isa/riscv64/simd-isub-swiden-high.clif
index f91f5447bd09..2a9322089ec2 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-isub-swiden-high.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-isub-swiden-high.clif
@@ -11,7 +11,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -24,7 +24,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -60,7 +60,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -73,7 +73,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -109,7 +109,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -122,7 +122,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -158,7 +158,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -169,7 +169,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -203,7 +203,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -214,7 +214,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -248,7 +248,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -259,7 +259,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -290,7 +290,7 @@ block0(v0: i32x4, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -302,7 +302,7 @@ block0(v0: i32x4, v1: i64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -336,7 +336,7 @@ block0(v0: i16x8, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -348,7 +348,7 @@ block0(v0: i16x8, v1: i32x4):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -382,7 +382,7 @@ block0(v0: i8x16, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -394,7 +394,7 @@ block0(v0: i8x16, v1: i16x8):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-isub-swiden-low.clif b/cranelift/filetests/filetests/isa/riscv64/simd-isub-swiden-low.clif
index 58f6bd012889..424df797fdf0 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-isub-swiden-low.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-isub-swiden-low.clif
@@ -11,7 +11,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -55,7 +55,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -66,7 +66,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -99,7 +99,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -110,7 +110,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -144,7 +144,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -154,7 +154,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -186,7 +186,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -196,7 +196,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -228,7 +228,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -238,7 +238,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -268,7 +268,7 @@ block0(v0: i32x4, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -279,7 +279,7 @@ block0(v0: i32x4, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -311,7 +311,7 @@ block0(v0: i16x8, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -322,7 +322,7 @@ block0(v0: i16x8, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -354,7 +354,7 @@ block0(v0: i8x16, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -365,7 +365,7 @@ block0(v0: i8x16, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-isub-uwiden-high.clif b/cranelift/filetests/filetests/isa/riscv64/simd-isub-uwiden-high.clif
index c60e3d6a5762..809e2bf01940 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-isub-uwiden-high.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-isub-uwiden-high.clif
@@ -11,7 +11,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -24,7 +24,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -60,7 +60,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -73,7 +73,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -109,7 +109,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -122,7 +122,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -158,7 +158,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -169,7 +169,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -203,7 +203,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -214,7 +214,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -248,7 +248,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -259,7 +259,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -290,7 +290,7 @@ block0(v0: i32x4, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -302,7 +302,7 @@ block0(v0: i32x4, v1: i64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -336,7 +336,7 @@ block0(v0: i16x8, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -348,7 +348,7 @@ block0(v0: i16x8, v1: i32x4):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -382,7 +382,7 @@ block0(v0: i8x16, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -394,7 +394,7 @@ block0(v0: i8x16, v1: i16x8):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-isub-uwiden-low.clif b/cranelift/filetests/filetests/isa/riscv64/simd-isub-uwiden-low.clif
index 688430660db0..a8992b096f0e 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-isub-uwiden-low.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-isub-uwiden-low.clif
@@ -11,7 +11,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -55,7 +55,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -66,7 +66,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -99,7 +99,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -110,7 +110,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -144,7 +144,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -154,7 +154,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -186,7 +186,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -196,7 +196,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -228,7 +228,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -238,7 +238,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -268,7 +268,7 @@ block0(v0: i32x4, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -279,7 +279,7 @@ block0(v0: i32x4, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -311,7 +311,7 @@ block0(v0: i16x8, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -322,7 +322,7 @@ block0(v0: i16x8, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -354,7 +354,7 @@ block0(v0: i8x16, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -365,7 +365,7 @@ block0(v0: i8x16, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-isub.clif b/cranelift/filetests/filetests/isa/riscv64/simd-isub.clif
index 654461153055..e4b368d12129 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-isub.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-isub.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -61,7 +61,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -92,7 +92,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -134,7 +134,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -177,7 +177,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -187,7 +187,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -217,7 +217,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -227,7 +227,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-nearest.clif b/cranelift/filetests/filetests/isa/riscv64/simd-nearest.clif
index ef823864d13d..63edad3aa02f 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-nearest.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-nearest.clif
@@ -10,7 +10,7 @@ block0(v0: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -31,7 +31,7 @@ block0(v0: f32x4):
 ;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -71,29 +71,28 @@ block0(v0: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ; block0:
 ;   vle8.v v9,16(fp) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   vfabs.v v12,v9 #avl=2, #vtype=(e64, m1, ta, ma)
-;   lui a1,1075
-;   slli a2,a1,40
-;   fmv.d.x fa4,a2
-;   vmflt.vf v0,v12,fa4 #avl=2, #vtype=(e64, m1, ta, ma)
-;   fsrmi a2,0
-;   vfcvt.x.f.v v8,v9 #avl=2, #vtype=(e64, m1, ta, ma)
-;   fsrm a2
-;   vfcvt.f.x.v v11,v8 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vfsgnj.vv v13,v11,v9 #avl=2, #vtype=(e64, m1, ta, ma)
-;   fmv.d.x fa5,zero
-;   vfadd.vf v9,v9,fa5 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vmerge.vvm v11,v9,v13,v0.t #avl=2, #vtype=(e64, m1, ta, ma)
-;   vse8.v v11,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
+;   ld a1,[const(0)]
+;   fmv.d.x fa2,a1
+;   vmflt.vf v0,v12,fa2 #avl=2, #vtype=(e64, m1, ta, ma)
+;   fsrmi a1,0
+;   vfcvt.x.f.v v14,v9 #avl=2, #vtype=(e64, m1, ta, ma)
+;   fsrm a1
+;   vfcvt.f.x.v v10,v14 #avl=2, #vtype=(e64, m1, ta, ma)
+;   vfsgnj.vv v11,v10,v9 #avl=2, #vtype=(e64, m1, ta, ma)
+;   fmv.d.x fa3,zero
+;   vfadd.vf v15,v9,fa3 #avl=2, #vtype=(e64, m1, ta, ma)
+;   vmerge.vvm v9,v15,v11,v0.t #avl=2, #vtype=(e64, m1, ta, ma)
+;   vse8.v v9,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -108,22 +107,25 @@ block0(v0: f64x2):
 ;   .byte 0x87, 0x84, 0x0f, 0x02
 ;   .byte 0x57, 0x70, 0x81, 0xcd
 ;   .byte 0x57, 0x96, 0x94, 0x2a
-;   lui a1, 0x433
-;   slli a2, a1, 0x28
-;   fmv.d.x fa4, a2
-;   .byte 0x57, 0x50, 0xc7, 0x6e
-;   fsrmi a2, 0
-;   .byte 0x57, 0x94, 0x90, 0x4a
-;   fsrm a2
-;   .byte 0xd7, 0x95, 0x81, 0x4a
-;   .byte 0xd7, 0x96, 0xb4, 0x22
-;   fmv.d.x fa5, zero
-;   .byte 0xd7, 0xd4, 0x97, 0x02
-;   .byte 0xd7, 0x85, 0x96, 0x5c
+;   auipc a1, 0
+;   ld a1, 0x4c(a1)
+;   fmv.d.x fa2, a1
+;   .byte 0x57, 0x50, 0xc6, 0x6e
+;   fsrmi a1, 0
+;   .byte 0x57, 0x97, 0x90, 0x4a
+;   fsrm a1
+;   .byte 0x57, 0x95, 0xe1, 0x4a
+;   .byte 0xd7, 0x95, 0xa4, 0x22
+;   fmv.d.x fa3, zero
+;   .byte 0xd7, 0xd7, 0x96, 0x02
+;   .byte 0xd7, 0x84, 0xf5, 0x5c
 ;   .byte 0x57, 0x70, 0x08, 0xcc
-;   .byte 0xa7, 0x05, 0x05, 0x02
+;   .byte 0xa7, 0x04, 0x05, 0x02
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
 ;   addi sp, sp, 0x10
 ;   ret
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0x30, 0x43
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-popcnt.clif b/cranelift/filetests/filetests/isa/riscv64/simd-popcnt.clif
index 832ceb5085b0..542541dc69b1 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-popcnt.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-popcnt.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -35,7 +35,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -78,7 +78,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -107,7 +107,7 @@ block0(v0: i16x8):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -155,7 +155,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -185,7 +185,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -234,7 +234,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -260,7 +260,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-saddsat.clif b/cranelift/filetests/filetests/isa/riscv64/simd-saddsat.clif
index f2ce9a107161..d25c6489f955 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-saddsat.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-saddsat.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -61,7 +61,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -92,7 +92,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -134,7 +134,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -178,7 +178,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -188,7 +188,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -217,7 +217,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -227,7 +227,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -258,7 +258,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -268,7 +268,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -299,7 +299,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -309,7 +309,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -339,7 +339,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -349,7 +349,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -377,7 +377,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -387,7 +387,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -417,7 +417,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -427,7 +427,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -457,7 +457,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -467,7 +467,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-scalartovector.clif b/cranelift/filetests/filetests/isa/riscv64/simd-scalartovector.clif
index d706a5708a87..e9be3c8451b0 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-scalartovector.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-scalartovector.clif
@@ -157,108 +157,3 @@ block0(v0: f64):
 ;   .byte 0xa7, 0x04, 0x05, 0x02
 ;   ret
 
-function %scalartovector_i8_imm(i8) -> i8x16 {
-block0(v0: i8):
-    v1 = iconst.i8 7
-    v2 = scalar_to_vector.i8x16 v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   vmv.v.x v11,zero #avl=16, #vtype=(e8, m1, ta, ma)
-;   vmv.v.i v0,1 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vmerge.vim v15,v11,7,v0.t #avl=16, #vtype=(e8, m1, ta, ma)
-;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x57, 0x70, 0x08, 0xcc
-;   .byte 0xd7, 0x45, 0x00, 0x5e
-;   .byte 0x57, 0x70, 0x81, 0xcd
-;   .byte 0x57, 0xb0, 0x00, 0x5e
-;   .byte 0x57, 0x70, 0x08, 0xcc
-;   .byte 0xd7, 0xb7, 0xb3, 0x5c
-;   .byte 0xa7, 0x87, 0x05, 0x02
-;   ret
-
-function %scalartovector_i16_imm(i16) -> i16x8 {
-block0(v0: i16):
-    v1 = iconst.i16 7
-    v2 = scalar_to_vector.i16x8 v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   vmv.v.x v11,zero #avl=8, #vtype=(e16, m1, ta, ma)
-;   vmv.v.i v0,1 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vmerge.vim v15,v11,7,v0.t #avl=8, #vtype=(e16, m1, ta, ma)
-;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x57, 0x70, 0x84, 0xcc
-;   .byte 0xd7, 0x45, 0x00, 0x5e
-;   .byte 0x57, 0x70, 0x81, 0xcd
-;   .byte 0x57, 0xb0, 0x00, 0x5e
-;   .byte 0x57, 0x70, 0x84, 0xcc
-;   .byte 0xd7, 0xb7, 0xb3, 0x5c
-;   .byte 0x57, 0x70, 0x08, 0xcc
-;   .byte 0xa7, 0x87, 0x05, 0x02
-;   ret
-
-function %scalartovector_i32_imm(i32) -> i32x4 {
-block0(v0: i32):
-    v1 = iconst.i32 7
-    v2 = scalar_to_vector.i32x4 v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   vmv.v.x v11,zero #avl=4, #vtype=(e32, m1, ta, ma)
-;   vmv.v.i v0,1 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vmerge.vim v15,v11,7,v0.t #avl=4, #vtype=(e32, m1, ta, ma)
-;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x57, 0x70, 0x02, 0xcd
-;   .byte 0xd7, 0x45, 0x00, 0x5e
-;   .byte 0x57, 0x70, 0x81, 0xcd
-;   .byte 0x57, 0xb0, 0x00, 0x5e
-;   .byte 0x57, 0x70, 0x02, 0xcd
-;   .byte 0xd7, 0xb7, 0xb3, 0x5c
-;   .byte 0x57, 0x70, 0x08, 0xcc
-;   .byte 0xa7, 0x87, 0x05, 0x02
-;   ret
-
-function %scalartovector_i64_imm(i64) -> i64x2 {
-block0(v0: i64):
-    v1 = iconst.i64 7
-    v2 = scalar_to_vector.i64x2 v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   vmv.v.x v11,zero #avl=2, #vtype=(e64, m1, ta, ma)
-;   vmv.v.i v0,1 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vmerge.vim v15,v11,7,v0.t #avl=2, #vtype=(e64, m1, ta, ma)
-;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x57, 0x70, 0x81, 0xcd
-;   .byte 0xd7, 0x45, 0x00, 0x5e
-;   .byte 0x57, 0xb0, 0x00, 0x5e
-;   .byte 0xd7, 0xb7, 0xb3, 0x5c
-;   .byte 0x57, 0x70, 0x08, 0xcc
-;   .byte 0xa7, 0x87, 0x05, 0x02
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-select.clif b/cranelift/filetests/filetests/isa/riscv64/simd-select.clif
index ef044569ec69..221baa2ab544 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-select.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-select.clif
@@ -9,18 +9,18 @@ block0(v0: i64, v1: i64x2, v2: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ; block0:
 ;   vle8.v v10,16(fp) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   vle8.v v12,32(fp) #avl=16, #vtype=(e8, m1, ta, ma)
-;   select v15,v10,v12##condition=(a0 ne zero)
+;   select_i64x2 v15,v10,v12##condition=a0
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -52,19 +52,20 @@ block0(v0: i32, v1: i32x4, v2: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ; block0:
 ;   vle8.v v10,16(fp) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   vle8.v v12,32(fp) #avl=16, #vtype=(e8, m1, ta, ma)
-;   sext.w a2,a0
-;   select v9,v10,v12##condition=(a2 ne zero)
-;   vse8.v v9,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
+;   slli a2,a0,32
+;   srli a3,a2,32
+;   select_i32x4 v11,v10,v12##condition=a3
+;   vse8.v v11,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -79,12 +80,13 @@ block0(v0: i32, v1: i32x4, v2: i32x4):
 ;   .byte 0x07, 0x85, 0x0f, 0x02
 ;   addi t6, s0, 0x20
 ;   .byte 0x07, 0x86, 0x0f, 0x02
-;   sext.w a2, a0
-;   beqz a2, 0xc
-;   .byte 0xd7, 0x34, 0xa0, 0x9e
+;   slli a2, a0, 0x20
+;   srli a3, a2, 0x20
+;   beqz a3, 0xc
+;   .byte 0xd7, 0x35, 0xa0, 0x9e
 ;   j 8
-;   .byte 0xd7, 0x34, 0xc0, 0x9e
-;   .byte 0xa7, 0x84, 0x05, 0x02
+;   .byte 0xd7, 0x35, 0xc0, 0x9e
+;   .byte 0xa7, 0x85, 0x05, 0x02
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
 ;   addi sp, sp, 0x10
@@ -97,7 +99,7 @@ block0(v0: i16, v1: i16x8, v2: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -105,12 +107,12 @@ block0(v0: i16, v1: i16x8, v2: i16x8):
 ;   vle8.v v10,16(fp) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   vle8.v v12,32(fp) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   slli a2,a0,48
-;   srai a3,a2,48
-;   select v11,v10,v12##condition=(a3 ne zero)
+;   srli a3,a2,48
+;   select_i16x8 v11,v10,v12##condition=a3
 ;   vse8.v v11,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -126,7 +128,7 @@ block0(v0: i16, v1: i16x8, v2: i16x8):
 ;   addi t6, s0, 0x20
 ;   .byte 0x07, 0x86, 0x0f, 0x02
 ;   slli a2, a0, 0x30
-;   srai a3, a2, 0x30
+;   srli a3, a2, 0x30
 ;   beqz a3, 0xc
 ;   .byte 0xd7, 0x35, 0xa0, 0x9e
 ;   j 8
@@ -144,7 +146,7 @@ block0(v0: i8, v1: i8x16, v2: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -152,11 +154,11 @@ block0(v0: i8, v1: i8x16, v2: i8x16):
 ;   vle8.v v10,16(fp) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   vle8.v v12,32(fp) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   andi a2,a0,255
-;   select v9,v10,v12##condition=(a2 ne zero)
+;   select_i8x16 v9,v10,v12##condition=a2
 ;   vse8.v v9,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -189,18 +191,18 @@ block0(v0: i64, v1: f64x2, v2: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ; block0:
 ;   vle8.v v10,16(fp) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   vle8.v v12,32(fp) #avl=16, #vtype=(e8, m1, ta, ma)
-;   select v15,v10,v12##condition=(a0 ne zero)
+;   select_f64x2 v15,v10,v12##condition=a0
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -232,18 +234,18 @@ block0(v0: i64, v1: f32x4, v2: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ; block0:
 ;   vle8.v v10,16(fp) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   vle8.v v12,32(fp) #avl=16, #vtype=(e8, m1, ta, ma)
-;   select v15,v10,v12##condition=(a0 ne zero)
+;   select_f32x4 v15,v10,v12##condition=a0
 ;   vse8.v v15,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-shuffle.clif b/cranelift/filetests/filetests/isa/riscv64/simd-shuffle.clif
index d8036d7b2f35..ff1b5e65cb96 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-shuffle.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-shuffle.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -24,7 +24,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-smax.clif b/cranelift/filetests/filetests/isa/riscv64/simd-smax.clif
index c548614f906a..471a676ea15e 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-smax.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-smax.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -61,7 +61,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -92,7 +92,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -134,7 +134,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -178,7 +178,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -189,7 +189,7 @@ block0(v0: i8x16):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -219,7 +219,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -230,7 +230,7 @@ block0(v0: i16x8):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -262,7 +262,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -273,7 +273,7 @@ block0(v0: i32x4):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -305,7 +305,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -316,7 +316,7 @@ block0(v0: i64x2):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -347,7 +347,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -357,7 +357,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -385,7 +385,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -395,7 +395,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -425,7 +425,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -435,7 +435,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -465,7 +465,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -475,7 +475,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-smin.clif b/cranelift/filetests/filetests/isa/riscv64/simd-smin.clif
index 9a12d2b1d7ce..e7cbf22b212b 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-smin.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-smin.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -61,7 +61,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -92,7 +92,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -134,7 +134,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -178,7 +178,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -189,7 +189,7 @@ block0(v0: i8x16):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -219,7 +219,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -230,7 +230,7 @@ block0(v0: i16x8):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -262,7 +262,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -273,7 +273,7 @@ block0(v0: i32x4):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -305,7 +305,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -316,7 +316,7 @@ block0(v0: i64x2):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -347,7 +347,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -357,7 +357,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -385,7 +385,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -395,7 +395,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -425,7 +425,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -435,7 +435,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -465,7 +465,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -475,7 +475,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-smulhi.clif b/cranelift/filetests/filetests/isa/riscv64/simd-smulhi.clif
index 4cf12be3b35a..337985f82a1c 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-smulhi.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-smulhi.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -61,7 +61,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -92,7 +92,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -134,7 +134,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -177,7 +177,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -187,7 +187,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -215,7 +215,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -225,7 +225,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -255,7 +255,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -265,7 +265,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -295,7 +295,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -305,7 +305,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-snarrow.clif b/cranelift/filetests/filetests/isa/riscv64/simd-snarrow.clif
index 1dbcc3c18549..1d05fbc75420 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-snarrow.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-snarrow.clif
@@ -9,7 +9,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -55,7 +55,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -68,7 +68,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -102,7 +102,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -115,7 +115,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-sqmulroundsat.clif b/cranelift/filetests/filetests/isa/riscv64/simd-sqmulroundsat.clif
index fe01e562a826..878bbd68ed29 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-sqmulroundsat.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-sqmulroundsat.clif
@@ -9,7 +9,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -20,7 +20,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -51,7 +51,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -62,7 +62,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -94,7 +94,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -104,7 +104,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -134,7 +134,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -144,7 +144,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-sqrt.clif b/cranelift/filetests/filetests/isa/riscv64/simd-sqrt.clif
index 43f2f1d27fef..5b0513b5eea0 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-sqrt.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-sqrt.clif
@@ -10,7 +10,7 @@ block0(v0: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -20,7 +20,7 @@ block0(v0: f32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -49,7 +49,7 @@ block0(v0: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -59,7 +59,7 @@ block0(v0: f64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-sshr-const.clif b/cranelift/filetests/filetests/isa/riscv64/simd-sshr-const.clif
index 8a7e416b969c..73ecefb1b014 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-sshr-const.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-sshr-const.clif
@@ -11,7 +11,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -49,7 +49,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -59,7 +59,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -87,7 +87,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -97,7 +97,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -125,7 +125,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -135,7 +135,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -164,7 +164,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -174,7 +174,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -202,7 +202,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -212,7 +212,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -242,7 +242,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -252,7 +252,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -282,7 +282,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -292,7 +292,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -322,7 +322,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -332,7 +332,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -363,7 +363,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -373,7 +373,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -403,7 +403,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -413,7 +413,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -443,7 +443,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -453,7 +453,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -483,7 +483,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -493,7 +493,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -523,7 +523,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -533,7 +533,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -564,7 +564,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -574,7 +574,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -604,7 +604,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -614,7 +614,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -644,7 +644,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -654,7 +654,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -684,7 +684,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -694,7 +694,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -724,7 +724,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -734,7 +734,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -765,7 +765,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -775,7 +775,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-sshr.clif b/cranelift/filetests/filetests/isa/riscv64/simd-sshr.clif
index b5eba6a1eff2..bb6af5e1c99e 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-sshr.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-sshr.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -19,7 +19,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -46,7 +46,7 @@ block0(v0: i8x16, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -56,7 +56,7 @@ block0(v0: i8x16, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -83,7 +83,7 @@ block0(v0: i8x16, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -93,7 +93,7 @@ block0(v0: i8x16, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -120,7 +120,7 @@ block0(v0: i8x16, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -130,7 +130,7 @@ block0(v0: i8x16, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -157,7 +157,7 @@ block0(v0: i8x16, v1: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -167,7 +167,7 @@ block0(v0: i8x16, v1: i128):
 ;   vse8.v v14,0(a2) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -194,7 +194,7 @@ block0(v0: i16x8, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -204,7 +204,7 @@ block0(v0: i16x8, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -233,7 +233,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -243,7 +243,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -272,7 +272,7 @@ block0(v0: i16x8, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -282,7 +282,7 @@ block0(v0: i16x8, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -311,7 +311,7 @@ block0(v0: i16x8, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -321,7 +321,7 @@ block0(v0: i16x8, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -350,7 +350,7 @@ block0(v0: i16x8, v1: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -360,7 +360,7 @@ block0(v0: i16x8, v1: i128):
 ;   vse8.v v14,0(a2) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -389,7 +389,7 @@ block0(v0: i32x4, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -399,7 +399,7 @@ block0(v0: i32x4, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -428,7 +428,7 @@ block0(v0: i32x4, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -438,7 +438,7 @@ block0(v0: i32x4, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -467,7 +467,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -477,7 +477,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -506,7 +506,7 @@ block0(v0: i32x4, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -516,7 +516,7 @@ block0(v0: i32x4, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -545,7 +545,7 @@ block0(v0: i32x4, v1: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -555,7 +555,7 @@ block0(v0: i32x4, v1: i128):
 ;   vse8.v v14,0(a2) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -584,7 +584,7 @@ block0(v0: i64x2, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -594,7 +594,7 @@ block0(v0: i64x2, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -623,7 +623,7 @@ block0(v0: i64x2, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -633,7 +633,7 @@ block0(v0: i64x2, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -662,7 +662,7 @@ block0(v0: i64x2, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -672,7 +672,7 @@ block0(v0: i64x2, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -701,7 +701,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -711,7 +711,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -740,7 +740,7 @@ block0(v0: i64x2, v1: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -750,7 +750,7 @@ block0(v0: i64x2, v1: i128):
 ;   vse8.v v14,0(a2) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-ssubsat.clif b/cranelift/filetests/filetests/isa/riscv64/simd-ssubsat.clif
index 5bb3377cff17..3d53f6a10da6 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-ssubsat.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-ssubsat.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -61,7 +61,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -92,7 +92,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -134,7 +134,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -178,7 +178,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -189,7 +189,7 @@ block0(v0: i8x16):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -219,7 +219,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -230,7 +230,7 @@ block0(v0: i16x8):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -262,7 +262,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -273,7 +273,7 @@ block0(v0: i32x4):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -305,7 +305,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -316,7 +316,7 @@ block0(v0: i64x2):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -347,7 +347,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -357,7 +357,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -385,7 +385,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -395,7 +395,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -425,7 +425,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -435,7 +435,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -465,7 +465,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -476,7 +476,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v14,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-stores.clif b/cranelift/filetests/filetests/isa/riscv64/simd-stores.clif
index 2fa49dde0dae..2105d2c74471 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-stores.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-stores.clif
@@ -10,7 +10,7 @@ block0(v0: i64, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -19,7 +19,7 @@ block0(v0: i64, v1: i8x16):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -45,7 +45,7 @@ block0(v0: i64, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -54,7 +54,7 @@ block0(v0: i64, v1: i16x8):
 ;   vse16.v v10,0(a0) #avl=8, #vtype=(e16, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -81,7 +81,7 @@ block0(v0: i64, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -90,7 +90,7 @@ block0(v0: i64, v1: i32x4):
 ;   vse32.v v10,0(a0) #avl=4, #vtype=(e32, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -117,7 +117,7 @@ block0(v0: i64, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -126,7 +126,7 @@ block0(v0: i64, v1: i64x2):
 ;   vse64.v v10,0(a0) #avl=2, #vtype=(e64, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-swiden_high.clif b/cranelift/filetests/filetests/isa/riscv64/simd-swiden_high.clif
index 4f1476c3a476..27e8fbb81023 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-swiden_high.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-swiden_high.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -20,7 +20,7 @@ block0(v0: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -61,7 +61,7 @@ block0(v0: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -92,7 +92,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -135,7 +135,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -146,7 +146,7 @@ block0(v0: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -177,7 +177,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -188,7 +188,7 @@ block0(v0: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -221,7 +221,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -232,7 +232,7 @@ block0(v0: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-swiden_low.clif b/cranelift/filetests/filetests/isa/riscv64/simd-swiden_low.clif
index ff3b2b2b28c3..d19533868334 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-swiden_low.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-swiden_low.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -19,7 +19,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -48,7 +48,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -58,7 +58,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -87,7 +87,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -97,7 +97,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -127,7 +127,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -137,7 +137,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -167,7 +167,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -177,7 +177,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -208,7 +208,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -218,7 +218,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-swizzle.clif b/cranelift/filetests/filetests/isa/riscv64/simd-swizzle.clif
index fc29d6cd3e19..f958fa0c8579 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-swizzle.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-swizzle.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -20,7 +20,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -60,7 +60,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -89,7 +89,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -99,7 +99,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-trunc.clif b/cranelift/filetests/filetests/isa/riscv64/simd-trunc.clif
index 511cb82bba3f..91671a7a2b2c 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-trunc.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-trunc.clif
@@ -10,7 +10,7 @@ block0(v0: f32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -29,7 +29,7 @@ block0(v0: f32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -67,27 +67,26 @@ block0(v0: f64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ; block0:
 ;   vle8.v v9,16(fp) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   vfabs.v v12,v9 #avl=2, #vtype=(e64, m1, ta, ma)
-;   lui a1,1075
-;   slli a2,a1,40
-;   fmv.d.x fa4,a2
-;   vmflt.vf v0,v12,fa4 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vfcvt.rtz.x.f.v v14,v9 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vfcvt.f.x.v v8,v14 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vfsgnj.vv v10,v8,v9 #avl=2, #vtype=(e64, m1, ta, ma)
-;   fmv.d.x fa2,zero
-;   vfadd.vf v14,v9,fa2 #avl=2, #vtype=(e64, m1, ta, ma)
-;   vmerge.vvm v8,v14,v10,v0.t #avl=2, #vtype=(e64, m1, ta, ma)
-;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
+;   ld a1,[const(0)]
+;   fmv.d.x fa2,a1
+;   vmflt.vf v0,v12,fa2 #avl=2, #vtype=(e64, m1, ta, ma)
+;   vfcvt.rtz.x.f.v v12,v9 #avl=2, #vtype=(e64, m1, ta, ma)
+;   vfcvt.f.x.v v14,v12 #avl=2, #vtype=(e64, m1, ta, ma)
+;   vfsgnj.vv v8,v14,v9 #avl=2, #vtype=(e64, m1, ta, ma)
+;   fmv.d.x fa0,zero
+;   vfadd.vf v12,v9,fa0 #avl=2, #vtype=(e64, m1, ta, ma)
+;   vmerge.vvm v14,v12,v8,v0.t #avl=2, #vtype=(e64, m1, ta, ma)
+;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -102,20 +101,23 @@ block0(v0: f64x2):
 ;   .byte 0x87, 0x84, 0x0f, 0x02
 ;   .byte 0x57, 0x70, 0x81, 0xcd
 ;   .byte 0x57, 0x96, 0x94, 0x2a
-;   lui a1, 0x433
-;   slli a2, a1, 0x28
-;   fmv.d.x fa4, a2
-;   .byte 0x57, 0x50, 0xc7, 0x6e
-;   .byte 0x57, 0x97, 0x93, 0x4a
-;   .byte 0x57, 0x94, 0xe1, 0x4a
-;   .byte 0x57, 0x95, 0x84, 0x22
-;   fmv.d.x fa2, zero
-;   .byte 0x57, 0x57, 0x96, 0x02
-;   .byte 0x57, 0x04, 0xe5, 0x5c
+;   auipc a1, 0
+;   ld a1, 0x44(a1)
+;   fmv.d.x fa2, a1
+;   .byte 0x57, 0x50, 0xc6, 0x6e
+;   .byte 0x57, 0x96, 0x93, 0x4a
+;   .byte 0x57, 0x97, 0xc1, 0x4a
+;   .byte 0x57, 0x94, 0xe4, 0x22
+;   fmv.d.x fa0, zero
+;   .byte 0x57, 0x56, 0x95, 0x02
+;   .byte 0x57, 0x07, 0xc4, 0x5c
 ;   .byte 0x57, 0x70, 0x08, 0xcc
-;   .byte 0x27, 0x04, 0x05, 0x02
+;   .byte 0x27, 0x07, 0x05, 0x02
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
 ;   addi sp, sp, 0x10
 ;   ret
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   .byte 0x00, 0x00, 0x30, 0x43
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-uaddsat.clif b/cranelift/filetests/filetests/isa/riscv64/simd-uaddsat.clif
index 9f26d227e70c..c6e514e313ba 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-uaddsat.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-uaddsat.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -61,7 +61,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -92,7 +92,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -134,7 +134,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -178,7 +178,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -188,7 +188,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -217,7 +217,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -227,7 +227,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -258,7 +258,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -268,7 +268,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -299,7 +299,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -309,7 +309,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -339,7 +339,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -349,7 +349,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -377,7 +377,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -387,7 +387,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -417,7 +417,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -427,7 +427,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -457,7 +457,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -467,7 +467,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-umax.clif b/cranelift/filetests/filetests/isa/riscv64/simd-umax.clif
index 6c45a563a8b5..0565fdf43c4c 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-umax.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-umax.clif
@@ -2,6 +2,7 @@ test compile precise-output
 set unwind_info=false
 target riscv64 has_v
 
+
 function %umax_i8x16(i8x16, i8x16) -> i8x16 {
 block0(v0: i8x16, v1: i8x16):
     v2 = umax v0, v1
@@ -9,7 +10,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -20,7 +21,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -49,7 +50,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -60,7 +61,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -91,7 +92,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -102,7 +103,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -133,7 +134,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -144,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -177,7 +178,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -188,7 +189,7 @@ block0(v0: i8x16):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -218,7 +219,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -229,7 +230,7 @@ block0(v0: i16x8):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -261,7 +262,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -272,7 +273,7 @@ block0(v0: i32x4):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -304,7 +305,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -315,7 +316,7 @@ block0(v0: i64x2):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -346,7 +347,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -356,7 +357,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -384,7 +385,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -394,7 +395,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -424,7 +425,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -434,7 +435,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -464,7 +465,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -474,7 +475,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-umin.clif b/cranelift/filetests/filetests/isa/riscv64/simd-umin.clif
index d3e7fbf9402e..72482e74f45e 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-umin.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-umin.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -61,7 +61,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -92,7 +92,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -134,7 +134,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -178,7 +178,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -189,7 +189,7 @@ block0(v0: i8x16):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -219,7 +219,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -230,7 +230,7 @@ block0(v0: i16x8):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -262,7 +262,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -273,7 +273,7 @@ block0(v0: i32x4):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -305,7 +305,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -316,7 +316,7 @@ block0(v0: i64x2):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -347,7 +347,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -357,7 +357,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -385,7 +385,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -395,7 +395,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -425,7 +425,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -435,7 +435,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -465,7 +465,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -475,7 +475,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-umulhi.clif b/cranelift/filetests/filetests/isa/riscv64/simd-umulhi.clif
index bc63e164e923..0e61ff3ff633 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-umulhi.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-umulhi.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -61,7 +61,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -92,7 +92,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -134,7 +134,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -177,7 +177,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -187,7 +187,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -215,7 +215,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -225,7 +225,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -255,7 +255,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -265,7 +265,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -295,7 +295,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -305,7 +305,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-unarrow.clif b/cranelift/filetests/filetests/isa/riscv64/simd-unarrow.clif
index dbc2893bd27a..ff46b1bbb248 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-unarrow.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-unarrow.clif
@@ -9,7 +9,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -24,7 +24,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -60,7 +60,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -75,7 +75,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -112,7 +112,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -127,7 +127,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-ushr-const.clif b/cranelift/filetests/filetests/isa/riscv64/simd-ushr-const.clif
index 474605911dc8..4bda7ac83b3b 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-ushr-const.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-ushr-const.clif
@@ -11,7 +11,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -49,7 +49,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -59,7 +59,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -87,7 +87,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -97,7 +97,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -125,7 +125,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -135,7 +135,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -164,7 +164,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -174,7 +174,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -202,7 +202,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -212,7 +212,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -242,7 +242,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -252,7 +252,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -282,7 +282,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -292,7 +292,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -322,7 +322,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -332,7 +332,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -363,7 +363,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -373,7 +373,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -403,7 +403,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -413,7 +413,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -443,7 +443,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -453,7 +453,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -483,7 +483,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -493,7 +493,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -523,7 +523,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -533,7 +533,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -564,7 +564,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -574,7 +574,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -604,7 +604,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -614,7 +614,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -644,7 +644,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -654,7 +654,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -684,7 +684,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -694,7 +694,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -724,7 +724,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -734,7 +734,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -765,7 +765,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -775,7 +775,7 @@ block0(v0: i64x2):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-ushr.clif b/cranelift/filetests/filetests/isa/riscv64/simd-ushr.clif
index cf4d02e87588..de8ddf56995a 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-ushr.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-ushr.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -19,7 +19,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -46,7 +46,7 @@ block0(v0: i8x16, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -56,7 +56,7 @@ block0(v0: i8x16, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -83,7 +83,7 @@ block0(v0: i8x16, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -93,7 +93,7 @@ block0(v0: i8x16, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -120,7 +120,7 @@ block0(v0: i8x16, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -130,7 +130,7 @@ block0(v0: i8x16, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -157,7 +157,7 @@ block0(v0: i8x16, v1: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -167,7 +167,7 @@ block0(v0: i8x16, v1: i128):
 ;   vse8.v v14,0(a2) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -194,7 +194,7 @@ block0(v0: i16x8, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -204,7 +204,7 @@ block0(v0: i16x8, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -233,7 +233,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -243,7 +243,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -272,7 +272,7 @@ block0(v0: i16x8, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -282,7 +282,7 @@ block0(v0: i16x8, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -311,7 +311,7 @@ block0(v0: i16x8, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -321,7 +321,7 @@ block0(v0: i16x8, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -350,7 +350,7 @@ block0(v0: i16x8, v1: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -360,7 +360,7 @@ block0(v0: i16x8, v1: i128):
 ;   vse8.v v14,0(a2) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -389,7 +389,7 @@ block0(v0: i32x4, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -399,7 +399,7 @@ block0(v0: i32x4, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -428,7 +428,7 @@ block0(v0: i32x4, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -438,7 +438,7 @@ block0(v0: i32x4, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -467,7 +467,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -477,7 +477,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -506,7 +506,7 @@ block0(v0: i32x4, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -516,7 +516,7 @@ block0(v0: i32x4, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -545,7 +545,7 @@ block0(v0: i32x4, v1: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -555,7 +555,7 @@ block0(v0: i32x4, v1: i128):
 ;   vse8.v v14,0(a2) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -584,7 +584,7 @@ block0(v0: i64x2, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -594,7 +594,7 @@ block0(v0: i64x2, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -623,7 +623,7 @@ block0(v0: i64x2, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -633,7 +633,7 @@ block0(v0: i64x2, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -662,7 +662,7 @@ block0(v0: i64x2, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -672,7 +672,7 @@ block0(v0: i64x2, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -701,7 +701,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -711,7 +711,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -740,7 +740,7 @@ block0(v0: i64x2, v1: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -750,7 +750,7 @@ block0(v0: i64x2, v1: i128):
 ;   vse8.v v14,0(a2) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-usubsat.clif b/cranelift/filetests/filetests/isa/riscv64/simd-usubsat.clif
index c8ec53fd165e..b24beb465c61 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-usubsat.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-usubsat.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16, v1: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16, v1: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,7 +50,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -61,7 +61,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -92,7 +92,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -103,7 +103,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -134,7 +134,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -145,7 +145,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -178,7 +178,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -189,7 +189,7 @@ block0(v0: i8x16):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -219,7 +219,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -230,7 +230,7 @@ block0(v0: i16x8):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -262,7 +262,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -273,7 +273,7 @@ block0(v0: i32x4):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -305,7 +305,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -316,7 +316,7 @@ block0(v0: i64x2):
 ;   vse8.v v13,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -347,7 +347,7 @@ block0(v0: i8x16, v1: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -357,7 +357,7 @@ block0(v0: i8x16, v1: i8):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -385,7 +385,7 @@ block0(v0: i16x8, v1: i16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -395,7 +395,7 @@ block0(v0: i16x8, v1: i16):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -425,7 +425,7 @@ block0(v0: i32x4, v1: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -435,7 +435,7 @@ block0(v0: i32x4, v1: i32):
 ;   vse8.v v13,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -465,7 +465,7 @@ block0(v0: i64x2, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -476,7 +476,7 @@ block0(v0: i64x2, v1: i64):
 ;   vse8.v v14,0(a1) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-uunarrow.clif b/cranelift/filetests/filetests/isa/riscv64/simd-uunarrow.clif
index ae45838dd7e6..6e5321eebf2f 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-uunarrow.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-uunarrow.clif
@@ -9,7 +9,7 @@ block0(v0: i16x8, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -22,7 +22,7 @@ block0(v0: i16x8, v1: i16x8):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -55,7 +55,7 @@ block0(v0: i32x4, v1: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -68,7 +68,7 @@ block0(v0: i32x4, v1: i32x4):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -102,7 +102,7 @@ block0(v0: i64x2, v1: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -115,7 +115,7 @@ block0(v0: i64x2, v1: i64x2):
 ;   vse8.v v8,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-uwiden_high.clif b/cranelift/filetests/filetests/isa/riscv64/simd-uwiden_high.clif
index 195c882f9c6c..1ab8bc5707e0 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-uwiden_high.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-uwiden_high.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -51,7 +51,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -62,7 +62,7 @@ block0(v0: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -93,7 +93,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -104,7 +104,7 @@ block0(v0: i32x4):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -136,7 +136,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -147,7 +147,7 @@ block0(v0: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -178,7 +178,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -189,7 +189,7 @@ block0(v0: i16x8):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -222,7 +222,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -233,7 +233,7 @@ block0(v0: i8x16):
 ;   vse8.v v14,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-uwiden_low.clif b/cranelift/filetests/filetests/isa/riscv64/simd-uwiden_low.clif
index b8f3c9a57305..dd99d93d81b4 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-uwiden_low.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-uwiden_low.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -20,7 +20,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -49,7 +49,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -59,7 +59,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -88,7 +88,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -98,7 +98,7 @@ block0(v0: i32x4):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -128,7 +128,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -138,7 +138,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -168,7 +168,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -178,7 +178,7 @@ block0(v0: i16x8):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -209,7 +209,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -219,7 +219,7 @@ block0(v0: i8x16):
 ;   vse8.v v12,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-valltrue.clif b/cranelift/filetests/filetests/isa/riscv64/simd-valltrue.clif
index fa6e243f6edf..f59e1a542d79 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-valltrue.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-valltrue.clif
@@ -9,7 +9,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -20,7 +20,7 @@ block0(v0: i8x16):
 ;   vmv.x.s a0,v12 #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -48,7 +48,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -59,7 +59,7 @@ block0(v0: i16x8):
 ;   vmv.x.s a0,v12 #avl=8, #vtype=(e16, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -88,7 +88,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -99,7 +99,7 @@ block0(v0: i32x4):
 ;   vmv.x.s a0,v12 #avl=4, #vtype=(e32, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -128,7 +128,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -139,7 +139,7 @@ block0(v0: i64x2):
 ;   vmv.x.s a0,v12 #avl=2, #vtype=(e64, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-vanytrue.clif b/cranelift/filetests/filetests/isa/riscv64/simd-vanytrue.clif
index aaad8833a14b..6495cc757364 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-vanytrue.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-vanytrue.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,7 +21,7 @@ block0(v0: i8x16):
 ;   sltu a0,zero,a4
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -49,7 +49,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -60,7 +60,7 @@ block0(v0: i16x8):
 ;   sltu a0,zero,a4
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -89,7 +89,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -100,7 +100,7 @@ block0(v0: i32x4):
 ;   sltu a0,zero,a4
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -129,7 +129,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -140,7 +140,7 @@ block0(v0: i64x2):
 ;   sltu a0,zero,a4
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-vhighbits.clif b/cranelift/filetests/filetests/isa/riscv64/simd-vhighbits.clif
index a0ca9d8c3659..4c40c040de7c 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-vhighbits.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-vhighbits.clif
@@ -10,7 +10,7 @@ block0(v0: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -23,7 +23,7 @@ block0(v0: i8x16):
 ;   and a0,a4,a2
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -54,7 +54,7 @@ block0(v0: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -65,7 +65,7 @@ block0(v0: i16x8):
 ;   andi a0,a4,255
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -95,7 +95,7 @@ block0(v0: i32x4):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -106,7 +106,7 @@ block0(v0: i32x4):
 ;   andi a0,a4,15
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -136,7 +136,7 @@ block0(v0: i64x2):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -147,7 +147,7 @@ block0(v0: i64x2):
 ;   andi a0,a4,3
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/simd-vstate.clif b/cranelift/filetests/filetests/isa/riscv64/simd-vstate.clif
index 916a592ceb43..c8a3c3594d7f 100644
--- a/cranelift/filetests/filetests/isa/riscv64/simd-vstate.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/simd-vstate.clif
@@ -12,7 +12,7 @@ block0(v0: i8x16, v1: i16x8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -26,7 +26,7 @@ block0(v0: i8x16, v1: i16x8):
 ;   vse8.v v9,16(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -71,7 +71,7 @@ block2(v6: i8x16, v7: i8x16):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -88,7 +88,7 @@ block2(v6: i8x16, v7: i8x16):
 ;   vse8.v v10,0(a0) #avl=16, #vtype=(e8, m1, ta, ma)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/smax-zbb.clif b/cranelift/filetests/filetests/isa/riscv64/smax-zbb.clif
deleted file mode 100644
index 0e99e3cf50fa..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/smax-zbb.clif
+++ /dev/null
@@ -1,143 +0,0 @@
-test compile precise-output
-set unwind_info=false
-target riscv64 has_zbb
-
-function %smax_i8(i8, i8) -> i8{
-block0(v0: i8, v1: i8):
-    v2 = smax v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   sext.b a3,a0
-;   sext.b a5,a1
-;   max a0,a3,a5
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x93, 0x16, 0x45, 0x60
-;   .byte 0x93, 0x97, 0x45, 0x60
-;   .byte 0x33, 0xe5, 0xf6, 0x0a
-;   ret
-
-function %smax_i16(i16, i16) -> i16{
-block0(v0: i16, v1: i16):
-    v2 = smax v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   sext.h a3,a0
-;   sext.h a5,a1
-;   max a0,a3,a5
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x93, 0x16, 0x55, 0x60
-;   .byte 0x93, 0x97, 0x55, 0x60
-;   .byte 0x33, 0xe5, 0xf6, 0x0a
-;   ret
-
-function %smax_i32(i32, i32) -> i32{
-block0(v0: i32, v1: i32):
-    v2 = smax v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   sext.w a3,a0
-;   sext.w a5,a1
-;   max a0,a3,a5
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   sext.w a3, a0
-;   sext.w a5, a1
-;   .byte 0x33, 0xe5, 0xf6, 0x0a
-;   ret
-
-function %smax_i64(i64, i64) -> i64{
-block0(v0: i64, v1: i64):
-    v2 = smax v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   max a0,a0,a1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x33, 0x65, 0xb5, 0x0a
-;   ret
-
-function %smax_i128(i128, i128) -> i128{
-block0(v0: i128, v1: i128):
-    v2 = smax v0, v1
-    return v2
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   sd s7,-8(sp)
-;   sd s9,-16(sp)
-;   addi sp,sp,-16
-; block0:
-;   slt a5,a3,a1
-;   sltu a4,a2,a0
-;   mv s7,a0
-;   xor a0,a3,a1
-;   mv s9,a1
-;   select a5,a4,a5##condition=(a0 eq zero)
-;   mv a4,s7
-;   select [a0,a1],[a4,s9],[a2,a3]##condition=(a5 ne zero)
-;   addi sp,sp,16
-;   ld s7,-8(sp)
-;   ld s9,-16(sp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-;   sd s7, -8(sp)
-;   sd s9, -0x10(sp)
-;   addi sp, sp, -0x10
-; block1: ; offset 0x1c
-;   slt a5, a3, a1
-;   sltu a4, a2, a0
-;   mv s7, a0
-;   xor a0, a3, a1
-;   mv s9, a1
-;   bnez a0, 8
-;   mv a5, a4
-;   mv a4, s7
-;   beqz a5, 0x10
-;   mv a0, a4
-;   mv a1, s9
-;   j 0xc
-;   mv a0, a2
-;   mv a1, a3
-;   addi sp, sp, 0x10
-;   ld s7, -8(sp)
-;   ld s9, -0x10(sp)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/smax.clif b/cranelift/filetests/filetests/isa/riscv64/smax.clif
deleted file mode 100644
index 36172f41c2a7..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/smax.clif
+++ /dev/null
@@ -1,161 +0,0 @@
-test compile precise-output
-set unwind_info=false
-target riscv64 has_v
-
-function %smax_i8(i8, i8) -> i8{
-block0(v0: i8, v1: i8):
-    v2 = smax v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   slli a3,a0,56
-;   srai a5,a3,56
-;   slli a1,a1,56
-;   srai a3,a1,56
-;   select a0,a5,a3##condition=(a5 sgt a3)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   slli a3, a0, 0x38
-;   srai a5, a3, 0x38
-;   slli a1, a1, 0x38
-;   srai a3, a1, 0x38
-;   bge a3, a5, 0xc
-;   mv a0, a5
-;   j 8
-;   mv a0, a3
-;   ret
-
-function %smax_i16(i16, i16) -> i16{
-block0(v0: i16, v1: i16):
-    v2 = smax v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   slli a3,a0,48
-;   srai a5,a3,48
-;   slli a1,a1,48
-;   srai a3,a1,48
-;   select a0,a5,a3##condition=(a5 sgt a3)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   slli a3, a0, 0x30
-;   srai a5, a3, 0x30
-;   slli a1, a1, 0x30
-;   srai a3, a1, 0x30
-;   bge a3, a5, 0xc
-;   mv a0, a5
-;   j 8
-;   mv a0, a3
-;   ret
-
-function %smax_i32(i32, i32) -> i32{
-block0(v0: i32, v1: i32):
-    v2 = smax v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   sext.w a3,a0
-;   sext.w a5,a1
-;   select a0,a3,a5##condition=(a3 sgt a5)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   sext.w a3, a0
-;   sext.w a5, a1
-;   bge a5, a3, 0xc
-;   mv a0, a3
-;   j 8
-;   mv a0, a5
-;   ret
-
-function %smax_i64(i64, i64) -> i64{
-block0(v0: i64, v1: i64):
-    v2 = smax v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   select a0,a0,a1##condition=(a0 sgt a1)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   blt a1, a0, 8
-;   mv a0, a1
-;   ret
-
-function %smax_i128(i128, i128) -> i128{
-block0(v0: i128, v1: i128):
-    v2 = smax v0, v1
-    return v2
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   sd s7,-8(sp)
-;   sd s9,-16(sp)
-;   addi sp,sp,-16
-; block0:
-;   slt a5,a3,a1
-;   sltu a4,a2,a0
-;   mv s7,a0
-;   xor a0,a3,a1
-;   mv s9,a1
-;   select a5,a4,a5##condition=(a0 eq zero)
-;   mv a4,s7
-;   select [a0,a1],[a4,s9],[a2,a3]##condition=(a5 ne zero)
-;   addi sp,sp,16
-;   ld s7,-8(sp)
-;   ld s9,-16(sp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-;   sd s7, -8(sp)
-;   sd s9, -0x10(sp)
-;   addi sp, sp, -0x10
-; block1: ; offset 0x1c
-;   slt a5, a3, a1
-;   sltu a4, a2, a0
-;   mv s7, a0
-;   xor a0, a3, a1
-;   mv s9, a1
-;   bnez a0, 8
-;   mv a5, a4
-;   mv a4, s7
-;   beqz a5, 0x10
-;   mv a0, a4
-;   mv a1, s9
-;   j 0xc
-;   mv a0, a2
-;   mv a1, a3
-;   addi sp, sp, 0x10
-;   ld s7, -8(sp)
-;   ld s9, -0x10(sp)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/smin-zbb.clif b/cranelift/filetests/filetests/isa/riscv64/smin-zbb.clif
deleted file mode 100644
index c1aa1db66ff6..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/smin-zbb.clif
+++ /dev/null
@@ -1,143 +0,0 @@
-test compile precise-output
-set unwind_info=false
-target riscv64 has_zbb
-
-function %smin_i8(i8, i8) -> i8{
-block0(v0: i8, v1: i8):
-    v2 = smin v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   sext.b a3,a0
-;   sext.b a5,a1
-;   max a0,a3,a5
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x93, 0x16, 0x45, 0x60
-;   .byte 0x93, 0x97, 0x45, 0x60
-;   .byte 0x33, 0xe5, 0xf6, 0x0a
-;   ret
-
-function %smin_i16(i16, i16) -> i16{
-block0(v0: i16, v1: i16):
-    v2 = smin v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   sext.h a3,a0
-;   sext.h a5,a1
-;   max a0,a3,a5
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x93, 0x16, 0x55, 0x60
-;   .byte 0x93, 0x97, 0x55, 0x60
-;   .byte 0x33, 0xe5, 0xf6, 0x0a
-;   ret
-
-function %smin_i32(i32, i32) -> i32{
-block0(v0: i32, v1: i32):
-    v2 = smin v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   sext.w a3,a0
-;   sext.w a5,a1
-;   max a0,a3,a5
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   sext.w a3, a0
-;   sext.w a5, a1
-;   .byte 0x33, 0xe5, 0xf6, 0x0a
-;   ret
-
-function %smin_i64(i64, i64) -> i64{
-block0(v0: i64, v1: i64):
-    v2 = smin v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   max a0,a0,a1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x33, 0x65, 0xb5, 0x0a
-;   ret
-
-function %smin_i128(i128, i128) -> i128{
-block0(v0: i128, v1: i128):
-    v2 = smin v0, v1
-    return v2
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   sd s7,-8(sp)
-;   sd s9,-16(sp)
-;   addi sp,sp,-16
-; block0:
-;   slt a5,a1,a3
-;   sltu a4,a0,a2
-;   mv s7,a0
-;   xor a0,a1,a3
-;   mv s9,a1
-;   select a5,a4,a5##condition=(a0 eq zero)
-;   mv a4,s7
-;   select [a0,a1],[a4,s9],[a2,a3]##condition=(a5 ne zero)
-;   addi sp,sp,16
-;   ld s7,-8(sp)
-;   ld s9,-16(sp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-;   sd s7, -8(sp)
-;   sd s9, -0x10(sp)
-;   addi sp, sp, -0x10
-; block1: ; offset 0x1c
-;   slt a5, a1, a3
-;   sltu a4, a0, a2
-;   mv s7, a0
-;   xor a0, a1, a3
-;   mv s9, a1
-;   bnez a0, 8
-;   mv a5, a4
-;   mv a4, s7
-;   beqz a5, 0x10
-;   mv a0, a4
-;   mv a1, s9
-;   j 0xc
-;   mv a0, a2
-;   mv a1, a3
-;   addi sp, sp, 0x10
-;   ld s7, -8(sp)
-;   ld s9, -0x10(sp)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/smin.clif b/cranelift/filetests/filetests/isa/riscv64/smin.clif
deleted file mode 100644
index dc8ab1189186..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/smin.clif
+++ /dev/null
@@ -1,161 +0,0 @@
-test compile precise-output
-set unwind_info=false
-target riscv64 has_v
-
-function %smin_i8(i8, i8) -> i8{
-block0(v0: i8, v1: i8):
-    v2 = smin v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   slli a3,a0,56
-;   srai a5,a3,56
-;   slli a1,a1,56
-;   srai a3,a1,56
-;   select a0,a5,a3##condition=(a5 slt a3)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   slli a3, a0, 0x38
-;   srai a5, a3, 0x38
-;   slli a1, a1, 0x38
-;   srai a3, a1, 0x38
-;   bge a5, a3, 0xc
-;   mv a0, a5
-;   j 8
-;   mv a0, a3
-;   ret
-
-function %smin_i16(i16, i16) -> i16{
-block0(v0: i16, v1: i16):
-    v2 = smin v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   slli a3,a0,48
-;   srai a5,a3,48
-;   slli a1,a1,48
-;   srai a3,a1,48
-;   select a0,a5,a3##condition=(a5 slt a3)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   slli a3, a0, 0x30
-;   srai a5, a3, 0x30
-;   slli a1, a1, 0x30
-;   srai a3, a1, 0x30
-;   bge a5, a3, 0xc
-;   mv a0, a5
-;   j 8
-;   mv a0, a3
-;   ret
-
-function %smin_i32(i32, i32) -> i32{
-block0(v0: i32, v1: i32):
-    v2 = smin v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   sext.w a3,a0
-;   sext.w a5,a1
-;   select a0,a3,a5##condition=(a3 slt a5)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   sext.w a3, a0
-;   sext.w a5, a1
-;   bge a3, a5, 0xc
-;   mv a0, a3
-;   j 8
-;   mv a0, a5
-;   ret
-
-function %smin_i64(i64, i64) -> i64{
-block0(v0: i64, v1: i64):
-    v2 = smin v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   select a0,a0,a1##condition=(a0 slt a1)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   blt a0, a1, 8
-;   mv a0, a1
-;   ret
-
-function %smin_i128(i128, i128) -> i128{
-block0(v0: i128, v1: i128):
-    v2 = smin v0, v1
-    return v2
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   sd s7,-8(sp)
-;   sd s9,-16(sp)
-;   addi sp,sp,-16
-; block0:
-;   slt a5,a1,a3
-;   sltu a4,a0,a2
-;   mv s7,a0
-;   xor a0,a1,a3
-;   mv s9,a1
-;   select a5,a4,a5##condition=(a0 eq zero)
-;   mv a4,s7
-;   select [a0,a1],[a4,s9],[a2,a3]##condition=(a5 ne zero)
-;   addi sp,sp,16
-;   ld s7,-8(sp)
-;   ld s9,-16(sp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-;   sd s7, -8(sp)
-;   sd s9, -0x10(sp)
-;   addi sp, sp, -0x10
-; block1: ; offset 0x1c
-;   slt a5, a1, a3
-;   sltu a4, a0, a2
-;   mv s7, a0
-;   xor a0, a1, a3
-;   mv s9, a1
-;   bnez a0, 8
-;   mv a5, a4
-;   mv a4, s7
-;   beqz a5, 0x10
-;   mv a0, a4
-;   mv a1, s9
-;   j 0xc
-;   mv a0, a2
-;   mv a1, a3
-;   addi sp, sp, 0x10
-;   ld s7, -8(sp)
-;   ld s9, -0x10(sp)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/sshr-const.clif b/cranelift/filetests/filetests/isa/riscv64/sshr-const.clif
index 55dd40560d09..b1f7ed83f95b 100644
--- a/cranelift/filetests/filetests/isa/riscv64/sshr-const.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/sshr-const.clif
@@ -401,16 +401,17 @@ block0(v0: i128):
 ;   li a3,64
 ;   sub a3,a3,a4
 ;   sll a5,a1,a3
-;   select a3,zero,a5##condition=(a4 eq zero)
+;   select_reg a3,zero,a5##condition=(a4 eq zero)
 ;   srl a5,a0,a4
 ;   or a5,a3,a5
 ;   li a0,64
 ;   sra a3,a1,a4
 ;   li a4,-1
-;   select t4,a4,zero##condition=(a1 slt zero)
+;   select_reg a1,a4,zero##condition=(a1 slt zero)
 ;   li a4,64
 ;   andi a2,a2,127
-;   select [a0,a1],[a3,t4],[a5,a3]##condition=(a2 uge a4)
+;   select_reg a0,a3,a5##condition=(a2 uge a4)
+;   select_reg a1,a1,a3##condition=(a2 uge a4)
 ;   ret
 ;
 ; Disassembled:
@@ -420,26 +421,26 @@ block0(v0: i128):
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a4
 ;   sll a5, a1, a3
-;   bnez a4, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a4, 0xc
 ;   mv a3, a5
+;   j 8
+;   mv a3, zero
 ;   srl a5, a0, a4
 ;   or a5, a3, a5
 ;   addi a0, zero, 0x40
 ;   sra a3, a1, a4
 ;   addi a4, zero, -1
-;   bgez a1, 0xc
-;   mv t4, a4
+;   bltz a1, 0xc
+;   mv a1, zero
 ;   j 8
-;   mv t4, zero
+;   mv a1, a4
 ;   addi a4, zero, 0x40
 ;   andi a2, a2, 0x7f
-;   bltu a2, a4, 0x10
-;   mv a0, a3
-;   mv a1, t4
-;   j 0xc
+;   bgeu a2, a4, 0xc
 ;   mv a0, a5
+;   j 8
+;   mv a0, a3
+;   bgeu a2, a4, 8
 ;   mv a1, a3
 ;   ret
 
@@ -457,16 +458,17 @@ block0(v0: i128):
 ;   li a3,64
 ;   sub a3,a3,a4
 ;   sll a5,a1,a3
-;   select a3,zero,a5##condition=(a4 eq zero)
+;   select_reg a3,zero,a5##condition=(a4 eq zero)
 ;   srl a5,a0,a4
 ;   or a5,a3,a5
 ;   li a0,64
 ;   sra a3,a1,a4
 ;   li a4,-1
-;   select t4,a4,zero##condition=(a1 slt zero)
+;   select_reg a1,a4,zero##condition=(a1 slt zero)
 ;   li a4,64
 ;   andi a2,a2,127
-;   select [a0,a1],[a3,t4],[a5,a3]##condition=(a2 uge a4)
+;   select_reg a0,a3,a5##condition=(a2 uge a4)
+;   select_reg a1,a1,a3##condition=(a2 uge a4)
 ;   ret
 ;
 ; Disassembled:
@@ -476,26 +478,26 @@ block0(v0: i128):
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a4
 ;   sll a5, a1, a3
-;   bnez a4, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a4, 0xc
 ;   mv a3, a5
+;   j 8
+;   mv a3, zero
 ;   srl a5, a0, a4
 ;   or a5, a3, a5
 ;   addi a0, zero, 0x40
 ;   sra a3, a1, a4
 ;   addi a4, zero, -1
-;   bgez a1, 0xc
-;   mv t4, a4
+;   bltz a1, 0xc
+;   mv a1, zero
 ;   j 8
-;   mv t4, zero
+;   mv a1, a4
 ;   addi a4, zero, 0x40
 ;   andi a2, a2, 0x7f
-;   bltu a2, a4, 0x10
-;   mv a0, a3
-;   mv a1, t4
-;   j 0xc
+;   bgeu a2, a4, 0xc
 ;   mv a0, a5
+;   j 8
+;   mv a0, a3
+;   bgeu a2, a4, 8
 ;   mv a1, a3
 ;   ret
 
@@ -513,16 +515,17 @@ block0(v0: i128):
 ;   li a3,64
 ;   sub a3,a3,a4
 ;   sll a5,a1,a3
-;   select a3,zero,a5##condition=(a4 eq zero)
+;   select_reg a3,zero,a5##condition=(a4 eq zero)
 ;   srl a5,a0,a4
 ;   or a5,a3,a5
 ;   li a0,64
 ;   sra a3,a1,a4
 ;   li a4,-1
-;   select t4,a4,zero##condition=(a1 slt zero)
+;   select_reg a1,a4,zero##condition=(a1 slt zero)
 ;   li a4,64
 ;   andi a2,a2,127
-;   select [a0,a1],[a3,t4],[a5,a3]##condition=(a2 uge a4)
+;   select_reg a0,a3,a5##condition=(a2 uge a4)
+;   select_reg a1,a1,a3##condition=(a2 uge a4)
 ;   ret
 ;
 ; Disassembled:
@@ -532,26 +535,26 @@ block0(v0: i128):
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a4
 ;   sll a5, a1, a3
-;   bnez a4, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a4, 0xc
 ;   mv a3, a5
+;   j 8
+;   mv a3, zero
 ;   srl a5, a0, a4
 ;   or a5, a3, a5
 ;   addi a0, zero, 0x40
 ;   sra a3, a1, a4
 ;   addi a4, zero, -1
-;   bgez a1, 0xc
-;   mv t4, a4
+;   bltz a1, 0xc
+;   mv a1, zero
 ;   j 8
-;   mv t4, zero
+;   mv a1, a4
 ;   addi a4, zero, 0x40
 ;   andi a2, a2, 0x7f
-;   bltu a2, a4, 0x10
-;   mv a0, a3
-;   mv a1, t4
-;   j 0xc
+;   bgeu a2, a4, 0xc
 ;   mv a0, a5
+;   j 8
+;   mv a0, a3
+;   bgeu a2, a4, 8
 ;   mv a1, a3
 ;   ret
 
@@ -569,16 +572,17 @@ block0(v0: i128):
 ;   li a3,64
 ;   sub a3,a3,a4
 ;   sll a5,a1,a3
-;   select a3,zero,a5##condition=(a4 eq zero)
+;   select_reg a3,zero,a5##condition=(a4 eq zero)
 ;   srl a5,a0,a4
 ;   or a5,a3,a5
 ;   li a0,64
 ;   sra a3,a1,a4
 ;   li a4,-1
-;   select t4,a4,zero##condition=(a1 slt zero)
+;   select_reg a1,a4,zero##condition=(a1 slt zero)
 ;   li a4,64
 ;   andi a2,a2,127
-;   select [a0,a1],[a3,t4],[a5,a3]##condition=(a2 uge a4)
+;   select_reg a0,a3,a5##condition=(a2 uge a4)
+;   select_reg a1,a1,a3##condition=(a2 uge a4)
 ;   ret
 ;
 ; Disassembled:
@@ -588,26 +592,26 @@ block0(v0: i128):
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a4
 ;   sll a5, a1, a3
-;   bnez a4, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a4, 0xc
 ;   mv a3, a5
+;   j 8
+;   mv a3, zero
 ;   srl a5, a0, a4
 ;   or a5, a3, a5
 ;   addi a0, zero, 0x40
 ;   sra a3, a1, a4
 ;   addi a4, zero, -1
-;   bgez a1, 0xc
-;   mv t4, a4
+;   bltz a1, 0xc
+;   mv a1, zero
 ;   j 8
-;   mv t4, zero
+;   mv a1, a4
 ;   addi a4, zero, 0x40
 ;   andi a2, a2, 0x7f
-;   bltu a2, a4, 0x10
-;   mv a0, a3
-;   mv a1, t4
-;   j 0xc
+;   bgeu a2, a4, 0xc
 ;   mv a0, a5
+;   j 8
+;   mv a0, a3
+;   bgeu a2, a4, 8
 ;   mv a1, a3
 ;   ret
 
@@ -620,12 +624,6 @@ block0(v0: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   sd s11,-8(sp)
-;   addi sp,sp,-16
 ; block0:
 ;   li a2,5
 ;   li a3,0
@@ -633,59 +631,45 @@ block0(v0: i128):
 ;   li a3,64
 ;   sub a3,a3,a5
 ;   sll a3,a1,a3
-;   select a3,zero,a3##condition=(a5 eq zero)
+;   select_reg a3,zero,a3##condition=(a5 eq zero)
 ;   srl a4,a0,a5
-;   or s11,a3,a4
+;   or a0,a3,a4
 ;   li a3,64
 ;   sra a3,a1,a5
 ;   li a5,-1
-;   select a5,a5,zero##condition=(a1 slt zero)
+;   select_reg a1,a5,zero##condition=(a1 slt zero)
 ;   li a4,64
-;   andi a2,a2,127
-;   select [a0,a1],[a3,a5],[s11,a3]##condition=(a2 uge a4)
-;   addi sp,sp,16
-;   ld s11,-8(sp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
+;   andi a5,a2,127
+;   select_reg a0,a3,a0##condition=(a5 uge a4)
+;   select_reg a1,a1,a3##condition=(a5 uge a4)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-;   sd s11, -8(sp)
-;   addi sp, sp, -0x10
-; block1: ; offset 0x18
 ;   addi a2, zero, 5
 ;   mv a3, zero
 ;   andi a5, a2, 0x3f
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a5
 ;   sll a3, a1, a3
-;   bnez a5, 8
+;   beqz a5, 8
+;   j 8
 ;   mv a3, zero
 ;   srl a4, a0, a5
-;   or s11, a3, a4
+;   or a0, a3, a4
 ;   addi a3, zero, 0x40
 ;   sra a3, a1, a5
 ;   addi a5, zero, -1
-;   bltz a1, 8
-;   mv a5, zero
+;   bltz a1, 0xc
+;   mv a1, zero
+;   j 8
+;   mv a1, a5
 ;   addi a4, zero, 0x40
-;   andi a2, a2, 0x7f
-;   bltu a2, a4, 0x10
+;   andi a5, a2, 0x7f
+;   bgeu a5, a4, 8
+;   j 8
 ;   mv a0, a3
-;   mv a1, a5
-;   j 0xc
-;   mv a0, s11
+;   bgeu a5, a4, 8
 ;   mv a1, a3
-;   addi sp, sp, 0x10
-;   ld s11, -8(sp)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/sshr.clif b/cranelift/filetests/filetests/isa/riscv64/sshr.clif
index 86d1c7a2e2f2..39dc9a867564 100644
--- a/cranelift/filetests/filetests/isa/riscv64/sshr.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/sshr.clif
@@ -395,16 +395,17 @@ block0(v0: i128, v1: i8):
 ;   li a3,64
 ;   sub a3,a3,a4
 ;   sll a5,a1,a3
-;   select a3,zero,a5##condition=(a4 eq zero)
+;   select_reg a3,zero,a5##condition=(a4 eq zero)
 ;   srl a5,a0,a4
 ;   or a5,a3,a5
 ;   li a0,64
 ;   sra a3,a1,a4
 ;   li a4,-1
-;   select t4,a4,zero##condition=(a1 slt zero)
+;   select_reg a1,a4,zero##condition=(a1 slt zero)
 ;   li a4,64
 ;   andi a2,a2,127
-;   select [a0,a1],[a3,t4],[a5,a3]##condition=(a2 uge a4)
+;   select_reg a0,a3,a5##condition=(a2 uge a4)
+;   select_reg a1,a1,a3##condition=(a2 uge a4)
 ;   ret
 ;
 ; Disassembled:
@@ -413,26 +414,26 @@ block0(v0: i128, v1: i8):
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a4
 ;   sll a5, a1, a3
-;   bnez a4, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a4, 0xc
 ;   mv a3, a5
+;   j 8
+;   mv a3, zero
 ;   srl a5, a0, a4
 ;   or a5, a3, a5
 ;   addi a0, zero, 0x40
 ;   sra a3, a1, a4
 ;   addi a4, zero, -1
-;   bgez a1, 0xc
-;   mv t4, a4
+;   bltz a1, 0xc
+;   mv a1, zero
 ;   j 8
-;   mv t4, zero
+;   mv a1, a4
 ;   addi a4, zero, 0x40
 ;   andi a2, a2, 0x7f
-;   bltu a2, a4, 0x10
-;   mv a0, a3
-;   mv a1, t4
-;   j 0xc
+;   bgeu a2, a4, 0xc
 ;   mv a0, a5
+;   j 8
+;   mv a0, a3
+;   bgeu a2, a4, 8
 ;   mv a1, a3
 ;   ret
 
@@ -448,16 +449,17 @@ block0(v0: i128, v1: i16):
 ;   li a3,64
 ;   sub a3,a3,a4
 ;   sll a5,a1,a3
-;   select a3,zero,a5##condition=(a4 eq zero)
+;   select_reg a3,zero,a5##condition=(a4 eq zero)
 ;   srl a5,a0,a4
 ;   or a5,a3,a5
 ;   li a0,64
 ;   sra a3,a1,a4
 ;   li a4,-1
-;   select t4,a4,zero##condition=(a1 slt zero)
+;   select_reg a1,a4,zero##condition=(a1 slt zero)
 ;   li a4,64
 ;   andi a2,a2,127
-;   select [a0,a1],[a3,t4],[a5,a3]##condition=(a2 uge a4)
+;   select_reg a0,a3,a5##condition=(a2 uge a4)
+;   select_reg a1,a1,a3##condition=(a2 uge a4)
 ;   ret
 ;
 ; Disassembled:
@@ -466,26 +468,26 @@ block0(v0: i128, v1: i16):
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a4
 ;   sll a5, a1, a3
-;   bnez a4, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a4, 0xc
 ;   mv a3, a5
+;   j 8
+;   mv a3, zero
 ;   srl a5, a0, a4
 ;   or a5, a3, a5
 ;   addi a0, zero, 0x40
 ;   sra a3, a1, a4
 ;   addi a4, zero, -1
-;   bgez a1, 0xc
-;   mv t4, a4
+;   bltz a1, 0xc
+;   mv a1, zero
 ;   j 8
-;   mv t4, zero
+;   mv a1, a4
 ;   addi a4, zero, 0x40
 ;   andi a2, a2, 0x7f
-;   bltu a2, a4, 0x10
-;   mv a0, a3
-;   mv a1, t4
-;   j 0xc
+;   bgeu a2, a4, 0xc
 ;   mv a0, a5
+;   j 8
+;   mv a0, a3
+;   bgeu a2, a4, 8
 ;   mv a1, a3
 ;   ret
 
@@ -501,16 +503,17 @@ block0(v0: i128, v1: i32):
 ;   li a3,64
 ;   sub a3,a3,a4
 ;   sll a5,a1,a3
-;   select a3,zero,a5##condition=(a4 eq zero)
+;   select_reg a3,zero,a5##condition=(a4 eq zero)
 ;   srl a5,a0,a4
 ;   or a5,a3,a5
 ;   li a0,64
 ;   sra a3,a1,a4
 ;   li a4,-1
-;   select t4,a4,zero##condition=(a1 slt zero)
+;   select_reg a1,a4,zero##condition=(a1 slt zero)
 ;   li a4,64
 ;   andi a2,a2,127
-;   select [a0,a1],[a3,t4],[a5,a3]##condition=(a2 uge a4)
+;   select_reg a0,a3,a5##condition=(a2 uge a4)
+;   select_reg a1,a1,a3##condition=(a2 uge a4)
 ;   ret
 ;
 ; Disassembled:
@@ -519,26 +522,26 @@ block0(v0: i128, v1: i32):
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a4
 ;   sll a5, a1, a3
-;   bnez a4, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a4, 0xc
 ;   mv a3, a5
+;   j 8
+;   mv a3, zero
 ;   srl a5, a0, a4
 ;   or a5, a3, a5
 ;   addi a0, zero, 0x40
 ;   sra a3, a1, a4
 ;   addi a4, zero, -1
-;   bgez a1, 0xc
-;   mv t4, a4
+;   bltz a1, 0xc
+;   mv a1, zero
 ;   j 8
-;   mv t4, zero
+;   mv a1, a4
 ;   addi a4, zero, 0x40
 ;   andi a2, a2, 0x7f
-;   bltu a2, a4, 0x10
-;   mv a0, a3
-;   mv a1, t4
-;   j 0xc
+;   bgeu a2, a4, 0xc
 ;   mv a0, a5
+;   j 8
+;   mv a0, a3
+;   bgeu a2, a4, 8
 ;   mv a1, a3
 ;   ret
 
@@ -554,16 +557,17 @@ block0(v0: i128, v1: i64):
 ;   li a3,64
 ;   sub a3,a3,a4
 ;   sll a5,a1,a3
-;   select a3,zero,a5##condition=(a4 eq zero)
+;   select_reg a3,zero,a5##condition=(a4 eq zero)
 ;   srl a5,a0,a4
 ;   or a5,a3,a5
 ;   li a0,64
 ;   sra a3,a1,a4
 ;   li a4,-1
-;   select t4,a4,zero##condition=(a1 slt zero)
+;   select_reg a1,a4,zero##condition=(a1 slt zero)
 ;   li a4,64
 ;   andi a2,a2,127
-;   select [a0,a1],[a3,t4],[a5,a3]##condition=(a2 uge a4)
+;   select_reg a0,a3,a5##condition=(a2 uge a4)
+;   select_reg a1,a1,a3##condition=(a2 uge a4)
 ;   ret
 ;
 ; Disassembled:
@@ -572,26 +576,26 @@ block0(v0: i128, v1: i64):
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a4
 ;   sll a5, a1, a3
-;   bnez a4, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a4, 0xc
 ;   mv a3, a5
+;   j 8
+;   mv a3, zero
 ;   srl a5, a0, a4
 ;   or a5, a3, a5
 ;   addi a0, zero, 0x40
 ;   sra a3, a1, a4
 ;   addi a4, zero, -1
-;   bgez a1, 0xc
-;   mv t4, a4
+;   bltz a1, 0xc
+;   mv a1, zero
 ;   j 8
-;   mv t4, zero
+;   mv a1, a4
 ;   addi a4, zero, 0x40
 ;   andi a2, a2, 0x7f
-;   bltu a2, a4, 0x10
-;   mv a0, a3
-;   mv a1, t4
-;   j 0xc
+;   bgeu a2, a4, 0xc
 ;   mv a0, a5
+;   j 8
+;   mv a0, a3
+;   bgeu a2, a4, 8
 ;   mv a1, a3
 ;   ret
 
@@ -602,68 +606,48 @@ block0(v0: i128, v1: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   sd s11,-8(sp)
-;   addi sp,sp,-16
 ; block0:
 ;   andi a5,a2,63
 ;   li a3,64
 ;   sub a3,a3,a5
 ;   sll a3,a1,a3
-;   select a3,zero,a3##condition=(a5 eq zero)
+;   select_reg a3,zero,a3##condition=(a5 eq zero)
 ;   srl a4,a0,a5
-;   or s11,a3,a4
+;   or a0,a3,a4
 ;   li a3,64
 ;   sra a3,a1,a5
 ;   li a5,-1
-;   select a5,a5,zero##condition=(a1 slt zero)
+;   select_reg a1,a5,zero##condition=(a1 slt zero)
 ;   li a4,64
-;   andi a2,a2,127
-;   select [a0,a1],[a3,a5],[s11,a3]##condition=(a2 uge a4)
-;   addi sp,sp,16
-;   ld s11,-8(sp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
+;   andi a5,a2,127
+;   select_reg a0,a3,a0##condition=(a5 uge a4)
+;   select_reg a1,a1,a3##condition=(a5 uge a4)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-;   sd s11, -8(sp)
-;   addi sp, sp, -0x10
-; block1: ; offset 0x18
 ;   andi a5, a2, 0x3f
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a5
 ;   sll a3, a1, a3
-;   bnez a5, 8
+;   beqz a5, 8
+;   j 8
 ;   mv a3, zero
 ;   srl a4, a0, a5
-;   or s11, a3, a4
+;   or a0, a3, a4
 ;   addi a3, zero, 0x40
 ;   sra a3, a1, a5
 ;   addi a5, zero, -1
-;   bltz a1, 8
-;   mv a5, zero
+;   bltz a1, 0xc
+;   mv a1, zero
+;   j 8
+;   mv a1, a5
 ;   addi a4, zero, 0x40
-;   andi a2, a2, 0x7f
-;   bltu a2, a4, 0x10
+;   andi a5, a2, 0x7f
+;   bgeu a5, a4, 8
+;   j 8
 ;   mv a0, a3
-;   mv a1, a5
-;   j 0xc
-;   mv a0, s11
+;   bgeu a5, a4, 8
 ;   mv a1, a3
-;   addi sp, sp, 0x10
-;   ld s11, -8(sp)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/stack-limit.clif b/cranelift/filetests/filetests/isa/riscv64/stack-limit.clif
index b0e01f1ce0dc..d33f83bdd740 100644
--- a/cranelift/filetests/filetests/isa/riscv64/stack-limit.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/stack-limit.clif
@@ -54,7 +54,7 @@ block0(v0: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -64,7 +64,7 @@ block0(v0: i64):
 ;   callind a2
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -99,7 +99,7 @@ block0(v0: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -111,7 +111,7 @@ block0(v0: i64):
 ;   callind a2
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -143,18 +143,18 @@ block0(v0: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ;   addi t6,a0,176
 ;   trap_if stk_ovf##(sp ult t6)
-;   addi sp,sp,-176
+;   add sp,-176
 ; block0:
-;   addi sp,sp,176
+;   add sp,+176
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -181,7 +181,7 @@ block0(v0: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -193,16 +193,12 @@ block0(v0: i64):
 ;   lui a0,98
 ;   addi a0,a0,-1408
 ;   call %Probestack
-;   lui t6,-98
-;   addi t6,t6,1408
-;   add sp,t6,sp
+;   add sp,-400000
 ; block0:
-;   lui t6,98
-;   addi t6,t6,-1408
-;   add sp,t6,sp
+;   add sp,+400000
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -220,12 +216,16 @@ block0(v0: i64):
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: stk_ovf
 ;   lui a0, 0x62
 ;   addi a0, a0, -0x580
-;   auipc ra, 0 ; reloc_external RiscvCallPlt %Probestack 0
-;   jalr ra
+;   auipc t5, 0
+;   ld t5, 0xc(t5)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %Probestack 0
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   jalr t5
 ;   lui t6, 0xfff9e
 ;   addi t6, t6, 0x580
 ;   add sp, t6, sp
-; block1: ; offset 0x48
+; block1: ; offset 0x58
 ;   lui t6, 0x62
 ;   addi t6, t6, -0x580
 ;   add sp, t6, sp
@@ -245,7 +245,7 @@ block0(v0: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -253,12 +253,12 @@ block0(v0: i64):
 ;   ld t6,4(t6)
 ;   addi t6,t6,32
 ;   trap_if stk_ovf##(sp ult t6)
-;   addi sp,sp,-32
+;   add sp,-32
 ; block0:
-;   addi sp,sp,32
+;   add sp,+32
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -291,7 +291,7 @@ block0(v0: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -305,16 +305,12 @@ block0(v0: i64):
 ;   lui a0,98
 ;   addi a0,a0,-1408
 ;   call %Probestack
-;   lui t6,-98
-;   addi t6,t6,1408
-;   add sp,t6,sp
+;   add sp,-400000
 ; block0:
-;   lui t6,98
-;   addi t6,t6,-1408
-;   add sp,t6,sp
+;   add sp,+400000
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -334,12 +330,16 @@ block0(v0: i64):
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: stk_ovf
 ;   lui a0, 0x62
 ;   addi a0, a0, -0x580
-;   auipc ra, 0 ; reloc_external RiscvCallPlt %Probestack 0
-;   jalr ra
+;   auipc t5, 0
+;   ld t5, 0xc(t5)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %Probestack 0
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   jalr t5
 ;   lui t6, 0xfff9e
 ;   addi t6, t6, 0x580
 ;   add sp, t6, sp
-; block1: ; offset 0x50
+; block1: ; offset 0x60
 ;   lui t6, 0x62
 ;   addi t6, t6, -0x580
 ;   add sp, t6, sp
@@ -358,19 +358,19 @@ block0(v0: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ;   ld t6,400000(a0)
 ;   addi t6,t6,32
 ;   trap_if stk_ovf##(sp ult t6)
-;   addi sp,sp,-32
+;   add sp,-32
 ; block0:
-;   addi sp,sp,32
+;   add sp,+32
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
diff --git a/cranelift/filetests/filetests/isa/riscv64/stack.clif b/cranelift/filetests/filetests/isa/riscv64/stack.clif
index 143a13482804..52f46d024d59 100644
--- a/cranelift/filetests/filetests/isa/riscv64/stack.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/stack.clif
@@ -12,17 +12,17 @@ block0:
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   addi sp,sp,-16
+;   add sp,-16
 ; block0:
 ;   load_addr a0,0(nominal_sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -50,24 +50,20 @@ block0:
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ;   lui a0,24
 ;   addi a0,a0,1712
 ;   call %Probestack
-;   lui t6,-24
-;   addi t6,t6,-1712
-;   add sp,t6,sp
+;   add sp,-100016
 ; block0:
 ;   load_addr a0,0(nominal_sp)
-;   lui t6,24
-;   addi t6,t6,1712
-;   add sp,t6,sp
+;   add sp,+100016
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -78,12 +74,16 @@ block0:
 ;   mv s0, sp
 ;   lui a0, 0x18
 ;   addi a0, a0, 0x6b0
-;   auipc ra, 0 ; reloc_external RiscvCallPlt %Probestack 0
-;   jalr ra
+;   auipc t5, 0
+;   ld t5, 0xc(t5)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %Probestack 0
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   jalr t5
 ;   lui t6, 0xfffe8
 ;   addi t6, t6, -0x6b0
 ;   add sp, t6, sp
-; block1: ; offset 0x2c
+; block1: ; offset 0x3c
 ;   mv a0, sp
 ;   lui t6, 0x18
 ;   addi t6, t6, 0x6b0
@@ -102,17 +102,18 @@ block0:
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   addi sp,sp,-16
+;   add sp,-16
 ; block0:
-;   ld a0,0(nominal_sp)
-;   addi sp,sp,16
+;   load_addr a1,0(nominal_sp)
+;   ld a0,0(a1)
+;   add sp,+16
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -123,7 +124,8 @@ block0:
 ;   mv s0, sp
 ;   addi sp, sp, -0x10
 ; block1: ; offset 0x14
-;   ld a0, 0(sp)
+;   mv a1, sp
+;   ld a0, 0(a1)
 ;   addi sp, sp, 0x10
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
@@ -140,24 +142,21 @@ block0:
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ;   lui a0,24
 ;   addi a0,a0,1712
 ;   call %Probestack
-;   lui t6,-24
-;   addi t6,t6,-1712
-;   add sp,t6,sp
+;   add sp,-100016
 ; block0:
-;   ld a0,0(nominal_sp)
-;   lui t6,24
-;   addi t6,t6,1712
-;   add sp,t6,sp
+;   load_addr a1,0(nominal_sp)
+;   ld a0,0(a1)
+;   add sp,+100016
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -168,13 +167,18 @@ block0:
 ;   mv s0, sp
 ;   lui a0, 0x18
 ;   addi a0, a0, 0x6b0
-;   auipc ra, 0 ; reloc_external RiscvCallPlt %Probestack 0
-;   jalr ra
+;   auipc t5, 0
+;   ld t5, 0xc(t5)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %Probestack 0
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   jalr t5
 ;   lui t6, 0xfffe8
 ;   addi t6, t6, -0x6b0
 ;   add sp, t6, sp
-; block1: ; offset 0x2c
-;   ld a0, 0(sp)
+; block1: ; offset 0x3c
+;   mv a1, sp
+;   ld a0, 0(a1)
 ;   lui t6, 0x18
 ;   addi t6, t6, 0x6b0
 ;   add sp, t6, sp
@@ -192,17 +196,18 @@ block0(v0: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   addi sp,sp,-16
+;   add sp,-16
 ; block0:
-;   sd a0,0(nominal_sp)
-;   addi sp,sp,16
+;   load_addr a2,0(nominal_sp)
+;   sd a0,0(a2)
+;   add sp,+16
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -213,7 +218,8 @@ block0(v0: i64):
 ;   mv s0, sp
 ;   addi sp, sp, -0x10
 ; block1: ; offset 0x14
-;   sd a0, 0(sp)
+;   mv a2, sp
+;   sd a0, 0(a2)
 ;   addi sp, sp, 0x10
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
@@ -230,24 +236,21 @@ block0(v0: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ;   lui a0,24
 ;   addi a0,a0,1712
 ;   call %Probestack
-;   lui t6,-24
-;   addi t6,t6,-1712
-;   add sp,t6,sp
+;   add sp,-100016
 ; block0:
-;   sd a0,0(nominal_sp)
-;   lui t6,24
-;   addi t6,t6,1712
-;   add sp,t6,sp
+;   load_addr a2,0(nominal_sp)
+;   sd a0,0(a2)
+;   add sp,+100016
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -258,13 +261,18 @@ block0(v0: i64):
 ;   mv s0, sp
 ;   lui a0, 0x18
 ;   addi a0, a0, 0x6b0
-;   auipc ra, 0 ; reloc_external RiscvCallPlt %Probestack 0
-;   jalr ra
+;   auipc t5, 0
+;   ld t5, 0xc(t5)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %Probestack 0
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   jalr t5
 ;   lui t6, 0xfffe8
 ;   addi t6, t6, -0x6b0
 ;   add sp, t6, sp
-; block1: ; offset 0x2c
-;   sd a0, 0(sp)
+; block1: ; offset 0x3c
+;   mv a2, sp
+;   sd a0, 0(a2)
 ;   lui t6, 0x18
 ;   addi t6, t6, 0x6b0
 ;   add sp, t6, sp
@@ -425,7 +433,7 @@ block0(v0: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -440,7 +448,7 @@ block0(v0: i8):
 ;   sd s9,-72(sp)
 ;   sd s10,-80(sp)
 ;   sd s11,-88(sp)
-;   addi sp,sp,-1360
+;   add sp,-1360
 ; block0:
 ;   sd a0,1000(nominal_sp)
 ;   li a2,2
@@ -560,11 +568,11 @@ block0(v0: i8):
 ;   ld t1,1160(nominal_sp)
 ;   ld t2,1168(nominal_sp)
 ;   add t1,t2,t1
-;   ld a7,1152(nominal_sp)
 ;   ld t4,1144(nominal_sp)
+;   ld a7,1152(nominal_sp)
 ;   add t2,a7,t4
-;   ld s3,1136(nominal_sp)
 ;   ld s5,1128(nominal_sp)
+;   ld s3,1136(nominal_sp)
 ;   add a6,s3,s5
 ;   ld a7,1112(nominal_sp)
 ;   ld t3,1120(nominal_sp)
@@ -584,8 +592,8 @@ block0(v0: i8):
 ;   ld s3,1032(nominal_sp)
 ;   ld s4,1040(nominal_sp)
 ;   add s3,s4,s3
-;   ld s4,1024(nominal_sp)
 ;   ld s5,1016(nominal_sp)
+;   ld s4,1024(nominal_sp)
 ;   add s4,s4,s5
 ;   ld s5,1008(nominal_sp)
 ;   add s5,s5,s6
@@ -612,7 +620,7 @@ block0(v0: i8):
 ;   add a1,a1,a2
 ;   add a1,a3,a1
 ;   ld a0,1000(nominal_sp)
-;   addi sp,sp,1360
+;   add sp,+1360
 ;   ld s1,-8(sp)
 ;   ld s2,-16(sp)
 ;   ld s3,-24(sp)
@@ -626,7 +634,7 @@ block0(v0: i8):
 ;   ld s11,-88(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -766,11 +774,11 @@ block0(v0: i8):
 ;   ld t1, 0x488(sp)
 ;   ld t2, 0x490(sp)
 ;   add t1, t2, t1
-;   ld a7, 0x480(sp)
 ;   ld t4, 0x478(sp)
+;   ld a7, 0x480(sp)
 ;   add t2, a7, t4
-;   ld s3, 0x470(sp)
 ;   ld s5, 0x468(sp)
+;   ld s3, 0x470(sp)
 ;   add a6, s3, s5
 ;   ld a7, 0x458(sp)
 ;   ld t3, 0x460(sp)
@@ -790,8 +798,8 @@ block0(v0: i8):
 ;   ld s3, 0x408(sp)
 ;   ld s4, 0x410(sp)
 ;   add s3, s4, s3
-;   ld s4, 0x400(sp)
 ;   ld s5, 0x3f8(sp)
+;   ld s4, 0x400(sp)
 ;   add s4, s4, s5
 ;   ld s5, 0x3f0(sp)
 ;   add s5, s5, s6
@@ -844,18 +852,19 @@ block0(v0: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   addi sp,sp,-16
+;   add sp,-16
 ; block0:
-;   sd a0,0(nominal_sp)
-;   sd a1,8(nominal_sp)
-;   addi sp,sp,16
+;   load_addr a3,0(nominal_sp)
+;   sd a0,0(a3)
+;   sd a1,8(a3)
+;   add sp,+16
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -866,8 +875,9 @@ block0(v0: i128):
 ;   mv s0, sp
 ;   addi sp, sp, -0x10
 ; block1: ; offset 0x14
-;   sd a0, 0(sp)
-;   sd a1, 8(sp)
+;   mv a3, sp
+;   sd a0, 0(a3)
+;   sd a1, 8(a3)
 ;   addi sp, sp, 0x10
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
@@ -884,18 +894,19 @@ block0(v0: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   addi sp,sp,-32
+;   add sp,-32
 ; block0:
-;   sd a0,32(nominal_sp)
-;   sd a1,40(nominal_sp)
-;   addi sp,sp,32
+;   load_addr a3,32(nominal_sp)
+;   sd a0,0(a3)
+;   sd a1,8(a3)
+;   add sp,+32
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -906,8 +917,9 @@ block0(v0: i128):
 ;   mv s0, sp
 ;   addi sp, sp, -0x20
 ; block1: ; offset 0x14
-;   sd a0, 0x20(sp)
-;   sd a1, 0x28(sp)
+;   addi a3, sp, 0x20
+;   sd a0, 0(a3)
+;   sd a1, 8(a3)
 ;   addi sp, sp, 0x20
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
@@ -924,25 +936,22 @@ block0(v0: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ;   lui a0,24
 ;   addi a0,a0,1712
 ;   call %Probestack
-;   lui t6,-24
-;   addi t6,t6,-1712
-;   add sp,t6,sp
+;   add sp,-100016
 ; block0:
-;   sd a0,0(nominal_sp)
-;   sd a1,8(nominal_sp)
-;   lui t6,24
-;   addi t6,t6,1712
-;   add sp,t6,sp
+;   load_addr a3,0(nominal_sp)
+;   sd a0,0(a3)
+;   sd a1,8(a3)
+;   add sp,+100016
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -953,14 +962,19 @@ block0(v0: i128):
 ;   mv s0, sp
 ;   lui a0, 0x18
 ;   addi a0, a0, 0x6b0
-;   auipc ra, 0 ; reloc_external RiscvCallPlt %Probestack 0
-;   jalr ra
+;   auipc t5, 0
+;   ld t5, 0xc(t5)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %Probestack 0
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   jalr t5
 ;   lui t6, 0xfffe8
 ;   addi t6, t6, -0x6b0
 ;   add sp, t6, sp
-; block1: ; offset 0x2c
-;   sd a0, 0(sp)
-;   sd a1, 8(sp)
+; block1: ; offset 0x3c
+;   mv a3, sp
+;   sd a0, 0(a3)
+;   sd a1, 8(a3)
 ;   lui t6, 0x18
 ;   addi t6, t6, 0x6b0
 ;   add sp, t6, sp
@@ -978,18 +992,19 @@ block0:
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   addi sp,sp,-16
+;   add sp,-16
 ; block0:
-;   ld a0,0(nominal_sp)
-;   ld a1,8(nominal_sp)
-;   addi sp,sp,16
+;   load_addr a2,0(nominal_sp)
+;   ld a0,0(a2)
+;   ld a1,8(a2)
+;   add sp,+16
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -1000,8 +1015,9 @@ block0:
 ;   mv s0, sp
 ;   addi sp, sp, -0x10
 ; block1: ; offset 0x14
-;   ld a0, 0(sp)
-;   ld a1, 8(sp)
+;   mv a2, sp
+;   ld a0, 0(a2)
+;   ld a1, 8(a2)
 ;   addi sp, sp, 0x10
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
@@ -1018,18 +1034,19 @@ block0:
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   addi sp,sp,-32
+;   add sp,-32
 ; block0:
-;   ld a0,32(nominal_sp)
-;   ld a1,40(nominal_sp)
-;   addi sp,sp,32
+;   load_addr a2,32(nominal_sp)
+;   ld a0,0(a2)
+;   ld a1,8(a2)
+;   add sp,+32
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -1040,8 +1057,9 @@ block0:
 ;   mv s0, sp
 ;   addi sp, sp, -0x20
 ; block1: ; offset 0x14
-;   ld a0, 0x20(sp)
-;   ld a1, 0x28(sp)
+;   addi a2, sp, 0x20
+;   ld a0, 0(a2)
+;   ld a1, 8(a2)
 ;   addi sp, sp, 0x20
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
@@ -1058,25 +1076,22 @@ block0:
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ;   lui a0,24
 ;   addi a0,a0,1712
 ;   call %Probestack
-;   lui t6,-24
-;   addi t6,t6,-1712
-;   add sp,t6,sp
+;   add sp,-100016
 ; block0:
-;   ld a0,0(nominal_sp)
-;   ld a1,8(nominal_sp)
-;   lui t6,24
-;   addi t6,t6,1712
-;   add sp,t6,sp
+;   load_addr a2,0(nominal_sp)
+;   ld a0,0(a2)
+;   ld a1,8(a2)
+;   add sp,+100016
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -1087,14 +1102,19 @@ block0:
 ;   mv s0, sp
 ;   lui a0, 0x18
 ;   addi a0, a0, 0x6b0
-;   auipc ra, 0 ; reloc_external RiscvCallPlt %Probestack 0
-;   jalr ra
+;   auipc t5, 0
+;   ld t5, 0xc(t5)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %Probestack 0
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   jalr t5
 ;   lui t6, 0xfffe8
 ;   addi t6, t6, -0x6b0
 ;   add sp, t6, sp
-; block1: ; offset 0x2c
-;   ld a0, 0(sp)
-;   ld a1, 8(sp)
+; block1: ; offset 0x3c
+;   mv a2, sp
+;   ld a0, 0(a2)
+;   ld a1, 8(a2)
 ;   lui t6, 0x18
 ;   addi t6, t6, 0x6b0
 ;   add sp, t6, sp
diff --git a/cranelift/filetests/filetests/isa/riscv64/symbol-value-pic.clif b/cranelift/filetests/filetests/isa/riscv64/symbol-value-pic.clif
deleted file mode 100644
index 049e9717d54e..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/symbol-value-pic.clif
+++ /dev/null
@@ -1,24 +0,0 @@
-test compile precise-output
-set unwind_info=false
-set is_pic
-target riscv64
-
-function %f() -> i64 {
-  gv0 = symbol %my_global
-
-block0:
-  v0 = symbol_value.i64 gv0
-  return v0
-}
-
-; VCode:
-; block0:
-;   load_sym a0,%my_global+0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   auipc a0, 0 ; reloc_external RiscvGotHi20 %my_global 0
-;   ld a0, 0(a0) ; reloc_external RiscvPCRelLo12I func+0 0
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/tail-call-conv.clif b/cranelift/filetests/filetests/isa/riscv64/tail-call-conv.clif
index d44b697bc2ee..f8f17dea411a 100644
--- a/cranelift/filetests/filetests/isa/riscv64/tail-call-conv.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/tail-call-conv.clif
@@ -9,7 +9,7 @@ block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64, v6: i64, v7: i64, v
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -21,8 +21,8 @@ block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64, v6: i64, v7: i64, v
 ;   ld s1,48(fp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
-;   addi sp,sp,48
+;   add sp,+16
+;   add sp,+48
 ;   ret
 ;
 ; Disassembled:
@@ -78,11 +78,11 @@ block0:
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   addi sp,sp,-16
+;   add sp,-16
 ; block0:
 ;   li s1,10
 ;   sd s1,8(nominal_sp)
@@ -112,7 +112,7 @@ block0:
 ;   li t2,125
 ;   li s1,130
 ;   li a0,135
-;   addi sp,sp,-48
+;   add sp,-48
 ;   virtual_sp_offset_adj +48
 ;   sd t0,0(sp)
 ;   sd t1,8(sp)
@@ -120,13 +120,13 @@ block0:
 ;   sd s1,24(sp)
 ;   sd a0,32(sp)
 ;   load_sym t0,%tail_callee_stack_args+0
-;   ld s1,8(nominal_sp)
 ;   ld a0,0(nominal_sp)
+;   ld s1,8(nominal_sp)
 ;   callind t0
-;   addi sp,sp,16
+;   add sp,+16
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -176,8 +176,8 @@ block0:
 ;   j 0xc
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %tail_callee_stack_args 0
 ;   .byte 0x00, 0x00, 0x00, 0x00
-;   ld s1, 0x38(sp)
 ;   ld a0, 0x30(sp)
+;   ld s1, 0x38(sp)
 ;   jalr t0
 ;   addi sp, sp, 0x10
 ;   ld ra, 8(sp)
@@ -219,11 +219,11 @@ block0:
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   addi sp,sp,-32
+;   add sp,-32
 ; block0:
 ;   li a3,10
 ;   sd a3,16(nominal_sp)
@@ -259,13 +259,13 @@ block0:
 ;   sd t2,16(s1)
 ;   sd a0,24(s1)
 ;   sd a1,32(s1)
-;   ld s1,16(nominal_sp)
-;   ld a0,8(nominal_sp)
 ;   ld a1,0(nominal_sp)
-;   addi sp,sp,32
+;   ld a0,8(nominal_sp)
+;   ld s1,16(nominal_sp)
+;   add sp,+32
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -310,9 +310,9 @@ block0:
 ;   sd t2, 0x10(s1)
 ;   sd a0, 0x18(s1)
 ;   sd a1, 0x20(s1)
-;   ld s1, 0x10(sp)
-;   ld a0, 8(sp)
 ;   ld a1, 0(sp)
+;   ld a0, 8(sp)
+;   ld s1, 0x10(sp)
 ;   addi sp, sp, 0x20
 ;   ld ra, 8(sp)
 ;   ld s0, 0(sp)
@@ -328,12 +328,12 @@ block0:
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ; block0:
-;   addi sp,sp,-48
+;   add sp,-48
 ;   virtual_sp_offset_adj +48
 ;   load_addr s1,0(sp)
 ;   load_sym t0,%tail_callee_stack_rets+0
@@ -343,11 +343,11 @@ block0:
 ;   ld a0,16(sp)
 ;   ld a2,24(sp)
 ;   ld s1,32(sp)
-;   addi sp,sp,48
+;   add sp,+48
 ;   virtual_sp_offset_adj -48
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -385,11 +385,11 @@ block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64, v6: i64, v7: i64, v
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   addi sp,sp,-32
+;   add sp,-32
 ; block0:
 ;   sd a0,0(nominal_sp)
 ;   sd a2,8(nominal_sp)
@@ -408,11 +408,11 @@ block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64, v6: i64, v7: i64, v
 ;   ld a0,0(nominal_sp)
 ;   ld a2,8(nominal_sp)
 ;   ld a4,16(nominal_sp)
-;   addi sp,sp,32
+;   add sp,+32
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
-;   addi sp,sp,48
+;   add sp,+16
+;   add sp,+48
 ;   ret
 ;
 ; Disassembled:
@@ -482,11 +482,11 @@ block0:
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   addi sp,sp,-16
+;   add sp,-16
 ; block0:
 ;   li s1,10
 ;   sd s1,8(nominal_sp)
@@ -516,7 +516,7 @@ block0:
 ;   li t2,125
 ;   li s1,130
 ;   li a0,135
-;   addi sp,sp,-96
+;   add sp,-96
 ;   virtual_sp_offset_adj +96
 ;   sd t0,0(sp)
 ;   sd t1,8(sp)
@@ -526,20 +526,20 @@ block0:
 ;   load_addr a0,48(sp)
 ;   sd a0,40(sp)
 ;   load_sym t0,%tail_callee_stack_args_and_rets+0
-;   ld s1,8(nominal_sp)
 ;   ld a0,0(nominal_sp)
+;   ld s1,8(nominal_sp)
 ;   callind t0
 ;   ld a4,0(sp)
 ;   ld a0,8(sp)
 ;   ld a2,16(sp)
 ;   ld a4,24(sp)
 ;   ld s1,32(sp)
-;   addi sp,sp,48
+;   add sp,+48
 ;   virtual_sp_offset_adj -48
-;   addi sp,sp,16
+;   add sp,+16
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -591,8 +591,8 @@ block0:
 ;   j 0xc
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %tail_callee_stack_args_and_rets 0
 ;   .byte 0x00, 0x00, 0x00, 0x00
-;   ld s1, 0x68(sp)
 ;   ld a0, 0x60(sp)
+;   ld s1, 0x68(sp)
 ;   jalr t0
 ;   ld a4, 0(sp)
 ;   ld a0, 8(sp)
diff --git a/cranelift/filetests/filetests/isa/riscv64/tls-elf.clif b/cranelift/filetests/filetests/isa/riscv64/tls-elf.clif
index 5a4d59d1f196..18e781b2fc0d 100644
--- a/cranelift/filetests/filetests/isa/riscv64/tls-elf.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/tls-elf.clif
@@ -11,22 +11,22 @@ block0(v0: i32):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
 ;   sd s1,-8(sp)
-;   addi sp,sp,-16
+;   add sp,-16
 ; block0:
 ;   mv s1,a0
 ;   elf_tls_get_addr a0,userextname0
 ;   mv a1,a0
 ;   mv a0,s1
-;   addi sp,sp,16
+;   add sp,+16
 ;   ld s1,-8(sp)
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
@@ -41,8 +41,12 @@ block0(v0: i32):
 ;   mv s1, a0
 ;   auipc a0, 0 ; reloc_external RiscvTlsGdHi20 u1:0 0
 ;   mv a0, a0 ; reloc_external RiscvPCRelLo12I func+28 0
-;   auipc ra, 0 ; reloc_external RiscvCallPlt %ElfTlsGetAddr 0
-;   jalr ra
+;   auipc t5, 0
+;   ld t5, 0xc(t5)
+;   j 0xc
+;   .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %ElfTlsGetAddr 0
+;   .byte 0x00, 0x00, 0x00, 0x00
+;   jalr t5
 ;   mv a1, a0
 ;   mv a0, s1
 ;   addi sp, sp, 0x10
@@ -52,48 +56,3 @@ block0(v0: i32):
 ;   addi sp, sp, 0x10
 ;   ret
 
-function u0:1(i64) -> i64 system_v {
-gv0 = symbol colocated tls u1:0
-
-block0(v0: i64):
-    v1 = tls_value.i64 gv0
-    v2 = iconst.i8 0
-    store notrap v2, v1
-    v3 = iconst.i64 0
-    return v3
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-; block0:
-;   elf_tls_get_addr a0,userextname0
-;   li a4,0
-;   sb a4,0(a0)
-;   li a0,0
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-; block1: ; offset 0x10
-;   auipc a0, 0 ; reloc_external RiscvTlsGdHi20 u1:0 0
-;   mv a0, a0 ; reloc_external RiscvPCRelLo12I func+16 0
-;   auipc ra, 0 ; reloc_external RiscvCallPlt %ElfTlsGetAddr 0
-;   jalr ra
-;   mv a4, zero
-;   sb a4, 0(a0)
-;   mv a0, zero
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/traps.clif b/cranelift/filetests/filetests/isa/riscv64/traps.clif
index 24de5ef0ad90..3abd6adcf215 100644
--- a/cranelift/filetests/filetests/isa/riscv64/traps.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/traps.clif
@@ -25,8 +25,9 @@ block0(v0: i64):
 
 ; VCode:
 ; block0:
-;   li a2,42
-;   beq a0,a2,taken(label2),not_taken(label1)
+;   li a3,42
+;   eq a3,a0,a3##ty=i64
+;   bne a3,zero,taken(label2),not_taken(label1)
 ; block1:
 ;   ret
 ; block2:
@@ -34,11 +35,15 @@ block0(v0: i64):
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi a2, zero, 0x2a
-;   beq a0, a2, 8
-; block1: ; offset 0x8
+;   addi a3, zero, 0x2a
+;   bne a0, a3, 0xc
+;   addi a3, zero, 1
+;   j 8
+;   mv a3, zero
+;   bnez a3, 8
+; block1: ; offset 0x18
 ;   ret
-; block2: ; offset 0xc
+; block2: ; offset 0x1c
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: user0
 
 function %h() {
diff --git a/cranelift/filetests/filetests/isa/riscv64/uadd_overflow_trap.clif b/cranelift/filetests/filetests/isa/riscv64/uadd_overflow_trap.clif
index 4e8e62857b55..d0c89e0c4f23 100644
--- a/cranelift/filetests/filetests/isa/riscv64/uadd_overflow_trap.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/uadd_overflow_trap.clif
@@ -104,17 +104,22 @@ block0(v0: i64):
 ; VCode:
 ; block0:
 ;   mv a1,a0
-;   li a3,127
-;   add a0,a1,a3
-;   trap_if user0##(a0 ult a1)
+;   li a4,127
+;   add a0,a1,a4
+;   ult a5,a0,a1##ty=i64
+;   trap_if user0##(a5 ne zero)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   mv a1, a0
-;   addi a3, zero, 0x7f
-;   add a0, a1, a3
-;   bgeu a0, a1, 8
+;   addi a4, zero, 0x7f
+;   add a0, a1, a4
+;   bgeu a0, a1, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
+;   beqz a5, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: user0
 ;   ret
 
@@ -127,16 +132,21 @@ block0(v0: i64):
 
 ; VCode:
 ; block0:
-;   li a3,127
-;   add a0,a3,a0
-;   trap_if user0##(a0 ult a3)
+;   li a4,127
+;   add a0,a4,a0
+;   ult a5,a0,a4##ty=i64
+;   trap_if user0##(a5 ne zero)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi a3, zero, 0x7f
-;   add a0, a3, a0
-;   bgeu a0, a3, 8
+;   addi a4, zero, 0x7f
+;   add a0, a4, a0
+;   bgeu a0, a4, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
+;   beqz a5, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: user0
 ;   ret
 
@@ -148,16 +158,23 @@ block0(v0: i64, v1: i64):
 
 ; VCode:
 ; block0:
-;   mv a5,a0
-;   add a0,a5,a1
-;   trap_if user0##(a0 ult a5)
+;   add a3,a0,a1
+;   mv a1,a3
+;   ult a5,a1,a0##ty=i64
+;   mv a0,a1
+;   trap_if user0##(a5 ne zero)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   mv a5, a0
-;   add a0, a5, a1
-;   bgeu a0, a5, 8
+;   add a3, a0, a1
+;   mv a1, a3
+;   bgeu a1, a0, 0xc
+;   addi a5, zero, 1
+;   j 8
+;   mv a5, zero
+;   mv a0, a1
+;   beqz a5, 8
 ;   .byte 0x00, 0x00, 0x00, 0x00 ; trap: user0
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/umax-zbb.clif b/cranelift/filetests/filetests/isa/riscv64/umax-zbb.clif
deleted file mode 100644
index 13a4089b4994..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/umax-zbb.clif
+++ /dev/null
@@ -1,147 +0,0 @@
-test compile precise-output
-set unwind_info=false
-target riscv64 has_zbb
-
-function %umax_i8(i8, i8) -> i8{
-block0(v0: i8, v1: i8):
-    v2 = umax v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   andi a3,a0,255
-;   andi a5,a1,255
-;   maxu a0,a3,a5
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   andi a3, a0, 0xff
-;   andi a5, a1, 0xff
-;   .byte 0x33, 0xf5, 0xf6, 0x0a
-;   ret
-
-function %umax_i16(i16, i16) -> i16{
-block0(v0: i16, v1: i16):
-    v2 = umax v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   zext.h a3,a0
-;   zext.h a5,a1
-;   maxu a0,a3,a5
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0xbb, 0x46, 0x05, 0x08
-;   .byte 0xbb, 0xc7, 0x05, 0x08
-;   .byte 0x33, 0xf5, 0xf6, 0x0a
-;   ret
-
-function %umax_i32(i32, i32) -> i32{
-block0(v0: i32, v1: i32):
-    v2 = umax v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   slli a3,a0,32
-;   srli a5,a3,32
-;   slli a1,a1,32
-;   srli a3,a1,32
-;   maxu a0,a5,a3
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   slli a3, a0, 0x20
-;   srli a5, a3, 0x20
-;   slli a1, a1, 0x20
-;   srli a3, a1, 0x20
-;   .byte 0x33, 0xf5, 0xd7, 0x0a
-;   ret
-
-function %umax_i64(i64, i64) -> i64{
-block0(v0: i64, v1: i64):
-    v2 = umax v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   maxu a0,a0,a1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x33, 0x75, 0xb5, 0x0a
-;   ret
-
-function %umax_i128(i128, i128) -> i128{
-block0(v0: i128, v1: i128):
-    v2 = umax v0, v1
-    return v2
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   sd s7,-8(sp)
-;   sd s9,-16(sp)
-;   addi sp,sp,-16
-; block0:
-;   sltu a5,a3,a1
-;   sltu a4,a2,a0
-;   mv s7,a0
-;   xor a0,a3,a1
-;   mv s9,a1
-;   select a5,a4,a5##condition=(a0 eq zero)
-;   mv a4,s7
-;   select [a0,a1],[a4,s9],[a2,a3]##condition=(a5 ne zero)
-;   addi sp,sp,16
-;   ld s7,-8(sp)
-;   ld s9,-16(sp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-;   sd s7, -8(sp)
-;   sd s9, -0x10(sp)
-;   addi sp, sp, -0x10
-; block1: ; offset 0x1c
-;   sltu a5, a3, a1
-;   sltu a4, a2, a0
-;   mv s7, a0
-;   xor a0, a3, a1
-;   mv s9, a1
-;   bnez a0, 8
-;   mv a5, a4
-;   mv a4, s7
-;   beqz a5, 0x10
-;   mv a0, a4
-;   mv a1, s9
-;   j 0xc
-;   mv a0, a2
-;   mv a1, a3
-;   addi sp, sp, 0x10
-;   ld s7, -8(sp)
-;   ld s9, -0x10(sp)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/umax.clif b/cranelift/filetests/filetests/isa/riscv64/umax.clif
deleted file mode 100644
index 6d07d693088f..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/umax.clif
+++ /dev/null
@@ -1,161 +0,0 @@
-test compile precise-output
-set unwind_info=false
-target riscv64 has_v
-
-function %umax_i8(i8, i8) -> i8{
-block0(v0: i8, v1: i8):
-    v2 = umax v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   andi a3,a0,255
-;   andi a5,a1,255
-;   select a0,a3,a5##condition=(a3 ugt a5)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   andi a3, a0, 0xff
-;   andi a5, a1, 0xff
-;   bgeu a5, a3, 0xc
-;   mv a0, a3
-;   j 8
-;   mv a0, a5
-;   ret
-
-function %umax_i16(i16, i16) -> i16{
-block0(v0: i16, v1: i16):
-    v2 = umax v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   slli a3,a0,48
-;   srli a5,a3,48
-;   slli a1,a1,48
-;   srli a3,a1,48
-;   select a0,a5,a3##condition=(a5 ugt a3)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   slli a3, a0, 0x30
-;   srli a5, a3, 0x30
-;   slli a1, a1, 0x30
-;   srli a3, a1, 0x30
-;   bgeu a3, a5, 0xc
-;   mv a0, a5
-;   j 8
-;   mv a0, a3
-;   ret
-
-function %umax_i32(i32, i32) -> i32{
-block0(v0: i32, v1: i32):
-    v2 = umax v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   slli a3,a0,32
-;   srli a5,a3,32
-;   slli a1,a1,32
-;   srli a3,a1,32
-;   select a0,a5,a3##condition=(a5 ugt a3)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   slli a3, a0, 0x20
-;   srli a5, a3, 0x20
-;   slli a1, a1, 0x20
-;   srli a3, a1, 0x20
-;   bgeu a3, a5, 0xc
-;   mv a0, a5
-;   j 8
-;   mv a0, a3
-;   ret
-
-function %umax_i64(i64, i64) -> i64{
-block0(v0: i64, v1: i64):
-    v2 = umax v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   select a0,a0,a1##condition=(a0 ugt a1)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   bltu a1, a0, 8
-;   mv a0, a1
-;   ret
-
-function %umax_i128(i128, i128) -> i128{
-block0(v0: i128, v1: i128):
-    v2 = umax v0, v1
-    return v2
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   sd s7,-8(sp)
-;   sd s9,-16(sp)
-;   addi sp,sp,-16
-; block0:
-;   sltu a5,a3,a1
-;   sltu a4,a2,a0
-;   mv s7,a0
-;   xor a0,a3,a1
-;   mv s9,a1
-;   select a5,a4,a5##condition=(a0 eq zero)
-;   mv a4,s7
-;   select [a0,a1],[a4,s9],[a2,a3]##condition=(a5 ne zero)
-;   addi sp,sp,16
-;   ld s7,-8(sp)
-;   ld s9,-16(sp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-;   sd s7, -8(sp)
-;   sd s9, -0x10(sp)
-;   addi sp, sp, -0x10
-; block1: ; offset 0x1c
-;   sltu a5, a3, a1
-;   sltu a4, a2, a0
-;   mv s7, a0
-;   xor a0, a3, a1
-;   mv s9, a1
-;   bnez a0, 8
-;   mv a5, a4
-;   mv a4, s7
-;   beqz a5, 0x10
-;   mv a0, a4
-;   mv a1, s9
-;   j 0xc
-;   mv a0, a2
-;   mv a1, a3
-;   addi sp, sp, 0x10
-;   ld s7, -8(sp)
-;   ld s9, -0x10(sp)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/umin-zbb.clif b/cranelift/filetests/filetests/isa/riscv64/umin-zbb.clif
deleted file mode 100644
index ee8a1eb988cb..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/umin-zbb.clif
+++ /dev/null
@@ -1,147 +0,0 @@
-test compile precise-output
-set unwind_info=false
-target riscv64 has_zbb
-
-function %umin_i8(i8, i8) -> i8{
-block0(v0: i8, v1: i8):
-    v2 = umin v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   andi a3,a0,255
-;   andi a5,a1,255
-;   minu a0,a3,a5
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   andi a3, a0, 0xff
-;   andi a5, a1, 0xff
-;   .byte 0x33, 0xd5, 0xf6, 0x0a
-;   ret
-
-function %umin_i16(i16, i16) -> i16{
-block0(v0: i16, v1: i16):
-    v2 = umin v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   zext.h a3,a0
-;   zext.h a5,a1
-;   minu a0,a3,a5
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0xbb, 0x46, 0x05, 0x08
-;   .byte 0xbb, 0xc7, 0x05, 0x08
-;   .byte 0x33, 0xd5, 0xf6, 0x0a
-;   ret
-
-function %umin_i32(i32, i32) -> i32{
-block0(v0: i32, v1: i32):
-    v2 = umin v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   slli a3,a0,32
-;   srli a5,a3,32
-;   slli a1,a1,32
-;   srli a3,a1,32
-;   minu a0,a5,a3
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   slli a3, a0, 0x20
-;   srli a5, a3, 0x20
-;   slli a1, a1, 0x20
-;   srli a3, a1, 0x20
-;   .byte 0x33, 0xd5, 0xd7, 0x0a
-;   ret
-
-function %umin_i64(i64, i64) -> i64{
-block0(v0: i64, v1: i64):
-    v2 = umin v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   minu a0,a0,a1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x33, 0x55, 0xb5, 0x0a
-;   ret
-
-function %umin_i128(i128, i128) -> i128{
-block0(v0: i128, v1: i128):
-    v2 = umin v0, v1
-    return v2
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   sd s7,-8(sp)
-;   sd s9,-16(sp)
-;   addi sp,sp,-16
-; block0:
-;   sltu a5,a1,a3
-;   sltu a4,a0,a2
-;   mv s7,a0
-;   xor a0,a1,a3
-;   mv s9,a1
-;   select a5,a4,a5##condition=(a0 eq zero)
-;   mv a4,s7
-;   select [a0,a1],[a4,s9],[a2,a3]##condition=(a5 ne zero)
-;   addi sp,sp,16
-;   ld s7,-8(sp)
-;   ld s9,-16(sp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-;   sd s7, -8(sp)
-;   sd s9, -0x10(sp)
-;   addi sp, sp, -0x10
-; block1: ; offset 0x1c
-;   sltu a5, a1, a3
-;   sltu a4, a0, a2
-;   mv s7, a0
-;   xor a0, a1, a3
-;   mv s9, a1
-;   bnez a0, 8
-;   mv a5, a4
-;   mv a4, s7
-;   beqz a5, 0x10
-;   mv a0, a4
-;   mv a1, s9
-;   j 0xc
-;   mv a0, a2
-;   mv a1, a3
-;   addi sp, sp, 0x10
-;   ld s7, -8(sp)
-;   ld s9, -0x10(sp)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/umin.clif b/cranelift/filetests/filetests/isa/riscv64/umin.clif
deleted file mode 100644
index 34e3527c0808..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/umin.clif
+++ /dev/null
@@ -1,161 +0,0 @@
-test compile precise-output
-set unwind_info=false
-target riscv64 has_v
-
-function %umin_i8(i8, i8) -> i8{
-block0(v0: i8, v1: i8):
-    v2 = umin v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   andi a3,a0,255
-;   andi a5,a1,255
-;   select a0,a3,a5##condition=(a3 ult a5)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   andi a3, a0, 0xff
-;   andi a5, a1, 0xff
-;   bgeu a3, a5, 0xc
-;   mv a0, a3
-;   j 8
-;   mv a0, a5
-;   ret
-
-function %umin_i16(i16, i16) -> i16{
-block0(v0: i16, v1: i16):
-    v2 = umin v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   slli a3,a0,48
-;   srli a5,a3,48
-;   slli a1,a1,48
-;   srli a3,a1,48
-;   select a0,a5,a3##condition=(a5 ult a3)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   slli a3, a0, 0x30
-;   srli a5, a3, 0x30
-;   slli a1, a1, 0x30
-;   srli a3, a1, 0x30
-;   bgeu a5, a3, 0xc
-;   mv a0, a5
-;   j 8
-;   mv a0, a3
-;   ret
-
-function %umin_i32(i32, i32) -> i32{
-block0(v0: i32, v1: i32):
-    v2 = umin v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   slli a3,a0,32
-;   srli a5,a3,32
-;   slli a1,a1,32
-;   srli a3,a1,32
-;   select a0,a5,a3##condition=(a5 ult a3)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   slli a3, a0, 0x20
-;   srli a5, a3, 0x20
-;   slli a1, a1, 0x20
-;   srli a3, a1, 0x20
-;   bgeu a5, a3, 0xc
-;   mv a0, a5
-;   j 8
-;   mv a0, a3
-;   ret
-
-function %umin_i64(i64, i64) -> i64{
-block0(v0: i64, v1: i64):
-    v2 = umin v0, v1
-    return v2
-}
-
-; VCode:
-; block0:
-;   select a0,a0,a1##condition=(a0 ult a1)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   bltu a0, a1, 8
-;   mv a0, a1
-;   ret
-
-function %umin_i128(i128, i128) -> i128{
-block0(v0: i128, v1: i128):
-    v2 = umin v0, v1
-    return v2
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   sd s7,-8(sp)
-;   sd s9,-16(sp)
-;   addi sp,sp,-16
-; block0:
-;   sltu a5,a1,a3
-;   sltu a4,a0,a2
-;   mv s7,a0
-;   xor a0,a1,a3
-;   mv s9,a1
-;   select a5,a4,a5##condition=(a0 eq zero)
-;   mv a4,s7
-;   select [a0,a1],[a4,s9],[a2,a3]##condition=(a5 ne zero)
-;   addi sp,sp,16
-;   ld s7,-8(sp)
-;   ld s9,-16(sp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-;   sd s7, -8(sp)
-;   sd s9, -0x10(sp)
-;   addi sp, sp, -0x10
-; block1: ; offset 0x1c
-;   sltu a5, a1, a3
-;   sltu a4, a0, a2
-;   mv s7, a0
-;   xor a0, a1, a3
-;   mv s9, a1
-;   bnez a0, 8
-;   mv a5, a4
-;   mv a4, s7
-;   beqz a5, 0x10
-;   mv a0, a4
-;   mv a1, s9
-;   j 0xc
-;   mv a0, a2
-;   mv a1, a3
-;   addi sp, sp, 0x10
-;   ld s7, -8(sp)
-;   ld s9, -0x10(sp)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
-;   ret
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/ushr-const.clif b/cranelift/filetests/filetests/isa/riscv64/ushr-const.clif
index 70a911248cb1..5989ce2e6d92 100644
--- a/cranelift/filetests/filetests/isa/riscv64/ushr-const.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/ushr-const.clif
@@ -391,13 +391,14 @@ block0(v0: i128):
 ;   li a2,64
 ;   sub a2,a2,a4
 ;   sll a5,a1,a2
-;   select a2,zero,a5##condition=(a4 eq zero)
+;   select_reg a2,zero,a5##condition=(a4 eq zero)
 ;   srl a5,a0,a4
 ;   or a5,a2,a5
 ;   li t0,64
 ;   srl a2,a1,a4
 ;   andi a4,a3,127
-;   select [a0,a1],[a2,zero],[a5,a2]##condition=(a4 uge t0)
+;   select_reg a0,a2,a5##condition=(a4 uge t0)
+;   select_reg a1,zero,a2##condition=(a4 uge t0)
 ;   ret
 ;
 ; Disassembled:
@@ -407,21 +408,23 @@ block0(v0: i128):
 ;   addi a2, zero, 0x40
 ;   sub a2, a2, a4
 ;   sll a5, a1, a2
-;   bnez a4, 0xc
-;   mv a2, zero
-;   j 8
+;   beqz a4, 0xc
 ;   mv a2, a5
+;   j 8
+;   mv a2, zero
 ;   srl a5, a0, a4
 ;   or a5, a2, a5
 ;   addi t0, zero, 0x40
 ;   srl a2, a1, a4
 ;   andi a4, a3, 0x7f
-;   bltu a4, t0, 0x10
-;   mv a0, a2
-;   mv a1, zero
-;   j 0xc
+;   bgeu a4, t0, 0xc
 ;   mv a0, a5
+;   j 8
+;   mv a0, a2
+;   bgeu a4, t0, 0xc
 ;   mv a1, a2
+;   j 8
+;   mv a1, zero
 ;   ret
 
 function %ushr_i128_const_i16(i128) -> i128 {
@@ -438,13 +441,14 @@ block0(v0: i128):
 ;   li a2,64
 ;   sub a2,a2,a4
 ;   sll a5,a1,a2
-;   select a2,zero,a5##condition=(a4 eq zero)
+;   select_reg a2,zero,a5##condition=(a4 eq zero)
 ;   srl a5,a0,a4
 ;   or a5,a2,a5
 ;   li t0,64
 ;   srl a2,a1,a4
 ;   andi a4,a3,127
-;   select [a0,a1],[a2,zero],[a5,a2]##condition=(a4 uge t0)
+;   select_reg a0,a2,a5##condition=(a4 uge t0)
+;   select_reg a1,zero,a2##condition=(a4 uge t0)
 ;   ret
 ;
 ; Disassembled:
@@ -454,21 +458,23 @@ block0(v0: i128):
 ;   addi a2, zero, 0x40
 ;   sub a2, a2, a4
 ;   sll a5, a1, a2
-;   bnez a4, 0xc
-;   mv a2, zero
-;   j 8
+;   beqz a4, 0xc
 ;   mv a2, a5
+;   j 8
+;   mv a2, zero
 ;   srl a5, a0, a4
 ;   or a5, a2, a5
 ;   addi t0, zero, 0x40
 ;   srl a2, a1, a4
 ;   andi a4, a3, 0x7f
-;   bltu a4, t0, 0x10
-;   mv a0, a2
-;   mv a1, zero
-;   j 0xc
+;   bgeu a4, t0, 0xc
 ;   mv a0, a5
+;   j 8
+;   mv a0, a2
+;   bgeu a4, t0, 0xc
 ;   mv a1, a2
+;   j 8
+;   mv a1, zero
 ;   ret
 
 function %ushr_i128_const_i32(i128) -> i128 {
@@ -485,13 +491,14 @@ block0(v0: i128):
 ;   li a2,64
 ;   sub a2,a2,a4
 ;   sll a5,a1,a2
-;   select a2,zero,a5##condition=(a4 eq zero)
+;   select_reg a2,zero,a5##condition=(a4 eq zero)
 ;   srl a5,a0,a4
 ;   or a5,a2,a5
 ;   li t0,64
 ;   srl a2,a1,a4
 ;   andi a4,a3,127
-;   select [a0,a1],[a2,zero],[a5,a2]##condition=(a4 uge t0)
+;   select_reg a0,a2,a5##condition=(a4 uge t0)
+;   select_reg a1,zero,a2##condition=(a4 uge t0)
 ;   ret
 ;
 ; Disassembled:
@@ -501,21 +508,23 @@ block0(v0: i128):
 ;   addi a2, zero, 0x40
 ;   sub a2, a2, a4
 ;   sll a5, a1, a2
-;   bnez a4, 0xc
-;   mv a2, zero
-;   j 8
+;   beqz a4, 0xc
 ;   mv a2, a5
+;   j 8
+;   mv a2, zero
 ;   srl a5, a0, a4
 ;   or a5, a2, a5
 ;   addi t0, zero, 0x40
 ;   srl a2, a1, a4
 ;   andi a4, a3, 0x7f
-;   bltu a4, t0, 0x10
-;   mv a0, a2
-;   mv a1, zero
-;   j 0xc
+;   bgeu a4, t0, 0xc
 ;   mv a0, a5
+;   j 8
+;   mv a0, a2
+;   bgeu a4, t0, 0xc
 ;   mv a1, a2
+;   j 8
+;   mv a1, zero
 ;   ret
 
 function %ushr_i128_const_i64(i128) -> i128 {
@@ -532,13 +541,14 @@ block0(v0: i128):
 ;   li a2,64
 ;   sub a2,a2,a4
 ;   sll a5,a1,a2
-;   select a2,zero,a5##condition=(a4 eq zero)
+;   select_reg a2,zero,a5##condition=(a4 eq zero)
 ;   srl a5,a0,a4
 ;   or a5,a2,a5
 ;   li t0,64
 ;   srl a2,a1,a4
 ;   andi a4,a3,127
-;   select [a0,a1],[a2,zero],[a5,a2]##condition=(a4 uge t0)
+;   select_reg a0,a2,a5##condition=(a4 uge t0)
+;   select_reg a1,zero,a2##condition=(a4 uge t0)
 ;   ret
 ;
 ; Disassembled:
@@ -548,21 +558,23 @@ block0(v0: i128):
 ;   addi a2, zero, 0x40
 ;   sub a2, a2, a4
 ;   sll a5, a1, a2
-;   bnez a4, 0xc
-;   mv a2, zero
-;   j 8
+;   beqz a4, 0xc
 ;   mv a2, a5
+;   j 8
+;   mv a2, zero
 ;   srl a5, a0, a4
 ;   or a5, a2, a5
 ;   addi t0, zero, 0x40
 ;   srl a2, a1, a4
 ;   andi a4, a3, 0x7f
-;   bltu a4, t0, 0x10
-;   mv a0, a2
-;   mv a1, zero
-;   j 0xc
+;   bgeu a4, t0, 0xc
 ;   mv a0, a5
+;   j 8
+;   mv a0, a2
+;   bgeu a4, t0, 0xc
 ;   mv a1, a2
+;   j 8
+;   mv a1, zero
 ;   ret
 
 function %ushr_i128_const_i128(i128) -> i128 {
@@ -574,12 +586,6 @@ block0(v0: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   sd s11,-8(sp)
-;   addi sp,sp,-16
 ; block0:
 ;   li a4,5
 ;   li a5,0
@@ -587,52 +593,38 @@ block0(v0: i128):
 ;   li a2,64
 ;   sub a3,a2,a5
 ;   sll a2,a1,a3
-;   select a2,zero,a2##condition=(a5 eq zero)
+;   select_reg a2,zero,a2##condition=(a5 eq zero)
 ;   srl a3,a0,a5
-;   or s11,a2,a3
+;   or a0,a2,a3
 ;   li a2,64
 ;   srl a3,a1,a5
 ;   andi a5,a4,127
-;   select [a0,a1],[a3,zero],[s11,a3]##condition=(a5 uge a2)
-;   addi sp,sp,16
-;   ld s11,-8(sp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
+;   select_reg a0,a3,a0##condition=(a5 uge a2)
+;   select_reg a1,zero,a3##condition=(a5 uge a2)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-;   sd s11, -8(sp)
-;   addi sp, sp, -0x10
-; block1: ; offset 0x18
 ;   addi a4, zero, 5
 ;   mv a5, zero
 ;   andi a5, a4, 0x3f
 ;   addi a2, zero, 0x40
 ;   sub a3, a2, a5
 ;   sll a2, a1, a3
-;   bnez a5, 8
+;   beqz a5, 8
+;   j 8
 ;   mv a2, zero
 ;   srl a3, a0, a5
-;   or s11, a2, a3
+;   or a0, a2, a3
 ;   addi a2, zero, 0x40
 ;   srl a3, a1, a5
 ;   andi a5, a4, 0x7f
-;   bltu a5, a2, 0x10
+;   bgeu a5, a2, 8
+;   j 8
 ;   mv a0, a3
-;   mv a1, zero
-;   j 0xc
-;   mv a0, s11
+;   bgeu a5, a2, 0xc
 ;   mv a1, a3
-;   addi sp, sp, 0x10
-;   ld s11, -8(sp)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
+;   j 8
+;   mv a1, zero
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/ushr.clif b/cranelift/filetests/filetests/isa/riscv64/ushr.clif
index 55af16c72c23..6d16f2db8054 100644
--- a/cranelift/filetests/filetests/isa/riscv64/ushr.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/ushr.clif
@@ -385,13 +385,14 @@ block0(v0: i128, v1: i8):
 ;   li a3,64
 ;   sub a3,a3,a4
 ;   sll a5,a1,a3
-;   select a3,zero,a5##condition=(a4 eq zero)
+;   select_reg a3,zero,a5##condition=(a4 eq zero)
 ;   srl a5,a0,a4
 ;   or a5,a3,a5
 ;   li t0,64
 ;   srl a3,a1,a4
 ;   andi a4,a2,127
-;   select [a0,a1],[a3,zero],[a5,a3]##condition=(a4 uge t0)
+;   select_reg a0,a3,a5##condition=(a4 uge t0)
+;   select_reg a1,zero,a3##condition=(a4 uge t0)
 ;   ret
 ;
 ; Disassembled:
@@ -400,21 +401,23 @@ block0(v0: i128, v1: i8):
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a4
 ;   sll a5, a1, a3
-;   bnez a4, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a4, 0xc
 ;   mv a3, a5
+;   j 8
+;   mv a3, zero
 ;   srl a5, a0, a4
 ;   or a5, a3, a5
 ;   addi t0, zero, 0x40
 ;   srl a3, a1, a4
 ;   andi a4, a2, 0x7f
-;   bltu a4, t0, 0x10
-;   mv a0, a3
-;   mv a1, zero
-;   j 0xc
+;   bgeu a4, t0, 0xc
 ;   mv a0, a5
+;   j 8
+;   mv a0, a3
+;   bgeu a4, t0, 0xc
 ;   mv a1, a3
+;   j 8
+;   mv a1, zero
 ;   ret
 
 function %ushr_i128_i16(i128, i16) -> i128 {
@@ -429,13 +432,14 @@ block0(v0: i128, v1: i16):
 ;   li a3,64
 ;   sub a3,a3,a4
 ;   sll a5,a1,a3
-;   select a3,zero,a5##condition=(a4 eq zero)
+;   select_reg a3,zero,a5##condition=(a4 eq zero)
 ;   srl a5,a0,a4
 ;   or a5,a3,a5
 ;   li t0,64
 ;   srl a3,a1,a4
 ;   andi a4,a2,127
-;   select [a0,a1],[a3,zero],[a5,a3]##condition=(a4 uge t0)
+;   select_reg a0,a3,a5##condition=(a4 uge t0)
+;   select_reg a1,zero,a3##condition=(a4 uge t0)
 ;   ret
 ;
 ; Disassembled:
@@ -444,21 +448,23 @@ block0(v0: i128, v1: i16):
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a4
 ;   sll a5, a1, a3
-;   bnez a4, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a4, 0xc
 ;   mv a3, a5
+;   j 8
+;   mv a3, zero
 ;   srl a5, a0, a4
 ;   or a5, a3, a5
 ;   addi t0, zero, 0x40
 ;   srl a3, a1, a4
 ;   andi a4, a2, 0x7f
-;   bltu a4, t0, 0x10
-;   mv a0, a3
-;   mv a1, zero
-;   j 0xc
+;   bgeu a4, t0, 0xc
 ;   mv a0, a5
+;   j 8
+;   mv a0, a3
+;   bgeu a4, t0, 0xc
 ;   mv a1, a3
+;   j 8
+;   mv a1, zero
 ;   ret
 
 function %ushr_i128_i32(i128, i32) -> i128 {
@@ -473,13 +479,14 @@ block0(v0: i128, v1: i32):
 ;   li a3,64
 ;   sub a3,a3,a4
 ;   sll a5,a1,a3
-;   select a3,zero,a5##condition=(a4 eq zero)
+;   select_reg a3,zero,a5##condition=(a4 eq zero)
 ;   srl a5,a0,a4
 ;   or a5,a3,a5
 ;   li t0,64
 ;   srl a3,a1,a4
 ;   andi a4,a2,127
-;   select [a0,a1],[a3,zero],[a5,a3]##condition=(a4 uge t0)
+;   select_reg a0,a3,a5##condition=(a4 uge t0)
+;   select_reg a1,zero,a3##condition=(a4 uge t0)
 ;   ret
 ;
 ; Disassembled:
@@ -488,21 +495,23 @@ block0(v0: i128, v1: i32):
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a4
 ;   sll a5, a1, a3
-;   bnez a4, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a4, 0xc
 ;   mv a3, a5
+;   j 8
+;   mv a3, zero
 ;   srl a5, a0, a4
 ;   or a5, a3, a5
 ;   addi t0, zero, 0x40
 ;   srl a3, a1, a4
 ;   andi a4, a2, 0x7f
-;   bltu a4, t0, 0x10
-;   mv a0, a3
-;   mv a1, zero
-;   j 0xc
+;   bgeu a4, t0, 0xc
 ;   mv a0, a5
+;   j 8
+;   mv a0, a3
+;   bgeu a4, t0, 0xc
 ;   mv a1, a3
+;   j 8
+;   mv a1, zero
 ;   ret
 
 function %ushr_i128_i64(i128, i64) -> i128 {
@@ -517,13 +526,14 @@ block0(v0: i128, v1: i64):
 ;   li a3,64
 ;   sub a3,a3,a4
 ;   sll a5,a1,a3
-;   select a3,zero,a5##condition=(a4 eq zero)
+;   select_reg a3,zero,a5##condition=(a4 eq zero)
 ;   srl a5,a0,a4
 ;   or a5,a3,a5
 ;   li t0,64
 ;   srl a3,a1,a4
 ;   andi a4,a2,127
-;   select [a0,a1],[a3,zero],[a5,a3]##condition=(a4 uge t0)
+;   select_reg a0,a3,a5##condition=(a4 uge t0)
+;   select_reg a1,zero,a3##condition=(a4 uge t0)
 ;   ret
 ;
 ; Disassembled:
@@ -532,21 +542,23 @@ block0(v0: i128, v1: i64):
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a4
 ;   sll a5, a1, a3
-;   bnez a4, 0xc
-;   mv a3, zero
-;   j 8
+;   beqz a4, 0xc
 ;   mv a3, a5
+;   j 8
+;   mv a3, zero
 ;   srl a5, a0, a4
 ;   or a5, a3, a5
 ;   addi t0, zero, 0x40
 ;   srl a3, a1, a4
 ;   andi a4, a2, 0x7f
-;   bltu a4, t0, 0x10
-;   mv a0, a3
-;   mv a1, zero
-;   j 0xc
+;   bgeu a4, t0, 0xc
 ;   mv a0, a5
+;   j 8
+;   mv a0, a3
+;   bgeu a4, t0, 0xc
 ;   mv a1, a3
+;   j 8
+;   mv a1, zero
 ;   ret
 
 function %ushr_i128_i128(i128, i128) -> i128 {
@@ -556,61 +568,41 @@ block0(v0: i128, v1: i128):
 }
 
 ; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   sd s11,-8(sp)
-;   addi sp,sp,-16
 ; block0:
 ;   andi a5,a2,63
 ;   li a3,64
 ;   sub a3,a3,a5
 ;   sll a3,a1,a3
-;   select a3,zero,a3##condition=(a5 eq zero)
+;   select_reg a3,zero,a3##condition=(a5 eq zero)
 ;   srl a4,a0,a5
-;   or s11,a3,a4
+;   or a0,a3,a4
 ;   li a3,64
 ;   srl a4,a1,a5
 ;   andi a5,a2,127
-;   select [a0,a1],[a4,zero],[s11,a4]##condition=(a5 uge a3)
-;   addi sp,sp,16
-;   ld s11,-8(sp)
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
+;   select_reg a0,a4,a0##condition=(a5 uge a3)
+;   select_reg a1,zero,a4##condition=(a5 uge a3)
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   addi sp, sp, -0x10
-;   sd ra, 8(sp)
-;   sd s0, 0(sp)
-;   mv s0, sp
-;   sd s11, -8(sp)
-;   addi sp, sp, -0x10
-; block1: ; offset 0x18
 ;   andi a5, a2, 0x3f
 ;   addi a3, zero, 0x40
 ;   sub a3, a3, a5
 ;   sll a3, a1, a3
-;   bnez a5, 8
+;   beqz a5, 8
+;   j 8
 ;   mv a3, zero
 ;   srl a4, a0, a5
-;   or s11, a3, a4
+;   or a0, a3, a4
 ;   addi a3, zero, 0x40
 ;   srl a4, a1, a5
 ;   andi a5, a2, 0x7f
-;   bltu a5, a3, 0x10
+;   bgeu a5, a3, 8
+;   j 8
 ;   mv a0, a4
-;   mv a1, zero
-;   j 0xc
-;   mv a0, s11
+;   bgeu a5, a3, 0xc
 ;   mv a1, a4
-;   addi sp, sp, 0x10
-;   ld s11, -8(sp)
-;   ld ra, 8(sp)
-;   ld s0, 0(sp)
-;   addi sp, sp, 0x10
+;   j 8
+;   mv a1, zero
 ;   ret
 
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
index d72cfed5a124..7938e65a4c6f 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
@@ -42,14 +42,15 @@
 ;; function u0:0:
 ;; block0:
 ;;   slli a3,a0,32
-;;   srli a4,a3,32
-;;   ld a3,8(a2)
-;;   addi a3,a3,-4
-;;   bgtu a4,a3,taken(label3),not_taken(label1)
+;;   srli a5,a3,32
+;;   ld a4,8(a2)
+;;   addi a4,a4,-4
+;;   ugt a4,a5,a4##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a5,0(a2)
-;;   add a4,a5,a4
-;;   sw a1,0(a4)
+;;   ld a0,0(a2)
+;;   add a5,a0,a5
+;;   sw a1,0(a5)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -58,15 +59,16 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a2,a0,32
-;;   srli a4,a2,32
-;;   ld a3,8(a1)
-;;   addi a3,a3,-4
-;;   bgtu a4,a3,taken(label3),not_taken(label1)
+;;   slli a3,a0,32
+;;   srli a5,a3,32
+;;   ld a4,8(a1)
+;;   addi a4,a4,-4
+;;   ugt a4,a5,a4##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a5,0(a1)
-;;   add a4,a5,a4
-;;   lw a0,0(a4)
+;;   ld a0,0(a1)
+;;   add a5,a0,a5
+;;   lw a0,0(a5)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index f877835d280c..ba9a33c1df02 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -41,17 +41,20 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a4,a0,32
-;;   srli a0,a4,32
-;;   ld a5,8(a2)
-;;   lui a4,-1
-;;   addi a3,a4,-4
-;;   add a5,a5,a3
-;;   bgtu a0,a5,taken(label3),not_taken(label1)
+;;   slli a3,a0,32
+;;   srli a3,a3,32
+;;   ld a4,8(a2)
+;;   lui a5,-1
+;;   addi a5,a5,-4
+;;   add a4,a4,a5
+;;   ugt a4,a3,a4##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a2)
-;;   add a0,a2,a0
-;;   sw a1,4096(a0)
+;;   ld a4,0(a2)
+;;   add a3,a4,a3
+;;   lui a4,1
+;;   add a3,a3,a4
+;;   sw a1,0(a3)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -60,17 +63,20 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a4,a0,32
-;;   srli a0,a4,32
-;;   ld a5,8(a1)
+;;   slli a2,a0,32
+;;   srli a3,a2,32
+;;   ld a2,8(a1)
 ;;   lui a4,-1
-;;   addi a2,a4,-4
-;;   add a5,a5,a2
-;;   bgtu a0,a5,taken(label3),not_taken(label1)
+;;   addi a4,a4,-4
+;;   add a2,a2,a4
+;;   ugt a2,a3,a2##ty=i64
+;;   bne a2,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a1,0(a1)
-;;   add a0,a1,a0
-;;   lw a0,4096(a0)
+;;   ld a4,0(a1)
+;;   add a3,a4,a3
+;;   lui a4,1
+;;   add a3,a3,a4
+;;   lw a0,0(a3)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 16a262f3b76f..f80497f60b79 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -42,21 +42,20 @@
 ;; function u0:0:
 ;; block0:
 ;;   slli a3,a0,32
-;;   srli a4,a3,32
-;;   lui a3,262140
-;;   addi a3,a3,1
-;;   slli a5,a3,2
-;;   add a3,a4,a5
-;;   trap_if heap_oob##(a3 ult a4)
+;;   srli a3,a3,32
+;;   ld a4,[const(1)]
+;;   add a4,a3,a4
+;;   ult a5,a4,a3##ty=i64
+;;   trap_if heap_oob##(a5 ne zero)
 ;;   ld a5,8(a2)
-;;   bgtu a3,a5,taken(label3),not_taken(label1)
+;;   ugt a4,a4,a5##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a5,0(a2)
-;;   add a5,a5,a4
-;;   lui a4,65535
-;;   slli a0,a4,4
-;;   add a5,a5,a0
-;;   sw a1,0(a5)
+;;   ld a4,0(a2)
+;;   add a4,a4,a3
+;;   ld a5,[const(0)]
+;;   add a4,a4,a5
+;;   sw a1,0(a4)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -66,21 +65,20 @@
 ;; function u0:1:
 ;; block0:
 ;;   slli a2,a0,32
-;;   srli a4,a2,32
-;;   lui a2,262140
-;;   addi a3,a2,1
-;;   slli a5,a3,2
-;;   add a3,a4,a5
-;;   trap_if heap_oob##(a3 ult a4)
-;;   ld a5,8(a1)
-;;   bgtu a3,a5,taken(label3),not_taken(label1)
+;;   srli a3,a2,32
+;;   ld a2,[const(1)]
+;;   add a2,a3,a2
+;;   ult a4,a2,a3##ty=i64
+;;   trap_if heap_oob##(a4 ne zero)
+;;   ld a4,8(a1)
+;;   ugt a4,a2,a4##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a5,0(a1)
-;;   add a5,a5,a4
-;;   lui a4,65535
-;;   slli a0,a4,4
-;;   add a5,a5,a0
-;;   lw a0,0(a5)
+;;   ld a4,0(a1)
+;;   add a4,a4,a3
+;;   ld a5,[const(0)]
+;;   add a4,a4,a5
+;;   lw a0,0(a4)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
index 9a41cc69378c..ee9fb69ef2e0 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
@@ -42,13 +42,14 @@
 ;; function u0:0:
 ;; block0:
 ;;   slli a3,a0,32
-;;   srli a3,a3,32
-;;   ld a4,8(a2)
-;;   bgeu a3,a4,taken(label3),not_taken(label1)
+;;   srli a4,a3,32
+;;   ld a3,8(a2)
+;;   uge a3,a4,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a4,0(a2)
-;;   add a3,a4,a3
-;;   sb a1,0(a3)
+;;   ld a5,0(a2)
+;;   add a4,a5,a4
+;;   sb a1,0(a4)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -58,13 +59,14 @@
 ;; function u0:1:
 ;; block0:
 ;;   slli a2,a0,32
-;;   srli a3,a2,32
-;;   ld a2,8(a1)
-;;   bgeu a3,a2,taken(label3),not_taken(label1)
+;;   srli a4,a2,32
+;;   ld a3,8(a1)
+;;   uge a3,a4,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a4,0(a1)
-;;   add a3,a4,a3
-;;   lbu a0,0(a3)
+;;   ld a5,0(a1)
+;;   add a4,a5,a4
+;;   lbu a0,0(a4)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index f7870c3feb68..1a8ec73ed37c 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -41,17 +41,20 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a4,a0,32
-;;   srli a0,a4,32
-;;   ld a5,8(a2)
-;;   lui a4,-1
-;;   addi a3,a4,-1
-;;   add a5,a5,a3
-;;   bgtu a0,a5,taken(label3),not_taken(label1)
+;;   slli a3,a0,32
+;;   srli a3,a3,32
+;;   ld a4,8(a2)
+;;   lui a5,-1
+;;   addi a5,a5,-1
+;;   add a4,a4,a5
+;;   ugt a4,a3,a4##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a2)
-;;   add a0,a2,a0
-;;   sb a1,4096(a0)
+;;   ld a4,0(a2)
+;;   add a3,a4,a3
+;;   lui a4,1
+;;   add a3,a3,a4
+;;   sb a1,0(a3)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -60,17 +63,20 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a4,a0,32
-;;   srli a0,a4,32
-;;   ld a5,8(a1)
+;;   slli a2,a0,32
+;;   srli a3,a2,32
+;;   ld a2,8(a1)
 ;;   lui a4,-1
-;;   addi a2,a4,-1
-;;   add a5,a5,a2
-;;   bgtu a0,a5,taken(label3),not_taken(label1)
+;;   addi a4,a4,-1
+;;   add a2,a2,a4
+;;   ugt a2,a3,a2##ty=i64
+;;   bne a2,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a1,0(a1)
-;;   add a0,a1,a0
-;;   lbu a0,4096(a0)
+;;   ld a4,0(a1)
+;;   add a3,a4,a3
+;;   lui a4,1
+;;   add a3,a3,a4
+;;   lbu a0,0(a3)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 43443094f4b7..eebf3e0a9c0f 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -41,20 +41,21 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a3,a0,32
-;;   ld a4,[const(0)]
+;;   slli a3,a0,32
+;;   srli a3,a3,32
+;;   ld a4,[const(1)]
 ;;   add a4,a3,a4
-;;   trap_if heap_oob##(a4 ult a3)
+;;   ult a5,a4,a3##ty=i64
+;;   trap_if heap_oob##(a5 ne zero)
 ;;   ld a5,8(a2)
-;;   bgtu a4,a5,taken(label3),not_taken(label1)
+;;   ugt a4,a4,a5##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
 ;;   ld a4,0(a2)
-;;   add a3,a4,a3
-;;   lui a2,65535
-;;   slli a4,a2,4
-;;   add a3,a3,a4
-;;   sb a1,0(a3)
+;;   add a4,a4,a3
+;;   ld a5,[const(0)]
+;;   add a4,a4,a5
+;;   sb a1,0(a4)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -63,20 +64,21 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a2,a0,32
-;;   ld a3,[const(0)]
-;;   add a3,a2,a3
-;;   trap_if heap_oob##(a3 ult a2)
+;;   slli a2,a0,32
+;;   srli a3,a2,32
+;;   ld a2,[const(1)]
+;;   add a2,a3,a2
+;;   ult a4,a2,a3##ty=i64
+;;   trap_if heap_oob##(a4 ne zero)
 ;;   ld a4,8(a1)
-;;   bgtu a3,a4,taken(label3),not_taken(label1)
+;;   ugt a4,a2,a4##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a3,0(a1)
-;;   add a3,a3,a2
-;;   lui a2,65535
-;;   slli a4,a2,4
-;;   add a3,a3,a4
-;;   lbu a0,0(a3)
+;;   ld a4,0(a1)
+;;   add a4,a4,a3
+;;   ld a5,[const(0)]
+;;   add a4,a4,a5
+;;   lbu a0,0(a4)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
index 0bb3e3c82174..cb4a70a8404b 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
@@ -41,34 +41,44 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a3,a0,32
-;;   ld a4,8(a2)
-;;   addi a4,a4,-4
-;;   sltu a4,a4,a3
-;;   ld a2,0(a2)
-;;   add a2,a2,a3
-;;   sub a5,zero,a4
-;;   not a3,a5
-;;   and a3,a2,a3
-;;   sw a1,0(a3)
+;;   slli a5,a0,32
+;;   srli a3,a5,32
+;;   ld a0,8(a2)
+;;   addi a0,a0,-4
+;;   ugt a4,a3,a0##ty=i64
+;;   ld a0,0(a2)
+;;   add a0,a0,a3
+;;   li a2,0
+;;   andi a3,a4,255
+;;   sltu a3,zero,a3
+;;   sub a4,zero,a3
+;;   and a2,a2,a4
+;;   not a3,a4
+;;   and a4,a0,a3
+;;   or a0,a2,a4
+;;   sw a1,0(a0)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a2,a0,32
-;;   ld a3,8(a1)
-;;   addi a3,a3,-4
-;;   sltu a3,a3,a2
-;;   ld a1,0(a1)
-;;   add a1,a1,a2
-;;   sub a5,zero,a3
-;;   not a2,a5
-;;   and a3,a1,a2
-;;   lw a0,0(a3)
+;;   slli a5,a0,32
+;;   srli a2,a5,32
+;;   ld a0,8(a1)
+;;   addi a0,a0,-4
+;;   ugt a3,a2,a0##ty=i64
+;;   ld a0,0(a1)
+;;   add a0,a0,a2
+;;   li a1,0
+;;   andi a2,a3,255
+;;   sltu a2,zero,a2
+;;   sub a4,zero,a2
+;;   and a1,a1,a4
+;;   not a2,a4
+;;   and a4,a0,a2
+;;   or a0,a1,a4
+;;   lw a0,0(a0)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
index 96357b19c956..7beb856e6ac4 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -41,42 +41,52 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a4,a0,32
-;;   srli a0,a4,32
-;;   ld a5,8(a2)
-;;   lui a4,-1
-;;   addi a3,a4,-4
-;;   add a5,a5,a3
-;;   sltu a5,a5,a0
-;;   ld a2,0(a2)
-;;   add a0,a2,a0
-;;   lui a2,1
-;;   add a0,a0,a2
-;;   sub a3,zero,a5
-;;   not a5,a3
-;;   and a2,a0,a5
-;;   sw a1,0(a2)
+;;   slli a3,a0,32
+;;   srli a5,a3,32
+;;   ld a4,8(a2)
+;;   lui a3,-1
+;;   addi a0,a3,-4
+;;   add a4,a4,a0
+;;   ugt a0,a5,a4##ty=i64
+;;   ld a4,0(a2)
+;;   add a4,a4,a5
+;;   lui a5,1
+;;   add a4,a4,a5
+;;   li a5,0
+;;   andi a0,a0,255
+;;   sltu a0,zero,a0
+;;   sub a2,zero,a0
+;;   and a5,a5,a2
+;;   not a0,a2
+;;   and a2,a4,a0
+;;   or a4,a5,a2
+;;   sw a1,0(a4)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a4,a0,32
-;;   srli a0,a4,32
-;;   ld a5,8(a1)
-;;   lui a4,-1
-;;   addi a2,a4,-4
-;;   add a5,a5,a2
-;;   sltu a5,a5,a0
-;;   ld a1,0(a1)
-;;   add a0,a1,a0
-;;   lui a1,1
-;;   add a0,a0,a1
-;;   sub a3,zero,a5
-;;   not a5,a3
-;;   and a1,a0,a5
-;;   lw a0,0(a1)
+;;   slli a3,a0,32
+;;   srli a5,a3,32
+;;   ld a4,8(a1)
+;;   lui a3,-1
+;;   addi a0,a3,-4
+;;   add a4,a4,a0
+;;   ugt a0,a5,a4##ty=i64
+;;   ld a4,0(a1)
+;;   add a4,a4,a5
+;;   lui a5,1
+;;   add a4,a4,a5
+;;   li a5,0
+;;   andi a0,a0,255
+;;   sltu a0,zero,a0
+;;   sub a2,zero,a0
+;;   and a5,a5,a2
+;;   not a0,a2
+;;   and a2,a4,a0
+;;   or a4,a5,a2
+;;   lw a0,0(a4)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index 9baf545cebb8..22d4a1643b34 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -41,48 +41,54 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a3,a0,32
-;;   lui a5,262140
-;;   addi a4,a5,1
-;;   slli a4,a4,2
-;;   add a4,a3,a4
-;;   trap_if heap_oob##(a4 ult a3)
-;;   ld a5,8(a2)
-;;   sltu a4,a5,a4
+;;   slli a3,a0,32
+;;   srli a5,a3,32
+;;   ld a4,[const(1)]
+;;   add a3,a5,a4
+;;   ult a0,a3,a5##ty=i64
+;;   trap_if heap_oob##(a0 ne zero)
+;;   ld a0,8(a2)
+;;   ugt a0,a3,a0##ty=i64
 ;;   ld a2,0(a2)
-;;   add a2,a2,a3
-;;   lui a3,65535
-;;   slli a3,a3,4
-;;   add a2,a2,a3
-;;   sub a0,zero,a4
-;;   not a3,a0
-;;   and a4,a2,a3
-;;   sw a1,0(a4)
+;;   add a5,a2,a5
+;;   ld a2,[const(0)]
+;;   add a5,a5,a2
+;;   li a2,0
+;;   andi a0,a0,255
+;;   sltu a3,zero,a0
+;;   sub a3,zero,a3
+;;   and a0,a2,a3
+;;   not a2,a3
+;;   and a3,a5,a2
+;;   or a5,a0,a3
+;;   sw a1,0(a5)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a2,a0,32
-;;   lui a5,262140
-;;   addi a3,a5,1
-;;   slli a3,a3,2
-;;   add a3,a2,a3
-;;   trap_if heap_oob##(a3 ult a2)
-;;   ld a4,8(a1)
-;;   sltu a3,a4,a3
-;;   ld a4,0(a1)
-;;   add a2,a4,a2
-;;   lui a1,65535
-;;   slli a4,a1,4
-;;   add a2,a2,a4
-;;   sub a0,zero,a3
-;;   not a3,a0
-;;   and a4,a2,a3
-;;   lw a0,0(a4)
+;;   slli a3,a0,32
+;;   srli a5,a3,32
+;;   ld a4,[const(1)]
+;;   add a3,a5,a4
+;;   ult a0,a3,a5##ty=i64
+;;   trap_if heap_oob##(a0 ne zero)
+;;   ld a0,8(a1)
+;;   ugt a0,a3,a0##ty=i64
+;;   ld a1,0(a1)
+;;   add a5,a1,a5
+;;   ld a1,[const(0)]
+;;   add a5,a5,a1
+;;   li a1,0
+;;   andi a0,a0,255
+;;   sltu a2,zero,a0
+;;   sub a3,zero,a2
+;;   and a0,a1,a3
+;;   not a1,a3
+;;   and a3,a5,a1
+;;   or a5,a0,a3
+;;   lw a0,0(a5)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat
index 78b730de2fce..549c75ada61b 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat
@@ -41,34 +41,42 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a3,a0,32
-;;   ld a4,8(a2)
-;;   sltu a0,a3,a4
-;;   xori a4,a0,1
-;;   ld a2,0(a2)
-;;   add a2,a2,a3
-;;   sub a5,zero,a4
-;;   not a3,a5
-;;   and a3,a2,a3
-;;   sb a1,0(a3)
+;;   slli a4,a0,32
+;;   srli a0,a4,32
+;;   ld a5,8(a2)
+;;   uge a3,a0,a5##ty=i64
+;;   ld a5,0(a2)
+;;   add a5,a5,a0
+;;   li a0,0
+;;   andi a2,a3,255
+;;   sltu a2,zero,a2
+;;   sub a3,zero,a2
+;;   and a0,a0,a3
+;;   not a2,a3
+;;   and a3,a5,a2
+;;   or a5,a0,a3
+;;   sb a1,0(a5)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a2,a0,32
-;;   ld a3,8(a1)
-;;   sltu a0,a2,a3
-;;   xori a3,a0,1
-;;   ld a1,0(a1)
-;;   add a1,a1,a2
-;;   sub a5,zero,a3
-;;   not a2,a5
-;;   and a3,a1,a2
-;;   lbu a0,0(a3)
+;;   slli a4,a0,32
+;;   srli a0,a4,32
+;;   ld a5,8(a1)
+;;   uge a2,a0,a5##ty=i64
+;;   ld a5,0(a1)
+;;   add a5,a5,a0
+;;   li a0,0
+;;   andi a1,a2,255
+;;   sltu a1,zero,a1
+;;   sub a3,zero,a1
+;;   and a0,a0,a3
+;;   not a1,a3
+;;   and a3,a5,a1
+;;   or a5,a0,a3
+;;   lbu a0,0(a5)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
index 889daa3f2208..f5e443f3788f 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -41,42 +41,52 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a4,a0,32
-;;   srli a0,a4,32
-;;   ld a5,8(a2)
-;;   lui a4,-1
-;;   addi a3,a4,-1
-;;   add a5,a5,a3
-;;   sltu a5,a5,a0
-;;   ld a2,0(a2)
-;;   add a0,a2,a0
-;;   lui a2,1
-;;   add a0,a0,a2
-;;   sub a3,zero,a5
-;;   not a5,a3
-;;   and a2,a0,a5
-;;   sb a1,0(a2)
+;;   slli a3,a0,32
+;;   srli a5,a3,32
+;;   ld a4,8(a2)
+;;   lui a3,-1
+;;   addi a0,a3,-1
+;;   add a4,a4,a0
+;;   ugt a0,a5,a4##ty=i64
+;;   ld a4,0(a2)
+;;   add a4,a4,a5
+;;   lui a5,1
+;;   add a4,a4,a5
+;;   li a5,0
+;;   andi a0,a0,255
+;;   sltu a0,zero,a0
+;;   sub a2,zero,a0
+;;   and a5,a5,a2
+;;   not a0,a2
+;;   and a2,a4,a0
+;;   or a4,a5,a2
+;;   sb a1,0(a4)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a4,a0,32
-;;   srli a0,a4,32
-;;   ld a5,8(a1)
-;;   lui a4,-1
-;;   addi a2,a4,-1
-;;   add a5,a5,a2
-;;   sltu a5,a5,a0
-;;   ld a1,0(a1)
-;;   add a0,a1,a0
-;;   lui a1,1
-;;   add a0,a0,a1
-;;   sub a3,zero,a5
-;;   not a5,a3
-;;   and a1,a0,a5
-;;   lbu a0,0(a1)
+;;   slli a3,a0,32
+;;   srli a5,a3,32
+;;   ld a4,8(a1)
+;;   lui a3,-1
+;;   addi a0,a3,-1
+;;   add a4,a4,a0
+;;   ugt a0,a5,a4##ty=i64
+;;   ld a4,0(a1)
+;;   add a4,a4,a5
+;;   lui a5,1
+;;   add a4,a4,a5
+;;   li a5,0
+;;   andi a0,a0,255
+;;   sltu a0,zero,a0
+;;   sub a2,zero,a0
+;;   and a5,a5,a2
+;;   not a0,a2
+;;   and a2,a4,a0
+;;   or a4,a5,a2
+;;   lbu a0,0(a4)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index ed660712bcba..4573556ee391 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -41,44 +41,54 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a4,a0,32
-;;   srli a0,a4,32
-;;   ld a5,[const(0)]
-;;   add a5,a0,a5
-;;   trap_if heap_oob##(a5 ult a0)
-;;   ld a3,8(a2)
-;;   sltu a3,a3,a5
+;;   slli a3,a0,32
+;;   srli a5,a3,32
+;;   ld a4,[const(1)]
+;;   add a3,a5,a4
+;;   ult a0,a3,a5##ty=i64
+;;   trap_if heap_oob##(a0 ne zero)
+;;   ld a0,8(a2)
+;;   ugt a0,a3,a0##ty=i64
 ;;   ld a2,0(a2)
-;;   add a0,a2,a0
-;;   lui a5,65535
-;;   slli a2,a5,4
-;;   add a0,a0,a2
-;;   sub a4,zero,a3
-;;   not a2,a4
-;;   and a2,a0,a2
-;;   sb a1,0(a2)
+;;   add a5,a2,a5
+;;   ld a2,[const(0)]
+;;   add a5,a5,a2
+;;   li a2,0
+;;   andi a0,a0,255
+;;   sltu a3,zero,a0
+;;   sub a3,zero,a3
+;;   and a0,a2,a3
+;;   not a2,a3
+;;   and a3,a5,a2
+;;   or a5,a0,a3
+;;   sb a1,0(a5)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a4,a0,32
-;;   srli a0,a4,32
-;;   ld a5,[const(0)]
-;;   add a5,a0,a5
-;;   trap_if heap_oob##(a5 ult a0)
-;;   ld a2,8(a1)
-;;   sltu a2,a2,a5
+;;   slli a3,a0,32
+;;   srli a5,a3,32
+;;   ld a4,[const(1)]
+;;   add a3,a5,a4
+;;   ult a0,a3,a5##ty=i64
+;;   trap_if heap_oob##(a0 ne zero)
+;;   ld a0,8(a1)
+;;   ugt a0,a3,a0##ty=i64
 ;;   ld a1,0(a1)
-;;   add a0,a1,a0
-;;   lui a5,65535
-;;   slli a1,a5,4
-;;   add a0,a0,a1
-;;   sub a4,zero,a2
-;;   not a1,a4
-;;   and a2,a0,a1
-;;   lbu a0,0(a2)
+;;   add a5,a1,a5
+;;   ld a1,[const(0)]
+;;   add a5,a5,a1
+;;   li a1,0
+;;   andi a0,a0,255
+;;   sltu a2,zero,a0
+;;   sub a3,zero,a2
+;;   and a0,a1,a3
+;;   not a1,a3
+;;   and a3,a5,a1
+;;   or a5,a0,a3
+;;   lbu a0,0(a5)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
index d30b15cce958..c0978bf98749 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
@@ -42,13 +42,14 @@
 ;; function u0:0:
 ;; block0:
 ;;   slli a3,a0,32
-;;   srli a3,a3,32
-;;   ld a4,8(a2)
-;;   bgtu a3,a4,taken(label3),not_taken(label1)
+;;   srli a4,a3,32
+;;   ld a3,8(a2)
+;;   ugt a3,a4,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a4,0(a2)
-;;   add a3,a4,a3
-;;   sw a1,0(a3)
+;;   ld a5,0(a2)
+;;   add a4,a5,a4
+;;   sw a1,0(a4)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -58,13 +59,14 @@
 ;; function u0:1:
 ;; block0:
 ;;   slli a2,a0,32
-;;   srli a3,a2,32
-;;   ld a2,8(a1)
-;;   bgtu a3,a2,taken(label3),not_taken(label1)
+;;   srli a4,a2,32
+;;   ld a3,8(a1)
+;;   ugt a3,a4,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a4,0(a1)
-;;   add a3,a4,a3
-;;   lw a0,0(a3)
+;;   ld a5,0(a1)
+;;   add a4,a5,a4
+;;   lw a0,0(a4)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index fa671f933dab..667a6e5ea6f8 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -41,14 +41,17 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a3,a0,32
-;;   srli a3,a3,32
-;;   ld a4,8(a2)
-;;   bgtu a3,a4,taken(label3),not_taken(label1)
+;;   slli a4,a0,32
+;;   srli a0,a4,32
+;;   ld a5,8(a2)
+;;   ugt a5,a0,a5##ty=i64
+;;   bne a5,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a4,0(a2)
-;;   add a3,a4,a3
-;;   sw a1,4096(a3)
+;;   ld a2,0(a2)
+;;   add a0,a2,a0
+;;   lui a2,1
+;;   add a0,a0,a2
+;;   sw a1,0(a0)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -57,14 +60,17 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a2,a0,32
-;;   srli a3,a2,32
-;;   ld a2,8(a1)
-;;   bgtu a3,a2,taken(label3),not_taken(label1)
+;;   slli a4,a0,32
+;;   srli a0,a4,32
+;;   ld a5,8(a1)
+;;   ugt a5,a0,a5##ty=i64
+;;   bne a5,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a4,0(a1)
-;;   add a3,a4,a3
-;;   lw a0,4096(a3)
+;;   ld a1,0(a1)
+;;   add a0,a1,a0
+;;   lui a1,1
+;;   add a0,a0,a1
+;;   lw a0,0(a0)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 2abf0fb9a8ba..6277594d6667 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -44,12 +44,12 @@
 ;;   slli a4,a0,32
 ;;   srli a0,a4,32
 ;;   ld a5,8(a2)
-;;   bgtu a0,a5,taken(label3),not_taken(label1)
+;;   ugt a5,a0,a5##ty=i64
+;;   bne a5,zero,taken(label3),not_taken(label1)
 ;; block1:
 ;;   ld a2,0(a2)
 ;;   add a0,a2,a0
-;;   lui a5,65535
-;;   slli a2,a5,4
+;;   ld a2,[const(0)]
 ;;   add a0,a0,a2
 ;;   sw a1,0(a0)
 ;;   j label2
@@ -63,12 +63,12 @@
 ;;   slli a4,a0,32
 ;;   srli a0,a4,32
 ;;   ld a5,8(a1)
-;;   bgtu a0,a5,taken(label3),not_taken(label1)
+;;   ugt a5,a0,a5##ty=i64
+;;   bne a5,zero,taken(label3),not_taken(label1)
 ;; block1:
 ;;   ld a1,0(a1)
 ;;   add a0,a1,a0
-;;   lui a5,65535
-;;   slli a1,a5,4
+;;   ld a1,[const(0)]
 ;;   add a0,a0,a1
 ;;   lw a0,0(a0)
 ;;   j label2
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
index 0137cdbbbc0c..7798803bd437 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
@@ -42,13 +42,14 @@
 ;; function u0:0:
 ;; block0:
 ;;   slli a3,a0,32
-;;   srli a3,a3,32
-;;   ld a4,8(a2)
-;;   bgeu a3,a4,taken(label3),not_taken(label1)
+;;   srli a4,a3,32
+;;   ld a3,8(a2)
+;;   uge a3,a4,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a4,0(a2)
-;;   add a3,a4,a3
-;;   sb a1,0(a3)
+;;   ld a5,0(a2)
+;;   add a4,a5,a4
+;;   sb a1,0(a4)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -58,13 +59,14 @@
 ;; function u0:1:
 ;; block0:
 ;;   slli a2,a0,32
-;;   srli a3,a2,32
-;;   ld a2,8(a1)
-;;   bgeu a3,a2,taken(label3),not_taken(label1)
+;;   srli a4,a2,32
+;;   ld a3,8(a1)
+;;   uge a3,a4,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a4,0(a1)
-;;   add a3,a4,a3
-;;   lbu a0,0(a3)
+;;   ld a5,0(a1)
+;;   add a4,a5,a4
+;;   lbu a0,0(a4)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index 3e9a20ee72d1..00f04a204cd9 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -41,14 +41,17 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a3,a0,32
-;;   srli a3,a3,32
-;;   ld a4,8(a2)
-;;   bgtu a3,a4,taken(label3),not_taken(label1)
+;;   slli a4,a0,32
+;;   srli a0,a4,32
+;;   ld a5,8(a2)
+;;   ugt a5,a0,a5##ty=i64
+;;   bne a5,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a4,0(a2)
-;;   add a3,a4,a3
-;;   sb a1,4096(a3)
+;;   ld a2,0(a2)
+;;   add a0,a2,a0
+;;   lui a2,1
+;;   add a0,a0,a2
+;;   sb a1,0(a0)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -57,14 +60,17 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a2,a0,32
-;;   srli a3,a2,32
-;;   ld a2,8(a1)
-;;   bgtu a3,a2,taken(label3),not_taken(label1)
+;;   slli a4,a0,32
+;;   srli a0,a4,32
+;;   ld a5,8(a1)
+;;   ugt a5,a0,a5##ty=i64
+;;   bne a5,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a4,0(a1)
-;;   add a3,a4,a3
-;;   lbu a0,4096(a3)
+;;   ld a1,0(a1)
+;;   add a0,a1,a0
+;;   lui a1,1
+;;   add a0,a0,a1
+;;   lbu a0,0(a0)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 3064723e08ae..03fb970a0bbe 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -44,12 +44,12 @@
 ;;   slli a4,a0,32
 ;;   srli a0,a4,32
 ;;   ld a5,8(a2)
-;;   bgtu a0,a5,taken(label3),not_taken(label1)
+;;   ugt a5,a0,a5##ty=i64
+;;   bne a5,zero,taken(label3),not_taken(label1)
 ;; block1:
 ;;   ld a2,0(a2)
 ;;   add a0,a2,a0
-;;   lui a5,65535
-;;   slli a2,a5,4
+;;   ld a2,[const(0)]
 ;;   add a0,a0,a2
 ;;   sb a1,0(a0)
 ;;   j label2
@@ -63,12 +63,12 @@
 ;;   slli a4,a0,32
 ;;   srli a0,a4,32
 ;;   ld a5,8(a1)
-;;   bgtu a0,a5,taken(label3),not_taken(label1)
+;;   ugt a5,a0,a5##ty=i64
+;;   bne a5,zero,taken(label3),not_taken(label1)
 ;; block1:
 ;;   ld a1,0(a1)
 ;;   add a0,a1,a0
-;;   lui a5,65535
-;;   slli a1,a5,4
+;;   ld a1,[const(0)]
 ;;   add a0,a0,a1
 ;;   lbu a0,0(a0)
 ;;   j label2
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
index 2f23d3365468..2a551c45a516 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
@@ -41,32 +41,42 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a5,a0,32
-;;   srli a3,a5,32
-;;   ld a0,8(a2)
-;;   sltu a0,a0,a3
-;;   ld a2,0(a2)
-;;   add a2,a2,a3
-;;   sub a4,zero,a0
-;;   not a0,a4
-;;   and a2,a2,a0
-;;   sw a1,0(a2)
+;;   slli a4,a0,32
+;;   srli a0,a4,32
+;;   ld a5,8(a2)
+;;   ugt a3,a0,a5##ty=i64
+;;   ld a5,0(a2)
+;;   add a5,a5,a0
+;;   li a0,0
+;;   andi a2,a3,255
+;;   sltu a2,zero,a2
+;;   sub a3,zero,a2
+;;   and a0,a0,a3
+;;   not a2,a3
+;;   and a3,a5,a2
+;;   or a5,a0,a3
+;;   sw a1,0(a5)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a5,a0,32
-;;   srli a2,a5,32
-;;   ld a0,8(a1)
-;;   sltu a0,a0,a2
-;;   ld a1,0(a1)
-;;   add a1,a1,a2
-;;   sub a4,zero,a0
-;;   not a0,a4
-;;   and a2,a1,a0
-;;   lw a0,0(a2)
+;;   slli a4,a0,32
+;;   srli a0,a4,32
+;;   ld a5,8(a1)
+;;   ugt a2,a0,a5##ty=i64
+;;   ld a5,0(a1)
+;;   add a5,a5,a0
+;;   li a0,0
+;;   andi a1,a2,255
+;;   sltu a1,zero,a1
+;;   sub a3,zero,a1
+;;   and a0,a0,a3
+;;   not a1,a3
+;;   and a3,a5,a1
+;;   or a5,a0,a3
+;;   lw a0,0(a5)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
index 7bac94ea9bfd..44d02911ef90 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -41,36 +41,46 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a3,a0,32
-;;   srli a4,a3,32
+;;   slli a0,a0,32
+;;   srli a4,a0,32
 ;;   ld a3,8(a2)
-;;   sltu a3,a3,a4
+;;   ugt a3,a4,a3##ty=i64
 ;;   ld a2,0(a2)
 ;;   add a2,a2,a4
 ;;   lui a4,1
 ;;   add a2,a2,a4
-;;   sub a0,zero,a3
-;;   not a3,a0
-;;   and a4,a2,a3
-;;   sw a1,0(a4)
+;;   li a4,0
+;;   andi a3,a3,255
+;;   sltu a3,zero,a3
+;;   sub a5,zero,a3
+;;   and a3,a4,a5
+;;   not a4,a5
+;;   and a5,a2,a4
+;;   or a2,a3,a5
+;;   sw a1,0(a2)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a2,a0,32
-;;   srli a3,a2,32
+;;   slli a0,a0,32
+;;   srli a3,a0,32
 ;;   ld a2,8(a1)
-;;   sltu a2,a2,a3
-;;   ld a4,0(a1)
-;;   add a3,a4,a3
-;;   lui a4,1
-;;   add a3,a3,a4
-;;   sub a0,zero,a2
-;;   not a2,a0
-;;   and a4,a3,a2
-;;   lw a0,0(a4)
+;;   ugt a2,a3,a2##ty=i64
+;;   ld a1,0(a1)
+;;   add a1,a1,a3
+;;   lui a3,1
+;;   add a1,a1,a3
+;;   li a3,0
+;;   andi a2,a2,255
+;;   sltu a4,zero,a2
+;;   sub a5,zero,a4
+;;   and a2,a3,a5
+;;   not a3,a5
+;;   and a5,a1,a3
+;;   or a1,a2,a5
+;;   lw a0,0(a1)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index cc49002d87d8..b8a7173a9229 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -41,38 +41,46 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a3,a0,32
-;;   srli a4,a3,32
+;;   slli a0,a0,32
+;;   srli a4,a0,32
 ;;   ld a3,8(a2)
-;;   sltu a3,a3,a4
-;;   ld a5,0(a2)
-;;   add a4,a5,a4
-;;   lui a2,65535
-;;   slli a5,a2,4
-;;   add a4,a4,a5
-;;   sub a2,zero,a3
-;;   not a3,a2
-;;   and a5,a4,a3
-;;   sw a1,0(a5)
+;;   ugt a3,a4,a3##ty=i64
+;;   ld a2,0(a2)
+;;   add a2,a2,a4
+;;   ld a4,[const(0)]
+;;   add a2,a2,a4
+;;   li a4,0
+;;   andi a3,a3,255
+;;   sltu a3,zero,a3
+;;   sub a5,zero,a3
+;;   and a3,a4,a5
+;;   not a4,a5
+;;   and a5,a2,a4
+;;   or a2,a3,a5
+;;   sw a1,0(a2)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a2,a0,32
-;;   srli a4,a2,32
-;;   ld a3,8(a1)
-;;   sltu a3,a3,a4
-;;   ld a5,0(a1)
-;;   add a4,a5,a4
-;;   lui a2,65535
-;;   slli a5,a2,4
-;;   add a4,a4,a5
-;;   sub a1,zero,a3
-;;   not a3,a1
-;;   and a5,a4,a3
-;;   lw a0,0(a5)
+;;   slli a0,a0,32
+;;   srli a3,a0,32
+;;   ld a2,8(a1)
+;;   ugt a2,a3,a2##ty=i64
+;;   ld a1,0(a1)
+;;   add a1,a1,a3
+;;   ld a3,[const(0)]
+;;   add a1,a1,a3
+;;   li a3,0
+;;   andi a2,a2,255
+;;   sltu a4,zero,a2
+;;   sub a5,zero,a4
+;;   and a2,a3,a5
+;;   not a3,a5
+;;   and a5,a1,a3
+;;   or a1,a2,a5
+;;   lw a0,0(a1)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
index 18970c5a1a2e..5719472c2b23 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
@@ -41,34 +41,42 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a3,a0,32
-;;   ld a4,8(a2)
-;;   sltu a0,a3,a4
-;;   xori a4,a0,1
-;;   ld a2,0(a2)
-;;   add a2,a2,a3
-;;   sub a5,zero,a4
-;;   not a3,a5
-;;   and a3,a2,a3
-;;   sb a1,0(a3)
+;;   slli a4,a0,32
+;;   srli a0,a4,32
+;;   ld a5,8(a2)
+;;   uge a3,a0,a5##ty=i64
+;;   ld a5,0(a2)
+;;   add a5,a5,a0
+;;   li a0,0
+;;   andi a2,a3,255
+;;   sltu a2,zero,a2
+;;   sub a3,zero,a2
+;;   and a0,a0,a3
+;;   not a2,a3
+;;   and a3,a5,a2
+;;   or a5,a0,a3
+;;   sb a1,0(a5)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a2,a0,32
-;;   ld a3,8(a1)
-;;   sltu a0,a2,a3
-;;   xori a3,a0,1
-;;   ld a1,0(a1)
-;;   add a1,a1,a2
-;;   sub a5,zero,a3
-;;   not a2,a5
-;;   and a3,a1,a2
-;;   lbu a0,0(a3)
+;;   slli a4,a0,32
+;;   srli a0,a4,32
+;;   ld a5,8(a1)
+;;   uge a2,a0,a5##ty=i64
+;;   ld a5,0(a1)
+;;   add a5,a5,a0
+;;   li a0,0
+;;   andi a1,a2,255
+;;   sltu a1,zero,a1
+;;   sub a3,zero,a1
+;;   and a0,a0,a3
+;;   not a1,a3
+;;   and a3,a5,a1
+;;   or a5,a0,a3
+;;   lbu a0,0(a5)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
index c93afa87bac1..f6d8b7c29431 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -41,36 +41,46 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a3,a0,32
-;;   srli a4,a3,32
+;;   slli a0,a0,32
+;;   srli a4,a0,32
 ;;   ld a3,8(a2)
-;;   sltu a3,a3,a4
+;;   ugt a3,a4,a3##ty=i64
 ;;   ld a2,0(a2)
 ;;   add a2,a2,a4
 ;;   lui a4,1
 ;;   add a2,a2,a4
-;;   sub a0,zero,a3
-;;   not a3,a0
-;;   and a4,a2,a3
-;;   sb a1,0(a4)
+;;   li a4,0
+;;   andi a3,a3,255
+;;   sltu a3,zero,a3
+;;   sub a5,zero,a3
+;;   and a3,a4,a5
+;;   not a4,a5
+;;   and a5,a2,a4
+;;   or a2,a3,a5
+;;   sb a1,0(a2)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a2,a0,32
-;;   srli a3,a2,32
+;;   slli a0,a0,32
+;;   srli a3,a0,32
 ;;   ld a2,8(a1)
-;;   sltu a2,a2,a3
-;;   ld a4,0(a1)
-;;   add a3,a4,a3
-;;   lui a4,1
-;;   add a3,a3,a4
-;;   sub a0,zero,a2
-;;   not a2,a0
-;;   and a4,a3,a2
-;;   lbu a0,0(a4)
+;;   ugt a2,a3,a2##ty=i64
+;;   ld a1,0(a1)
+;;   add a1,a1,a3
+;;   lui a3,1
+;;   add a1,a1,a3
+;;   li a3,0
+;;   andi a2,a2,255
+;;   sltu a4,zero,a2
+;;   sub a5,zero,a4
+;;   and a2,a3,a5
+;;   not a3,a5
+;;   and a5,a1,a3
+;;   or a1,a2,a5
+;;   lbu a0,0(a1)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index ce5e2af1fa74..eb087e87bd28 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -41,38 +41,46 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a3,a0,32
-;;   srli a4,a3,32
+;;   slli a0,a0,32
+;;   srli a4,a0,32
 ;;   ld a3,8(a2)
-;;   sltu a3,a3,a4
-;;   ld a5,0(a2)
-;;   add a4,a5,a4
-;;   lui a2,65535
-;;   slli a5,a2,4
-;;   add a4,a4,a5
-;;   sub a2,zero,a3
-;;   not a3,a2
-;;   and a5,a4,a3
-;;   sb a1,0(a5)
+;;   ugt a3,a4,a3##ty=i64
+;;   ld a2,0(a2)
+;;   add a2,a2,a4
+;;   ld a4,[const(0)]
+;;   add a2,a2,a4
+;;   li a4,0
+;;   andi a3,a3,255
+;;   sltu a3,zero,a3
+;;   sub a5,zero,a3
+;;   and a3,a4,a5
+;;   not a4,a5
+;;   and a5,a2,a4
+;;   or a2,a3,a5
+;;   sb a1,0(a2)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a2,a0,32
-;;   srli a4,a2,32
-;;   ld a3,8(a1)
-;;   sltu a3,a3,a4
-;;   ld a5,0(a1)
-;;   add a4,a5,a4
-;;   lui a2,65535
-;;   slli a5,a2,4
-;;   add a4,a4,a5
-;;   sub a1,zero,a3
-;;   not a3,a1
-;;   and a5,a4,a3
-;;   lbu a0,0(a5)
+;;   slli a0,a0,32
+;;   srli a3,a0,32
+;;   ld a2,8(a1)
+;;   ugt a2,a3,a2##ty=i64
+;;   ld a1,0(a1)
+;;   add a1,a1,a3
+;;   ld a3,[const(0)]
+;;   add a1,a1,a3
+;;   li a3,0
+;;   andi a2,a2,255
+;;   sltu a4,zero,a2
+;;   sub a5,zero,a4
+;;   and a2,a3,a5
+;;   not a3,a5
+;;   and a5,a1,a3
+;;   or a1,a2,a5
+;;   lbu a0,0(a1)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
index f21969e0c25e..c7ad7f0c8218 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
@@ -43,11 +43,12 @@
 ;; block0:
 ;;   ld a3,8(a2)
 ;;   addi a3,a3,-4
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   ugt a3,a0,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a2)
-;;   add a2,a2,a0
-;;   sw a1,0(a2)
+;;   ld a3,0(a2)
+;;   add a3,a3,a0
+;;   sw a1,0(a3)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -58,11 +59,12 @@
 ;; block0:
 ;;   ld a2,8(a1)
 ;;   addi a2,a2,-4
-;;   bgtu a0,a2,taken(label3),not_taken(label1)
+;;   ugt a2,a0,a2##ty=i64
+;;   bne a2,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a1)
-;;   add a2,a2,a0
-;;   lw a0,0(a2)
+;;   ld a3,0(a1)
+;;   add a3,a3,a0
+;;   lw a0,0(a3)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index 025f33dde63e..1d8d35da02b1 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -42,14 +42,17 @@
 ;; function u0:0:
 ;; block0:
 ;;   ld a3,8(a2)
-;;   lui a4,-1
-;;   addi a4,a4,-4
+;;   lui a5,-1
+;;   addi a4,a5,-4
 ;;   add a3,a3,a4
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   ugt a3,a0,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a4,0(a2)
-;;   add a4,a4,a0
-;;   sw a1,4096(a4)
+;;   ld a2,0(a2)
+;;   add a2,a2,a0
+;;   lui a3,1
+;;   add a2,a2,a3
+;;   sw a1,0(a2)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -58,15 +61,18 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   ld a3,8(a1)
-;;   lui a2,-1
-;;   addi a4,a2,-4
-;;   add a3,a3,a4
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   ld a2,8(a1)
+;;   lui a5,-1
+;;   addi a3,a5,-4
+;;   add a2,a2,a3
+;;   ugt a2,a0,a2##ty=i64
+;;   bne a2,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a4,0(a1)
-;;   add a4,a4,a0
-;;   lw a0,4096(a4)
+;;   ld a1,0(a1)
+;;   add a1,a1,a0
+;;   lui a2,1
+;;   add a1,a1,a2
+;;   lw a0,0(a1)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
index fa4768c25dfa..e4263aebdc52 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -41,20 +41,19 @@
 
 ;; function u0:0:
 ;; block0:
-;;   lui a5,262140
-;;   addi a3,a5,1
-;;   slli a3,a3,2
-;;   add a3,a0,a3
-;;   trap_if heap_oob##(a3 ult a0)
-;;   ld a4,8(a2)
-;;   bgtu a3,a4,taken(label3),not_taken(label1)
+;;   ld a3,[const(1)]
+;;   add a5,a0,a3
+;;   ult a3,a5,a0##ty=i64
+;;   trap_if heap_oob##(a3 ne zero)
+;;   ld a3,8(a2)
+;;   ugt a3,a5,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a3,0(a2)
-;;   add a3,a3,a0
-;;   lui a2,65535
-;;   slli a4,a2,4
-;;   add a3,a3,a4
-;;   sw a1,0(a3)
+;;   ld a2,0(a2)
+;;   add a2,a2,a0
+;;   ld a3,[const(0)]
+;;   add a2,a2,a3
+;;   sw a1,0(a2)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -63,20 +62,19 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   lui a5,262140
-;;   addi a2,a5,1
-;;   slli a3,a2,2
-;;   add a2,a0,a3
-;;   trap_if heap_oob##(a2 ult a0)
-;;   ld a3,8(a1)
-;;   bgtu a2,a3,taken(label3),not_taken(label1)
+;;   ld a2,[const(1)]
+;;   add a5,a0,a2
+;;   ult a2,a5,a0##ty=i64
+;;   trap_if heap_oob##(a2 ne zero)
+;;   ld a2,8(a1)
+;;   ugt a2,a5,a2##ty=i64
+;;   bne a2,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a3,0(a1)
-;;   add a3,a3,a0
-;;   lui a2,65535
-;;   slli a4,a2,4
-;;   add a3,a3,a4
-;;   lw a0,0(a3)
+;;   ld a2,0(a1)
+;;   add a2,a2,a0
+;;   ld a3,[const(0)]
+;;   add a2,a2,a3
+;;   lw a0,0(a2)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
index 3a323cef4580..e46cd968548f 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
@@ -42,7 +42,8 @@
 ;; function u0:0:
 ;; block0:
 ;;   ld a3,8(a2)
-;;   bgeu a0,a3,taken(label3),not_taken(label1)
+;;   uge a3,a0,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
 ;;   ld a2,0(a2)
 ;;   add a2,a2,a0
@@ -56,11 +57,12 @@
 ;; function u0:1:
 ;; block0:
 ;;   ld a2,8(a1)
-;;   bgeu a0,a2,taken(label3),not_taken(label1)
+;;   uge a2,a0,a2##ty=i64
+;;   bne a2,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a1,0(a1)
-;;   add a1,a1,a0
-;;   lbu a0,0(a1)
+;;   ld a2,0(a1)
+;;   add a2,a2,a0
+;;   lbu a0,0(a2)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index ee26ad7f0626..a506870ffeba 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -42,14 +42,17 @@
 ;; function u0:0:
 ;; block0:
 ;;   ld a3,8(a2)
-;;   lui a4,-1
-;;   addi a4,a4,-1
+;;   lui a5,-1
+;;   addi a4,a5,-1
 ;;   add a3,a3,a4
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   ugt a3,a0,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a4,0(a2)
-;;   add a4,a4,a0
-;;   sb a1,4096(a4)
+;;   ld a2,0(a2)
+;;   add a2,a2,a0
+;;   lui a3,1
+;;   add a2,a2,a3
+;;   sb a1,0(a2)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -58,15 +61,18 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   ld a3,8(a1)
-;;   lui a2,-1
-;;   addi a4,a2,-1
-;;   add a3,a3,a4
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   ld a2,8(a1)
+;;   lui a5,-1
+;;   addi a3,a5,-1
+;;   add a2,a2,a3
+;;   ugt a2,a0,a2##ty=i64
+;;   bne a2,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a4,0(a1)
-;;   add a4,a4,a0
-;;   lbu a0,4096(a4)
+;;   ld a1,0(a1)
+;;   add a1,a1,a0
+;;   lui a2,1
+;;   add a1,a1,a2
+;;   lbu a0,0(a1)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 445a2b6d9885..c08c2c65c62e 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -41,16 +41,17 @@
 
 ;; function u0:0:
 ;; block0:
-;;   ld a5,[const(0)]
-;;   add a5,a0,a5
-;;   trap_if heap_oob##(a5 ult a0)
+;;   ld a3,[const(1)]
+;;   add a5,a0,a3
+;;   ult a3,a5,a0##ty=i64
+;;   trap_if heap_oob##(a3 ne zero)
 ;;   ld a3,8(a2)
-;;   bgtu a5,a3,taken(label3),not_taken(label1)
+;;   ugt a3,a5,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
 ;;   ld a2,0(a2)
 ;;   add a2,a2,a0
-;;   lui a0,65535
-;;   slli a3,a0,4
+;;   ld a3,[const(0)]
 ;;   add a2,a2,a3
 ;;   sb a1,0(a2)
 ;;   j label2
@@ -61,18 +62,19 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   ld a5,[const(0)]
-;;   add a5,a0,a5
-;;   trap_if heap_oob##(a5 ult a0)
+;;   ld a2,[const(1)]
+;;   add a5,a0,a2
+;;   ult a2,a5,a0##ty=i64
+;;   trap_if heap_oob##(a2 ne zero)
 ;;   ld a2,8(a1)
-;;   bgtu a5,a2,taken(label3),not_taken(label1)
+;;   ugt a2,a5,a2##ty=i64
+;;   bne a2,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a1,0(a1)
-;;   add a1,a1,a0
-;;   lui a0,65535
-;;   slli a2,a0,4
-;;   add a1,a1,a2
-;;   lbu a0,0(a1)
+;;   ld a2,0(a1)
+;;   add a2,a2,a0
+;;   ld a3,[const(0)]
+;;   add a2,a2,a3
+;;   lbu a0,0(a2)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
index 76bca6405501..d139bc455b33 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
@@ -41,30 +41,40 @@
 
 ;; function u0:0:
 ;; block0:
-;;   ld a5,8(a2)
-;;   addi a5,a5,-4
-;;   sltu a5,a5,a0
-;;   ld a2,0(a2)
-;;   add a0,a2,a0
-;;   sub a3,zero,a5
-;;   not a5,a3
-;;   and a2,a0,a5
-;;   sw a1,0(a2)
+;;   ld a4,8(a2)
+;;   addi a4,a4,-4
+;;   ugt a5,a0,a4##ty=i64
+;;   ld a4,0(a2)
+;;   add a4,a4,a0
+;;   li a0,0
+;;   andi a5,a5,255
+;;   sltu a2,zero,a5
+;;   sub a2,zero,a2
+;;   and a5,a0,a2
+;;   not a0,a2
+;;   and a2,a4,a0
+;;   or a4,a5,a2
+;;   sw a1,0(a4)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   ld a5,8(a1)
-;;   addi a5,a5,-4
-;;   sltu a5,a5,a0
-;;   ld a1,0(a1)
-;;   add a0,a1,a0
-;;   sub a3,zero,a5
-;;   not a5,a3
-;;   and a1,a0,a5
-;;   lw a0,0(a1)
+;;   ld a4,8(a1)
+;;   addi a4,a4,-4
+;;   ugt a5,a0,a4##ty=i64
+;;   ld a4,0(a1)
+;;   add a4,a4,a0
+;;   li a0,0
+;;   andi a5,a5,255
+;;   sltu a1,zero,a5
+;;   sub a2,zero,a1
+;;   and a5,a0,a2
+;;   not a0,a2
+;;   and a2,a4,a0
+;;   or a4,a5,a2
+;;   lw a0,0(a4)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
index c2c8fad1bbe5..ef78d4658201 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -45,34 +45,44 @@
 ;;   lui a4,-1
 ;;   addi a4,a4,-4
 ;;   add a3,a3,a4
-;;   sltu a3,a3,a0
-;;   ld a4,0(a2)
-;;   add a4,a4,a0
-;;   lui a5,1
-;;   add a4,a4,a5
-;;   sub a2,zero,a3
-;;   not a3,a2
-;;   and a5,a4,a3
-;;   sw a1,0(a5)
+;;   ugt a3,a0,a3##ty=i64
+;;   ld a2,0(a2)
+;;   add a2,a2,a0
+;;   lui a4,1
+;;   add a2,a2,a4
+;;   li a4,0
+;;   andi a3,a3,255
+;;   sltu a5,zero,a3
+;;   sub a0,zero,a5
+;;   and a3,a4,a0
+;;   not a4,a0
+;;   and a0,a2,a4
+;;   or a2,a3,a0
+;;   sw a1,0(a2)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   ld a3,8(a1)
-;;   lui a2,-1
-;;   addi a4,a2,-4
-;;   add a3,a3,a4
-;;   sltu a3,a3,a0
-;;   ld a4,0(a1)
-;;   add a4,a4,a0
-;;   lui a5,1
-;;   add a4,a4,a5
-;;   sub a1,zero,a3
-;;   not a3,a1
-;;   and a5,a4,a3
-;;   lw a0,0(a5)
+;;   ld a2,8(a1)
+;;   lui a3,-1
+;;   addi a3,a3,-4
+;;   add a2,a2,a3
+;;   ugt a3,a0,a2##ty=i64
+;;   ld a2,0(a1)
+;;   add a2,a2,a0
+;;   lui a4,1
+;;   add a2,a2,a4
+;;   li a4,0
+;;   andi a3,a3,255
+;;   sltu a5,zero,a3
+;;   sub a0,zero,a5
+;;   and a3,a4,a0
+;;   not a4,a0
+;;   and a0,a2,a4
+;;   or a2,a3,a0
+;;   lw a0,0(a2)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index cd9ffc9cca1b..d27e29e4b2f9 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -41,44 +41,50 @@
 
 ;; function u0:0:
 ;; block0:
-;;   lui a3,262140
-;;   addi a5,a3,1
-;;   slli a3,a5,2
-;;   add a5,a0,a3
-;;   trap_if heap_oob##(a5 ult a0)
-;;   ld a3,8(a2)
-;;   sltu a3,a3,a5
-;;   ld a2,0(a2)
-;;   add a0,a2,a0
-;;   lui a5,65535
-;;   slli a2,a5,4
-;;   add a0,a0,a2
-;;   sub a4,zero,a3
-;;   not a2,a4
-;;   and a2,a0,a2
-;;   sw a1,0(a2)
+;;   ld a3,[const(1)]
+;;   add a3,a0,a3
+;;   ult a4,a3,a0##ty=i64
+;;   trap_if heap_oob##(a4 ne zero)
+;;   ld a4,8(a2)
+;;   ugt a4,a3,a4##ty=i64
+;;   ld a3,0(a2)
+;;   add a3,a3,a0
+;;   ld a5,[const(0)]
+;;   add a3,a3,a5
+;;   li a5,0
+;;   andi a4,a4,255
+;;   sltu a0,zero,a4
+;;   sub a2,zero,a0
+;;   and a4,a5,a2
+;;   not a5,a2
+;;   and a2,a3,a5
+;;   or a3,a4,a2
+;;   sw a1,0(a3)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   lui a3,262140
-;;   addi a5,a3,1
-;;   slli a2,a5,2
-;;   add a5,a0,a2
-;;   trap_if heap_oob##(a5 ult a0)
-;;   ld a2,8(a1)
-;;   sltu a2,a2,a5
-;;   ld a1,0(a1)
-;;   add a0,a1,a0
-;;   lui a5,65535
-;;   slli a1,a5,4
-;;   add a0,a0,a1
-;;   sub a4,zero,a2
-;;   not a1,a4
-;;   and a2,a0,a1
-;;   lw a0,0(a2)
+;;   ld a2,[const(1)]
+;;   add a2,a0,a2
+;;   ult a3,a2,a0##ty=i64
+;;   trap_if heap_oob##(a3 ne zero)
+;;   ld a3,8(a1)
+;;   ugt a4,a2,a3##ty=i64
+;;   ld a3,0(a1)
+;;   add a3,a3,a0
+;;   ld a5,[const(0)]
+;;   add a3,a3,a5
+;;   li a5,0
+;;   andi a4,a4,255
+;;   sltu a0,zero,a4
+;;   sub a1,zero,a0
+;;   and a4,a5,a1
+;;   not a5,a1
+;;   and a1,a3,a5
+;;   or a3,a4,a1
+;;   lw a0,0(a3)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
index ab64fade666c..5a3bc080b7db 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
@@ -41,30 +41,38 @@
 
 ;; function u0:0:
 ;; block0:
-;;   ld a5,8(a2)
-;;   sltu a4,a0,a5
-;;   xori a3,a4,1
-;;   ld a5,0(a2)
-;;   add a5,a5,a0
-;;   sub a3,zero,a3
-;;   not a0,a3
-;;   and a2,a5,a0
-;;   sb a1,0(a2)
+;;   ld a3,8(a2)
+;;   uge a4,a0,a3##ty=i64
+;;   ld a3,0(a2)
+;;   add a3,a3,a0
+;;   li a5,0
+;;   andi a4,a4,255
+;;   sltu a0,zero,a4
+;;   sub a2,zero,a0
+;;   and a4,a5,a2
+;;   not a5,a2
+;;   and a2,a3,a5
+;;   or a3,a4,a2
+;;   sb a1,0(a3)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   ld a5,8(a1)
-;;   sltu a4,a0,a5
-;;   xori a2,a4,1
-;;   ld a5,0(a1)
-;;   add a5,a5,a0
-;;   sub a3,zero,a2
-;;   not a0,a3
-;;   and a1,a5,a0
-;;   lbu a0,0(a1)
+;;   ld a3,8(a1)
+;;   uge a4,a0,a3##ty=i64
+;;   ld a3,0(a1)
+;;   add a3,a3,a0
+;;   li a5,0
+;;   andi a4,a4,255
+;;   sltu a0,zero,a4
+;;   sub a1,zero,a0
+;;   and a4,a5,a1
+;;   not a5,a1
+;;   and a1,a3,a5
+;;   or a3,a4,a1
+;;   lbu a0,0(a3)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
index 66c48cb1b806..422e1bc1c3de 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -45,34 +45,44 @@
 ;;   lui a4,-1
 ;;   addi a4,a4,-1
 ;;   add a3,a3,a4
-;;   sltu a3,a3,a0
-;;   ld a4,0(a2)
-;;   add a4,a4,a0
-;;   lui a5,1
-;;   add a4,a4,a5
-;;   sub a2,zero,a3
-;;   not a3,a2
-;;   and a5,a4,a3
-;;   sb a1,0(a5)
+;;   ugt a3,a0,a3##ty=i64
+;;   ld a2,0(a2)
+;;   add a2,a2,a0
+;;   lui a4,1
+;;   add a2,a2,a4
+;;   li a4,0
+;;   andi a3,a3,255
+;;   sltu a5,zero,a3
+;;   sub a0,zero,a5
+;;   and a3,a4,a0
+;;   not a4,a0
+;;   and a0,a2,a4
+;;   or a2,a3,a0
+;;   sb a1,0(a2)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   ld a3,8(a1)
-;;   lui a2,-1
-;;   addi a4,a2,-1
-;;   add a3,a3,a4
-;;   sltu a3,a3,a0
-;;   ld a4,0(a1)
-;;   add a4,a4,a0
-;;   lui a5,1
-;;   add a4,a4,a5
-;;   sub a1,zero,a3
-;;   not a3,a1
-;;   and a5,a4,a3
-;;   lbu a0,0(a5)
+;;   ld a2,8(a1)
+;;   lui a3,-1
+;;   addi a3,a3,-1
+;;   add a2,a2,a3
+;;   ugt a3,a0,a2##ty=i64
+;;   ld a2,0(a1)
+;;   add a2,a2,a0
+;;   lui a4,1
+;;   add a2,a2,a4
+;;   li a4,0
+;;   andi a3,a3,255
+;;   sltu a5,zero,a3
+;;   sub a0,zero,a5
+;;   and a3,a4,a0
+;;   not a4,a0
+;;   and a0,a2,a4
+;;   or a2,a3,a0
+;;   lbu a0,0(a2)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index f8524212d90e..f51b54592618 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -41,40 +41,50 @@
 
 ;; function u0:0:
 ;; block0:
-;;   ld a3,[const(0)]
+;;   ld a3,[const(1)]
 ;;   add a3,a0,a3
-;;   trap_if heap_oob##(a3 ult a0)
+;;   ult a4,a3,a0##ty=i64
+;;   trap_if heap_oob##(a4 ne zero)
 ;;   ld a4,8(a2)
-;;   sltu a4,a4,a3
-;;   ld a5,0(a2)
-;;   add a5,a5,a0
-;;   lui a3,65535
-;;   slli a0,a3,4
-;;   add a5,a5,a0
-;;   sub a2,zero,a4
-;;   not a4,a2
-;;   and a0,a5,a4
-;;   sb a1,0(a0)
+;;   ugt a4,a3,a4##ty=i64
+;;   ld a3,0(a2)
+;;   add a3,a3,a0
+;;   ld a5,[const(0)]
+;;   add a3,a3,a5
+;;   li a5,0
+;;   andi a4,a4,255
+;;   sltu a0,zero,a4
+;;   sub a2,zero,a0
+;;   and a4,a5,a2
+;;   not a5,a2
+;;   and a2,a3,a5
+;;   or a3,a4,a2
+;;   sb a1,0(a3)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   ld a3,[const(0)]
-;;   add a3,a0,a3
-;;   trap_if heap_oob##(a3 ult a0)
-;;   ld a4,8(a1)
-;;   sltu a4,a4,a3
-;;   ld a5,0(a1)
-;;   add a5,a5,a0
-;;   lui a3,65535
-;;   slli a0,a3,4
-;;   add a5,a5,a0
-;;   sub a2,zero,a4
-;;   not a4,a2
-;;   and a0,a5,a4
-;;   lbu a0,0(a0)
+;;   ld a2,[const(1)]
+;;   add a2,a0,a2
+;;   ult a3,a2,a0##ty=i64
+;;   trap_if heap_oob##(a3 ne zero)
+;;   ld a3,8(a1)
+;;   ugt a4,a2,a3##ty=i64
+;;   ld a3,0(a1)
+;;   add a3,a3,a0
+;;   ld a5,[const(0)]
+;;   add a3,a3,a5
+;;   li a5,0
+;;   andi a4,a4,255
+;;   sltu a0,zero,a4
+;;   sub a1,zero,a0
+;;   and a4,a5,a1
+;;   not a5,a1
+;;   and a1,a3,a5
+;;   or a3,a4,a1
+;;   lbu a0,0(a3)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
index 216eea7f715d..75f0ba62c4e5 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
@@ -42,7 +42,8 @@
 ;; function u0:0:
 ;; block0:
 ;;   ld a3,8(a2)
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   ugt a3,a0,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
 ;;   ld a2,0(a2)
 ;;   add a2,a2,a0
@@ -56,11 +57,12 @@
 ;; function u0:1:
 ;; block0:
 ;;   ld a2,8(a1)
-;;   bgtu a0,a2,taken(label3),not_taken(label1)
+;;   ugt a2,a0,a2##ty=i64
+;;   bne a2,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a1,0(a1)
-;;   add a1,a1,a0
-;;   lw a0,0(a1)
+;;   ld a2,0(a1)
+;;   add a2,a2,a0
+;;   lw a0,0(a2)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index f7784defa517..dc8294ba3a4d 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -42,11 +42,14 @@
 ;; function u0:0:
 ;; block0:
 ;;   ld a3,8(a2)
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   ugt a3,a0,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a2)
-;;   add a2,a2,a0
-;;   sw a1,4096(a2)
+;;   ld a4,0(a2)
+;;   add a4,a4,a0
+;;   lui a5,1
+;;   add a4,a4,a5
+;;   sw a1,0(a4)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -55,12 +58,15 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   ld a2,8(a1)
-;;   bgtu a0,a2,taken(label3),not_taken(label1)
+;;   ld a3,8(a1)
+;;   ugt a3,a0,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a1,0(a1)
-;;   add a1,a1,a0
-;;   lw a0,4096(a1)
+;;   ld a4,0(a1)
+;;   add a4,a4,a0
+;;   lui a5,1
+;;   add a4,a4,a5
+;;   lw a0,0(a4)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 3a8325aa3646..dbea624b7911 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -42,12 +42,12 @@
 ;; function u0:0:
 ;; block0:
 ;;   ld a3,8(a2)
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   ugt a3,a0,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
 ;;   ld a4,0(a2)
 ;;   add a4,a4,a0
-;;   lui a3,65535
-;;   slli a5,a3,4
+;;   ld a5,[const(0)]
 ;;   add a4,a4,a5
 ;;   sw a1,0(a4)
 ;;   j label2
@@ -59,12 +59,12 @@
 ;; function u0:1:
 ;; block0:
 ;;   ld a3,8(a1)
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   ugt a3,a0,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
 ;;   ld a4,0(a1)
 ;;   add a4,a4,a0
-;;   lui a3,65535
-;;   slli a5,a3,4
+;;   ld a5,[const(0)]
 ;;   add a4,a4,a5
 ;;   lw a0,0(a4)
 ;;   j label2
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
index 598727d97962..f860593c77d7 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
@@ -42,7 +42,8 @@
 ;; function u0:0:
 ;; block0:
 ;;   ld a3,8(a2)
-;;   bgeu a0,a3,taken(label3),not_taken(label1)
+;;   uge a3,a0,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
 ;;   ld a2,0(a2)
 ;;   add a2,a2,a0
@@ -56,11 +57,12 @@
 ;; function u0:1:
 ;; block0:
 ;;   ld a2,8(a1)
-;;   bgeu a0,a2,taken(label3),not_taken(label1)
+;;   uge a2,a0,a2##ty=i64
+;;   bne a2,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a1,0(a1)
-;;   add a1,a1,a0
-;;   lbu a0,0(a1)
+;;   ld a2,0(a1)
+;;   add a2,a2,a0
+;;   lbu a0,0(a2)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index 10beda2e0206..ae0916d97f76 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -42,11 +42,14 @@
 ;; function u0:0:
 ;; block0:
 ;;   ld a3,8(a2)
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   ugt a3,a0,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a2)
-;;   add a2,a2,a0
-;;   sb a1,4096(a2)
+;;   ld a4,0(a2)
+;;   add a4,a4,a0
+;;   lui a5,1
+;;   add a4,a4,a5
+;;   sb a1,0(a4)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -55,12 +58,15 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   ld a2,8(a1)
-;;   bgtu a0,a2,taken(label3),not_taken(label1)
+;;   ld a3,8(a1)
+;;   ugt a3,a0,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a1,0(a1)
-;;   add a1,a1,a0
-;;   lbu a0,4096(a1)
+;;   ld a4,0(a1)
+;;   add a4,a4,a0
+;;   lui a5,1
+;;   add a4,a4,a5
+;;   lbu a0,0(a4)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 6ac50e3591b9..8154bb644e6a 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -42,12 +42,12 @@
 ;; function u0:0:
 ;; block0:
 ;;   ld a3,8(a2)
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   ugt a3,a0,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
 ;;   ld a4,0(a2)
 ;;   add a4,a4,a0
-;;   lui a3,65535
-;;   slli a5,a3,4
+;;   ld a5,[const(0)]
 ;;   add a4,a4,a5
 ;;   sb a1,0(a4)
 ;;   j label2
@@ -59,12 +59,12 @@
 ;; function u0:1:
 ;; block0:
 ;;   ld a3,8(a1)
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   ugt a3,a0,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
 ;;   ld a4,0(a1)
 ;;   add a4,a4,a0
-;;   lui a3,65535
-;;   slli a5,a3,4
+;;   ld a5,[const(0)]
 ;;   add a4,a4,a5
 ;;   lbu a0,0(a4)
 ;;   j label2
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
index 8fa602c76f95..a6f0dfe87df4 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
@@ -41,28 +41,38 @@
 
 ;; function u0:0:
 ;; block0:
-;;   ld a4,8(a2)
-;;   sltu a4,a4,a0
-;;   ld a5,0(a2)
-;;   add a5,a5,a0
-;;   sub a2,zero,a4
-;;   not a4,a2
-;;   and a0,a5,a4
-;;   sw a1,0(a0)
+;;   ld a3,8(a2)
+;;   ugt a4,a0,a3##ty=i64
+;;   ld a3,0(a2)
+;;   add a3,a3,a0
+;;   li a5,0
+;;   andi a4,a4,255
+;;   sltu a0,zero,a4
+;;   sub a2,zero,a0
+;;   and a4,a5,a2
+;;   not a5,a2
+;;   and a2,a3,a5
+;;   or a3,a4,a2
+;;   sw a1,0(a3)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   ld a4,8(a1)
-;;   sltu a4,a4,a0
-;;   ld a5,0(a1)
-;;   add a5,a5,a0
-;;   sub a2,zero,a4
-;;   not a4,a2
-;;   and a0,a5,a4
-;;   lw a0,0(a0)
+;;   ld a3,8(a1)
+;;   ugt a4,a0,a3##ty=i64
+;;   ld a3,0(a1)
+;;   add a3,a3,a0
+;;   li a5,0
+;;   andi a4,a4,255
+;;   sltu a0,zero,a4
+;;   sub a1,zero,a0
+;;   and a4,a5,a1
+;;   not a5,a1
+;;   and a1,a3,a5
+;;   or a3,a4,a1
+;;   lw a0,0(a3)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
index 0f24853ad68b..3e23e55bfce9 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -41,32 +41,42 @@
 
 ;; function u0:0:
 ;; block0:
-;;   ld a3,8(a2)
-;;   sltu a3,a3,a0
-;;   ld a2,0(a2)
-;;   add a0,a2,a0
-;;   lui a2,1
-;;   add a0,a0,a2
-;;   sub a4,zero,a3
-;;   not a2,a4
-;;   and a2,a0,a2
-;;   sw a1,0(a2)
+;;   ld a5,8(a2)
+;;   ugt a3,a0,a5##ty=i64
+;;   ld a5,0(a2)
+;;   add a5,a5,a0
+;;   lui a0,1
+;;   add a5,a5,a0
+;;   li a2,0
+;;   andi a0,a3,255
+;;   sltu a3,zero,a0
+;;   sub a3,zero,a3
+;;   and a0,a2,a3
+;;   not a2,a3
+;;   and a3,a5,a2
+;;   or a5,a0,a3
+;;   sw a1,0(a5)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   ld a2,8(a1)
-;;   sltu a2,a2,a0
-;;   ld a1,0(a1)
-;;   add a0,a1,a0
-;;   lui a1,1
-;;   add a0,a0,a1
-;;   sub a4,zero,a2
-;;   not a1,a4
-;;   and a2,a0,a1
-;;   lw a0,0(a2)
+;;   ld a5,8(a1)
+;;   ugt a2,a0,a5##ty=i64
+;;   ld a5,0(a1)
+;;   add a5,a5,a0
+;;   lui a0,1
+;;   add a5,a5,a0
+;;   li a1,0
+;;   andi a0,a2,255
+;;   sltu a2,zero,a0
+;;   sub a3,zero,a2
+;;   and a0,a1,a3
+;;   not a1,a3
+;;   and a3,a5,a1
+;;   or a5,a0,a3
+;;   lw a0,0(a5)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index 78a82b827e6d..67f34728d8a5 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -41,34 +41,42 @@
 
 ;; function u0:0:
 ;; block0:
-;;   ld a3,8(a2)
-;;   sltu a4,a3,a0
-;;   ld a2,0(a2)
-;;   add a3,a2,a0
-;;   lui a0,65535
-;;   slli a2,a0,4
-;;   add a3,a3,a2
-;;   sub a5,zero,a4
-;;   not a2,a5
-;;   and a3,a3,a2
-;;   sw a1,0(a3)
+;;   ld a5,8(a2)
+;;   ugt a3,a0,a5##ty=i64
+;;   ld a5,0(a2)
+;;   add a5,a5,a0
+;;   ld a0,[const(0)]
+;;   add a5,a5,a0
+;;   li a2,0
+;;   andi a0,a3,255
+;;   sltu a3,zero,a0
+;;   sub a3,zero,a3
+;;   and a0,a2,a3
+;;   not a2,a3
+;;   and a3,a5,a2
+;;   or a5,a0,a3
+;;   sw a1,0(a5)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   ld a2,8(a1)
-;;   sltu a3,a2,a0
-;;   ld a1,0(a1)
-;;   add a2,a1,a0
-;;   lui a0,65535
-;;   slli a4,a0,4
-;;   add a2,a2,a4
-;;   sub a5,zero,a3
-;;   not a1,a5
-;;   and a3,a2,a1
-;;   lw a0,0(a3)
+;;   ld a5,8(a1)
+;;   ugt a2,a0,a5##ty=i64
+;;   ld a5,0(a1)
+;;   add a5,a5,a0
+;;   ld a0,[const(0)]
+;;   add a5,a5,a0
+;;   li a1,0
+;;   andi a0,a2,255
+;;   sltu a2,zero,a0
+;;   sub a3,zero,a2
+;;   and a0,a1,a3
+;;   not a1,a3
+;;   and a3,a5,a1
+;;   or a5,a0,a3
+;;   lw a0,0(a5)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
index 8427fd5d3853..c90e4738e5c4 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
@@ -41,30 +41,38 @@
 
 ;; function u0:0:
 ;; block0:
-;;   ld a5,8(a2)
-;;   sltu a4,a0,a5
-;;   xori a3,a4,1
-;;   ld a5,0(a2)
-;;   add a5,a5,a0
-;;   sub a3,zero,a3
-;;   not a0,a3
-;;   and a2,a5,a0
-;;   sb a1,0(a2)
+;;   ld a3,8(a2)
+;;   uge a4,a0,a3##ty=i64
+;;   ld a3,0(a2)
+;;   add a3,a3,a0
+;;   li a5,0
+;;   andi a4,a4,255
+;;   sltu a0,zero,a4
+;;   sub a2,zero,a0
+;;   and a4,a5,a2
+;;   not a5,a2
+;;   and a2,a3,a5
+;;   or a3,a4,a2
+;;   sb a1,0(a3)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   ld a5,8(a1)
-;;   sltu a4,a0,a5
-;;   xori a2,a4,1
-;;   ld a5,0(a1)
-;;   add a5,a5,a0
-;;   sub a3,zero,a2
-;;   not a0,a3
-;;   and a1,a5,a0
-;;   lbu a0,0(a1)
+;;   ld a3,8(a1)
+;;   uge a4,a0,a3##ty=i64
+;;   ld a3,0(a1)
+;;   add a3,a3,a0
+;;   li a5,0
+;;   andi a4,a4,255
+;;   sltu a0,zero,a4
+;;   sub a1,zero,a0
+;;   and a4,a5,a1
+;;   not a5,a1
+;;   and a1,a3,a5
+;;   or a3,a4,a1
+;;   lbu a0,0(a3)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
index c62abdfe2fc3..74390da34be9 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -41,32 +41,42 @@
 
 ;; function u0:0:
 ;; block0:
-;;   ld a3,8(a2)
-;;   sltu a3,a3,a0
-;;   ld a2,0(a2)
-;;   add a0,a2,a0
-;;   lui a2,1
-;;   add a0,a0,a2
-;;   sub a4,zero,a3
-;;   not a2,a4
-;;   and a2,a0,a2
-;;   sb a1,0(a2)
+;;   ld a5,8(a2)
+;;   ugt a3,a0,a5##ty=i64
+;;   ld a5,0(a2)
+;;   add a5,a5,a0
+;;   lui a0,1
+;;   add a5,a5,a0
+;;   li a2,0
+;;   andi a0,a3,255
+;;   sltu a3,zero,a0
+;;   sub a3,zero,a3
+;;   and a0,a2,a3
+;;   not a2,a3
+;;   and a3,a5,a2
+;;   or a5,a0,a3
+;;   sb a1,0(a5)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   ld a2,8(a1)
-;;   sltu a2,a2,a0
-;;   ld a1,0(a1)
-;;   add a0,a1,a0
-;;   lui a1,1
-;;   add a0,a0,a1
-;;   sub a4,zero,a2
-;;   not a1,a4
-;;   and a2,a0,a1
-;;   lbu a0,0(a2)
+;;   ld a5,8(a1)
+;;   ugt a2,a0,a5##ty=i64
+;;   ld a5,0(a1)
+;;   add a5,a5,a0
+;;   lui a0,1
+;;   add a5,a5,a0
+;;   li a1,0
+;;   andi a0,a2,255
+;;   sltu a2,zero,a0
+;;   sub a3,zero,a2
+;;   and a0,a1,a3
+;;   not a1,a3
+;;   and a3,a5,a1
+;;   or a5,a0,a3
+;;   lbu a0,0(a5)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index d0ea46100852..0b9d9f0903fc 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -41,34 +41,42 @@
 
 ;; function u0:0:
 ;; block0:
-;;   ld a3,8(a2)
-;;   sltu a4,a3,a0
-;;   ld a2,0(a2)
-;;   add a3,a2,a0
-;;   lui a0,65535
-;;   slli a2,a0,4
-;;   add a3,a3,a2
-;;   sub a5,zero,a4
-;;   not a2,a5
-;;   and a3,a3,a2
-;;   sb a1,0(a3)
+;;   ld a5,8(a2)
+;;   ugt a3,a0,a5##ty=i64
+;;   ld a5,0(a2)
+;;   add a5,a5,a0
+;;   ld a0,[const(0)]
+;;   add a5,a5,a0
+;;   li a2,0
+;;   andi a0,a3,255
+;;   sltu a3,zero,a0
+;;   sub a3,zero,a3
+;;   and a0,a2,a3
+;;   not a2,a3
+;;   and a3,a5,a2
+;;   or a5,a0,a3
+;;   sb a1,0(a5)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   ld a2,8(a1)
-;;   sltu a3,a2,a0
-;;   ld a1,0(a1)
-;;   add a2,a1,a0
-;;   lui a0,65535
-;;   slli a4,a0,4
-;;   add a2,a2,a4
-;;   sub a5,zero,a3
-;;   not a1,a5
-;;   and a3,a2,a1
-;;   lbu a0,0(a3)
+;;   ld a5,8(a1)
+;;   ugt a2,a0,a5##ty=i64
+;;   ld a5,0(a1)
+;;   add a5,a5,a0
+;;   ld a0,[const(0)]
+;;   add a5,a5,a0
+;;   li a1,0
+;;   andi a0,a2,255
+;;   sltu a2,zero,a0
+;;   sub a3,zero,a2
+;;   and a0,a1,a3
+;;   not a1,a3
+;;   and a3,a5,a1
+;;   or a5,a0,a3
+;;   lbu a0,0(a5)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
index be756e1e6b5a..b37cdad54916 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
@@ -40,14 +40,15 @@
 ;; function u0:0:
 ;; block0:
 ;;   slli a3,a0,32
-;;   srli a4,a3,32
+;;   srli a5,a3,32
 ;;   lui a3,65536
-;;   addi a5,a3,-4
-;;   bgtu a4,a5,taken(label3),not_taken(label1)
+;;   addi a0,a3,-4
+;;   ugt a4,a5,a0##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a5,0(a2)
-;;   add a4,a5,a4
-;;   sw a1,0(a4)
+;;   ld a0,0(a2)
+;;   add a5,a0,a5
+;;   sw a1,0(a5)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -56,15 +57,16 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a2,a0,32
-;;   srli a4,a2,32
-;;   lui a2,65536
-;;   addi a5,a2,-4
-;;   bgtu a4,a5,taken(label3),not_taken(label1)
+;;   slli a3,a0,32
+;;   srli a5,a3,32
+;;   lui a3,65536
+;;   addi a0,a3,-4
+;;   ugt a4,a5,a0##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a5,0(a1)
-;;   add a4,a5,a4
-;;   lw a0,0(a4)
+;;   ld a0,0(a1)
+;;   add a5,a0,a5
+;;   lw a0,0(a5)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index bb58c0d19bf0..f52de3ba484f 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -39,15 +39,18 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a3,a0,32
-;;   srli a4,a3,32
-;;   lui a3,65535
-;;   addi a5,a3,-4
-;;   bgtu a4,a5,taken(label3),not_taken(label1)
+;;   slli a5,a0,32
+;;   srli a3,a5,32
+;;   lui a5,65535
+;;   addi a4,a5,-4
+;;   ugt a0,a3,a4##ty=i64
+;;   bne a0,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a5,0(a2)
-;;   add a4,a5,a4
-;;   sw a1,4096(a4)
+;;   ld a2,0(a2)
+;;   add a2,a2,a3
+;;   lui a3,1
+;;   add a2,a2,a3
+;;   sw a1,0(a2)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -56,15 +59,18 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a2,a0,32
-;;   srli a4,a2,32
-;;   lui a2,65535
-;;   addi a5,a2,-4
-;;   bgtu a4,a5,taken(label3),not_taken(label1)
+;;   slli a5,a0,32
+;;   srli a2,a5,32
+;;   lui a5,65535
+;;   addi a3,a5,-4
+;;   ugt a0,a2,a3##ty=i64
+;;   bne a0,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a5,0(a1)
-;;   add a4,a5,a4
-;;   lw a0,4096(a4)
+;;   ld a1,0(a1)
+;;   add a1,a1,a2
+;;   lui a2,1
+;;   add a1,a1,a2
+;;   lw a0,0(a1)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
index 10a641f261a1..a537a70f068e 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
@@ -40,14 +40,15 @@
 ;; function u0:0:
 ;; block0:
 ;;   slli a3,a0,32
-;;   srli a4,a3,32
+;;   srli a5,a3,32
 ;;   lui a3,65536
-;;   addi a5,a3,-1
-;;   bgtu a4,a5,taken(label3),not_taken(label1)
+;;   addi a0,a3,-1
+;;   ugt a4,a5,a0##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a5,0(a2)
-;;   add a4,a5,a4
-;;   sb a1,0(a4)
+;;   ld a0,0(a2)
+;;   add a5,a0,a5
+;;   sb a1,0(a5)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -56,15 +57,16 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a2,a0,32
-;;   srli a4,a2,32
-;;   lui a2,65536
-;;   addi a5,a2,-1
-;;   bgtu a4,a5,taken(label3),not_taken(label1)
+;;   slli a3,a0,32
+;;   srli a5,a3,32
+;;   lui a3,65536
+;;   addi a0,a3,-1
+;;   ugt a4,a5,a0##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a5,0(a1)
-;;   add a4,a5,a4
-;;   lbu a0,0(a4)
+;;   ld a0,0(a1)
+;;   add a5,a0,a5
+;;   lbu a0,0(a5)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index 3c3968591466..8570a3a7c40b 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -39,15 +39,18 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a3,a0,32
-;;   srli a4,a3,32
-;;   lui a3,65535
-;;   addi a5,a3,-1
-;;   bgtu a4,a5,taken(label3),not_taken(label1)
+;;   slli a5,a0,32
+;;   srli a3,a5,32
+;;   lui a5,65535
+;;   addi a4,a5,-1
+;;   ugt a0,a3,a4##ty=i64
+;;   bne a0,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a5,0(a2)
-;;   add a4,a5,a4
-;;   sb a1,4096(a4)
+;;   ld a2,0(a2)
+;;   add a2,a2,a3
+;;   lui a3,1
+;;   add a2,a2,a3
+;;   sb a1,0(a2)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -56,15 +59,18 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a2,a0,32
-;;   srli a4,a2,32
-;;   lui a2,65535
-;;   addi a5,a2,-1
-;;   bgtu a4,a5,taken(label3),not_taken(label1)
+;;   slli a5,a0,32
+;;   srli a2,a5,32
+;;   lui a5,65535
+;;   addi a3,a5,-1
+;;   ugt a0,a2,a3##ty=i64
+;;   bne a0,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a5,0(a1)
-;;   add a4,a5,a4
-;;   lbu a0,4096(a4)
+;;   ld a1,0(a1)
+;;   add a1,a1,a2
+;;   lui a2,1
+;;   add a1,a1,a2
+;;   lbu a0,0(a1)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
index e2e3d0711795..f8f8f2ec4288 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
@@ -39,34 +39,44 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a3,a0,32
-;;   lui a0,65536
-;;   addi a4,a0,-4
-;;   sltu a4,a4,a3
-;;   ld a2,0(a2)
-;;   add a2,a2,a3
-;;   sub a5,zero,a4
-;;   not a3,a5
-;;   and a3,a2,a3
-;;   sw a1,0(a3)
+;;   slli a5,a0,32
+;;   srli a3,a5,32
+;;   lui a5,65536
+;;   addi a4,a5,-4
+;;   ugt a4,a3,a4##ty=i64
+;;   ld a0,0(a2)
+;;   add a0,a0,a3
+;;   li a2,0
+;;   andi a3,a4,255
+;;   sltu a3,zero,a3
+;;   sub a4,zero,a3
+;;   and a2,a2,a4
+;;   not a3,a4
+;;   and a4,a0,a3
+;;   or a0,a2,a4
+;;   sw a1,0(a0)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a2,a0,32
-;;   lui a0,65536
-;;   addi a3,a0,-4
-;;   sltu a3,a3,a2
-;;   ld a1,0(a1)
-;;   add a1,a1,a2
-;;   sub a5,zero,a3
-;;   not a2,a5
-;;   and a3,a1,a2
-;;   lw a0,0(a3)
+;;   slli a5,a0,32
+;;   srli a2,a5,32
+;;   lui a5,65536
+;;   addi a3,a5,-4
+;;   ugt a3,a2,a3##ty=i64
+;;   ld a0,0(a1)
+;;   add a0,a0,a2
+;;   li a1,0
+;;   andi a2,a3,255
+;;   sltu a2,zero,a2
+;;   sub a4,zero,a2
+;;   and a1,a1,a4
+;;   not a2,a4
+;;   and a4,a0,a2
+;;   or a0,a1,a4
+;;   lw a0,0(a0)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
index 701c8583fc51..ca129eb94eb9 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -42,16 +42,21 @@
 ;;   slli a3,a0,32
 ;;   srli a4,a3,32
 ;;   lui a3,65535
-;;   addi a5,a3,-4
-;;   sltu a3,a5,a4
-;;   ld a5,0(a2)
-;;   add a4,a5,a4
-;;   lui a5,1
-;;   add a4,a4,a5
-;;   sub a2,zero,a3
-;;   not a3,a2
-;;   and a5,a4,a3
-;;   sw a1,0(a5)
+;;   addi a3,a3,-4
+;;   ugt a3,a4,a3##ty=i64
+;;   ld a2,0(a2)
+;;   add a2,a2,a4
+;;   lui a4,1
+;;   add a2,a2,a4
+;;   li a4,0
+;;   andi a3,a3,255
+;;   sltu a5,zero,a3
+;;   sub a0,zero,a5
+;;   and a3,a4,a0
+;;   not a4,a0
+;;   and a0,a2,a4
+;;   or a2,a3,a0
+;;   sw a1,0(a2)
 ;;   j label1
 ;; block1:
 ;;   ret
@@ -61,16 +66,21 @@
 ;;   slli a2,a0,32
 ;;   srli a4,a2,32
 ;;   lui a2,65535
-;;   addi a5,a2,-4
-;;   sltu a3,a5,a4
-;;   ld a5,0(a1)
-;;   add a4,a5,a4
-;;   lui a5,1
-;;   add a4,a4,a5
-;;   sub a1,zero,a3
-;;   not a3,a1
-;;   and a5,a4,a3
-;;   lw a0,0(a5)
+;;   addi a3,a2,-4
+;;   ugt a3,a4,a3##ty=i64
+;;   ld a2,0(a1)
+;;   add a2,a2,a4
+;;   lui a4,1
+;;   add a2,a2,a4
+;;   li a4,0
+;;   andi a3,a3,255
+;;   sltu a5,zero,a3
+;;   sub a0,zero,a5
+;;   and a3,a4,a0
+;;   not a4,a0
+;;   and a0,a2,a4
+;;   or a2,a3,a0
+;;   lw a0,0(a2)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat
index b433aef1c6f5..e1532d5465fa 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat
@@ -39,34 +39,44 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a3,a0,32
-;;   lui a0,65536
-;;   addi a4,a0,-1
-;;   sltu a4,a4,a3
-;;   ld a2,0(a2)
-;;   add a2,a2,a3
-;;   sub a5,zero,a4
-;;   not a3,a5
-;;   and a3,a2,a3
-;;   sb a1,0(a3)
+;;   slli a5,a0,32
+;;   srli a3,a5,32
+;;   lui a5,65536
+;;   addi a4,a5,-1
+;;   ugt a4,a3,a4##ty=i64
+;;   ld a0,0(a2)
+;;   add a0,a0,a3
+;;   li a2,0
+;;   andi a3,a4,255
+;;   sltu a3,zero,a3
+;;   sub a4,zero,a3
+;;   and a2,a2,a4
+;;   not a3,a4
+;;   and a4,a0,a3
+;;   or a0,a2,a4
+;;   sb a1,0(a0)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a2,a0,32
-;;   lui a0,65536
-;;   addi a3,a0,-1
-;;   sltu a3,a3,a2
-;;   ld a1,0(a1)
-;;   add a1,a1,a2
-;;   sub a5,zero,a3
-;;   not a2,a5
-;;   and a3,a1,a2
-;;   lbu a0,0(a3)
+;;   slli a5,a0,32
+;;   srli a2,a5,32
+;;   lui a5,65536
+;;   addi a3,a5,-1
+;;   ugt a3,a2,a3##ty=i64
+;;   ld a0,0(a1)
+;;   add a0,a0,a2
+;;   li a1,0
+;;   andi a2,a3,255
+;;   sltu a2,zero,a2
+;;   sub a4,zero,a2
+;;   and a1,a1,a4
+;;   not a2,a4
+;;   and a4,a0,a2
+;;   or a0,a1,a4
+;;   lbu a0,0(a0)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
index 3fec46bd49d4..2d09800de3a3 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -42,16 +42,21 @@
 ;;   slli a3,a0,32
 ;;   srli a4,a3,32
 ;;   lui a3,65535
-;;   addi a5,a3,-1
-;;   sltu a3,a5,a4
-;;   ld a5,0(a2)
-;;   add a4,a5,a4
-;;   lui a5,1
-;;   add a4,a4,a5
-;;   sub a2,zero,a3
-;;   not a3,a2
-;;   and a5,a4,a3
-;;   sb a1,0(a5)
+;;   addi a3,a3,-1
+;;   ugt a3,a4,a3##ty=i64
+;;   ld a2,0(a2)
+;;   add a2,a2,a4
+;;   lui a4,1
+;;   add a2,a2,a4
+;;   li a4,0
+;;   andi a3,a3,255
+;;   sltu a5,zero,a3
+;;   sub a0,zero,a5
+;;   and a3,a4,a0
+;;   not a4,a0
+;;   and a0,a2,a4
+;;   or a2,a3,a0
+;;   sb a1,0(a2)
 ;;   j label1
 ;; block1:
 ;;   ret
@@ -61,16 +66,21 @@
 ;;   slli a2,a0,32
 ;;   srli a4,a2,32
 ;;   lui a2,65535
-;;   addi a5,a2,-1
-;;   sltu a3,a5,a4
-;;   ld a5,0(a1)
-;;   add a4,a5,a4
-;;   lui a5,1
-;;   add a4,a4,a5
-;;   sub a1,zero,a3
-;;   not a3,a1
-;;   and a5,a4,a3
-;;   lbu a0,0(a5)
+;;   addi a3,a2,-1
+;;   ugt a3,a4,a3##ty=i64
+;;   ld a2,0(a1)
+;;   add a2,a2,a4
+;;   lui a4,1
+;;   add a2,a2,a4
+;;   li a4,0
+;;   andi a3,a3,255
+;;   sltu a5,zero,a3
+;;   sub a0,zero,a5
+;;   and a3,a4,a0
+;;   not a4,a0
+;;   and a0,a2,a4
+;;   or a2,a3,a0
+;;   lbu a0,0(a2)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index 0d16208377cd..c1a79596e9a8 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -39,22 +39,26 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a3,a0,32
-;;   ld a2,0(a2)
-;;   add a2,a2,a3
-;;   sw a1,4096(a2)
+;;   slli a3,a0,32
+;;   srli a4,a3,32
+;;   ld a3,0(a2)
+;;   add a3,a3,a4
+;;   lui a4,1
+;;   add a3,a3,a4
+;;   sw a1,0(a3)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a2,a0,32
-;;   ld a1,0(a1)
-;;   add a1,a1,a2
-;;   lw a0,4096(a1)
+;;   slli a2,a0,32
+;;   srli a4,a2,32
+;;   ld a3,0(a1)
+;;   add a3,a3,a4
+;;   lui a4,1
+;;   add a3,a3,a4
+;;   lw a0,0(a3)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index 1a3f9d4396f3..46016dc22f2a 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -39,22 +39,26 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a3,a0,32
-;;   ld a2,0(a2)
-;;   add a2,a2,a3
-;;   sb a1,4096(a2)
+;;   slli a3,a0,32
+;;   srli a4,a3,32
+;;   ld a3,0(a2)
+;;   add a3,a3,a4
+;;   lui a4,1
+;;   add a3,a3,a4
+;;   sb a1,0(a3)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a2,a0,32
-;;   ld a1,0(a1)
-;;   add a1,a1,a2
-;;   lbu a0,4096(a1)
+;;   slli a2,a0,32
+;;   srli a4,a2,32
+;;   ld a3,0(a1)
+;;   add a3,a3,a4
+;;   lui a4,1
+;;   add a3,a3,a4
+;;   lbu a0,0(a3)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
index d7355dbe7037..a967a82735a6 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -39,22 +39,26 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a3,a0,32
-;;   ld a2,0(a2)
-;;   add a2,a2,a3
-;;   sw a1,4096(a2)
+;;   slli a3,a0,32
+;;   srli a4,a3,32
+;;   ld a3,0(a2)
+;;   add a3,a3,a4
+;;   lui a4,1
+;;   add a3,a3,a4
+;;   sw a1,0(a3)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a2,a0,32
-;;   ld a1,0(a1)
-;;   add a1,a1,a2
-;;   lw a0,4096(a1)
+;;   slli a2,a0,32
+;;   srli a4,a2,32
+;;   ld a3,0(a1)
+;;   add a3,a3,a4
+;;   lui a4,1
+;;   add a3,a3,a4
+;;   lw a0,0(a3)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
index a6cd0f771bd9..2eb455c6cedc 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -39,22 +39,26 @@
 
 ;; function u0:0:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a3,a0,32
-;;   ld a2,0(a2)
-;;   add a2,a2,a3
-;;   sb a1,4096(a2)
+;;   slli a3,a0,32
+;;   srli a4,a3,32
+;;   ld a3,0(a2)
+;;   add a3,a3,a4
+;;   lui a4,1
+;;   add a3,a3,a4
+;;   sb a1,0(a3)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   slli a0,a0,32
-;;   srli a2,a0,32
-;;   ld a1,0(a1)
-;;   add a1,a1,a2
-;;   lbu a0,4096(a1)
+;;   slli a2,a0,32
+;;   srli a4,a2,32
+;;   ld a3,0(a1)
+;;   add a3,a3,a4
+;;   lui a4,1
+;;   add a3,a3,a4
+;;   lbu a0,0(a3)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
index 2ccf3332dafe..ecd6829c5d7d 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
@@ -41,11 +41,12 @@
 ;; block0:
 ;;   lui a3,65536
 ;;   addi a3,a3,-4
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   ugt a3,a0,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a2)
-;;   add a2,a2,a0
-;;   sw a1,0(a2)
+;;   ld a3,0(a2)
+;;   add a3,a3,a0
+;;   sw a1,0(a3)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -55,12 +56,13 @@
 ;; function u0:1:
 ;; block0:
 ;;   lui a2,65536
-;;   addi a2,a2,-4
-;;   bgtu a0,a2,taken(label3),not_taken(label1)
+;;   addi a3,a2,-4
+;;   ugt a2,a0,a3##ty=i64
+;;   bne a2,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a1)
-;;   add a2,a2,a0
-;;   lw a0,0(a2)
+;;   ld a3,0(a1)
+;;   add a3,a3,a0
+;;   lw a0,0(a3)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index 1e526bff3979..f44f814a9eb4 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -40,12 +40,15 @@
 ;; function u0:0:
 ;; block0:
 ;;   lui a3,65535
-;;   addi a3,a3,-4
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   addi a5,a3,-4
+;;   ugt a4,a0,a5##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a2)
-;;   add a2,a2,a0
-;;   sw a1,4096(a2)
+;;   ld a5,0(a2)
+;;   add a5,a5,a0
+;;   lui a0,1
+;;   add a5,a5,a0
+;;   sw a1,0(a5)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -54,13 +57,16 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   lui a2,65535
-;;   addi a2,a2,-4
-;;   bgtu a0,a2,taken(label3),not_taken(label1)
+;;   lui a3,65535
+;;   addi a5,a3,-4
+;;   ugt a4,a0,a5##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a1)
-;;   add a2,a2,a0
-;;   lw a0,4096(a2)
+;;   ld a5,0(a1)
+;;   add a5,a5,a0
+;;   lui a0,1
+;;   add a5,a5,a0
+;;   lw a0,0(a5)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
index 0b54080054b9..d20b6c5773f7 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
@@ -41,11 +41,12 @@
 ;; block0:
 ;;   lui a3,65536
 ;;   addi a3,a3,-1
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   ugt a3,a0,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a2)
-;;   add a2,a2,a0
-;;   sb a1,0(a2)
+;;   ld a3,0(a2)
+;;   add a3,a3,a0
+;;   sb a1,0(a3)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -55,12 +56,13 @@
 ;; function u0:1:
 ;; block0:
 ;;   lui a2,65536
-;;   addi a2,a2,-1
-;;   bgtu a0,a2,taken(label3),not_taken(label1)
+;;   addi a3,a2,-1
+;;   ugt a2,a0,a3##ty=i64
+;;   bne a2,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a1)
-;;   add a2,a2,a0
-;;   lbu a0,0(a2)
+;;   ld a3,0(a1)
+;;   add a3,a3,a0
+;;   lbu a0,0(a3)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index f85b1a0bd8fe..a571703d9f91 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -40,12 +40,15 @@
 ;; function u0:0:
 ;; block0:
 ;;   lui a3,65535
-;;   addi a3,a3,-1
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   addi a5,a3,-1
+;;   ugt a4,a0,a5##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a2)
-;;   add a2,a2,a0
-;;   sb a1,4096(a2)
+;;   ld a5,0(a2)
+;;   add a5,a5,a0
+;;   lui a0,1
+;;   add a5,a5,a0
+;;   sb a1,0(a5)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -54,13 +57,16 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   lui a2,65535
-;;   addi a2,a2,-1
-;;   bgtu a0,a2,taken(label3),not_taken(label1)
+;;   lui a3,65535
+;;   addi a5,a3,-1
+;;   ugt a4,a0,a5##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a1)
-;;   add a2,a2,a0
-;;   lbu a0,4096(a2)
+;;   ld a5,0(a1)
+;;   add a5,a5,a0
+;;   lui a0,1
+;;   add a5,a5,a0
+;;   lbu a0,0(a5)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
index f37b13a2aa9c..d5a07ae68ecb 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
@@ -39,30 +39,40 @@
 
 ;; function u0:0:
 ;; block0:
-;;   lui a4,65536
-;;   addi a3,a4,-4
-;;   sltu a5,a3,a0
-;;   ld a2,0(a2)
-;;   add a0,a2,a0
-;;   sub a3,zero,a5
-;;   not a5,a3
-;;   and a2,a0,a5
-;;   sw a1,0(a2)
+;;   lui a3,65536
+;;   addi a5,a3,-4
+;;   ugt a5,a0,a5##ty=i64
+;;   ld a4,0(a2)
+;;   add a4,a4,a0
+;;   li a0,0
+;;   andi a5,a5,255
+;;   sltu a2,zero,a5
+;;   sub a2,zero,a2
+;;   and a5,a0,a2
+;;   not a0,a2
+;;   and a2,a4,a0
+;;   or a4,a5,a2
+;;   sw a1,0(a4)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   lui a4,65536
-;;   addi a2,a4,-4
-;;   sltu a5,a2,a0
-;;   ld a1,0(a1)
-;;   add a0,a1,a0
-;;   sub a3,zero,a5
-;;   not a5,a3
-;;   and a1,a0,a5
-;;   lw a0,0(a1)
+;;   lui a3,65536
+;;   addi a5,a3,-4
+;;   ugt a5,a0,a5##ty=i64
+;;   ld a4,0(a1)
+;;   add a4,a4,a0
+;;   li a0,0
+;;   andi a5,a5,255
+;;   sltu a1,zero,a5
+;;   sub a2,zero,a1
+;;   and a5,a0,a2
+;;   not a0,a2
+;;   and a2,a4,a0
+;;   or a4,a5,a2
+;;   lw a0,0(a4)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
index 5dc39b67c751..0e16efed51ca 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -39,34 +39,44 @@
 
 ;; function u0:0:
 ;; block0:
-;;   lui a3,65535
-;;   addi a3,a3,-4
-;;   sltu a3,a3,a0
+;;   lui a5,65535
+;;   addi a3,a5,-4
+;;   ugt a4,a0,a3##ty=i64
 ;;   ld a2,0(a2)
-;;   add a2,a2,a0
-;;   lui a4,1
-;;   add a2,a2,a4
-;;   sub a5,zero,a3
-;;   not a3,a5
-;;   and a3,a2,a3
-;;   sw a1,0(a3)
+;;   add a0,a2,a0
+;;   lui a2,1
+;;   add a0,a0,a2
+;;   li a3,0
+;;   andi a2,a4,255
+;;   sltu a2,zero,a2
+;;   sub a4,zero,a2
+;;   and a2,a3,a4
+;;   not a3,a4
+;;   and a4,a0,a3
+;;   or a0,a2,a4
+;;   sw a1,0(a0)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   lui a2,65535
-;;   addi a2,a2,-4
-;;   sltu a2,a2,a0
+;;   lui a5,65535
+;;   addi a2,a5,-4
+;;   ugt a3,a0,a2##ty=i64
 ;;   ld a1,0(a1)
-;;   add a1,a1,a0
-;;   lui a3,1
-;;   add a1,a1,a3
-;;   sub a5,zero,a2
-;;   not a2,a5
-;;   and a3,a1,a2
-;;   lw a0,0(a3)
+;;   add a0,a1,a0
+;;   lui a1,1
+;;   add a0,a0,a1
+;;   li a2,0
+;;   andi a1,a3,255
+;;   sltu a3,zero,a1
+;;   sub a4,zero,a3
+;;   and a1,a2,a4
+;;   not a2,a4
+;;   and a4,a0,a2
+;;   or a0,a1,a4
+;;   lw a0,0(a0)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
index 448eeda62f29..b9d9b85d9634 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
@@ -39,30 +39,40 @@
 
 ;; function u0:0:
 ;; block0:
-;;   lui a4,65536
-;;   addi a3,a4,-1
-;;   sltu a5,a3,a0
-;;   ld a2,0(a2)
-;;   add a0,a2,a0
-;;   sub a3,zero,a5
-;;   not a5,a3
-;;   and a2,a0,a5
-;;   sb a1,0(a2)
+;;   lui a3,65536
+;;   addi a5,a3,-1
+;;   ugt a5,a0,a5##ty=i64
+;;   ld a4,0(a2)
+;;   add a4,a4,a0
+;;   li a0,0
+;;   andi a5,a5,255
+;;   sltu a2,zero,a5
+;;   sub a2,zero,a2
+;;   and a5,a0,a2
+;;   not a0,a2
+;;   and a2,a4,a0
+;;   or a4,a5,a2
+;;   sb a1,0(a4)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   lui a4,65536
-;;   addi a2,a4,-1
-;;   sltu a5,a2,a0
-;;   ld a1,0(a1)
-;;   add a0,a1,a0
-;;   sub a3,zero,a5
-;;   not a5,a3
-;;   and a1,a0,a5
-;;   lbu a0,0(a1)
+;;   lui a3,65536
+;;   addi a5,a3,-1
+;;   ugt a5,a0,a5##ty=i64
+;;   ld a4,0(a1)
+;;   add a4,a4,a0
+;;   li a0,0
+;;   andi a5,a5,255
+;;   sltu a1,zero,a5
+;;   sub a2,zero,a1
+;;   and a5,a0,a2
+;;   not a0,a2
+;;   and a2,a4,a0
+;;   or a4,a5,a2
+;;   lbu a0,0(a4)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
index 7d9c18675f07..dd356dcb506b 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -39,34 +39,44 @@
 
 ;; function u0:0:
 ;; block0:
-;;   lui a3,65535
-;;   addi a3,a3,-1
-;;   sltu a3,a3,a0
+;;   lui a5,65535
+;;   addi a3,a5,-1
+;;   ugt a4,a0,a3##ty=i64
 ;;   ld a2,0(a2)
-;;   add a2,a2,a0
-;;   lui a4,1
-;;   add a2,a2,a4
-;;   sub a5,zero,a3
-;;   not a3,a5
-;;   and a3,a2,a3
-;;   sb a1,0(a3)
+;;   add a0,a2,a0
+;;   lui a2,1
+;;   add a0,a0,a2
+;;   li a3,0
+;;   andi a2,a4,255
+;;   sltu a2,zero,a2
+;;   sub a4,zero,a2
+;;   and a2,a3,a4
+;;   not a3,a4
+;;   and a4,a0,a3
+;;   or a0,a2,a4
+;;   sb a1,0(a0)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   lui a2,65535
-;;   addi a2,a2,-1
-;;   sltu a2,a2,a0
+;;   lui a5,65535
+;;   addi a2,a5,-1
+;;   ugt a3,a0,a2##ty=i64
 ;;   ld a1,0(a1)
-;;   add a1,a1,a0
-;;   lui a3,1
-;;   add a1,a1,a3
-;;   sub a5,zero,a2
-;;   not a2,a5
-;;   and a3,a1,a2
-;;   lbu a0,0(a3)
+;;   add a0,a1,a0
+;;   lui a1,1
+;;   add a0,a0,a1
+;;   li a2,0
+;;   andi a1,a3,255
+;;   sltu a3,zero,a1
+;;   sub a4,zero,a3
+;;   and a1,a2,a4
+;;   not a2,a4
+;;   and a4,a0,a2
+;;   or a0,a1,a4
+;;   lbu a0,0(a0)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
index 7ee1cabd23a5..d9741e0bd334 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
@@ -41,11 +41,12 @@
 ;; block0:
 ;;   lui a3,65536
 ;;   addi a3,a3,-4
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   ugt a3,a0,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a2)
-;;   add a2,a2,a0
-;;   sw a1,0(a2)
+;;   ld a3,0(a2)
+;;   add a3,a3,a0
+;;   sw a1,0(a3)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -55,12 +56,13 @@
 ;; function u0:1:
 ;; block0:
 ;;   lui a2,65536
-;;   addi a2,a2,-4
-;;   bgtu a0,a2,taken(label3),not_taken(label1)
+;;   addi a3,a2,-4
+;;   ugt a2,a0,a3##ty=i64
+;;   bne a2,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a1)
-;;   add a2,a2,a0
-;;   lw a0,0(a2)
+;;   ld a3,0(a1)
+;;   add a3,a3,a0
+;;   lw a0,0(a3)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index 27c1f657371c..1df188f25318 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -40,12 +40,15 @@
 ;; function u0:0:
 ;; block0:
 ;;   lui a3,65535
-;;   addi a3,a3,-4
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   addi a5,a3,-4
+;;   ugt a4,a0,a5##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a2)
-;;   add a2,a2,a0
-;;   sw a1,4096(a2)
+;;   ld a5,0(a2)
+;;   add a5,a5,a0
+;;   lui a0,1
+;;   add a5,a5,a0
+;;   sw a1,0(a5)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -54,13 +57,16 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   lui a2,65535
-;;   addi a2,a2,-4
-;;   bgtu a0,a2,taken(label3),not_taken(label1)
+;;   lui a3,65535
+;;   addi a5,a3,-4
+;;   ugt a4,a0,a5##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a1)
-;;   add a2,a2,a0
-;;   lw a0,4096(a2)
+;;   ld a5,0(a1)
+;;   add a5,a5,a0
+;;   lui a0,1
+;;   add a5,a5,a0
+;;   lw a0,0(a5)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
index 60b63137691f..645e8aaa6203 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
@@ -41,11 +41,12 @@
 ;; block0:
 ;;   lui a3,65536
 ;;   addi a3,a3,-1
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   ugt a3,a0,a3##ty=i64
+;;   bne a3,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a2)
-;;   add a2,a2,a0
-;;   sb a1,0(a2)
+;;   ld a3,0(a2)
+;;   add a3,a3,a0
+;;   sb a1,0(a3)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -55,12 +56,13 @@
 ;; function u0:1:
 ;; block0:
 ;;   lui a2,65536
-;;   addi a2,a2,-1
-;;   bgtu a0,a2,taken(label3),not_taken(label1)
+;;   addi a3,a2,-1
+;;   ugt a2,a0,a3##ty=i64
+;;   bne a2,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a1)
-;;   add a2,a2,a0
-;;   lbu a0,0(a2)
+;;   ld a3,0(a1)
+;;   add a3,a3,a0
+;;   lbu a0,0(a3)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index 8568f99897bc..c870967303d4 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -40,12 +40,15 @@
 ;; function u0:0:
 ;; block0:
 ;;   lui a3,65535
-;;   addi a3,a3,-1
-;;   bgtu a0,a3,taken(label3),not_taken(label1)
+;;   addi a5,a3,-1
+;;   ugt a4,a0,a5##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a2)
-;;   add a2,a2,a0
-;;   sb a1,4096(a2)
+;;   ld a5,0(a2)
+;;   add a5,a5,a0
+;;   lui a0,1
+;;   add a5,a5,a0
+;;   sb a1,0(a5)
 ;;   j label2
 ;; block2:
 ;;   ret
@@ -54,13 +57,16 @@
 ;;
 ;; function u0:1:
 ;; block0:
-;;   lui a2,65535
-;;   addi a2,a2,-1
-;;   bgtu a0,a2,taken(label3),not_taken(label1)
+;;   lui a3,65535
+;;   addi a5,a3,-1
+;;   ugt a4,a0,a5##ty=i64
+;;   bne a4,zero,taken(label3),not_taken(label1)
 ;; block1:
-;;   ld a2,0(a1)
-;;   add a2,a2,a0
-;;   lbu a0,4096(a2)
+;;   ld a5,0(a1)
+;;   add a5,a5,a0
+;;   lui a0,1
+;;   add a5,a5,a0
+;;   lbu a0,0(a5)
 ;;   j label2
 ;; block2:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
index 2afdc54934e2..973ba5f4bdc1 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
@@ -39,30 +39,40 @@
 
 ;; function u0:0:
 ;; block0:
-;;   lui a4,65536
-;;   addi a3,a4,-4
-;;   sltu a5,a3,a0
-;;   ld a2,0(a2)
-;;   add a0,a2,a0
-;;   sub a3,zero,a5
-;;   not a5,a3
-;;   and a2,a0,a5
-;;   sw a1,0(a2)
+;;   lui a3,65536
+;;   addi a5,a3,-4
+;;   ugt a5,a0,a5##ty=i64
+;;   ld a4,0(a2)
+;;   add a4,a4,a0
+;;   li a0,0
+;;   andi a5,a5,255
+;;   sltu a2,zero,a5
+;;   sub a2,zero,a2
+;;   and a5,a0,a2
+;;   not a0,a2
+;;   and a2,a4,a0
+;;   or a4,a5,a2
+;;   sw a1,0(a4)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   lui a4,65536
-;;   addi a2,a4,-4
-;;   sltu a5,a2,a0
-;;   ld a1,0(a1)
-;;   add a0,a1,a0
-;;   sub a3,zero,a5
-;;   not a5,a3
-;;   and a1,a0,a5
-;;   lw a0,0(a1)
+;;   lui a3,65536
+;;   addi a5,a3,-4
+;;   ugt a5,a0,a5##ty=i64
+;;   ld a4,0(a1)
+;;   add a4,a4,a0
+;;   li a0,0
+;;   andi a5,a5,255
+;;   sltu a1,zero,a5
+;;   sub a2,zero,a1
+;;   and a5,a0,a2
+;;   not a0,a2
+;;   and a2,a4,a0
+;;   or a4,a5,a2
+;;   lw a0,0(a4)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
index 968522c1f13e..d202e72373e8 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -39,34 +39,44 @@
 
 ;; function u0:0:
 ;; block0:
-;;   lui a3,65535
-;;   addi a3,a3,-4
-;;   sltu a3,a3,a0
+;;   lui a5,65535
+;;   addi a3,a5,-4
+;;   ugt a4,a0,a3##ty=i64
 ;;   ld a2,0(a2)
-;;   add a2,a2,a0
-;;   lui a4,1
-;;   add a2,a2,a4
-;;   sub a5,zero,a3
-;;   not a3,a5
-;;   and a3,a2,a3
-;;   sw a1,0(a3)
+;;   add a0,a2,a0
+;;   lui a2,1
+;;   add a0,a0,a2
+;;   li a3,0
+;;   andi a2,a4,255
+;;   sltu a2,zero,a2
+;;   sub a4,zero,a2
+;;   and a2,a3,a4
+;;   not a3,a4
+;;   and a4,a0,a3
+;;   or a0,a2,a4
+;;   sw a1,0(a0)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   lui a2,65535
-;;   addi a2,a2,-4
-;;   sltu a2,a2,a0
+;;   lui a5,65535
+;;   addi a2,a5,-4
+;;   ugt a3,a0,a2##ty=i64
 ;;   ld a1,0(a1)
-;;   add a1,a1,a0
-;;   lui a3,1
-;;   add a1,a1,a3
-;;   sub a5,zero,a2
-;;   not a2,a5
-;;   and a3,a1,a2
-;;   lw a0,0(a3)
+;;   add a0,a1,a0
+;;   lui a1,1
+;;   add a0,a0,a1
+;;   li a2,0
+;;   andi a1,a3,255
+;;   sltu a3,zero,a1
+;;   sub a4,zero,a3
+;;   and a1,a2,a4
+;;   not a2,a4
+;;   and a4,a0,a2
+;;   or a0,a1,a4
+;;   lw a0,0(a0)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
index 1d75bcf2d3fd..ee4599cd2566 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
@@ -39,30 +39,40 @@
 
 ;; function u0:0:
 ;; block0:
-;;   lui a4,65536
-;;   addi a3,a4,-1
-;;   sltu a5,a3,a0
-;;   ld a2,0(a2)
-;;   add a0,a2,a0
-;;   sub a3,zero,a5
-;;   not a5,a3
-;;   and a2,a0,a5
-;;   sb a1,0(a2)
+;;   lui a3,65536
+;;   addi a5,a3,-1
+;;   ugt a5,a0,a5##ty=i64
+;;   ld a4,0(a2)
+;;   add a4,a4,a0
+;;   li a0,0
+;;   andi a5,a5,255
+;;   sltu a2,zero,a5
+;;   sub a2,zero,a2
+;;   and a5,a0,a2
+;;   not a0,a2
+;;   and a2,a4,a0
+;;   or a4,a5,a2
+;;   sb a1,0(a4)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   lui a4,65536
-;;   addi a2,a4,-1
-;;   sltu a5,a2,a0
-;;   ld a1,0(a1)
-;;   add a0,a1,a0
-;;   sub a3,zero,a5
-;;   not a5,a3
-;;   and a1,a0,a5
-;;   lbu a0,0(a1)
+;;   lui a3,65536
+;;   addi a5,a3,-1
+;;   ugt a5,a0,a5##ty=i64
+;;   ld a4,0(a1)
+;;   add a4,a4,a0
+;;   li a0,0
+;;   andi a5,a5,255
+;;   sltu a1,zero,a5
+;;   sub a2,zero,a1
+;;   and a5,a0,a2
+;;   not a0,a2
+;;   and a2,a4,a0
+;;   or a4,a5,a2
+;;   lbu a0,0(a4)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
index 92c31e01986e..ea258a38ff87 100644
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/riscv64/wasm/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -39,34 +39,44 @@
 
 ;; function u0:0:
 ;; block0:
-;;   lui a3,65535
-;;   addi a3,a3,-1
-;;   sltu a3,a3,a0
+;;   lui a5,65535
+;;   addi a3,a5,-1
+;;   ugt a4,a0,a3##ty=i64
 ;;   ld a2,0(a2)
-;;   add a2,a2,a0
-;;   lui a4,1
-;;   add a2,a2,a4
-;;   sub a5,zero,a3
-;;   not a3,a5
-;;   and a3,a2,a3
-;;   sb a1,0(a3)
+;;   add a0,a2,a0
+;;   lui a2,1
+;;   add a0,a0,a2
+;;   li a3,0
+;;   andi a2,a4,255
+;;   sltu a2,zero,a2
+;;   sub a4,zero,a2
+;;   and a2,a3,a4
+;;   not a3,a4
+;;   and a4,a0,a3
+;;   or a0,a2,a4
+;;   sb a1,0(a0)
 ;;   j label1
 ;; block1:
 ;;   ret
 ;;
 ;; function u0:1:
 ;; block0:
-;;   lui a2,65535
-;;   addi a2,a2,-1
-;;   sltu a2,a2,a0
+;;   lui a5,65535
+;;   addi a2,a5,-1
+;;   ugt a3,a0,a2##ty=i64
 ;;   ld a1,0(a1)
-;;   add a1,a1,a0
-;;   lui a3,1
-;;   add a1,a1,a3
-;;   sub a5,zero,a2
-;;   not a2,a5
-;;   and a3,a1,a2
-;;   lbu a0,0(a3)
+;;   add a0,a1,a0
+;;   lui a1,1
+;;   add a0,a0,a1
+;;   li a2,0
+;;   andi a1,a3,255
+;;   sltu a3,zero,a1
+;;   sub a4,zero,a3
+;;   and a1,a2,a4
+;;   not a2,a4
+;;   and a4,a0,a2
+;;   or a0,a1,a4
+;;   lbu a0,0(a0)
 ;;   j label1
 ;; block1:
 ;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/zbb.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/zbb.wat
deleted file mode 100644
index e307e6a6ad43..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/zbb.wat
+++ /dev/null
@@ -1,115 +0,0 @@
-;;! target = "riscv64"
-;;! compile = true
-;;! settings = ["has_zbb", "opt_level=speed"]
-
-(module
-  (func (export "rolw") (param i32 i32) (result i32)
-    (i32.rotl (local.get 0) (local.get 1)))
-  (func (export "rol") (param i64 i64) (result i64)
-    (i64.rotl (local.get 0) (local.get 1)))
-  (func (export "rolwi") (param i32 ) (result i32)
-    (i32.rotl (local.get 0) (i32.const 100)))
-  (func (export "roli") (param i64) (result i64)
-    (i64.rotl (local.get 0) (i64.const 40)))
-
-  (func (export "rorw") (param i32 i32) (result i32)
-    (i32.rotr (local.get 0) (local.get 1)))
-  (func (export "ror") (param i64 i64) (result i64)
-    (i64.rotr (local.get 0) (local.get 1)))
-  (func (export "rorwi") (param i32 ) (result i32)
-    (i32.rotr (local.get 0) (i32.const 100)))
-  (func (export "rori") (param i64) (result i64)
-    (i64.rotr (local.get 0) (i64.const 40)))
-
-  (func (export "xnor32_1") (param i32 i32) (result i32)
-    (i32.xor (i32.xor (local.get 0) (local.get 1)) (i32.const -1)))
-  (func (export "xnor32_2") (param i32 i32) (result i32)
-    (i32.xor (i32.const -1) (i32.xor (local.get 0) (local.get 1))))
-  (func (export "xnor64_1") (param i64 i64) (result i64)
-    (i64.xor (i64.xor (local.get 0) (local.get 1)) (i64.const -1)))
-  (func (export "xnor64_2") (param i64 i64) (result i64)
-    (i64.xor (i64.const -1) (i64.xor (local.get 0) (local.get 1))))
-)
-;; function u0:0:
-;; block0:
-;;   j label1
-;; block1:
-;;   rolw a0,a0,a1
-;;   ret
-;;
-;; function u0:1:
-;; block0:
-;;   j label1
-;; block1:
-;;   rol a0,a0,a1
-;;   ret
-;;
-;; function u0:2:
-;; block0:
-;;   j label1
-;; block1:
-;;   roriw a0,a0,28
-;;   ret
-;;
-;; function u0:3:
-;; block0:
-;;   j label1
-;; block1:
-;;   rori a0,a0,24
-;;   ret
-;;
-;; function u0:4:
-;; block0:
-;;   j label1
-;; block1:
-;;   rorw a0,a0,a1
-;;   ret
-;;
-;; function u0:5:
-;; block0:
-;;   j label1
-;; block1:
-;;   ror a0,a0,a1
-;;   ret
-;;
-;; function u0:6:
-;; block0:
-;;   j label1
-;; block1:
-;;   roriw a0,a0,100
-;;   ret
-;;
-;; function u0:7:
-;; block0:
-;;   j label1
-;; block1:
-;;   rori a0,a0,40
-;;   ret
-;;
-;; function u0:8:
-;; block0:
-;;   j label1
-;; block1:
-;;   xnor a0,a0,a1
-;;   ret
-;;
-;; function u0:9:
-;; block0:
-;;   j label1
-;; block1:
-;;   xnor a0,a0,a1
-;;   ret
-;;
-;; function u0:10:
-;; block0:
-;;   j label1
-;; block1:
-;;   xnor a0,a0,a1
-;;   ret
-;;
-;; function u0:11:
-;; block0:
-;;   j label1
-;; block1:
-;;   xnor a0,a0,a1
-;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/wasm/zbs.wat b/cranelift/filetests/filetests/isa/riscv64/wasm/zbs.wat
deleted file mode 100644
index 3d14406d598e..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/wasm/zbs.wat
+++ /dev/null
@@ -1,398 +0,0 @@
-;;! target = "riscv64"
-;;! compile = true
-;;! settings = ["has_zbs", "opt_level=speed"]
-
-(module
-  (func (export "bclr32") (param i32 i32) (result i32)
-    (i32.and (local.get 0) (i32.xor (i32.shl (i32.const 1) (local.get 1)) (i32.const -1)))
-  )
-  (func (export "bclr64") (param i64 i64) (result i64)
-    (i64.and (i64.xor (i64.shl (i64.const 1) (local.get 1)) (i64.const -1)) (local.get 0))
-  )
-  (func (export "bclri32_4") (param i32) (result i32)
-    (i32.and (local.get 0) (i32.xor (i32.shl (i32.const 1) (i32.const 4)) (i32.const -1)))
-  )
-  (func (export "bclri32_20") (param i32) (result i32)
-    (i32.and (i32.xor (i32.shl (i32.const 1) (i32.const 20)) (i32.const -1)) (local.get 0))
-  )
-  (func (export "bclri64_4") (param i64) (result i64)
-    (i64.and (local.get 0) (i64.xor (i64.shl (i64.const 1) (i64.const 4)) (i64.const -1)))
-  )
-  (func (export "bclri64_52") (param i64) (result i64)
-    (i64.and (local.get 0) (i64.xor (i64.shl (i64.const 1) (i64.const 52)) (i64.const -1)))
-  )
-
-  (func (export "bext32_1") (param i32 i32) (result i32)
-    (i32.and (i32.shr_u (local.get 0) (local.get 1)) (i32.const 1))
-  )
-  (func (export "bext32_2") (param i32 i32) (result i32)
-    (i32.and (i32.shr_s (local.get 0) (local.get 1)) (i32.const 1))
-  )
-  (func (export "bext32_3") (param i32 i32) (result i32)
-    (i32.and (i32.const 1) (i32.shr_u (local.get 0) (local.get 1)))
-  )
-  (func (export "bext32_4") (param i32 i32) (result i32)
-    (i32.and (i32.const 1) (i32.shr_s (local.get 0) (local.get 1)))
-  )
-  (func (export "bext64_1") (param i64 i64) (result i64)
-    (i64.and (i64.shr_u (local.get 0) (local.get 1)) (i64.const 1))
-  )
-  (func (export "bext64_2") (param i64 i64) (result i64)
-    (i64.and (i64.shr_s (local.get 0) (local.get 1)) (i64.const 1))
-  )
-  (func (export "bext64_3") (param i64 i64) (result i64)
-    (i64.and (i64.const 1) (i64.shr_u (local.get 0) (local.get 1)))
-  )
-  (func (export "bext64_4") (param i64 i64) (result i64)
-    (i64.and (i64.const 1) (i64.shr_s (local.get 0) (local.get 1)))
-  )
-
-  (func (export "bexti32_1") (param i32) (result i32)
-    (i32.and (i32.shr_u (local.get 0) (i32.const 10)) (i32.const 1))
-  )
-  (func (export "bexti32_2") (param i32) (result i32)
-    (i32.and (i32.shr_s (local.get 0) (i32.const 20)) (i32.const 1))
-  )
-  (func (export "bexti32_3") (param i32) (result i32)
-    (i32.and (i32.shr_u (i32.const 1) (local.get 0) (i32.const 30)))
-  )
-  (func (export "bexti32_4") (param i32) (result i32)
-    (i32.and (i32.shr_s (i32.const 1) (local.get 0) (i32.const 40)))
-  )
-  (func (export "bexti64_1") (param i64) (result i64)
-    (i64.and (i64.shr_u (local.get 0) (i64.const 10)) (i64.const 1))
-  )
-  (func (export "bexti64_2") (param i64) (result i64)
-    (i64.and (i64.shr_s (local.get 0) (i64.const 20)) (i64.const 1))
-  )
-  (func (export "bexti64_3") (param i64) (result i64)
-    (i64.and (i64.shr_u (i64.const 1) (local.get 0) (i64.const 30)))
-  )
-  (func (export "bexti64_4") (param i64) (result i64)
-    (i64.and (i64.shr_s (i64.const 1) (local.get 0) (i64.const 40)))
-  )
-
-  (func (export "binv32_1") (param i32 i32) (result i32)
-    (i32.xor (local.get 0) (i32.shl (i32.const 1) (local.get 1)))
-  )
-  (func (export "binv32_2") (param i32 i32) (result i32)
-    (i32.xor (i32.shl (i32.const 1) (local.get 1)) (local.get 0))
-  )
-  (func (export "binv64_1") (param i64 i64) (result i64)
-    (i64.xor (local.get 0) (i64.shl (i64.const 1) (local.get 1)))
-  )
-  (func (export "binv64_2") (param i64 i64) (result i64)
-    (i64.xor (i64.shl (i64.const 1) (local.get 1)) (local.get 0))
-  )
-  (func (export "binvi32_1") (param i32) (result i32)
-    (i32.xor (local.get 0) (i32.shl (i32.const 1) (i32.const 10)))
-  )
-  (func (export "binvi32_2") (param i32) (result i32)
-    (i32.xor (i32.shl (i32.const 1) (i32.const 20)) (local.get 0))
-  )
-  (func (export "binvi64_1") (param i64) (result i64)
-    (i64.xor (local.get 0) (i64.shl (i64.const 1) (i64.const 30)))
-  )
-  (func (export "binvi64_2") (param i64) (result i64)
-    (i64.xor (i64.shl (i64.const 1) (i64.const 40)) (local.get 0))
-  )
-
-  (func (export "bset32_1") (param i32 i32) (result i32)
-    (i32.or (local.get 0) (i32.shl (i32.const 1) (local.get 1)))
-  )
-  (func (export "bset32_2") (param i32 i32) (result i32)
-    (i32.or (i32.shl (i32.const 1) (local.get 1)) (local.get 0))
-  )
-  (func (export "bset64_1") (param i64 i64) (result i64)
-    (i64.or (local.get 0) (i64.shl (i64.const 1) (local.get 1)))
-  )
-  (func (export "bset64_2") (param i64 i64) (result i64)
-    (i64.or (i64.shl (i64.const 1) (local.get 1)) (local.get 0))
-  )
-  (func (export "bseti32_1") (param i32) (result i32)
-    (i32.or (local.get 0) (i32.shl (i32.const 1) (i32.const 10)))
-  )
-  (func (export "bseti32_2") (param i32) (result i32)
-    (i32.or (i32.shl (i32.const 1) (i32.const 20)) (local.get 0))
-  )
-  (func (export "bseti64_1") (param i64) (result i64)
-    (i64.or (local.get 0) (i64.shl (i64.const 1) (i64.const 30)))
-  )
-  (func (export "bseti64_2") (param i64) (result i64)
-    (i64.or (i64.shl (i64.const 1) (i64.const 40)) (local.get 0))
-  )
-)
-;; function u0:0:
-;; block0:
-;;   j label1
-;; block1:
-;;   andi a5,a1,31
-;;   bclr a0,a0,a5
-;;   ret
-;;
-;; function u0:1:
-;; block0:
-;;   j label1
-;; block1:
-;;   bclr a0,a0,a1
-;;   ret
-;;
-;; function u0:2:
-;; block0:
-;;   j label1
-;; block1:
-;;   bclri a0,a0,4
-;;   ret
-;;
-;; function u0:3:
-;; block0:
-;;   j label1
-;; block1:
-;;   bclri a0,a0,20
-;;   ret
-;;
-;; function u0:4:
-;; block0:
-;;   j label1
-;; block1:
-;;   bclri a0,a0,4
-;;   ret
-;;
-;; function u0:5:
-;; block0:
-;;   j label1
-;; block1:
-;;   bclri a0,a0,52
-;;   ret
-;;
-;; function u0:6:
-;; block0:
-;;   j label1
-;; block1:
-;;   andi a5,a1,31
-;;   bext a0,a0,a5
-;;   ret
-;;
-;; function u0:7:
-;; block0:
-;;   j label1
-;; block1:
-;;   andi a5,a1,31
-;;   bext a0,a0,a5
-;;   ret
-;;
-;; function u0:8:
-;; block0:
-;;   j label1
-;; block1:
-;;   andi a5,a1,31
-;;   bext a0,a0,a5
-;;   ret
-;;
-;; function u0:9:
-;; block0:
-;;   j label1
-;; block1:
-;;   andi a5,a1,31
-;;   bext a0,a0,a5
-;;   ret
-;;
-;; function u0:10:
-;; block0:
-;;   j label1
-;; block1:
-;;   bext a0,a0,a1
-;;   ret
-;;
-;; function u0:11:
-;; block0:
-;;   j label1
-;; block1:
-;;   bext a0,a0,a1
-;;   ret
-;;
-;; function u0:12:
-;; block0:
-;;   j label1
-;; block1:
-;;   bext a0,a0,a1
-;;   ret
-;;
-;; function u0:13:
-;; block0:
-;;   j label1
-;; block1:
-;;   bext a0,a0,a1
-;;   ret
-;;
-;; function u0:14:
-;; block0:
-;;   j label1
-;; block1:
-;;   bexti a0,a0,10
-;;   ret
-;;
-;; function u0:15:
-;; block0:
-;;   j label1
-;; block1:
-;;   bexti a0,a0,20
-;;   ret
-;;
-;; function u0:16:
-;; block0:
-;;   j label1
-;; block1:
-;;   bexti a0,a0,30
-;;   ret
-;;
-;; function u0:17:
-;; block0:
-;;   j label1
-;; block1:
-;;   bexti a0,a0,8
-;;   ret
-;;
-;; function u0:18:
-;; block0:
-;;   j label1
-;; block1:
-;;   bexti a0,a0,10
-;;   ret
-;;
-;; function u0:19:
-;; block0:
-;;   j label1
-;; block1:
-;;   bexti a0,a0,20
-;;   ret
-;;
-;; function u0:20:
-;; block0:
-;;   j label1
-;; block1:
-;;   bexti a0,a0,30
-;;   ret
-;;
-;; function u0:21:
-;; block0:
-;;   j label1
-;; block1:
-;;   bexti a0,a0,40
-;;   ret
-;;
-;; function u0:22:
-;; block0:
-;;   j label1
-;; block1:
-;;   andi a5,a1,31
-;;   binv a0,a0,a5
-;;   ret
-;;
-;; function u0:23:
-;; block0:
-;;   j label1
-;; block1:
-;;   andi a5,a1,31
-;;   binv a0,a0,a5
-;;   ret
-;;
-;; function u0:24:
-;; block0:
-;;   j label1
-;; block1:
-;;   binv a0,a0,a1
-;;   ret
-;;
-;; function u0:25:
-;; block0:
-;;   j label1
-;; block1:
-;;   binv a0,a0,a1
-;;   ret
-;;
-;; function u0:26:
-;; block0:
-;;   j label1
-;; block1:
-;;   binvi a0,a0,10
-;;   ret
-;;
-;; function u0:27:
-;; block0:
-;;   j label1
-;; block1:
-;;   binvi a0,a0,20
-;;   ret
-;;
-;; function u0:28:
-;; block0:
-;;   j label1
-;; block1:
-;;   binvi a0,a0,30
-;;   ret
-;;
-;; function u0:29:
-;; block0:
-;;   j label1
-;; block1:
-;;   binvi a0,a0,40
-;;   ret
-;;
-;; function u0:30:
-;; block0:
-;;   j label1
-;; block1:
-;;   andi a5,a1,31
-;;   bset a0,a0,a5
-;;   ret
-;;
-;; function u0:31:
-;; block0:
-;;   j label1
-;; block1:
-;;   andi a5,a1,31
-;;   bset a0,a0,a5
-;;   ret
-;;
-;; function u0:32:
-;; block0:
-;;   j label1
-;; block1:
-;;   bset a0,a0,a1
-;;   ret
-;;
-;; function u0:33:
-;; block0:
-;;   j label1
-;; block1:
-;;   bset a0,a0,a1
-;;   ret
-;;
-;; function u0:34:
-;; block0:
-;;   j label1
-;; block1:
-;;   bseti a0,a0,10
-;;   ret
-;;
-;; function u0:35:
-;; block0:
-;;   j label1
-;; block1:
-;;   bseti a0,a0,20
-;;   ret
-;;
-;; function u0:36:
-;; block0:
-;;   j label1
-;; block1:
-;;   bseti a0,a0,30
-;;   ret
-;;
-;; function u0:37:
-;; block0:
-;;   j label1
-;; block1:
-;;   bseti a0,a0,40
-;;   ret
diff --git a/cranelift/filetests/filetests/isa/riscv64/zca.clif b/cranelift/filetests/filetests/isa/riscv64/zca.clif
index 6d6620d52caa..84ee5c541fb3 100644
--- a/cranelift/filetests/filetests/isa/riscv64/zca.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/zca.clif
@@ -157,7 +157,7 @@ block0(v0: i8, v1: i8, v2: i8):
 ; VCode:
 ; block0:
 ;   andi a4,a0,255
-;   select a0,a1,a2##condition=(a4 ne zero)
+;   select_i8 a0,a1,a2##condition=a4
 ;   ret
 ;
 ; Disassembled:
@@ -178,7 +178,7 @@ block0(v0: i8):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -189,10 +189,10 @@ block0(v0: i8):
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   c.addi16sp sp, -0x10
-;   c.sdsp ra, 8(sp)
-;   c.sdsp s0, 0(sp)
+;   sd ra, 8(sp)
+;   sd s0, 0(sp)
 ;   c.mv s0, sp
-; block1: ; offset 0x8
+; block1: ; offset 0xc
 ;   auipc a2, 0
 ;   ld a2, 0xa(a2)
 ;   c.j 0xa
@@ -228,7 +228,7 @@ block0(v0: i64, v1: i64):
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
@@ -236,19 +236,19 @@ block0(v0: i64, v1: i64):
 ;   callind a1
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   c.addi16sp sp, -0x10
-;   c.sdsp ra, 8(sp)
-;   c.sdsp s0, 0(sp)
+;   sd ra, 8(sp)
+;   sd s0, 0(sp)
 ;   c.mv s0, sp
-; block1: ; offset 0x8
+; block1: ; offset 0xc
 ;   c.jalr a1
-;   c.ldsp ra, 8(sp)
-;   c.ldsp s0, 0(sp)
+;   ld ra, 8(sp)
+;   ld s0, 0(sp)
 ;   c.addi16sp sp, 0x10
 ;   c.jr ra
 
@@ -356,31 +356,31 @@ block0:
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   addi sp,sp,-16
+;   add sp,-16
 ; block0:
 ;   load_addr a0,0(nominal_sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   c.addi16sp sp, -0x10
-;   c.sdsp ra, 8(sp)
-;   c.sdsp s0, 0(sp)
+;   sd ra, 8(sp)
+;   sd s0, 0(sp)
 ;   c.mv s0, sp
 ;   c.addi16sp sp, -0x10
-; block1: ; offset 0xa
+; block1: ; offset 0xe
 ;   c.mv a0, sp
 ;   c.addi16sp sp, 0x10
-;   c.ldsp ra, 8(sp)
-;   c.ldsp s0, 0(sp)
+;   ld ra, 8(sp)
+;   ld s0, 0(sp)
 ;   c.addi16sp sp, 0x10
 ;   c.jr ra
 
@@ -400,509 +400,41 @@ block0(v0: i64):
 ;   c.slli a0, 0x3f
 ;   c.jr ra
 
-function %c_srai(i64) -> i64 {
-block0(v0: i64):
-  v1 = sshr_imm.i64 v0, 63
-  return v1
-}
-
-; VCode:
-; block0:
-;   srai a0,a0,63
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.srai a0, 0x3f
-;   c.jr ra
-
-function %c_srli(i64) -> i64 {
-block0(v0: i64):
-  v1 = ushr_imm.i64 v0, 20
-  return v1
-}
-
-; VCode:
-; block0:
-;   srli a0,a0,20
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.srli a0, 0x14
-;   c.jr ra
-
-function %c_addi4spn() -> i64, i64, i64, i64, i64 {
-  ss0 = explicit_slot 2048
-
-block0:
-  v0 = stack_addr.i64 ss0+1020
-  v1 = stack_addr.i64 ss0+4
-  v2 = stack_addr.i64 ss0+512
-  v4 = stack_addr.i64 ss0+256
-  v5 = stack_addr.i64 ss0+64
-  return v0, v1, v2, v4, v5
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   addi sp,sp,-2048
-; block0:
-;   load_addr a1,1020(nominal_sp)
-;   mv a5,a1
-;   load_addr a1,4(nominal_sp)
-;   load_addr a2,512(nominal_sp)
-;   load_addr a3,256(nominal_sp)
-;   load_addr a4,64(nominal_sp)
-;   sd a2,0(a0)
-;   sd a3,8(a0)
-;   sd a4,16(a0)
-;   mv a0,a5
-;   lui t6,1
-;   addi t6,t6,-2048
-;   add sp,t6,sp
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.addi16sp sp, -0x10
-;   c.sdsp ra, 8(sp)
-;   c.sdsp s0, 0(sp)
-;   c.mv s0, sp
-;   addi sp, sp, -0x800
-; block1: ; offset 0xc
-;   c.addi4spn a1, sp, 0x3fc
-;   c.mv a5, a1
-;   c.addi4spn a1, sp, 4
-;   c.addi4spn a2, sp, 0x200
-;   c.addi4spn a3, sp, 0x100
-;   c.addi4spn a4, sp, 0x40
-;   c.sd a2, 0(a0)
-;   c.sd a3, 8(a0)
-;   c.sd a4, 0x10(a0)
-;   c.mv a0, a5
-;   c.lui t6, 1
-;   addi t6, t6, -0x800
-;   add sp, t6, sp
-;   c.ldsp ra, 8(sp)
-;   c.ldsp s0, 0(sp)
-;   c.addi16sp sp, 0x10
-;   c.jr ra
 
-function %out_of_bounds_c_addi4spn() -> i64, i64 {
-  ss0 = explicit_slot 2048
+function %c_addi4spn() -> i64 {
+  ss0 = explicit_slot 64
 
 block0:
-  v0 = stack_addr.i64 ss0+1024
-  v1 = stack_addr.i64 ss0+0
-  return v0, v1
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   addi sp,sp,-2048
-; block0:
-;   load_addr a0,1024(nominal_sp)
-;   load_addr a1,0(nominal_sp)
-;   lui t6,1
-;   addi t6,t6,-2048
-;   add sp,t6,sp
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.addi16sp sp, -0x10
-;   c.sdsp ra, 8(sp)
-;   c.sdsp s0, 0(sp)
-;   c.mv s0, sp
-;   addi sp, sp, -0x800
-; block1: ; offset 0xc
-;   addi a0, sp, 0x400
-;   c.mv a1, sp
-;   c.lui t6, 1
-;   addi t6, t6, -0x800
-;   add sp, t6, sp
-;   c.ldsp ra, 8(sp)
-;   c.ldsp s0, 0(sp)
-;   c.addi16sp sp, 0x10
-;   c.jr ra
-
-function %c_addi4spn_512() -> i64 {
-  ss0 = explicit_slot 1024
-
-block0:
-  v0 = stack_addr.i64 ss0+512
+  v0 = stack_addr.i64 ss0+24
   return v0
 }
 
 ; VCode:
-;   addi sp,sp,-16
+;   add sp,-16
 ;   sd ra,8(sp)
 ;   sd fp,0(sp)
 ;   mv fp,sp
-;   addi sp,sp,-1024
+;   add sp,-64
 ; block0:
-;   load_addr a0,512(nominal_sp)
-;   addi sp,sp,1024
+;   load_addr a0,24(nominal_sp)
+;   add sp,+64
 ;   ld ra,8(sp)
 ;   ld fp,0(sp)
-;   addi sp,sp,16
+;   add sp,+16
 ;   ret
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   c.addi16sp sp, -0x10
-;   c.sdsp ra, 8(sp)
-;   c.sdsp s0, 0(sp)
+;   sd ra, 8(sp)
+;   sd s0, 0(sp)
 ;   c.mv s0, sp
-;   addi sp, sp, -0x400
-; block1: ; offset 0xc
-;   c.addi4spn a0, sp, 0x200
-;   addi sp, sp, 0x400
-;   c.ldsp ra, 8(sp)
-;   c.ldsp s0, 0(sp)
+;   c.addi16sp sp, -0x40
+; block1: ; offset 0xe
+;   c.addi4spn a0, sp, 0x18
+;   c.addi16sp sp, 0x40
+;   ld ra, 8(sp)
+;   ld s0, 0(sp)
 ;   c.addi16sp sp, 0x10
 ;   c.jr ra
 
-function %c_li() -> i64, i64, i64, i64, i64 {
-block0:
-  v0 = iconst.i64 0
-  v1 = iconst.i64 1
-  v2 = iconst.i64 -1
-  v3 = iconst.i64 -32
-  v4 = iconst.i64 31
-  return v0, v1, v2, v3, v4
-}
-
-; VCode:
-; block0:
-;   li a1,0
-;   mv a5,a1
-;   li a1,1
-;   li a2,-1
-;   li a3,-32
-;   li a4,31
-;   sd a2,0(a0)
-;   sd a3,8(a0)
-;   sd a4,16(a0)
-;   mv a0,a5
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.li a1, 0
-;   c.mv a5, a1
-;   c.li a1, 1
-;   c.li a2, -1
-;   c.li a3, -0x20
-;   c.li a4, 0x1f
-;   c.sd a2, 0(a0)
-;   c.sd a3, 8(a0)
-;   c.sd a4, 0x10(a0)
-;   c.mv a0, a5
-;   c.jr ra
-
-function %c_lui() -> i64, i64, i64 {
-block0:
-  v0 = iconst.i64 0x4000
-  v1 = iconst.i64 0xffffffff_fffff000
-  v2 = iconst.i64 0xffffffff_fffe0000
-  return v0, v1, v2
-}
-
-; VCode:
-; block0:
-;   mv a2,a0
-;   lui a0,4
-;   lui a1,-1
-;   lui a4,-32
-;   sd a4,0(a2)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.mv a2, a0
-;   c.lui a0, 4
-;   c.lui a1, 0xfffff
-;   c.lui a4, 0xfffe0
-;   c.sd a4, 0(a2)
-;   c.jr ra
-
-function %c_andi_f(i64) -> i64 {
-block0(v0: i64):
-  v1 = band_imm.i64 v0, 0xf
-  return v1
-}
-
-; VCode:
-; block0:
-;   andi a0,a0,15
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.andi a0, 0xf
-;   c.jr ra
-
-function %c_andi_neg_16(i64) -> i64 {
-block0(v0: i64):
-  v1 = band_imm.i64 v0, -16
-  return v1
-}
-
-; VCode:
-; block0:
-;   andi a0,a0,-16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.andi a0, -0x10
-;   c.jr ra
-
-function %c_andi_zero(i64) -> i64 {
-block0(v0: i64):
-  v1 = band_imm.i64 v0, 0
-  return v1
-}
-
-; VCode:
-; block0:
-;   andi a0,a0,0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.andi a0, 0
-;   c.jr ra
-
-function %c_lwsp() -> i32 {
-  ss0 = explicit_slot 16
-
-block0:
-  v0 = stack_load.i32 ss0+12
-  return v0
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   addi sp,sp,-16
-; block0:
-;   lw a0,12(nominal_sp)
-;   addi sp,sp,16
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.addi16sp sp, -0x10
-;   c.sdsp ra, 8(sp)
-;   c.sdsp s0, 0(sp)
-;   c.mv s0, sp
-;   c.addi16sp sp, -0x10
-; block1: ; offset 0xa
-;   c.lwsp a0, 0xc(sp)
-;   c.addi16sp sp, 0x10
-;   c.ldsp ra, 8(sp)
-;   c.ldsp s0, 0(sp)
-;   c.addi16sp sp, 0x10
-;   c.jr ra
-
-function %c_ldsp() -> i64 {
-  ss0 = explicit_slot 128
-
-block0:
-  v0 = stack_load.i64 ss0+64
-  return v0
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   addi sp,sp,-128
-; block0:
-;   ld a0,64(nominal_sp)
-;   addi sp,sp,128
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.addi16sp sp, -0x10
-;   c.sdsp ra, 8(sp)
-;   c.sdsp s0, 0(sp)
-;   c.mv s0, sp
-;   c.addi16sp sp, -0x80
-; block1: ; offset 0xa
-;   c.ldsp a0, 0x40(sp)
-;   c.addi16sp sp, 0x80
-;   c.ldsp ra, 8(sp)
-;   c.ldsp s0, 0(sp)
-;   c.addi16sp sp, 0x10
-;   c.jr ra
-
-function %c_swsp(i32) {
-  ss0 = explicit_slot 16
-
-block0(v0: i32):
-  stack_store.i32 v0, ss0+12
-  return
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   addi sp,sp,-16
-; block0:
-;   sw a0,12(nominal_sp)
-;   addi sp,sp,16
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.addi16sp sp, -0x10
-;   c.sdsp ra, 8(sp)
-;   c.sdsp s0, 0(sp)
-;   c.mv s0, sp
-;   c.addi16sp sp, -0x10
-; block1: ; offset 0xa
-;   c.swsp a0, 0xc(sp)
-;   c.addi16sp sp, 0x10
-;   c.ldsp ra, 8(sp)
-;   c.ldsp s0, 0(sp)
-;   c.addi16sp sp, 0x10
-;   c.jr ra
-
-function %c_sdsp(i64) {
-  ss0 = explicit_slot 128
-
-block0(v0: i64):
-  stack_store.i64 v0, ss0+64
-  return
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   addi sp,sp,-128
-; block0:
-;   sd a0,64(nominal_sp)
-;   addi sp,sp,128
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.addi16sp sp, -0x10
-;   c.sdsp ra, 8(sp)
-;   c.sdsp s0, 0(sp)
-;   c.mv s0, sp
-;   c.addi16sp sp, -0x80
-; block1: ; offset 0xa
-;   c.sdsp a0, 0x40(sp)
-;   c.addi16sp sp, 0x80
-;   c.ldsp ra, 8(sp)
-;   c.ldsp s0, 0(sp)
-;   c.addi16sp sp, 0x10
-;   c.jr ra
-
-function %c_sw(i64, i32) {
-block0(v0: i64, v1: i32):
-  store.i32 v1, v0+12
-  store.i32 v1, v0-12
-  return
-}
-
-; VCode:
-; block0:
-;   sw a1,12(a0)
-;   sw a1,-12(a0)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.sw a1, 0xc(a0)
-;   sw a1, -0xc(a0)
-;   c.jr ra
-
-function %c_sd(i64, i64) {
-block0(v0: i64, v1: i64):
-  store.i32 v1, v0+16
-  store.i32 v1, v0-16
-  return
-}
-
-; VCode:
-; block0:
-;   sd a1,16(a0)
-;   sd a1,-16(a0)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.sd a1, 0x10(a0)
-;   sd a1, -0x10(a0)
-;   c.jr ra
-
-function %c_lw(i64) -> i32 {
-block0(v0: i64):
-  v1 = load.i32 v0+64
-  return v1
-}
-
-; VCode:
-; block0:
-;   lw a0,64(a0)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.lw a0, 0x40(a0)
-;   c.jr ra
-
-function %c_ld(i64) -> i64 {
-block0(v0: i64):
-  v1 = load.i64 v0+64
-  return v1
-}
-
-; VCode:
-; block0:
-;   ld a0,64(a0)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.ld a0, 0x40(a0)
-;   c.jr ra
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/zcb.clif b/cranelift/filetests/filetests/isa/riscv64/zcb.clif
deleted file mode 100644
index 76c68310c209..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/zcb.clif
+++ /dev/null
@@ -1,239 +0,0 @@
-test compile precise-output
-set unwind_info=false
-target riscv64 has_zca has_zcb has_zbb has_zba
-
-function %c_mul(i64, i64) -> i64 {
-block0(v0: i64, v1: i64):
-  v2 = imul.i64 v0, v1
-  return v2
-}
-
-; VCode:
-; block0:
-;   mul a0,a0,a1
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x4d, 0x9d
-;   c.jr ra
-
-
-
-function %c_not(i64) -> i64 {
-block0(v0: i64):
-  v1 = bnot.i64 v0
-  return v1
-}
-
-; VCode:
-; block0:
-;   not a0,a0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x75, 0x9d
-;   c.jr ra
-
-function %c_zextb(i8) -> i64 {
-block0(v0: i8):
-    v1 = uextend.i64 v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   andi a0,a0,255
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x61, 0x9d
-;   c.jr ra
-
-function %c_zexth(i16) -> i64 {
-block0(v0: i16):
-    v1 = uextend.i64 v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   zext.h a0,a0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x69, 0x9d
-;   c.jr ra
-
-function %c_zextw(i32) -> i64 {
-block0(v0: i32):
-    v1 = uextend.i64 v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   zext.w a0,a0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x71, 0x9d
-;   c.jr ra
-
-function %c_sextb(i8) -> i64 {
-block0(v0: i8):
-    v1 = sextend.i64 v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   sext.b a0,a0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x65, 0x9d
-;   c.jr ra
-
-function %c_sexth(i16) -> i64 {
-block0(v0: i16):
-    v1 = sextend.i64 v0
-    return v1
-}
-
-; VCode:
-; block0:
-;   sext.h a0,a0
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x6d, 0x9d
-;   c.jr ra
-
-
-function %c_lbu(i64) -> i16, i64 {
-block0(v0: i64):
-  v1 = uload8.i16 v0+0
-  v2 = uload8.i64 v0+3
-  return v1, v2
-}
-
-; VCode:
-; block0:
-;   lbu a3,0(a0)
-;   mv a4,a3
-;   lbu a1,3(a0)
-;   mv a0,a4
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x14, 0x81
-;   c.mv a4, a3
-;   .byte 0x6c, 0x81
-;   c.mv a0, a4
-;   c.jr ra
-
-function %c_lhu(i64) -> i32, i64 {
-block0(v0: i64):
-  v1 = uload16.i32 v0+0
-  v2 = uload16.i64 v0+2
-  return v1, v2
-}
-
-; VCode:
-; block0:
-;   lhu a3,0(a0)
-;   mv a4,a3
-;   lhu a1,2(a0)
-;   mv a0,a4
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x14, 0x85
-;   c.mv a4, a3
-;   .byte 0x2c, 0x85
-;   c.mv a0, a4
-;   c.jr ra
-
-function %c_lh(i64) -> i16, i16 {
-block0(v0: i64):
-  v1 = load.i16 v0+0
-  v2 = load.i16 v0+2
-  return v1, v2
-}
-
-; VCode:
-; block0:
-;   lh a3,0(a0)
-;   mv a4,a3
-;   lh a1,2(a0)
-;   mv a0,a4
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x54, 0x85
-;   c.mv a4, a3
-;   .byte 0x6c, 0x85
-;   c.mv a0, a4
-;   c.jr ra
-
-
-function %c_sb(i64, i8) {
-block0(v0: i64, v1: i8):
-  store.i8 v1, v0+0
-  store.i8 v1, v0+1
-  store.i8 v1, v0+2
-  store.i8 v1, v0+3
-  store.i8 v1, v0+4
-  return
-}
-
-; VCode:
-; block0:
-;   sb a1,0(a0)
-;   sb a1,1(a0)
-;   sb a1,2(a0)
-;   sb a1,3(a0)
-;   sb a1,4(a0)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x0c, 0x89
-;   .byte 0x4c, 0x89
-;   .byte 0x2c, 0x89
-;   .byte 0x6c, 0x89
-;   sb a1, 4(a0)
-;   c.jr ra
-
-function %c_sh(i64, i16) {
-block0(v0: i64, v1: i16):
-  store.i16 v1, v0+0
-  store.i16 v1, v0+2
-  store.i16 v1, v0+3
-  return
-}
-
-; VCode:
-; block0:
-;   sh a1,0(a0)
-;   sh a1,2(a0)
-;   sh a1,3(a0)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   .byte 0x0c, 0x8d
-;   .byte 0x2c, 0x8d
-;   sh a1, 3(a0)
-;   c.jr ra
-
diff --git a/cranelift/filetests/filetests/isa/riscv64/zcd.clif b/cranelift/filetests/filetests/isa/riscv64/zcd.clif
deleted file mode 100644
index 5e80aa47ab84..000000000000
--- a/cranelift/filetests/filetests/isa/riscv64/zcd.clif
+++ /dev/null
@@ -1,113 +0,0 @@
-test compile precise-output
-set unwind_info=false
-target riscv64 has_zca has_zcd
-
-function %c_fldsp() -> f64 {
-  ss0 = explicit_slot 16
-
-block0:
-  v0 = stack_load.f64 ss0+8
-  return v0
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   addi sp,sp,-16
-; block0:
-;   fld fa0,8(nominal_sp)
-;   addi sp,sp,16
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.addi16sp sp, -0x10
-;   c.sdsp ra, 8(sp)
-;   c.sdsp s0, 0(sp)
-;   c.mv s0, sp
-;   c.addi16sp sp, -0x10
-; block1: ; offset 0xa
-;   c.fldsp fa0, 8(sp)
-;   c.addi16sp sp, 0x10
-;   c.ldsp ra, 8(sp)
-;   c.ldsp s0, 0(sp)
-;   c.addi16sp sp, 0x10
-;   c.jr ra
-
-function %c_fsdsp(f64) {
-  ss0 = explicit_slot 128
-
-block0(v0: f64):
-  stack_store.f64 v0, ss0+64
-  return
-}
-
-; VCode:
-;   addi sp,sp,-16
-;   sd ra,8(sp)
-;   sd fp,0(sp)
-;   mv fp,sp
-;   addi sp,sp,-128
-; block0:
-;   fsd fa0,64(nominal_sp)
-;   addi sp,sp,128
-;   ld ra,8(sp)
-;   ld fp,0(sp)
-;   addi sp,sp,16
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.addi16sp sp, -0x10
-;   c.sdsp ra, 8(sp)
-;   c.sdsp s0, 0(sp)
-;   c.mv s0, sp
-;   c.addi16sp sp, -0x80
-; block1: ; offset 0xa
-;   c.fsdsp fa0, 0x40(sp)
-;   c.addi16sp sp, 0x80
-;   c.ldsp ra, 8(sp)
-;   c.ldsp s0, 0(sp)
-;   c.addi16sp sp, 0x10
-;   c.jr ra
-
-function %c_fsd(i64, f64) {
-block0(v0: i64, v1: f64):
-  store.i32 v1, v0+16
-  store.i32 v1, v0-16
-  return
-}
-
-; VCode:
-; block0:
-;   fsd fa0,16(a0)
-;   fsd fa0,-16(a0)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.fsd fa0, 0x10(a0)
-;   fsd fa0, -0x10(a0)
-;   c.jr ra
-
-function %c_fld(i64) -> f64 {
-block0(v0: i64):
-  v1 = load.f64 v0+64
-  return v1
-}
-
-; VCode:
-; block0:
-;   fld fa0,64(a0)
-;   ret
-;
-; Disassembled:
-; block0: ; offset 0x0
-;   c.fld fa0, 0x40(a0)
-;   c.jr ra
-
diff --git a/cranelift/filetests/filetests/isa/s390x/atomic_rmw-arch13.clif b/cranelift/filetests/filetests/isa/s390x/atomic_rmw-arch13.clif
index 7864a67bb2bf..3aa194f547e4 100644
--- a/cranelift/filetests/filetests/isa/s390x/atomic_rmw-arch13.clif
+++ b/cranelift/filetests/filetests/isa/s390x/atomic_rmw-arch13.clif
@@ -57,23 +57,25 @@ block0(v0: i64, v1: i64, v2: i16):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; rnsbg %r1, %r4, 32, 48, 16 ; xilf %r1, 4294901760 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; rnsbg %r1, %r4, 32, 48, 16 ; xilf %r1, 4294901760 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 16(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
 ;   rnsbg %r1, %r4, 0x20, 0x30, 0x10
 ;   xilf %r1, 0xffff0000
 ;   rll %r1, %r1, 0(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0xe
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x12
 ;   rll %r2, %r0, 0x10(%r2)
 ;   br %r14
 
@@ -86,25 +88,27 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; rnsbg %r1, %r4, 32, 40, 24 ; xilf %r1, 4278190080 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; rnsbg %r1, %r4, 32, 40, 24 ; xilf %r1, 4278190080 ; rll %r1, %r1, 0(%r3) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
 ;   rnsbg %r1, %r4, 0x20, 0x28, 0x18
 ;   xilf %r1, 0xff000000
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x10
+;   rll %r1, %r1, 0(%r3)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x14
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -166,27 +170,31 @@ block0(v0: i64, v1: i64, v2: i16):
 
 ; VCode:
 ; block0:
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   lrvr %r4, %r4
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 16(%r2) ; rnsbg %r1, %r4, 48, 64, 48 ; xilf %r1, 65535 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r4, %r3
+;   nill %r4, 65532
+;   lrvr %r3, %r5
+;   l %r0, 0(%r4)
+;   0: rll %r1, %r0, 16(%r2) ; rnsbg %r1, %r3, 48, 64, 48 ; xilf %r1, 65535 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r4) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   lrvr %r4, %r4
-;   l %r0, 0(%r3)
+;   lgr %r4, %r3
+;   nill %r4, 0xfffc
+;   lrvr %r3, %r5
+;   l %r0, 0(%r4)
 ;   rll %r1, %r0, 0x10(%r2)
-;   rnsbg %r1, %r4, 0x30, 0x40, 0x30
+;   rnsbg %r1, %r3, 0x30, 0x40, 0x30
 ;   xilf %r1, 0xffff
 ;   rll %r1, %r1, 0x10(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x12
+;   cs %r0, %r1, 0(%r4)
+;   jglh 0x1a
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
@@ -200,25 +208,27 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; rnsbg %r1, %r4, 32, 40, 24 ; xilf %r1, 4278190080 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; rnsbg %r1, %r4, 32, 40, 24 ; xilf %r1, 4278190080 ; rll %r1, %r1, 0(%r3) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
 ;   rnsbg %r1, %r4, 0x20, 0x28, 0x18
 ;   xilf %r1, 0xff000000
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x10
+;   rll %r1, %r1, 0(%r3)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x14
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
diff --git a/cranelift/filetests/filetests/isa/s390x/atomic_rmw-little.clif b/cranelift/filetests/filetests/isa/s390x/atomic_rmw-little.clif
index d8bbbecddf3b..b113d1c94c9e 100644
--- a/cranelift/filetests/filetests/isa/s390x/atomic_rmw-little.clif
+++ b/cranelift/filetests/filetests/isa/s390x/atomic_rmw-little.clif
@@ -59,26 +59,30 @@ block0(v0: i64, v1: i64, v2: i16):
 
 ; VCode:
 ; block0:
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   lrvr %r4, %r4
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 16(%r2) ; risbgn %r1, %r4, 48, 64, 48 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r4, %r3
+;   nill %r4, 65532
+;   lrvr %r3, %r5
+;   l %r0, 0(%r4)
+;   0: rll %r1, %r0, 16(%r2) ; risbgn %r1, %r3, 48, 64, 48 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r4) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   lrvr %r4, %r4
-;   l %r0, 0(%r3)
+;   lgr %r4, %r3
+;   nill %r4, 0xfffc
+;   lrvr %r3, %r5
+;   l %r0, 0(%r4)
 ;   rll %r1, %r0, 0x10(%r2)
-;   risbgn %r1, %r4, 0x30, 0x40, 0x30
+;   risbgn %r1, %r3, 0x30, 0x40, 0x30
 ;   rll %r1, %r1, 0x10(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x12
+;   cs %r0, %r1, 0(%r4)
+;   jglh 0x1a
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
@@ -92,24 +96,26 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; risbgn %r1, %r4, 32, 40, 24 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; risbgn %r1, %r4, 32, 40, 24 ; rll %r1, %r1, 0(%r3) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
 ;   risbgn %r1, %r4, 0x20, 0x28, 0x18
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x10
+;   rll %r1, %r1, 0(%r3)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x14
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -169,28 +175,32 @@ block0(v0: i64, v1: i64, v2: i16):
 
 ; VCode:
 ; block0:
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 16
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 16(%r2) ; lrvr %r1, %r1 ; ar %r1, %r4 ; lrvr %r1, %r1 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r4, %r3
+;   nill %r4, 65532
+;   sllk %r3, %r5, 16
+;   l %r0, 0(%r4)
+;   0: rll %r1, %r0, 16(%r2) ; lrvr %r1, %r1 ; ar %r1, %r3 ; lrvr %r1, %r1 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r4) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x10
-;   l %r0, 0(%r3)
+;   lgr %r4, %r3
+;   nill %r4, 0xfffc
+;   sllk %r3, %r5, 0x10
+;   l %r0, 0(%r4)
 ;   rll %r1, %r0, 0x10(%r2)
 ;   lrvr %r1, %r1
-;   ar %r1, %r4
+;   ar %r1, %r3
 ;   lrvr %r1, %r1
 ;   rll %r1, %r1, 0x10(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x14
+;   cs %r0, %r1, 0(%r4)
+;   jglh 0x1c
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
@@ -204,26 +214,28 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 24
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; ar %r1, %r4 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   sllk %r3, %r4, 24
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; ar %r1, %r3 ; rll %r1, %r1, 0(%r4) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x18
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   sllk %r3, %r4, 0x18
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
-;   ar %r1, %r4
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x16
+;   ar %r1, %r3
+;   rll %r1, %r1, 0(%r4)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x1a
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -283,28 +295,32 @@ block0(v0: i64, v1: i64, v2: i16):
 
 ; VCode:
 ; block0:
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 16
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 16(%r2) ; lrvr %r1, %r1 ; sr %r1, %r4 ; lrvr %r1, %r1 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r4, %r3
+;   nill %r4, 65532
+;   sllk %r3, %r5, 16
+;   l %r0, 0(%r4)
+;   0: rll %r1, %r0, 16(%r2) ; lrvr %r1, %r1 ; sr %r1, %r3 ; lrvr %r1, %r1 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r4) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x10
-;   l %r0, 0(%r3)
+;   lgr %r4, %r3
+;   nill %r4, 0xfffc
+;   sllk %r3, %r5, 0x10
+;   l %r0, 0(%r4)
 ;   rll %r1, %r0, 0x10(%r2)
 ;   lrvr %r1, %r1
-;   sr %r1, %r4
+;   sr %r1, %r3
 ;   lrvr %r1, %r1
 ;   rll %r1, %r1, 0x10(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x14
+;   cs %r0, %r1, 0(%r4)
+;   jglh 0x1c
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
@@ -318,26 +334,28 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 24
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; sr %r1, %r4 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   sllk %r3, %r4, 24
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; sr %r1, %r3 ; rll %r1, %r1, 0(%r4) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x18
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   sllk %r3, %r4, 0x18
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
-;   sr %r1, %r4
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x16
+;   sr %r1, %r3
+;   rll %r1, %r1, 0(%r4)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x1a
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -389,26 +407,30 @@ block0(v0: i64, v1: i64, v2: i16):
 
 ; VCode:
 ; block0:
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   lrvr %r4, %r4
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 16(%r2) ; rnsbg %r1, %r4, 48, 64, 48 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r4, %r3
+;   nill %r4, 65532
+;   lrvr %r3, %r5
+;   l %r0, 0(%r4)
+;   0: rll %r1, %r0, 16(%r2) ; rnsbg %r1, %r3, 48, 64, 48 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r4) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   lrvr %r4, %r4
-;   l %r0, 0(%r3)
+;   lgr %r4, %r3
+;   nill %r4, 0xfffc
+;   lrvr %r3, %r5
+;   l %r0, 0(%r4)
 ;   rll %r1, %r0, 0x10(%r2)
-;   rnsbg %r1, %r4, 0x30, 0x40, 0x30
+;   rnsbg %r1, %r3, 0x30, 0x40, 0x30
 ;   rll %r1, %r1, 0x10(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x12
+;   cs %r0, %r1, 0(%r4)
+;   jglh 0x1a
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
@@ -422,24 +444,26 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; rnsbg %r1, %r4, 32, 40, 24 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; rnsbg %r1, %r4, 32, 40, 24 ; rll %r1, %r1, 0(%r3) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
 ;   rnsbg %r1, %r4, 0x20, 0x28, 0x18
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x10
+;   rll %r1, %r1, 0(%r3)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x14
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -491,26 +515,30 @@ block0(v0: i64, v1: i64, v2: i16):
 
 ; VCode:
 ; block0:
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   lrvr %r4, %r4
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 16(%r2) ; rosbg %r1, %r4, 48, 64, 48 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r4, %r3
+;   nill %r4, 65532
+;   lrvr %r3, %r5
+;   l %r0, 0(%r4)
+;   0: rll %r1, %r0, 16(%r2) ; rosbg %r1, %r3, 48, 64, 48 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r4) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   lrvr %r4, %r4
-;   l %r0, 0(%r3)
+;   lgr %r4, %r3
+;   nill %r4, 0xfffc
+;   lrvr %r3, %r5
+;   l %r0, 0(%r4)
 ;   rll %r1, %r0, 0x10(%r2)
-;   rosbg %r1, %r4, 0x30, 0x40, 0x30
+;   rosbg %r1, %r3, 0x30, 0x40, 0x30
 ;   rll %r1, %r1, 0x10(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x12
+;   cs %r0, %r1, 0(%r4)
+;   jglh 0x1a
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
@@ -524,24 +552,26 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; rosbg %r1, %r4, 32, 40, 24 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; rosbg %r1, %r4, 32, 40, 24 ; rll %r1, %r1, 0(%r3) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
 ;   rosbg %r1, %r4, 0x20, 0x28, 0x18
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x10
+;   rll %r1, %r1, 0(%r3)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x14
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -593,26 +623,30 @@ block0(v0: i64, v1: i64, v2: i16):
 
 ; VCode:
 ; block0:
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   lrvr %r4, %r4
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 16(%r2) ; rxsbg %r1, %r4, 48, 64, 48 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r4, %r3
+;   nill %r4, 65532
+;   lrvr %r3, %r5
+;   l %r0, 0(%r4)
+;   0: rll %r1, %r0, 16(%r2) ; rxsbg %r1, %r3, 48, 64, 48 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r4) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   lrvr %r4, %r4
-;   l %r0, 0(%r3)
+;   lgr %r4, %r3
+;   nill %r4, 0xfffc
+;   lrvr %r3, %r5
+;   l %r0, 0(%r4)
 ;   rll %r1, %r0, 0x10(%r2)
-;   rxsbg %r1, %r4, 0x30, 0x40, 0x30
+;   rxsbg %r1, %r3, 0x30, 0x40, 0x30
 ;   rll %r1, %r1, 0x10(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x12
+;   cs %r0, %r1, 0(%r4)
+;   jglh 0x1a
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
@@ -626,24 +660,26 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; rxsbg %r1, %r4, 32, 40, 24 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; rxsbg %r1, %r4, 32, 40, 24 ; rll %r1, %r1, 0(%r3) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
 ;   rxsbg %r1, %r4, 0x20, 0x28, 0x18
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x10
+;   rll %r1, %r1, 0(%r3)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x14
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -706,27 +742,31 @@ block0(v0: i64, v1: i64, v2: i16):
 
 ; VCode:
 ; block0:
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   lrvr %r4, %r4
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 16(%r2) ; rnsbg %r1, %r4, 48, 64, 48 ; xilf %r1, 65535 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r4, %r3
+;   nill %r4, 65532
+;   lrvr %r3, %r5
+;   l %r0, 0(%r4)
+;   0: rll %r1, %r0, 16(%r2) ; rnsbg %r1, %r3, 48, 64, 48 ; xilf %r1, 65535 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r4) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   lrvr %r4, %r4
-;   l %r0, 0(%r3)
+;   lgr %r4, %r3
+;   nill %r4, 0xfffc
+;   lrvr %r3, %r5
+;   l %r0, 0(%r4)
 ;   rll %r1, %r0, 0x10(%r2)
-;   rnsbg %r1, %r4, 0x30, 0x40, 0x30
+;   rnsbg %r1, %r3, 0x30, 0x40, 0x30
 ;   xilf %r1, 0xffff
 ;   rll %r1, %r1, 0x10(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x12
+;   cs %r0, %r1, 0(%r4)
+;   jglh 0x1a
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
@@ -740,25 +780,27 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; rnsbg %r1, %r4, 32, 40, 24 ; xilf %r1, 4278190080 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; rnsbg %r1, %r4, 32, 40, 24 ; xilf %r1, 4278190080 ; rll %r1, %r1, 0(%r3) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
 ;   rnsbg %r1, %r4, 0x20, 0x28, 0x18
 ;   xilf %r1, 0xff000000
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x10
+;   rll %r1, %r1, 0(%r3)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x14
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -820,30 +862,34 @@ block0(v0: i64, v1: i64, v2: i16):
 
 ; VCode:
 ; block0:
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 16
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 16(%r2) ; lrvr %r1, %r1 ; cr %r4, %r1 ; jgnl 1f ; risbgn %r1, %r4, 32, 48, 0 ; lrvr %r1, %r1 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r4, %r3
+;   nill %r4, 65532
+;   sllk %r3, %r5, 16
+;   l %r0, 0(%r4)
+;   0: rll %r1, %r0, 16(%r2) ; lrvr %r1, %r1 ; cr %r3, %r1 ; jgnl 1f ; risbgn %r1, %r3, 32, 48, 0 ; lrvr %r1, %r1 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r4) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x10
-;   l %r0, 0(%r3)
+;   lgr %r4, %r3
+;   nill %r4, 0xfffc
+;   sllk %r3, %r5, 0x10
+;   l %r0, 0(%r4)
 ;   rll %r1, %r0, 0x10(%r2)
 ;   lrvr %r1, %r1
-;   cr %r4, %r1
-;   jgnl 0x40
-;   risbgn %r1, %r4, 0x20, 0x30, 0
+;   cr %r3, %r1
+;   jgnl 0x48
+;   risbgn %r1, %r3, 0x20, 0x30, 0
 ;   lrvr %r1, %r1
 ;   rll %r1, %r1, 0x10(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x14
+;   cs %r0, %r1, 0(%r4)
+;   jglh 0x1c
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
@@ -857,28 +903,30 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 24
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; cr %r4, %r1 ; jgnl 1f ; risbgn %r1, %r4, 32, 40, 0 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   sllk %r3, %r4, 24
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; cr %r3, %r1 ; jgnl 1f ; risbgn %r1, %r3, 32, 40, 0 ; rll %r1, %r1, 0(%r4) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x18
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   sllk %r3, %r4, 0x18
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
-;   cr %r4, %r1
-;   jgnl 0x3a
-;   risbgn %r1, %r4, 0x20, 0x28, 0
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x16
+;   cr %r3, %r1
+;   jgnl 0x3e
+;   risbgn %r1, %r3, 0x20, 0x28, 0
+;   rll %r1, %r1, 0(%r4)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x1a
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -940,30 +988,34 @@ block0(v0: i64, v1: i64, v2: i16):
 
 ; VCode:
 ; block0:
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 16
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 16(%r2) ; lrvr %r1, %r1 ; cr %r4, %r1 ; jgnh 1f ; risbgn %r1, %r4, 32, 48, 0 ; lrvr %r1, %r1 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r4, %r3
+;   nill %r4, 65532
+;   sllk %r3, %r5, 16
+;   l %r0, 0(%r4)
+;   0: rll %r1, %r0, 16(%r2) ; lrvr %r1, %r1 ; cr %r3, %r1 ; jgnh 1f ; risbgn %r1, %r3, 32, 48, 0 ; lrvr %r1, %r1 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r4) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x10
-;   l %r0, 0(%r3)
+;   lgr %r4, %r3
+;   nill %r4, 0xfffc
+;   sllk %r3, %r5, 0x10
+;   l %r0, 0(%r4)
 ;   rll %r1, %r0, 0x10(%r2)
 ;   lrvr %r1, %r1
-;   cr %r4, %r1
-;   jgnh 0x40
-;   risbgn %r1, %r4, 0x20, 0x30, 0
+;   cr %r3, %r1
+;   jgnh 0x48
+;   risbgn %r1, %r3, 0x20, 0x30, 0
 ;   lrvr %r1, %r1
 ;   rll %r1, %r1, 0x10(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x14
+;   cs %r0, %r1, 0(%r4)
+;   jglh 0x1c
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
@@ -977,28 +1029,30 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 24
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; cr %r4, %r1 ; jgnh 1f ; risbgn %r1, %r4, 32, 40, 0 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   sllk %r3, %r4, 24
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; cr %r3, %r1 ; jgnh 1f ; risbgn %r1, %r3, 32, 40, 0 ; rll %r1, %r1, 0(%r4) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x18
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   sllk %r3, %r4, 0x18
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
-;   cr %r4, %r1
-;   jgnh 0x3a
-;   risbgn %r1, %r4, 0x20, 0x28, 0
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x16
+;   cr %r3, %r1
+;   jgnh 0x3e
+;   risbgn %r1, %r3, 0x20, 0x28, 0
+;   rll %r1, %r1, 0(%r4)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x1a
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -1060,30 +1114,34 @@ block0(v0: i64, v1: i64, v2: i16):
 
 ; VCode:
 ; block0:
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 16
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 16(%r2) ; lrvr %r1, %r1 ; clr %r4, %r1 ; jgnl 1f ; risbgn %r1, %r4, 32, 48, 0 ; lrvr %r1, %r1 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r4, %r3
+;   nill %r4, 65532
+;   sllk %r3, %r5, 16
+;   l %r0, 0(%r4)
+;   0: rll %r1, %r0, 16(%r2) ; lrvr %r1, %r1 ; clr %r3, %r1 ; jgnl 1f ; risbgn %r1, %r3, 32, 48, 0 ; lrvr %r1, %r1 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r4) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x10
-;   l %r0, 0(%r3)
+;   lgr %r4, %r3
+;   nill %r4, 0xfffc
+;   sllk %r3, %r5, 0x10
+;   l %r0, 0(%r4)
 ;   rll %r1, %r0, 0x10(%r2)
 ;   lrvr %r1, %r1
-;   clr %r4, %r1
-;   jgnl 0x40
-;   risbgn %r1, %r4, 0x20, 0x30, 0
+;   clr %r3, %r1
+;   jgnl 0x48
+;   risbgn %r1, %r3, 0x20, 0x30, 0
 ;   lrvr %r1, %r1
 ;   rll %r1, %r1, 0x10(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x14
+;   cs %r0, %r1, 0(%r4)
+;   jglh 0x1c
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
@@ -1097,28 +1155,30 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 24
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; clr %r4, %r1 ; jgnl 1f ; risbgn %r1, %r4, 32, 40, 0 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   sllk %r3, %r4, 24
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; clr %r3, %r1 ; jgnl 1f ; risbgn %r1, %r3, 32, 40, 0 ; rll %r1, %r1, 0(%r4) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x18
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   sllk %r3, %r4, 0x18
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
-;   clr %r4, %r1
-;   jgnl 0x3a
-;   risbgn %r1, %r4, 0x20, 0x28, 0
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x16
+;   clr %r3, %r1
+;   jgnl 0x3e
+;   risbgn %r1, %r3, 0x20, 0x28, 0
+;   rll %r1, %r1, 0(%r4)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x1a
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -1180,30 +1240,34 @@ block0(v0: i64, v1: i64, v2: i16):
 
 ; VCode:
 ; block0:
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 16
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 16(%r2) ; lrvr %r1, %r1 ; clr %r4, %r1 ; jgnh 1f ; risbgn %r1, %r4, 32, 48, 0 ; lrvr %r1, %r1 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r4, %r3
+;   nill %r4, 65532
+;   sllk %r3, %r5, 16
+;   l %r0, 0(%r4)
+;   0: rll %r1, %r0, 16(%r2) ; lrvr %r1, %r1 ; clr %r3, %r1 ; jgnh 1f ; risbgn %r1, %r3, 32, 48, 0 ; lrvr %r1, %r1 ; rll %r1, %r1, 16(%r2) ; cs %r0, %r1, 0(%r4) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x10
-;   l %r0, 0(%r3)
+;   lgr %r4, %r3
+;   nill %r4, 0xfffc
+;   sllk %r3, %r5, 0x10
+;   l %r0, 0(%r4)
 ;   rll %r1, %r0, 0x10(%r2)
 ;   lrvr %r1, %r1
-;   clr %r4, %r1
-;   jgnh 0x40
-;   risbgn %r1, %r4, 0x20, 0x30, 0
+;   clr %r3, %r1
+;   jgnh 0x48
+;   risbgn %r1, %r3, 0x20, 0x30, 0
 ;   lrvr %r1, %r1
 ;   rll %r1, %r1, 0x10(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x14
+;   cs %r0, %r1, 0(%r4)
+;   jglh 0x1c
 ;   rll %r2, %r0, 0(%r2)
 ;   lrvr %r2, %r2
 ;   br %r14
@@ -1217,28 +1281,30 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 24
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; clr %r4, %r1 ; jgnh 1f ; risbgn %r1, %r4, 32, 40, 0 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   sllk %r3, %r4, 24
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; clr %r3, %r1 ; jgnh 1f ; risbgn %r1, %r3, 32, 40, 0 ; rll %r1, %r1, 0(%r4) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x18
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   sllk %r3, %r4, 0x18
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
-;   clr %r4, %r1
-;   jgnh 0x3a
-;   risbgn %r1, %r4, 0x20, 0x28, 0
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x16
+;   clr %r3, %r1
+;   jgnh 0x3e
+;   risbgn %r1, %r3, 0x20, 0x28, 0
+;   rll %r1, %r1, 0(%r4)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x1a
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
diff --git a/cranelift/filetests/filetests/isa/s390x/atomic_rmw.clif b/cranelift/filetests/filetests/isa/s390x/atomic_rmw.clif
index 3ab94f59f473..50366a46feff 100644
--- a/cranelift/filetests/filetests/isa/s390x/atomic_rmw.clif
+++ b/cranelift/filetests/filetests/isa/s390x/atomic_rmw.clif
@@ -56,22 +56,24 @@ block0(v0: i64, v1: i64, v2: i16):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; risbgn %r1, %r4, 32, 48, 16 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; risbgn %r1, %r4, 32, 48, 16 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 16(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
 ;   risbgn %r1, %r4, 0x20, 0x30, 0x10
 ;   rll %r1, %r1, 0(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0xe
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x12
 ;   rll %r2, %r0, 0x10(%r2)
 ;   br %r14
 
@@ -84,24 +86,26 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; risbgn %r1, %r4, 32, 40, 24 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; risbgn %r1, %r4, 32, 40, 24 ; rll %r1, %r1, 0(%r3) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
 ;   risbgn %r1, %r4, 0x20, 0x28, 0x18
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x10
+;   rll %r1, %r1, 0(%r3)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x14
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -145,25 +149,29 @@ block0(v0: i64, v1: i64, v2: i16):
 
 ; VCode:
 ; block0:
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 16
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; ar %r1, %r4 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r4, %r3
+;   nill %r4, 65532
+;   sllk %r3, %r5, 16
+;   l %r0, 0(%r4)
+;   0: rll %r1, %r0, 0(%r2) ; ar %r1, %r3 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r4) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 16(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x10
-;   l %r0, 0(%r3)
+;   lgr %r4, %r3
+;   nill %r4, 0xfffc
+;   sllk %r3, %r5, 0x10
+;   l %r0, 0(%r4)
 ;   rll %r1, %r0, 0(%r2)
-;   ar %r1, %r4
+;   ar %r1, %r3
 ;   rll %r1, %r1, 0(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x14
+;   cs %r0, %r1, 0(%r4)
+;   jglh 0x1c
 ;   rll %r2, %r0, 0x10(%r2)
 ;   br %r14
 
@@ -176,26 +184,28 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 24
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; ar %r1, %r4 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   sllk %r3, %r4, 24
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; ar %r1, %r3 ; rll %r1, %r1, 0(%r4) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x18
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   sllk %r3, %r4, 0x18
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
-;   ar %r1, %r4
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x16
+;   ar %r1, %r3
+;   rll %r1, %r1, 0(%r4)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x1a
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -243,25 +253,29 @@ block0(v0: i64, v1: i64, v2: i16):
 
 ; VCode:
 ; block0:
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 16
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; sr %r1, %r4 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r4, %r3
+;   nill %r4, 65532
+;   sllk %r3, %r5, 16
+;   l %r0, 0(%r4)
+;   0: rll %r1, %r0, 0(%r2) ; sr %r1, %r3 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r4) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 16(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x10
-;   l %r0, 0(%r3)
+;   lgr %r4, %r3
+;   nill %r4, 0xfffc
+;   sllk %r3, %r5, 0x10
+;   l %r0, 0(%r4)
 ;   rll %r1, %r0, 0(%r2)
-;   sr %r1, %r4
+;   sr %r1, %r3
 ;   rll %r1, %r1, 0(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x14
+;   cs %r0, %r1, 0(%r4)
+;   jglh 0x1c
 ;   rll %r2, %r0, 0x10(%r2)
 ;   br %r14
 
@@ -274,26 +288,28 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 24
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; sr %r1, %r4 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   sllk %r3, %r4, 24
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; sr %r1, %r3 ; rll %r1, %r1, 0(%r4) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x18
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   sllk %r3, %r4, 0x18
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
-;   sr %r1, %r4
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x16
+;   sr %r1, %r3
+;   rll %r1, %r1, 0(%r4)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x1a
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -338,22 +354,24 @@ block0(v0: i64, v1: i64, v2: i16):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; rnsbg %r1, %r4, 32, 48, 16 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; rnsbg %r1, %r4, 32, 48, 16 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 16(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
 ;   rnsbg %r1, %r4, 0x20, 0x30, 0x10
 ;   rll %r1, %r1, 0(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0xe
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x12
 ;   rll %r2, %r0, 0x10(%r2)
 ;   br %r14
 
@@ -366,24 +384,26 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; rnsbg %r1, %r4, 32, 40, 24 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; rnsbg %r1, %r4, 32, 40, 24 ; rll %r1, %r1, 0(%r3) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
 ;   rnsbg %r1, %r4, 0x20, 0x28, 0x18
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x10
+;   rll %r1, %r1, 0(%r3)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x14
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -428,22 +448,24 @@ block0(v0: i64, v1: i64, v2: i16):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; rosbg %r1, %r4, 32, 48, 16 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; rosbg %r1, %r4, 32, 48, 16 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 16(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
 ;   rosbg %r1, %r4, 0x20, 0x30, 0x10
 ;   rll %r1, %r1, 0(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0xe
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x12
 ;   rll %r2, %r0, 0x10(%r2)
 ;   br %r14
 
@@ -456,24 +478,26 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; rosbg %r1, %r4, 32, 40, 24 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; rosbg %r1, %r4, 32, 40, 24 ; rll %r1, %r1, 0(%r3) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
 ;   rosbg %r1, %r4, 0x20, 0x28, 0x18
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x10
+;   rll %r1, %r1, 0(%r3)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x14
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -518,22 +542,24 @@ block0(v0: i64, v1: i64, v2: i16):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; rxsbg %r1, %r4, 32, 48, 16 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; rxsbg %r1, %r4, 32, 48, 16 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 16(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
 ;   rxsbg %r1, %r4, 0x20, 0x30, 0x10
 ;   rll %r1, %r1, 0(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0xe
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x12
 ;   rll %r2, %r0, 0x10(%r2)
 ;   br %r14
 
@@ -546,24 +572,26 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; rxsbg %r1, %r4, 32, 40, 24 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; rxsbg %r1, %r4, 32, 40, 24 ; rll %r1, %r1, 0(%r3) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
 ;   rxsbg %r1, %r4, 0x20, 0x28, 0x18
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x10
+;   rll %r1, %r1, 0(%r3)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x14
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -623,23 +651,25 @@ block0(v0: i64, v1: i64, v2: i16):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; rnsbg %r1, %r4, 32, 48, 16 ; xilf %r1, 4294901760 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; rnsbg %r1, %r4, 32, 48, 16 ; xilf %r1, 4294901760 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 16(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
 ;   rnsbg %r1, %r4, 0x20, 0x30, 0x10
 ;   xilf %r1, 0xffff0000
 ;   rll %r1, %r1, 0(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0xe
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x12
 ;   rll %r2, %r0, 0x10(%r2)
 ;   br %r14
 
@@ -652,25 +682,27 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; rnsbg %r1, %r4, 32, 40, 24 ; xilf %r1, 4278190080 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; rnsbg %r1, %r4, 32, 40, 24 ; xilf %r1, 4278190080 ; rll %r1, %r1, 0(%r3) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   lcr %r3, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
 ;   rnsbg %r1, %r4, 0x20, 0x28, 0x18
 ;   xilf %r1, 0xff000000
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x10
+;   rll %r1, %r1, 0(%r3)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x14
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -728,27 +760,31 @@ block0(v0: i64, v1: i64, v2: i16):
 
 ; VCode:
 ; block0:
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 16
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; cr %r4, %r1 ; jgnl 1f ; risbgn %r1, %r4, 32, 48, 0 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r4, %r3
+;   nill %r4, 65532
+;   sllk %r3, %r5, 16
+;   l %r0, 0(%r4)
+;   0: rll %r1, %r0, 0(%r2) ; cr %r3, %r1 ; jgnl 1f ; risbgn %r1, %r3, 32, 48, 0 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r4) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 16(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x10
-;   l %r0, 0(%r3)
+;   lgr %r4, %r3
+;   nill %r4, 0xfffc
+;   sllk %r3, %r5, 0x10
+;   l %r0, 0(%r4)
 ;   rll %r1, %r0, 0(%r2)
-;   cr %r4, %r1
-;   jgnl 0x38
-;   risbgn %r1, %r4, 0x20, 0x30, 0
+;   cr %r3, %r1
+;   jgnl 0x40
+;   risbgn %r1, %r3, 0x20, 0x30, 0
 ;   rll %r1, %r1, 0(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x14
+;   cs %r0, %r1, 0(%r4)
+;   jglh 0x1c
 ;   rll %r2, %r0, 0x10(%r2)
 ;   br %r14
 
@@ -761,28 +797,30 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 24
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; cr %r4, %r1 ; jgnl 1f ; risbgn %r1, %r4, 32, 40, 0 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   sllk %r3, %r4, 24
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; cr %r3, %r1 ; jgnl 1f ; risbgn %r1, %r3, 32, 40, 0 ; rll %r1, %r1, 0(%r4) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x18
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   sllk %r3, %r4, 0x18
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
-;   cr %r4, %r1
-;   jgnl 0x3a
-;   risbgn %r1, %r4, 0x20, 0x28, 0
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x16
+;   cr %r3, %r1
+;   jgnl 0x3e
+;   risbgn %r1, %r3, 0x20, 0x28, 0
+;   rll %r1, %r1, 0(%r4)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x1a
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -840,27 +878,31 @@ block0(v0: i64, v1: i64, v2: i16):
 
 ; VCode:
 ; block0:
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 16
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; cr %r4, %r1 ; jgnh 1f ; risbgn %r1, %r4, 32, 48, 0 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r4, %r3
+;   nill %r4, 65532
+;   sllk %r3, %r5, 16
+;   l %r0, 0(%r4)
+;   0: rll %r1, %r0, 0(%r2) ; cr %r3, %r1 ; jgnh 1f ; risbgn %r1, %r3, 32, 48, 0 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r4) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 16(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x10
-;   l %r0, 0(%r3)
+;   lgr %r4, %r3
+;   nill %r4, 0xfffc
+;   sllk %r3, %r5, 0x10
+;   l %r0, 0(%r4)
 ;   rll %r1, %r0, 0(%r2)
-;   cr %r4, %r1
-;   jgnh 0x38
-;   risbgn %r1, %r4, 0x20, 0x30, 0
+;   cr %r3, %r1
+;   jgnh 0x40
+;   risbgn %r1, %r3, 0x20, 0x30, 0
 ;   rll %r1, %r1, 0(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x14
+;   cs %r0, %r1, 0(%r4)
+;   jglh 0x1c
 ;   rll %r2, %r0, 0x10(%r2)
 ;   br %r14
 
@@ -873,28 +915,30 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 24
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; cr %r4, %r1 ; jgnh 1f ; risbgn %r1, %r4, 32, 40, 0 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   sllk %r3, %r4, 24
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; cr %r3, %r1 ; jgnh 1f ; risbgn %r1, %r3, 32, 40, 0 ; rll %r1, %r1, 0(%r4) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x18
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   sllk %r3, %r4, 0x18
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
-;   cr %r4, %r1
-;   jgnh 0x3a
-;   risbgn %r1, %r4, 0x20, 0x28, 0
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x16
+;   cr %r3, %r1
+;   jgnh 0x3e
+;   risbgn %r1, %r3, 0x20, 0x28, 0
+;   rll %r1, %r1, 0(%r4)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x1a
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -952,27 +996,31 @@ block0(v0: i64, v1: i64, v2: i16):
 
 ; VCode:
 ; block0:
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 16
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; clr %r4, %r1 ; jgnl 1f ; risbgn %r1, %r4, 32, 48, 0 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r4, %r3
+;   nill %r4, 65532
+;   sllk %r3, %r5, 16
+;   l %r0, 0(%r4)
+;   0: rll %r1, %r0, 0(%r2) ; clr %r3, %r1 ; jgnl 1f ; risbgn %r1, %r3, 32, 48, 0 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r4) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 16(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x10
-;   l %r0, 0(%r3)
+;   lgr %r4, %r3
+;   nill %r4, 0xfffc
+;   sllk %r3, %r5, 0x10
+;   l %r0, 0(%r4)
 ;   rll %r1, %r0, 0(%r2)
-;   clr %r4, %r1
-;   jgnl 0x38
-;   risbgn %r1, %r4, 0x20, 0x30, 0
+;   clr %r3, %r1
+;   jgnl 0x40
+;   risbgn %r1, %r3, 0x20, 0x30, 0
 ;   rll %r1, %r1, 0(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x14
+;   cs %r0, %r1, 0(%r4)
+;   jglh 0x1c
 ;   rll %r2, %r0, 0x10(%r2)
 ;   br %r14
 
@@ -985,28 +1033,30 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 24
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; clr %r4, %r1 ; jgnl 1f ; risbgn %r1, %r4, 32, 40, 0 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   sllk %r3, %r4, 24
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; clr %r3, %r1 ; jgnl 1f ; risbgn %r1, %r3, 32, 40, 0 ; rll %r1, %r1, 0(%r4) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x18
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   sllk %r3, %r4, 0x18
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
-;   clr %r4, %r1
-;   jgnl 0x3a
-;   risbgn %r1, %r4, 0x20, 0x28, 0
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x16
+;   clr %r3, %r1
+;   jgnl 0x3e
+;   risbgn %r1, %r3, 0x20, 0x28, 0
+;   rll %r1, %r1, 0(%r4)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x1a
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
@@ -1064,27 +1114,31 @@ block0(v0: i64, v1: i64, v2: i16):
 
 ; VCode:
 ; block0:
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 16
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; clr %r4, %r1 ; jgnh 1f ; risbgn %r1, %r4, 32, 48, 0 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r4, %r3
+;   nill %r4, 65532
+;   sllk %r3, %r5, 16
+;   l %r0, 0(%r4)
+;   0: rll %r1, %r0, 0(%r2) ; clr %r3, %r1 ; jgnh 1f ; risbgn %r1, %r3, 32, 48, 0 ; rll %r1, %r1, 0(%r2) ; cs %r0, %r1, 0(%r4) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 16(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
+;   lgr %r5, %r4
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x10
-;   l %r0, 0(%r3)
+;   lgr %r4, %r3
+;   nill %r4, 0xfffc
+;   sllk %r3, %r5, 0x10
+;   l %r0, 0(%r4)
 ;   rll %r1, %r0, 0(%r2)
-;   clr %r4, %r1
-;   jgnh 0x38
-;   risbgn %r1, %r4, 0x20, 0x30, 0
+;   clr %r3, %r1
+;   jgnh 0x40
+;   risbgn %r1, %r3, 0x20, 0x30, 0
 ;   rll %r1, %r1, 0(%r2)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x14
+;   cs %r0, %r1, 0(%r4)
+;   jglh 0x1c
 ;   rll %r2, %r0, 0x10(%r2)
 ;   br %r14
 
@@ -1097,28 +1151,30 @@ block0(v0: i64, v1: i64, v2: i8):
 ; VCode:
 ; block0:
 ;   sllk %r2, %r3, 3
-;   nill %r3, 65532
-;   sllk %r4, %r4, 24
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
-;   0: rll %r1, %r0, 0(%r2) ; clr %r4, %r1 ; jgnh 1f ; risbgn %r1, %r4, 32, 40, 0 ; rll %r1, %r1, 0(%r5) ; cs %r0, %r1, 0(%r3) ; jglh 0b ; 1:
+;   lgr %r5, %r3
+;   nill %r5, 65532
+;   sllk %r3, %r4, 24
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
+;   0: rll %r1, %r0, 0(%r2) ; clr %r3, %r1 ; jgnh 1f ; risbgn %r1, %r3, 32, 40, 0 ; rll %r1, %r1, 0(%r4) ; cs %r0, %r1, 0(%r5) ; jglh 0b ; 1:
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   sllk %r2, %r3, 3
-;   nill %r3, 0xfffc
-;   sllk %r4, %r4, 0x18
-;   lcr %r5, %r2
-;   l %r0, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xfffc
+;   sllk %r3, %r4, 0x18
+;   lcr %r4, %r2
+;   l %r0, 0(%r5)
 ;   rll %r1, %r0, 0(%r2)
-;   clr %r4, %r1
-;   jgnh 0x3a
-;   risbgn %r1, %r4, 0x20, 0x28, 0
-;   rll %r1, %r1, 0(%r5)
-;   cs %r0, %r1, 0(%r3)
-;   jglh 0x16
+;   clr %r3, %r1
+;   jgnh 0x3e
+;   risbgn %r1, %r3, 0x20, 0x28, 0
+;   rll %r1, %r1, 0(%r4)
+;   cs %r0, %r1, 0(%r5)
+;   jglh 0x1a
 ;   rll %r2, %r0, 8(%r2)
 ;   br %r14
 
diff --git a/cranelift/filetests/filetests/isa/s390x/bitops.clif b/cranelift/filetests/filetests/isa/s390x/bitops.clif
index 62fc004022bd..eda5849401a2 100644
--- a/cranelift/filetests/filetests/isa/s390x/bitops.clif
+++ b/cranelift/filetests/filetests/isa/s390x/bitops.clif
@@ -603,9 +603,10 @@ block0(v0: i64):
 ;   lcgr %r4, %r2
 ;   ngr %r2, %r4
 ;   flogr %r2, %r2
-;   locghie %r2, -1
+;   lgr %r3, %r2
+;   locghie %r3, -1
 ;   lghi %r5, 63
-;   sgrk %r2, %r5, %r2
+;   sgrk %r2, %r5, %r3
 ;   br %r14
 ;
 ; Disassembled:
@@ -613,9 +614,10 @@ block0(v0: i64):
 ;   lcgr %r4, %r2
 ;   ngr %r2, %r4
 ;   flogr %r2, %r2
-;   locghie %r2, -1
+;   lgr %r3, %r2
+;   locghie %r3, -1
 ;   lghi %r5, 0x3f
-;   sgrk %r2, %r5, %r2
+;   sgrk %r2, %r5, %r3
 ;   br %r14
 
 function %ctz_i32(i32) -> i32 {
@@ -626,9 +628,10 @@ block0(v0: i32):
 
 ; VCode:
 ; block0:
-;   oihl %r2, 1
-;   lcgr %r3, %r2
-;   ngrk %r4, %r2, %r3
+;   lgr %r4, %r2
+;   oihl %r4, 1
+;   lcgr %r2, %r4
+;   ngr %r4, %r2
 ;   flogr %r2, %r4
 ;   lhi %r5, 63
 ;   srk %r2, %r5, %r2
@@ -636,9 +639,10 @@ block0(v0: i32):
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   oihl %r2, 1
-;   lcgr %r3, %r2
-;   ngrk %r4, %r2, %r3
+;   lgr %r4, %r2
+;   oihl %r4, 1
+;   lcgr %r2, %r4
+;   ngr %r4, %r2
 ;   flogr %r2, %r4
 ;   lhi %r5, 0x3f
 ;   srk %r2, %r5, %r2
@@ -652,9 +656,10 @@ block0(v0: i16):
 
 ; VCode:
 ; block0:
-;   oilh %r2, 1
-;   lcgr %r3, %r2
-;   ngrk %r4, %r2, %r3
+;   lgr %r4, %r2
+;   oilh %r4, 1
+;   lcgr %r2, %r4
+;   ngr %r4, %r2
 ;   flogr %r2, %r4
 ;   lhi %r5, 63
 ;   srk %r2, %r5, %r2
@@ -662,9 +667,10 @@ block0(v0: i16):
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   oilh %r2, 1
-;   lcgr %r3, %r2
-;   ngrk %r4, %r2, %r3
+;   lgr %r4, %r2
+;   oilh %r4, 1
+;   lcgr %r2, %r4
+;   ngr %r4, %r2
 ;   flogr %r2, %r4
 ;   lhi %r5, 0x3f
 ;   srk %r2, %r5, %r2
@@ -678,9 +684,10 @@ block0(v0: i8):
 
 ; VCode:
 ; block0:
-;   oill %r2, 256
-;   lcgr %r3, %r2
-;   ngrk %r4, %r2, %r3
+;   lgr %r4, %r2
+;   oill %r4, 256
+;   lcgr %r2, %r4
+;   ngr %r4, %r2
 ;   flogr %r2, %r4
 ;   lhi %r5, 63
 ;   srk %r2, %r5, %r2
@@ -688,9 +695,10 @@ block0(v0: i8):
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   oill %r2, 0x100
-;   lcgr %r3, %r2
-;   ngrk %r4, %r2, %r3
+;   lgr %r4, %r2
+;   oill %r4, 0x100
+;   lcgr %r2, %r4
+;   ngr %r4, %r2
 ;   flogr %r2, %r4
 ;   lhi %r5, 0x3f
 ;   srk %r2, %r5, %r2
diff --git a/cranelift/filetests/filetests/isa/s390x/bitwise.clif b/cranelift/filetests/filetests/isa/s390x/bitwise.clif
index 54506197e4ea..cee8bfd674d3 100644
--- a/cranelift/filetests/filetests/isa/s390x/bitwise.clif
+++ b/cranelift/filetests/filetests/isa/s390x/bitwise.clif
@@ -936,18 +936,20 @@ block0(v0: i64, v1: i64, v2: i64):
 ; VCode:
 ; block0:
 ;   ngr %r3, %r2
-;   xilf %r2, 4294967295
-;   xihf %r2, 4294967295
-;   ngr %r4, %r2
+;   lgr %r5, %r2
+;   xilf %r5, 4294967295
+;   xihf %r5, 4294967295
+;   ngr %r4, %r5
 ;   ogrk %r2, %r4, %r3
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   ngr %r3, %r2
-;   xilf %r2, 0xffffffff
-;   xihf %r2, 0xffffffff
-;   ngr %r4, %r2
+;   lgr %r5, %r2
+;   xilf %r5, 0xffffffff
+;   xihf %r5, 0xffffffff
+;   ngr %r4, %r5
 ;   ogrk %r2, %r4, %r3
 ;   br %r14
 
@@ -960,16 +962,18 @@ block0(v0: i32, v1: i32, v2: i32):
 ; VCode:
 ; block0:
 ;   nr %r3, %r2
-;   xilf %r2, 4294967295
-;   nrk %r2, %r4, %r2
+;   lgr %r5, %r2
+;   xilf %r5, 4294967295
+;   nrk %r2, %r4, %r5
 ;   or %r2, %r3
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   nr %r3, %r2
-;   xilf %r2, 0xffffffff
-;   nrk %r2, %r4, %r2
+;   lgr %r5, %r2
+;   xilf %r5, 0xffffffff
+;   nrk %r2, %r4, %r5
 ;   or %r2, %r3
 ;   br %r14
 
@@ -982,16 +986,18 @@ block0(v0: i16, v1: i16, v2: i16):
 ; VCode:
 ; block0:
 ;   nr %r3, %r2
-;   xilf %r2, 4294967295
-;   nrk %r2, %r4, %r2
+;   lgr %r5, %r2
+;   xilf %r5, 4294967295
+;   nrk %r2, %r4, %r5
 ;   or %r2, %r3
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   nr %r3, %r2
-;   xilf %r2, 0xffffffff
-;   nrk %r2, %r4, %r2
+;   lgr %r5, %r2
+;   xilf %r5, 0xffffffff
+;   nrk %r2, %r4, %r5
 ;   or %r2, %r3
 ;   br %r14
 
@@ -1004,16 +1010,18 @@ block0(v0: i8, v1: i8, v2: i8):
 ; VCode:
 ; block0:
 ;   nr %r3, %r2
-;   xilf %r2, 4294967295
-;   nrk %r2, %r4, %r2
+;   lgr %r5, %r2
+;   xilf %r5, 4294967295
+;   nrk %r2, %r4, %r5
 ;   or %r2, %r3
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
 ;   nr %r3, %r2
-;   xilf %r2, 0xffffffff
-;   nrk %r2, %r4, %r2
+;   lgr %r5, %r2
+;   xilf %r5, 0xffffffff
+;   nrk %r2, %r4, %r5
 ;   or %r2, %r3
 ;   br %r14
 
diff --git a/cranelift/filetests/filetests/isa/s390x/jumptable.clif b/cranelift/filetests/filetests/isa/s390x/jumptable.clif
index 2c71a5019305..0e86a1eea87b 100644
--- a/cranelift/filetests/filetests/isa/s390x/jumptable.clif
+++ b/cranelift/filetests/filetests/isa/s390x/jumptable.clif
@@ -32,7 +32,7 @@ block5(v5: i32):
 ;   clgfi %r3, 3
 ;   jghe label4
 ;   sllg %r3, %r3, 2
-;   larl %r1, 14 ; agf %r1, 0(%r1, %r3) ; br %r1 ; jt_entries label2 label1
+;   larl %r1, 14 ; agf %r1, 0(%r1, %r3) ; br %r1 ; jt_entries label3 label2 label1
 ; block1:
 ;   lhi %r5, 3
 ;   jg label5
diff --git a/cranelift/filetests/filetests/isa/s390x/reftypes.clif b/cranelift/filetests/filetests/isa/s390x/reftypes.clif
index b2dc9a4aadfa..a879eb37c9c4 100644
--- a/cranelift/filetests/filetests/isa/s390x/reftypes.clif
+++ b/cranelift/filetests/filetests/isa/s390x/reftypes.clif
@@ -111,8 +111,8 @@ block3(v7: r64, v8: r64):
 ;   chi %r2, 0
 ;   jglh label2 ; jg label1
 ; block1:
-;   lg %r2, 176(%r15)
 ;   lgr %r3, %r11
+;   lg %r2, 176(%r15)
 ;   jg label3
 ; block2:
 ;   lgr %r2, %r11
@@ -148,8 +148,8 @@ block3(v7: r64, v8: r64):
 ;   chi %r2, 0
 ;   jglh 0x62
 ; block2: ; offset 0x52
-;   lg %r2, 0xb0(%r15)
 ;   lgr %r3, %r11
+;   lg %r2, 0xb0(%r15)
 ;   jg 0x6c
 ; block3: ; offset 0x62
 ;   lgr %r2, %r11
diff --git a/cranelift/filetests/filetests/isa/s390x/shift-rotate.clif b/cranelift/filetests/filetests/isa/s390x/shift-rotate.clif
index c11ea0659971..044a454395b3 100644
--- a/cranelift/filetests/filetests/isa/s390x/shift-rotate.clif
+++ b/cranelift/filetests/filetests/isa/s390x/shift-rotate.clif
@@ -915,14 +915,16 @@ block0(v0: i32, v1: i32):
 
 ; VCode:
 ; block0:
-;   nill %r3, 31
-;   srlk %r2, %r2, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 31
+;   srlk %r2, %r2, 0(%r5)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   nill %r3, 0x1f
-;   srlk %r2, %r2, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0x1f
+;   srlk %r2, %r2, 0(%r5)
 ;   br %r14
 
 function %ushr_i32_imm(i32) -> i32 {
@@ -1228,14 +1230,16 @@ block0(v0: i32, v1: i32):
 
 ; VCode:
 ; block0:
-;   nill %r3, 31
-;   sllk %r2, %r2, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 31
+;   sllk %r2, %r2, 0(%r5)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   nill %r3, 0x1f
-;   sllk %r2, %r2, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0x1f
+;   sllk %r2, %r2, 0(%r5)
 ;   br %r14
 
 function %ishl_i32_imm(i32) -> i32 {
@@ -1285,14 +1289,16 @@ block0(v0: i16, v1: i16):
 
 ; VCode:
 ; block0:
-;   nill %r3, 15
-;   sllk %r2, %r2, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 15
+;   sllk %r2, %r2, 0(%r5)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   nill %r3, 0xf
-;   sllk %r2, %r2, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0xf
+;   sllk %r2, %r2, 0(%r5)
 ;   br %r14
 
 function %ishl_i16_imm(i16) -> i16 {
@@ -1342,14 +1348,16 @@ block0(v0: i8, v1: i8):
 
 ; VCode:
 ; block0:
-;   nill %r3, 7
-;   sllk %r2, %r2, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 7
+;   sllk %r2, %r2, 0(%r5)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   nill %r3, 7
-;   sllk %r2, %r2, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 7
+;   sllk %r2, %r2, 0(%r5)
 ;   br %r14
 
 function %ishl_i8_imm(i8) -> i8 {
@@ -1529,14 +1537,16 @@ block0(v0: i32, v1: i32):
 
 ; VCode:
 ; block0:
-;   nill %r3, 31
-;   srak %r2, %r2, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 31
+;   srak %r2, %r2, 0(%r5)
 ;   br %r14
 ;
 ; Disassembled:
 ; block0: ; offset 0x0
-;   nill %r3, 0x1f
-;   srak %r2, %r2, 0(%r3)
+;   lgr %r5, %r3
+;   nill %r5, 0x1f
+;   srak %r2, %r2, 0(%r5)
 ;   br %r14
 
 function %sshr_i32_imm(i32) -> i32 {
diff --git a/cranelift/filetests/filetests/isa/s390x/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/s390x/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index a7b6dc32a222..daeb205fa0ba 100644
--- a/cranelift/filetests/filetests/isa/s390x/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/s390x/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -48,9 +48,10 @@
 ;;   clgr %r2, %r5
 ;;   jgh label3 ; jg label1
 ;; block1:
-;;   ag %r2, 0(%r4)
+;;   lgr %r5, %r2
+;;   ag %r5, 0(%r4)
 ;;   lghi %r4, 4096
-;;   strv %r3, 0(%r4,%r2)
+;;   strv %r3, 0(%r4,%r5)
 ;;   jg label2
 ;; block2:
 ;;   br %r14
@@ -66,9 +67,10 @@
 ;;   clgr %r2, %r4
 ;;   jgh label3 ; jg label1
 ;; block1:
-;;   ag %r2, 0(%r3)
+;;   lgr %r4, %r2
+;;   ag %r4, 0(%r3)
 ;;   lghi %r3, 4096
-;;   lrv %r2, 0(%r3,%r2)
+;;   lrv %r2, 0(%r3,%r4)
 ;;   jg label2
 ;; block2:
 ;;   br %r14
diff --git a/cranelift/filetests/filetests/isa/s390x/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/s390x/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 50f1dc5ade66..3c280d330546 100644
--- a/cranelift/filetests/filetests/isa/s390x/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/s390x/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -53,9 +53,10 @@
 ;;   clgr %r5, %r14
 ;;   jgh label3 ; jg label1
 ;; block1:
-;;   ag %r2, 0(%r4)
+;;   lgr %r5, %r2
+;;   ag %r5, 0(%r4)
 ;;   llilh %r4, 65535
-;;   strv %r3, 0(%r4,%r2)
+;;   strv %r3, 0(%r4,%r5)
 ;;   jg label2
 ;; block2:
 ;;   lmg %r14, %r15, 112(%r15)
@@ -74,9 +75,10 @@
 ;;   clgr %r5, %r4
 ;;   jgh label3 ; jg label1
 ;; block1:
-;;   ag %r2, 0(%r3)
-;;   llilh %r4, 65535
-;;   lrv %r2, 0(%r4,%r2)
+;;   lgr %r4, %r2
+;;   ag %r4, 0(%r3)
+;;   llilh %r5, 65535
+;;   lrv %r2, 0(%r5,%r4)
 ;;   jg label2
 ;; block2:
 ;;   br %r14
diff --git a/cranelift/filetests/filetests/isa/s390x/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/s390x/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index e25817dc31a9..d3f740891bc0 100644
--- a/cranelift/filetests/filetests/isa/s390x/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/s390x/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -48,9 +48,10 @@
 ;;   clgr %r2, %r5
 ;;   jgh label3 ; jg label1
 ;; block1:
-;;   ag %r2, 0(%r4)
+;;   lgr %r5, %r2
+;;   ag %r5, 0(%r4)
 ;;   lghi %r4, 4096
-;;   stc %r3, 0(%r4,%r2)
+;;   stc %r3, 0(%r4,%r5)
 ;;   jg label2
 ;; block2:
 ;;   br %r14
@@ -66,9 +67,10 @@
 ;;   clgr %r2, %r4
 ;;   jgh label3 ; jg label1
 ;; block1:
-;;   ag %r2, 0(%r3)
+;;   lgr %r4, %r2
+;;   ag %r4, 0(%r3)
 ;;   lghi %r3, 4096
-;;   llc %r2, 0(%r3,%r2)
+;;   llc %r2, 0(%r3,%r4)
 ;;   jg label2
 ;; block2:
 ;;   br %r14
diff --git a/cranelift/filetests/filetests/isa/s390x/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/s390x/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
index be59a9689720..631727f67640 100644
--- a/cranelift/filetests/filetests/isa/s390x/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/s390x/wasm/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -53,9 +53,10 @@
 ;;   clgr %r5, %r14
 ;;   jgh label3 ; jg label1
 ;; block1:
-;;   ag %r2, 0(%r4)
+;;   lgr %r5, %r2
+;;   ag %r5, 0(%r4)
 ;;   llilh %r4, 65535
-;;   stc %r3, 0(%r4,%r2)
+;;   stc %r3, 0(%r4,%r5)
 ;;   jg label2
 ;; block2:
 ;;   lmg %r14, %r15, 112(%r15)
@@ -74,9 +75,10 @@
 ;;   clgr %r5, %r4
 ;;   jgh label3 ; jg label1
 ;; block1:
-;;   ag %r2, 0(%r3)
-;;   llilh %r4, 65535
-;;   llc %r2, 0(%r4,%r2)
+;;   lgr %r4, %r2
+;;   ag %r4, 0(%r3)
+;;   llilh %r5, 65535
+;;   llc %r2, 0(%r5,%r4)
 ;;   jg label2
 ;; block2:
 ;;   br %r14
diff --git a/cranelift/filetests/filetests/isa/s390x/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/s390x/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index 56cce5cd1cef..0d1ed849d45f 100644
--- a/cranelift/filetests/filetests/isa/s390x/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/s390x/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -44,9 +44,10 @@
 ;;   clgfi %r2, 268431356
 ;;   jgh label3 ; jg label1
 ;; block1:
-;;   ag %r2, 0(%r4)
-;;   lghi %r5, 4096
-;;   strv %r3, 0(%r5,%r2)
+;;   lgr %r5, %r2
+;;   ag %r5, 0(%r4)
+;;   lghi %r2, 4096
+;;   strv %r3, 0(%r2,%r5)
 ;;   jg label2
 ;; block2:
 ;;   br %r14
@@ -60,9 +61,10 @@
 ;;   clgfi %r2, 268431356
 ;;   jgh label3 ; jg label1
 ;; block1:
-;;   ag %r2, 0(%r3)
-;;   lghi %r5, 4096
-;;   lrv %r2, 0(%r5,%r2)
+;;   lgr %r5, %r2
+;;   ag %r5, 0(%r3)
+;;   lghi %r2, 4096
+;;   lrv %r2, 0(%r2,%r5)
 ;;   jg label2
 ;; block2:
 ;;   br %r14
diff --git a/cranelift/filetests/filetests/isa/s390x/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/s390x/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index 99d2a21705f1..f9ed4aab9b37 100644
--- a/cranelift/filetests/filetests/isa/s390x/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/s390x/wasm/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -44,9 +44,10 @@
 ;;   clgfi %r2, 268431359
 ;;   jgh label3 ; jg label1
 ;; block1:
-;;   ag %r2, 0(%r4)
-;;   lghi %r5, 4096
-;;   stc %r3, 0(%r5,%r2)
+;;   lgr %r5, %r2
+;;   ag %r5, 0(%r4)
+;;   lghi %r2, 4096
+;;   stc %r3, 0(%r2,%r5)
 ;;   jg label2
 ;; block2:
 ;;   br %r14
@@ -60,9 +61,10 @@
 ;;   clgfi %r2, 268431359
 ;;   jgh label3 ; jg label1
 ;; block1:
-;;   ag %r2, 0(%r3)
-;;   lghi %r5, 4096
-;;   llc %r2, 0(%r5,%r2)
+;;   lgr %r5, %r2
+;;   ag %r5, 0(%r3)
+;;   lghi %r2, 4096
+;;   llc %r2, 0(%r2,%r5)
 ;;   jg label2
 ;; block2:
 ;;   br %r14
diff --git a/cranelift/filetests/filetests/isa/s390x/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/s390x/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index b74f04d06f9b..5e17082f889a 100644
--- a/cranelift/filetests/filetests/isa/s390x/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/s390x/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -44,9 +44,10 @@
 ;;   clgfi %r2, 268431356
 ;;   jgh label3 ; jg label1
 ;; block1:
-;;   ag %r2, 0(%r4)
-;;   lghi %r5, 4096
-;;   strv %r3, 0(%r5,%r2)
+;;   lgr %r5, %r2
+;;   ag %r5, 0(%r4)
+;;   lghi %r2, 4096
+;;   strv %r3, 0(%r2,%r5)
 ;;   jg label2
 ;; block2:
 ;;   br %r14
@@ -60,9 +61,10 @@
 ;;   clgfi %r2, 268431356
 ;;   jgh label3 ; jg label1
 ;; block1:
-;;   ag %r2, 0(%r3)
-;;   lghi %r5, 4096
-;;   lrv %r2, 0(%r5,%r2)
+;;   lgr %r5, %r2
+;;   ag %r5, 0(%r3)
+;;   lghi %r2, 4096
+;;   lrv %r2, 0(%r2,%r5)
 ;;   jg label2
 ;; block2:
 ;;   br %r14
diff --git a/cranelift/filetests/filetests/isa/s390x/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/isa/s390x/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index 1cc7a766fae8..d9442a3a1f20 100644
--- a/cranelift/filetests/filetests/isa/s390x/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/isa/s390x/wasm/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -44,9 +44,10 @@
 ;;   clgfi %r2, 268431359
 ;;   jgh label3 ; jg label1
 ;; block1:
-;;   ag %r2, 0(%r4)
-;;   lghi %r5, 4096
-;;   stc %r3, 0(%r5,%r2)
+;;   lgr %r5, %r2
+;;   ag %r5, 0(%r4)
+;;   lghi %r2, 4096
+;;   stc %r3, 0(%r2,%r5)
 ;;   jg label2
 ;; block2:
 ;;   br %r14
@@ -60,9 +61,10 @@
 ;;   clgfi %r2, 268431359
 ;;   jgh label3 ; jg label1
 ;; block1:
-;;   ag %r2, 0(%r3)
-;;   lghi %r5, 4096
-;;   llc %r2, 0(%r5,%r2)
+;;   lgr %r5, %r2
+;;   ag %r5, 0(%r3)
+;;   lghi %r2, 4096
+;;   llc %r2, 0(%r2,%r5)
 ;;   jg label2
 ;; block2:
 ;;   br %r14
diff --git a/cranelift/filetests/filetests/isa/x64/amode-opt.clif b/cranelift/filetests/filetests/isa/x64/amode-opt.clif
index 1188f022bb0d..2c8b00c744ec 100644
--- a/cranelift/filetests/filetests/isa/x64/amode-opt.clif
+++ b/cranelift/filetests/filetests/isa/x64/amode-opt.clif
@@ -210,8 +210,9 @@ block0(v0: i64, v1: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   shll    $3, %esi, %esi
-;   movq    -1(%rdi,%rsi,1), %rax
+;   movq    %rsi, %rdx
+;   shll    $3, %edx, %edx
+;   movq    -1(%rdi,%rdx,1), %rax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -221,8 +222,9 @@ block0(v0: i64, v1: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   shll $3, %esi
-;   movq -1(%rdi, %rsi), %rax ; trap: heap_oob
+;   movq %rsi, %rdx
+;   shll $3, %edx
+;   movq -1(%rdi, %rdx), %rax ; trap: heap_oob
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
diff --git a/cranelift/filetests/filetests/isa/x64/bmask.clif b/cranelift/filetests/filetests/isa/x64/bmask.clif
index 3871aaec8c59..8184c444cd66 100644
--- a/cranelift/filetests/filetests/isa/x64/bmask.clif
+++ b/cranelift/filetests/filetests/isa/x64/bmask.clif
@@ -509,11 +509,11 @@ block0(v0: i128):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   orq     %rdi, %rsi, %rdi
-;   movq    %rdi, %r8
-;   negq    %r8, %r8
 ;   movq    %rdi, %rdx
-;   sbbq    %rdx, %rdi, %rdx
+;   orq     %rdx, %rsi, %rdx
+;   movq    %rdx, %r8
+;   negq    %r8, %r8
+;   sbbq    %rdx, %rdx, %rdx
 ;   movq    %rdx, %rax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -524,11 +524,11 @@ block0(v0: i128):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   orq %rsi, %rdi
-;   movq %rdi, %r8
-;   negq %r8
 ;   movq %rdi, %rdx
-;   sbbq %rdi, %rdx
+;   orq %rsi, %rdx
+;   movq %rdx, %r8
+;   negq %r8
+;   sbbq %rdx, %rdx
 ;   movq %rdx, %rax
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -544,11 +544,11 @@ block0(v0: i128):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   orq     %rdi, %rsi, %rdi
-;   movq    %rdi, %r8
-;   negq    %r8, %r8
 ;   movq    %rdi, %rax
-;   sbbq    %rax, %rdi, %rax
+;   orq     %rax, %rsi, %rax
+;   movq    %rax, %r8
+;   negq    %r8, %r8
+;   sbbq    %rax, %rax, %rax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -558,11 +558,11 @@ block0(v0: i128):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   orq %rsi, %rdi
-;   movq %rdi, %r8
-;   negq %r8
 ;   movq %rdi, %rax
-;   sbbq %rdi, %rax
+;   orq %rsi, %rax
+;   movq %rax, %r8
+;   negq %r8
+;   sbbq %rax, %rax
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -577,11 +577,11 @@ block0(v0: i128):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   orq     %rdi, %rsi, %rdi
-;   movq    %rdi, %r8
-;   negq    %r8, %r8
 ;   movq    %rdi, %rax
-;   sbbl    %eax, %edi, %eax
+;   orq     %rax, %rsi, %rax
+;   movq    %rax, %r8
+;   negq    %r8, %r8
+;   sbbl    %eax, %eax, %eax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -591,11 +591,11 @@ block0(v0: i128):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   orq %rsi, %rdi
-;   movq %rdi, %r8
-;   negq %r8
 ;   movq %rdi, %rax
-;   sbbl %edi, %eax
+;   orq %rsi, %rax
+;   movq %rax, %r8
+;   negq %r8
+;   sbbl %eax, %eax
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -610,11 +610,11 @@ block0(v0: i128):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   orq     %rdi, %rsi, %rdi
-;   movq    %rdi, %r8
-;   negq    %r8, %r8
 ;   movq    %rdi, %rax
-;   sbbl    %eax, %edi, %eax
+;   orq     %rax, %rsi, %rax
+;   movq    %rax, %r8
+;   negq    %r8, %r8
+;   sbbl    %eax, %eax, %eax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -624,11 +624,11 @@ block0(v0: i128):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   orq %rsi, %rdi
-;   movq %rdi, %r8
-;   negq %r8
 ;   movq %rdi, %rax
-;   sbbl %edi, %eax
+;   orq %rsi, %rax
+;   movq %rax, %r8
+;   negq %r8
+;   sbbl %eax, %eax
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -643,11 +643,11 @@ block0(v0: i128):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   orq     %rdi, %rsi, %rdi
-;   movq    %rdi, %r8
-;   negq    %r8, %r8
 ;   movq    %rdi, %rax
-;   sbbl    %eax, %edi, %eax
+;   orq     %rax, %rsi, %rax
+;   movq    %rax, %r8
+;   negq    %r8, %r8
+;   sbbl    %eax, %eax, %eax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -657,11 +657,11 @@ block0(v0: i128):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   orq %rsi, %rdi
-;   movq %rdi, %r8
-;   negq %r8
 ;   movq %rdi, %rax
-;   sbbl %edi, %eax
+;   orq %rsi, %rax
+;   movq %rax, %r8
+;   negq %r8
+;   sbbl %eax, %eax
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
diff --git a/cranelift/filetests/filetests/isa/x64/bmi2.clif b/cranelift/filetests/filetests/isa/x64/bmi2.clif
index 134853ed393e..b65825742732 100644
--- a/cranelift/filetests/filetests/isa/x64/bmi2.clif
+++ b/cranelift/filetests/filetests/isa/x64/bmi2.clif
@@ -268,8 +268,9 @@ block0(v0: i32, v1: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andl    %esi, $31, %esi
-;   bzhi    %edi, %esi, %eax
+;   movq    %rsi, %rcx
+;   andl    %ecx, $31, %ecx
+;   bzhi    %edi, %ecx, %eax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -279,8 +280,9 @@ block0(v0: i32, v1: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   andl $0x1f, %esi
-;   bzhil %esi, %edi, %eax
+;   movq %rsi, %rcx
+;   andl $0x1f, %ecx
+;   bzhil %ecx, %edi, %eax
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -298,8 +300,9 @@ block0(v0: i64, v1: i64):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andq    %rsi, $63, %rsi
-;   bzhi    %rdi, %rsi, %rax
+;   movq    %rsi, %rcx
+;   andq    %rcx, $63, %rcx
+;   bzhi    %rdi, %rcx, %rax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -309,8 +312,9 @@ block0(v0: i64, v1: i64):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   andq $0x3f, %rsi
-;   bzhiq %rsi, %rdi, %rax
+;   movq %rsi, %rcx
+;   andq $0x3f, %rcx
+;   bzhiq %rcx, %rdi, %rax
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -329,8 +333,9 @@ block0(v0: i64, v1: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andl    %esi, $31, %esi
-;   bzhi    20(%rdi), %esi, %eax
+;   movq    %rsi, %rcx
+;   andl    %ecx, $31, %ecx
+;   bzhi    20(%rdi), %ecx, %eax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -340,8 +345,9 @@ block0(v0: i64, v1: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   andl $0x1f, %esi
-;   bzhil %esi, 0x14(%rdi), %eax ; trap: heap_oob
+;   movq %rsi, %rcx
+;   andl $0x1f, %ecx
+;   bzhil %ecx, 0x14(%rdi), %eax ; trap: heap_oob
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
diff --git a/cranelift/filetests/filetests/isa/x64/call-conv.clif b/cranelift/filetests/filetests/isa/x64/call-conv.clif
index 33d93d834604..a4e383e817f0 100644
--- a/cranelift/filetests/filetests/isa/x64/call-conv.clif
+++ b/cranelift/filetests/filetests/isa/x64/call-conv.clif
@@ -202,8 +202,8 @@ block0(
 ;   movq    %rax, %rdi
 ;   movq    16(%rbp), %r10
 ;   movq    24(%rbp), %r11
-;   movss   32(%rbp), %xmm11
-;   movsd   40(%rbp), %xmm13
+;   movss   32(%rbp), %xmm9
+;   movsd   40(%rbp), %xmm8
 ;   subq    %rsp, $144, %rsp
 ;   virtual_sp_offset_adjust 144
 ;   movq    %r8, 32(%rsp)
@@ -218,8 +218,8 @@ block0(
 ;   movsd   %xmm7, 104(%rsp)
 ;   movq    %r10, 112(%rsp)
 ;   movl    %r11d, 120(%rsp)
-;   movss   %xmm11, 128(%rsp)
-;   movsd   %xmm13, 136(%rsp)
+;   movss   %xmm9, 128(%rsp)
+;   movsd   %xmm8, 136(%rsp)
 ;   movq    %rdi, %r9
 ;   movq    %rcx, %r8
 ;   movq    %rsi, %rcx
@@ -242,8 +242,8 @@ block0(
 ;   movq %rax, %rdi
 ;   movq 0x10(%rbp), %r10
 ;   movq 0x18(%rbp), %r11
-;   movss 0x20(%rbp), %xmm11
-;   movsd 0x28(%rbp), %xmm13
+;   movss 0x20(%rbp), %xmm9
+;   movsd 0x28(%rbp), %xmm8
 ;   subq $0x90, %rsp
 ;   movq %r8, 0x20(%rsp)
 ;   movq %r9, 0x28(%rsp)
@@ -257,8 +257,8 @@ block0(
 ;   movsd %xmm7, 0x68(%rsp)
 ;   movq %r10, 0x70(%rsp)
 ;   movl %r11d, 0x78(%rsp)
-;   movss %xmm11, 0x80(%rsp)
-;   movsd %xmm13, 0x88(%rsp)
+;   movss %xmm9, 0x80(%rsp)
+;   movsd %xmm8, 0x88(%rsp)
 ;   movq %rdi, %r9
 ;   movq %rcx, %r8
 ;   movq %rsi, %rcx
@@ -330,7 +330,7 @@ block0(v0: i32, v1: f32, v2: i64, v3: f64, v4: i32, v5: i32, v6: i32, v7: f32, v
 ; block0:
 ;   movq    %rsi, %r9
 ;   movq    %rdi, %rsi
-;   movdqa  %xmm1, %xmm6
+;   movdqa  %xmm1, %xmm12
 ;   movdqa  %xmm0, %xmm1
 ;   subq    %rsp, $96, %rsp
 ;   virtual_sp_offset_adjust 96
@@ -343,7 +343,7 @@ block0(v0: i32, v1: f32, v2: i64, v3: f64, v4: i32, v5: i32, v6: i32, v7: f32, v
 ;   movsd   %xmm5, 80(%rsp)
 ;   movq    %rsi, %rcx
 ;   movq    %r9, %r8
-;   movdqa  %xmm6, %xmm3
+;   movdqa  %xmm12, %xmm3
 ;   call    *%rcx
 ;   addq    %rsp, $96, %rsp
 ;   virtual_sp_offset_adjust -96
@@ -358,7 +358,7 @@ block0(v0: i32, v1: f32, v2: i64, v3: f64, v4: i32, v5: i32, v6: i32, v7: f32, v
 ; block1: ; offset 0x4
 ;   movq %rsi, %r9
 ;   movq %rdi, %rsi
-;   movdqa %xmm1, %xmm6
+;   movdqa %xmm1, %xmm12
 ;   movdqa %xmm0, %xmm1
 ;   subq $0x60, %rsp
 ;   movl %edx, 0x20(%rsp)
@@ -370,7 +370,7 @@ block0(v0: i32, v1: f32, v2: i64, v3: f64, v4: i32, v5: i32, v6: i32, v7: f32, v
 ;   movsd %xmm5, 0x50(%rsp)
 ;   movq %rsi, %rcx
 ;   movq %r9, %r8
-;   movdqa %xmm6, %xmm3
+;   movdqa %xmm12, %xmm3
 ;   callq *%rcx
 ;   addq $0x60, %rsp
 ;   movq %rbp, %rsp
@@ -425,8 +425,8 @@ block0(v0: i32, v1: i32, v2: i8x16, v3: i64, v4: i8x16):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   movq    %rsi, %rcx
 ;   movq    %rdx, %r8
+;   movq    %rsi, %rcx
 ;   subq    %rsp, $64, %rsp
 ;   virtual_sp_offset_adjust 64
 ;   lea     32(%rsp), %rdx
@@ -446,8 +446,8 @@ block0(v0: i32, v1: i32, v2: i8x16, v3: i64, v4: i8x16):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   movq %rsi, %rcx
 ;   movq %rdx, %r8
+;   movq %rsi, %rcx
 ;   subq $0x40, %rsp
 ;   leaq 0x20(%rsp), %rdx
 ;   movdqu %xmm0, (%rdx)
diff --git a/cranelift/filetests/filetests/isa/x64/cmp-mem-bug.clif b/cranelift/filetests/filetests/isa/x64/cmp-mem-bug.clif
index 2574ddfb3de5..331239f54827 100644
--- a/cranelift/filetests/filetests/isa/x64/cmp-mem-bug.clif
+++ b/cranelift/filetests/filetests/isa/x64/cmp-mem-bug.clif
@@ -54,13 +54,13 @@ block0(v0: f64, v1: i64):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   movsd   0(%rdi), %xmm1
-;   ucomisd %xmm1, %xmm0
+;   movsd   0(%rdi), %xmm9
+;   ucomisd %xmm9, %xmm0
 ;   setnp   %dil
 ;   setz    %al
 ;   andl    %edi, %eax, %edi
 ;   movzbq  %dil, %rax
-;   ucomisd %xmm1, %xmm0
+;   ucomisd %xmm9, %xmm0
 ;   movdqa  %xmm0, %xmm2
 ;   movsd %xmm0, %xmm0; jnp $next; movsd %xmm2, %xmm0; $next:
 ;   movsd %xmm0, %xmm0; jz $next; movsd %xmm2, %xmm0; $next:
@@ -73,17 +73,17 @@ block0(v0: f64, v1: i64):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   movsd (%rdi), %xmm1 ; trap: heap_oob
-;   ucomisd %xmm1, %xmm0
+;   movsd (%rdi), %xmm9 ; trap: heap_oob
+;   ucomisd %xmm9, %xmm0
 ;   setnp %dil
 ;   sete %al
 ;   andl %eax, %edi
 ;   movzbq %dil, %rax
-;   ucomisd %xmm1, %xmm0
+;   ucomisd %xmm9, %xmm0
 ;   movdqa %xmm0, %xmm2
-;   jnp 0x2c
+;   jnp 0x2f
 ;   movsd %xmm2, %xmm0
-;   je 0x36
+;   je 0x39
 ;   movsd %xmm2, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
diff --git a/cranelift/filetests/filetests/isa/x64/conditional-values.clif b/cranelift/filetests/filetests/isa/x64/conditional-values.clif
index 8cba952ac3d7..d54ebd4f34a8 100644
--- a/cranelift/filetests/filetests/isa/x64/conditional-values.clif
+++ b/cranelift/filetests/filetests/isa/x64/conditional-values.clif
@@ -347,8 +347,8 @@ block0(v0: i64):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   notq    %rdi, %rdi
 ;   movq    %rdi, %rax
+;   notq    %rax, %rax
 ;   shrq    $63, %rax, %rax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -359,8 +359,8 @@ block0(v0: i64):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   notq %rdi
 ;   movq %rdi, %rax
+;   notq %rax
 ;   shrq $0x3f, %rax
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -377,8 +377,8 @@ block0(v0: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   notq    %rdi, %rdi
 ;   movq    %rdi, %rax
+;   notq    %rax, %rax
 ;   shrl    $31, %eax, %eax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -389,8 +389,8 @@ block0(v0: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   notq %rdi
 ;   movq %rdi, %rax
+;   notq %rax
 ;   shrl $0x1f, %eax
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -407,8 +407,8 @@ block0(v0: i64):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   notq    %rdi, %rdi
 ;   movq    %rdi, %rax
+;   notq    %rax, %rax
 ;   shrq    $63, %rax, %rax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -419,8 +419,8 @@ block0(v0: i64):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   notq %rdi
 ;   movq %rdi, %rax
+;   notq %rax
 ;   shrq $0x3f, %rax
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -437,8 +437,8 @@ block0(v0: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   notq    %rdi, %rdi
 ;   movq    %rdi, %rax
+;   notq    %rax, %rax
 ;   shrl    $31, %eax, %eax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -449,8 +449,8 @@ block0(v0: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   notq %rdi
 ;   movq %rdi, %rax
+;   notq %rax
 ;   shrl $0x1f, %eax
 ;   movq %rbp, %rsp
 ;   popq %rbp
diff --git a/cranelift/filetests/filetests/isa/x64/fastcall.clif b/cranelift/filetests/filetests/isa/x64/fastcall.clif
index d83c9fbee0f0..0bf874402fdb 100644
--- a/cranelift/filetests/filetests/isa/x64/fastcall.clif
+++ b/cranelift/filetests/filetests/isa/x64/fastcall.clif
@@ -241,27 +241,20 @@ block0(v0: i64):
 ;   pushq   %rbp
 ;   unwind PushFrameRegs { offset_upward_to_caller_sp: 16 }
 ;   movq    %rsp, %rbp
-;   unwind DefineNewFrame { offset_upward_to_caller_sp: 16, offset_downward_to_clobbers: 16 }
-;   subq    %rsp, $16, %rsp
-;   movq    %rdi, 0(%rsp)
-;   unwind SaveReg { clobber_offset: 0, reg: p7i }
+;   unwind DefineNewFrame { offset_upward_to_caller_sp: 16, offset_downward_to_clobbers: 0 }
 ; block0:
-;   uninit  %xmm3
-;   xorpd   %xmm3, %xmm3, %xmm3
-;   cvtsi2sd %xmm3, %rcx, %xmm3
+;   cvtsi2sd %rcx, %xmm3
 ;   subq    %rsp, $48, %rsp
 ;   virtual_sp_offset_adjust 48
 ;   movq    %rcx, 32(%rsp)
 ;   movq    %rcx, 40(%rsp)
 ;   movq    %rcx, %rdx
-;   load_ext_name %g+0, %rdi
+;   load_ext_name %g+0, %r11
 ;   movq    %rdx, %rcx
 ;   movdqa  %xmm3, %xmm2
-;   call    *%rdi
+;   call    *%r11
 ;   addq    %rsp, $48, %rsp
 ;   virtual_sp_offset_adjust -48
-;   movq    0(%rsp), %rdi
-;   addq    %rsp, $16, %rsp
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -270,22 +263,17 @@ block0(v0: i64):
 ; block0: ; offset 0x0
 ;   pushq %rbp
 ;   movq %rsp, %rbp
-;   subq $0x10, %rsp
-;   movq %rdi, (%rsp)
-; block1: ; offset 0xc
-;   xorpd %xmm3, %xmm3
+; block1: ; offset 0x4
 ;   cvtsi2sdq %rcx, %xmm3
 ;   subq $0x30, %rsp
 ;   movq %rcx, 0x20(%rsp)
 ;   movq %rcx, 0x28(%rsp)
 ;   movq %rcx, %rdx
-;   movabsq $0, %rdi ; reloc_external Abs8 %g 0
+;   movabsq $0, %r11 ; reloc_external Abs8 %g 0
 ;   movq %rdx, %rcx
 ;   movdqa %xmm3, %xmm2
-;   callq *%rdi
+;   callq *%r11
 ;   addq $0x30, %rsp
-;   movq (%rsp), %rdi
-;   addq $0x10, %rsp
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -368,53 +356,51 @@ block0(v0: i64):
 ;   unwind SaveReg { clobber_offset: 144, reg: p15f }
 ; block0:
 ;   movsd   0(%rcx), %xmm0
-;   movsd   8(%rcx), %xmm8
-;   movdqu  %xmm8, rsp(48 + virtual offset)
-;   movsd   16(%rcx), %xmm10
-;   movdqu  %xmm10, rsp(0 + virtual offset)
-;   movsd   24(%rcx), %xmm9
-;   movdqa  %xmm9, %xmm10
-;   movsd   32(%rcx), %xmm5
-;   movsd   40(%rcx), %xmm6
-;   movdqu  %xmm6, rsp(32 + virtual offset)
+;   movsd   8(%rcx), %xmm10
+;   movdqu  %xmm10, rsp(48 + virtual offset)
+;   movsd   16(%rcx), %xmm5
+;   movsd   24(%rcx), %xmm14
+;   movdqu  %xmm14, rsp(32 + virtual offset)
+;   movsd   32(%rcx), %xmm13
+;   movsd   40(%rcx), %xmm15
+;   movdqu  %xmm15, rsp(16 + virtual offset)
 ;   movsd   48(%rcx), %xmm7
-;   movsd   56(%rcx), %xmm12
-;   movdqu  %xmm12, rsp(16 + virtual offset)
-;   movsd   64(%rcx), %xmm4
-;   movsd   72(%rcx), %xmm12
-;   movsd   80(%rcx), %xmm1
-;   movsd   88(%rcx), %xmm14
+;   movsd   56(%rcx), %xmm8
+;   movdqu  %xmm8, rsp(0 + virtual offset)
+;   movsd   64(%rcx), %xmm12
+;   movsd   72(%rcx), %xmm2
+;   movsd   80(%rcx), %xmm9
+;   movsd   88(%rcx), %xmm4
 ;   movsd   96(%rcx), %xmm3
-;   movsd   104(%rcx), %xmm15
+;   movsd   104(%rcx), %xmm8
 ;   movsd   112(%rcx), %xmm11
-;   movsd   120(%rcx), %xmm8
-;   movsd   128(%rcx), %xmm2
-;   movsd   136(%rcx), %xmm9
-;   movsd   144(%rcx), %xmm13
-;   movdqu  rsp(48 + virtual offset), %xmm6
-;   addsd   %xmm0, %xmm6, %xmm0
-;   movdqa  %xmm10, %xmm6
-;   movdqu  rsp(0 + virtual offset), %xmm10
-;   addsd   %xmm10, %xmm6, %xmm10
-;   movdqu  rsp(32 + virtual offset), %xmm6
-;   addsd   %xmm5, %xmm6, %xmm5
-;   movdqu  rsp(16 + virtual offset), %xmm6
-;   addsd   %xmm7, %xmm6, %xmm7
-;   addsd   %xmm4, %xmm12, %xmm4
-;   addsd   %xmm1, %xmm14, %xmm1
-;   addsd   %xmm3, %xmm15, %xmm3
-;   addsd   %xmm11, %xmm8, %xmm11
-;   addsd   %xmm2, %xmm9, %xmm2
-;   addsd   %xmm13, 152(%rcx), %xmm13
-;   addsd   %xmm0, %xmm10, %xmm0
-;   addsd   %xmm5, %xmm7, %xmm5
-;   addsd   %xmm4, %xmm1, %xmm4
-;   addsd   %xmm3, %xmm11, %xmm3
-;   addsd   %xmm2, %xmm13, %xmm2
+;   movsd   120(%rcx), %xmm10
+;   movsd   128(%rcx), %xmm6
+;   movsd   136(%rcx), %xmm14
+;   movsd   144(%rcx), %xmm1
+;   movdqu  rsp(48 + virtual offset), %xmm15
+;   addsd   %xmm0, %xmm15, %xmm0
+;   movdqu  rsp(32 + virtual offset), %xmm15
+;   addsd   %xmm5, %xmm15, %xmm5
+;   movdqu  rsp(16 + virtual offset), %xmm15
+;   addsd   %xmm13, %xmm15, %xmm13
+;   movdqu  rsp(0 + virtual offset), %xmm15
+;   addsd   %xmm7, %xmm15, %xmm7
+;   addsd   %xmm12, %xmm2, %xmm12
+;   addsd   %xmm9, %xmm4, %xmm9
+;   addsd   %xmm3, %xmm8, %xmm3
+;   addsd   %xmm11, %xmm10, %xmm11
+;   addsd   %xmm6, %xmm14, %xmm6
+;   addsd   %xmm1, 152(%rcx), %xmm1
 ;   addsd   %xmm0, %xmm5, %xmm0
-;   addsd   %xmm4, %xmm3, %xmm4
-;   addsd   %xmm0, %xmm4, %xmm0
-;   addsd   %xmm0, %xmm2, %xmm0
+;   addsd   %xmm13, %xmm7, %xmm13
+;   addsd   %xmm12, %xmm9, %xmm12
+;   addsd   %xmm3, %xmm11, %xmm3
+;   addsd   %xmm6, %xmm1, %xmm6
+;   addsd   %xmm0, %xmm13, %xmm0
+;   addsd   %xmm12, %xmm3, %xmm12
+;   addsd   %xmm0, %xmm12, %xmm0
+;   addsd   %xmm0, %xmm6, %xmm0
 ;   movdqu  64(%rsp), %xmm6
 ;   movdqu  80(%rsp), %xmm7
 ;   movdqu  96(%rsp), %xmm8
@@ -447,53 +433,51 @@ block0(v0: i64):
 ;   movdqu %xmm15, 0xd0(%rsp)
 ; block1: ; offset 0x61
 ;   movsd (%rcx), %xmm0 ; trap: heap_oob
-;   movsd 8(%rcx), %xmm8 ; trap: heap_oob
-;   movdqu %xmm8, 0x30(%rsp)
-;   movsd 0x10(%rcx), %xmm10 ; trap: heap_oob
-;   movdqu %xmm10, (%rsp)
-;   movsd 0x18(%rcx), %xmm9 ; trap: heap_oob
-;   movdqa %xmm9, %xmm10
-;   movsd 0x20(%rcx), %xmm5 ; trap: heap_oob
-;   movsd 0x28(%rcx), %xmm6 ; trap: heap_oob
-;   movdqu %xmm6, 0x20(%rsp)
+;   movsd 8(%rcx), %xmm10 ; trap: heap_oob
+;   movdqu %xmm10, 0x30(%rsp)
+;   movsd 0x10(%rcx), %xmm5 ; trap: heap_oob
+;   movsd 0x18(%rcx), %xmm14 ; trap: heap_oob
+;   movdqu %xmm14, 0x20(%rsp)
+;   movsd 0x20(%rcx), %xmm13 ; trap: heap_oob
+;   movsd 0x28(%rcx), %xmm15 ; trap: heap_oob
+;   movdqu %xmm15, 0x10(%rsp)
 ;   movsd 0x30(%rcx), %xmm7 ; trap: heap_oob
-;   movsd 0x38(%rcx), %xmm12 ; trap: heap_oob
-;   movdqu %xmm12, 0x10(%rsp)
-;   movsd 0x40(%rcx), %xmm4 ; trap: heap_oob
-;   movsd 0x48(%rcx), %xmm12 ; trap: heap_oob
-;   movsd 0x50(%rcx), %xmm1 ; trap: heap_oob
-;   movsd 0x58(%rcx), %xmm14 ; trap: heap_oob
+;   movsd 0x38(%rcx), %xmm8 ; trap: heap_oob
+;   movdqu %xmm8, (%rsp)
+;   movsd 0x40(%rcx), %xmm12 ; trap: heap_oob
+;   movsd 0x48(%rcx), %xmm2 ; trap: heap_oob
+;   movsd 0x50(%rcx), %xmm9 ; trap: heap_oob
+;   movsd 0x58(%rcx), %xmm4 ; trap: heap_oob
 ;   movsd 0x60(%rcx), %xmm3 ; trap: heap_oob
-;   movsd 0x68(%rcx), %xmm15 ; trap: heap_oob
+;   movsd 0x68(%rcx), %xmm8 ; trap: heap_oob
 ;   movsd 0x70(%rcx), %xmm11 ; trap: heap_oob
-;   movsd 0x78(%rcx), %xmm8 ; trap: heap_oob
-;   movsd 0x80(%rcx), %xmm2 ; trap: heap_oob
-;   movsd 0x88(%rcx), %xmm9 ; trap: heap_oob
-;   movsd 0x90(%rcx), %xmm13 ; trap: heap_oob
-;   movdqu 0x30(%rsp), %xmm6
-;   addsd %xmm6, %xmm0
-;   movdqa %xmm10, %xmm6
-;   movdqu (%rsp), %xmm10
-;   addsd %xmm6, %xmm10
-;   movdqu 0x20(%rsp), %xmm6
-;   addsd %xmm6, %xmm5
-;   movdqu 0x10(%rsp), %xmm6
-;   addsd %xmm6, %xmm7
-;   addsd %xmm12, %xmm4
-;   addsd %xmm14, %xmm1
-;   addsd %xmm15, %xmm3
-;   addsd %xmm8, %xmm11
-;   addsd %xmm9, %xmm2
-;   addsd 0x98(%rcx), %xmm13 ; trap: heap_oob
-;   addsd %xmm10, %xmm0
-;   addsd %xmm7, %xmm5
-;   addsd %xmm1, %xmm4
-;   addsd %xmm11, %xmm3
-;   addsd %xmm13, %xmm2
+;   movsd 0x78(%rcx), %xmm10 ; trap: heap_oob
+;   movsd 0x80(%rcx), %xmm6 ; trap: heap_oob
+;   movsd 0x88(%rcx), %xmm14 ; trap: heap_oob
+;   movsd 0x90(%rcx), %xmm1 ; trap: heap_oob
+;   movdqu 0x30(%rsp), %xmm15
+;   addsd %xmm15, %xmm0
+;   movdqu 0x20(%rsp), %xmm15
+;   addsd %xmm15, %xmm5
+;   movdqu 0x10(%rsp), %xmm15
+;   addsd %xmm15, %xmm13
+;   movdqu (%rsp), %xmm15
+;   addsd %xmm15, %xmm7
+;   addsd %xmm2, %xmm12
+;   addsd %xmm4, %xmm9
+;   addsd %xmm8, %xmm3
+;   addsd %xmm10, %xmm11
+;   addsd %xmm14, %xmm6
+;   addsd 0x98(%rcx), %xmm1 ; trap: heap_oob
 ;   addsd %xmm5, %xmm0
-;   addsd %xmm3, %xmm4
-;   addsd %xmm4, %xmm0
-;   addsd %xmm2, %xmm0
+;   addsd %xmm7, %xmm13
+;   addsd %xmm9, %xmm12
+;   addsd %xmm11, %xmm3
+;   addsd %xmm1, %xmm6
+;   addsd %xmm13, %xmm0
+;   addsd %xmm3, %xmm12
+;   addsd %xmm12, %xmm0
+;   addsd %xmm6, %xmm0
 ;   movdqu 0x40(%rsp), %xmm6
 ;   movdqu 0x50(%rsp), %xmm7
 ;   movdqu 0x60(%rsp), %xmm8
diff --git a/cranelift/filetests/filetests/isa/x64/fcopysign.clif b/cranelift/filetests/filetests/isa/x64/fcopysign.clif
index c2f39049ac96..a6140711c829 100644
--- a/cranelift/filetests/filetests/isa/x64/fcopysign.clif
+++ b/cranelift/filetests/filetests/isa/x64/fcopysign.clif
@@ -13,9 +13,9 @@ block0(v0: f32, v1: f32):
 ; block0:
 ;   movl    $-2147483648, %ecx
 ;   movd    %ecx, %xmm7
-;   movdqa  %xmm0, %xmm2
+;   movdqa  %xmm0, %xmm10
 ;   movdqa  %xmm7, %xmm0
-;   andnps  %xmm0, %xmm2, %xmm0
+;   andnps  %xmm0, %xmm10, %xmm0
 ;   andps   %xmm7, %xmm1, %xmm7
 ;   orps    %xmm0, %xmm7, %xmm0
 ;   movq    %rbp, %rsp
@@ -29,9 +29,9 @@ block0(v0: f32, v1: f32):
 ; block1: ; offset 0x4
 ;   movl $0x80000000, %ecx
 ;   movd %ecx, %xmm7
-;   movdqa %xmm0, %xmm2
+;   movdqa %xmm0, %xmm10
 ;   movdqa %xmm7, %xmm0
-;   andnps %xmm2, %xmm0
+;   andnps %xmm10, %xmm0
 ;   andps %xmm1, %xmm7
 ;   orps %xmm7, %xmm0
 ;   movq %rbp, %rsp
@@ -50,9 +50,9 @@ block0(v0: f64, v1: f64):
 ; block0:
 ;   movabsq $-9223372036854775808, %rcx
 ;   movq    %rcx, %xmm7
-;   movdqa  %xmm0, %xmm2
+;   movdqa  %xmm0, %xmm10
 ;   movdqa  %xmm7, %xmm0
-;   andnpd  %xmm0, %xmm2, %xmm0
+;   andnpd  %xmm0, %xmm10, %xmm0
 ;   andpd   %xmm7, %xmm1, %xmm7
 ;   orpd    %xmm0, %xmm7, %xmm0
 ;   movq    %rbp, %rsp
@@ -66,9 +66,9 @@ block0(v0: f64, v1: f64):
 ; block1: ; offset 0x4
 ;   movabsq $9223372036854775808, %rcx
 ;   movq %rcx, %xmm7
-;   movdqa %xmm0, %xmm2
+;   movdqa %xmm0, %xmm10
 ;   movdqa %xmm7, %xmm0
-;   andnpd %xmm2, %xmm0
+;   andnpd %xmm10, %xmm0
 ;   andpd %xmm1, %xmm7
 ;   orpd %xmm7, %xmm0
 ;   movq %rbp, %rsp
diff --git a/cranelift/filetests/filetests/isa/x64/fcvt-avx.clif b/cranelift/filetests/filetests/isa/x64/fcvt-avx.clif
index d46212e18597..98e47d2b79f8 100644
--- a/cranelift/filetests/filetests/isa/x64/fcvt-avx.clif
+++ b/cranelift/filetests/filetests/isa/x64/fcvt-avx.clif
@@ -11,9 +11,7 @@ block0(v0: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   uninit  %xmm2
-;   vxorps  %xmm2, %xmm2, %xmm4
-;   vcvtsi2ss %xmm4, %edi, %xmm0
+;   vcvtsi2ss %edi, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -23,8 +21,7 @@ block0(v0: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   vxorps %xmm2, %xmm2, %xmm4
-;   vcvtsi2ssl %edi, %xmm4, %xmm0
+;   vcvtsi2ssl %edi, %xmm0, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -39,9 +36,7 @@ block0(v0: i64):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   uninit  %xmm2
-;   vxorps  %xmm2, %xmm2, %xmm4
-;   vcvtsi2ss %xmm4, %rdi, %xmm0
+;   vcvtsi2ss %rdi, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -51,8 +46,7 @@ block0(v0: i64):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   vxorps %xmm2, %xmm2, %xmm4
-;   vcvtsi2ssq %rdi, %xmm4, %xmm0
+;   vcvtsi2ssq %rdi, %xmm0, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -67,9 +61,7 @@ block0(v0: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   uninit  %xmm2
-;   vxorpd  %xmm2, %xmm2, %xmm4
-;   vcvtsi2sd %xmm4, %edi, %xmm0
+;   vcvtsi2sd %edi, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -79,8 +71,7 @@ block0(v0: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   vxorpd %xmm2, %xmm2, %xmm4
-;   vcvtsi2sdl %edi, %xmm4, %xmm0
+;   vcvtsi2sdl %edi, %xmm0, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -95,9 +86,7 @@ block0(v0: i64):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   uninit  %xmm2
-;   vxorpd  %xmm2, %xmm2, %xmm4
-;   vcvtsi2sd %xmm4, %rdi, %xmm0
+;   vcvtsi2sd %rdi, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -107,8 +96,7 @@ block0(v0: i64):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   vxorpd %xmm2, %xmm2, %xmm4
-;   vcvtsi2sdq %rdi, %xmm4, %xmm0
+;   vcvtsi2sdq %rdi, %xmm0, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
diff --git a/cranelift/filetests/filetests/isa/x64/fcvt.clif b/cranelift/filetests/filetests/isa/x64/fcvt.clif
index 2533ccb85fa8..cbe440745cf4 100644
--- a/cranelift/filetests/filetests/isa/x64/fcvt.clif
+++ b/cranelift/filetests/filetests/isa/x64/fcvt.clif
@@ -11,10 +11,8 @@ block0(v0: i8):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   uninit  %xmm0
-;   xorps   %xmm0, %xmm0, %xmm0
-;   movsbl  %dil, %r9d
-;   cvtsi2ss %xmm0, %r9d, %xmm0
+;   movsbl  %dil, %eax
+;   cvtsi2ss %eax, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -24,9 +22,8 @@ block0(v0: i8):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   xorps %xmm0, %xmm0
-;   movsbl %dil, %r9d
-;   cvtsi2ssl %r9d, %xmm0
+;   movsbl %dil, %eax
+;   cvtsi2ssl %eax, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -41,10 +38,8 @@ block0(v0: i16):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   uninit  %xmm0
-;   xorps   %xmm0, %xmm0, %xmm0
-;   movswl  %di, %r9d
-;   cvtsi2ss %xmm0, %r9d, %xmm0
+;   movswl  %di, %eax
+;   cvtsi2ss %eax, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -54,9 +49,8 @@ block0(v0: i16):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   xorps %xmm0, %xmm0
-;   movswl %di, %r9d
-;   cvtsi2ssl %r9d, %xmm0
+;   movswl %di, %eax
+;   cvtsi2ssl %eax, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -71,9 +65,7 @@ block0(v0: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   uninit  %xmm0
-;   xorps   %xmm0, %xmm0, %xmm0
-;   cvtsi2ss %xmm0, %edi, %xmm0
+;   cvtsi2ss %edi, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -83,7 +75,6 @@ block0(v0: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   xorps %xmm0, %xmm0
 ;   cvtsi2ssl %edi, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -99,9 +90,7 @@ block0(v0: i64):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   uninit  %xmm0
-;   xorps   %xmm0, %xmm0, %xmm0
-;   cvtsi2ss %xmm0, %rdi, %xmm0
+;   cvtsi2ss %rdi, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -111,7 +100,6 @@ block0(v0: i64):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   xorps %xmm0, %xmm0
 ;   cvtsi2ssq %rdi, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -127,10 +115,8 @@ block0(v0: i8):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   uninit  %xmm0
-;   xorpd   %xmm0, %xmm0, %xmm0
-;   movsbl  %dil, %r9d
-;   cvtsi2sd %xmm0, %r9d, %xmm0
+;   movsbl  %dil, %eax
+;   cvtsi2sd %eax, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -140,9 +126,8 @@ block0(v0: i8):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   xorpd %xmm0, %xmm0
-;   movsbl %dil, %r9d
-;   cvtsi2sdl %r9d, %xmm0
+;   movsbl %dil, %eax
+;   cvtsi2sdl %eax, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -157,10 +142,8 @@ block0(v0: i16):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   uninit  %xmm0
-;   xorpd   %xmm0, %xmm0, %xmm0
-;   movswl  %di, %r9d
-;   cvtsi2sd %xmm0, %r9d, %xmm0
+;   movswl  %di, %eax
+;   cvtsi2sd %eax, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -170,9 +153,8 @@ block0(v0: i16):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   xorpd %xmm0, %xmm0
-;   movswl %di, %r9d
-;   cvtsi2sdl %r9d, %xmm0
+;   movswl %di, %eax
+;   cvtsi2sdl %eax, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -187,9 +169,7 @@ block0(v0: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   uninit  %xmm0
-;   xorpd   %xmm0, %xmm0, %xmm0
-;   cvtsi2sd %xmm0, %edi, %xmm0
+;   cvtsi2sd %edi, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -199,7 +179,6 @@ block0(v0: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   xorpd %xmm0, %xmm0
 ;   cvtsi2sdl %edi, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -215,9 +194,7 @@ block0(v0: i64):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   uninit  %xmm0
-;   xorpd   %xmm0, %xmm0, %xmm0
-;   cvtsi2sd %xmm0, %rdi, %xmm0
+;   cvtsi2sd %rdi, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -227,7 +204,6 @@ block0(v0: i64):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   xorpd %xmm0, %xmm0
 ;   cvtsi2sdq %rdi, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -275,22 +251,16 @@ block0(v0: i8, v1: i16, v2: i32, v3: i64):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   uninit  %xmm0
-;   xorps   %xmm0, %xmm0, %xmm0
-;   movzbq  %dil, %r8
-;   cvtsi2ss %xmm0, %r8, %xmm0
-;   uninit  %xmm6
-;   xorps   %xmm6, %xmm6, %xmm6
-;   movzwq  %si, %r8
-;   cvtsi2ss %xmm6, %r8, %xmm6
-;   uninit  %xmm7
-;   xorps   %xmm7, %xmm7, %xmm7
-;   movl    %edx, %r8d
-;   cvtsi2ss %xmm7, %r8, %xmm7
-;   u64_to_f32_seq %rcx, %xmm4, %r8, %rdx
-;   addss   %xmm0, %xmm6, %xmm0
-;   addss   %xmm0, %xmm7, %xmm0
-;   addss   %xmm0, %xmm4, %xmm0
+;   movzbq  %dil, %r9
+;   cvtsi2ss %r9, %xmm0
+;   movzwq  %si, %r9
+;   cvtsi2ss %r9, %xmm1
+;   movl    %edx, %r9d
+;   cvtsi2ss %r9, %xmm2
+;   u64_to_f32_seq %rcx, %xmm14, %r9, %r10
+;   addss   %xmm0, %xmm1, %xmm0
+;   addss   %xmm0, %xmm2, %xmm0
+;   addss   %xmm0, %xmm14, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -300,29 +270,26 @@ block0(v0: i8, v1: i16, v2: i32, v3: i64):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   xorps %xmm0, %xmm0
-;   movzbq %dil, %r8
-;   cvtsi2ssq %r8, %xmm0
-;   xorps %xmm6, %xmm6
-;   movzwq %si, %r8
-;   cvtsi2ssq %r8, %xmm6
-;   xorps %xmm7, %xmm7
-;   movl %edx, %r8d
-;   cvtsi2ssq %r8, %xmm7
+;   movzbq %dil, %r9
+;   cvtsi2ssq %r9, %xmm0
+;   movzwq %si, %r9
+;   cvtsi2ssq %r9, %xmm1
+;   movl %edx, %r9d
+;   cvtsi2ssq %r9, %xmm2
 ;   cmpq $0, %rcx
-;   jl 0x3b
-;   cvtsi2ssq %rcx, %xmm4
-;   jmp 0x55
-;   movq %rcx, %r8
-;   shrq $1, %r8
-;   movq %rcx, %rdx
-;   andq $1, %rdx
-;   orq %r8, %rdx
-;   cvtsi2ssq %rdx, %xmm4
-;   addss %xmm4, %xmm4
-;   addss %xmm6, %xmm0
-;   addss %xmm7, %xmm0
-;   addss %xmm4, %xmm0
+;   jl 0x32
+;   cvtsi2ssq %rcx, %xmm14
+;   jmp 0x4d
+;   movq %rcx, %r9
+;   shrq $1, %r9
+;   movq %rcx, %r10
+;   andq $1, %r10
+;   orq %r9, %r10
+;   cvtsi2ssq %r10, %xmm14
+;   addss %xmm14, %xmm14
+;   addss %xmm1, %xmm0
+;   addss %xmm2, %xmm0
+;   addss %xmm14, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -386,12 +353,13 @@ block0(v0: i32x4):
 ;   movdqa  %xmm0, %xmm3
 ;   pslld   %xmm3, $16, %xmm3
 ;   psrld   %xmm3, $16, %xmm3
-;   psubd   %xmm0, %xmm3, %xmm0
-;   cvtdq2ps %xmm3, %xmm1
-;   psrld   %xmm0, $1, %xmm0
-;   cvtdq2ps %xmm0, %xmm0
+;   movdqa  %xmm0, %xmm9
+;   psubd   %xmm9, %xmm3, %xmm9
+;   cvtdq2ps %xmm3, %xmm8
+;   psrld   %xmm9, $1, %xmm9
+;   cvtdq2ps %xmm9, %xmm0
 ;   addps   %xmm0, %xmm0, %xmm0
-;   addps   %xmm0, %xmm1, %xmm0
+;   addps   %xmm0, %xmm8, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -404,12 +372,13 @@ block0(v0: i32x4):
 ;   movdqa %xmm0, %xmm3
 ;   pslld $0x10, %xmm3
 ;   psrld $0x10, %xmm3
-;   psubd %xmm3, %xmm0
-;   cvtdq2ps %xmm3, %xmm1
-;   psrld $1, %xmm0
-;   cvtdq2ps %xmm0, %xmm0
+;   movdqa %xmm0, %xmm9
+;   psubd %xmm3, %xmm9
+;   cvtdq2ps %xmm3, %xmm8
+;   psrld $1, %xmm9
+;   cvtdq2ps %xmm9, %xmm0
 ;   addps %xmm0, %xmm0
-;   addps %xmm1, %xmm0
+;   addps %xmm8, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -1066,19 +1035,20 @@ block0(v0: f32x4):
 ; block0:
 ;   uninit  %xmm6
 ;   xorps   %xmm6, %xmm6, %xmm6
-;   maxps   %xmm0, %xmm6, %xmm0
+;   movdqa  %xmm0, %xmm11
+;   maxps   %xmm11, %xmm6, %xmm11
 ;   pcmpeqd %xmm6, %xmm6, %xmm6
 ;   psrld   %xmm6, $1, %xmm6
-;   cvtdq2ps %xmm6, %xmm7
-;   cvttps2dq %xmm0, %xmm6
-;   subps   %xmm0, %xmm7, %xmm0
-;   cmpps   $2, %xmm7, %xmm0, %xmm7
-;   cvttps2dq %xmm0, %xmm0
-;   pxor    %xmm0, %xmm7, %xmm0
-;   uninit  %xmm1
-;   pxor    %xmm1, %xmm1, %xmm1
-;   pmaxsd  %xmm0, %xmm1, %xmm0
-;   paddd   %xmm0, %xmm6, %xmm0
+;   cvtdq2ps %xmm6, %xmm15
+;   cvttps2dq %xmm11, %xmm14
+;   subps   %xmm11, %xmm15, %xmm11
+;   cmpps   $2, %xmm15, %xmm11, %xmm15
+;   cvttps2dq %xmm11, %xmm0
+;   pxor    %xmm0, %xmm15, %xmm0
+;   uninit  %xmm9
+;   pxor    %xmm9, %xmm9, %xmm9
+;   pmaxsd  %xmm0, %xmm9, %xmm0
+;   paddd   %xmm0, %xmm14, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -1089,18 +1059,19 @@ block0(v0: f32x4):
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
 ;   xorps %xmm6, %xmm6
-;   maxps %xmm6, %xmm0
+;   movdqa %xmm0, %xmm11
+;   maxps %xmm6, %xmm11
 ;   pcmpeqd %xmm6, %xmm6
 ;   psrld $1, %xmm6
-;   cvtdq2ps %xmm6, %xmm7
-;   cvttps2dq %xmm0, %xmm6
-;   subps %xmm7, %xmm0
-;   cmpleps %xmm0, %xmm7
-;   cvttps2dq %xmm0, %xmm0
-;   pxor %xmm7, %xmm0
-;   pxor %xmm1, %xmm1
-;   pmaxsd %xmm1, %xmm0
-;   paddd %xmm6, %xmm0
+;   cvtdq2ps %xmm6, %xmm15
+;   cvttps2dq %xmm11, %xmm14
+;   subps %xmm15, %xmm11
+;   cmpleps %xmm11, %xmm15
+;   cvttps2dq %xmm11, %xmm0
+;   pxor %xmm15, %xmm0
+;   pxor %xmm9, %xmm9
+;   pmaxsd %xmm9, %xmm0
+;   paddd %xmm14, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -1117,13 +1088,14 @@ block0(v0: f32x4):
 ; block0:
 ;   movdqa  %xmm0, %xmm4
 ;   cmpps   $0, %xmm4, %xmm0, %xmm4
-;   andps   %xmm0, %xmm4, %xmm0
-;   pxor    %xmm4, %xmm0, %xmm4
-;   cvttps2dq %xmm0, %xmm1
-;   movdqa  %xmm1, %xmm0
+;   movdqa  %xmm0, %xmm5
+;   andps   %xmm5, %xmm4, %xmm5
+;   pxor    %xmm4, %xmm5, %xmm4
+;   cvttps2dq %xmm5, %xmm8
+;   movdqa  %xmm8, %xmm0
 ;   pand    %xmm0, %xmm4, %xmm0
 ;   psrad   %xmm0, $31, %xmm0
-;   pxor    %xmm0, %xmm1, %xmm0
+;   pxor    %xmm0, %xmm8, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -1135,13 +1107,14 @@ block0(v0: f32x4):
 ; block1: ; offset 0x4
 ;   movdqa %xmm0, %xmm4
 ;   cmpeqps %xmm0, %xmm4
-;   andps %xmm4, %xmm0
-;   pxor %xmm0, %xmm4
-;   cvttps2dq %xmm0, %xmm1
-;   movdqa %xmm1, %xmm0
+;   movdqa %xmm0, %xmm5
+;   andps %xmm4, %xmm5
+;   pxor %xmm5, %xmm4
+;   cvttps2dq %xmm5, %xmm8
+;   movdqa %xmm8, %xmm0
 ;   pand %xmm4, %xmm0
 ;   psrad $0x1f, %xmm0
-;   pxor %xmm1, %xmm0
+;   pxor %xmm8, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
diff --git a/cranelift/filetests/filetests/isa/x64/float-avx.clif b/cranelift/filetests/filetests/isa/x64/float-avx.clif
index e7ddfa2fb7e4..948056a03d14 100644
--- a/cranelift/filetests/filetests/isa/x64/float-avx.clif
+++ b/cranelift/filetests/filetests/isa/x64/float-avx.clif
@@ -444,11 +444,11 @@ block0(v0: i32x4):
 ;   vpslld  %xmm0, $16, %xmm2
 ;   vpsrld  %xmm2, $16, %xmm4
 ;   vpsubd  %xmm0, %xmm4, %xmm6
-;   vcvtdq2ps %xmm4, %xmm0
-;   vpsrld  %xmm6, $1, %xmm2
-;   vcvtdq2ps %xmm2, %xmm4
-;   vaddps  %xmm4, %xmm4, %xmm6
-;   vaddps  %xmm6, %xmm0, %xmm0
+;   vcvtdq2ps %xmm4, %xmm8
+;   vpsrld  %xmm6, $1, %xmm10
+;   vcvtdq2ps %xmm10, %xmm12
+;   vaddps  %xmm12, %xmm12, %xmm14
+;   vaddps  %xmm14, %xmm8, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -461,11 +461,11 @@ block0(v0: i32x4):
 ;   vpslld $0x10, %xmm0, %xmm2
 ;   vpsrld $0x10, %xmm2, %xmm4
 ;   vpsubd %xmm4, %xmm0, %xmm6
-;   vcvtdq2ps %xmm4, %xmm0
-;   vpsrld $1, %xmm6, %xmm2
-;   vcvtdq2ps %xmm2, %xmm4
-;   vaddps %xmm4, %xmm4, %xmm6
-;   vaddps %xmm0, %xmm6, %xmm0
+;   vcvtdq2ps %xmm4, %xmm8
+;   vpsrld $1, %xmm6, %xmm10
+;   vcvtdq2ps %xmm10, %xmm12
+;   vaddps %xmm12, %xmm12, %xmm14
+;   vaddps %xmm8, %xmm14, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -533,10 +533,10 @@ block0(v0: f32x4):
 ;   vcmpps  $0, %xmm0, %xmm0, %xmm2
 ;   vandps  %xmm0, %xmm2, %xmm4
 ;   vpxor   %xmm2, %xmm4, %xmm6
-;   vcvttps2dq %xmm4, %xmm0
-;   vpand   %xmm0, %xmm6, %xmm2
-;   vpsrad  %xmm2, $31, %xmm4
-;   vpxor   %xmm4, %xmm0, %xmm0
+;   vcvttps2dq %xmm4, %xmm8
+;   vpand   %xmm8, %xmm6, %xmm10
+;   vpsrad  %xmm10, $31, %xmm12
+;   vpxor   %xmm12, %xmm8, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -549,10 +549,10 @@ block0(v0: f32x4):
 ;   vcmpeqps %xmm0, %xmm0, %xmm2
 ;   vandps %xmm2, %xmm0, %xmm4
 ;   vpxor %xmm4, %xmm2, %xmm6
-;   vcvttps2dq %xmm4, %xmm0
-;   vpand %xmm6, %xmm0, %xmm2
-;   vpsrad $0x1f, %xmm2, %xmm4
-;   vpxor %xmm0, %xmm4, %xmm0
+;   vcvttps2dq %xmm4, %xmm8
+;   vpand %xmm6, %xmm8, %xmm10
+;   vpsrad $0x1f, %xmm10, %xmm12
+;   vpxor %xmm8, %xmm12, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
diff --git a/cranelift/filetests/filetests/isa/x64/fma-call.clif b/cranelift/filetests/filetests/isa/x64/fma-call.clif
index 79175599d00d..0b92c3f44e79 100644
--- a/cranelift/filetests/filetests/isa/x64/fma-call.clif
+++ b/cranelift/filetests/filetests/isa/x64/fma-call.clif
@@ -74,26 +74,26 @@ block0(v0: f32x4, v1: f32x4, v2: f32x4):
 ;   movdqu  rsp(16 + virtual offset), %xmm1
 ;   movdqu  rsp(32 + virtual offset), %xmm2
 ;   call    *%r8
+;   movdqu  %xmm0, rsp(48 + virtual offset)
 ;   movdqu  rsp(0 + virtual offset), %xmm4
-;   movdqu  %xmm0, rsp(80 + virtual offset)
 ;   pshufd  $1, %xmm4, %xmm0
-;   movdqu  rsp(16 + virtual offset), %xmm2
-;   pshufd  $1, %xmm2, %xmm1
-;   movdqu  rsp(32 + virtual offset), %xmm5
-;   pshufd  $1, %xmm5, %xmm2
+;   movdqu  rsp(16 + virtual offset), %xmm8
+;   pshufd  $1, %xmm8, %xmm1
+;   movdqu  rsp(32 + virtual offset), %xmm12
+;   pshufd  $1, %xmm12, %xmm2
 ;   load_ext_name %FmaF32+0, %r9
 ;   call    *%r9
+;   movdqu  %xmm0, rsp(64 + virtual offset)
 ;   movdqu  rsp(0 + virtual offset), %xmm4
-;   movdqu  %xmm0, rsp(48 + virtual offset)
 ;   pshufd  $2, %xmm4, %xmm0
-;   movdqu  rsp(16 + virtual offset), %xmm7
-;   pshufd  $2, %xmm7, %xmm1
+;   movdqu  rsp(16 + virtual offset), %xmm14
+;   pshufd  $2, %xmm14, %xmm1
 ;   movdqu  rsp(32 + virtual offset), %xmm3
 ;   pshufd  $2, %xmm3, %xmm2
 ;   load_ext_name %FmaF32+0, %r10
 ;   call    *%r10
+;   movdqu  %xmm0, rsp(80 + virtual offset)
 ;   movdqu  rsp(0 + virtual offset), %xmm4
-;   movdqu  %xmm0, rsp(64 + virtual offset)
 ;   pshufd  $3, %xmm4, %xmm0
 ;   movdqu  rsp(16 + virtual offset), %xmm1
 ;   pshufd  $3, %xmm1, %xmm1
@@ -101,12 +101,12 @@ block0(v0: f32x4, v1: f32x4, v2: f32x4):
 ;   pshufd  $3, %xmm2, %xmm2
 ;   load_ext_name %FmaF32+0, %r11
 ;   call    *%r11
+;   movdqu  rsp(64 + virtual offset), %xmm4
 ;   movdqa  %xmm0, %xmm2
-;   movdqu  rsp(48 + virtual offset), %xmm1
-;   movdqu  rsp(80 + virtual offset), %xmm0
-;   insertps $16, %xmm0, %xmm1, %xmm0
-;   movdqu  rsp(64 + virtual offset), %xmm6
-;   insertps $32, %xmm0, %xmm6, %xmm0
+;   movdqu  rsp(48 + virtual offset), %xmm0
+;   insertps $16, %xmm0, %xmm4, %xmm0
+;   movdqu  rsp(80 + virtual offset), %xmm1
+;   insertps $32, %xmm0, %xmm1, %xmm0
 ;   movdqa  %xmm2, %xmm3
 ;   insertps $48, %xmm0, %xmm3, %xmm0
 ;   addq    %rsp, $96, %rsp
@@ -128,26 +128,26 @@ block0(v0: f32x4, v1: f32x4, v2: f32x4):
 ;   movdqu 0x10(%rsp), %xmm1
 ;   movdqu 0x20(%rsp), %xmm2
 ;   callq *%r8
+;   movdqu %xmm0, 0x30(%rsp)
 ;   movdqu (%rsp), %xmm4
-;   movdqu %xmm0, 0x50(%rsp)
 ;   pshufd $1, %xmm4, %xmm0
-;   movdqu 0x10(%rsp), %xmm2
-;   pshufd $1, %xmm2, %xmm1
-;   movdqu 0x20(%rsp), %xmm5
-;   pshufd $1, %xmm5, %xmm2
+;   movdqu 0x10(%rsp), %xmm8
+;   pshufd $1, %xmm8, %xmm1
+;   movdqu 0x20(%rsp), %xmm12
+;   pshufd $1, %xmm12, %xmm2
 ;   movabsq $0, %r9 ; reloc_external Abs8 %FmaF32 0
 ;   callq *%r9
+;   movdqu %xmm0, 0x40(%rsp)
 ;   movdqu (%rsp), %xmm4
-;   movdqu %xmm0, 0x30(%rsp)
 ;   pshufd $2, %xmm4, %xmm0
-;   movdqu 0x10(%rsp), %xmm7
-;   pshufd $2, %xmm7, %xmm1
+;   movdqu 0x10(%rsp), %xmm14
+;   pshufd $2, %xmm14, %xmm1
 ;   movdqu 0x20(%rsp), %xmm3
 ;   pshufd $2, %xmm3, %xmm2
 ;   movabsq $0, %r10 ; reloc_external Abs8 %FmaF32 0
 ;   callq *%r10
+;   movdqu %xmm0, 0x50(%rsp)
 ;   movdqu (%rsp), %xmm4
-;   movdqu %xmm0, 0x40(%rsp)
 ;   pshufd $3, %xmm4, %xmm0
 ;   movdqu 0x10(%rsp), %xmm1
 ;   pshufd $3, %xmm1, %xmm1
@@ -155,12 +155,12 @@ block0(v0: f32x4, v1: f32x4, v2: f32x4):
 ;   pshufd $3, %xmm2, %xmm2
 ;   movabsq $0, %r11 ; reloc_external Abs8 %FmaF32 0
 ;   callq *%r11
+;   movdqu 0x40(%rsp), %xmm4
 ;   movdqa %xmm0, %xmm2
-;   movdqu 0x30(%rsp), %xmm1
-;   movdqu 0x50(%rsp), %xmm0
-;   insertps $0x10, %xmm1, %xmm0
-;   movdqu 0x40(%rsp), %xmm6
-;   insertps $0x20, %xmm6, %xmm0
+;   movdqu 0x30(%rsp), %xmm0
+;   insertps $0x10, %xmm4, %xmm0
+;   movdqu 0x50(%rsp), %xmm1
+;   insertps $0x20, %xmm1, %xmm0
 ;   movdqa %xmm2, %xmm3
 ;   insertps $0x30, %xmm3, %xmm0
 ;   addq $0x60, %rsp
@@ -196,9 +196,9 @@ block0(v0: f64x2, v1: f64x2, v2: f64x2):
 ;   pshufd  $238, %xmm2, %xmm2
 ;   load_ext_name %FmaF64+0, %r9
 ;   call    *%r9
-;   movdqa  %xmm0, %xmm7
+;   movdqa  %xmm0, %xmm14
 ;   movdqu  rsp(48 + virtual offset), %xmm0
-;   movlhps %xmm0, %xmm7, %xmm0
+;   movlhps %xmm0, %xmm14, %xmm0
 ;   addq    %rsp, $64, %rsp
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -227,9 +227,9 @@ block0(v0: f64x2, v1: f64x2, v2: f64x2):
 ;   pshufd $0xee, %xmm2, %xmm2
 ;   movabsq $0, %r9 ; reloc_external Abs8 %FmaF64 0
 ;   callq *%r9
-;   movdqa %xmm0, %xmm7
+;   movdqa %xmm0, %xmm14
 ;   movdqu 0x30(%rsp), %xmm0
-;   movlhps %xmm7, %xmm0
+;   movlhps %xmm14, %xmm0
 ;   addq $0x40, %rsp
 ;   movq %rbp, %rsp
 ;   popq %rbp
diff --git a/cranelift/filetests/filetests/isa/x64/i128.clif b/cranelift/filetests/filetests/isa/x64/i128.clif
index 0654089deadf..74048b0a8115 100644
--- a/cranelift/filetests/filetests/isa/x64/i128.clif
+++ b/cranelift/filetests/filetests/isa/x64/i128.clif
@@ -203,8 +203,9 @@ block0(v0: i128, v1: i128):
 ;   imulq   %rdx, %rcx, %rdx
 ;   movq    %rax, %rcx
 ;   movq    %rdi, %rax
-;   imulq   %rsi, %rcx, %rsi
-;   addq    %rdx, %rsi, %rdx
+;   movq    %rsi, %r10
+;   imulq   %r10, %rcx, %r10
+;   addq    %rdx, %r10, %rdx
 ;   movq    %rdx, %r9
 ;   mul     %rax, %rcx, %rax, %rdx
 ;   movq    %rdx, %rcx
@@ -224,8 +225,9 @@ block0(v0: i128, v1: i128):
 ;   imulq %rcx, %rdx
 ;   movq %rax, %rcx
 ;   movq %rdi, %rax
-;   imulq %rcx, %rsi
-;   addq %rsi, %rdx
+;   movq %rsi, %r10
+;   imulq %rcx, %r10
+;   addq %r10, %rdx
 ;   movq %rdx, %r9
 ;   mulq %rcx
 ;   movq %rdx, %rcx
@@ -245,8 +247,8 @@ block0(v0: i64, v1: i64):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   movq    %rdi, %rax
 ;   movq    %rsi, %rdx
+;   movq    %rdi, %rax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -256,8 +258,8 @@ block0(v0: i64, v1: i64):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   movq %rdi, %rax
 ;   movq %rsi, %rdx
+;   movq %rdi, %rax
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -272,8 +274,8 @@ block0(v0: i128):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   movq    %rdi, %rax
 ;   movq    %rsi, %rdx
+;   movq    %rdi, %rax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -283,8 +285,8 @@ block0(v0: i128):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   movq %rdi, %rax
 ;   movq %rsi, %rdx
+;   movq %rdi, %rax
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -863,16 +865,17 @@ block0(v0: i128):
 ;   shrq    $1, %rax, %rax
 ;   movabsq $8608480567731124087, %r8
 ;   andq    %rax, %r8, %rax
-;   subq    %rdi, %rax, %rdi
+;   movq    %rdi, %r9
+;   subq    %r9, %rax, %r9
 ;   shrq    $1, %rax, %rax
 ;   andq    %rax, %r8, %rax
-;   subq    %rdi, %rax, %rdi
+;   subq    %r9, %rax, %r9
 ;   shrq    $1, %rax, %rax
 ;   andq    %rax, %r8, %rax
-;   subq    %rdi, %rax, %rdi
-;   movq    %rdi, %rax
+;   subq    %r9, %rax, %r9
+;   movq    %r9, %rax
 ;   shrq    $4, %rax, %rax
-;   addq    %rax, %rdi, %rax
+;   addq    %rax, %r9, %rax
 ;   movabsq $1085102592571150095, %rdi
 ;   andq    %rax, %rdi, %rax
 ;   movabsq $72340172838076673, %rdx
@@ -882,22 +885,23 @@ block0(v0: i128):
 ;   shrq    $1, %rdi, %rdi
 ;   movabsq $8608480567731124087, %rcx
 ;   andq    %rdi, %rcx, %rdi
-;   subq    %rsi, %rdi, %rsi
+;   movq    %rsi, %rdx
+;   subq    %rdx, %rdi, %rdx
 ;   shrq    $1, %rdi, %rdi
 ;   andq    %rdi, %rcx, %rdi
-;   subq    %rsi, %rdi, %rsi
+;   subq    %rdx, %rdi, %rdx
 ;   shrq    $1, %rdi, %rdi
 ;   andq    %rdi, %rcx, %rdi
-;   subq    %rsi, %rdi, %rsi
-;   movq    %rsi, %rdi
-;   shrq    $4, %rdi, %rdi
-;   addq    %rdi, %rsi, %rdi
+;   subq    %rdx, %rdi, %rdx
+;   movq    %rdx, %rsi
+;   shrq    $4, %rsi, %rsi
+;   addq    %rsi, %rdx, %rsi
 ;   movabsq $1085102592571150095, %r10
-;   andq    %rdi, %r10, %rdi
+;   andq    %rsi, %r10, %rsi
 ;   movabsq $72340172838076673, %rcx
-;   imulq   %rdi, %rcx, %rdi
-;   shrq    $56, %rdi, %rdi
-;   addq    %rax, %rdi, %rax
+;   imulq   %rsi, %rcx, %rsi
+;   shrq    $56, %rsi, %rsi
+;   addq    %rax, %rsi, %rax
 ;   xorq    %rdx, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -912,16 +916,17 @@ block0(v0: i128):
 ;   shrq $1, %rax
 ;   movabsq $0x7777777777777777, %r8
 ;   andq %r8, %rax
-;   subq %rax, %rdi
+;   movq %rdi, %r9
+;   subq %rax, %r9
 ;   shrq $1, %rax
 ;   andq %r8, %rax
-;   subq %rax, %rdi
+;   subq %rax, %r9
 ;   shrq $1, %rax
 ;   andq %r8, %rax
-;   subq %rax, %rdi
-;   movq %rdi, %rax
+;   subq %rax, %r9
+;   movq %r9, %rax
 ;   shrq $4, %rax
-;   addq %rdi, %rax
+;   addq %r9, %rax
 ;   movabsq $0xf0f0f0f0f0f0f0f, %rdi
 ;   andq %rdi, %rax
 ;   movabsq $0x101010101010101, %rdx
@@ -931,22 +936,23 @@ block0(v0: i128):
 ;   shrq $1, %rdi
 ;   movabsq $0x7777777777777777, %rcx
 ;   andq %rcx, %rdi
-;   subq %rdi, %rsi
+;   movq %rsi, %rdx
+;   subq %rdi, %rdx
 ;   shrq $1, %rdi
 ;   andq %rcx, %rdi
-;   subq %rdi, %rsi
+;   subq %rdi, %rdx
 ;   shrq $1, %rdi
 ;   andq %rcx, %rdi
-;   subq %rdi, %rsi
-;   movq %rsi, %rdi
-;   shrq $4, %rdi
-;   addq %rsi, %rdi
+;   subq %rdi, %rdx
+;   movq %rdx, %rsi
+;   shrq $4, %rsi
+;   addq %rdx, %rsi
 ;   movabsq $0xf0f0f0f0f0f0f0f, %r10
-;   andq %r10, %rdi
+;   andq %r10, %rsi
 ;   movabsq $0x101010101010101, %rcx
-;   imulq %rcx, %rdi
-;   shrq $0x38, %rdi
-;   addq %rdi, %rax
+;   imulq %rcx, %rsi
+;   shrq $0x38, %rsi
+;   addq %rsi, %rax
 ;   xorq %rdx, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -965,10 +971,11 @@ block0(v0: i128):
 ;   movabsq $6148914691236517205, %rcx
 ;   movq    %rsi, %rdx
 ;   andq    %rdx, %rcx, %rdx
-;   shrq    $1, %rsi, %rsi
-;   andq    %rsi, %rcx, %rsi
+;   movq    %rsi, %r11
+;   shrq    $1, %r11, %r11
+;   andq    %r11, %rcx, %r11
 ;   shlq    $1, %rdx, %rdx
-;   orq     %rdx, %rsi, %rdx
+;   orq     %rdx, %r11, %rdx
 ;   movabsq $3689348814741910323, %r9
 ;   movq    %rdx, %r10
 ;   andq    %r10, %r9, %r10
@@ -1006,10 +1013,11 @@ block0(v0: i128):
 ;   movabsq $6148914691236517205, %rdx
 ;   movq    %rdi, %rcx
 ;   andq    %rcx, %rdx, %rcx
-;   shrq    $1, %rdi, %rdi
-;   andq    %rdi, %rdx, %rdi
+;   movq    %rdi, %r9
+;   shrq    $1, %r9, %r9
+;   andq    %r9, %rdx, %r9
 ;   shlq    $1, %rcx, %rcx
-;   orq     %rcx, %rdi, %rcx
+;   orq     %rcx, %r9, %rcx
 ;   movabsq $3689348814741910323, %rdx
 ;   movq    %rcx, %r8
 ;   andq    %r8, %rdx, %r8
@@ -1056,10 +1064,11 @@ block0(v0: i128):
 ;   movabsq $0x5555555555555555, %rcx
 ;   movq %rsi, %rdx
 ;   andq %rcx, %rdx
-;   shrq $1, %rsi
-;   andq %rcx, %rsi
+;   movq %rsi, %r11
+;   shrq $1, %r11
+;   andq %rcx, %r11
 ;   shlq $1, %rdx
-;   orq %rsi, %rdx
+;   orq %r11, %rdx
 ;   movabsq $0x3333333333333333, %r9
 ;   movq %rdx, %r10
 ;   andq %r9, %r10
@@ -1097,10 +1106,11 @@ block0(v0: i128):
 ;   movabsq $0x5555555555555555, %rdx
 ;   movq %rdi, %rcx
 ;   andq %rdx, %rcx
-;   shrq $1, %rdi
-;   andq %rdx, %rdi
+;   movq %rdi, %r9
+;   shrq $1, %r9
+;   andq %rdx, %r9
 ;   shlq $1, %rcx
-;   orq %rdi, %rcx
+;   orq %r9, %rcx
 ;   movabsq $0x3333333333333333, %rdx
 ;   movq %rcx, %r8
 ;   andq %rdx, %r8
@@ -1286,31 +1296,36 @@ block0(v0: i128, v1: i128, v2: i64, v3: i128, v4: i128, v5: i128):
 ;   movq    %rsp, %rbp
 ;   subq    %rsp, $32, %rsp
 ;   movq    %rbx, 0(%rsp)
-;   movq    %r13, 8(%rsp)
+;   movq    %r12, 8(%rsp)
 ;   movq    %r14, 16(%rsp)
 ;   movq    %r15, 24(%rsp)
 ; block0:
-;   movq    %rdx, %rbx
-;   movq    %rcx, %r14
-;   movq    16(%rbp), %rcx
+;   movq    %r8, %r14
+;   movq    %rcx, %rbx
+;   movq    %rdx, %rcx
+;   movq    16(%rbp), %r15
 ;   movq    24(%rbp), %rax
 ;   movq    32(%rbp), %rdx
 ;   movq    40(%rbp), %r11
 ;   movq    48(%rbp), %r10
-;   addq    %rdi, %rbx, %rdi
-;   movq    %r14, %r15
-;   adcq    %rsi, %r15, %rsi
-;   xorq    %r13, %r13, %r13
-;   addq    %r9, %r8, %r9
-;   adcq    %rcx, %r13, %rcx
+;   movq    %rdi, %r8
+;   addq    %r8, %rcx, %r8
+;   movq    %rbx, %rdi
+;   movq    %rsi, %rcx
+;   adcq    %rcx, %rdi, %rcx
+;   xorq    %rdi, %rdi, %rdi
+;   movq    %r14, %r12
+;   movq    %r9, %rsi
+;   addq    %rsi, %r12, %rsi
+;   adcq    %r15, %rdi, %r15
 ;   addq    %rax, %r11, %rax
 ;   adcq    %rdx, %r10, %rdx
-;   addq    %rdi, %r9, %rdi
-;   adcq    %rsi, %rcx, %rsi
-;   addq    %rax, %rdi, %rax
-;   adcq    %rdx, %rsi, %rdx
+;   addq    %r8, %rsi, %r8
+;   adcq    %rcx, %r15, %rcx
+;   addq    %rax, %r8, %rax
+;   adcq    %rdx, %rcx, %rdx
 ;   movq    0(%rsp), %rbx
-;   movq    8(%rsp), %r13
+;   movq    8(%rsp), %r12
 ;   movq    16(%rsp), %r14
 ;   movq    24(%rsp), %r15
 ;   addq    %rsp, $32, %rsp
@@ -1324,31 +1339,36 @@ block0(v0: i128, v1: i128, v2: i64, v3: i128, v4: i128, v5: i128):
 ;   movq %rsp, %rbp
 ;   subq $0x20, %rsp
 ;   movq %rbx, (%rsp)
-;   movq %r13, 8(%rsp)
+;   movq %r12, 8(%rsp)
 ;   movq %r14, 0x10(%rsp)
 ;   movq %r15, 0x18(%rsp)
 ; block1: ; offset 0x1b
-;   movq %rdx, %rbx
-;   movq %rcx, %r14
-;   movq 0x10(%rbp), %rcx
+;   movq %r8, %r14
+;   movq %rcx, %rbx
+;   movq %rdx, %rcx
+;   movq 0x10(%rbp), %r15
 ;   movq 0x18(%rbp), %rax
 ;   movq 0x20(%rbp), %rdx
 ;   movq 0x28(%rbp), %r11
 ;   movq 0x30(%rbp), %r10
-;   addq %rbx, %rdi
-;   movq %r14, %r15
-;   adcq %r15, %rsi
-;   xorq %r13, %r13
-;   addq %r8, %r9
-;   adcq %r13, %rcx
+;   movq %rdi, %r8
+;   addq %rcx, %r8
+;   movq %rbx, %rdi
+;   movq %rsi, %rcx
+;   adcq %rdi, %rcx
+;   xorq %rdi, %rdi
+;   movq %r14, %r12
+;   movq %r9, %rsi
+;   addq %r12, %rsi
+;   adcq %rdi, %r15
 ;   addq %r11, %rax
 ;   adcq %r10, %rdx
-;   addq %r9, %rdi
-;   adcq %rcx, %rsi
-;   addq %rdi, %rax
-;   adcq %rsi, %rdx
+;   addq %rsi, %r8
+;   adcq %r15, %rcx
+;   addq %r8, %rax
+;   adcq %rcx, %rdx
 ;   movq (%rsp), %rbx
-;   movq 8(%rsp), %r13
+;   movq 8(%rsp), %r12
 ;   movq 0x10(%rsp), %r14
 ;   movq 0x18(%rsp), %r15
 ;   addq $0x20, %rsp
@@ -1598,19 +1618,21 @@ block0(v0: i128, v1: i128):
 ;   movq    %rdx, %r10
 ;   movq    %rdi, %rdx
 ;   shlq    %cl, %rdx, %rdx
-;   shlq    %cl, %rsi, %rsi
+;   movq    %rsi, %r11
+;   shlq    %cl, %r11, %r11
 ;   movq    %rcx, %r10
 ;   movl    $64, %ecx
 ;   movq    %r10, %r8
 ;   subq    %rcx, %r8, %rcx
-;   shrq    %cl, %rdi, %rdi
+;   movq    %rdi, %r10
+;   shrq    %cl, %r10, %r10
 ;   xorq    %rax, %rax, %rax
 ;   testq   $127, %r8
-;   cmovzq  %rax, %rdi, %rdi
-;   orq     %rdi, %rsi, %rdi
+;   cmovzq  %rax, %r10, %r10
+;   orq     %r10, %r11, %r10
 ;   testq   $64, %r8
 ;   cmovzq  %rdx, %rax, %rax
-;   cmovzq  %rdi, %rdx, %rdx
+;   cmovzq  %r10, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -1624,19 +1646,21 @@ block0(v0: i128, v1: i128):
 ;   movq %rdx, %r10
 ;   movq %rdi, %rdx
 ;   shlq %cl, %rdx
-;   shlq %cl, %rsi
+;   movq %rsi, %r11
+;   shlq %cl, %r11
 ;   movq %rcx, %r10
 ;   movl $0x40, %ecx
 ;   movq %r10, %r8
 ;   subq %r8, %rcx
-;   shrq %cl, %rdi
+;   movq %rdi, %r10
+;   shrq %cl, %r10
 ;   xorq %rax, %rax
 ;   testq $0x7f, %r8
-;   cmoveq %rax, %rdi
-;   orq %rsi, %rdi
+;   cmoveq %rax, %r10
+;   orq %r11, %r10
 ;   testq $0x40, %r8
 ;   cmoveq %rdx, %rax
-;   cmoveq %rdi, %rdx
+;   cmoveq %r10, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -1653,21 +1677,23 @@ block0(v0: i128, v1: i128):
 ; block0:
 ;   movq    %rdx, %rcx
 ;   movq    %rdx, %r11
-;   shrq    %cl, %rdi, %rdi
+;   movq    %rdi, %r8
+;   shrq    %cl, %r8, %r8
 ;   movq    %rsi, %r10
 ;   shrq    %cl, %r10, %r10
 ;   movq    %rcx, %r11
 ;   movl    $64, %ecx
-;   movq    %r11, %rax
-;   subq    %rcx, %rax, %rcx
-;   shlq    %cl, %rsi, %rsi
+;   movq    %r11, %rdi
+;   subq    %rcx, %rdi, %rcx
+;   movq    %rsi, %r11
+;   shlq    %cl, %r11, %r11
 ;   xorq    %rdx, %rdx, %rdx
-;   testq   $127, %rax
-;   cmovzq  %rdx, %rsi, %rsi
-;   orq     %rsi, %rdi, %rsi
-;   testq   $64, %rax
+;   testq   $127, %rdi
+;   cmovzq  %rdx, %r11, %r11
+;   orq     %r11, %r8, %r11
+;   testq   $64, %rdi
 ;   movq    %r10, %rax
-;   cmovzq  %rsi, %rax, %rax
+;   cmovzq  %r11, %rax, %rax
 ;   cmovzq  %r10, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -1680,21 +1706,23 @@ block0(v0: i128, v1: i128):
 ; block1: ; offset 0x4
 ;   movq %rdx, %rcx
 ;   movq %rdx, %r11
-;   shrq %cl, %rdi
+;   movq %rdi, %r8
+;   shrq %cl, %r8
 ;   movq %rsi, %r10
 ;   shrq %cl, %r10
 ;   movq %rcx, %r11
 ;   movl $0x40, %ecx
-;   movq %r11, %rax
-;   subq %rax, %rcx
-;   shlq %cl, %rsi
+;   movq %r11, %rdi
+;   subq %rdi, %rcx
+;   movq %rsi, %r11
+;   shlq %cl, %r11
 ;   xorq %rdx, %rdx
-;   testq $0x7f, %rax
-;   cmoveq %rdx, %rsi
-;   orq %rdi, %rsi
-;   testq $0x40, %rax
+;   testq $0x7f, %rdi
+;   cmoveq %rdx, %r11
+;   orq %r8, %r11
+;   testq $0x40, %rdi
 ;   movq %r10, %rax
-;   cmoveq %rsi, %rax
+;   cmoveq %r11, %rax
 ;   cmoveq %r10, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -1712,7 +1740,8 @@ block0(v0: i128, v1: i128):
 ; block0:
 ;   movq    %rdx, %rcx
 ;   movq    %rdx, %r11
-;   shrq    %cl, %rdi, %rdi
+;   movq    %rdi, %r8
+;   shrq    %cl, %r8, %r8
 ;   movq    %rsi, %r10
 ;   sarq    %cl, %r10, %r10
 ;   movq    %rcx, %r11
@@ -1724,12 +1753,12 @@ block0(v0: i128, v1: i128):
 ;   xorq    %r11, %r11, %r11
 ;   testq   $127, %rax
 ;   cmovzq  %r11, %r9, %r9
-;   orq     %rdi, %r9, %rdi
-;   sarq    $63, %rsi, %rsi
+;   orq     %r8, %r9, %r8
+;   movq    %rsi, %rdx
+;   sarq    $63, %rdx, %rdx
 ;   testq   $64, %rax
 ;   movq    %r10, %rax
-;   cmovzq  %rdi, %rax, %rax
-;   movq    %rsi, %rdx
+;   cmovzq  %r8, %rax, %rax
 ;   cmovzq  %r10, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -1742,7 +1771,8 @@ block0(v0: i128, v1: i128):
 ; block1: ; offset 0x4
 ;   movq %rdx, %rcx
 ;   movq %rdx, %r11
-;   shrq %cl, %rdi
+;   movq %rdi, %r8
+;   shrq %cl, %r8
 ;   movq %rsi, %r10
 ;   sarq %cl, %r10
 ;   movq %rcx, %r11
@@ -1754,12 +1784,12 @@ block0(v0: i128, v1: i128):
 ;   xorq %r11, %r11
 ;   testq $0x7f, %rax
 ;   cmoveq %r11, %r9
-;   orq %r9, %rdi
-;   sarq $0x3f, %rsi
+;   orq %r9, %r8
+;   movq %rsi, %rdx
+;   sarq $0x3f, %rdx
 ;   testq $0x40, %rax
 ;   movq %r10, %rax
-;   cmoveq %rdi, %rax
-;   movq %rsi, %rdx
+;   cmoveq %r8, %rax
 ;   cmoveq %r10, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -1798,24 +1828,26 @@ block0(v0: i128, v1: i128):
 ;   movl    $128, %ecx
 ;   movq    %r8, %r10
 ;   subq    %rcx, %r10, %rcx
-;   shrq    %cl, %rdi, %rdi
+;   movq    %rdi, %r8
+;   shrq    %cl, %r8, %r8
 ;   movq    %rsi, %r9
 ;   shrq    %cl, %r9, %r9
-;   movq    %rcx, %r8
+;   movq    %rcx, %r10
 ;   movl    $64, %ecx
-;   movq    %r8, %r10
-;   subq    %rcx, %r10, %rcx
-;   shlq    %cl, %rsi, %rsi
-;   xorq    %r8, %r8, %r8
-;   testq   $127, %r10
-;   cmovzq  %r8, %rsi, %rsi
-;   orq     %rsi, %rdi, %rsi
-;   testq   $64, %r10
-;   movq    %r9, %r10
+;   movq    %r10, %r11
+;   subq    %rcx, %r11, %rcx
+;   movq    %rsi, %r10
+;   shlq    %cl, %r10, %r10
+;   xorq    %rsi, %rsi, %rsi
+;   testq   $127, %r11
 ;   cmovzq  %rsi, %r10, %r10
-;   cmovzq  %r9, %r8, %r8
-;   orq     %rax, %r10, %rax
-;   orq     %rdx, %r8, %rdx
+;   orq     %r10, %r8, %r10
+;   testq   $64, %r11
+;   movq    %r9, %r8
+;   cmovzq  %r10, %r8, %r8
+;   cmovzq  %r9, %rsi, %rsi
+;   orq     %rax, %r8, %rax
+;   orq     %rdx, %rsi, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -1848,24 +1880,26 @@ block0(v0: i128, v1: i128):
 ;   movl $0x80, %ecx
 ;   movq %r8, %r10
 ;   subq %r10, %rcx
-;   shrq %cl, %rdi
+;   movq %rdi, %r8
+;   shrq %cl, %r8
 ;   movq %rsi, %r9
 ;   shrq %cl, %r9
-;   movq %rcx, %r8
+;   movq %rcx, %r10
 ;   movl $0x40, %ecx
-;   movq %r8, %r10
-;   subq %r10, %rcx
-;   shlq %cl, %rsi
-;   xorq %r8, %r8
-;   testq $0x7f, %r10
-;   cmoveq %r8, %rsi
-;   orq %rdi, %rsi
-;   testq $0x40, %r10
-;   movq %r9, %r10
+;   movq %r10, %r11
+;   subq %r11, %rcx
+;   movq %rsi, %r10
+;   shlq %cl, %r10
+;   xorq %rsi, %rsi
+;   testq $0x7f, %r11
 ;   cmoveq %rsi, %r10
-;   cmoveq %r9, %r8
-;   orq %r10, %rax
-;   orq %r8, %rdx
+;   orq %r8, %r10
+;   testq $0x40, %r11
+;   movq %r9, %r8
+;   cmoveq %r10, %r8
+;   cmoveq %r9, %rsi
+;   orq %r8, %rax
+;   orq %rsi, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -1906,18 +1940,21 @@ block0(v0: i128, v1: i128):
 ;   subq    %rcx, %r10, %rcx
 ;   movq    %rdi, %r8
 ;   shlq    %cl, %r8, %r8
-;   shlq    %cl, %rsi, %rsi
+;   movq    %rsi, %r10
+;   shlq    %cl, %r10, %r10
 ;   movq    %rcx, %r9
 ;   movl    $64, %ecx
-;   subq    %rcx, %r9, %rcx
-;   shrq    %cl, %rdi, %rdi
+;   movq    %r9, %rsi
+;   subq    %rcx, %rsi, %rcx
+;   movq    %rdi, %r9
+;   shrq    %cl, %r9, %r9
 ;   xorq    %r11, %r11, %r11
-;   testq   $127, %r9
-;   cmovzq  %r11, %rdi, %rdi
-;   orq     %rdi, %rsi, %rdi
-;   testq   $64, %r9
+;   testq   $127, %rsi
+;   cmovzq  %r11, %r9, %r9
+;   orq     %r9, %r10, %r9
+;   testq   $64, %rsi
 ;   cmovzq  %r8, %r11, %r11
-;   cmovzq  %rdi, %r8, %r8
+;   cmovzq  %r9, %r8, %r8
 ;   orq     %rax, %r11, %rax
 ;   orq     %rdx, %r8, %rdx
 ;   movq    %rbp, %rsp
@@ -1955,59 +1992,24 @@ block0(v0: i128, v1: i128):
 ;   subq %r10, %rcx
 ;   movq %rdi, %r8
 ;   shlq %cl, %r8
-;   shlq %cl, %rsi
+;   movq %rsi, %r10
+;   shlq %cl, %r10
 ;   movq %rcx, %r9
 ;   movl $0x40, %ecx
-;   subq %r9, %rcx
-;   shrq %cl, %rdi
+;   movq %r9, %rsi
+;   subq %rsi, %rcx
+;   movq %rdi, %r9
+;   shrq %cl, %r9
 ;   xorq %r11, %r11
-;   testq $0x7f, %r9
-;   cmoveq %r11, %rdi
-;   orq %rsi, %rdi
-;   testq $0x40, %r9
+;   testq $0x7f, %rsi
+;   cmoveq %r11, %r9
+;   orq %r10, %r9
+;   testq $0x40, %rsi
 ;   cmoveq %r8, %r11
-;   cmoveq %rdi, %r8
+;   cmoveq %r9, %r8
 ;   orq %r11, %rax
 ;   orq %r8, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
 
-function %iabs_i128(i128) -> i128 {
-block0(v0: i128):
-    v1 = iabs.i128 v0
-    return v1
-}
-
-; VCode:
-;   pushq   %rbp
-;   movq    %rsp, %rbp
-; block0:
-;   xorq    %r8, %r8, %r8
-;   movq    %rdi, %rax
-;   negq    %rax, %rax
-;   movq    %rsi, %rdx
-;   adcq    %rdx, %r8, %rdx
-;   negq    %rdx, %rdx
-;   cmovsq  %rdi, %rax, %rax
-;   cmovsq  %rsi, %rdx, %rdx
-;   movq    %rbp, %rsp
-;   popq    %rbp
-;   ret
-; 
-; Disassembled:
-; block0: ; offset 0x0
-;   pushq %rbp
-;   movq %rsp, %rbp
-; block1: ; offset 0x4
-;   xorq %r8, %r8
-;   movq %rdi, %rax
-;   negq %rax
-;   movq %rsi, %rdx
-;   adcq %r8, %rdx
-;   negq %rdx
-;   cmovsq %rdi, %rax
-;   cmovsq %rsi, %rdx
-;   movq %rbp, %rsp
-;   popq %rbp
-;   retq
diff --git a/cranelift/filetests/filetests/isa/x64/ishl.clif b/cranelift/filetests/filetests/isa/x64/ishl.clif
index 32ab2f796270..743ea813cc49 100644
--- a/cranelift/filetests/filetests/isa/x64/ishl.clif
+++ b/cranelift/filetests/filetests/isa/x64/ishl.clif
@@ -21,19 +21,21 @@ block0(v0: i128, v1: i8):
 ;   movzbq  %dl, %rcx
 ;   movq    %rdi, %rdx
 ;   shlq    %cl, %rdx, %rdx
-;   shlq    %cl, %rsi, %rsi
+;   movq    %rsi, %r11
+;   shlq    %cl, %r11, %r11
 ;   movq    %rcx, %r9
 ;   movl    $64, %ecx
 ;   movq    %r9, %r8
 ;   subq    %rcx, %r8, %rcx
-;   shrq    %cl, %rdi, %rdi
+;   movq    %rdi, %r10
+;   shrq    %cl, %r10, %r10
 ;   xorq    %rax, %rax, %rax
 ;   testq   $127, %r8
-;   cmovzq  %rax, %rdi, %rdi
-;   orq     %rdi, %rsi, %rdi
+;   cmovzq  %rax, %r10, %r10
+;   orq     %r10, %r11, %r10
 ;   testq   $64, %r8
 ;   cmovzq  %rdx, %rax, %rax
-;   cmovzq  %rdi, %rdx, %rdx
+;   cmovzq  %r10, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -46,19 +48,21 @@ block0(v0: i128, v1: i8):
 ;   movzbq %dl, %rcx
 ;   movq %rdi, %rdx
 ;   shlq %cl, %rdx
-;   shlq %cl, %rsi
+;   movq %rsi, %r11
+;   shlq %cl, %r11
 ;   movq %rcx, %r9
 ;   movl $0x40, %ecx
 ;   movq %r9, %r8
 ;   subq %r8, %rcx
-;   shrq %cl, %rdi
+;   movq %rdi, %r10
+;   shrq %cl, %r10
 ;   xorq %rax, %rax
 ;   testq $0x7f, %r8
-;   cmoveq %rax, %rdi
-;   orq %rsi, %rdi
+;   cmoveq %rax, %r10
+;   orq %r11, %r10
 ;   testq $0x40, %r8
 ;   cmoveq %rdx, %rax
-;   cmoveq %rdi, %rdx
+;   cmoveq %r10, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -77,19 +81,21 @@ block0(v0: i128, v1: i64):
 ;   movq    %rdx, %r9
 ;   movq    %rdi, %rdx
 ;   shlq    %cl, %rdx, %rdx
-;   shlq    %cl, %rsi, %rsi
+;   movq    %rsi, %r10
+;   shlq    %cl, %r10, %r10
 ;   movq    %rcx, %r9
 ;   movl    $64, %ecx
-;   movq    %r9, %r8
-;   subq    %rcx, %r8, %rcx
-;   shrq    %cl, %rdi, %rdi
+;   movq    %r9, %rsi
+;   subq    %rcx, %rsi, %rcx
+;   movq    %rdi, %r9
+;   shrq    %cl, %r9, %r9
 ;   xorq    %rax, %rax, %rax
-;   testq   $127, %r8
-;   cmovzq  %rax, %rdi, %rdi
-;   orq     %rdi, %rsi, %rdi
-;   testq   $64, %r8
+;   testq   $127, %rsi
+;   cmovzq  %rax, %r9, %r9
+;   orq     %r9, %r10, %r9
+;   testq   $64, %rsi
 ;   cmovzq  %rdx, %rax, %rax
-;   cmovzq  %rdi, %rdx, %rdx
+;   cmovzq  %r9, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -103,19 +109,21 @@ block0(v0: i128, v1: i64):
 ;   movq %rdx, %r9
 ;   movq %rdi, %rdx
 ;   shlq %cl, %rdx
-;   shlq %cl, %rsi
+;   movq %rsi, %r10
+;   shlq %cl, %r10
 ;   movq %rcx, %r9
 ;   movl $0x40, %ecx
-;   movq %r9, %r8
-;   subq %r8, %rcx
-;   shrq %cl, %rdi
+;   movq %r9, %rsi
+;   subq %rsi, %rcx
+;   movq %rdi, %r9
+;   shrq %cl, %r9
 ;   xorq %rax, %rax
-;   testq $0x7f, %r8
-;   cmoveq %rax, %rdi
-;   orq %rsi, %rdi
-;   testq $0x40, %r8
+;   testq $0x7f, %rsi
+;   cmoveq %rax, %r9
+;   orq %r10, %r9
+;   testq $0x40, %rsi
 ;   cmoveq %rdx, %rax
-;   cmoveq %rdi, %rdx
+;   cmoveq %r9, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -134,19 +142,21 @@ block0(v0: i128, v1: i32):
 ;   movq    %rdx, %r9
 ;   movq    %rdi, %rdx
 ;   shlq    %cl, %rdx, %rdx
-;   shlq    %cl, %rsi, %rsi
+;   movq    %rsi, %r10
+;   shlq    %cl, %r10, %r10
 ;   movq    %rcx, %r9
 ;   movl    $64, %ecx
-;   movq    %r9, %r8
-;   subq    %rcx, %r8, %rcx
-;   shrq    %cl, %rdi, %rdi
+;   movq    %r9, %rsi
+;   subq    %rcx, %rsi, %rcx
+;   movq    %rdi, %r9
+;   shrq    %cl, %r9, %r9
 ;   xorq    %rax, %rax, %rax
-;   testq   $127, %r8
-;   cmovzq  %rax, %rdi, %rdi
-;   orq     %rdi, %rsi, %rdi
-;   testq   $64, %r8
+;   testq   $127, %rsi
+;   cmovzq  %rax, %r9, %r9
+;   orq     %r9, %r10, %r9
+;   testq   $64, %rsi
 ;   cmovzq  %rdx, %rax, %rax
-;   cmovzq  %rdi, %rdx, %rdx
+;   cmovzq  %r9, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -160,19 +170,21 @@ block0(v0: i128, v1: i32):
 ;   movq %rdx, %r9
 ;   movq %rdi, %rdx
 ;   shlq %cl, %rdx
-;   shlq %cl, %rsi
+;   movq %rsi, %r10
+;   shlq %cl, %r10
 ;   movq %rcx, %r9
 ;   movl $0x40, %ecx
-;   movq %r9, %r8
-;   subq %r8, %rcx
-;   shrq %cl, %rdi
+;   movq %r9, %rsi
+;   subq %rsi, %rcx
+;   movq %rdi, %r9
+;   shrq %cl, %r9
 ;   xorq %rax, %rax
-;   testq $0x7f, %r8
-;   cmoveq %rax, %rdi
-;   orq %rsi, %rdi
-;   testq $0x40, %r8
+;   testq $0x7f, %rsi
+;   cmoveq %rax, %r9
+;   orq %r10, %r9
+;   testq $0x40, %rsi
 ;   cmoveq %rdx, %rax
-;   cmoveq %rdi, %rdx
+;   cmoveq %r9, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -191,19 +203,21 @@ block0(v0: i128, v1: i16):
 ;   movq    %rdx, %r9
 ;   movq    %rdi, %rdx
 ;   shlq    %cl, %rdx, %rdx
-;   shlq    %cl, %rsi, %rsi
+;   movq    %rsi, %r10
+;   shlq    %cl, %r10, %r10
 ;   movq    %rcx, %r9
 ;   movl    $64, %ecx
-;   movq    %r9, %r8
-;   subq    %rcx, %r8, %rcx
-;   shrq    %cl, %rdi, %rdi
+;   movq    %r9, %rsi
+;   subq    %rcx, %rsi, %rcx
+;   movq    %rdi, %r9
+;   shrq    %cl, %r9, %r9
 ;   xorq    %rax, %rax, %rax
-;   testq   $127, %r8
-;   cmovzq  %rax, %rdi, %rdi
-;   orq     %rdi, %rsi, %rdi
-;   testq   $64, %r8
+;   testq   $127, %rsi
+;   cmovzq  %rax, %r9, %r9
+;   orq     %r9, %r10, %r9
+;   testq   $64, %rsi
 ;   cmovzq  %rdx, %rax, %rax
-;   cmovzq  %rdi, %rdx, %rdx
+;   cmovzq  %r9, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -217,19 +231,21 @@ block0(v0: i128, v1: i16):
 ;   movq %rdx, %r9
 ;   movq %rdi, %rdx
 ;   shlq %cl, %rdx
-;   shlq %cl, %rsi
+;   movq %rsi, %r10
+;   shlq %cl, %r10
 ;   movq %rcx, %r9
 ;   movl $0x40, %ecx
-;   movq %r9, %r8
-;   subq %r8, %rcx
-;   shrq %cl, %rdi
+;   movq %r9, %rsi
+;   subq %rsi, %rcx
+;   movq %rdi, %r9
+;   shrq %cl, %r9
 ;   xorq %rax, %rax
-;   testq $0x7f, %r8
-;   cmoveq %rax, %rdi
-;   orq %rsi, %rdi
-;   testq $0x40, %r8
+;   testq $0x7f, %rsi
+;   cmoveq %rax, %r9
+;   orq %r10, %r9
+;   testq $0x40, %rsi
 ;   cmoveq %rdx, %rax
-;   cmoveq %rdi, %rdx
+;   cmoveq %r9, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -248,19 +264,21 @@ block0(v0: i128, v1: i8):
 ;   movq    %rdx, %r9
 ;   movq    %rdi, %rdx
 ;   shlq    %cl, %rdx, %rdx
-;   shlq    %cl, %rsi, %rsi
+;   movq    %rsi, %r10
+;   shlq    %cl, %r10, %r10
 ;   movq    %rcx, %r9
 ;   movl    $64, %ecx
-;   movq    %r9, %r8
-;   subq    %rcx, %r8, %rcx
-;   shrq    %cl, %rdi, %rdi
+;   movq    %r9, %rsi
+;   subq    %rcx, %rsi, %rcx
+;   movq    %rdi, %r9
+;   shrq    %cl, %r9, %r9
 ;   xorq    %rax, %rax, %rax
-;   testq   $127, %r8
-;   cmovzq  %rax, %rdi, %rdi
-;   orq     %rdi, %rsi, %rdi
-;   testq   $64, %r8
+;   testq   $127, %rsi
+;   cmovzq  %rax, %r9, %r9
+;   orq     %r9, %r10, %r9
+;   testq   $64, %rsi
 ;   cmovzq  %rdx, %rax, %rax
-;   cmovzq  %rdi, %rdx, %rdx
+;   cmovzq  %r9, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -274,19 +292,21 @@ block0(v0: i128, v1: i8):
 ;   movq %rdx, %r9
 ;   movq %rdi, %rdx
 ;   shlq %cl, %rdx
-;   shlq %cl, %rsi
+;   movq %rsi, %r10
+;   shlq %cl, %r10
 ;   movq %rcx, %r9
 ;   movl $0x40, %ecx
-;   movq %r9, %r8
-;   subq %r8, %rcx
-;   shrq %cl, %rdi
+;   movq %r9, %rsi
+;   subq %rsi, %rcx
+;   movq %rdi, %r9
+;   shrq %cl, %r9
 ;   xorq %rax, %rax
-;   testq $0x7f, %r8
-;   cmoveq %rax, %rdi
-;   orq %rsi, %rdi
-;   testq $0x40, %r8
+;   testq $0x7f, %rsi
+;   cmoveq %rax, %r9
+;   orq %r10, %r9
+;   testq $0x40, %rsi
 ;   cmoveq %rdx, %rax
-;   cmoveq %rdi, %rdx
+;   cmoveq %r9, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
diff --git a/cranelift/filetests/filetests/isa/x64/narrowing.clif b/cranelift/filetests/filetests/isa/x64/narrowing.clif
index d46d1c9980da..44dc282d7006 100644
--- a/cranelift/filetests/filetests/isa/x64/narrowing.clif
+++ b/cranelift/filetests/filetests/isa/x64/narrowing.clif
@@ -66,8 +66,9 @@ block0(v0: f64x2):
 ;   movdqa  %xmm0, %xmm3
 ;   cmppd   $0, %xmm3, %xmm0, %xmm3
 ;   andps   %xmm3, const(0), %xmm3
-;   minpd   %xmm0, %xmm3, %xmm0
-;   cvttpd2dq %xmm0, %xmm0
+;   movdqa  %xmm0, %xmm6
+;   minpd   %xmm6, %xmm3, %xmm6
+;   cvttpd2dq %xmm6, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -80,8 +81,9 @@ block0(v0: f64x2):
 ;   movdqa %xmm0, %xmm3
 ;   cmpeqpd %xmm0, %xmm3
 ;   andps 0x1c(%rip), %xmm3
-;   minpd %xmm3, %xmm0
-;   cvttpd2dq %xmm0, %xmm0
+;   movdqa %xmm0, %xmm6
+;   minpd %xmm3, %xmm6
+;   cvttpd2dq %xmm6, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -91,8 +93,6 @@ block0(v0: f64x2):
 ;   addb %al, (%rax)
 ;   addb %al, (%rax)
 ;   addb %al, (%rax)
-;   addb %al, (%rax)
-;   addb %al, (%rax)
 ;   addb %al, %al
 
 function %f4(i16x8, i16x8) -> i8x16 {
diff --git a/cranelift/filetests/filetests/isa/x64/popcnt.clif b/cranelift/filetests/filetests/isa/x64/popcnt.clif
index 3aecd486fd12..41ecc069c2a4 100644
--- a/cranelift/filetests/filetests/isa/x64/popcnt.clif
+++ b/cranelift/filetests/filetests/isa/x64/popcnt.clif
@@ -11,20 +11,21 @@ block0(v0: i64):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   movq    %rdi, %rax
-;   shrq    $1, %rax, %rax
+;   movq    %rdi, %rcx
+;   shrq    $1, %rdi, %rdi
+;   movq    %rcx, %r8
 ;   movabsq $8608480567731124087, %rdx
-;   andq    %rax, %rdx, %rax
-;   subq    %rdi, %rax, %rdi
-;   shrq    $1, %rax, %rax
-;   andq    %rax, %rdx, %rax
-;   subq    %rdi, %rax, %rdi
-;   shrq    $1, %rax, %rax
-;   andq    %rax, %rdx, %rax
-;   subq    %rdi, %rax, %rdi
-;   movq    %rdi, %rax
+;   andq    %rdi, %rdx, %rdi
+;   subq    %r8, %rdi, %r8
+;   shrq    $1, %rdi, %rdi
+;   andq    %rdi, %rdx, %rdi
+;   subq    %r8, %rdi, %r8
+;   shrq    $1, %rdi, %rdi
+;   andq    %rdi, %rdx, %rdi
+;   subq    %r8, %rdi, %r8
+;   movq    %r8, %rax
 ;   shrq    $4, %rax, %rax
-;   addq    %rax, %rdi, %rax
+;   addq    %rax, %r8, %rax
 ;   movabsq $1085102592571150095, %r11
 ;   andq    %rax, %r11, %rax
 ;   movabsq $72340172838076673, %rcx
@@ -39,20 +40,21 @@ block0(v0: i64):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   movq %rdi, %rax
-;   shrq $1, %rax
+;   movq %rdi, %rcx
+;   shrq $1, %rdi
+;   movq %rcx, %r8
 ;   movabsq $0x7777777777777777, %rdx
-;   andq %rdx, %rax
-;   subq %rax, %rdi
-;   shrq $1, %rax
-;   andq %rdx, %rax
-;   subq %rax, %rdi
-;   shrq $1, %rax
-;   andq %rdx, %rax
-;   subq %rax, %rdi
-;   movq %rdi, %rax
+;   andq %rdx, %rdi
+;   subq %rdi, %r8
+;   shrq $1, %rdi
+;   andq %rdx, %rdi
+;   subq %rdi, %r8
+;   shrq $1, %rdi
+;   andq %rdx, %rdi
+;   subq %rdi, %r8
+;   movq %r8, %rax
 ;   shrq $4, %rax
-;   addq %rdi, %rax
+;   addq %r8, %rax
 ;   movabsq $0xf0f0f0f0f0f0f0f, %r11
 ;   andq %r11, %rax
 ;   movabsq $0x101010101010101, %rcx
@@ -137,19 +139,20 @@ block0(v0: i32):
 ;   movq    %rsp, %rbp
 ; block0:
 ;   movq    %rdi, %rax
-;   shrl    $1, %eax, %eax
+;   shrl    $1, %edi, %edi
 ;   movl    $2004318071, %edx
-;   andl    %eax, %edx, %eax
-;   subl    %edi, %eax, %edi
-;   shrl    $1, %eax, %eax
-;   andl    %eax, %edx, %eax
-;   subl    %edi, %eax, %edi
-;   shrl    $1, %eax, %eax
-;   andl    %eax, %edx, %eax
-;   subl    %edi, %eax, %edi
-;   movq    %rdi, %rax
+;   andl    %edi, %edx, %edi
+;   movq    %rax, %r8
+;   subl    %r8d, %edi, %r8d
+;   shrl    $1, %edi, %edi
+;   andl    %edi, %edx, %edi
+;   subl    %r8d, %edi, %r8d
+;   shrl    $1, %edi, %edi
+;   andl    %edi, %edx, %edi
+;   subl    %r8d, %edi, %r8d
+;   movq    %r8, %rax
 ;   shrl    $4, %eax, %eax
-;   addl    %eax, %edi, %eax
+;   addl    %eax, %r8d, %eax
 ;   andl    %eax, $252645135, %eax
 ;   imull   %eax, $16843009, %eax
 ;   shrl    $24, %eax, %eax
@@ -163,19 +166,20 @@ block0(v0: i32):
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
 ;   movq %rdi, %rax
-;   shrl $1, %eax
+;   shrl $1, %edi
 ;   movl $0x77777777, %edx
-;   andl %edx, %eax
-;   subl %eax, %edi
-;   shrl $1, %eax
-;   andl %edx, %eax
-;   subl %eax, %edi
-;   shrl $1, %eax
-;   andl %edx, %eax
-;   subl %eax, %edi
-;   movq %rdi, %rax
+;   andl %edx, %edi
+;   movq %rax, %r8
+;   subl %edi, %r8d
+;   shrl $1, %edi
+;   andl %edx, %edi
+;   subl %edi, %r8d
+;   shrl $1, %edi
+;   andl %edx, %edi
+;   subl %edi, %r8d
+;   movq %r8, %rax
 ;   shrl $4, %eax
-;   addl %edi, %eax
+;   addl %r8d, %eax
 ;   andl $0xf0f0f0f, %eax
 ;   imull $0x1010101, %eax, %eax
 ;   shrl $0x18, %eax
diff --git a/cranelift/filetests/filetests/isa/x64/return-call.clif b/cranelift/filetests/filetests/isa/x64/return-call.clif
index 3276c7678894..18b9dce2db26 100644
--- a/cranelift/filetests/filetests/isa/x64/return-call.clif
+++ b/cranelift/filetests/filetests/isa/x64/return-call.clif
@@ -363,16 +363,16 @@ block0:
 ;   movq    %rbp, %r15
 ;   movq    8(%r15), %r13
 ;   load_ext_name %tail_callee_stack_args+0, %r12
-;   movq    rsp(96 + virtual offset), %rax
-;   movq    rsp(88 + virtual offset), %rcx
-;   movq    rsp(80 + virtual offset), %rdx
-;   movq    rsp(72 + virtual offset), %rbx
-;   movq    rsp(64 + virtual offset), %rsi
-;   movq    rsp(56 + virtual offset), %rdi
-;   movq    rsp(48 + virtual offset), %r8
-;   movq    rsp(40 + virtual offset), %r9
-;   movq    rsp(32 + virtual offset), %r10
 ;   movq    rsp(24 + virtual offset), %r11
+;   movq    rsp(32 + virtual offset), %r10
+;   movq    rsp(40 + virtual offset), %r9
+;   movq    rsp(48 + virtual offset), %r8
+;   movq    rsp(56 + virtual offset), %rdi
+;   movq    rsp(64 + virtual offset), %rsi
+;   movq    rsp(72 + virtual offset), %rbx
+;   movq    rsp(80 + virtual offset), %rdx
+;   movq    rsp(88 + virtual offset), %rcx
+;   movq    rsp(96 + virtual offset), %rax
 ;   return_call_unknown %r12 new_stack_arg_size:128 old_stack_arg_size:0 ret_addr:Some("%v219") fp:%v218 tmp:%v220 %rax=%rax %rcx=%rcx %rdx=%rdx %rbx=%rbx %rsi=%rsi %rdi=%rdi %r8=%r8 %r9=%r9 %r10=%r10 %r11=%r11
 ;
 ; Disassembled:
@@ -443,16 +443,16 @@ block0:
 ;   movq %rbp, %r15
 ;   movq 8(%r15), %r13
 ;   movabsq $0, %r12 ; reloc_external Abs8 %tail_callee_stack_args 0
-;   movq 0xe0(%rsp), %rax
-;   movq 0xd8(%rsp), %rcx
-;   movq 0xd0(%rsp), %rdx
-;   movq 0xc8(%rsp), %rbx
-;   movq 0xc0(%rsp), %rsi
-;   movq 0xb8(%rsp), %rdi
-;   movq 0xb0(%rsp), %r8
-;   movq 0xa8(%rsp), %r9
-;   movq 0xa0(%rsp), %r10
 ;   movq 0x98(%rsp), %r11
+;   movq 0xa0(%rsp), %r10
+;   movq 0xa8(%rsp), %r9
+;   movq 0xb0(%rsp), %r8
+;   movq 0xb8(%rsp), %rdi
+;   movq 0xc0(%rsp), %rsi
+;   movq 0xc8(%rsp), %rbx
+;   movq 0xd0(%rsp), %rdx
+;   movq 0xd8(%rsp), %rcx
+;   movq 0xe0(%rsp), %rax
 ;   movq (%r15), %rbp
 ;   movq 0x78(%rsp), %r14
 ;   movq %r14, 8(%r15)
diff --git a/cranelift/filetests/filetests/isa/x64/select-i128.clif b/cranelift/filetests/filetests/isa/x64/select-i128.clif
index 74eae44aec8c..3586dc7523e8 100644
--- a/cranelift/filetests/filetests/isa/x64/select-i128.clif
+++ b/cranelift/filetests/filetests/isa/x64/select-i128.clif
@@ -51,11 +51,11 @@ block0(v0: f32, v1: i128, v2: i128):
 ;   movq    %rsp, %rbp
 ; block0:
 ;   ucomiss %xmm0, %xmm0
-;   cmovpq  %rdx, %rdi, %rdi
 ;   movq    %rdi, %rax
+;   cmovpq  %rdx, %rax, %rax
 ;   cmovnzq %rdx, %rax, %rax
-;   cmovpq  %rcx, %rsi, %rsi
 ;   movq    %rsi, %rdx
+;   cmovpq  %rcx, %rdx, %rdx
 ;   cmovnzq %rcx, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -67,11 +67,11 @@ block0(v0: f32, v1: i128, v2: i128):
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
 ;   ucomiss %xmm0, %xmm0
-;   cmovpq %rdx, %rdi
 ;   movq %rdi, %rax
+;   cmovpq %rdx, %rax
 ;   cmovneq %rdx, %rax
-;   cmovpq %rcx, %rsi
 ;   movq %rsi, %rdx
+;   cmovpq %rcx, %rdx
 ;   cmovneq %rcx, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
diff --git a/cranelift/filetests/filetests/isa/x64/select.clif b/cranelift/filetests/filetests/isa/x64/select.clif
index 4951bce58d10..a348b34a6e9e 100644
--- a/cranelift/filetests/filetests/isa/x64/select.clif
+++ b/cranelift/filetests/filetests/isa/x64/select.clif
@@ -45,8 +45,8 @@ block0(v0: f32, v1: f32, v2: i64, v3: i64):
 ;   movq    %rsp, %rbp
 ; block0:
 ;   ucomiss %xmm1, %xmm0
-;   cmovpq  %rsi, %rdi, %rdi
 ;   movq    %rdi, %rax
+;   cmovpq  %rsi, %rax, %rax
 ;   cmovnzq %rsi, %rax, %rax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -58,8 +58,8 @@ block0(v0: f32, v1: f32, v2: i64, v3: i64):
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
 ;   ucomiss %xmm1, %xmm0
-;   cmovpq %rsi, %rdi
 ;   movq %rdi, %rax
+;   cmovpq %rsi, %rax
 ;   cmovneq %rsi, %rax
 ;   movq %rbp, %rsp
 ;   popq %rbp
diff --git a/cranelift/filetests/filetests/isa/x64/simd-arith-avx.clif b/cranelift/filetests/filetests/isa/x64/simd-arith-avx.clif
index 12e3ce7c3f5d..f8c390ba8a17 100644
--- a/cranelift/filetests/filetests/isa/x64/simd-arith-avx.clif
+++ b/cranelift/filetests/filetests/isa/x64/simd-arith-avx.clif
@@ -914,14 +914,15 @@ block0(v0: i8x16, v1: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andq    %rdi, $7, %rdi
+;   movq    %rdi, %r9
+;   andq    %r9, $7, %r9
 ;   vpunpcklbw %xmm0, %xmm0, %xmm5
 ;   vpunpckhbw %xmm0, %xmm0, %xmm7
-;   addl    %edi, $8, %edi
-;   vmovd   %edi, %xmm3
-;   vpsraw  %xmm5, %xmm3, %xmm5
-;   vpsraw  %xmm7, %xmm3, %xmm7
-;   vpacksswb %xmm5, %xmm7, %xmm0
+;   addl    %r9d, $8, %r9d
+;   vmovd   %r9d, %xmm11
+;   vpsraw  %xmm5, %xmm11, %xmm13
+;   vpsraw  %xmm7, %xmm11, %xmm15
+;   vpacksswb %xmm13, %xmm15, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -931,14 +932,15 @@ block0(v0: i8x16, v1: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   andq $7, %rdi
+;   movq %rdi, %r9
+;   andq $7, %r9
 ;   vpunpcklbw %xmm0, %xmm0, %xmm5
 ;   vpunpckhbw %xmm0, %xmm0, %xmm7
-;   addl $8, %edi
-;   vmovd %edi, %xmm3
-;   vpsraw %xmm3, %xmm5, %xmm5
-;   vpsraw %xmm3, %xmm7, %xmm7
-;   vpacksswb %xmm7, %xmm5, %xmm0
+;   addl $8, %r9d
+;   vmovd %r9d, %xmm11
+;   vpsraw %xmm11, %xmm5, %xmm13
+;   vpsraw %xmm11, %xmm7, %xmm15
+;   vpacksswb %xmm15, %xmm13, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -957,8 +959,8 @@ block0(v0: i8x16):
 ;   vpunpcklbw %xmm0, %xmm0, %xmm2
 ;   vpunpckhbw %xmm0, %xmm0, %xmm4
 ;   vpsraw  %xmm2, $11, %xmm6
-;   vpsraw  %xmm4, $11, %xmm0
-;   vpacksswb %xmm6, %xmm0, %xmm0
+;   vpsraw  %xmm4, $11, %xmm8
+;   vpacksswb %xmm6, %xmm8, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -971,8 +973,8 @@ block0(v0: i8x16):
 ;   vpunpcklbw %xmm0, %xmm0, %xmm2
 ;   vpunpckhbw %xmm0, %xmm0, %xmm4
 ;   vpsraw $0xb, %xmm2, %xmm6
-;   vpsraw $0xb, %xmm4, %xmm0
-;   vpacksswb %xmm0, %xmm6, %xmm0
+;   vpsraw $0xb, %xmm4, %xmm8
+;   vpacksswb %xmm8, %xmm6, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -987,8 +989,9 @@ block0(v0: i16x8, v1: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andq    %rdi, $15, %rdi
-;   vmovd   %edi, %xmm5
+;   movq    %rdi, %rcx
+;   andq    %rcx, $15, %rcx
+;   vmovd   %ecx, %xmm5
 ;   vpsraw  %xmm0, %xmm5, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -999,8 +1002,9 @@ block0(v0: i16x8, v1: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   andq $0xf, %rdi
-;   vmovd %edi, %xmm5
+;   movq %rdi, %rcx
+;   andq $0xf, %rcx
+;   vmovd %ecx, %xmm5
 ;   vpsraw %xmm5, %xmm0, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -1042,8 +1046,9 @@ block0(v0: i32x4, v1: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andq    %rdi, $31, %rdi
-;   vmovd   %edi, %xmm5
+;   movq    %rdi, %rcx
+;   andq    %rcx, $31, %rcx
+;   vmovd   %ecx, %xmm5
 ;   vpsrad  %xmm0, %xmm5, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -1054,8 +1059,9 @@ block0(v0: i32x4, v1: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   andq $0x1f, %rdi
-;   vmovd %edi, %xmm5
+;   movq %rdi, %rcx
+;   andq $0x1f, %rcx
+;   vmovd %ecx, %xmm5
 ;   vpsrad %xmm5, %xmm0, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -1344,10 +1350,10 @@ block0(v0: f64x2):
 ;   uninit  %xmm2
 ;   vxorpd  %xmm2, %xmm2, %xmm4
 ;   vmaxpd  %xmm0, %xmm4, %xmm6
-;   vminpd  %xmm6, const(0), %xmm0
-;   vroundpd $3, %xmm0, %xmm2
-;   vaddpd  %xmm2, const(1), %xmm5
-;   vshufps $136, %xmm5, %xmm4, %xmm0
+;   vminpd  %xmm6, const(0), %xmm8
+;   vroundpd $3, %xmm8, %xmm10
+;   vaddpd  %xmm10, const(1), %xmm12
+;   vshufps $136, %xmm12, %xmm4, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -1359,10 +1365,10 @@ block0(v0: f64x2):
 ; block1: ; offset 0x4
 ;   vxorpd %xmm2, %xmm2, %xmm4
 ;   vmaxpd %xmm4, %xmm0, %xmm6
-;   vminpd 0x1c(%rip), %xmm6, %xmm0
-;   vroundpd $3, %xmm0, %xmm2
-;   vaddpd 0x1e(%rip), %xmm2, %xmm5
-;   vshufps $0x88, %xmm4, %xmm5, %xmm0
+;   vminpd 0x1c(%rip), %xmm6, %xmm8
+;   vroundpd $3, %xmm8, %xmm10
+;   vaddpd 0x1e(%rip), %xmm10, %xmm12
+;   vshufps $0x88, %xmm4, %xmm12, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -1381,13 +1387,14 @@ block0(v0: i8x16, v1: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andq    %rdi, $7, %rdi
-;   vmovd   %edi, %xmm5
+;   movq    %rdi, %r10
+;   andq    %r10, $7, %r10
+;   vmovd   %r10d, %xmm5
 ;   vpsllw  %xmm0, %xmm5, %xmm7
 ;   lea     const(0), %rsi
-;   shlq    $4, %rdi, %rdi
-;   vmovdqu 0(%rsi,%rdi,1), %xmm5
-;   vpand   %xmm7, %xmm5, %xmm0
+;   shlq    $4, %r10, %r10
+;   vmovdqu 0(%rsi,%r10,1), %xmm13
+;   vpand   %xmm7, %xmm13, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -1397,19 +1404,17 @@ block0(v0: i8x16, v1: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   andq $7, %rdi
-;   vmovd %edi, %xmm5
+;   movq %rdi, %r10
+;   andq $7, %r10
+;   vmovd %r10d, %xmm5
 ;   vpsllw %xmm5, %xmm0, %xmm7
-;   leaq 0x19(%rip), %rsi
-;   shlq $4, %rdi
-;   vmovdqu (%rsi, %rdi), %xmm5
-;   vpand %xmm5, %xmm7, %xmm0
+;   leaq 0x15(%rip), %rsi
+;   shlq $4, %r10
+;   vmovdqu (%rsi, %r10), %xmm13
+;   vpand %xmm13, %xmm7, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
-;   addb %al, (%rax)
-;   addb %al, (%rax)
-;   addb %al, (%rax)
 ;   addb %bh, %bh
 
 function %i8x16_shl_imm(i8x16) -> i8x16 {
@@ -1455,8 +1460,9 @@ block0(v0: i16x8, v1: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andq    %rdi, $15, %rdi
-;   vmovd   %edi, %xmm5
+;   movq    %rdi, %rcx
+;   andq    %rcx, $15, %rcx
+;   vmovd   %ecx, %xmm5
 ;   vpsllw  %xmm0, %xmm5, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -1467,8 +1473,9 @@ block0(v0: i16x8, v1: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   andq $0xf, %rdi
-;   vmovd %edi, %xmm5
+;   movq %rdi, %rcx
+;   andq $0xf, %rcx
+;   vmovd %ecx, %xmm5
 ;   vpsllw %xmm5, %xmm0, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -1510,8 +1517,9 @@ block0(v0: i32x4, v1: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andq    %rdi, $31, %rdi
-;   vmovd   %edi, %xmm5
+;   movq    %rdi, %rcx
+;   andq    %rcx, $31, %rcx
+;   vmovd   %ecx, %xmm5
 ;   vpslld  %xmm0, %xmm5, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -1522,8 +1530,9 @@ block0(v0: i32x4, v1: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   andq $0x1f, %rdi
-;   vmovd %edi, %xmm5
+;   movq %rdi, %rcx
+;   andq $0x1f, %rcx
+;   vmovd %ecx, %xmm5
 ;   vpslld %xmm5, %xmm0, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -1565,8 +1574,9 @@ block0(v0: i64x2, v1: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andq    %rdi, $63, %rdi
-;   vmovd   %edi, %xmm5
+;   movq    %rdi, %rcx
+;   andq    %rcx, $63, %rcx
+;   vmovd   %ecx, %xmm5
 ;   vpsllq  %xmm0, %xmm5, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -1577,8 +1587,9 @@ block0(v0: i64x2, v1: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   andq $0x3f, %rdi
-;   vmovd %edi, %xmm5
+;   movq %rdi, %rcx
+;   andq $0x3f, %rcx
+;   vmovd %ecx, %xmm5
 ;   vpsllq %xmm5, %xmm0, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -1620,12 +1631,13 @@ block0(v0: i8x16, v1: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andq    %rdi, $7, %rdi
-;   vmovd   %edi, %xmm5
+;   movq    %rdi, %r10
+;   andq    %r10, $7, %r10
+;   vmovd   %r10d, %xmm5
 ;   vpsrlw  %xmm0, %xmm5, %xmm7
 ;   lea     const(0), %rsi
-;   shlq    $4, %rdi, %rdi
-;   vpand   %xmm7, 0(%rsi,%rdi,1), %xmm0
+;   shlq    $4, %r10, %r10
+;   vpand   %xmm7, 0(%rsi,%r10,1), %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -1635,21 +1647,19 @@ block0(v0: i8x16, v1: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   andq $7, %rdi
-;   vmovd %edi, %xmm5
+;   movq %rdi, %r10
+;   andq $7, %r10
+;   vmovd %r10d, %xmm5
 ;   vpsrlw %xmm5, %xmm0, %xmm7
-;   leaq 0x19(%rip), %rsi
-;   shlq $4, %rdi
-;   vpand (%rsi, %rdi), %xmm7, %xmm0
+;   leaq 0x15(%rip), %rsi
+;   shlq $4, %r10
+;   vpand (%rsi, %r10), %xmm7, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
 ;   addb %al, (%rax)
 ;   addb %al, (%rax)
 ;   addb %al, (%rax)
-;   addb %al, (%rax)
-;   addb %al, (%rax)
-;   addb %bh, %bh
 
 function %i8x16_ushr_imm(i8x16) -> i8x16 {
 block0(v0: i8x16):
@@ -1702,8 +1712,9 @@ block0(v0: i16x8, v1: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andq    %rdi, $15, %rdi
-;   vmovd   %edi, %xmm5
+;   movq    %rdi, %rcx
+;   andq    %rcx, $15, %rcx
+;   vmovd   %ecx, %xmm5
 ;   vpsrlw  %xmm0, %xmm5, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -1714,8 +1725,9 @@ block0(v0: i16x8, v1: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   andq $0xf, %rdi
-;   vmovd %edi, %xmm5
+;   movq %rdi, %rcx
+;   andq $0xf, %rcx
+;   vmovd %ecx, %xmm5
 ;   vpsrlw %xmm5, %xmm0, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -1757,8 +1769,9 @@ block0(v0: i32x4, v1: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andq    %rdi, $31, %rdi
-;   vmovd   %edi, %xmm5
+;   movq    %rdi, %rcx
+;   andq    %rcx, $31, %rcx
+;   vmovd   %ecx, %xmm5
 ;   vpsrld  %xmm0, %xmm5, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -1769,8 +1782,9 @@ block0(v0: i32x4, v1: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   andq $0x1f, %rdi
-;   vmovd %edi, %xmm5
+;   movq %rdi, %rcx
+;   andq $0x1f, %rcx
+;   vmovd %ecx, %xmm5
 ;   vpsrld %xmm5, %xmm0, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -1812,8 +1826,9 @@ block0(v0: i64x2, v1: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andq    %rdi, $63, %rdi
-;   vmovd   %edi, %xmm5
+;   movq    %rdi, %rcx
+;   andq    %rcx, $63, %rcx
+;   vmovd   %ecx, %xmm5
 ;   vpsrlq  %xmm0, %xmm5, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -1824,8 +1839,9 @@ block0(v0: i64x2, v1: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   andq $0x3f, %rdi
-;   vmovd %edi, %xmm5
+;   movq %rdi, %rcx
+;   andq $0x3f, %rcx
+;   vmovd %ecx, %xmm5
 ;   vpsrlq %xmm5, %xmm0, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
diff --git a/cranelift/filetests/filetests/isa/x64/simd-bitselect.clif b/cranelift/filetests/filetests/isa/x64/simd-bitselect.clif
index 842fceb3bf1c..50eb59680e30 100644
--- a/cranelift/filetests/filetests/isa/x64/simd-bitselect.clif
+++ b/cranelift/filetests/filetests/isa/x64/simd-bitselect.clif
@@ -82,12 +82,11 @@ block0(v0: i8x16, v1: i8x16, v2: i32x4):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   pand    %xmm0, %xmm2, %xmm0
-;   movdqa  %xmm0, %xmm7
-;   pandn   %xmm2, %xmm1, %xmm2
-;   movdqa  %xmm7, %xmm1
+;   movdqa  %xmm0, %xmm4
+;   pand    %xmm4, %xmm2, %xmm4
 ;   movdqa  %xmm2, %xmm0
-;   por     %xmm0, %xmm1, %xmm0
+;   pandn   %xmm0, %xmm1, %xmm0
+;   por     %xmm0, %xmm4, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -97,12 +96,11 @@ block0(v0: i8x16, v1: i8x16, v2: i32x4):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   pand %xmm2, %xmm0
-;   movdqa %xmm0, %xmm7
-;   pandn %xmm1, %xmm2
-;   movdqa %xmm7, %xmm1
+;   movdqa %xmm0, %xmm4
+;   pand %xmm2, %xmm4
 ;   movdqa %xmm2, %xmm0
-;   por %xmm1, %xmm0
+;   pandn %xmm1, %xmm0
+;   por %xmm4, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -213,12 +211,12 @@ block0(v0: i8x16, v1: i8x16):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   movdqa  %xmm0, %xmm7
+;   movdqa  %xmm0, %xmm8
 ;   movdqu  const(0), %xmm0
-;   movdqa  %xmm7, %xmm2
-;   pand    %xmm2, %xmm0, %xmm2
+;   movdqa  %xmm8, %xmm4
+;   pand    %xmm4, %xmm0, %xmm4
 ;   pandn   %xmm0, %xmm1, %xmm0
-;   por     %xmm0, %xmm2, %xmm0
+;   por     %xmm0, %xmm4, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -228,12 +226,12 @@ block0(v0: i8x16, v1: i8x16):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   movdqa %xmm0, %xmm7
-;   movdqu 0x20(%rip), %xmm0
-;   movdqa %xmm7, %xmm2
-;   pand %xmm0, %xmm2
+;   movdqa %xmm0, %xmm8
+;   movdqu 0x1f(%rip), %xmm0
+;   movdqa %xmm8, %xmm4
+;   pand %xmm0, %xmm4
 ;   pandn %xmm1, %xmm0
-;   por %xmm2, %xmm0
+;   por %xmm4, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -242,7 +240,6 @@ block0(v0: i8x16, v1: i8x16):
 ;   addb %al, (%rax)
 ;   addb %al, (%rax)
 ;   addb %al, (%rax)
-;   addb %al, (%rax)
 ;   addb %dh, %al
 ;   addb %al, (%rax)
 ;   incl (%rax)
diff --git a/cranelift/filetests/filetests/isa/x64/simd-bitwise-avx.clif b/cranelift/filetests/filetests/isa/x64/simd-bitwise-avx.clif
index 0de407a7abc7..8b540989c2b1 100644
--- a/cranelift/filetests/filetests/isa/x64/simd-bitwise-avx.clif
+++ b/cranelift/filetests/filetests/isa/x64/simd-bitwise-avx.clif
@@ -42,8 +42,8 @@ block0(v0: i64):
 ;   movl    $-2147483648, %eax
 ;   vmovd   %eax, %xmm4
 ;   vandnps %xmm4, const(0), %xmm6
-;   vandps  %xmm4, 0(%rdi), %xmm0
-;   vorps   %xmm6, %xmm0, %xmm0
+;   vandps  %xmm4, 0(%rdi), %xmm8
+;   vorps   %xmm6, %xmm8, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -56,8 +56,8 @@ block0(v0: i64):
 ;   movl $0x80000000, %eax
 ;   vmovd %eax, %xmm4
 ;   vandnps 0x1b(%rip), %xmm4, %xmm6
-;   vandps (%rdi), %xmm4, %xmm0
-;   vorps %xmm0, %xmm6, %xmm0
+;   vandps (%rdi), %xmm4, %xmm8
+;   vorps %xmm8, %xmm6, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -75,7 +75,6 @@ block0(v0: i64):
 ;   addb %al, (%rax)
 ;   addb %al, (%rax)
 ;   addb %al, (%rax)
-;   addb %al, (%rax)
 
 function %bor_f32x4(f32x4, f32x4) -> f32x4 {
 block0(v0: f32x4, v1: f32x4):
diff --git a/cranelift/filetests/filetests/isa/x64/simd-bitwise-compile.clif b/cranelift/filetests/filetests/isa/x64/simd-bitwise-compile.clif
index f026d0a6e809..817598710f4e 100644
--- a/cranelift/filetests/filetests/isa/x64/simd-bitwise-compile.clif
+++ b/cranelift/filetests/filetests/isa/x64/simd-bitwise-compile.clif
@@ -236,9 +236,10 @@ block0(v0: i16x8, v1: i16x8, v2: i16x8):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   pand    %xmm1, %xmm0, %xmm1
+;   movdqa  %xmm1, %xmm4
+;   pand    %xmm4, %xmm0, %xmm4
 ;   pandn   %xmm0, %xmm2, %xmm0
-;   por     %xmm0, %xmm1, %xmm0
+;   por     %xmm0, %xmm4, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -248,9 +249,10 @@ block0(v0: i16x8, v1: i16x8, v2: i16x8):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   pand %xmm0, %xmm1
+;   movdqa %xmm1, %xmm4
+;   pand %xmm0, %xmm4
 ;   pandn %xmm2, %xmm0
-;   por %xmm1, %xmm0
+;   por %xmm4, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -265,9 +267,10 @@ block0(v0: f32x4, v1: f32x4, v2: f32x4):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andps   %xmm1, %xmm0, %xmm1
+;   movdqa  %xmm1, %xmm4
+;   andps   %xmm4, %xmm0, %xmm4
 ;   andnps  %xmm0, %xmm2, %xmm0
-;   orps    %xmm0, %xmm1, %xmm0
+;   orps    %xmm0, %xmm4, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -277,9 +280,10 @@ block0(v0: f32x4, v1: f32x4, v2: f32x4):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   andps %xmm0, %xmm1
+;   movdqa %xmm1, %xmm4
+;   andps %xmm0, %xmm4
 ;   andnps %xmm2, %xmm0
-;   orps %xmm1, %xmm0
+;   orps %xmm4, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -294,9 +298,10 @@ block0(v0: f64x2, v1: f64x2, v2: f64x2):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andpd   %xmm1, %xmm0, %xmm1
+;   movdqa  %xmm1, %xmm4
+;   andpd   %xmm4, %xmm0, %xmm4
 ;   andnpd  %xmm0, %xmm2, %xmm0
-;   orpd    %xmm0, %xmm1, %xmm0
+;   orpd    %xmm0, %xmm4, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -306,9 +311,10 @@ block0(v0: f64x2, v1: f64x2, v2: f64x2):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   andpd %xmm0, %xmm1
+;   movdqa %xmm1, %xmm4
+;   andpd %xmm0, %xmm4
 ;   andnpd %xmm2, %xmm0
-;   orpd %xmm1, %xmm0
+;   orpd %xmm4, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -325,13 +331,14 @@ block0(v0: i32):
 ;   movq    %rsp, %rbp
 ; block0:
 ;   movdqu  const(1), %xmm0
-;   andq    %rdi, $7, %rdi
-;   movd    %edi, %xmm5
+;   movq    %rdi, %r10
+;   andq    %r10, $7, %r10
+;   movd    %r10d, %xmm5
 ;   psllw   %xmm0, %xmm5, %xmm0
 ;   lea     const(0), %rsi
-;   shlq    $4, %rdi, %rdi
-;   movdqu  0(%rsi,%rdi,1), %xmm5
-;   pand    %xmm0, %xmm5, %xmm0
+;   shlq    $4, %r10, %r10
+;   movdqu  0(%rsi,%r10,1), %xmm13
+;   pand    %xmm0, %xmm13, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -342,13 +349,14 @@ block0(v0: i32):
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
 ;   movdqu 0x34(%rip), %xmm0
-;   andq $7, %rdi
-;   movd %edi, %xmm5
+;   movq %rdi, %r10
+;   andq $7, %r10
+;   movd %r10d, %xmm5
 ;   psllw %xmm5, %xmm0
-;   leaq 0x31(%rip), %rsi
-;   shlq $4, %rdi
-;   movdqu (%rsi, %rdi), %xmm5
-;   pand %xmm5, %xmm0
+;   leaq 0x2d(%rip), %rsi
+;   shlq $4, %r10
+;   movdqu (%rsi, %r10), %xmm13
+;   pand %xmm13, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -357,9 +365,6 @@ block0(v0: i32):
 ;   addb %al, (%rax)
 ;   addb %al, (%rax)
 ;   addb %al, (%rax)
-;   addb %al, (%rax)
-;   addb %al, (%rax)
-;   addb %al, (%rax)
 ;   addl %eax, (%rdx)
 ;   addl 0x9080706(, %rax), %eax
 ;   orb (%rbx), %cl
@@ -600,16 +605,17 @@ block0(v0: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   movdqu  const(0), %xmm1
-;   andq    %rdi, $7, %rdi
-;   movdqa  %xmm1, %xmm0
-;   punpcklbw %xmm0, %xmm1, %xmm0
-;   punpckhbw %xmm1, %xmm1, %xmm1
-;   addl    %edi, $8, %edi
-;   movd    %edi, %xmm3
-;   psraw   %xmm0, %xmm3, %xmm0
-;   psraw   %xmm1, %xmm3, %xmm1
-;   packsswb %xmm0, %xmm1, %xmm0
+;   movdqu  const(0), %xmm8
+;   movq    %rdi, %r9
+;   andq    %r9, $7, %r9
+;   movdqa  %xmm8, %xmm0
+;   punpcklbw %xmm0, %xmm8, %xmm0
+;   punpckhbw %xmm8, %xmm8, %xmm8
+;   addl    %r9d, $8, %r9d
+;   movd    %r9d, %xmm11
+;   psraw   %xmm0, %xmm11, %xmm0
+;   psraw   %xmm8, %xmm11, %xmm8
+;   packsswb %xmm0, %xmm8, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -619,25 +625,20 @@ block0(v0: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   movdqu 0x34(%rip), %xmm1
-;   andq $7, %rdi
-;   movdqa %xmm1, %xmm0
-;   punpcklbw %xmm1, %xmm0
-;   punpckhbw %xmm1, %xmm1
-;   addl $8, %edi
-;   movd %edi, %xmm3
-;   psraw %xmm3, %xmm0
-;   psraw %xmm3, %xmm1
-;   packsswb %xmm1, %xmm0
+;   movdqu 0x33(%rip), %xmm8
+;   movq %rdi, %r9
+;   andq $7, %r9
+;   movdqa %xmm8, %xmm0
+;   punpcklbw %xmm8, %xmm0
+;   punpckhbw %xmm8, %xmm8
+;   addl $8, %r9d
+;   movd %r9d, %xmm11
+;   psraw %xmm11, %xmm0
+;   psraw %xmm11, %xmm8
+;   packsswb %xmm8, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
-;   addb %al, (%rax)
-;   addb %al, (%rax)
-;   addb %al, (%rax)
-;   addb %al, (%rax)
-;   addb %al, (%rax)
-;   addb %al, (%rax)
 ;   addb %al, (%rcx)
 ;   addb (%rbx), %al
 ;   addb $5, %al
@@ -654,12 +655,13 @@ block0(v0: i8x16, v1: i32):
 ; block0:
 ;   movdqa  %xmm0, %xmm7
 ;   punpcklbw %xmm7, %xmm0, %xmm7
-;   punpckhbw %xmm0, %xmm0, %xmm0
-;   movdqa  %xmm0, %xmm5
-;   movdqa  %xmm7, %xmm0
+;   movdqa  %xmm7, %xmm8
+;   movdqa  %xmm0, %xmm7
+;   punpckhbw %xmm7, %xmm0, %xmm7
+;   movdqa  %xmm8, %xmm0
 ;   psraw   %xmm0, $11, %xmm0
-;   psraw   %xmm5, $11, %xmm5
-;   packsswb %xmm0, %xmm5, %xmm0
+;   psraw   %xmm7, $11, %xmm7
+;   packsswb %xmm0, %xmm7, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -671,12 +673,13 @@ block0(v0: i8x16, v1: i32):
 ; block1: ; offset 0x4
 ;   movdqa %xmm0, %xmm7
 ;   punpcklbw %xmm0, %xmm7
-;   punpckhbw %xmm0, %xmm0
-;   movdqa %xmm0, %xmm5
-;   movdqa %xmm7, %xmm0
+;   movdqa %xmm7, %xmm8
+;   movdqa %xmm0, %xmm7
+;   punpckhbw %xmm0, %xmm7
+;   movdqa %xmm8, %xmm0
 ;   psraw $0xb, %xmm0
-;   psraw $0xb, %xmm5
-;   packsswb %xmm5, %xmm0
+;   psraw $0xb, %xmm7
+;   packsswb %xmm7, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -747,8 +750,9 @@ block0(v0: i64x2):
 ;   movdqa  %xmm0, %xmm2
 ;   psrad   %xmm2, $1, %xmm2
 ;   pshufd  $237, %xmm2, %xmm4
-;   psrlq   %xmm0, $1, %xmm0
-;   pshufd  $232, %xmm0, %xmm0
+;   movdqa  %xmm0, %xmm6
+;   psrlq   %xmm6, $1, %xmm6
+;   pshufd  $232, %xmm6, %xmm0
 ;   punpckldq %xmm0, %xmm4, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -762,8 +766,9 @@ block0(v0: i64x2):
 ;   movdqa %xmm0, %xmm2
 ;   psrad $1, %xmm2
 ;   pshufd $0xed, %xmm2, %xmm4
-;   psrlq $1, %xmm0
-;   pshufd $0xe8, %xmm0, %xmm0
+;   movdqa %xmm0, %xmm6
+;   psrlq $1, %xmm6
+;   pshufd $0xe8, %xmm6, %xmm0
 ;   punpckldq %xmm4, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -781,8 +786,9 @@ block0(v0: i64x2):
 ;   movq    %rsp, %rbp
 ; block0:
 ;   pshufd  $237, %xmm0, %xmm5
-;   psrad   %xmm0, $31, %xmm0
-;   pshufd  $237, %xmm0, %xmm6
+;   movdqa  %xmm0, %xmm4
+;   psrad   %xmm4, $31, %xmm4
+;   pshufd  $237, %xmm4, %xmm6
 ;   movdqa  %xmm5, %xmm0
 ;   punpckldq %xmm0, %xmm6, %xmm0
 ;   movq    %rbp, %rsp
@@ -795,8 +801,9 @@ block0(v0: i64x2):
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
 ;   pshufd $0xed, %xmm0, %xmm5
-;   psrad $0x1f, %xmm0
-;   pshufd $0xed, %xmm0, %xmm6
+;   movdqa %xmm0, %xmm4
+;   psrad $0x1f, %xmm4
+;   pshufd $0xed, %xmm4, %xmm6
 ;   movdqa %xmm5, %xmm0
 ;   punpckldq %xmm6, %xmm0
 ;   movq %rbp, %rsp
@@ -817,8 +824,9 @@ block0(v0: i64x2):
 ;   movdqa  %xmm0, %xmm2
 ;   psrad   %xmm2, $31, %xmm2
 ;   pshufd  $237, %xmm2, %xmm4
-;   psrad   %xmm0, $22, %xmm0
-;   pshufd  $237, %xmm0, %xmm0
+;   movdqa  %xmm0, %xmm6
+;   psrad   %xmm6, $22, %xmm6
+;   pshufd  $237, %xmm6, %xmm0
 ;   punpckldq %xmm0, %xmm4, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -832,8 +840,9 @@ block0(v0: i64x2):
 ;   movdqa %xmm0, %xmm2
 ;   psrad $0x1f, %xmm2
 ;   pshufd $0xed, %xmm2, %xmm4
-;   psrad $0x16, %xmm0
-;   pshufd $0xed, %xmm0, %xmm0
+;   movdqa %xmm0, %xmm6
+;   psrad $0x16, %xmm6
+;   pshufd $0xed, %xmm6, %xmm0
 ;   punpckldq %xmm4, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -853,8 +862,9 @@ block0(v0: i64x2):
 ;   movdqa  %xmm0, %xmm2
 ;   psrad   %xmm2, $31, %xmm2
 ;   pshufd  $237, %xmm2, %xmm4
-;   psrad   %xmm0, $4, %xmm0
-;   pshufd  $237, %xmm0, %xmm0
+;   movdqa  %xmm0, %xmm6
+;   psrad   %xmm6, $4, %xmm6
+;   pshufd  $237, %xmm6, %xmm0
 ;   punpckldq %xmm0, %xmm4, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -868,8 +878,9 @@ block0(v0: i64x2):
 ;   movdqa %xmm0, %xmm2
 ;   psrad $0x1f, %xmm2
 ;   pshufd $0xed, %xmm2, %xmm4
-;   psrad $4, %xmm0
-;   pshufd $0xed, %xmm0, %xmm0
+;   movdqa %xmm0, %xmm6
+;   psrad $4, %xmm6
+;   pshufd $0xed, %xmm6, %xmm0
 ;   punpckldq %xmm4, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -885,15 +896,16 @@ block0(v0: i64x2, v1: i32):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andq    %rdi, $63, %rdi
-;   movq    %rdi, %xmm5
-;   movdqu  const(0), %xmm1
-;   psrlq   %xmm1, %xmm5, %xmm1
-;   psrlq   %xmm0, %xmm5, %xmm0
-;   movdqa  %xmm0, %xmm7
-;   movdqa  %xmm1, %xmm0
-;   pxor    %xmm0, %xmm7, %xmm0
-;   psubq   %xmm0, %xmm1, %xmm0
+;   movq    %rdi, %rcx
+;   andq    %rcx, $63, %rcx
+;   movq    %rcx, %xmm5
+;   movdqu  const(0), %xmm8
+;   psrlq   %xmm8, %xmm5, %xmm8
+;   movdqa  %xmm0, %xmm11
+;   psrlq   %xmm11, %xmm5, %xmm11
+;   movdqa  %xmm8, %xmm0
+;   pxor    %xmm0, %xmm11, %xmm0
+;   psubq   %xmm0, %xmm8, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -903,15 +915,16 @@ block0(v0: i64x2, v1: i32):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   andq $0x3f, %rdi
-;   movq %rdi, %xmm5
-;   movdqu 0x2b(%rip), %xmm1
-;   psrlq %xmm5, %xmm1
-;   psrlq %xmm5, %xmm0
-;   movdqa %xmm0, %xmm7
-;   movdqa %xmm1, %xmm0
-;   pxor %xmm7, %xmm0
-;   psubq %xmm1, %xmm0
+;   movq %rdi, %rcx
+;   andq $0x3f, %rcx
+;   movq %rcx, %xmm5
+;   movdqu 0x27(%rip), %xmm8
+;   psrlq %xmm5, %xmm8
+;   movdqa %xmm0, %xmm11
+;   psrlq %xmm5, %xmm11
+;   movdqa %xmm8, %xmm0
+;   pxor %xmm11, %xmm0
+;   psubq %xmm8, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -922,9 +935,4 @@ block0(v0: i64x2, v1: i32):
 ;   addb %al, (%rax)
 ;   addb %al, (%rax)
 ;   addb %al, (%rax)
-;   addb %al, (%rax)
-;   addb %al, (%rax)
-;   addb %al, (%rax)
-;   addb %al, (%rax)
-;   addb %al, (%rax)
 
diff --git a/cranelift/filetests/filetests/isa/x64/simd-cmp-avx.clif b/cranelift/filetests/filetests/isa/x64/simd-cmp-avx.clif
index 60bd126554ad..bccc8657cb9a 100644
--- a/cranelift/filetests/filetests/isa/x64/simd-cmp-avx.clif
+++ b/cranelift/filetests/filetests/isa/x64/simd-cmp-avx.clif
@@ -214,10 +214,10 @@ block0(v0: f32x4, v1: f32x4):
 ;   vminps  %xmm0, %xmm1, %xmm3
 ;   vminps  %xmm1, %xmm0, %xmm5
 ;   vorps   %xmm3, %xmm5, %xmm7
-;   vcmpps  $3, %xmm7, %xmm5, %xmm1
-;   vorps   %xmm7, %xmm1, %xmm3
-;   vpsrld  %xmm1, $10, %xmm5
-;   vandnps %xmm5, %xmm3, %xmm0
+;   vcmpps  $3, %xmm7, %xmm5, %xmm9
+;   vorps   %xmm7, %xmm9, %xmm11
+;   vpsrld  %xmm9, $10, %xmm13
+;   vandnps %xmm13, %xmm11, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -230,10 +230,10 @@ block0(v0: f32x4, v1: f32x4):
 ;   vminps %xmm1, %xmm0, %xmm3
 ;   vminps %xmm0, %xmm1, %xmm5
 ;   vorps %xmm5, %xmm3, %xmm7
-;   vcmpunordps %xmm5, %xmm7, %xmm1
-;   vorps %xmm1, %xmm7, %xmm3
-;   vpsrld $0xa, %xmm1, %xmm5
-;   vandnps %xmm3, %xmm5, %xmm0
+;   vcmpunordps %xmm5, %xmm7, %xmm9
+;   vorps %xmm9, %xmm7, %xmm11
+;   vpsrld $0xa, %xmm9, %xmm13
+;   vandnps %xmm11, %xmm13, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -251,10 +251,10 @@ block0(v0: f64x2, v1: f64x2):
 ;   vminpd  %xmm0, %xmm1, %xmm3
 ;   vminpd  %xmm1, %xmm0, %xmm5
 ;   vorpd   %xmm3, %xmm5, %xmm7
-;   vcmppd  $3, %xmm3, %xmm5, %xmm1
-;   vorpd   %xmm7, %xmm1, %xmm3
-;   vpsrlq  %xmm1, $13, %xmm5
-;   vandnpd %xmm5, %xmm3, %xmm0
+;   vcmppd  $3, %xmm3, %xmm5, %xmm9
+;   vorpd   %xmm7, %xmm9, %xmm11
+;   vpsrlq  %xmm9, $13, %xmm13
+;   vandnpd %xmm13, %xmm11, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -267,10 +267,10 @@ block0(v0: f64x2, v1: f64x2):
 ;   vminpd %xmm1, %xmm0, %xmm3
 ;   vminpd %xmm0, %xmm1, %xmm5
 ;   vorpd %xmm5, %xmm3, %xmm7
-;   vcmpunordpd %xmm5, %xmm3, %xmm1
-;   vorpd %xmm1, %xmm7, %xmm3
-;   vpsrlq $0xd, %xmm1, %xmm5
-;   vandnpd %xmm3, %xmm5, %xmm0
+;   vcmpunordpd %xmm5, %xmm3, %xmm9
+;   vorpd %xmm9, %xmm7, %xmm11
+;   vpsrlq $0xd, %xmm9, %xmm13
+;   vandnpd %xmm11, %xmm13, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -288,11 +288,11 @@ block0(v0: f32x4, v1: f32x4):
 ;   vmaxps  %xmm0, %xmm1, %xmm3
 ;   vmaxps  %xmm1, %xmm0, %xmm5
 ;   vxorps  %xmm3, %xmm5, %xmm7
-;   vorps   %xmm3, %xmm7, %xmm1
-;   vsubps  %xmm1, %xmm7, %xmm3
-;   vcmpps  $3, %xmm1, %xmm1, %xmm5
-;   vpsrld  %xmm5, $10, %xmm7
-;   vandnps %xmm7, %xmm3, %xmm0
+;   vorps   %xmm3, %xmm7, %xmm9
+;   vsubps  %xmm9, %xmm7, %xmm11
+;   vcmpps  $3, %xmm9, %xmm9, %xmm13
+;   vpsrld  %xmm13, $10, %xmm15
+;   vandnps %xmm15, %xmm11, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -305,11 +305,11 @@ block0(v0: f32x4, v1: f32x4):
 ;   vmaxps %xmm1, %xmm0, %xmm3
 ;   vmaxps %xmm0, %xmm1, %xmm5
 ;   vxorps %xmm5, %xmm3, %xmm7
-;   vorps %xmm7, %xmm3, %xmm1
-;   vsubps %xmm7, %xmm1, %xmm3
-;   vcmpunordps %xmm1, %xmm1, %xmm5
-;   vpsrld $0xa, %xmm5, %xmm7
-;   vandnps %xmm3, %xmm7, %xmm0
+;   vorps %xmm7, %xmm3, %xmm9
+;   vsubps %xmm7, %xmm9, %xmm11
+;   vcmpunordps %xmm9, %xmm9, %xmm13
+;   vpsrld $0xa, %xmm13, %xmm15
+;   vandnps %xmm11, %xmm15, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -327,11 +327,11 @@ block0(v0: f64x2, v1: f64x2):
 ;   vmaxpd  %xmm0, %xmm1, %xmm3
 ;   vmaxpd  %xmm1, %xmm0, %xmm5
 ;   vxorpd  %xmm3, %xmm5, %xmm7
-;   vorpd   %xmm3, %xmm7, %xmm1
-;   vsubpd  %xmm1, %xmm7, %xmm3
-;   vcmppd  $3, %xmm1, %xmm1, %xmm5
-;   vpsrlq  %xmm5, $13, %xmm7
-;   vandnpd %xmm7, %xmm3, %xmm0
+;   vorpd   %xmm3, %xmm7, %xmm9
+;   vsubpd  %xmm9, %xmm7, %xmm11
+;   vcmppd  $3, %xmm9, %xmm9, %xmm13
+;   vpsrlq  %xmm13, $13, %xmm15
+;   vandnpd %xmm15, %xmm11, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -344,11 +344,11 @@ block0(v0: f64x2, v1: f64x2):
 ;   vmaxpd %xmm1, %xmm0, %xmm3
 ;   vmaxpd %xmm0, %xmm1, %xmm5
 ;   vxorpd %xmm5, %xmm3, %xmm7
-;   vorpd %xmm7, %xmm3, %xmm1
-;   vsubpd %xmm7, %xmm1, %xmm3
-;   vcmpunordpd %xmm1, %xmm1, %xmm5
-;   vpsrlq $0xd, %xmm5, %xmm7
-;   vandnpd %xmm3, %xmm7, %xmm0
+;   vorpd %xmm7, %xmm3, %xmm9
+;   vsubpd %xmm7, %xmm9, %xmm11
+;   vcmpunordpd %xmm9, %xmm9, %xmm13
+;   vpsrlq $0xd, %xmm13, %xmm15
+;   vandnpd %xmm11, %xmm15, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
diff --git a/cranelift/filetests/filetests/isa/x64/simd-comparison-legalize.clif b/cranelift/filetests/filetests/isa/x64/simd-comparison-legalize.clif
index 26f10fdcca1a..805258582eb4 100644
--- a/cranelift/filetests/filetests/isa/x64/simd-comparison-legalize.clif
+++ b/cranelift/filetests/filetests/isa/x64/simd-comparison-legalize.clif
@@ -43,9 +43,9 @@ block0(v0: i32x4, v1: i32x4):
 ; block0:
 ;   pmaxud  %xmm0, %xmm1, %xmm0
 ;   pcmpeqd %xmm0, %xmm1, %xmm0
-;   uninit  %xmm1
-;   pcmpeqd %xmm1, %xmm1, %xmm1
-;   pxor    %xmm0, %xmm1, %xmm0
+;   uninit  %xmm8
+;   pcmpeqd %xmm8, %xmm8, %xmm8
+;   pxor    %xmm0, %xmm8, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -57,8 +57,8 @@ block0(v0: i32x4, v1: i32x4):
 ; block1: ; offset 0x4
 ;   pmaxud %xmm1, %xmm0
 ;   pcmpeqd %xmm1, %xmm0
-;   pcmpeqd %xmm1, %xmm1
-;   pxor %xmm1, %xmm0
+;   pcmpeqd %xmm8, %xmm8
+;   pxor %xmm8, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
diff --git a/cranelift/filetests/filetests/isa/x64/simd-i64x2-shift-avx512.clif b/cranelift/filetests/filetests/isa/x64/simd-i64x2-shift-avx512.clif
index 22210f479675..8730dee0e2d5 100644
--- a/cranelift/filetests/filetests/isa/x64/simd-i64x2-shift-avx512.clif
+++ b/cranelift/filetests/filetests/isa/x64/simd-i64x2-shift-avx512.clif
@@ -11,8 +11,9 @@ block0(v0: i64x2, v1: i64):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   andq    %rdi, $63, %rdi
-;   vmovd   %edi, %xmm5
+;   movq    %rdi, %rcx
+;   andq    %rcx, $63, %rcx
+;   vmovd   %ecx, %xmm5
 ;   vpsraq  %xmm5, %xmm0, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -23,8 +24,9 @@ block0(v0: i64x2, v1: i64):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   andq $0x3f, %rdi
-;   vmovd %edi, %xmm5
+;   movq %rdi, %rcx
+;   andq $0x3f, %rcx
+;   vmovd %ecx, %xmm5
 ;   vpsraq %xmm5, %xmm0, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
diff --git a/cranelift/filetests/filetests/isa/x64/simd-logical-compile.clif b/cranelift/filetests/filetests/isa/x64/simd-logical-compile.clif
index 0e95a11aa374..e9df78d5fd82 100644
--- a/cranelift/filetests/filetests/isa/x64/simd-logical-compile.clif
+++ b/cranelift/filetests/filetests/isa/x64/simd-logical-compile.clif
@@ -68,8 +68,9 @@ block0(v0: i64x2):
 ; block0:
 ;   uninit  %xmm3
 ;   pxor    %xmm3, %xmm3, %xmm3
-;   pcmpeqq %xmm0, %xmm3, %xmm0
-;   ptest   %xmm0, %xmm0
+;   movdqa  %xmm0, %xmm6
+;   pcmpeqq %xmm6, %xmm3, %xmm6
+;   ptest   %xmm6, %xmm6
 ;   setz    %al
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -81,8 +82,9 @@ block0(v0: i64x2):
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
 ;   pxor %xmm3, %xmm3
-;   pcmpeqq %xmm3, %xmm0
-;   ptest %xmm0, %xmm0
+;   movdqa %xmm0, %xmm6
+;   pcmpeqq %xmm3, %xmm6
+;   ptest %xmm6, %xmm6
 ;   sete %al
 ;   movq %rbp, %rsp
 ;   popq %rbp
diff --git a/cranelift/filetests/filetests/isa/x64/simd-splat-avx.clif b/cranelift/filetests/filetests/isa/x64/simd-splat-avx.clif
index 9e994d56593a..c7a3a92af894 100644
--- a/cranelift/filetests/filetests/isa/x64/simd-splat-avx.clif
+++ b/cranelift/filetests/filetests/isa/x64/simd-splat-avx.clif
@@ -178,8 +178,8 @@ block0(v0: i64):
 ;   uninit  %xmm2
 ;   vpinsrb $0, %xmm2, 0(%rdi), %xmm4
 ;   uninit  %xmm6
-;   vpxor   %xmm6, %xmm6, %xmm0
-;   vpshufb %xmm4, %xmm0, %xmm0
+;   vpxor   %xmm6, %xmm6, %xmm8
+;   vpshufb %xmm4, %xmm8, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -190,8 +190,8 @@ block0(v0: i64):
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
 ;   vpinsrb $0, (%rdi), %xmm2, %xmm4 ; trap: heap_oob
-;   vpxor %xmm6, %xmm6, %xmm0
-;   vpshufb %xmm0, %xmm4, %xmm0
+;   vpxor %xmm6, %xmm6, %xmm8
+;   vpshufb %xmm8, %xmm4, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
diff --git a/cranelift/filetests/filetests/isa/x64/simd-widen-mul.clif b/cranelift/filetests/filetests/isa/x64/simd-widen-mul.clif
index 69a43c63bc7f..4941dda84a70 100644
--- a/cranelift/filetests/filetests/isa/x64/simd-widen-mul.clif
+++ b/cranelift/filetests/filetests/isa/x64/simd-widen-mul.clif
@@ -13,11 +13,13 @@ block0(v0: i8x16, v1: i8x16):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   palignr $8, %xmm0, %xmm0, %xmm0
-;   pmovsxbw %xmm0, %xmm0
-;   palignr $8, %xmm1, %xmm1, %xmm1
-;   pmovsxbw %xmm1, %xmm1
-;   pmullw  %xmm0, %xmm1, %xmm0
+;   movdqa  %xmm0, %xmm6
+;   palignr $8, %xmm6, %xmm0, %xmm6
+;   pmovsxbw %xmm6, %xmm0
+;   movdqa  %xmm1, %xmm6
+;   palignr $8, %xmm6, %xmm1, %xmm6
+;   pmovsxbw %xmm6, %xmm8
+;   pmullw  %xmm0, %xmm8, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -27,11 +29,13 @@ block0(v0: i8x16, v1: i8x16):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   palignr $8, %xmm0, %xmm0
-;   pmovsxbw %xmm0, %xmm0
-;   palignr $8, %xmm1, %xmm1
-;   pmovsxbw %xmm1, %xmm1
-;   pmullw %xmm1, %xmm0
+;   movdqa %xmm0, %xmm6
+;   palignr $8, %xmm0, %xmm6
+;   pmovsxbw %xmm6, %xmm0
+;   movdqa %xmm1, %xmm6
+;   palignr $8, %xmm1, %xmm6
+;   pmovsxbw %xmm6, %xmm8
+;   pmullw %xmm8, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -50,10 +54,11 @@ block0(v0: i16x8, v1: i16x8):
 ; block0:
 ;   movdqa  %xmm0, %xmm5
 ;   pmullw  %xmm5, %xmm1, %xmm5
-;   pmulhw  %xmm0, %xmm1, %xmm0
-;   movdqa  %xmm0, %xmm2
-;   movdqa  %xmm5, %xmm0
-;   punpckhwd %xmm0, %xmm2, %xmm0
+;   movdqa  %xmm5, %xmm6
+;   movdqa  %xmm0, %xmm5
+;   pmulhw  %xmm5, %xmm1, %xmm5
+;   movdqa  %xmm6, %xmm0
+;   punpckhwd %xmm0, %xmm5, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -65,10 +70,11 @@ block0(v0: i16x8, v1: i16x8):
 ; block1: ; offset 0x4
 ;   movdqa %xmm0, %xmm5
 ;   pmullw %xmm1, %xmm5
-;   pmulhw %xmm1, %xmm0
-;   movdqa %xmm0, %xmm2
-;   movdqa %xmm5, %xmm0
-;   punpckhwd %xmm2, %xmm0
+;   movdqa %xmm5, %xmm6
+;   movdqa %xmm0, %xmm5
+;   pmulhw %xmm1, %xmm5
+;   movdqa %xmm6, %xmm0
+;   punpckhwd %xmm5, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -149,10 +155,11 @@ block0(v0: i16x8, v1: i16x8):
 ; block0:
 ;   movdqa  %xmm0, %xmm5
 ;   pmullw  %xmm5, %xmm1, %xmm5
-;   pmulhw  %xmm0, %xmm1, %xmm0
-;   movdqa  %xmm0, %xmm2
-;   movdqa  %xmm5, %xmm0
-;   punpcklwd %xmm0, %xmm2, %xmm0
+;   movdqa  %xmm5, %xmm6
+;   movdqa  %xmm0, %xmm5
+;   pmulhw  %xmm5, %xmm1, %xmm5
+;   movdqa  %xmm6, %xmm0
+;   punpcklwd %xmm0, %xmm5, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -164,10 +171,11 @@ block0(v0: i16x8, v1: i16x8):
 ; block1: ; offset 0x4
 ;   movdqa %xmm0, %xmm5
 ;   pmullw %xmm1, %xmm5
-;   pmulhw %xmm1, %xmm0
-;   movdqa %xmm0, %xmm2
-;   movdqa %xmm5, %xmm0
-;   punpcklwd %xmm2, %xmm0
+;   movdqa %xmm5, %xmm6
+;   movdqa %xmm0, %xmm5
+;   pmulhw %xmm1, %xmm5
+;   movdqa %xmm6, %xmm0
+;   punpcklwd %xmm5, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -215,13 +223,14 @@ block0(v0: i8x16, v1: i8x16):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   uninit  %xmm2
-;   pxor    %xmm2, %xmm2, %xmm2
-;   punpckhbw %xmm0, %xmm2, %xmm0
-;   uninit  %xmm2
-;   pxor    %xmm2, %xmm2, %xmm2
-;   punpckhbw %xmm1, %xmm2, %xmm1
-;   pmullw  %xmm0, %xmm1, %xmm0
+;   uninit  %xmm8
+;   pxor    %xmm8, %xmm8, %xmm8
+;   punpckhbw %xmm0, %xmm8, %xmm0
+;   uninit  %xmm8
+;   pxor    %xmm8, %xmm8, %xmm8
+;   movdqa  %xmm1, %xmm11
+;   punpckhbw %xmm11, %xmm8, %xmm11
+;   pmullw  %xmm0, %xmm11, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -231,11 +240,12 @@ block0(v0: i8x16, v1: i8x16):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   pxor %xmm2, %xmm2
-;   punpckhbw %xmm2, %xmm0
-;   pxor %xmm2, %xmm2
-;   punpckhbw %xmm2, %xmm1
-;   pmullw %xmm1, %xmm0
+;   pxor %xmm8, %xmm8
+;   punpckhbw %xmm8, %xmm0
+;   pxor %xmm8, %xmm8
+;   movdqa %xmm1, %xmm11
+;   punpckhbw %xmm8, %xmm11
+;   pmullw %xmm11, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -254,10 +264,11 @@ block0(v0: i16x8, v1: i16x8):
 ; block0:
 ;   movdqa  %xmm0, %xmm5
 ;   pmullw  %xmm5, %xmm1, %xmm5
-;   pmulhuw %xmm0, %xmm1, %xmm0
-;   movdqa  %xmm0, %xmm2
-;   movdqa  %xmm5, %xmm0
-;   punpckhwd %xmm0, %xmm2, %xmm0
+;   movdqa  %xmm5, %xmm6
+;   movdqa  %xmm0, %xmm5
+;   pmulhuw %xmm5, %xmm1, %xmm5
+;   movdqa  %xmm6, %xmm0
+;   punpckhwd %xmm0, %xmm5, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -269,10 +280,11 @@ block0(v0: i16x8, v1: i16x8):
 ; block1: ; offset 0x4
 ;   movdqa %xmm0, %xmm5
 ;   pmullw %xmm1, %xmm5
-;   pmulhuw %xmm1, %xmm0
-;   movdqa %xmm0, %xmm2
-;   movdqa %xmm5, %xmm0
-;   punpckhwd %xmm2, %xmm0
+;   movdqa %xmm5, %xmm6
+;   movdqa %xmm0, %xmm5
+;   pmulhuw %xmm1, %xmm5
+;   movdqa %xmm6, %xmm0
+;   punpckhwd %xmm5, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -353,10 +365,11 @@ block0(v0: i16x8, v1: i16x8):
 ; block0:
 ;   movdqa  %xmm0, %xmm5
 ;   pmullw  %xmm5, %xmm1, %xmm5
-;   pmulhuw %xmm0, %xmm1, %xmm0
-;   movdqa  %xmm0, %xmm2
-;   movdqa  %xmm5, %xmm0
-;   punpcklwd %xmm0, %xmm2, %xmm0
+;   movdqa  %xmm5, %xmm6
+;   movdqa  %xmm0, %xmm5
+;   pmulhuw %xmm5, %xmm1, %xmm5
+;   movdqa  %xmm6, %xmm0
+;   punpcklwd %xmm0, %xmm5, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -368,10 +381,11 @@ block0(v0: i16x8, v1: i16x8):
 ; block1: ; offset 0x4
 ;   movdqa %xmm0, %xmm5
 ;   pmullw %xmm1, %xmm5
-;   pmulhuw %xmm1, %xmm0
-;   movdqa %xmm0, %xmm2
-;   movdqa %xmm5, %xmm0
-;   punpcklwd %xmm2, %xmm0
+;   movdqa %xmm5, %xmm6
+;   movdqa %xmm0, %xmm5
+;   pmulhuw %xmm1, %xmm5
+;   movdqa %xmm6, %xmm0
+;   punpcklwd %xmm5, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
diff --git a/cranelift/filetests/filetests/isa/x64/sshr.clif b/cranelift/filetests/filetests/isa/x64/sshr.clif
index b44ad0c35ed6..45d7d9af7624 100644
--- a/cranelift/filetests/filetests/isa/x64/sshr.clif
+++ b/cranelift/filetests/filetests/isa/x64/sshr.clif
@@ -18,7 +18,8 @@ block0(v0: i128, v1: i8):
 ;   movq    %rsp, %rbp
 ; block0:
 ;   movzbq  %dl, %rcx
-;   shrq    %cl, %rdi, %rdi
+;   movq    %rdi, %r8
+;   shrq    %cl, %r8, %r8
 ;   movq    %rsi, %r10
 ;   sarq    %cl, %r10, %r10
 ;   movq    %rcx, %r11
@@ -30,12 +31,12 @@ block0(v0: i128, v1: i8):
 ;   xorq    %r11, %r11, %r11
 ;   testq   $127, %rax
 ;   cmovzq  %r11, %r9, %r9
-;   orq     %rdi, %r9, %rdi
-;   sarq    $63, %rsi, %rsi
+;   orq     %r8, %r9, %r8
+;   movq    %rsi, %rdx
+;   sarq    $63, %rdx, %rdx
 ;   testq   $64, %rax
 ;   movq    %r10, %rax
-;   cmovzq  %rdi, %rax, %rax
-;   movq    %rsi, %rdx
+;   cmovzq  %r8, %rax, %rax
 ;   cmovzq  %r10, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -47,7 +48,8 @@ block0(v0: i128, v1: i8):
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
 ;   movzbq %dl, %rcx
-;   shrq %cl, %rdi
+;   movq %rdi, %r8
+;   shrq %cl, %r8
 ;   movq %rsi, %r10
 ;   sarq %cl, %r10
 ;   movq %rcx, %r11
@@ -59,12 +61,12 @@ block0(v0: i128, v1: i8):
 ;   xorq %r11, %r11
 ;   testq $0x7f, %rax
 ;   cmoveq %r11, %r9
-;   orq %r9, %rdi
-;   sarq $0x3f, %rsi
+;   orq %r9, %r8
+;   movq %rsi, %rdx
+;   sarq $0x3f, %rdx
 ;   testq $0x40, %rax
 ;   movq %r10, %rax
-;   cmoveq %rdi, %rax
-;   movq %rsi, %rdx
+;   cmoveq %r8, %rax
 ;   cmoveq %r10, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -82,24 +84,25 @@ block0(v0: i128, v1: i64):
 ; block0:
 ;   movq    %rdx, %rcx
 ;   movq    %rdx, %r10
-;   shrq    %cl, %rdi, %rdi
+;   movq    %rdi, %r11
+;   shrq    %cl, %r11, %r11
 ;   movq    %rsi, %r9
 ;   sarq    %cl, %r9, %r9
 ;   movq    %rcx, %r10
 ;   movl    $64, %ecx
-;   movq    %r10, %rax
-;   subq    %rcx, %rax, %rcx
+;   movq    %r10, %rdi
+;   subq    %rcx, %rdi, %rcx
 ;   movq    %rsi, %r8
 ;   shlq    %cl, %r8, %r8
 ;   xorq    %r10, %r10, %r10
-;   testq   $127, %rax
+;   testq   $127, %rdi
 ;   cmovzq  %r10, %r8, %r8
-;   orq     %rdi, %r8, %rdi
-;   sarq    $63, %rsi, %rsi
-;   testq   $64, %rax
-;   movq    %r9, %rax
-;   cmovzq  %rdi, %rax, %rax
+;   orq     %r11, %r8, %r11
 ;   movq    %rsi, %rdx
+;   sarq    $63, %rdx, %rdx
+;   testq   $64, %rdi
+;   movq    %r9, %rax
+;   cmovzq  %r11, %rax, %rax
 ;   cmovzq  %r9, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -112,24 +115,25 @@ block0(v0: i128, v1: i64):
 ; block1: ; offset 0x4
 ;   movq %rdx, %rcx
 ;   movq %rdx, %r10
-;   shrq %cl, %rdi
+;   movq %rdi, %r11
+;   shrq %cl, %r11
 ;   movq %rsi, %r9
 ;   sarq %cl, %r9
 ;   movq %rcx, %r10
 ;   movl $0x40, %ecx
-;   movq %r10, %rax
-;   subq %rax, %rcx
+;   movq %r10, %rdi
+;   subq %rdi, %rcx
 ;   movq %rsi, %r8
 ;   shlq %cl, %r8
 ;   xorq %r10, %r10
-;   testq $0x7f, %rax
+;   testq $0x7f, %rdi
 ;   cmoveq %r10, %r8
-;   orq %r8, %rdi
-;   sarq $0x3f, %rsi
-;   testq $0x40, %rax
-;   movq %r9, %rax
-;   cmoveq %rdi, %rax
+;   orq %r8, %r11
 ;   movq %rsi, %rdx
+;   sarq $0x3f, %rdx
+;   testq $0x40, %rdi
+;   movq %r9, %rax
+;   cmoveq %r11, %rax
 ;   cmoveq %r9, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -147,24 +151,25 @@ block0(v0: i128, v1: i32):
 ; block0:
 ;   movq    %rdx, %rcx
 ;   movq    %rdx, %r10
-;   shrq    %cl, %rdi, %rdi
+;   movq    %rdi, %r11
+;   shrq    %cl, %r11, %r11
 ;   movq    %rsi, %r9
 ;   sarq    %cl, %r9, %r9
 ;   movq    %rcx, %r10
 ;   movl    $64, %ecx
-;   movq    %r10, %rax
-;   subq    %rcx, %rax, %rcx
+;   movq    %r10, %rdi
+;   subq    %rcx, %rdi, %rcx
 ;   movq    %rsi, %r8
 ;   shlq    %cl, %r8, %r8
 ;   xorq    %r10, %r10, %r10
-;   testq   $127, %rax
+;   testq   $127, %rdi
 ;   cmovzq  %r10, %r8, %r8
-;   orq     %rdi, %r8, %rdi
-;   sarq    $63, %rsi, %rsi
-;   testq   $64, %rax
-;   movq    %r9, %rax
-;   cmovzq  %rdi, %rax, %rax
+;   orq     %r11, %r8, %r11
 ;   movq    %rsi, %rdx
+;   sarq    $63, %rdx, %rdx
+;   testq   $64, %rdi
+;   movq    %r9, %rax
+;   cmovzq  %r11, %rax, %rax
 ;   cmovzq  %r9, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -177,24 +182,25 @@ block0(v0: i128, v1: i32):
 ; block1: ; offset 0x4
 ;   movq %rdx, %rcx
 ;   movq %rdx, %r10
-;   shrq %cl, %rdi
+;   movq %rdi, %r11
+;   shrq %cl, %r11
 ;   movq %rsi, %r9
 ;   sarq %cl, %r9
 ;   movq %rcx, %r10
 ;   movl $0x40, %ecx
-;   movq %r10, %rax
-;   subq %rax, %rcx
+;   movq %r10, %rdi
+;   subq %rdi, %rcx
 ;   movq %rsi, %r8
 ;   shlq %cl, %r8
 ;   xorq %r10, %r10
-;   testq $0x7f, %rax
+;   testq $0x7f, %rdi
 ;   cmoveq %r10, %r8
-;   orq %r8, %rdi
-;   sarq $0x3f, %rsi
-;   testq $0x40, %rax
-;   movq %r9, %rax
-;   cmoveq %rdi, %rax
+;   orq %r8, %r11
 ;   movq %rsi, %rdx
+;   sarq $0x3f, %rdx
+;   testq $0x40, %rdi
+;   movq %r9, %rax
+;   cmoveq %r11, %rax
 ;   cmoveq %r9, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -212,24 +218,25 @@ block0(v0: i128, v1: i16):
 ; block0:
 ;   movq    %rdx, %rcx
 ;   movq    %rdx, %r10
-;   shrq    %cl, %rdi, %rdi
+;   movq    %rdi, %r11
+;   shrq    %cl, %r11, %r11
 ;   movq    %rsi, %r9
 ;   sarq    %cl, %r9, %r9
 ;   movq    %rcx, %r10
 ;   movl    $64, %ecx
-;   movq    %r10, %rax
-;   subq    %rcx, %rax, %rcx
+;   movq    %r10, %rdi
+;   subq    %rcx, %rdi, %rcx
 ;   movq    %rsi, %r8
 ;   shlq    %cl, %r8, %r8
 ;   xorq    %r10, %r10, %r10
-;   testq   $127, %rax
+;   testq   $127, %rdi
 ;   cmovzq  %r10, %r8, %r8
-;   orq     %rdi, %r8, %rdi
-;   sarq    $63, %rsi, %rsi
-;   testq   $64, %rax
-;   movq    %r9, %rax
-;   cmovzq  %rdi, %rax, %rax
+;   orq     %r11, %r8, %r11
 ;   movq    %rsi, %rdx
+;   sarq    $63, %rdx, %rdx
+;   testq   $64, %rdi
+;   movq    %r9, %rax
+;   cmovzq  %r11, %rax, %rax
 ;   cmovzq  %r9, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -242,24 +249,25 @@ block0(v0: i128, v1: i16):
 ; block1: ; offset 0x4
 ;   movq %rdx, %rcx
 ;   movq %rdx, %r10
-;   shrq %cl, %rdi
+;   movq %rdi, %r11
+;   shrq %cl, %r11
 ;   movq %rsi, %r9
 ;   sarq %cl, %r9
 ;   movq %rcx, %r10
 ;   movl $0x40, %ecx
-;   movq %r10, %rax
-;   subq %rax, %rcx
+;   movq %r10, %rdi
+;   subq %rdi, %rcx
 ;   movq %rsi, %r8
 ;   shlq %cl, %r8
 ;   xorq %r10, %r10
-;   testq $0x7f, %rax
+;   testq $0x7f, %rdi
 ;   cmoveq %r10, %r8
-;   orq %r8, %rdi
-;   sarq $0x3f, %rsi
-;   testq $0x40, %rax
-;   movq %r9, %rax
-;   cmoveq %rdi, %rax
+;   orq %r8, %r11
 ;   movq %rsi, %rdx
+;   sarq $0x3f, %rdx
+;   testq $0x40, %rdi
+;   movq %r9, %rax
+;   cmoveq %r11, %rax
 ;   cmoveq %r9, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -277,24 +285,25 @@ block0(v0: i128, v1: i8):
 ; block0:
 ;   movq    %rdx, %rcx
 ;   movq    %rdx, %r10
-;   shrq    %cl, %rdi, %rdi
+;   movq    %rdi, %r11
+;   shrq    %cl, %r11, %r11
 ;   movq    %rsi, %r9
 ;   sarq    %cl, %r9, %r9
 ;   movq    %rcx, %r10
 ;   movl    $64, %ecx
-;   movq    %r10, %rax
-;   subq    %rcx, %rax, %rcx
+;   movq    %r10, %rdi
+;   subq    %rcx, %rdi, %rcx
 ;   movq    %rsi, %r8
 ;   shlq    %cl, %r8, %r8
 ;   xorq    %r10, %r10, %r10
-;   testq   $127, %rax
+;   testq   $127, %rdi
 ;   cmovzq  %r10, %r8, %r8
-;   orq     %rdi, %r8, %rdi
-;   sarq    $63, %rsi, %rsi
-;   testq   $64, %rax
-;   movq    %r9, %rax
-;   cmovzq  %rdi, %rax, %rax
+;   orq     %r11, %r8, %r11
 ;   movq    %rsi, %rdx
+;   sarq    $63, %rdx, %rdx
+;   testq   $64, %rdi
+;   movq    %r9, %rax
+;   cmovzq  %r11, %rax, %rax
 ;   cmovzq  %r9, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -307,24 +316,25 @@ block0(v0: i128, v1: i8):
 ; block1: ; offset 0x4
 ;   movq %rdx, %rcx
 ;   movq %rdx, %r10
-;   shrq %cl, %rdi
+;   movq %rdi, %r11
+;   shrq %cl, %r11
 ;   movq %rsi, %r9
 ;   sarq %cl, %r9
 ;   movq %rcx, %r10
 ;   movl $0x40, %ecx
-;   movq %r10, %rax
-;   subq %rax, %rcx
+;   movq %r10, %rdi
+;   subq %rdi, %rcx
 ;   movq %rsi, %r8
 ;   shlq %cl, %r8
 ;   xorq %r10, %r10
-;   testq $0x7f, %rax
+;   testq $0x7f, %rdi
 ;   cmoveq %r10, %r8
-;   orq %r8, %rdi
-;   sarq $0x3f, %rsi
-;   testq $0x40, %rax
-;   movq %r9, %rax
-;   cmoveq %rdi, %rax
+;   orq %r8, %r11
 ;   movq %rsi, %rdx
+;   sarq $0x3f, %rdx
+;   testq $0x40, %rdi
+;   movq %r9, %rax
+;   cmoveq %r11, %rax
 ;   cmoveq %r9, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
diff --git a/cranelift/filetests/filetests/isa/x64/struct-arg.clif b/cranelift/filetests/filetests/isa/x64/struct-arg.clif
index 5de74242ec39..cf1606a892e5 100644
--- a/cranelift/filetests/filetests/isa/x64/struct-arg.clif
+++ b/cranelift/filetests/filetests/isa/x64/struct-arg.clif
@@ -207,8 +207,8 @@ block0(v0: i64, v1: i64, v2: i64):
 ;   movq    %r12, 0(%rsp)
 ;   movq    %r14, 8(%rsp)
 ; block0:
-;   movq    %rdi, %r12
 ;   movq    %rdx, %r14
+;   movq    %rdi, %r12
 ;   subq    %rsp, $192, %rsp
 ;   virtual_sp_offset_adjust 192
 ;   lea     0(%rsp), %rdi
@@ -239,8 +239,8 @@ block0(v0: i64, v1: i64, v2: i64):
 ;   movq %r12, (%rsp)
 ;   movq %r14, 8(%rsp)
 ; block1: ; offset 0x11
-;   movq %rdi, %r12
 ;   movq %rdx, %r14
+;   movq %rdi, %r12
 ;   subq $0xc0, %rsp
 ;   leaq (%rsp), %rdi
 ;   movl $0x80, %edx
diff --git a/cranelift/filetests/filetests/isa/x64/tail-call-conv.clif b/cranelift/filetests/filetests/isa/x64/tail-call-conv.clif
index e3afe591e268..04012299b7b5 100644
--- a/cranelift/filetests/filetests/isa/x64/tail-call-conv.clif
+++ b/cranelift/filetests/filetests/isa/x64/tail-call-conv.clif
@@ -240,19 +240,19 @@ block0:
 ;   movq    %r12, 80(%rax)
 ;   movq    %r13, 88(%rax)
 ;   movq    %r14, 96(%rax)
-;   movq    rsp(96 + virtual offset), %rax
-;   movq    rsp(88 + virtual offset), %rcx
-;   movq    rsp(80 + virtual offset), %rdx
-;   movq    rsp(72 + virtual offset), %rbx
-;   movq    rsp(64 + virtual offset), %rsi
-;   movq    rsp(56 + virtual offset), %rdi
-;   movq    rsp(48 + virtual offset), %r8
-;   movq    rsp(40 + virtual offset), %r9
-;   movq    rsp(32 + virtual offset), %r10
-;   movq    rsp(24 + virtual offset), %r11
-;   movq    rsp(16 + virtual offset), %r12
-;   movq    rsp(8 + virtual offset), %r13
 ;   movq    rsp(0 + virtual offset), %r14
+;   movq    rsp(8 + virtual offset), %r13
+;   movq    rsp(16 + virtual offset), %r12
+;   movq    rsp(24 + virtual offset), %r11
+;   movq    rsp(32 + virtual offset), %r10
+;   movq    rsp(40 + virtual offset), %r9
+;   movq    rsp(48 + virtual offset), %r8
+;   movq    rsp(56 + virtual offset), %rdi
+;   movq    rsp(64 + virtual offset), %rsi
+;   movq    rsp(72 + virtual offset), %rbx
+;   movq    rsp(80 + virtual offset), %rdx
+;   movq    rsp(88 + virtual offset), %rcx
+;   movq    rsp(96 + virtual offset), %rax
 ;   addq    %rsp, $112, %rsp
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -316,19 +316,19 @@ block0:
 ;   movq %r12, 0x50(%rax)
 ;   movq %r13, 0x58(%rax)
 ;   movq %r14, 0x60(%rax)
-;   movq 0x60(%rsp), %rax
-;   movq 0x58(%rsp), %rcx
-;   movq 0x50(%rsp), %rdx
-;   movq 0x48(%rsp), %rbx
-;   movq 0x40(%rsp), %rsi
-;   movq 0x38(%rsp), %rdi
-;   movq 0x30(%rsp), %r8
-;   movq 0x28(%rsp), %r9
-;   movq 0x20(%rsp), %r10
-;   movq 0x18(%rsp), %r11
-;   movq 0x10(%rsp), %r12
-;   movq 8(%rsp), %r13
 ;   movq (%rsp), %r14
+;   movq 8(%rsp), %r13
+;   movq 0x10(%rsp), %r12
+;   movq 0x18(%rsp), %r11
+;   movq 0x20(%rsp), %r10
+;   movq 0x28(%rsp), %r9
+;   movq 0x30(%rsp), %r8
+;   movq 0x38(%rsp), %rdi
+;   movq 0x40(%rsp), %rsi
+;   movq 0x48(%rsp), %rbx
+;   movq 0x50(%rsp), %rdx
+;   movq 0x58(%rsp), %rcx
+;   movq 0x60(%rsp), %rax
 ;   addq $0x70, %rsp
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -638,16 +638,16 @@ block0:
 ;   lea     144(%rsp), %r10
 ;   movq    %r10, 128(%rsp)
 ;   load_ext_name %tail_callee_stack_args_and_rets+0, %r15
-;   movq    rsp(96 + virtual offset), %rax
-;   movq    rsp(88 + virtual offset), %rcx
-;   movq    rsp(80 + virtual offset), %rdx
-;   movq    rsp(72 + virtual offset), %rbx
-;   movq    rsp(64 + virtual offset), %rsi
-;   movq    rsp(56 + virtual offset), %rdi
-;   movq    rsp(48 + virtual offset), %r8
-;   movq    rsp(40 + virtual offset), %r9
-;   movq    rsp(32 + virtual offset), %r10
 ;   movq    rsp(24 + virtual offset), %r11
+;   movq    rsp(32 + virtual offset), %r10
+;   movq    rsp(40 + virtual offset), %r9
+;   movq    rsp(48 + virtual offset), %r8
+;   movq    rsp(56 + virtual offset), %rdi
+;   movq    rsp(64 + virtual offset), %rsi
+;   movq    rsp(72 + virtual offset), %rbx
+;   movq    rsp(80 + virtual offset), %rdx
+;   movq    rsp(88 + virtual offset), %rcx
+;   movq    rsp(96 + virtual offset), %rax
 ;   call    *%r15
 ;   movq    0(%rsp), %r10
 ;   movq    8(%rsp), %rsi
@@ -737,16 +737,16 @@ block0:
 ;   leaq 0x90(%rsp), %r10
 ;   movq %r10, 0x80(%rsp)
 ;   movabsq $0, %r15 ; reloc_external Abs8 %tail_callee_stack_args_and_rets 0
-;   movq 0x160(%rsp), %rax
-;   movq 0x158(%rsp), %rcx
-;   movq 0x150(%rsp), %rdx
-;   movq 0x148(%rsp), %rbx
-;   movq 0x140(%rsp), %rsi
-;   movq 0x138(%rsp), %rdi
-;   movq 0x130(%rsp), %r8
-;   movq 0x128(%rsp), %r9
-;   movq 0x120(%rsp), %r10
 ;   movq 0x118(%rsp), %r11
+;   movq 0x120(%rsp), %r10
+;   movq 0x128(%rsp), %r9
+;   movq 0x130(%rsp), %r8
+;   movq 0x138(%rsp), %rdi
+;   movq 0x140(%rsp), %rsi
+;   movq 0x148(%rsp), %rbx
+;   movq 0x150(%rsp), %rdx
+;   movq 0x158(%rsp), %rcx
+;   movq 0x160(%rsp), %rax
 ;   callq *%r15
 ;   movq (%rsp), %r10
 ;   movq 8(%rsp), %rsi
diff --git a/cranelift/filetests/filetests/isa/x64/traps.clif b/cranelift/filetests/filetests/isa/x64/traps.clif
index 6645ecb3bb77..bd3e81ee3bf0 100644
--- a/cranelift/filetests/filetests/isa/x64/traps.clif
+++ b/cranelift/filetests/filetests/isa/x64/traps.clif
@@ -29,7 +29,8 @@ block0(v0: i64, v1: i64):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   addq    %rdi, %rsi, %rdi
+;   movq    %rdi, %rcx
+;   addq    %rcx, %rsi, %rcx
 ;   jb #trap=user0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -40,8 +41,9 @@ block0(v0: i64, v1: i64):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   addq %rsi, %rdi
-;   jb 0x12
+;   movq %rdi, %rcx
+;   addq %rsi, %rcx
+;   jb 0x15
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
diff --git a/cranelift/filetests/filetests/isa/x64/uext-sext-handling.clif b/cranelift/filetests/filetests/isa/x64/uext-sext-handling.clif
deleted file mode 100644
index 0908bec08c96..000000000000
--- a/cranelift/filetests/filetests/isa/x64/uext-sext-handling.clif
+++ /dev/null
@@ -1,38 +0,0 @@
-test compile
-target x86_64
-
-; The x86_64 system_v call conv respects uext and sext
-function u0:0(i8) system_v {
-    sig0 = (i8 uext) system_v
-    fn0 = u0:0 sig0
-
-block0(v0: i8):
-    call fn0(v0)
-    return
-}
-
-; check: pushq   %rbp
-; nextln: movq    %rsp, %rbp
-; nextln: block0:
-; nextln: movzbq  %dil, %rdi
-; nextln: load_ext_name userextname0+0, %rdx
-; nextln: call    *%rdx
-
-; The x86_64 windows_fastcall call conv respects uext and sext
-function u0:0(i8) windows_fastcall {
-    sig0 = (i8 uext) windows_fastcall
-    fn0 = u0:0 sig0
-
-block0(v0: i8):
-    call fn0(v0)
-    return
-}
-
-; check: pushq   %rbp
-; nextln: movq    %rsp, %rbp
-; nextln: block0:
-; nextln: subq    %rsp, $$32, %rsp
-; nextln: virtual_sp_offset_adjust 32
-; nextln: movzbq  %cl, %rcx
-; nextln: load_ext_name userextname0+0, %r9
-; nextln: call    *%r9
diff --git a/cranelift/filetests/filetests/isa/x64/ushr.clif b/cranelift/filetests/filetests/isa/x64/ushr.clif
index 8c760f2d48f0..710f35a11f33 100644
--- a/cranelift/filetests/filetests/isa/x64/ushr.clif
+++ b/cranelift/filetests/filetests/isa/x64/ushr.clif
@@ -17,21 +17,23 @@ block0(v0: i128, v1: i8):
 ;   movq    %rsp, %rbp
 ; block0:
 ;   movzbq  %dl, %rcx
-;   shrq    %cl, %rdi, %rdi
+;   movq    %rdi, %r8
+;   shrq    %cl, %r8, %r8
 ;   movq    %rsi, %r10
 ;   shrq    %cl, %r10, %r10
 ;   movq    %rcx, %r9
 ;   movl    $64, %ecx
-;   movq    %r9, %rax
-;   subq    %rcx, %rax, %rcx
-;   shlq    %cl, %rsi, %rsi
+;   movq    %r9, %rdi
+;   subq    %rcx, %rdi, %rcx
+;   movq    %rsi, %r11
+;   shlq    %cl, %r11, %r11
 ;   xorq    %rdx, %rdx, %rdx
-;   testq   $127, %rax
-;   cmovzq  %rdx, %rsi, %rsi
-;   orq     %rsi, %rdi, %rsi
-;   testq   $64, %rax
+;   testq   $127, %rdi
+;   cmovzq  %rdx, %r11, %r11
+;   orq     %r11, %r8, %r11
+;   testq   $64, %rdi
 ;   movq    %r10, %rax
-;   cmovzq  %rsi, %rax, %rax
+;   cmovzq  %r11, %rax, %rax
 ;   cmovzq  %r10, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -43,21 +45,23 @@ block0(v0: i128, v1: i8):
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
 ;   movzbq %dl, %rcx
-;   shrq %cl, %rdi
+;   movq %rdi, %r8
+;   shrq %cl, %r8
 ;   movq %rsi, %r10
 ;   shrq %cl, %r10
 ;   movq %rcx, %r9
 ;   movl $0x40, %ecx
-;   movq %r9, %rax
-;   subq %rax, %rcx
-;   shlq %cl, %rsi
+;   movq %r9, %rdi
+;   subq %rdi, %rcx
+;   movq %rsi, %r11
+;   shlq %cl, %r11
 ;   xorq %rdx, %rdx
-;   testq $0x7f, %rax
-;   cmoveq %rdx, %rsi
-;   orq %rdi, %rsi
-;   testq $0x40, %rax
+;   testq $0x7f, %rdi
+;   cmoveq %rdx, %r11
+;   orq %r8, %r11
+;   testq $0x40, %rdi
 ;   movq %r10, %rax
-;   cmoveq %rsi, %rax
+;   cmoveq %r11, %rax
 ;   cmoveq %r10, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -75,21 +79,23 @@ block0(v0: i128, v1: i64):
 ; block0:
 ;   movq    %rdx, %rcx
 ;   movq    %rdx, %r10
-;   shrq    %cl, %rdi, %rdi
+;   movq    %rdi, %r8
+;   shrq    %cl, %r8, %r8
 ;   movq    %rsi, %r9
 ;   shrq    %cl, %r9, %r9
 ;   movq    %rcx, %r10
 ;   movl    $64, %ecx
-;   movq    %r10, %rax
-;   subq    %rcx, %rax, %rcx
-;   shlq    %cl, %rsi, %rsi
+;   movq    %r10, %rdi
+;   subq    %rcx, %rdi, %rcx
+;   movq    %rsi, %r10
+;   shlq    %cl, %r10, %r10
 ;   xorq    %rdx, %rdx, %rdx
-;   testq   $127, %rax
-;   cmovzq  %rdx, %rsi, %rsi
-;   orq     %rsi, %rdi, %rsi
-;   testq   $64, %rax
+;   testq   $127, %rdi
+;   cmovzq  %rdx, %r10, %r10
+;   orq     %r10, %r8, %r10
+;   testq   $64, %rdi
 ;   movq    %r9, %rax
-;   cmovzq  %rsi, %rax, %rax
+;   cmovzq  %r10, %rax, %rax
 ;   cmovzq  %r9, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -102,21 +108,23 @@ block0(v0: i128, v1: i64):
 ; block1: ; offset 0x4
 ;   movq %rdx, %rcx
 ;   movq %rdx, %r10
-;   shrq %cl, %rdi
+;   movq %rdi, %r8
+;   shrq %cl, %r8
 ;   movq %rsi, %r9
 ;   shrq %cl, %r9
 ;   movq %rcx, %r10
 ;   movl $0x40, %ecx
-;   movq %r10, %rax
-;   subq %rax, %rcx
-;   shlq %cl, %rsi
+;   movq %r10, %rdi
+;   subq %rdi, %rcx
+;   movq %rsi, %r10
+;   shlq %cl, %r10
 ;   xorq %rdx, %rdx
-;   testq $0x7f, %rax
-;   cmoveq %rdx, %rsi
-;   orq %rdi, %rsi
-;   testq $0x40, %rax
+;   testq $0x7f, %rdi
+;   cmoveq %rdx, %r10
+;   orq %r8, %r10
+;   testq $0x40, %rdi
 ;   movq %r9, %rax
-;   cmoveq %rsi, %rax
+;   cmoveq %r10, %rax
 ;   cmoveq %r9, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -134,21 +142,23 @@ block0(v0: i128, v1: i32):
 ; block0:
 ;   movq    %rdx, %rcx
 ;   movq    %rdx, %r10
-;   shrq    %cl, %rdi, %rdi
+;   movq    %rdi, %r8
+;   shrq    %cl, %r8, %r8
 ;   movq    %rsi, %r9
 ;   shrq    %cl, %r9, %r9
 ;   movq    %rcx, %r10
 ;   movl    $64, %ecx
-;   movq    %r10, %rax
-;   subq    %rcx, %rax, %rcx
-;   shlq    %cl, %rsi, %rsi
+;   movq    %r10, %rdi
+;   subq    %rcx, %rdi, %rcx
+;   movq    %rsi, %r10
+;   shlq    %cl, %r10, %r10
 ;   xorq    %rdx, %rdx, %rdx
-;   testq   $127, %rax
-;   cmovzq  %rdx, %rsi, %rsi
-;   orq     %rsi, %rdi, %rsi
-;   testq   $64, %rax
+;   testq   $127, %rdi
+;   cmovzq  %rdx, %r10, %r10
+;   orq     %r10, %r8, %r10
+;   testq   $64, %rdi
 ;   movq    %r9, %rax
-;   cmovzq  %rsi, %rax, %rax
+;   cmovzq  %r10, %rax, %rax
 ;   cmovzq  %r9, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -161,21 +171,23 @@ block0(v0: i128, v1: i32):
 ; block1: ; offset 0x4
 ;   movq %rdx, %rcx
 ;   movq %rdx, %r10
-;   shrq %cl, %rdi
+;   movq %rdi, %r8
+;   shrq %cl, %r8
 ;   movq %rsi, %r9
 ;   shrq %cl, %r9
 ;   movq %rcx, %r10
 ;   movl $0x40, %ecx
-;   movq %r10, %rax
-;   subq %rax, %rcx
-;   shlq %cl, %rsi
+;   movq %r10, %rdi
+;   subq %rdi, %rcx
+;   movq %rsi, %r10
+;   shlq %cl, %r10
 ;   xorq %rdx, %rdx
-;   testq $0x7f, %rax
-;   cmoveq %rdx, %rsi
-;   orq %rdi, %rsi
-;   testq $0x40, %rax
+;   testq $0x7f, %rdi
+;   cmoveq %rdx, %r10
+;   orq %r8, %r10
+;   testq $0x40, %rdi
 ;   movq %r9, %rax
-;   cmoveq %rsi, %rax
+;   cmoveq %r10, %rax
 ;   cmoveq %r9, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -193,21 +205,23 @@ block0(v0: i128, v1: i16):
 ; block0:
 ;   movq    %rdx, %rcx
 ;   movq    %rdx, %r10
-;   shrq    %cl, %rdi, %rdi
+;   movq    %rdi, %r8
+;   shrq    %cl, %r8, %r8
 ;   movq    %rsi, %r9
 ;   shrq    %cl, %r9, %r9
 ;   movq    %rcx, %r10
 ;   movl    $64, %ecx
-;   movq    %r10, %rax
-;   subq    %rcx, %rax, %rcx
-;   shlq    %cl, %rsi, %rsi
+;   movq    %r10, %rdi
+;   subq    %rcx, %rdi, %rcx
+;   movq    %rsi, %r10
+;   shlq    %cl, %r10, %r10
 ;   xorq    %rdx, %rdx, %rdx
-;   testq   $127, %rax
-;   cmovzq  %rdx, %rsi, %rsi
-;   orq     %rsi, %rdi, %rsi
-;   testq   $64, %rax
+;   testq   $127, %rdi
+;   cmovzq  %rdx, %r10, %r10
+;   orq     %r10, %r8, %r10
+;   testq   $64, %rdi
 ;   movq    %r9, %rax
-;   cmovzq  %rsi, %rax, %rax
+;   cmovzq  %r10, %rax, %rax
 ;   cmovzq  %r9, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -220,21 +234,23 @@ block0(v0: i128, v1: i16):
 ; block1: ; offset 0x4
 ;   movq %rdx, %rcx
 ;   movq %rdx, %r10
-;   shrq %cl, %rdi
+;   movq %rdi, %r8
+;   shrq %cl, %r8
 ;   movq %rsi, %r9
 ;   shrq %cl, %r9
 ;   movq %rcx, %r10
 ;   movl $0x40, %ecx
-;   movq %r10, %rax
-;   subq %rax, %rcx
-;   shlq %cl, %rsi
+;   movq %r10, %rdi
+;   subq %rdi, %rcx
+;   movq %rsi, %r10
+;   shlq %cl, %r10
 ;   xorq %rdx, %rdx
-;   testq $0x7f, %rax
-;   cmoveq %rdx, %rsi
-;   orq %rdi, %rsi
-;   testq $0x40, %rax
+;   testq $0x7f, %rdi
+;   cmoveq %rdx, %r10
+;   orq %r8, %r10
+;   testq $0x40, %rdi
 ;   movq %r9, %rax
-;   cmoveq %rsi, %rax
+;   cmoveq %r10, %rax
 ;   cmoveq %r9, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
@@ -252,21 +268,23 @@ block0(v0: i128, v1: i8):
 ; block0:
 ;   movq    %rdx, %rcx
 ;   movq    %rdx, %r10
-;   shrq    %cl, %rdi, %rdi
+;   movq    %rdi, %r8
+;   shrq    %cl, %r8, %r8
 ;   movq    %rsi, %r9
 ;   shrq    %cl, %r9, %r9
 ;   movq    %rcx, %r10
 ;   movl    $64, %ecx
-;   movq    %r10, %rax
-;   subq    %rcx, %rax, %rcx
-;   shlq    %cl, %rsi, %rsi
+;   movq    %r10, %rdi
+;   subq    %rcx, %rdi, %rcx
+;   movq    %rsi, %r10
+;   shlq    %cl, %r10, %r10
 ;   xorq    %rdx, %rdx, %rdx
-;   testq   $127, %rax
-;   cmovzq  %rdx, %rsi, %rsi
-;   orq     %rsi, %rdi, %rsi
-;   testq   $64, %rax
+;   testq   $127, %rdi
+;   cmovzq  %rdx, %r10, %r10
+;   orq     %r10, %r8, %r10
+;   testq   $64, %rdi
 ;   movq    %r9, %rax
-;   cmovzq  %rsi, %rax, %rax
+;   cmovzq  %r10, %rax, %rax
 ;   cmovzq  %r9, %rdx, %rdx
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -279,21 +297,23 @@ block0(v0: i128, v1: i8):
 ; block1: ; offset 0x4
 ;   movq %rdx, %rcx
 ;   movq %rdx, %r10
-;   shrq %cl, %rdi
+;   movq %rdi, %r8
+;   shrq %cl, %r8
 ;   movq %rsi, %r9
 ;   shrq %cl, %r9
 ;   movq %rcx, %r10
 ;   movl $0x40, %ecx
-;   movq %r10, %rax
-;   subq %rax, %rcx
-;   shlq %cl, %rsi
+;   movq %r10, %rdi
+;   subq %rdi, %rcx
+;   movq %rsi, %r10
+;   shlq %cl, %r10
 ;   xorq %rdx, %rdx
-;   testq $0x7f, %rax
-;   cmoveq %rdx, %rsi
-;   orq %rdi, %rsi
-;   testq $0x40, %rax
+;   testq $0x7f, %rdi
+;   cmoveq %rdx, %r10
+;   orq %r8, %r10
+;   testq $0x40, %rdi
 ;   movq %r9, %rax
-;   cmoveq %rsi, %rax
+;   cmoveq %r10, %rax
 ;   cmoveq %r9, %rdx
 ;   movq %rbp, %rsp
 ;   popq %rbp
diff --git a/cranelift/filetests/filetests/isa/x64/uunarrow.clif b/cranelift/filetests/filetests/isa/x64/uunarrow.clif
index 57fdf011cbaa..0abe8d104ba6 100644
--- a/cranelift/filetests/filetests/isa/x64/uunarrow.clif
+++ b/cranelift/filetests/filetests/isa/x64/uunarrow.clif
@@ -15,9 +15,10 @@ block0(v0: f64x2):
 ; block0:
 ;   uninit  %xmm3
 ;   xorpd   %xmm3, %xmm3, %xmm3
-;   maxpd   %xmm0, %xmm3, %xmm0
-;   minpd   %xmm0, const(0), %xmm0
-;   roundpd $3, %xmm0, %xmm0
+;   movdqa  %xmm0, %xmm7
+;   maxpd   %xmm7, %xmm3, %xmm7
+;   minpd   %xmm7, const(0), %xmm7
+;   roundpd $3, %xmm7, %xmm0
 ;   addpd   %xmm0, const(1), %xmm0
 ;   shufps  $136, %xmm0, %xmm3, %xmm0
 ;   movq    %rbp, %rsp
@@ -30,16 +31,15 @@ block0(v0: f64x2):
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
 ;   xorpd %xmm3, %xmm3
-;   maxpd %xmm3, %xmm0
-;   minpd 0x1c(%rip), %xmm0
-;   roundpd $3, %xmm0, %xmm0
-;   addpd 0x1e(%rip), %xmm0
+;   movdqa %xmm0, %xmm7
+;   maxpd %xmm3, %xmm7
+;   minpd 0x18(%rip), %xmm7
+;   roundpd $3, %xmm7, %xmm0
+;   addpd 0x1a(%rip), %xmm0
 ;   shufps $0x88, %xmm3, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
 ;   addb %al, (%rax)
-;   addb %al, (%rax)
-;   addb %al, (%rax)
 ;   addb %ah, %al
 
diff --git a/cranelift/filetests/filetests/isa/x64/vhigh_bits.clif b/cranelift/filetests/filetests/isa/x64/vhigh_bits.clif
index 51fdff3a0bfc..bf086f00c894 100644
--- a/cranelift/filetests/filetests/isa/x64/vhigh_bits.clif
+++ b/cranelift/filetests/filetests/isa/x64/vhigh_bits.clif
@@ -61,8 +61,9 @@ block0(v0: i16x8):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   packsswb %xmm0, %xmm0, %xmm0
-;   pmovmskb %xmm0, %eax
+;   movdqa  %xmm0, %xmm2
+;   packsswb %xmm2, %xmm0, %xmm2
+;   pmovmskb %xmm2, %eax
 ;   shrq    $8, %rax, %rax
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
@@ -73,8 +74,9 @@ block0(v0: i16x8):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   packsswb %xmm0, %xmm0
-;   pmovmskb %xmm0, %eax
+;   movdqa %xmm0, %xmm2
+;   packsswb %xmm0, %xmm2
+;   pmovmskb %xmm2, %eax
 ;   shrq $8, %rax
 ;   movq %rbp, %rsp
 ;   popq %rbp
diff --git a/cranelift/filetests/filetests/isa/x64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/x64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index ca713ccc731b..98836b711f88 100644
--- a/cranelift/filetests/filetests/isa/x64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/x64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -45,17 +45,18 @@
 ;;   movq    %rsp, %rbp
 ;;   unwind DefineNewFrame { offset_upward_to_caller_sp: 16, offset_downward_to_clobbers: 0 }
 ;; block0:
-;;   movq    %rdi, %rax
-;;   addq    %rax, const(0), %rax
+;;   movq    %rdi, %r8
+;;   addq    %r8, const(0), %r8
 ;;   jb #trap=heap_oob
-;;   movq    8(%rdx), %rcx
-;;   addq    %rdi, 0(%rdx), %rdi
+;;   movq    8(%rdx), %rax
+;;   movq    %rdi, %rcx
+;;   addq    %rcx, 0(%rdx), %rcx
 ;;   movl    $-65536, %edx
-;;   lea     0(%rdi,%rdx,1), %rdi
+;;   lea     0(%rcx,%rdx,1), %rcx
 ;;   xorq    %rdx, %rdx, %rdx
-;;   cmpq    %rcx, %rax
-;;   cmovnbeq %rdx, %rdi, %rdi
-;;   movl    %esi, 0(%rdi)
+;;   cmpq    %rax, %r8
+;;   cmovnbeq %rdx, %rcx, %rcx
+;;   movl    %esi, 0(%rcx)
 ;;   jmp     label1
 ;; block1:
 ;;   movq    %rbp, %rsp
@@ -68,15 +69,16 @@
 ;;   movq    %rsp, %rbp
 ;;   unwind DefineNewFrame { offset_upward_to_caller_sp: 16, offset_downward_to_clobbers: 0 }
 ;; block0:
-;;   movq    %rdi, %rax
-;;   addq    %rax, const(0), %rax
+;;   movq    %rdi, %rcx
+;;   addq    %rcx, const(0), %rcx
 ;;   jb #trap=heap_oob
-;;   movq    8(%rsi), %rcx
-;;   addq    %rdi, 0(%rsi), %rdi
-;;   movl    $-65536, %edx
-;;   lea     0(%rdi,%rdx,1), %rsi
+;;   movq    8(%rsi), %rax
+;;   movq    %rdi, %rdx
+;;   addq    %rdx, 0(%rsi), %rdx
+;;   movl    $-65536, %r8d
+;;   lea     0(%rdx,%r8,1), %rsi
 ;;   xorq    %rdx, %rdx, %rdx
-;;   cmpq    %rcx, %rax
+;;   cmpq    %rax, %rcx
 ;;   cmovnbeq %rdx, %rsi, %rsi
 ;;   movl    0(%rsi), %eax
 ;;   jmp     label1
diff --git a/cranelift/filetests/filetests/isa/x64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/x64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index c0ae962583e7..be22d8a42144 100644
--- a/cranelift/filetests/filetests/isa/x64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/x64/wasm/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -45,17 +45,18 @@
 ;;   movq    %rsp, %rbp
 ;;   unwind DefineNewFrame { offset_upward_to_caller_sp: 16, offset_downward_to_clobbers: 0 }
 ;; block0:
-;;   movq    %rdi, %rax
-;;   addq    %rax, const(0), %rax
+;;   movq    %rdi, %r8
+;;   addq    %r8, const(0), %r8
 ;;   jb #trap=heap_oob
-;;   movq    8(%rdx), %rcx
-;;   addq    %rdi, 0(%rdx), %rdi
+;;   movq    8(%rdx), %rax
+;;   movq    %rdi, %rcx
+;;   addq    %rcx, 0(%rdx), %rcx
 ;;   movl    $-65536, %edx
-;;   lea     0(%rdi,%rdx,1), %rdi
+;;   lea     0(%rcx,%rdx,1), %rcx
 ;;   xorq    %rdx, %rdx, %rdx
-;;   cmpq    %rcx, %rax
-;;   cmovnbeq %rdx, %rdi, %rdi
-;;   movb    %sil, 0(%rdi)
+;;   cmpq    %rax, %r8
+;;   cmovnbeq %rdx, %rcx, %rcx
+;;   movb    %sil, 0(%rcx)
 ;;   jmp     label1
 ;; block1:
 ;;   movq    %rbp, %rsp
@@ -68,15 +69,16 @@
 ;;   movq    %rsp, %rbp
 ;;   unwind DefineNewFrame { offset_upward_to_caller_sp: 16, offset_downward_to_clobbers: 0 }
 ;; block0:
-;;   movq    %rdi, %rax
-;;   addq    %rax, const(0), %rax
+;;   movq    %rdi, %rcx
+;;   addq    %rcx, const(0), %rcx
 ;;   jb #trap=heap_oob
-;;   movq    8(%rsi), %rcx
-;;   addq    %rdi, 0(%rsi), %rdi
-;;   movl    $-65536, %edx
-;;   lea     0(%rdi,%rdx,1), %rsi
+;;   movq    8(%rsi), %rax
+;;   movq    %rdi, %rdx
+;;   addq    %rdx, 0(%rsi), %rdx
+;;   movl    $-65536, %r8d
+;;   lea     0(%rdx,%r8,1), %rsi
 ;;   xorq    %rdx, %rdx, %rdx
-;;   cmpq    %rcx, %rax
+;;   cmpq    %rax, %rcx
 ;;   cmovnbeq %rdx, %rsi, %rsi
 ;;   movzbq  0(%rsi), %rax
 ;;   jmp     label1
diff --git a/cranelift/filetests/filetests/isa/x64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/x64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
index e0f869ff951d..6d9c1df46417 100644
--- a/cranelift/filetests/filetests/isa/x64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/x64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -49,9 +49,10 @@
 ;;   cmpq    %r9, %rdi
 ;;   jnbe    label3; j label1
 ;; block1:
-;;   addq    %rdi, 0(%rdx), %rdi
-;;   movl    $-65536, %r11d
-;;   movl    %esi, 0(%rdi,%r11,1)
+;;   movq    %rdi, %r11
+;;   addq    %r11, 0(%rdx), %r11
+;;   movl    $-65536, %edi
+;;   movl    %esi, 0(%r11,%rdi,1)
 ;;   jmp     label2
 ;; block2:
 ;;   movq    %rbp, %rsp
@@ -70,9 +71,10 @@
 ;;   cmpq    %r9, %rdi
 ;;   jnbe    label3; j label1
 ;; block1:
-;;   addq    %rdi, 0(%rsi), %rdi
-;;   movl    $-65536, %r11d
-;;   movl    0(%rdi,%r11,1), %eax
+;;   movq    %rdi, %r11
+;;   addq    %r11, 0(%rsi), %r11
+;;   movl    $-65536, %esi
+;;   movl    0(%r11,%rsi,1), %eax
 ;;   jmp     label2
 ;; block2:
 ;;   movq    %rbp, %rsp
diff --git a/cranelift/filetests/filetests/isa/x64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/isa/x64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 0a8abfc3ceb3..33e0e97a68c0 100644
--- a/cranelift/filetests/filetests/isa/x64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/isa/x64/wasm/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -49,9 +49,10 @@
 ;;   cmpq    %r9, %rdi
 ;;   jnbe    label3; j label1
 ;; block1:
-;;   addq    %rdi, 0(%rdx), %rdi
-;;   movl    $-65536, %r11d
-;;   movb    %sil, 0(%rdi,%r11,1)
+;;   movq    %rdi, %r11
+;;   addq    %r11, 0(%rdx), %r11
+;;   movl    $-65536, %edi
+;;   movb    %sil, 0(%r11,%rdi,1)
 ;;   jmp     label2
 ;; block2:
 ;;   movq    %rbp, %rsp
@@ -70,9 +71,10 @@
 ;;   cmpq    %r9, %rdi
 ;;   jnbe    label3; j label1
 ;; block1:
-;;   addq    %rdi, 0(%rsi), %rdi
-;;   movl    $-65536, %r11d
-;;   movzbq  0(%rdi,%r11,1), %rax
+;;   movq    %rdi, %r11
+;;   addq    %r11, 0(%rsi), %r11
+;;   movl    $-65536, %esi
+;;   movzbq  0(%r11,%rsi,1), %rax
 ;;   jmp     label2
 ;; block2:
 ;;   movq    %rbp, %rsp
diff --git a/cranelift/filetests/filetests/isa/x64/widening.clif b/cranelift/filetests/filetests/isa/x64/widening.clif
index 1bd9ef170bcb..65d32fd50665 100644
--- a/cranelift/filetests/filetests/isa/x64/widening.clif
+++ b/cranelift/filetests/filetests/isa/x64/widening.clif
@@ -86,8 +86,9 @@ block0(v0: i8x16):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   palignr $8, %xmm0, %xmm0, %xmm0
-;   pmovsxbw %xmm0, %xmm0
+;   movdqa  %xmm0, %xmm2
+;   palignr $8, %xmm2, %xmm0, %xmm2
+;   pmovsxbw %xmm2, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -97,8 +98,9 @@ block0(v0: i8x16):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   palignr $8, %xmm0, %xmm0
-;   pmovsxbw %xmm0, %xmm0
+;   movdqa %xmm0, %xmm2
+;   palignr $8, %xmm0, %xmm2
+;   pmovsxbw %xmm2, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
@@ -113,8 +115,9 @@ block0(v0: i16x8):
 ;   pushq   %rbp
 ;   movq    %rsp, %rbp
 ; block0:
-;   palignr $8, %xmm0, %xmm0, %xmm0
-;   pmovsxwd %xmm0, %xmm0
+;   movdqa  %xmm0, %xmm2
+;   palignr $8, %xmm2, %xmm0, %xmm2
+;   pmovsxwd %xmm2, %xmm0
 ;   movq    %rbp, %rsp
 ;   popq    %rbp
 ;   ret
@@ -124,8 +127,9 @@ block0(v0: i16x8):
 ;   pushq %rbp
 ;   movq %rsp, %rbp
 ; block1: ; offset 0x4
-;   palignr $8, %xmm0, %xmm0
-;   pmovsxwd %xmm0, %xmm0
+;   movdqa %xmm0, %xmm2
+;   palignr $8, %xmm0, %xmm2
+;   pmovsxwd %xmm2, %xmm0
 ;   movq %rbp, %rsp
 ;   popq %rbp
 ;   retq
diff --git a/cranelift/filetests/filetests/pcc/fail/add.clif b/cranelift/filetests/filetests/pcc/fail/add.clif
deleted file mode 100644
index afcf9765015a..000000000000
--- a/cranelift/filetests/filetests/pcc/fail/add.clif
+++ /dev/null
@@ -1,51 +0,0 @@
-test compile expect-fail
-set enable_pcc=true
-target aarch64
-target x86_64
-
-function %f0(i32, i32) -> i32 {
-block0(v0 ! range(32, 0, 0x100): i32, v1 ! range(32, 0, 0x80): i32):
-    v2 ! range(32, 0, 0x17f) = iadd.i32 v0, v1
-    return v2
-}
-
-function %f1(i32) -> i32 {
-block0(v0 ! range(32, 0, 0x100): i32):
-    v1 ! range(32, 0, 1) = iconst.i32 1
-    v2 ! range(32, 0, 0x100) = iadd.i32 v0, v1
-    return v2
-}
-
-function %f3(i32) -> i64 {
-block0(v0: i32):
-    v1 ! range(32, 0, 1) = iconst.i32 1
-    v2 ! range(32, 0, 0xffff_fffe) = iadd.i32 v0, v1
-    v3 ! range(64, 0, 0xffff_fffe) = uextend.i64 v2
-    return v3
-}
-
-function %f3(i32) -> i64 {
-block0(v0: i32):
-    v1 ! range(32, 0, 1) = iconst.i32 1
-    v2 ! range(32, 0, 0xffff_ffff) = iadd.i32 v0, v1
-    v3 ! range(64, 0, 0xffff_ffff) = uextend.i64 v2
-    v4 ! range(64, 0, 0x1) = iconst.i64 1
-    v5 ! range(64, 0, 0xffff_ffff) = iadd.i64 v3, v4
-    return v5
-}
-
-;; check merged ops:
-function %f4(i32, i32) -> i32 {
-block0(v0 ! range(32, 0, 0x100): i32, v1 ! range(32, 0, 0x200): i32):
-  v2 = iconst.i32 2
-  v3 ! range(32, 0, 0x400) = ishl.i32 v0, v2
-  v4 ! range(32, 0, 0x5ff) = iadd.i32 v1, v3
-  return v4
-}
-
-function %f5(i32, i64) -> i64 {
-block0(v0 ! range(32, 0, 0x100): i32, v1 ! range(64, 0, 0x200): i64):
-  v2 ! range(64, 0, 0x100) = uextend.i64 v0
-  v3 ! range(64, 0, 0x2ff) = iadd.i64 v1, v2
-  return v3
-}
diff --git a/cranelift/filetests/filetests/pcc/fail/blockparams.clif b/cranelift/filetests/filetests/pcc/fail/blockparams.clif
deleted file mode 100644
index 3840f9932322..000000000000
--- a/cranelift/filetests/filetests/pcc/fail/blockparams.clif
+++ /dev/null
@@ -1,20 +0,0 @@
-test compile expect-fail
-set enable_pcc=true
-target aarch64
-target x86_64
-
-function %f0(i64, i32) -> i64 {
-block0(v0 ! range(64, 0, 0x100): i64, v1: i32):
-    v2 ! range(64, 0, 0x100) = iconst.i64 0x100
-    v3 ! range(64, 0, 0x200) = iadd v0, v2
-    brif v1, block1(v0), block2(v3)
-
-block1(v4 ! range(64, 0, 0xff): i64):  ;; shrink the range -- should be caught
-    jump block3(v4)
-
-block2(v5 ! range(64, 0, 0x1ff): i64):
-    jump block3(v5)
-
-block3(v6 ! range(64, 0, 1): i64):
-    return v6
-}
diff --git a/cranelift/filetests/filetests/pcc/fail/extend.clif b/cranelift/filetests/filetests/pcc/fail/extend.clif
deleted file mode 100644
index 43b830d7a998..000000000000
--- a/cranelift/filetests/filetests/pcc/fail/extend.clif
+++ /dev/null
@@ -1,10 +0,0 @@
-test compile expect-fail
-set enable_pcc=true
-target aarch64
-target x86_64
-
-function %f0(i32) -> i64 {
-block0(v0 ! range(32, 0, 0xffff_ffff): i32):
-  v1 ! range(64, 0, 0xffff_0000) = uextend.i64 v0
-  return v1
-}
diff --git a/cranelift/filetests/filetests/pcc/fail/load.clif b/cranelift/filetests/filetests/pcc/fail/load.clif
deleted file mode 100644
index c4c086b1f19b..000000000000
--- a/cranelift/filetests/filetests/pcc/fail/load.clif
+++ /dev/null
@@ -1,65 +0,0 @@
-test compile expect-fail
-set enable_pcc=true
-target aarch64
-target x86_64
-
-function %f0(i64, i32) -> i64 {
-    mt0 = memory 0x1000
-block0(v0 ! mem(mt0, 0, 0): i64, v1 ! range(32, 0, 0x1000): i32):
-    v2 ! range(64, 0, 0x100) = uextend.i64 v1
-    v3 ! mem(mt0, 0, 0x100) = iadd.i64 v0, v2
-    v4 = load.i64 checked v3
-    return v4
-}
-
-;; Insufficient guard region: the 8-byte load could go off the end.
-function %f1(i64, i32) -> i64 {
-    mt0 = memory 0x1_0000_0000
-block0(v0 ! mem(mt0, 0, 0): i64, v1 ! range(32, 0, 0xffff_ffff): i32):
-    v2 ! range(64, 0, 0xffff_ffff) = uextend.i64 v1
-    v3 ! mem(mt0, 0, 0xffff_ffff) = iadd.i64 v0, v2
-    v4 = load.i64 checked v3
-    return v4
-}
-
-;; RegRegExtend mode on aarch64.
-function %f2(i64, i32) -> i8 {
-    mt0 = memory 0x1000
-block0(v0 ! mem(mt0, 0, 0x1000): i64, v1 ! range(32, 0, 0x1000): i32):
-    v2 ! range(64, 0, 0x100) = uextend.i64 v1
-    v3 ! mem(mt0, 0, 0x100) = iadd.i64 v0, v2
-    v4 = load.i8 checked v3
-    return v4
-}
-
-;; RegReg mode on aarch64.
-function %f3(i64, i64) -> i8 {
-    mt0 = memory 0x100
-block0(v0 ! mem(mt0, 0, 0): i64, v1 ! range(64, 0, 0xfff): i64):
-    v2 ! mem(mt0, 0, 0xfff) = iadd.i64 v0, v1
-    v3 = load.i8 checked v2
-    return v3
-}
-
-;; RegScaledExtended mode on aarch64.
-function %f4(i64, i32) -> i64 {
-    mt0 = memory 0x7000
-block0(v0 ! mem(mt0, 0, 0): i64, v1 ! range(32, 0, 0xfff): i32):
-    v2 ! range(64, 0, 0xfff) = uextend.i64 v1
-    v3 = iconst.i32 3
-    v4 ! range(64, 0, 0x7ff8) = ishl.i64 v2, v3
-    v5 ! mem(mt0, 0, 0x7ff8) = iadd.i64 v0, v4
-    v6 = load.i64 checked v5
-    return v6
-}
-
-;; RegScaled mode on aarch64.
-function %f5(i64, i64) -> i64 {
-    mt0 = memory 0x7000
-block0(v0 ! mem(mt0, 0, 0): i64, v1 ! range(64, 0, 0xfff): i64):
-    v2 = iconst.i32 3
-    v3 ! range(64, 0, 0x7ff8) = ishl.i64 v1, v2
-    v4 ! mem(mt0, 0, 0x7ff8) = iadd.i64 v0, v3
-    v5 = load.i64 checked v4
-    return v5
-}
diff --git a/cranelift/filetests/filetests/pcc/fail/memtypes.clif b/cranelift/filetests/filetests/pcc/fail/memtypes.clif
deleted file mode 100644
index 6f5b12a38307..000000000000
--- a/cranelift/filetests/filetests/pcc/fail/memtypes.clif
+++ /dev/null
@@ -1,30 +0,0 @@
-test verifier
-set enable_pcc=true
-target aarch64
-target x86_64
-
-function %f0(i64) -> i32 {
-    mt0 = struct 8 { 4: i32, 0: i32 } ; error: out-of-order
-
-block0(v0 ! mem(mt0, 0, 0): i64):
-    v1 = load.i32 v0+0
-    return v1
-}
-
-function %f1(i64) -> i32 {
-    ;; out-of-bounds field:
-    mt0 = struct 8 { 0: i32, 6: i32 } ; error: field at offset 6 of size 4 that overflows
-
-block0(v0 ! mem(mt0, 0, 0): i64):
-    v1 = load.i32 v0+0
-    return v1
-}
-
-function %f2(i64) -> i32 {
-    ;; overflowing offset + field size:
-    mt0 = struct 8 { 0: i32, 0xffff_ffff_ffff_ffff: i32 } ; error: field at offset 18446744073709551615 of size 4; offset plus size overflows a u64
-
-block0(v0 ! mem(mt0, 0, 0): i64):
-    v1 = load.i32 v0+0
-    return v1
-}
diff --git a/cranelift/filetests/filetests/pcc/fail/shift.clif b/cranelift/filetests/filetests/pcc/fail/shift.clif
deleted file mode 100644
index b4f4929b3bc2..000000000000
--- a/cranelift/filetests/filetests/pcc/fail/shift.clif
+++ /dev/null
@@ -1,11 +0,0 @@
-test compile expect-fail
-set enable_pcc=true
-target aarch64
-target x86_64
-
-function %f0(i32) -> i32 {
-block0(v0 ! range(32, 1, 0x100): i32):
-  v1 = iconst.i32 2
-  v2 ! range(32, 4, 0x3ff) = ishl.i32 v0, v1
-  return v2
-}
diff --git a/cranelift/filetests/filetests/pcc/fail/simple.clif b/cranelift/filetests/filetests/pcc/fail/simple.clif
deleted file mode 100644
index 45b2e9ab665d..000000000000
--- a/cranelift/filetests/filetests/pcc/fail/simple.clif
+++ /dev/null
@@ -1,27 +0,0 @@
-test compile expect-fail
-set enable_pcc=true
-target aarch64
-target x86_64
-
-;; The `memory` memtype is not large enough here -- the 4GiB-range
-;; 32-bit offset could go out of range. PCC should catch this.
-
-function %simple1(i64 vmctx, i32) -> i8 {
-    mt0 = memory 0x8000_0000
-block0(v0 ! mem(mt0, 0, 0): i64, v1 ! range(32, 0, 0xffff_ffff): i32):
-    v2 ! range(64, 0, 0xffff_ffff) = uextend.i64 v1
-    v3 ! mem(mt0, 0, 0xffff_ffff) = iadd.i64 v0, v2
-    v4 = load.i8 checked v3
-    return v4
-}
-
-;; Check that the offset in the `mem` is validated too.
-
-function %simple2(i64 vmctx, i32) -> i8 {
-    mt0 = memory 0x8000_0000
-block0(v0 ! mem(mt0, 0, 0): i64, v1 ! range(32, 0, 0xffff_ffff): i32):
-    v2 ! range(64, 0, 0xffff_ffff) = uextend.i64 v1
-    v3 ! mem(mt0, 0, 0) = iadd.i64 v0, v2
-    v4 = load.i8 checked v3
-    return v4
-}
diff --git a/cranelift/filetests/filetests/pcc/fail/struct.clif b/cranelift/filetests/filetests/pcc/fail/struct.clif
deleted file mode 100644
index 88d905e32e3a..000000000000
--- a/cranelift/filetests/filetests/pcc/fail/struct.clif
+++ /dev/null
@@ -1,29 +0,0 @@
-test compile expect-fail
-set enable_pcc=true
-target aarch64
-target x86_64
-
-function %f0(i64) -> i64 {
-    mt0 = struct 8 { 0: i64 ! mem(mt1, 0, 0) }
-    mt1 = memory 0x1_0000_0000
-block0(v0 ! mem(mt0, 0, 0): i64):
-    v1 ! mem(mt1, 8, 8) = load.i64 checked v0
-    return v1
-}
-
-function %f1(i64, i64) {
-    mt0 = struct 8 { 0: i64 ! mem(mt1, 0, 0) }
-    mt1 = memory 0x1_0000_0000
-block0(v0 ! mem(mt0, 0, 0): i64, v1 ! mem(mt1, 8, 8): i64):
-    store.i64 checked v1, v0
-    return
-}
-
-function %f2(i64) -> i32 {
-    mt0 = struct 8 { 0: i32 ! range(32, 0, 1), 4: i32 }
-
-    ;; insufficiently-constrained range:
-block0(v0 ! mem(mt0, 0, 8): i64):
-    v1 ! range(32, 0, 1) = load.i32 checked v0+0
-    return v1
-}
diff --git a/cranelift/filetests/filetests/pcc/fail/vmctx.clif b/cranelift/filetests/filetests/pcc/fail/vmctx.clif
deleted file mode 100644
index 1dc947bf21fb..000000000000
--- a/cranelift/filetests/filetests/pcc/fail/vmctx.clif
+++ /dev/null
@@ -1,38 +0,0 @@
-test compile expect-fail
-set enable_pcc=true
-target aarch64
-target x86_64
-
-;; Equivalent to a Wasm `i64.load` from a static memory.
-function %f0(i64, i32) -> i64 {
-    ;; mock vmctx struct:
-    mt0 = struct 8 { 0: i64 readonly ! mem(mt1, 0, 0) }
-    ;; mock static memory: 4GiB range, *but insufficient guard*
-    mt1 = memory 0x1_0000_0000
-
-block0(v0 ! mem(mt0, 0, 0): i64, v1: i32):
-    ;; Compute the address: base + offset. Guard region (2GiB) is
-    ;; sufficient for an 8-byte I64 load.
-    v2 ! mem(mt1, 0, 0) = load.i64 checked v0+0    ;; base pointer
-    v3 ! range(64, 0, 0xffff_ffff) = uextend.i64 v1  ;; offset
-    v4 ! mem(mt1, 0, 0xffff_ffff) = iadd.i64 v2, v3
-    v5 = load.i64 checked v4
-    return v5
-}
-
-;; Equivalent to a Wasm `i64.load` from a static memory.
-function %f1(i64, i32) -> i64 {
-    ;; mock vmctx struct:
-    mt0 = struct 16 { 0: i64 readonly ! mem(mt1, 0, 0), 8: i64 readonly }
-    ;; mock static memory: 4GiB range, *but insufficient guard*
-    mt1 = memory 0x1_8000_0000
-
-block0(v0 ! mem(mt0, 0, 0): i64, v1: i32):
-    ;; Compute the address: base + offset. Guard region (2GiB) is
-    ;; sufficient for an 8-byte I64 load.
-    v2 ! mem(mt1, 0, 0) = load.i64 checked v0+8    ;; base pointer, but the wrong one
-    v3 ! range(64, 0, 0xffff_ffff) = uextend.i64 v1  ;; offset
-    v4 ! mem(mt1, 0, 0xffff_ffff) = iadd.i64 v2, v3
-    v5 = load.i64 checked v4
-    return v5
-}
diff --git a/cranelift/filetests/filetests/pcc/succeed/add.clif b/cranelift/filetests/filetests/pcc/succeed/add.clif
deleted file mode 100644
index 2e2416ce642d..000000000000
--- a/cranelift/filetests/filetests/pcc/succeed/add.clif
+++ /dev/null
@@ -1,61 +0,0 @@
-test compile
-set enable_pcc=true
-target aarch64
-target x86_64
-
-function %f0(i32, i32) -> i32 {
-block0(v0 ! range(32, 0, 0x100): i32, v1 ! range(32, 0, 0x80): i32):
-    v2 ! range(32, 0, 0x180) = iadd.i32 v0, v1
-    return v2
-}
-
-function %f1(i32) -> i32 {
-block0(v0 ! range(32, 0, 0x100): i32):
-    v1 ! range(32, 0, 1) = iconst.i32 1
-    v2 ! range(32, 0, 0x101) = iadd.i32 v0, v1
-    return v2
-}
-
-;; a looser but still accurate bound should check too:
-function %f2(i32) -> i32 {
-block0(v0 ! range(32, 0, 0x100): i32):
-    v1 ! range(32, 0, 1) = iconst.i32 1
-    v2 ! range(32, 0, 0x102) = iadd.i32 v0, v1
-    return v2
-}
-
-;; we should be able to verify a range based on the type alone:
-function %f3(i32) -> i64 {
-block0(v0: i32):
-    v1 ! range(32, 0, 1) = iconst.i32 1
-    v2 ! range(32, 0, 0xffff_ffff) = iadd.i32 v0, v1
-    v3 ! range(64, 0, 0xffff_ffff) = uextend.i64 v2
-    return v3
-}
-
-;; we should be able to verify a range based on the type alone:
-function %f3(i32) -> i64 {
-block0(v0: i32):
-    v1 ! range(32, 0, 1) = iconst.i32 1
-    v2 ! range(32, 0, 0xffff_ffff) = iadd.i32 v0, v1
-    v3 ! range(64, 0, 0xffff_ffff) = uextend.i64 v2
-    v4 ! range(64, 0, 0x1) = iconst.i64 1
-    v5 ! range(64, 0, 0x1_0000_0000) = iadd.i64 v3, v4
-    return v5
-}
-
-;; check merged ops:
-function %f4(i32, i32) -> i32 {
-block0(v0 ! range(32, 0, 0x100): i32, v1 ! range(32, 0, 0x200): i32):
-  v2 = iconst.i32 2
-  v3 ! range(32, 0, 0x400) = ishl.i32 v0, v2
-  v4 ! range(32, 0, 0x600) = iadd.i32 v1, v3
-  return v4
-}
-
-function %f5(i32, i64) -> i64 {
-block0(v0 ! range(32, 0, 0x100): i32, v1 ! range(64, 0, 0x200): i64):
-  v2 ! range(64, 0, 0x100) = uextend.i64 v0
-  v3 ! range(64, 0, 0x300) = iadd.i64 v1, v2
-  return v3
-}
diff --git a/cranelift/filetests/filetests/pcc/succeed/blockparams.clif b/cranelift/filetests/filetests/pcc/succeed/blockparams.clif
deleted file mode 100644
index 7a823e1bf27d..000000000000
--- a/cranelift/filetests/filetests/pcc/succeed/blockparams.clif
+++ /dev/null
@@ -1,20 +0,0 @@
-test compile
-set enable_pcc=true
-target aarch64
-target x86_64
-
-function %f0(i64, i32) -> i64 {
-block0(v0 ! range(64, 0, 0x100): i64, v1: i32):
-    v2 ! range(64, 0, 0x100) = iconst.i64 0x100
-    v3 ! range(64, 0, 0x200) = iadd v0, v2
-    brif v1, block1(v0), block2(v3)
-
-block1(v4 ! range(64, 0, 0x1000): i64):  ;; broaden the range -- always allowed
-    jump block3(v4)
-
-block2(v5 ! range(64, 0, 0x2000): i64):
-    jump block3(v5)
-
-block3(v6 ! range(64, 0, 0x2001): i64):
-    return v6
-}
diff --git a/cranelift/filetests/filetests/pcc/succeed/extend.clif b/cranelift/filetests/filetests/pcc/succeed/extend.clif
deleted file mode 100644
index 2926aa65bd7d..000000000000
--- a/cranelift/filetests/filetests/pcc/succeed/extend.clif
+++ /dev/null
@@ -1,17 +0,0 @@
-test compile
-set enable_pcc=true
-target aarch64
-target x86_64
-
-function %f0(i32) -> i64 {
-block0(v0 ! range(32, 42, 0xffff_fffe): i32):
-  ;; we're allowed to broaden the range on either end:
-  v1 ! range(64, 1, 0xffff_ffff) = uextend.i64 v0
-  return v1
-}
-
-function %f1(i32) -> i64 {
-block0(v0 ! range(16, 0, 0xffff): i32):
-  v1 ! range(64, 0, 0xffff_ffff) = uextend.i64 v0
-  return v1
-}
diff --git a/cranelift/filetests/filetests/pcc/succeed/gv_fact.clif b/cranelift/filetests/filetests/pcc/succeed/gv_fact.clif
deleted file mode 100644
index 329b8d444edc..000000000000
--- a/cranelift/filetests/filetests/pcc/succeed/gv_fact.clif
+++ /dev/null
@@ -1,58 +0,0 @@
-test compile
-set enable_pcc=true
-target aarch64
-target x86_64
-
-function %f0(i64 vmctx) -> i64 {
-    mt0 = struct 16 { 8: i64 ! mem(mt1, 0, 0) }
-    mt1 = memory 0x1_0000_0000
-    gv0 ! mem(mt0, 0, 0) = vmctx
-    gv1 ! mem(mt1, 0, 0) = load.i64 notrap aligned checked gv0+8
-    
-block0(v0 ! mem(mt0, 0, 0): i64):
-    v1 ! mem(mt1, 0, 0) = global_value.i64 gv1
-    return v1
-}
-
-function %f1(i64 vmctx) -> i64 {
-    mt0 = struct 16 { 8: i64 ! mem(mt1, 0, 0) }
-    mt1 = struct 8 { 0: i64 ! mem(mt2, 0, 0) }
-    mt2 = memory 0x1_0000_0000
-    gv0 ! mem(mt0, 0, 0) = vmctx
-    gv1 ! mem(mt1, 0, 0) = load.i64 notrap aligned checked gv0+8
-    gv2 ! mem(mt2, 0, 0) = load.i64 notrap aligned checked gv1+0
-    
-block0(v0 ! mem(mt0, 0, 0): i64):
-    v1 ! mem(mt2, 0, 0) = global_value.i64 gv2
-    return v1
-}
-
-function %f2(i64 vmctx) -> i64 {
-    mt0 = struct 16 { 8: i64 ! mem(mt1, 0, 0) }
-    mt1 = struct 8 { 0: i64 ! mem(mt2, 0, 0) }
-    mt2 = memory 0x1_0000_0000
-    gv0 ! mem(mt0, 0, 0) = vmctx
-    gv1 ! mem(mt1, 0, 0) = load.i64 notrap aligned checked gv0+8
-    gv2 ! mem(mt2, 0, 0) = load.i64 notrap aligned checked gv1+0
-    gv3 ! mem(mt2, 8, 8) = iadd_imm.i64 gv2, 8
-    
-block0(v0 ! mem(mt0, 0, 0): i64):
-    v1 ! mem(mt2, 8, 8) = global_value.i64 gv3
-    return v1
-}
-
-function %f3(i64 vmctx) -> i64 {
-    mt0 = struct 16 { 8: i64 ! mem(mt1, 0, 0) }
-    mt1 = struct 8 { 0: i64 ! mem(mt2, 0, 0) }
-    mt2 = memory 0x1_0000_0000
-    gv0 ! mem(mt0, 0, 0) = vmctx
-    gv1 ! mem(mt1, 0, 0) = load.i64 notrap aligned checked gv0+8
-    gv2 ! mem(mt2, 0, 0) = load.i64 notrap aligned checked gv1+0
-    gv3 ! mem(mt2, 8, 8) = iadd_imm.i64 gv2, 8
-
-    ;; like the above, but with no fact provided on `v0`; it should
-    ;; get copied from the GV.
-block0(v0: i64):
-    v1 ! mem(mt2, 8, 8) = global_value.i64 gv3
-    return v1
-}
diff --git a/cranelift/filetests/filetests/pcc/succeed/load.clif b/cranelift/filetests/filetests/pcc/succeed/load.clif
deleted file mode 100644
index 59996ef05fae..000000000000
--- a/cranelift/filetests/filetests/pcc/succeed/load.clif
+++ /dev/null
@@ -1,85 +0,0 @@
-test compile
-set enable_pcc=true
-target aarch64
-target x86_64
-
-function %f0(i64, i32) -> i64 {
-    mt0 = memory 0x1_0000_0000
-block0(v0 ! mem(mt0, 0, 0): i64, v1 ! range(32, 0, 0x100): i32):
-    v2 ! range(64, 0, 0x100) = uextend.i64 v1
-    v3 ! mem(mt0, 0, 8) = iadd.i64 v0, v2
-    v4 = load.i64 checked v3
-    return v4
-}
-
-function %f1(i64, i32) -> i64 {
-    ;; Note the guard region of 8 bytes -- just enough for the below!
-    mt0 = memory 0x1_0000_0008
-block0(v0 ! mem(mt0, 0, 0): i64, v1 ! range(32, 0, 0xffff_ffff): i32):
-    v2 ! range(64, 0, 0xffff_ffff) = uextend.i64 v1
-    v3 ! mem(mt0, 0, 0xffff_ffff) = iadd.i64 v0, v2
-    v4 = load.i64 checked v3
-    return v4
-}
-
-;; RegRegExtend mode on aarch64.
-function %f2(i64, i32) -> i8 {
-    mt0 = memory 0x1000
-block0(v0 ! mem(mt0, 0, 0): i64, v1 ! range(32, 0, 0xfff): i32):
-    v2 ! range(64, 0, 0xfff) = uextend.i64 v1
-    v3 ! mem(mt0, 0, 0xfff) = iadd.i64 v0, v2
-    v4 = load.i8 checked v3
-    return v4
-}
-
-;; RegReg mode on aarch64.
-function %f3(i64, i64) -> i8 {
-    mt0 = memory 0x1000
-block0(v0 ! mem(mt0, 0, 0): i64, v1 ! range(64, 0, 0xfff): i64):
-    v2 ! mem(mt0, 0, 0xfff) = iadd.i64 v0, v1
-    v3 = load.i8 checked v2
-    return v3
-}
-
-;; RegScaledExtended mode on aarch64.
-function %f4(i64, i32) -> i64 {
-    mt0 = memory 0x8000
-block0(v0 ! mem(mt0, 0, 0): i64, v1 ! range(32, 0, 0xfff): i32):
-    v2 ! range(64, 0, 0xfff) = uextend.i64 v1
-    v3 = iconst.i32 3
-    v4 ! range(64, 0, 0x7ff8) = ishl.i64 v2, v3
-    v5 ! mem(mt0, 0, 0x7ff8) = iadd.i64 v0, v4
-    v6 = load.i64 checked v5
-    return v6
-}
-
-;; RegScaled mode on aarch64.
-function %f5(i64, i64) -> i64 {
-    mt0 = memory 0x8000
-block0(v0 ! mem(mt0, 0, 0): i64, v1 ! range(64, 0, 0xfff): i64):
-    v2 = iconst.i32 3
-    v3 ! range(64, 0, 0x7ff8) = ishl.i64 v1, v2
-    v4 ! mem(mt0, 0, 0x7ff8) = iadd.i64 v0, v3
-    v5 = load.i64 checked v4
-    return v5
-}
-
-;; UnsignedOffset mode on aarch64.
-function %f6(i64) -> i64 {
-    mt0 = memory 0x8000
-block0(v0 ! mem(mt0, 0, 0): i64):
-    v2 = iconst.i64 8
-    v3 ! mem(mt0, 8, 8) = iadd.i64 v0, v2
-    v4 = load.i64 checked v3
-    return v4
-}
-
-;; Unscaled mode on aarch64.
-function %f6(i64) -> i64 {
-    mt0 = memory 0x8000
-block0(v0 ! mem(mt0, 8, 8): i64):
-    v2 = iconst.i64 8
-    v3 ! mem(mt0, 0, 0) = isub.i64 v0, v2
-    v4 = load.i64 checked v3
-    return v4
-}
diff --git a/cranelift/filetests/filetests/pcc/succeed/memtypes.clif b/cranelift/filetests/filetests/pcc/succeed/memtypes.clif
deleted file mode 100644
index dc4805c90cc5..000000000000
--- a/cranelift/filetests/filetests/pcc/succeed/memtypes.clif
+++ /dev/null
@@ -1,24 +0,0 @@
-test compile
-set enable_pcc=true
-target aarch64
-target x86_64
-
-function %f0(i64) -> i32 {
-    mt0 = struct 8 { 0: i32, 4: i32 readonly }
-
-block0(v0 ! mem(mt0, 0, 0): i64):  ;; v0 points to an instance of mt0, at offset 0
-    v1 = load.i32 v0+0
-    v2 = load.i32 v0+4
-    v3 = iadd.i32 v1, v2
-    return v3
-}
-
-function %f1(i64) -> i32 {
-    mt0 = struct 8 { 0: i64 readonly ! mem(mt1, 0, 0) }
-    mt1 = memory 0x1_0000_0000
-
-block0(v0 ! mem(mt0, 0, 0): i64):
-    v1 ! mem(mt1, 0, 0) = load.i64 v0
-    v2 = load.i32 v1+0x1000
-    return v2
-}
diff --git a/cranelift/filetests/filetests/pcc/succeed/opt.clif b/cranelift/filetests/filetests/pcc/succeed/opt.clif
deleted file mode 100644
index 8fda923223c4..000000000000
--- a/cranelift/filetests/filetests/pcc/succeed/opt.clif
+++ /dev/null
@@ -1,85 +0,0 @@
-test compile
-set enable_pcc=true
-set opt_level=speed
-target aarch64
-target x86_64
-
-;; Equivalent to a Wasm `i64.load` from a static memory, but with some
-;; redundant stuff that should be optimized away (x+0 -> x).
-function %f0(i64, i32) -> i64 {
-    ;; mock vmctx struct:
-    mt0 = struct 8 { 0: i64 readonly ! mem(mt1, 0, 0) }
-    ;; mock static memory: 4GiB range, plus 2GiB guard
-    mt1 = memory 0x1_8000_0000
-
-block0(v0 ! mem(mt0, 0, 0): i64, v1: i32):
-    v2 ! mem(mt1, 0, 0) = load.i64 checked v0+0
-    v3 ! range(64, 0, 0xffff_ffff) = uextend.i64 v1
-    v4 = iconst.i64 0
-    v5 = iadd.i64 v3, v4
-    v6 ! mem(mt1, 0, 0xffff_ffff) = iadd.i64 v2, v5
-    v7 = load.i64 checked v6
-    return v7
-}
-
-;; GVN opportunity.
-function %f1(i64, i32) -> i64 {
-    ;; mock vmctx struct:
-    mt0 = struct 8 { 0: i64 readonly ! mem(mt1, 0, 0) }
-    ;; mock static memory: 4GiB range, plus 2GiB guard
-    mt1 = memory 0x1_8000_0000
-
-block0(v0 ! mem(mt0, 0, 0): i64, v1: i32):
-    v2 ! mem(mt1, 0, 0) = load.i64 checked notrap readonly v0+0
-    v3 ! range(64, 0, 0xffff_ffff) = uextend.i64 v1
-    v4 = iconst.i64 0
-    v5 = iadd.i64 v3, v4
-    v6 ! mem(mt1, 0, 0xffff_ffff) = iadd.i64 v2, v5
-    v7 = load.i64 checked v6
-
-    v8 = load.i64 checked notrap readonly v0+0
-    v9 = uextend.i64 v1
-    v10 ! mem(mt1, 0, 0xffff_ffff) = iadd.i64 v8, v9
-    v11 = load.i64 checked v10
-
-    v12 = iadd.i64 v7, v11
-
-    return v12
-}
-
-;; RLE opportunity.
-function %f2(i64, i32) -> i64 {
-    ;; mock vmctx struct:
-    mt0 = struct 8 { 0: i64 readonly ! mem(mt1, 0, 0) }
-    ;; mock static memory: 4GiB range, plus 2GiB guard
-    mt1 = memory 0x1_8000_0000
-
-block0(v0 ! mem(mt0, 0, 0): i64, v1: i32):
-    v2 ! mem(mt1, 0, 0) = load.i64 checked notrap readonly aligned v0+0
-    brif v1, block1, block2
-
-block1:
-    v3 ! mem(mt1, 0, 0) = load.i64 checked notrap readonly aligned v0+0
-    return v3
-
-block2:
-    v4 ! mem(mt1, 0, 0) = load.i64 checked notrap readonly aligned v0+0
-    return v4
-}
-
-function %f3(i64, i32) {
-    mt0 = struct 4 { 0: i32 ! range(32, 1, 3) }
-
-block0(v0 ! mem(mt0, 0, 0): i64, v1 ! range(32, 0, 1): i32):
-    v2 ! range(32, 1, 1) = iconst.i32 1
-    v3 ! range(32, 1, 2) = iadd.i32 v1, v2
-
-    v4 ! range(32, 1, 1) = iconst.i32 1
-    v5 ! range(32, 1, 3) = iadd.i32 v1, v4  ;; should GVN onto v3.
-
-    ;; v3/v5's facts should merge to the narrower range.
-    store.i32 checked v3, v0
-    store.i32 checked v5, v0
-
-    return
-}
diff --git a/cranelift/filetests/filetests/pcc/succeed/shift.clif b/cranelift/filetests/filetests/pcc/succeed/shift.clif
deleted file mode 100644
index 0fcf627464ef..000000000000
--- a/cranelift/filetests/filetests/pcc/succeed/shift.clif
+++ /dev/null
@@ -1,18 +0,0 @@
-test compile
-set enable_pcc=true
-target aarch64
-target x86_64
-
-function %f0(i32) -> i32 {
-block0(v0 ! range(32, 1, 0x100): i32):
-  v1 = iconst.i32 2
-  v2 ! range(32, 4, 0x400) = ishl.i32 v0, v1
-  return v2
-}
-
-function %f0(i32) -> i32 {
-block0(v0: i32):
-  v1 = iconst.i32 2
-  v2 ! range(32, 0, 0xffff_ffff) = ishl.i32 v0, v1
-  return v2
-}
diff --git a/cranelift/filetests/filetests/pcc/succeed/simple.clif b/cranelift/filetests/filetests/pcc/succeed/simple.clif
deleted file mode 100644
index 80dc769899ef..000000000000
--- a/cranelift/filetests/filetests/pcc/succeed/simple.clif
+++ /dev/null
@@ -1,13 +0,0 @@
-test compile
-set enable_pcc=true
-target aarch64
-target x86_64
-
-function %simple1(i64 vmctx, i32) -> i8 {
-    mt0 = memory 0x1_0000_0000
-block0(v0 ! mem(mt0, 0, 0): i64, v1 ! range(32, 0, 0xffff_ffff): i32):
-    v2 ! range(64, 0, 0xffff_ffff) = uextend.i64 v1
-    v3 ! mem(mt0, 0, 0xffff_ffff) = iadd.i64 v0, v2
-    v4 = load.i8 checked v3
-    return v4
-}
diff --git a/cranelift/filetests/filetests/pcc/succeed/struct.clif b/cranelift/filetests/filetests/pcc/succeed/struct.clif
deleted file mode 100644
index f53bdaff54d4..000000000000
--- a/cranelift/filetests/filetests/pcc/succeed/struct.clif
+++ /dev/null
@@ -1,20 +0,0 @@
-test compile
-set enable_pcc=true
-target aarch64
-target x86_64
-
-function %f0(i64) -> i64 {
-    mt0 = struct 8 { 0: i64 ! mem(mt1, 0, 0) }
-    mt1 = memory 0x1_0000_0000
-block0(v0 ! mem(mt0, 0, 0): i64):
-    v1 ! mem(mt1, 0, 0) = load.i64 checked v0
-    return v1
-}
-
-function %f1(i64, i64) {
-    mt0 = struct 8 { 0: i64 ! mem(mt1, 0, 0) }
-    mt1 = memory 0x1_0000_0000
-block0(v0 ! mem(mt0, 0, 0): i64, v1 ! mem(mt1, 0, 0): i64):
-    store.i64 checked v1, v0
-    return
-}
diff --git a/cranelift/filetests/filetests/pcc/succeed/vmctx.clif b/cranelift/filetests/filetests/pcc/succeed/vmctx.clif
deleted file mode 100644
index ec05f22fa6c0..000000000000
--- a/cranelift/filetests/filetests/pcc/succeed/vmctx.clif
+++ /dev/null
@@ -1,21 +0,0 @@
-test compile
-set enable_pcc=true
-target aarch64
-target x86_64
-
-;; Equivalent to a Wasm `i64.load` from a static memory.
-function %f0(i64, i32) -> i64 {
-    ;; mock vmctx struct:
-    mt0 = struct 8 { 0: i64 readonly ! mem(mt1, 0, 0) }
-    ;; mock static memory: 4GiB range, plus 2GiB guard
-    mt1 = memory 0x1_8000_0000
-
-block0(v0 ! mem(mt0, 0, 0): i64, v1: i32):
-    ;; Compute the address: base + offset. Guard region (2GiB) is
-    ;; sufficient for an 8-byte I64 load.
-    v2 ! mem(mt1, 0, 0) = load.i64 checked v0+0    ;; base pointer
-    v3 ! range(64, 0, 0xffff_ffff) = uextend.i64 v1  ;; offset
-    v4 ! mem(mt1, 0, 0xffff_ffff) = iadd.i64 v2, v3
-    v5 = load.i64 checked v4
-    return v5
-}
diff --git a/cranelift/filetests/filetests/runtests/bitrev.clif b/cranelift/filetests/filetests/runtests/bitrev.clif
index 4bcadd553224..fff70f7b435e 100644
--- a/cranelift/filetests/filetests/runtests/bitrev.clif
+++ b/cranelift/filetests/filetests/runtests/bitrev.clif
@@ -4,9 +4,6 @@ target aarch64
 target s390x
 target x86_64
 target riscv64
-target riscv64 has_zbb
-target riscv64 has_zbkb
-target riscv64 has_zbb has_zbkb
 target riscv64 has_c has_zcb
 
 function %bitrev_i8(i8) -> i8 {
diff --git a/cranelift/filetests/filetests/runtests/call_libcall.clif b/cranelift/filetests/filetests/runtests/call_libcall.clif
index 5201b771d1aa..5956fca9575e 100644
--- a/cranelift/filetests/filetests/runtests/call_libcall.clif
+++ b/cranelift/filetests/filetests/runtests/call_libcall.clif
@@ -1,9 +1,6 @@
-test interpret
 test run
 target x86_64
-target aarch64
-target aarch64 sign_return_address
-target aarch64 has_pauth sign_return_address
+; AArch64 Does not have these libcalls
 target s390x
 target riscv64
 target riscv64 has_c has_zcb
diff --git a/cranelift/filetests/filetests/runtests/conversion-i8-i16.clif b/cranelift/filetests/filetests/runtests/conversion-i8-i16.clif
deleted file mode 100644
index dde4635be504..000000000000
--- a/cranelift/filetests/filetests/runtests/conversion-i8-i16.clif
+++ /dev/null
@@ -1,234 +0,0 @@
-test interpret
-test run
-target aarch64
-target s390x
-target riscv64 has_c has_zcb
-target riscv64
-
-function %f32_to_i8(f32) -> i8 {
-block0(v0: f32):
-    v1 = fcvt_to_sint.i8 v0
-    return v1
-}
-; run: %f32_to_i8(0x0.0) == 0
-; run: %f32_to_i8(0x1.0) == 1
-; run: %f32_to_i8(0x8.1) == 8
-; run: %f32_to_i8(-0x8.1) == -8
-; run: %f32_to_i8(-0x80.1) == 0x80
-; run: %f32_to_i8(0x7f.1) == 0x7f
-; run: %f32_to_i8(-0x0.1) == 0
-
-function %f64_to_i8(f64) -> i8 {
-block0(v0: f64):
-    v1 = fcvt_to_sint.i8 v0
-    return v1
-}
-; run: %f64_to_i8(0x0.0) == 0
-; run: %f64_to_i8(0x1.0) == 1
-; run: %f64_to_i8(0x8.1) == 8
-; run: %f64_to_i8(-0x8.1) == -8
-; run: %f64_to_i8(-0x80.1) == 0x80
-; run: %f64_to_i8(0x7f.1) == 0x7f
-; run: %f64_to_i8(-0x0.1) == 0
-
-function %f32_to_i16(f32) -> i16 {
-block0(v0: f32):
-    v1 = fcvt_to_sint.i16 v0
-    return v1
-}
-; run: %f32_to_i16(0x0.0) == 0
-; run: %f32_to_i16(0x1.0) == 1
-; run: %f32_to_i16(0x8.1) == 8
-; run: %f32_to_i16(-0x8.1) == -8
-; run: %f32_to_i16(-0x8000.1) == 0x8000
-; run: %f32_to_i16(0x7fff.1) == 0x7fff
-; run: %f32_to_i16(-0x0.1) == 0
-
-function %f64_to_i16(f64) -> i16 {
-block0(v0: f64):
-    v1 = fcvt_to_sint.i16 v0
-    return v1
-}
-; run: %f64_to_i16(0x0.0) == 0
-; run: %f64_to_i16(0x1.0) == 1
-; run: %f64_to_i16(0x8.1) == 8
-; run: %f64_to_i16(-0x8.1) == -8
-; run: %f64_to_i16(-0x8000.1) == 0x8000
-; run: %f64_to_i16(0x7fff.1) == 0x7fff
-; run: %f64_to_i16(-0x0.1) == 0
-
-function %f32_to_u8(f32) -> i8 {
-block0(v0:f32):
-    v1 = fcvt_to_uint.i8 v0
-    return v1
-}
-; run: %f32_to_u8(0x0.0) == 0
-; run: %f32_to_u8(0x1.0) == 1
-; run: %f32_to_u8(0x4.2) == 4
-; run: %f32_to_u8(0x4.6) == 4
-; run: %f32_to_u8(-0x0.1) == 0
-
-function %f64_to_u8(f64) -> i8 {
-block0(v0:f64):
-    v1 = fcvt_to_uint.i8 v0
-    return v1
-}
-; run: %f64_to_u8(0x0.0) == 0
-; run: %f64_to_u8(0x1.0) == 1
-; run: %f64_to_u8(0x4.2) == 4
-; run: %f64_to_u8(0x4.6) == 4
-; run: %f64_to_u8(-0x0.1) == 0
-
-function %f32_to_u16(f32) -> i16 {
-block0(v0:f32):
-    v1 = fcvt_to_uint.i16 v0
-    return v1
-}
-; run: %f32_to_u16(0x0.0) == 0
-; run: %f32_to_u16(0x1.0) == 1
-; run: %f32_to_u16(0x4.2) == 4
-; run: %f32_to_u16(0x4.6) == 4
-; run: %f32_to_u16(-0x0.1) == 0
-
-function %f64_to_u16(f64) -> i16 {
-block0(v0:f64):
-    v1 = fcvt_to_uint.i16 v0
-    return v1
-}
-; run: %f64_to_u16(0x0.0) == 0
-; run: %f64_to_u16(0x1.0) == 1
-; run: %f64_to_u16(0x4.2) == 4
-; run: %f64_to_u16(0x4.6) == 4
-; run: %f64_to_u16(-0x0.1) == 0
-
-function %f32_to_i8_sat(f32) -> i8 {
-block0(v0: f32):
-    v1 = fcvt_to_sint_sat.i8 v0
-    return v1
-}
-; run: %f32_to_i8_sat(0x0.0) == 0
-; run: %f32_to_i8_sat(0x1.0) == 1
-; run: %f32_to_i8_sat(0x8.1) == 8
-; run: %f32_to_i8_sat(-0x1.0) == -1
-; run: %f32_to_i8_sat(0x1.fffffep127) == 0x7f
-; run: %f32_to_i8_sat(-0x1.fffffep127) == 0x80
-; run: %f32_to_i8_sat(+NaN) == 0
-; run: %f32_to_i8_sat(-NaN) == 0
-; run: %f32_to_i8_sat(+Inf) == 0x7f
-; run: %f32_to_i8_sat(-Inf) == 0x80
-
-function %f64_to_i8_sat(f64) -> i8 {
-block0(v0: f64):
-    v1 = fcvt_to_sint_sat.i8 v0
-    return v1
-}
-; run: %f64_to_i8_sat(0x0.0) == 0
-; run: %f64_to_i8_sat(0x1.0) == 1
-; run: %f64_to_i8_sat(0x8.1) == 8
-; run: %f64_to_i8_sat(-0x1.0) == -1
-; run: %f64_to_i8_sat(0x1.fffffep127) == 0x7f
-; run: %f64_to_i8_sat(-0x1.fffffep127) == 0x80
-; run: %f64_to_i8_sat(+NaN) == 0
-; run: %f64_to_i8_sat(-NaN) == 0
-; run: %f64_to_i8_sat(+Inf) == 0x7f
-; run: %f64_to_i8_sat(-Inf) == 0x80
-
-function %f32_to_i16_sat(f32) -> i16 {
-block0(v0: f32):
-    v1 = fcvt_to_sint_sat.i16 v0
-    return v1
-}
-; run: %f32_to_i16_sat(0x0.0) == 0
-; run: %f32_to_i16_sat(0x1.0) == 1
-; run: %f32_to_i16_sat(0x8.1) == 8
-; run: %f32_to_i16_sat(-0x1.0) == -1
-; run: %f32_to_i16_sat(0x1.fffffep127) == 0x7fff
-; run: %f32_to_i16_sat(-0x1.fffffep127) == 0x8000
-; run: %f32_to_i16_sat(+NaN) == 0
-; run: %f32_to_i16_sat(-NaN) == 0
-; run: %f32_to_i16_sat(+Inf) == 0x7fff
-; run: %f32_to_i16_sat(-Inf) == 0x8000
-
-function %f64_to_i16_sat(f64) -> i16 {
-block0(v0: f64):
-    v1 = fcvt_to_sint_sat.i16 v0
-    return v1
-}
-; run: %f64_to_i16_sat(0x0.0) == 0
-; run: %f64_to_i16_sat(0x1.0) == 1
-; run: %f64_to_i16_sat(0x8.1) == 8
-; run: %f64_to_i16_sat(-0x1.0) == -1
-; run: %f64_to_i16_sat(0x1.fffffep127) == 0x7fff
-; run: %f64_to_i16_sat(-0x1.fffffep127) == 0x8000
-; run: %f64_to_i16_sat(+NaN) == 0
-; run: %f64_to_i16_sat(-NaN) == 0
-; run: %f64_to_i16_sat(+Inf) == 0x7fff
-; run: %f64_to_i16_sat(-Inf) == 0x8000
-
-function %f32_to_u8_sat(f32) -> i8 {
-block0(v0:f32):
-    v1 = fcvt_to_uint_sat.i8 v0
-    return v1
-}
-; run: %f32_to_u8_sat(0x0.0) == 0
-; run: %f32_to_u8_sat(0x1.0) == 1
-; run: %f32_to_u8_sat(0x4.2) == 4
-; run: %f32_to_u8_sat(0x4.6) == 4
-; run: %f32_to_u8_sat(-0x1.0) == 0
-; run: %f32_to_u8_sat(0x1.fffffep127) == 0xff
-; run: %f32_to_u8_sat(-0x1.fffffep127) == 0
-; run: %f32_to_u8_sat(+NaN) == 0
-; run: %f32_to_u8_sat(-NaN) == 0
-; run: %f32_to_u8_sat(+Inf) == 0xff
-; run: %f32_to_u8_sat(-Inf) == 0
-
-function %f64_to_u8_sat(f64) -> i8 {
-block0(v0:f64):
-    v1 = fcvt_to_uint_sat.i8 v0
-    return v1
-}
-; run: %f64_to_u8_sat(0x0.0) == 0
-; run: %f64_to_u8_sat(0x1.0) == 1
-; run: %f64_to_u8_sat(0x4.2) == 4
-; run: %f64_to_u8_sat(0x4.6) == 4
-; run: %f64_to_u8_sat(-0x1.0) == 0
-; run: %f64_to_u8_sat(0x1.fffffep127) == 0xff
-; run: %f64_to_u8_sat(-0x1.fffffep127) == 0
-; run: %f64_to_u8_sat(+NaN) == 0
-; run: %f64_to_u8_sat(-NaN) == 0
-; run: %f64_to_u8_sat(+Inf) == 0xff
-; run: %f64_to_u8_sat(-Inf) == 0
-
-function %f32_to_u16_sat(f32) -> i16 {
-block0(v0:f32):
-    v1 = fcvt_to_uint_sat.i16 v0
-    return v1
-}
-; run: %f32_to_u16_sat(0x0.0) == 0
-; run: %f32_to_u16_sat(0x1.0) == 1
-; run: %f32_to_u16_sat(0x4.2) == 4
-; run: %f32_to_u16_sat(0x4.6) == 4
-; run: %f32_to_u16_sat(-0x1.0) == 0
-; run: %f32_to_u16_sat(0x1.fffffep127) == 0xffff
-; run: %f32_to_u16_sat(-0x1.fffffep127) == 0
-; run: %f32_to_u16_sat(+NaN) == 0
-; run: %f32_to_u16_sat(-NaN) == 0
-; run: %f32_to_u16_sat(+Inf) == 0xffff
-; run: %f32_to_u16_sat(-Inf) == 0
-
-function %f64_to_u16_sat(f64) -> i16 {
-block0(v0:f64):
-    v1 = fcvt_to_uint_sat.i16 v0
-    return v1
-}
-; run: %f64_to_u16_sat(0x0.0) == 0
-; run: %f64_to_u16_sat(0x1.0) == 1
-; run: %f64_to_u16_sat(0x4.2) == 4
-; run: %f64_to_u16_sat(0x4.6) == 4
-; run: %f64_to_u16_sat(-0x1.0) == 0
-; run: %f64_to_u16_sat(0x1.fffffep127) == 0xffff
-; run: %f64_to_u16_sat(-0x1.fffffep127) == 0
-; run: %f64_to_u16_sat(+NaN) == 0
-; run: %f64_to_u16_sat(-NaN) == 0
-; run: %f64_to_u16_sat(+Inf) == 0xffff
-; run: %f64_to_u16_sat(-Inf) == 0
diff --git a/cranelift/filetests/filetests/runtests/conversion.clif b/cranelift/filetests/filetests/runtests/conversion.clif
index 5b4a554e080f..1040e7e1040f 100644
--- a/cranelift/filetests/filetests/runtests/conversion.clif
+++ b/cranelift/filetests/filetests/runtests/conversion.clif
@@ -7,248 +7,52 @@ target x86_64 has_avx
 target riscv64 has_c has_zcb
 target riscv64
 
-function %f32_to_i32(f32) -> i32 {
+function %fcvt_to_sint(f32) -> i32 {
 block0(v0: f32):
     v1 = fcvt_to_sint.i32 v0
     return v1
 }
-; run: %f32_to_i32(0x0.0) == 0
-; run: %f32_to_i32(0x1.0) == 1
-; run: %f32_to_i32(0x1.d6f346p26) == 123456792
-; run: %f32_to_i32(0x8.1) == 8
-; run: %f32_to_i32(-0x8.1) == -8
-; run: %f32_to_i32(-0x0.1) == 0
-; run: %f32_to_i32(-0x1.0p31) == 0x8000_0000
+; run: %fcvt_to_sint(0x0.0) == 0
+; run: %fcvt_to_sint(0x1.0) == 1
+; run: %fcvt_to_sint(0x1.d6f346p26) == 123456792
+; run: %fcvt_to_sint(0x8.1) == 8
 
-function %f64_to_i32(f64) -> i32 {
-block0(v0: f64):
-    v1 = fcvt_to_sint.i32 v0
-    return v1
-}
-; run: %f64_to_i32(0x0.0) == 0
-; run: %f64_to_i32(0x1.0) == 1
-; run: %f64_to_i32(0x1.d6f346p26) == 123456792
-; run: %f64_to_i32(0x8.1) == 8
-; run: %f64_to_i32(-0x8.1) == -8
-; run: %f64_to_i32(-0x0.1) == 0
-; run: %f64_to_i32(-0x1.0p31) == 0x8000_0000
-
-function %f32_to_i64(f32) -> i64 {
-block0(v0: f32):
-    v1 = fcvt_to_sint.i64 v0
-    return v1
-}
-; run: %f32_to_i64(0x0.0) == 0
-; run: %f32_to_i64(0x1.0) == 1
-; run: %f32_to_i64(0x1.d6f346p26) == 123456792
-; run: %f32_to_i64(0x8.1) == 8
-; run: %f32_to_i64(-0x8.1) == -8
-; run: %f32_to_i64(-0x0.1) == 0
-
-function %f64_to_i64(f64) -> i64 {
-block0(v0: f64):
-    v1 = fcvt_to_sint.i64 v0
-    return v1
-}
-; run: %f64_to_i64(0x0.0) == 0
-; run: %f64_to_i64(0x1.0) == 1
-; run: %f64_to_i64(0x1.d6f346p26) == 123456792
-; run: %f64_to_i64(0x8.1) == 8
-; run: %f64_to_i64(-0x8.1) == -8
-; run: %f64_to_i64(-0x0.1) == 0
-
-function %f32_to_u32(f32) -> i32 {
+function %fcvt_to_uint(f32) -> i32 {
 block0(v0:f32):
     v1 = fcvt_to_uint.i32 v0
     return v1
 }
-; run: %f32_to_u32(0x0.0) == 0
-; run: %f32_to_u32(0x1.0) == 1
-; run: %f32_to_u32(0x4.2) == 4
-; run: %f32_to_u32(0x4.6) == 4
-; run: %f32_to_u32(0x1.d6f346p26) == 123456792
-; run: %f32_to_u32(0xB2D05E00.0) == 3000000000
-; run: %f32_to_u32(-0x0.1) == 0
-
-function %f64_to_u32(f64) -> i32 {
-block0(v0:f64):
-    v1 = fcvt_to_uint.i32 v0
-    return v1
-}
-; run: %f64_to_u32(0x0.0) == 0
-; run: %f64_to_u32(0x1.0) == 1
-; run: %f64_to_u32(0x4.2) == 4
-; run: %f64_to_u32(0x4.6) == 4
-; run: %f64_to_u32(0x1.d6f346p26) == 123456792
-; run: %f64_to_u32(0xB2D05E00.0) == 3000000000
-; run: %f64_to_u32(-0x0.1) == 0
-
-function %f32_to_u64(f32) -> i64 {
-block0(v0:f32):
-    v1 = fcvt_to_uint.i64 v0
-    return v1
-}
-; run: %f32_to_u64(0x0.0) == 0
-; run: %f32_to_u64(0x1.0) == 1
-; run: %f32_to_u64(0x4.2) == 4
-; run: %f32_to_u64(0x4.6) == 4
-; run: %f32_to_u64(0x1.d6f346p26) == 123456792
-; run: %f32_to_u64(0xB2D05E00.0) == 3000000000
-; run: %f32_to_u64(-0x0.1) == 0
-
-function %f64_to_u64(f64) -> i64 {
-block0(v0:f64):
-    v1 = fcvt_to_uint.i64 v0
-    return v1
-}
-; run: %f64_to_u64(0x0.0) == 0
-; run: %f64_to_u64(0x1.0) == 1
-; run: %f64_to_u64(0x4.2) == 4
-; run: %f64_to_u64(0x4.6) == 4
-; run: %f64_to_u64(0x1.d6f346p26) == 123456792
-; run: %f64_to_u64(0xB2D05E00.0) == 3000000000
-; run: %f64_to_u64(-0x0.1) == 0
+; run: %fcvt_to_uint(0x0.0) == 0
+; run: %fcvt_to_uint(0x1.0) == 1
+; run: %fcvt_to_uint(0x4.2) == 4
+; run: %fcvt_to_uint(0x4.6) == 4
+; run: %fcvt_to_uint(0x1.d6f346p26) == 123456792
+; run: %fcvt_to_uint(0xB2D05E00.0) == 3000000000
 
-function %f32_to_i32_sat(f32) -> i32 {
+function %fcvt_to_sint_sat(f32) -> i32 {
 block0(v0: f32):
     v1 = fcvt_to_sint_sat.i32 v0
     return v1
 }
-; run: %f32_to_i32_sat(0x0.0) == 0
-; run: %f32_to_i32_sat(0x1.0) == 1
-; run: %f32_to_i32_sat(0x1.d6f346p26) == 123456792
-; run: %f32_to_i32_sat(0x8.1) == 8
-; run: %f32_to_i32_sat(-0x1.0) == -1
-; run: %f32_to_i32_sat(0x1.fffffep127) == 2147483647
-; run: %f32_to_i32_sat(-0x1.fffffep127) == -2147483648
-; run: %f32_to_i32_sat(+NaN) == 0
-; run: %f32_to_i32_sat(-NaN) == 0
-; run: %f32_to_i32_sat(+Inf) == 2147483647
-; run: %f32_to_i32_sat(-Inf) == -2147483648
+; run: %fcvt_to_sint_sat(0x0.0) == 0
+; run: %fcvt_to_sint_sat(0x1.0) == 1
+; run: %fcvt_to_sint_sat(0x1.d6f346p26) == 123456792
+; run: %fcvt_to_sint_sat(0x8.1) == 8
+; run: %fcvt_to_sint_sat(-0x1.0) == -1
+; run: %fcvt_to_sint_sat(0x1.fffffep127) == 2147483647
+; run: %fcvt_to_sint_sat(-0x1.fffffep127) == -2147483648
 
-function %f64_to_i32_sat(f64) -> i32 {
-block0(v0: f64):
-    v1 = fcvt_to_sint_sat.i32 v0
-    return v1
-}
-; run: %f64_to_i32_sat(0x0.0) == 0
-; run: %f64_to_i32_sat(0x1.0) == 1
-; run: %f64_to_i32_sat(0x1.d6f346p26) == 123456792
-; run: %f64_to_i32_sat(0x8.1) == 8
-; run: %f64_to_i32_sat(-0x1.0) == -1
-; run: %f64_to_i32_sat(0x1.fffffep127) == 2147483647
-; run: %f64_to_i32_sat(-0x1.fffffep127) == -2147483648
-; run: %f64_to_i32_sat(+NaN) == 0
-; run: %f64_to_i32_sat(-NaN) == 0
-; run: %f64_to_i32_sat(+Inf) == 2147483647
-; run: %f64_to_i32_sat(-Inf) == -2147483648
-
-function %f32_to_i64_sat(f32) -> i64 {
-block0(v0: f32):
-    v1 = fcvt_to_sint_sat.i64 v0
-    return v1
-}
-; run: %f32_to_i64_sat(0x0.0) == 0
-; run: %f32_to_i64_sat(0x1.0) == 1
-; run: %f32_to_i64_sat(0x1.d6f346p26) == 123456792
-; run: %f32_to_i64_sat(0x8.1) == 8
-; run: %f32_to_i64_sat(-0x1.0) == -1
-; run: %f32_to_i64_sat(0x1.fffffep127) == 0x7fffffff_ffffffff
-; run: %f32_to_i64_sat(-0x1.fffffep127) == 0x80000000_00000000
-; run: %f32_to_i64_sat(+NaN) == 0
-; run: %f32_to_i64_sat(-NaN) == 0
-; run: %f32_to_i64_sat(+Inf) == 0x7fffffff_ffffffff
-; run: %f32_to_i64_sat(-Inf) == 0x80000000_00000000
-
-function %f64_to_i64_sat(f64) -> i64 {
-block0(v0: f64):
-    v1 = fcvt_to_sint_sat.i64 v0
-    return v1
-}
-; run: %f64_to_i64_sat(0x0.0) == 0
-; run: %f64_to_i64_sat(0x1.0) == 1
-; run: %f64_to_i64_sat(0x1.d6f346p26) == 123456792
-; run: %f64_to_i64_sat(0x8.1) == 8
-; run: %f64_to_i64_sat(-0x1.0) == -1
-; run: %f64_to_i64_sat(0x1.fffffep127) == 0x7fffffff_ffffffff
-; run: %f64_to_i64_sat(-0x1.fffffep127) == 0x80000000_00000000
-; run: %f64_to_i64_sat(+NaN) == 0
-; run: %f64_to_i64_sat(-NaN) == 0
-; run: %f64_to_i64_sat(+Inf) == 0x7fffffff_ffffffff
-; run: %f64_to_i64_sat(-Inf) == 0x80000000_00000000
-
-function %f32_to_u32_sat(f32) -> i32 {
+function %fcvt_to_uint_sat(f32) -> i32 {
 block0(v0:f32):
     v1 = fcvt_to_uint_sat.i32 v0
     return v1
 }
-; run: %f32_to_u32_sat(0x0.0) == 0
-; run: %f32_to_u32_sat(0x1.0) == 1
-; run: %f32_to_u32_sat(0x4.2) == 4
-; run: %f32_to_u32_sat(0x4.6) == 4
-; run: %f32_to_u32_sat(0x1.d6f346p26) == 123456792
-; run: %f32_to_u32_sat(0xB2D05E00.0) == 3000000000
-; run: %f32_to_u32_sat(-0x1.0) == 0
-; run: %f32_to_u32_sat(0x1.fffffep127) == 4294967295
-; run: %f32_to_u32_sat(-0x1.fffffep127) == 0
-; run: %f32_to_u32_sat(+NaN) == 0
-; run: %f32_to_u32_sat(-NaN) == 0
-; run: %f32_to_u32_sat(+Inf) == 0xffffffff
-; run: %f32_to_u32_sat(-Inf) == 0
-
-function %f64_to_u32_sat(f64) -> i32 {
-block0(v0:f64):
-    v1 = fcvt_to_uint_sat.i32 v0
-    return v1
-}
-; run: %f64_to_u32_sat(0x0.0) == 0
-; run: %f64_to_u32_sat(0x1.0) == 1
-; run: %f64_to_u32_sat(0x4.2) == 4
-; run: %f64_to_u32_sat(0x4.6) == 4
-; run: %f64_to_u32_sat(0x1.d6f346p26) == 123456792
-; run: %f64_to_u32_sat(0xB2D05E00.0) == 3000000000
-; run: %f64_to_u32_sat(-0x1.0) == 0
-; run: %f64_to_u32_sat(0x1.fffffep127) == 4294967295
-; run: %f64_to_u32_sat(-0x1.fffffep127) == 0
-; run: %f64_to_u32_sat(+NaN) == 0
-; run: %f64_to_u32_sat(-NaN) == 0
-; run: %f64_to_u32_sat(+Inf) == 0xffffffff
-; run: %f64_to_u32_sat(-Inf) == 0
-
-function %f32_to_u64_sat(f32) -> i64 {
-block0(v0:f32):
-    v1 = fcvt_to_uint_sat.i64 v0
-    return v1
-}
-; run: %f32_to_u64_sat(0x0.0) == 0
-; run: %f32_to_u64_sat(0x1.0) == 1
-; run: %f32_to_u64_sat(0x4.2) == 4
-; run: %f32_to_u64_sat(0x4.6) == 4
-; run: %f32_to_u64_sat(0x1.d6f346p26) == 123456792
-; run: %f32_to_u64_sat(0xB2D05E00.0) == 3000000000
-; run: %f32_to_u64_sat(-0x1.0) == 0
-; run: %f32_to_u64_sat(0x1.fffffep127) == 0xffffffff_ffffffff
-; run: %f32_to_u64_sat(-0x1.fffffep127) == 0
-; run: %f32_to_u64_sat(+NaN) == 0
-; run: %f32_to_u64_sat(-NaN) == 0
-; run: %f32_to_u64_sat(+Inf) == 0xffffffff_ffffffff
-; run: %f32_to_u64_sat(-Inf) == 0
-
-function %f64_to_u64_sat(f64) -> i64 {
-block0(v0:f64):
-    v1 = fcvt_to_uint_sat.i64 v0
-    return v1
-}
-; run: %f64_to_u64_sat(0x0.0) == 0
-; run: %f64_to_u64_sat(0x1.0) == 1
-; run: %f64_to_u64_sat(0x4.2) == 4
-; run: %f64_to_u64_sat(0x4.6) == 4
-; run: %f64_to_u64_sat(0x1.d6f346p26) == 123456792
-; run: %f64_to_u64_sat(0xB2D05E00.0) == 3000000000
-; run: %f64_to_u64_sat(-0x1.0) == 0
-; run: %f64_to_u64_sat(0x1.fffffep127) == 0xffffffff_ffffffff
-; run: %f64_to_u64_sat(-0x1.fffffep127) == 0
-; run: %f64_to_u64_sat(+NaN) == 0
-; run: %f64_to_u64_sat(-NaN) == 0
-; run: %f64_to_u64_sat(+Inf) == 0xffffffff_ffffffff
-; run: %f64_to_u64_sat(-Inf) == 0
+; run: %fcvt_to_uint_sat(0x0.0) == 0
+; run: %fcvt_to_uint_sat(0x1.0) == 1
+; run: %fcvt_to_uint_sat(0x4.2) == 4
+; run: %fcvt_to_uint_sat(0x4.6) == 4
+; run: %fcvt_to_uint_sat(0x1.d6f346p26) == 123456792
+; run: %fcvt_to_uint_sat(0xB2D05E00.0) == 3000000000
+; run: %fcvt_to_uint_sat(-0x1.0) == 0
+; run: %fcvt_to_uint_sat(0x1.fffffep127) == 4294967295
+; run: %fcvt_to_uint_sat(-0x1.fffffep127) == 0
diff --git a/cranelift/filetests/filetests/runtests/extend.clif b/cranelift/filetests/filetests/runtests/extend.clif
index 710c33d9a8e9..bc02c2d23bad 100644
--- a/cranelift/filetests/filetests/runtests/extend.clif
+++ b/cranelift/filetests/filetests/runtests/extend.clif
@@ -216,21 +216,3 @@ block0(v0: i32, v1: i32):
 }
 ; run: %add_sextend32_64(0xffff_ee00, 0x1000_0001) == 0x0000_0000_0fff_ee01
 ; run: %add_sextend32_64(0xffff_ee00, 0x9000_0001) == 0xffff_ffff_8fff_ee01
-
-function %sext16_zext32(i8) -> i32 {
-block0(v0: i8):
-    v1 = sextend.i16 v0
-    v2 = uextend.i32 v1
-    return v2
-}
-; run: %sext16_zext32(0xff) == 0xffff
-; run: %sext16_zext32(0x7f) == 0x7f
-
-function %zext16_sext32(i8) -> i32 {
-block0(v0: i8):
-    v1 = uextend.i16 v0
-    v2 = sextend.i32 v1
-    return v2
-}
-; run: %zext16_sext32(0xff) == 0xff
-; run: %zext16_sext32(0x7f) == 0x7f
diff --git a/cranelift/filetests/filetests/runtests/i128-bitrev.clif b/cranelift/filetests/filetests/runtests/i128-bitrev.clif
index c53cf0ba30e5..a3bc89eca2d2 100644
--- a/cranelift/filetests/filetests/runtests/i128-bitrev.clif
+++ b/cranelift/filetests/filetests/runtests/i128-bitrev.clif
@@ -4,9 +4,6 @@ target aarch64
 target s390x
 target x86_64
 target riscv64
-target riscv64 has_zbb
-target riscv64 has_zbkb
-target riscv64 has_zbb has_zbkb
 target riscv64 has_c has_zcb
 
 function %reverse_bits_zero() -> i8 {
diff --git a/cranelift/filetests/filetests/runtests/i128-iabs.clif b/cranelift/filetests/filetests/runtests/i128-iabs.clif
index 5078f8ac06ed..c84f2c03e09c 100644
--- a/cranelift/filetests/filetests/runtests/i128-iabs.clif
+++ b/cranelift/filetests/filetests/runtests/i128-iabs.clif
@@ -1,9 +1,6 @@
 test interpret
 test run
-set enable_llvm_abi_extensions=true
-target aarch64
 target s390x
-target x86_64
 
 function %iabs_i128(i128) -> i128 {
 block0(v0: i128):
@@ -13,6 +10,4 @@ block0(v0: i128):
 ; run: %iabs_i128(0) == 0
 ; run: %iabs_i128(-1) == 1
 ; run: %iabs_i128(1) == 1
-; run: %iabs_i128(0x40000000_00000000_80000000_00000000) == 0x40000000_00000000_80000000_00000000
-; run: %iabs_i128(0x80000000_00000000_80000000_00000000) == 0x7fffffff_ffffffff_80000000_00000000
 ; run: %iabs_i128(0x80000000_00000000_00000000_00000000) == 0x80000000_00000000_00000000_00000000
diff --git a/cranelift/filetests/filetests/runtests/i128-icmp.clif b/cranelift/filetests/filetests/runtests/i128-icmp.clif
index 8db45d6bcc56..75559b4b91d3 100644
--- a/cranelift/filetests/filetests/runtests/i128-icmp.clif
+++ b/cranelift/filetests/filetests/runtests/i128-icmp.clif
@@ -21,7 +21,6 @@ block0(v0: i128, v1: i128):
 ; run: %icmp_eq_i128(0xDECAFFFF_C0FFEEEE_C0FFEEEE_DECAFFFF, 0xDECAFFFF_C0FFEEEE_C0FFEEEE_DECAFFFF) == 1
 ; run: %icmp_eq_i128(0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFF, 0x00000000_00000001_00000000_00000001) == 0
 ; run: %icmp_eq_i128(0x00000000_00000001_FFFFFFFF_FFFFFFFF, 0x00000000_00000001_00000000_00000001) == 0
-; run: %icmp_eq_i128(0xffffffff_ffffffff, 0) == 0
 
 ; This is a regression test for aarch64, see: https://github.com/bytecodealliance/wasmtime/issues/4705
 ; run: %icmp_eq_i128(36893488147419103231, 0) == 0
@@ -41,7 +40,6 @@ block0(v0: i128, v1: i128):
 ; run: %icmp_ne_i128(0xDECAFFFF_C0FFEEEE_C0FFEEEE_DECAFFFF, 0xDECAFFFF_C0FFEEEE_C0FFEEEE_DECAFFFF) == 0
 ; run: %icmp_ne_i128(0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFF, 0x00000000_00000001_00000000_00000001) == 1
 ; run: %icmp_ne_i128(0x00000000_00000001_FFFFFFFF_FFFFFFFF, 0x00000000_00000001_00000000_00000001) == 1
-; run: %icmp_ne_i128(0xffffffff_ffffffff, 0) == 1
 
 
 
@@ -59,7 +57,6 @@ block0(v0: i128, v1: i128):
 ; run: %icmp_slt_i128(0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFD, 0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFF) == 1
 ; run: %icmp_slt_i128(0xC0FFEEEE_C0FFEEEE_00000000_00000000, 0xDECAFFFF_DECAFFFF_00000000_00000000) == 1
 ; run: %icmp_slt_i128(0xDECAFFFF_DECAFFFF_00000000_00000000, 0xC0FFEEEE_C0FFEEEE_00000000_00000000) == 0
-; run: %icmp_slt_i128(0xffffffff_ffffffff, 0) == 0
 
 
 function %icmp_ult_i128(i128, i128) -> i8 {
@@ -76,7 +73,6 @@ block0(v0: i128, v1: i128):
 ; run: %icmp_ult_i128(0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFD, 0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFF) == 1
 ; run: %icmp_ult_i128(0xC0FFEEEE_C0FFEEEE_00000000_00000000, 0xDECAFFFF_DECAFFFF_00000000_00000000) == 1
 ; run: %icmp_ult_i128(0xDECAFFFF_DECAFFFF_00000000_00000000, 0xC0FFEEEE_C0FFEEEE_00000000_00000000) == 0
-; run: %icmp_ult_i128(0xffffffff_ffffffff, 0) == 0
 
 
 function %icmp_sle_i128(i128, i128) -> i8 {
@@ -93,7 +89,6 @@ block0(v0: i128, v1: i128):
 ; run: %icmp_sle_i128(0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFD, 0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFF) == 1
 ; run: %icmp_sle_i128(0xC0FFEEEE_C0FFEEEE_00000000_00000000, 0xDECAFFFF_DECAFFFF_00000000_00000000) == 1
 ; run: %icmp_sle_i128(0xDECAFFFF_DECAFFFF_00000000_00000000, 0xC0FFEEEE_C0FFEEEE_00000000_00000000) == 0
-; run: %icmp_sle_i128(0xffffffff_ffffffff, 0) == 0
 
 
 function %icmp_ule_i128(i128, i128) -> i8 {
@@ -110,7 +105,6 @@ block0(v0: i128, v1: i128):
 ; run: %icmp_ule_i128(0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFD, 0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFF) == 1
 ; run: %icmp_ule_i128(0xC0FFEEEE_C0FFEEEE_00000000_00000000, 0xDECAFFFF_DECAFFFF_00000000_00000000) == 1
 ; run: %icmp_ule_i128(0xDECAFFFF_DECAFFFF_00000000_00000000, 0xC0FFEEEE_C0FFEEEE_00000000_00000000) == 0
-; run: %icmp_ule_i128(0xffffffff_ffffffff, 0) == 0
 
 
 function %icmp_sgt_i128(i128, i128) -> i8 {
@@ -127,7 +121,6 @@ block0(v0: i128, v1: i128):
 ; run: %icmp_sgt_i128(0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFD, 0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFF) == 0
 ; run: %icmp_sgt_i128(0xC0FFEEEE_C0FFEEEE_00000000_00000000, 0xDECAFFFF_DECAFFFF_00000000_00000000) == 0
 ; run: %icmp_sgt_i128(0xDECAFFFF_DECAFFFF_00000000_00000000, 0xC0FFEEEE_C0FFEEEE_00000000_00000000) == 1
-; run: %icmp_sgt_i128(0xffffffff_ffffffff, 0) == 1
 
 
 function %icmp_ugt_i128(i128, i128) -> i8 {
@@ -144,7 +137,6 @@ block0(v0: i128, v1: i128):
 ; run: %icmp_ugt_i128(0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFD, 0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFF) == 0
 ; run: %icmp_ugt_i128(0xC0FFEEEE_C0FFEEEE_00000000_00000000, 0xDECAFFFF_DECAFFFF_00000000_00000000) == 0
 ; run: %icmp_ugt_i128(0xDECAFFFF_DECAFFFF_00000000_00000000, 0xC0FFEEEE_C0FFEEEE_00000000_00000000) == 1
-; run: %icmp_ugt_i128(0xffffffff_ffffffff, 0) == 1
 
 
 function %icmp_sge_i128(i128, i128) -> i8 {
@@ -161,7 +153,6 @@ block0(v0: i128, v1: i128):
 ; run: %icmp_sge_i128(0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFD, 0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFF) == 0
 ; run: %icmp_sge_i128(0xC0FFEEEE_C0FFEEEE_00000000_00000000, 0xDECAFFFF_DECAFFFF_00000000_00000000) == 0
 ; run: %icmp_sge_i128(0xDECAFFFF_DECAFFFF_00000000_00000000, 0xC0FFEEEE_C0FFEEEE_00000000_00000000) == 1
-; run: %icmp_sge_i128(0xffffffff_ffffffff, 0) == 1
 
 
 function %icmp_uge_i128(i128, i128) -> i8 {
@@ -178,7 +169,6 @@ block0(v0: i128, v1: i128):
 ; run: %icmp_uge_i128(0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFD, 0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFF) == 0
 ; run: %icmp_uge_i128(0xC0FFEEEE_C0FFEEEE_00000000_00000000, 0xDECAFFFF_DECAFFFF_00000000_00000000) == 0
 ; run: %icmp_uge_i128(0xDECAFFFF_DECAFFFF_00000000_00000000, 0xC0FFEEEE_C0FFEEEE_00000000_00000000) == 1
-; run: %icmp_uge_i128(0xffffffff_ffffffff, 0) == 1
 
 
 ; Icmp Imm Tests
diff --git a/cranelift/filetests/filetests/runtests/icmp-uge.clif b/cranelift/filetests/filetests/runtests/icmp-uge.clif
index 0459baf4317f..72ef20767780 100644
--- a/cranelift/filetests/filetests/runtests/icmp-uge.clif
+++ b/cranelift/filetests/filetests/runtests/icmp-uge.clif
@@ -53,13 +53,3 @@ block0(v0: i64, v1: i64):
 ; run: %icmp_uge_i64(0, 1) == 0
 ; run: %icmp_uge_i64(-5, -1) == 0
 ; run: %icmp_uge_i64(1, -1) == 0
-
-
-function %constant_inputs() -> i8 {
-block0:
-    v9 = iconst.i8 128
-    v11 = iconst.i8 0
-    v17 = icmp uge v9, v11
-    return v17
-}
-; run: %constant_inputs() == 1
diff --git a/cranelift/filetests/filetests/runtests/icmp-ugt.clif b/cranelift/filetests/filetests/runtests/icmp-ugt.clif
index 274444262005..3d2d33056a4b 100644
--- a/cranelift/filetests/filetests/runtests/icmp-ugt.clif
+++ b/cranelift/filetests/filetests/runtests/icmp-ugt.clif
@@ -53,13 +53,3 @@ block0(v0: i64, v1: i64):
 ; run: %icmp_ugt_i64(0, 1) == 0
 ; run: %icmp_ugt_i64(-5, -1) == 0
 ; run: %icmp_ugt_i64(1, -1) == 0
-
-
-function %icmp_ugt_const() -> i8  {
-block0:
-    v11 = iconst.i8 196
-    v17 = icmp ugt v11, v11
-    return v17
-}
-
-; run: %icmp_ugt_const() == 0
diff --git a/cranelift/filetests/filetests/runtests/issue-5992.clif b/cranelift/filetests/filetests/runtests/issue-5992.clif
deleted file mode 100644
index a1d9e3692639..000000000000
--- a/cranelift/filetests/filetests/runtests/issue-5992.clif
+++ /dev/null
@@ -1,36 +0,0 @@
-test interpret
-test run
-target riscv64
-target aarch64
-target s390x
-
-function %a_f32(f32) -> i16 {
-block0(v0: f32):
-    v1 = fcvt_to_uint_sat.i16 v0
-    return v1
-}
-; run: %a_f32(0x1.949400p21) == -1
-
-
-function %b_f32(f32) -> i8 {
-block0(v0: f32):
-    v1 = fcvt_to_uint_sat.i8 v0
-    return v1
-}
-; run: %b_f32(0x1.949400p21) == -1
-
-
-function %a_f64(f64) -> i16 {
-block0(v0: f64):
-    v1 = fcvt_to_uint_sat.i16 v0
-    return v1
-}
-; run: %a_f64(0x1.949400p21) == -1
-
-
-function %b_f64(f64) -> i8 {
-block0(v0: f64):
-    v1 = fcvt_to_uint_sat.i8 v0
-    return v1
-}
-; run: %b_f64(0x1.949400p21) == -1
diff --git a/cranelift/filetests/filetests/runtests/issue-5993.clif b/cranelift/filetests/filetests/runtests/issue-5993.clif
deleted file mode 100644
index b19a865b246c..000000000000
--- a/cranelift/filetests/filetests/runtests/issue-5993.clif
+++ /dev/null
@@ -1,19 +0,0 @@
-test interpret
-test run
-target riscv64
-target aarch64
-target s390x
-
-function %a(f64) -> i8 {
-block0(v0: f64):
-    v1 = fcvt_to_sint_sat.i8 v0
-    return v1
-}
-; run: %a(-0x1.811d818400000p30) == -128
-
-function %b(f64) -> i16 {
-block0(v0: f64):
-    v1 = fcvt_to_sint_sat.i16 v0
-    return v1
-}
-; run: %b(-0x1.811d818400000p30) == -32768
diff --git a/cranelift/filetests/filetests/runtests/simd-scalartovector.clif b/cranelift/filetests/filetests/runtests/simd-scalartovector.clif
index 5a92405b6ed1..5ec07bc47c50 100644
--- a/cranelift/filetests/filetests/runtests/simd-scalartovector.clif
+++ b/cranelift/filetests/filetests/runtests/simd-scalartovector.clif
@@ -15,14 +15,6 @@ block0(v0: i32):
 ; run: %scalartovector_i32(1) == [1 0 0 0]
 ; run: %scalartovector_i32(4294967295) == [4294967295 0 0 0]
 
-function %scalartovector_i32_imm(i32) -> i32x4 {
-block0(v0: i32):
-    v1 = iconst.i32 7
-    v2 = scalar_to_vector.i32x4 v1
-    return v2
-}
-; run: %scalartovector_i32_imm(1) == [7 0 0 0]
-
 function %scalartovector_i64(i64) -> i64x2 {
 block0(v0: i64):
     v1 = scalar_to_vector.i64x2 v0
@@ -32,14 +24,6 @@ block0(v0: i64):
 ; run: %scalartovector_i64(1) == [1 0]
 ; run: %scalartovector_i64(18446744073709551615) == [18446744073709551615 0]
 
-function %scalartovector_i64_imm(i64) -> i64x2 {
-block0(v0: i64):
-    v1 = iconst.i64 7
-    v2 = scalar_to_vector.i64x2 v1
-    return v2
-}
-; run: %scalartovector_i64_imm(1) == [7 0]
-
 function %scalartovector_f32(f32) -> f32x4 {
 block0(v0: f32):
     v1 = scalar_to_vector.f32x4 v0
diff --git a/cranelift/filetests/filetests/runtests/urem.clif b/cranelift/filetests/filetests/runtests/urem.clif
index 3fa2024240f8..42297ad37a2b 100644
--- a/cranelift/filetests/filetests/runtests/urem.clif
+++ b/cranelift/filetests/filetests/runtests/urem.clif
@@ -135,13 +135,3 @@ block0(v0: i8):
 ; run: %urem_imm_i8(-19) == 0
 ; run: %urem_imm_i8(0xC0) == 0
 ; run: %urem_imm_i8(0x80) == 2
-
-
-function %constant_inputs() -> i8  {
-block0:
-    v3 = iconst.i8 208
-    v11 = urem v3, v3  ; v3 = 208, v3 = 208
-    return v11
-}
-
-; run: %constant_inputs() == 0
diff --git a/cranelift/filetests/filetests/wasm/byteswap.wat b/cranelift/filetests/filetests/wasm/byteswap.wat
deleted file mode 100644
index de5b51985d8f..000000000000
--- a/cranelift/filetests/filetests/wasm/byteswap.wat
+++ /dev/null
@@ -1,93 +0,0 @@
-;;! target = "x86_64"
-;;! optimize = true
-;;! settings = ["opt_level=speed"]
-
-(module
-  (func (export "bswap32") (param i32) (result i32)
-    local.get 0
-    i32.const 24
-    i32.shl
-    local.get 0
-    i32.const 65280
-    i32.and
-    i32.const 8
-    i32.shl
-    i32.or
-    local.get 0
-    i32.const 8
-    i32.shr_u
-    i32.const 65280
-    i32.and
-    local.get 0
-    i32.const 24
-    i32.shr_u
-    i32.or
-    i32.or
-  )
-
-  (func (export "bswap64") (param i64) (result i64)
-    local.get 0
-    i64.const 56
-    i64.shl
-    local.get 0
-    i64.const 65280
-    i64.and
-    i64.const 40
-    i64.shl
-    i64.or
-    local.get 0
-    i64.const 16711680
-    i64.and
-    i64.const 24
-    i64.shl
-    local.get 0
-    i64.const 4278190080
-    i64.and
-    i64.const 8
-    i64.shl
-    i64.or
-    i64.or
-    local.get 0
-    i64.const 8
-    i64.shr_u
-    i64.const 4278190080
-    i64.and
-    local.get 0
-    i64.const 24
-    i64.shr_u
-    i64.const 16711680
-    i64.and
-    i64.or
-    local.get 0
-    i64.const 40
-    i64.shr_u
-    i64.const 65280
-    i64.and
-    local.get 0
-    i64.const 56
-    i64.shr_u
-    i64.or
-    i64.or
-    i64.or
-  )
-)
-
-;; function u0:0(i32, i64 vmctx) -> i32 fast {
-;;                                 block0(v0: i32, v1: i64):
-;; @0057                               jump block1
-;;
-;;                                 block1:
-;;                                     v18 = bswap.i32 v0
-;;                                     v19 -> v18
-;; @0057                               return v18
-;; }
-;;
-;; function u0:1(i64, i64 vmctx) -> i64 fast {
-;;                                 block0(v0: i64, v1: i64):
-;; @00ad                               jump block1
-;;
-;;                                 block1:
-;;                                     v38 = bswap.i64 v0
-;;                                     v39 -> v38
-;; @00ad                               return v38
-;; }
diff --git a/cranelift/filetests/filetests/wasm/duplicate-loads-dynamic-memory.wat b/cranelift/filetests/filetests/wasm/duplicate-loads-dynamic-memory.wat
index 524f7eb83657..7d00c81bfdd5 100644
--- a/cranelift/filetests/filetests/wasm/duplicate-loads-dynamic-memory.wat
+++ b/cranelift/filetests/filetests/wasm/duplicate-loads-dynamic-memory.wat
@@ -48,10 +48,6 @@
 ;;     gv2 = load.i64 notrap aligned gv0
 ;;
 ;;                                 block0(v0: i32, v1: i64):
-;;                                     v20 -> v1
-;;                                     v21 -> v1
-;;                                     v22 -> v1
-;;                                     v23 -> v1
 ;; @0057                               v5 = load.i64 notrap aligned v1+8
 ;; @0057                               v7 = load.i64 notrap aligned v1
 ;; @0057                               v4 = uextend.i64 v0
@@ -73,23 +69,19 @@
 ;;     gv2 = load.i64 notrap aligned gv0
 ;;
 ;;                                 block0(v0: i32, v1: i64):
-;;                                     v24 -> v1
-;;                                     v25 -> v1
-;;                                     v26 -> v1
-;;                                     v27 -> v1
 ;; @0064                               v5 = load.i64 notrap aligned v1+8
 ;; @0064                               v7 = load.i64 notrap aligned v1
 ;; @0064                               v4 = uextend.i64 v0
 ;; @0064                               v6 = icmp ugt v4, v5
-;; @0064                               v11 = iconst.i64 0
+;; @0064                               v10 = iconst.i64 0
 ;; @0064                               v8 = iadd v7, v4
-;; @0064                               v9 = iconst.i64 1234
-;; @0064                               v10 = iadd v8, v9  ; v9 = 1234
-;; @0064                               v12 = select_spectre_guard v6, v11, v10  ; v11 = 0
-;; @0064                               v13 = load.i32 little heap v12
-;;                                     v2 -> v13
+;;                                     v22 = iconst.i64 1234
+;; @0064                               v9 = iadd v8, v22  ; v22 = 1234
+;; @0064                               v11 = select_spectre_guard v6, v10, v9  ; v10 = 0
+;; @0064                               v12 = load.i32 little heap v11
+;;                                     v2 -> v12
 ;; @006e                               jump block1
 ;;
 ;;                                 block1:
-;; @006e                               return v13, v13
+;; @006e                               return v12, v12
 ;; }
diff --git a/cranelift/filetests/filetests/wasm/duplicate-loads-static-memory.wat b/cranelift/filetests/filetests/wasm/duplicate-loads-static-memory.wat
index c63173922333..16a4fe413335 100644
--- a/cranelift/filetests/filetests/wasm/duplicate-loads-static-memory.wat
+++ b/cranelift/filetests/filetests/wasm/duplicate-loads-static-memory.wat
@@ -43,8 +43,6 @@
 ;;     gv1 = load.i64 notrap aligned readonly gv0
 ;;
 ;;                                 block0(v0: i32, v1: i64):
-;;                                     v12 -> v1
-;;                                     v13 -> v1
 ;; @0057                               v5 = load.i64 notrap aligned readonly v1
 ;; @0057                               v4 = uextend.i64 v0
 ;; @0057                               v6 = iadd v5, v4
@@ -61,17 +59,15 @@
 ;;     gv1 = load.i64 notrap aligned readonly gv0
 ;;
 ;;                                 block0(v0: i32, v1: i64):
-;;                                     v16 -> v1
-;;                                     v17 -> v1
 ;; @0064                               v5 = load.i64 notrap aligned readonly v1
 ;; @0064                               v4 = uextend.i64 v0
 ;; @0064                               v6 = iadd v5, v4
-;; @0064                               v7 = iconst.i64 1234
-;; @0064                               v8 = iadd v6, v7  ; v7 = 1234
-;; @0064                               v9 = load.i32 little heap v8
-;;                                     v2 -> v9
+;;                                     v14 = iconst.i64 1234
+;; @0064                               v7 = iadd v6, v14  ; v14 = 1234
+;; @0064                               v8 = load.i32 little heap v7
+;;                                     v2 -> v8
 ;; @006e                               jump block1
 ;;
 ;;                                 block1:
-;; @006e                               return v9, v9
+;; @006e                               return v8, v8
 ;; }
diff --git a/cranelift/filetests/filetests/wasm/dynamic-memory-no-spectre-access-same-index-different-offsets.wat b/cranelift/filetests/filetests/wasm/dynamic-memory-no-spectre-access-same-index-different-offsets.wat
index f7f5f72bce6a..d3f19dfe5266 100644
--- a/cranelift/filetests/filetests/wasm/dynamic-memory-no-spectre-access-same-index-different-offsets.wat
+++ b/cranelift/filetests/filetests/wasm/dynamic-memory-no-spectre-access-same-index-different-offsets.wat
@@ -61,12 +61,6 @@
 ;;     gv2 = load.i64 notrap aligned gv0
 ;;
 ;;                                 block0(v0: i32, v1: i64):
-;;                                     v29 -> v1
-;;                                     v30 -> v1
-;;                                     v31 -> v1
-;;                                     v32 -> v1
-;;                                     v33 -> v1
-;;                                     v34 -> v1
 ;; @0047                               v6 = load.i64 notrap aligned v1+8
 ;; @0047                               v5 = uextend.i64 v0
 ;; @0047                               v7 = icmp ugt v5, v6
@@ -86,29 +80,29 @@
 ;; @004c                               trap heap_oob
 ;;
 ;;                                 block5:
-;; @004c                               v16 = iconst.i64 4
-;; @004c                               v17 = iadd.i64 v9, v16  ; v16 = 4
-;; @004c                               v18 = load.i32 little heap v17
-;;                                     v3 -> v18
-;; @0051                               v20 = iconst.i64 0x0010_0003
-;; @0051                               v21 = uadd_overflow_trap.i64 v5, v20, heap_oob  ; v20 = 0x0010_0003
-;; @0051                               v23 = icmp ugt v21, v6
-;; @0051                               brif v23, block6, block7
+;;                                     v27 = iconst.i64 4
+;; @004c                               v16 = iadd.i64 v9, v27  ; v27 = 4
+;; @004c                               v17 = load.i32 little heap v16
+;;                                     v3 -> v17
+;; @0051                               v19 = iconst.i64 0x0010_0003
+;; @0051                               v20 = uadd_overflow_trap.i64 v5, v19, heap_oob  ; v19 = 0x0010_0003
+;; @0051                               v22 = icmp ugt v20, v6
+;; @0051                               brif v22, block6, block7
 ;;
 ;;                                 block6 cold:
 ;; @0051                               trap heap_oob
 ;;
 ;;                                 block7:
-;; @0051                               v24 = load.i64 notrap aligned v1
-;; @0051                               v25 = iadd v24, v5
-;; @0051                               v26 = iconst.i64 0x000f_ffff
-;; @0051                               v27 = iadd v25, v26  ; v26 = 0x000f_ffff
-;; @0051                               v28 = load.i32 little heap v27
-;;                                     v4 -> v28
+;; @0051                               v23 = load.i64 notrap aligned v1
+;; @0051                               v24 = iadd v23, v5
+;;                                     v28 = iconst.i64 0x000f_ffff
+;; @0051                               v25 = iadd v24, v28  ; v28 = 0x000f_ffff
+;; @0051                               v26 = load.i32 little heap v25
+;;                                     v4 -> v26
 ;; @0056                               jump block1
 ;;
 ;;                                 block1:
-;; @0056                               return v10, v18, v28
+;; @0056                               return v10, v17, v26
 ;; }
 ;;
 ;; function u0:1(i32, i32, i32, i32, i64 vmctx) fast {
@@ -117,12 +111,6 @@
 ;;     gv2 = load.i64 notrap aligned gv0
 ;;
 ;;                                 block0(v0: i32, v1: i32, v2: i32, v3: i32, v4: i64):
-;;                                     v26 -> v4
-;;                                     v27 -> v4
-;;                                     v28 -> v4
-;;                                     v29 -> v4
-;;                                     v30 -> v4
-;;                                     v31 -> v4
 ;; @005d                               v6 = load.i64 notrap aligned v4+8
 ;; @005d                               v5 = uextend.i64 v0
 ;; @005d                               v7 = icmp ugt v5, v6
@@ -141,23 +129,23 @@
 ;; @0064                               trap heap_oob
 ;;
 ;;                                 block5:
-;; @0064                               v15 = iconst.i64 4
-;; @0064                               v16 = iadd.i64 v9, v15  ; v15 = 4
-;; @0064                               store.i32 little heap v2, v16
-;; @006b                               v18 = iconst.i64 0x0010_0003
-;; @006b                               v19 = uadd_overflow_trap.i64 v5, v18, heap_oob  ; v18 = 0x0010_0003
-;; @006b                               v21 = icmp ugt v19, v6
-;; @006b                               brif v21, block6, block7
+;;                                     v24 = iconst.i64 4
+;; @0064                               v15 = iadd.i64 v9, v24  ; v24 = 4
+;; @0064                               store.i32 little heap v2, v15
+;; @006b                               v17 = iconst.i64 0x0010_0003
+;; @006b                               v18 = uadd_overflow_trap.i64 v5, v17, heap_oob  ; v17 = 0x0010_0003
+;; @006b                               v20 = icmp ugt v18, v6
+;; @006b                               brif v20, block6, block7
 ;;
 ;;                                 block6 cold:
 ;; @006b                               trap heap_oob
 ;;
 ;;                                 block7:
-;; @006b                               v22 = load.i64 notrap aligned v4
-;; @006b                               v23 = iadd v22, v5
-;; @006b                               v24 = iconst.i64 0x000f_ffff
-;; @006b                               v25 = iadd v23, v24  ; v24 = 0x000f_ffff
-;; @006b                               store.i32 little heap v3, v25
+;; @006b                               v21 = load.i64 notrap aligned v4
+;; @006b                               v22 = iadd v21, v5
+;;                                     v25 = iconst.i64 0x000f_ffff
+;; @006b                               v23 = iadd v22, v25  ; v25 = 0x000f_ffff
+;; @006b                               store.i32 little heap v3, v23
 ;; @0070                               jump block1
 ;;
 ;;                                 block1:
diff --git a/cranelift/filetests/filetests/wasm/dynamic-memory-yes-spectre-access-same-index-different-offsets.wat b/cranelift/filetests/filetests/wasm/dynamic-memory-yes-spectre-access-same-index-different-offsets.wat
index 55e4b6b67f7f..c31b82338eb6 100644
--- a/cranelift/filetests/filetests/wasm/dynamic-memory-yes-spectre-access-same-index-different-offsets.wat
+++ b/cranelift/filetests/filetests/wasm/dynamic-memory-yes-spectre-access-same-index-different-offsets.wat
@@ -61,12 +61,6 @@
 ;;     gv2 = load.i64 notrap aligned gv0
 ;;
 ;;                                 block0(v0: i32, v1: i64):
-;;                                     v35 -> v1
-;;                                     v36 -> v1
-;;                                     v37 -> v1
-;;                                     v38 -> v1
-;;                                     v39 -> v1
-;;                                     v40 -> v1
 ;; @0047                               v6 = load.i64 notrap aligned v1+8
 ;; @0047                               v8 = load.i64 notrap aligned v1
 ;; @0047                               v5 = uextend.i64 v0
@@ -76,23 +70,23 @@
 ;; @0047                               v11 = select_spectre_guard v7, v10, v9  ; v10 = 0
 ;; @0047                               v12 = load.i32 little heap v11
 ;;                                     v2 -> v12
-;; @004c                               v18 = iconst.i64 4
-;; @004c                               v19 = iadd v9, v18  ; v18 = 4
-;; @004c                               v21 = select_spectre_guard v7, v10, v19  ; v10 = 0
-;; @004c                               v22 = load.i32 little heap v21
-;;                                     v3 -> v22
-;; @0051                               v24 = iconst.i64 0x0010_0003
-;; @0051                               v25 = uadd_overflow_trap v5, v24, heap_oob  ; v24 = 0x0010_0003
-;; @0051                               v27 = icmp ugt v25, v6
-;; @0051                               v30 = iconst.i64 0x000f_ffff
-;; @0051                               v31 = iadd v9, v30  ; v30 = 0x000f_ffff
-;; @0051                               v33 = select_spectre_guard v27, v10, v31  ; v10 = 0
-;; @0051                               v34 = load.i32 little heap v33
-;;                                     v4 -> v34
+;;                                     v33 = iconst.i64 4
+;; @004c                               v18 = iadd v9, v33  ; v33 = 4
+;; @004c                               v20 = select_spectre_guard v7, v10, v18  ; v10 = 0
+;; @004c                               v21 = load.i32 little heap v20
+;;                                     v3 -> v21
+;; @0051                               v23 = iconst.i64 0x0010_0003
+;; @0051                               v24 = uadd_overflow_trap v5, v23, heap_oob  ; v23 = 0x0010_0003
+;; @0051                               v26 = icmp ugt v24, v6
+;;                                     v34 = iconst.i64 0x000f_ffff
+;; @0051                               v29 = iadd v9, v34  ; v34 = 0x000f_ffff
+;; @0051                               v31 = select_spectre_guard v26, v10, v29  ; v10 = 0
+;; @0051                               v32 = load.i32 little heap v31
+;;                                     v4 -> v32
 ;; @0056                               jump block1
 ;;
 ;;                                 block1:
-;; @0056                               return v12, v22, v34
+;; @0056                               return v12, v21, v32
 ;; }
 ;;
 ;; function u0:1(i32, i32, i32, i32, i64 vmctx) fast {
@@ -101,12 +95,6 @@
 ;;     gv2 = load.i64 notrap aligned gv0
 ;;
 ;;                                 block0(v0: i32, v1: i32, v2: i32, v3: i32, v4: i64):
-;;                                     v32 -> v4
-;;                                     v33 -> v4
-;;                                     v34 -> v4
-;;                                     v35 -> v4
-;;                                     v36 -> v4
-;;                                     v37 -> v4
 ;; @005d                               v6 = load.i64 notrap aligned v4+8
 ;; @005d                               v8 = load.i64 notrap aligned v4
 ;; @005d                               v5 = uextend.i64 v0
@@ -115,17 +103,17 @@
 ;; @005d                               v9 = iadd v8, v5
 ;; @005d                               v11 = select_spectre_guard v7, v10, v9  ; v10 = 0
 ;; @005d                               store little heap v1, v11
-;; @0064                               v17 = iconst.i64 4
-;; @0064                               v18 = iadd v9, v17  ; v17 = 4
-;; @0064                               v20 = select_spectre_guard v7, v10, v18  ; v10 = 0
-;; @0064                               store little heap v2, v20
-;; @006b                               v22 = iconst.i64 0x0010_0003
-;; @006b                               v23 = uadd_overflow_trap v5, v22, heap_oob  ; v22 = 0x0010_0003
-;; @006b                               v25 = icmp ugt v23, v6
-;; @006b                               v28 = iconst.i64 0x000f_ffff
-;; @006b                               v29 = iadd v9, v28  ; v28 = 0x000f_ffff
-;; @006b                               v31 = select_spectre_guard v25, v10, v29  ; v10 = 0
-;; @006b                               store little heap v3, v31
+;;                                     v30 = iconst.i64 4
+;; @0064                               v17 = iadd v9, v30  ; v30 = 4
+;; @0064                               v19 = select_spectre_guard v7, v10, v17  ; v10 = 0
+;; @0064                               store little heap v2, v19
+;; @006b                               v21 = iconst.i64 0x0010_0003
+;; @006b                               v22 = uadd_overflow_trap v5, v21, heap_oob  ; v21 = 0x0010_0003
+;; @006b                               v24 = icmp ugt v22, v6
+;;                                     v31 = iconst.i64 0x000f_ffff
+;; @006b                               v27 = iadd v9, v31  ; v31 = 0x000f_ffff
+;; @006b                               v29 = select_spectre_guard v24, v10, v27  ; v10 = 0
+;; @006b                               store little heap v3, v29
 ;; @0070                               jump block1
 ;;
 ;;                                 block1:
diff --git a/cranelift/filetests/filetests/wasm/fixed-size-memory.wat b/cranelift/filetests/filetests/wasm/fixed-size-memory.wat
deleted file mode 100644
index ac1de89f39af..000000000000
--- a/cranelift/filetests/filetests/wasm/fixed-size-memory.wat
+++ /dev/null
@@ -1,78 +0,0 @@
-;;! target = "x86_64"
-;;!
-;;! settings = ["enable_heap_access_spectre_mitigation=false"]
-;;!
-;;! compile = false
-;;!
-;;! [globals.vmctx]
-;;! type = "i64"
-;;! vmctx = true
-;;!
-;;! [globals.heap_base]
-;;! type = "i64"
-;;! load = { base = "vmctx", offset = 0, readonly = true }
-;;!
-;;! [globals.heap_bound]
-;;! type = "i64"
-;;! load = { base = "vmctx", offset = 8, readonly = true }
-;;!
-;;! [[heaps]]
-;;! base = "heap_base"
-;;! min_size = 0x10000
-;;! max_size = 0x10000
-;;! offset_guard_size = 0
-;;! index_type = "i32"
-;;! style = { kind = "dynamic", bound = "heap_bound" }
-
-;; Test that dynamic memories with `min_size == max_size` don't actually load
-;; their dynamic memory bound, since it is a constant.
-
-(module
-  (memory 1 1)
-
-  (func (export "do_store") (param i32 i32)
-    local.get 0
-    local.get 1
-    i32.store8 offset=0)
-
-  (func (export "do_load") (param i32) (result i32)
-    local.get 0
-    i32.load8_u offset=0))
-
-;; function u0:0(i32, i32, i64 vmctx) fast {
-;;     gv0 = vmctx
-;;     gv1 = load.i64 notrap aligned readonly gv0+8
-;;     gv2 = load.i64 notrap aligned readonly gv0
-;;
-;;                                 block0(v0: i32, v1: i32, v2: i64):
-;; @0041                               v3 = uextend.i64 v0
-;; @0041                               v4 = iconst.i64 0x0001_0000
-;; @0041                               v5 = icmp uge v3, v4  ; v4 = 0x0001_0000
-;; @0041                               trapnz v5, heap_oob
-;; @0041                               v6 = global_value.i64 gv2
-;; @0041                               v7 = iadd v6, v3
-;; @0041                               istore8 little heap v1, v7
-;; @0044                               jump block1
-;;
-;;                                 block1:
-;; @0044                               return
-;; }
-;;
-;; function u0:1(i32, i64 vmctx) -> i32 fast {
-;;     gv0 = vmctx
-;;     gv1 = load.i64 notrap aligned readonly gv0+8
-;;     gv2 = load.i64 notrap aligned readonly gv0
-;;
-;;                                 block0(v0: i32, v1: i64):
-;; @0049                               v3 = uextend.i64 v0
-;; @0049                               v4 = iconst.i64 0x0001_0000
-;; @0049                               v5 = icmp uge v3, v4  ; v4 = 0x0001_0000
-;; @0049                               trapnz v5, heap_oob
-;; @0049                               v6 = global_value.i64 gv2
-;; @0049                               v7 = iadd v6, v3
-;; @0049                               v8 = uload8.i32 little heap v7
-;; @004c                               jump block1(v8)
-;;
-;;                                 block1(v2: i32):
-;; @004c                               return v2
-;; }
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index ba6614b910e1..6311eff510f4 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -52,9 +52,8 @@
 ;; @0040                               trapnz v6, heap_oob
 ;; @0040                               v7 = global_value.i64 gv2
 ;; @0040                               v8 = iadd v7, v3
-;; @0040                               v9 = iconst.i64 4096
-;; @0040                               v10 = iadd v8, v9  ; v9 = 4096
-;; @0040                               store little heap v1, v10
+;; @0040                               v9 = iadd_imm v8, 4096
+;; @0040                               store little heap v1, v9
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -74,11 +73,10 @@
 ;; @0049                               trapnz v6, heap_oob
 ;; @0049                               v7 = global_value.i64 gv2
 ;; @0049                               v8 = iadd v7, v3
-;; @0049                               v9 = iconst.i64 4096
-;; @0049                               v10 = iadd v8, v9  ; v9 = 4096
-;; @0049                               v11 = load.i32 little heap v10
-;; @004d                               jump block1(v11)
+;; @0049                               v9 = iadd_imm v8, 4096
+;; @0049                               v10 = load.i32 little heap v9
+;; @004d                               jump block1(v10)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
-;; }
+;; }
\ No newline at end of file
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 04da18209042..0e5e00017750 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -53,9 +53,8 @@
 ;; @0040                               trapnz v7, heap_oob
 ;; @0040                               v8 = global_value.i64 gv2
 ;; @0040                               v9 = iadd v8, v3
-;; @0040                               v10 = iconst.i64 0xffff_0000
-;; @0040                               v11 = iadd v9, v10  ; v10 = 0xffff_0000
-;; @0040                               store little heap v1, v11
+;; @0040                               v10 = iadd_imm v9, 0xffff_0000
+;; @0040                               store little heap v1, v10
 ;; @0047                               jump block1
 ;;
 ;;                                 block1:
@@ -76,11 +75,10 @@
 ;; @004c                               trapnz v7, heap_oob
 ;; @004c                               v8 = global_value.i64 gv2
 ;; @004c                               v9 = iadd v8, v3
-;; @004c                               v10 = iconst.i64 0xffff_0000
-;; @004c                               v11 = iadd v9, v10  ; v10 = 0xffff_0000
-;; @004c                               v12 = load.i32 little heap v11
-;; @0053                               jump block1(v12)
+;; @004c                               v10 = iadd_imm v9, 0xffff_0000
+;; @004c                               v11 = load.i32 little heap v10
+;; @0053                               jump block1(v11)
 ;;
 ;;                                 block1(v2: i32):
 ;; @0053                               return v2
-;; }
+;; }
\ No newline at end of file
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index de4cac40c0a1..7868f17e506d 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -52,9 +52,8 @@
 ;; @0040                               trapnz v6, heap_oob
 ;; @0040                               v7 = global_value.i64 gv2
 ;; @0040                               v8 = iadd v7, v3
-;; @0040                               v9 = iconst.i64 4096
-;; @0040                               v10 = iadd v8, v9  ; v9 = 4096
-;; @0040                               istore8 little heap v1, v10
+;; @0040                               v9 = iadd_imm v8, 4096
+;; @0040                               istore8 little heap v1, v9
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -74,11 +73,10 @@
 ;; @0049                               trapnz v6, heap_oob
 ;; @0049                               v7 = global_value.i64 gv2
 ;; @0049                               v8 = iadd v7, v3
-;; @0049                               v9 = iconst.i64 4096
-;; @0049                               v10 = iadd v8, v9  ; v9 = 4096
-;; @0049                               v11 = uload8.i32 little heap v10
-;; @004d                               jump block1(v11)
+;; @0049                               v9 = iadd_imm v8, 4096
+;; @0049                               v10 = uload8.i32 little heap v9
+;; @004d                               jump block1(v10)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
-;; }
+;; }
\ No newline at end of file
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
index b44a5c824111..d678f9f53be9 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -53,9 +53,8 @@
 ;; @0040                               trapnz v7, heap_oob
 ;; @0040                               v8 = global_value.i64 gv2
 ;; @0040                               v9 = iadd v8, v3
-;; @0040                               v10 = iconst.i64 0xffff_0000
-;; @0040                               v11 = iadd v9, v10  ; v10 = 0xffff_0000
-;; @0040                               istore8 little heap v1, v11
+;; @0040                               v10 = iadd_imm v9, 0xffff_0000
+;; @0040                               istore8 little heap v1, v10
 ;; @0047                               jump block1
 ;;
 ;;                                 block1:
@@ -76,11 +75,10 @@
 ;; @004c                               trapnz v7, heap_oob
 ;; @004c                               v8 = global_value.i64 gv2
 ;; @004c                               v9 = iadd v8, v3
-;; @004c                               v10 = iconst.i64 0xffff_0000
-;; @004c                               v11 = iadd v9, v10  ; v10 = 0xffff_0000
-;; @004c                               v12 = uload8.i32 little heap v11
-;; @0053                               jump block1(v12)
+;; @004c                               v10 = iadd_imm v9, 0xffff_0000
+;; @004c                               v11 = uload8.i32 little heap v10
+;; @0053                               jump block1(v11)
 ;;
 ;;                                 block1(v2: i32):
 ;; @0053                               return v2
-;; }
+;; }
\ No newline at end of file
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
index c5388cfa1092..d87ec248c314 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -51,11 +51,10 @@
 ;; @0040                               v6 = icmp ugt v3, v5
 ;; @0040                               v7 = global_value.i64 gv2
 ;; @0040                               v8 = iadd v7, v3
-;; @0040                               v9 = iconst.i64 4096
-;; @0040                               v10 = iadd v8, v9  ; v9 = 4096
-;; @0040                               v11 = iconst.i64 0
-;; @0040                               v12 = select_spectre_guard v6, v11, v10  ; v11 = 0
-;; @0040                               store little heap v1, v12
+;; @0040                               v9 = iadd_imm v8, 4096
+;; @0040                               v10 = iconst.i64 0
+;; @0040                               v11 = select_spectre_guard v6, v10, v9  ; v10 = 0
+;; @0040                               store little heap v1, v11
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -74,12 +73,11 @@
 ;; @0049                               v6 = icmp ugt v3, v5
 ;; @0049                               v7 = global_value.i64 gv2
 ;; @0049                               v8 = iadd v7, v3
-;; @0049                               v9 = iconst.i64 4096
-;; @0049                               v10 = iadd v8, v9  ; v9 = 4096
-;; @0049                               v11 = iconst.i64 0
-;; @0049                               v12 = select_spectre_guard v6, v11, v10  ; v11 = 0
-;; @0049                               v13 = load.i32 little heap v12
-;; @004d                               jump block1(v13)
+;; @0049                               v9 = iadd_imm v8, 4096
+;; @0049                               v10 = iconst.i64 0
+;; @0049                               v11 = select_spectre_guard v6, v10, v9  ; v10 = 0
+;; @0049                               v12 = load.i32 little heap v11
+;; @004d                               jump block1(v12)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index 3721500f77e0..3f41ddeb92fe 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -52,11 +52,10 @@
 ;; @0040                               v7 = icmp ugt v5, v6
 ;; @0040                               v8 = global_value.i64 gv2
 ;; @0040                               v9 = iadd v8, v3
-;; @0040                               v10 = iconst.i64 0xffff_0000
-;; @0040                               v11 = iadd v9, v10  ; v10 = 0xffff_0000
-;; @0040                               v12 = iconst.i64 0
-;; @0040                               v13 = select_spectre_guard v7, v12, v11  ; v12 = 0
-;; @0040                               store little heap v1, v13
+;; @0040                               v10 = iadd_imm v9, 0xffff_0000
+;; @0040                               v11 = iconst.i64 0
+;; @0040                               v12 = select_spectre_guard v7, v11, v10  ; v11 = 0
+;; @0040                               store little heap v1, v12
 ;; @0047                               jump block1
 ;;
 ;;                                 block1:
@@ -76,12 +75,11 @@
 ;; @004c                               v7 = icmp ugt v5, v6
 ;; @004c                               v8 = global_value.i64 gv2
 ;; @004c                               v9 = iadd v8, v3
-;; @004c                               v10 = iconst.i64 0xffff_0000
-;; @004c                               v11 = iadd v9, v10  ; v10 = 0xffff_0000
-;; @004c                               v12 = iconst.i64 0
-;; @004c                               v13 = select_spectre_guard v7, v12, v11  ; v12 = 0
-;; @004c                               v14 = load.i32 little heap v13
-;; @0053                               jump block1(v14)
+;; @004c                               v10 = iadd_imm v9, 0xffff_0000
+;; @004c                               v11 = iconst.i64 0
+;; @004c                               v12 = select_spectre_guard v7, v11, v10  ; v11 = 0
+;; @004c                               v13 = load.i32 little heap v12
+;; @0053                               jump block1(v13)
 ;;
 ;;                                 block1(v2: i32):
 ;; @0053                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
index 5cc8031797ba..05f55e95069b 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -51,11 +51,10 @@
 ;; @0040                               v6 = icmp ugt v3, v5
 ;; @0040                               v7 = global_value.i64 gv2
 ;; @0040                               v8 = iadd v7, v3
-;; @0040                               v9 = iconst.i64 4096
-;; @0040                               v10 = iadd v8, v9  ; v9 = 4096
-;; @0040                               v11 = iconst.i64 0
-;; @0040                               v12 = select_spectre_guard v6, v11, v10  ; v11 = 0
-;; @0040                               istore8 little heap v1, v12
+;; @0040                               v9 = iadd_imm v8, 4096
+;; @0040                               v10 = iconst.i64 0
+;; @0040                               v11 = select_spectre_guard v6, v10, v9  ; v10 = 0
+;; @0040                               istore8 little heap v1, v11
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -74,12 +73,11 @@
 ;; @0049                               v6 = icmp ugt v3, v5
 ;; @0049                               v7 = global_value.i64 gv2
 ;; @0049                               v8 = iadd v7, v3
-;; @0049                               v9 = iconst.i64 4096
-;; @0049                               v10 = iadd v8, v9  ; v9 = 4096
-;; @0049                               v11 = iconst.i64 0
-;; @0049                               v12 = select_spectre_guard v6, v11, v10  ; v11 = 0
-;; @0049                               v13 = uload8.i32 little heap v12
-;; @004d                               jump block1(v13)
+;; @0049                               v9 = iadd_imm v8, 4096
+;; @0049                               v10 = iconst.i64 0
+;; @0049                               v11 = select_spectre_guard v6, v10, v9  ; v10 = 0
+;; @0049                               v12 = uload8.i32 little heap v11
+;; @004d                               jump block1(v12)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index 0853765ff767..5da9f16544d3 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -52,11 +52,10 @@
 ;; @0040                               v7 = icmp ugt v5, v6
 ;; @0040                               v8 = global_value.i64 gv2
 ;; @0040                               v9 = iadd v8, v3
-;; @0040                               v10 = iconst.i64 0xffff_0000
-;; @0040                               v11 = iadd v9, v10  ; v10 = 0xffff_0000
-;; @0040                               v12 = iconst.i64 0
-;; @0040                               v13 = select_spectre_guard v7, v12, v11  ; v12 = 0
-;; @0040                               istore8 little heap v1, v13
+;; @0040                               v10 = iadd_imm v9, 0xffff_0000
+;; @0040                               v11 = iconst.i64 0
+;; @0040                               v12 = select_spectre_guard v7, v11, v10  ; v11 = 0
+;; @0040                               istore8 little heap v1, v12
 ;; @0047                               jump block1
 ;;
 ;;                                 block1:
@@ -76,12 +75,11 @@
 ;; @004c                               v7 = icmp ugt v5, v6
 ;; @004c                               v8 = global_value.i64 gv2
 ;; @004c                               v9 = iadd v8, v3
-;; @004c                               v10 = iconst.i64 0xffff_0000
-;; @004c                               v11 = iadd v9, v10  ; v10 = 0xffff_0000
-;; @004c                               v12 = iconst.i64 0
-;; @004c                               v13 = select_spectre_guard v7, v12, v11  ; v12 = 0
-;; @004c                               v14 = uload8.i32 little heap v13
-;; @0053                               jump block1(v14)
+;; @004c                               v10 = iadd_imm v9, 0xffff_0000
+;; @004c                               v11 = iconst.i64 0
+;; @004c                               v12 = select_spectre_guard v7, v11, v10  ; v11 = 0
+;; @004c                               v13 = uload8.i32 little heap v12
+;; @0053                               jump block1(v13)
 ;;
 ;;                                 block1(v2: i32):
 ;; @0053                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index 7d4d75a61e55..830fcdb0e5d0 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -51,9 +51,8 @@
 ;; @0040                               trapnz v5, heap_oob
 ;; @0040                               v6 = global_value.i64 gv2
 ;; @0040                               v7 = iadd v6, v3
-;; @0040                               v8 = iconst.i64 4096
-;; @0040                               v9 = iadd v7, v8  ; v8 = 4096
-;; @0040                               store little heap v1, v9
+;; @0040                               v8 = iadd_imm v7, 4096
+;; @0040                               store little heap v1, v8
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -72,10 +71,9 @@
 ;; @0049                               trapnz v5, heap_oob
 ;; @0049                               v6 = global_value.i64 gv2
 ;; @0049                               v7 = iadd v6, v3
-;; @0049                               v8 = iconst.i64 4096
-;; @0049                               v9 = iadd v7, v8  ; v8 = 4096
-;; @0049                               v10 = load.i32 little heap v9
-;; @004d                               jump block1(v10)
+;; @0049                               v8 = iadd_imm v7, 4096
+;; @0049                               v9 = load.i32 little heap v8
+;; @004d                               jump block1(v9)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 1d9c4bd0629c..56f3565d164f 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -51,9 +51,8 @@
 ;; @0040                               trapnz v5, heap_oob
 ;; @0040                               v6 = global_value.i64 gv2
 ;; @0040                               v7 = iadd v6, v3
-;; @0040                               v8 = iconst.i64 0xffff_0000
-;; @0040                               v9 = iadd v7, v8  ; v8 = 0xffff_0000
-;; @0040                               store little heap v1, v9
+;; @0040                               v8 = iadd_imm v7, 0xffff_0000
+;; @0040                               store little heap v1, v8
 ;; @0047                               jump block1
 ;;
 ;;                                 block1:
@@ -72,10 +71,9 @@
 ;; @004c                               trapnz v5, heap_oob
 ;; @004c                               v6 = global_value.i64 gv2
 ;; @004c                               v7 = iadd v6, v3
-;; @004c                               v8 = iconst.i64 0xffff_0000
-;; @004c                               v9 = iadd v7, v8  ; v8 = 0xffff_0000
-;; @004c                               v10 = load.i32 little heap v9
-;; @0053                               jump block1(v10)
+;; @004c                               v8 = iadd_imm v7, 0xffff_0000
+;; @004c                               v9 = load.i32 little heap v8
+;; @0053                               jump block1(v9)
 ;;
 ;;                                 block1(v2: i32):
 ;; @0053                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index c9f0c46a6e0e..72a89f431d4c 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -51,9 +51,8 @@
 ;; @0040                               trapnz v5, heap_oob
 ;; @0040                               v6 = global_value.i64 gv2
 ;; @0040                               v7 = iadd v6, v3
-;; @0040                               v8 = iconst.i64 4096
-;; @0040                               v9 = iadd v7, v8  ; v8 = 4096
-;; @0040                               istore8 little heap v1, v9
+;; @0040                               v8 = iadd_imm v7, 4096
+;; @0040                               istore8 little heap v1, v8
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -72,10 +71,9 @@
 ;; @0049                               trapnz v5, heap_oob
 ;; @0049                               v6 = global_value.i64 gv2
 ;; @0049                               v7 = iadd v6, v3
-;; @0049                               v8 = iconst.i64 4096
-;; @0049                               v9 = iadd v7, v8  ; v8 = 4096
-;; @0049                               v10 = uload8.i32 little heap v9
-;; @004d                               jump block1(v10)
+;; @0049                               v8 = iadd_imm v7, 4096
+;; @0049                               v9 = uload8.i32 little heap v8
+;; @004d                               jump block1(v9)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
index ada084d03a55..ea033f97e078 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -51,9 +51,8 @@
 ;; @0040                               trapnz v5, heap_oob
 ;; @0040                               v6 = global_value.i64 gv2
 ;; @0040                               v7 = iadd v6, v3
-;; @0040                               v8 = iconst.i64 0xffff_0000
-;; @0040                               v9 = iadd v7, v8  ; v8 = 0xffff_0000
-;; @0040                               istore8 little heap v1, v9
+;; @0040                               v8 = iadd_imm v7, 0xffff_0000
+;; @0040                               istore8 little heap v1, v8
 ;; @0047                               jump block1
 ;;
 ;;                                 block1:
@@ -72,10 +71,9 @@
 ;; @004c                               trapnz v5, heap_oob
 ;; @004c                               v6 = global_value.i64 gv2
 ;; @004c                               v7 = iadd v6, v3
-;; @004c                               v8 = iconst.i64 0xffff_0000
-;; @004c                               v9 = iadd v7, v8  ; v8 = 0xffff_0000
-;; @004c                               v10 = uload8.i32 little heap v9
-;; @0053                               jump block1(v10)
+;; @004c                               v8 = iadd_imm v7, 0xffff_0000
+;; @004c                               v9 = uload8.i32 little heap v8
+;; @0053                               jump block1(v9)
 ;;
 ;;                                 block1(v2: i32):
 ;; @0053                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
index 84ca6ae1f2b7..7735b88823b4 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -50,11 +50,10 @@
 ;; @0040                               v5 = icmp ugt v3, v4
 ;; @0040                               v6 = global_value.i64 gv2
 ;; @0040                               v7 = iadd v6, v3
-;; @0040                               v8 = iconst.i64 4096
-;; @0040                               v9 = iadd v7, v8  ; v8 = 4096
-;; @0040                               v10 = iconst.i64 0
-;; @0040                               v11 = select_spectre_guard v5, v10, v9  ; v10 = 0
-;; @0040                               store little heap v1, v11
+;; @0040                               v8 = iadd_imm v7, 4096
+;; @0040                               v9 = iconst.i64 0
+;; @0040                               v10 = select_spectre_guard v5, v9, v8  ; v9 = 0
+;; @0040                               store little heap v1, v10
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -72,12 +71,11 @@
 ;; @0049                               v5 = icmp ugt v3, v4
 ;; @0049                               v6 = global_value.i64 gv2
 ;; @0049                               v7 = iadd v6, v3
-;; @0049                               v8 = iconst.i64 4096
-;; @0049                               v9 = iadd v7, v8  ; v8 = 4096
-;; @0049                               v10 = iconst.i64 0
-;; @0049                               v11 = select_spectre_guard v5, v10, v9  ; v10 = 0
-;; @0049                               v12 = load.i32 little heap v11
-;; @004d                               jump block1(v12)
+;; @0049                               v8 = iadd_imm v7, 4096
+;; @0049                               v9 = iconst.i64 0
+;; @0049                               v10 = select_spectre_guard v5, v9, v8  ; v9 = 0
+;; @0049                               v11 = load.i32 little heap v10
+;; @004d                               jump block1(v11)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index 6921e49b2dae..0f6b07a13d8d 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -50,11 +50,10 @@
 ;; @0040                               v5 = icmp ugt v3, v4
 ;; @0040                               v6 = global_value.i64 gv2
 ;; @0040                               v7 = iadd v6, v3
-;; @0040                               v8 = iconst.i64 0xffff_0000
-;; @0040                               v9 = iadd v7, v8  ; v8 = 0xffff_0000
-;; @0040                               v10 = iconst.i64 0
-;; @0040                               v11 = select_spectre_guard v5, v10, v9  ; v10 = 0
-;; @0040                               store little heap v1, v11
+;; @0040                               v8 = iadd_imm v7, 0xffff_0000
+;; @0040                               v9 = iconst.i64 0
+;; @0040                               v10 = select_spectre_guard v5, v9, v8  ; v9 = 0
+;; @0040                               store little heap v1, v10
 ;; @0047                               jump block1
 ;;
 ;;                                 block1:
@@ -72,12 +71,11 @@
 ;; @004c                               v5 = icmp ugt v3, v4
 ;; @004c                               v6 = global_value.i64 gv2
 ;; @004c                               v7 = iadd v6, v3
-;; @004c                               v8 = iconst.i64 0xffff_0000
-;; @004c                               v9 = iadd v7, v8  ; v8 = 0xffff_0000
-;; @004c                               v10 = iconst.i64 0
-;; @004c                               v11 = select_spectre_guard v5, v10, v9  ; v10 = 0
-;; @004c                               v12 = load.i32 little heap v11
-;; @0053                               jump block1(v12)
+;; @004c                               v8 = iadd_imm v7, 0xffff_0000
+;; @004c                               v9 = iconst.i64 0
+;; @004c                               v10 = select_spectre_guard v5, v9, v8  ; v9 = 0
+;; @004c                               v11 = load.i32 little heap v10
+;; @0053                               jump block1(v11)
 ;;
 ;;                                 block1(v2: i32):
 ;; @0053                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
index 26324e58fcfa..4c00fe0b8181 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -50,11 +50,10 @@
 ;; @0040                               v5 = icmp ugt v3, v4
 ;; @0040                               v6 = global_value.i64 gv2
 ;; @0040                               v7 = iadd v6, v3
-;; @0040                               v8 = iconst.i64 4096
-;; @0040                               v9 = iadd v7, v8  ; v8 = 4096
-;; @0040                               v10 = iconst.i64 0
-;; @0040                               v11 = select_spectre_guard v5, v10, v9  ; v10 = 0
-;; @0040                               istore8 little heap v1, v11
+;; @0040                               v8 = iadd_imm v7, 4096
+;; @0040                               v9 = iconst.i64 0
+;; @0040                               v10 = select_spectre_guard v5, v9, v8  ; v9 = 0
+;; @0040                               istore8 little heap v1, v10
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -72,12 +71,11 @@
 ;; @0049                               v5 = icmp ugt v3, v4
 ;; @0049                               v6 = global_value.i64 gv2
 ;; @0049                               v7 = iadd v6, v3
-;; @0049                               v8 = iconst.i64 4096
-;; @0049                               v9 = iadd v7, v8  ; v8 = 4096
-;; @0049                               v10 = iconst.i64 0
-;; @0049                               v11 = select_spectre_guard v5, v10, v9  ; v10 = 0
-;; @0049                               v12 = uload8.i32 little heap v11
-;; @004d                               jump block1(v12)
+;; @0049                               v8 = iadd_imm v7, 4096
+;; @0049                               v9 = iconst.i64 0
+;; @0049                               v10 = select_spectre_guard v5, v9, v8  ; v9 = 0
+;; @0049                               v11 = uload8.i32 little heap v10
+;; @004d                               jump block1(v11)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index 9078e96e10f3..8f44855404ab 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -50,11 +50,10 @@
 ;; @0040                               v5 = icmp ugt v3, v4
 ;; @0040                               v6 = global_value.i64 gv2
 ;; @0040                               v7 = iadd v6, v3
-;; @0040                               v8 = iconst.i64 0xffff_0000
-;; @0040                               v9 = iadd v7, v8  ; v8 = 0xffff_0000
-;; @0040                               v10 = iconst.i64 0
-;; @0040                               v11 = select_spectre_guard v5, v10, v9  ; v10 = 0
-;; @0040                               istore8 little heap v1, v11
+;; @0040                               v8 = iadd_imm v7, 0xffff_0000
+;; @0040                               v9 = iconst.i64 0
+;; @0040                               v10 = select_spectre_guard v5, v9, v8  ; v9 = 0
+;; @0040                               istore8 little heap v1, v10
 ;; @0047                               jump block1
 ;;
 ;;                                 block1:
@@ -72,12 +71,11 @@
 ;; @004c                               v5 = icmp ugt v3, v4
 ;; @004c                               v6 = global_value.i64 gv2
 ;; @004c                               v7 = iadd v6, v3
-;; @004c                               v8 = iconst.i64 0xffff_0000
-;; @004c                               v9 = iadd v7, v8  ; v8 = 0xffff_0000
-;; @004c                               v10 = iconst.i64 0
-;; @004c                               v11 = select_spectre_guard v5, v10, v9  ; v10 = 0
-;; @004c                               v12 = uload8.i32 little heap v11
-;; @0053                               jump block1(v12)
+;; @004c                               v8 = iadd_imm v7, 0xffff_0000
+;; @004c                               v9 = iconst.i64 0
+;; @004c                               v10 = select_spectre_guard v5, v9, v8  ; v9 = 0
+;; @004c                               v11 = uload8.i32 little heap v10
+;; @0053                               jump block1(v11)
 ;;
 ;;                                 block1(v2: i32):
 ;; @0053                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index 9bc1d64eb434..48d3c4cdb9b4 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -51,9 +51,8 @@
 ;; @0040                               trapnz v5, heap_oob
 ;; @0040                               v6 = global_value.i64 gv2
 ;; @0040                               v7 = iadd v6, v0
-;; @0040                               v8 = iconst.i64 4096
-;; @0040                               v9 = iadd v7, v8  ; v8 = 4096
-;; @0040                               store little heap v1, v9
+;; @0040                               v8 = iadd_imm v7, 4096
+;; @0040                               store little heap v1, v8
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -72,11 +71,10 @@
 ;; @0049                               trapnz v5, heap_oob
 ;; @0049                               v6 = global_value.i64 gv2
 ;; @0049                               v7 = iadd v6, v0
-;; @0049                               v8 = iconst.i64 4096
-;; @0049                               v9 = iadd v7, v8  ; v8 = 4096
-;; @0049                               v10 = load.i32 little heap v9
-;; @004d                               jump block1(v10)
+;; @0049                               v8 = iadd_imm v7, 4096
+;; @0049                               v9 = load.i32 little heap v8
+;; @004d                               jump block1(v9)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
-;; }
+;; }
\ No newline at end of file
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
index ac003b4f3caa..2818830f2e5e 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -52,9 +52,8 @@
 ;; @0040                               trapnz v6, heap_oob
 ;; @0040                               v7 = global_value.i64 gv2
 ;; @0040                               v8 = iadd v7, v0
-;; @0040                               v9 = iconst.i64 0xffff_0000
-;; @0040                               v10 = iadd v8, v9  ; v9 = 0xffff_0000
-;; @0040                               store little heap v1, v10
+;; @0040                               v9 = iadd_imm v8, 0xffff_0000
+;; @0040                               store little heap v1, v9
 ;; @0047                               jump block1
 ;;
 ;;                                 block1:
@@ -74,11 +73,10 @@
 ;; @004c                               trapnz v6, heap_oob
 ;; @004c                               v7 = global_value.i64 gv2
 ;; @004c                               v8 = iadd v7, v0
-;; @004c                               v9 = iconst.i64 0xffff_0000
-;; @004c                               v10 = iadd v8, v9  ; v9 = 0xffff_0000
-;; @004c                               v11 = load.i32 little heap v10
-;; @0053                               jump block1(v11)
+;; @004c                               v9 = iadd_imm v8, 0xffff_0000
+;; @004c                               v10 = load.i32 little heap v9
+;; @0053                               jump block1(v10)
 ;;
 ;;                                 block1(v2: i32):
 ;; @0053                               return v2
-;; }
+;; }
\ No newline at end of file
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index f520713d21dc..fe99a3a69a27 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -51,9 +51,8 @@
 ;; @0040                               trapnz v5, heap_oob
 ;; @0040                               v6 = global_value.i64 gv2
 ;; @0040                               v7 = iadd v6, v0
-;; @0040                               v8 = iconst.i64 4096
-;; @0040                               v9 = iadd v7, v8  ; v8 = 4096
-;; @0040                               istore8 little heap v1, v9
+;; @0040                               v8 = iadd_imm v7, 4096
+;; @0040                               istore8 little heap v1, v8
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -72,11 +71,10 @@
 ;; @0049                               trapnz v5, heap_oob
 ;; @0049                               v6 = global_value.i64 gv2
 ;; @0049                               v7 = iadd v6, v0
-;; @0049                               v8 = iconst.i64 4096
-;; @0049                               v9 = iadd v7, v8  ; v8 = 4096
-;; @0049                               v10 = uload8.i32 little heap v9
-;; @004d                               jump block1(v10)
+;; @0049                               v8 = iadd_imm v7, 4096
+;; @0049                               v9 = uload8.i32 little heap v8
+;; @004d                               jump block1(v9)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
-;; }
+;; }
\ No newline at end of file
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
index cbcebcb4e22d..dfffbffa10a9 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -52,9 +52,8 @@
 ;; @0040                               trapnz v6, heap_oob
 ;; @0040                               v7 = global_value.i64 gv2
 ;; @0040                               v8 = iadd v7, v0
-;; @0040                               v9 = iconst.i64 0xffff_0000
-;; @0040                               v10 = iadd v8, v9  ; v9 = 0xffff_0000
-;; @0040                               istore8 little heap v1, v10
+;; @0040                               v9 = iadd_imm v8, 0xffff_0000
+;; @0040                               istore8 little heap v1, v9
 ;; @0047                               jump block1
 ;;
 ;;                                 block1:
@@ -74,11 +73,10 @@
 ;; @004c                               trapnz v6, heap_oob
 ;; @004c                               v7 = global_value.i64 gv2
 ;; @004c                               v8 = iadd v7, v0
-;; @004c                               v9 = iconst.i64 0xffff_0000
-;; @004c                               v10 = iadd v8, v9  ; v9 = 0xffff_0000
-;; @004c                               v11 = uload8.i32 little heap v10
-;; @0053                               jump block1(v11)
+;; @004c                               v9 = iadd_imm v8, 0xffff_0000
+;; @004c                               v10 = uload8.i32 little heap v9
+;; @0053                               jump block1(v10)
 ;;
 ;;                                 block1(v2: i32):
 ;; @0053                               return v2
-;; }
+;; }
\ No newline at end of file
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
index 4b9aa76fa29b..4c7f300166e6 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -50,11 +50,10 @@
 ;; @0040                               v5 = icmp ugt v0, v4
 ;; @0040                               v6 = global_value.i64 gv2
 ;; @0040                               v7 = iadd v6, v0
-;; @0040                               v8 = iconst.i64 4096
-;; @0040                               v9 = iadd v7, v8  ; v8 = 4096
-;; @0040                               v10 = iconst.i64 0
-;; @0040                               v11 = select_spectre_guard v5, v10, v9  ; v10 = 0
-;; @0040                               store little heap v1, v11
+;; @0040                               v8 = iadd_imm v7, 4096
+;; @0040                               v9 = iconst.i64 0
+;; @0040                               v10 = select_spectre_guard v5, v9, v8  ; v9 = 0
+;; @0040                               store little heap v1, v10
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -72,12 +71,11 @@
 ;; @0049                               v5 = icmp ugt v0, v4
 ;; @0049                               v6 = global_value.i64 gv2
 ;; @0049                               v7 = iadd v6, v0
-;; @0049                               v8 = iconst.i64 4096
-;; @0049                               v9 = iadd v7, v8  ; v8 = 4096
-;; @0049                               v10 = iconst.i64 0
-;; @0049                               v11 = select_spectre_guard v5, v10, v9  ; v10 = 0
-;; @0049                               v12 = load.i32 little heap v11
-;; @004d                               jump block1(v12)
+;; @0049                               v8 = iadd_imm v7, 4096
+;; @0049                               v9 = iconst.i64 0
+;; @0049                               v10 = select_spectre_guard v5, v9, v8  ; v9 = 0
+;; @0049                               v11 = load.i32 little heap v10
+;; @004d                               jump block1(v11)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index 57a261728359..fc82ac16b563 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -51,11 +51,10 @@
 ;; @0040                               v6 = icmp ugt v4, v5
 ;; @0040                               v7 = global_value.i64 gv2
 ;; @0040                               v8 = iadd v7, v0
-;; @0040                               v9 = iconst.i64 0xffff_0000
-;; @0040                               v10 = iadd v8, v9  ; v9 = 0xffff_0000
-;; @0040                               v11 = iconst.i64 0
-;; @0040                               v12 = select_spectre_guard v6, v11, v10  ; v11 = 0
-;; @0040                               store little heap v1, v12
+;; @0040                               v9 = iadd_imm v8, 0xffff_0000
+;; @0040                               v10 = iconst.i64 0
+;; @0040                               v11 = select_spectre_guard v6, v10, v9  ; v10 = 0
+;; @0040                               store little heap v1, v11
 ;; @0047                               jump block1
 ;;
 ;;                                 block1:
@@ -74,12 +73,11 @@
 ;; @004c                               v6 = icmp ugt v4, v5
 ;; @004c                               v7 = global_value.i64 gv2
 ;; @004c                               v8 = iadd v7, v0
-;; @004c                               v9 = iconst.i64 0xffff_0000
-;; @004c                               v10 = iadd v8, v9  ; v9 = 0xffff_0000
-;; @004c                               v11 = iconst.i64 0
-;; @004c                               v12 = select_spectre_guard v6, v11, v10  ; v11 = 0
-;; @004c                               v13 = load.i32 little heap v12
-;; @0053                               jump block1(v13)
+;; @004c                               v9 = iadd_imm v8, 0xffff_0000
+;; @004c                               v10 = iconst.i64 0
+;; @004c                               v11 = select_spectre_guard v6, v10, v9  ; v10 = 0
+;; @004c                               v12 = load.i32 little heap v11
+;; @0053                               jump block1(v12)
 ;;
 ;;                                 block1(v2: i32):
 ;; @0053                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
index 277bcdc2e02c..c68c778f8789 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -50,11 +50,10 @@
 ;; @0040                               v5 = icmp ugt v0, v4
 ;; @0040                               v6 = global_value.i64 gv2
 ;; @0040                               v7 = iadd v6, v0
-;; @0040                               v8 = iconst.i64 4096
-;; @0040                               v9 = iadd v7, v8  ; v8 = 4096
-;; @0040                               v10 = iconst.i64 0
-;; @0040                               v11 = select_spectre_guard v5, v10, v9  ; v10 = 0
-;; @0040                               istore8 little heap v1, v11
+;; @0040                               v8 = iadd_imm v7, 4096
+;; @0040                               v9 = iconst.i64 0
+;; @0040                               v10 = select_spectre_guard v5, v9, v8  ; v9 = 0
+;; @0040                               istore8 little heap v1, v10
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -72,12 +71,11 @@
 ;; @0049                               v5 = icmp ugt v0, v4
 ;; @0049                               v6 = global_value.i64 gv2
 ;; @0049                               v7 = iadd v6, v0
-;; @0049                               v8 = iconst.i64 4096
-;; @0049                               v9 = iadd v7, v8  ; v8 = 4096
-;; @0049                               v10 = iconst.i64 0
-;; @0049                               v11 = select_spectre_guard v5, v10, v9  ; v10 = 0
-;; @0049                               v12 = uload8.i32 little heap v11
-;; @004d                               jump block1(v12)
+;; @0049                               v8 = iadd_imm v7, 4096
+;; @0049                               v9 = iconst.i64 0
+;; @0049                               v10 = select_spectre_guard v5, v9, v8  ; v9 = 0
+;; @0049                               v11 = uload8.i32 little heap v10
+;; @004d                               jump block1(v11)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index 78b07266e53f..694152664d8b 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -51,11 +51,10 @@
 ;; @0040                               v6 = icmp ugt v4, v5
 ;; @0040                               v7 = global_value.i64 gv2
 ;; @0040                               v8 = iadd v7, v0
-;; @0040                               v9 = iconst.i64 0xffff_0000
-;; @0040                               v10 = iadd v8, v9  ; v9 = 0xffff_0000
-;; @0040                               v11 = iconst.i64 0
-;; @0040                               v12 = select_spectre_guard v6, v11, v10  ; v11 = 0
-;; @0040                               istore8 little heap v1, v12
+;; @0040                               v9 = iadd_imm v8, 0xffff_0000
+;; @0040                               v10 = iconst.i64 0
+;; @0040                               v11 = select_spectre_guard v6, v10, v9  ; v10 = 0
+;; @0040                               istore8 little heap v1, v11
 ;; @0047                               jump block1
 ;;
 ;;                                 block1:
@@ -74,12 +73,11 @@
 ;; @004c                               v6 = icmp ugt v4, v5
 ;; @004c                               v7 = global_value.i64 gv2
 ;; @004c                               v8 = iadd v7, v0
-;; @004c                               v9 = iconst.i64 0xffff_0000
-;; @004c                               v10 = iadd v8, v9  ; v9 = 0xffff_0000
-;; @004c                               v11 = iconst.i64 0
-;; @004c                               v12 = select_spectre_guard v6, v11, v10  ; v11 = 0
-;; @004c                               v13 = uload8.i32 little heap v12
-;; @0053                               jump block1(v13)
+;; @004c                               v9 = iadd_imm v8, 0xffff_0000
+;; @004c                               v10 = iconst.i64 0
+;; @004c                               v11 = select_spectre_guard v6, v10, v9  ; v10 = 0
+;; @004c                               v12 = uload8.i32 little heap v11
+;; @0053                               jump block1(v12)
 ;;
 ;;                                 block1(v2: i32):
 ;; @0053                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index a24f1ccd2390..c8f3414adea3 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -50,9 +50,8 @@
 ;; @0040                               trapnz v4, heap_oob
 ;; @0040                               v5 = global_value.i64 gv2
 ;; @0040                               v6 = iadd v5, v0
-;; @0040                               v7 = iconst.i64 4096
-;; @0040                               v8 = iadd v6, v7  ; v7 = 4096
-;; @0040                               store little heap v1, v8
+;; @0040                               v7 = iadd_imm v6, 4096
+;; @0040                               store little heap v1, v7
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -70,10 +69,9 @@
 ;; @0049                               trapnz v4, heap_oob
 ;; @0049                               v5 = global_value.i64 gv2
 ;; @0049                               v6 = iadd v5, v0
-;; @0049                               v7 = iconst.i64 4096
-;; @0049                               v8 = iadd v6, v7  ; v7 = 4096
-;; @0049                               v9 = load.i32 little heap v8
-;; @004d                               jump block1(v9)
+;; @0049                               v7 = iadd_imm v6, 4096
+;; @0049                               v8 = load.i32 little heap v7
+;; @004d                               jump block1(v8)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
index fa4c682724bf..4f1f011e6fab 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -50,9 +50,8 @@
 ;; @0040                               trapnz v4, heap_oob
 ;; @0040                               v5 = global_value.i64 gv2
 ;; @0040                               v6 = iadd v5, v0
-;; @0040                               v7 = iconst.i64 0xffff_0000
-;; @0040                               v8 = iadd v6, v7  ; v7 = 0xffff_0000
-;; @0040                               store little heap v1, v8
+;; @0040                               v7 = iadd_imm v6, 0xffff_0000
+;; @0040                               store little heap v1, v7
 ;; @0047                               jump block1
 ;;
 ;;                                 block1:
@@ -70,10 +69,9 @@
 ;; @004c                               trapnz v4, heap_oob
 ;; @004c                               v5 = global_value.i64 gv2
 ;; @004c                               v6 = iadd v5, v0
-;; @004c                               v7 = iconst.i64 0xffff_0000
-;; @004c                               v8 = iadd v6, v7  ; v7 = 0xffff_0000
-;; @004c                               v9 = load.i32 little heap v8
-;; @0053                               jump block1(v9)
+;; @004c                               v7 = iadd_imm v6, 0xffff_0000
+;; @004c                               v8 = load.i32 little heap v7
+;; @0053                               jump block1(v8)
 ;;
 ;;                                 block1(v2: i32):
 ;; @0053                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index cab36e4e5e15..d25588855566 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -50,9 +50,8 @@
 ;; @0040                               trapnz v4, heap_oob
 ;; @0040                               v5 = global_value.i64 gv2
 ;; @0040                               v6 = iadd v5, v0
-;; @0040                               v7 = iconst.i64 4096
-;; @0040                               v8 = iadd v6, v7  ; v7 = 4096
-;; @0040                               istore8 little heap v1, v8
+;; @0040                               v7 = iadd_imm v6, 4096
+;; @0040                               istore8 little heap v1, v7
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -70,10 +69,9 @@
 ;; @0049                               trapnz v4, heap_oob
 ;; @0049                               v5 = global_value.i64 gv2
 ;; @0049                               v6 = iadd v5, v0
-;; @0049                               v7 = iconst.i64 4096
-;; @0049                               v8 = iadd v6, v7  ; v7 = 4096
-;; @0049                               v9 = uload8.i32 little heap v8
-;; @004d                               jump block1(v9)
+;; @0049                               v7 = iadd_imm v6, 4096
+;; @0049                               v8 = uload8.i32 little heap v7
+;; @004d                               jump block1(v8)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 7e729f740991..eadb8b32c184 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -50,9 +50,8 @@
 ;; @0040                               trapnz v4, heap_oob
 ;; @0040                               v5 = global_value.i64 gv2
 ;; @0040                               v6 = iadd v5, v0
-;; @0040                               v7 = iconst.i64 0xffff_0000
-;; @0040                               v8 = iadd v6, v7  ; v7 = 0xffff_0000
-;; @0040                               istore8 little heap v1, v8
+;; @0040                               v7 = iadd_imm v6, 0xffff_0000
+;; @0040                               istore8 little heap v1, v7
 ;; @0047                               jump block1
 ;;
 ;;                                 block1:
@@ -70,10 +69,9 @@
 ;; @004c                               trapnz v4, heap_oob
 ;; @004c                               v5 = global_value.i64 gv2
 ;; @004c                               v6 = iadd v5, v0
-;; @004c                               v7 = iconst.i64 0xffff_0000
-;; @004c                               v8 = iadd v6, v7  ; v7 = 0xffff_0000
-;; @004c                               v9 = uload8.i32 little heap v8
-;; @0053                               jump block1(v9)
+;; @004c                               v7 = iadd_imm v6, 0xffff_0000
+;; @004c                               v8 = uload8.i32 little heap v7
+;; @0053                               jump block1(v8)
 ;;
 ;;                                 block1(v2: i32):
 ;; @0053                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
index 8d2cbfe3a70e..bc6c14897347 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -49,11 +49,10 @@
 ;; @0040                               v4 = icmp ugt v0, v3
 ;; @0040                               v5 = global_value.i64 gv2
 ;; @0040                               v6 = iadd v5, v0
-;; @0040                               v7 = iconst.i64 4096
-;; @0040                               v8 = iadd v6, v7  ; v7 = 4096
-;; @0040                               v9 = iconst.i64 0
-;; @0040                               v10 = select_spectre_guard v4, v9, v8  ; v9 = 0
-;; @0040                               store little heap v1, v10
+;; @0040                               v7 = iadd_imm v6, 4096
+;; @0040                               v8 = iconst.i64 0
+;; @0040                               v9 = select_spectre_guard v4, v8, v7  ; v8 = 0
+;; @0040                               store little heap v1, v9
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -70,12 +69,11 @@
 ;; @0049                               v4 = icmp ugt v0, v3
 ;; @0049                               v5 = global_value.i64 gv2
 ;; @0049                               v6 = iadd v5, v0
-;; @0049                               v7 = iconst.i64 4096
-;; @0049                               v8 = iadd v6, v7  ; v7 = 4096
-;; @0049                               v9 = iconst.i64 0
-;; @0049                               v10 = select_spectre_guard v4, v9, v8  ; v9 = 0
-;; @0049                               v11 = load.i32 little heap v10
-;; @004d                               jump block1(v11)
+;; @0049                               v7 = iadd_imm v6, 4096
+;; @0049                               v8 = iconst.i64 0
+;; @0049                               v9 = select_spectre_guard v4, v8, v7  ; v8 = 0
+;; @0049                               v10 = load.i32 little heap v9
+;; @004d                               jump block1(v10)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index 73f14c458b34..501d164e2b49 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -49,11 +49,10 @@
 ;; @0040                               v4 = icmp ugt v0, v3
 ;; @0040                               v5 = global_value.i64 gv2
 ;; @0040                               v6 = iadd v5, v0
-;; @0040                               v7 = iconst.i64 0xffff_0000
-;; @0040                               v8 = iadd v6, v7  ; v7 = 0xffff_0000
-;; @0040                               v9 = iconst.i64 0
-;; @0040                               v10 = select_spectre_guard v4, v9, v8  ; v9 = 0
-;; @0040                               store little heap v1, v10
+;; @0040                               v7 = iadd_imm v6, 0xffff_0000
+;; @0040                               v8 = iconst.i64 0
+;; @0040                               v9 = select_spectre_guard v4, v8, v7  ; v8 = 0
+;; @0040                               store little heap v1, v9
 ;; @0047                               jump block1
 ;;
 ;;                                 block1:
@@ -70,12 +69,11 @@
 ;; @004c                               v4 = icmp ugt v0, v3
 ;; @004c                               v5 = global_value.i64 gv2
 ;; @004c                               v6 = iadd v5, v0
-;; @004c                               v7 = iconst.i64 0xffff_0000
-;; @004c                               v8 = iadd v6, v7  ; v7 = 0xffff_0000
-;; @004c                               v9 = iconst.i64 0
-;; @004c                               v10 = select_spectre_guard v4, v9, v8  ; v9 = 0
-;; @004c                               v11 = load.i32 little heap v10
-;; @0053                               jump block1(v11)
+;; @004c                               v7 = iadd_imm v6, 0xffff_0000
+;; @004c                               v8 = iconst.i64 0
+;; @004c                               v9 = select_spectre_guard v4, v8, v7  ; v8 = 0
+;; @004c                               v10 = load.i32 little heap v9
+;; @0053                               jump block1(v10)
 ;;
 ;;                                 block1(v2: i32):
 ;; @0053                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
index c4fa39c9f350..f4f55950bcdb 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -49,11 +49,10 @@
 ;; @0040                               v4 = icmp ugt v0, v3
 ;; @0040                               v5 = global_value.i64 gv2
 ;; @0040                               v6 = iadd v5, v0
-;; @0040                               v7 = iconst.i64 4096
-;; @0040                               v8 = iadd v6, v7  ; v7 = 4096
-;; @0040                               v9 = iconst.i64 0
-;; @0040                               v10 = select_spectre_guard v4, v9, v8  ; v9 = 0
-;; @0040                               istore8 little heap v1, v10
+;; @0040                               v7 = iadd_imm v6, 4096
+;; @0040                               v8 = iconst.i64 0
+;; @0040                               v9 = select_spectre_guard v4, v8, v7  ; v8 = 0
+;; @0040                               istore8 little heap v1, v9
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -70,12 +69,11 @@
 ;; @0049                               v4 = icmp ugt v0, v3
 ;; @0049                               v5 = global_value.i64 gv2
 ;; @0049                               v6 = iadd v5, v0
-;; @0049                               v7 = iconst.i64 4096
-;; @0049                               v8 = iadd v6, v7  ; v7 = 4096
-;; @0049                               v9 = iconst.i64 0
-;; @0049                               v10 = select_spectre_guard v4, v9, v8  ; v9 = 0
-;; @0049                               v11 = uload8.i32 little heap v10
-;; @004d                               jump block1(v11)
+;; @0049                               v7 = iadd_imm v6, 4096
+;; @0049                               v8 = iconst.i64 0
+;; @0049                               v9 = select_spectre_guard v4, v8, v7  ; v8 = 0
+;; @0049                               v10 = uload8.i32 little heap v9
+;; @004d                               jump block1(v10)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index 1f543bd61fc4..aad253adbfb8 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -49,11 +49,10 @@
 ;; @0040                               v4 = icmp ugt v0, v3
 ;; @0040                               v5 = global_value.i64 gv2
 ;; @0040                               v6 = iadd v5, v0
-;; @0040                               v7 = iconst.i64 0xffff_0000
-;; @0040                               v8 = iadd v6, v7  ; v7 = 0xffff_0000
-;; @0040                               v9 = iconst.i64 0
-;; @0040                               v10 = select_spectre_guard v4, v9, v8  ; v9 = 0
-;; @0040                               istore8 little heap v1, v10
+;; @0040                               v7 = iadd_imm v6, 0xffff_0000
+;; @0040                               v8 = iconst.i64 0
+;; @0040                               v9 = select_spectre_guard v4, v8, v7  ; v8 = 0
+;; @0040                               istore8 little heap v1, v9
 ;; @0047                               jump block1
 ;;
 ;;                                 block1:
@@ -70,12 +69,11 @@
 ;; @004c                               v4 = icmp ugt v0, v3
 ;; @004c                               v5 = global_value.i64 gv2
 ;; @004c                               v6 = iadd v5, v0
-;; @004c                               v7 = iconst.i64 0xffff_0000
-;; @004c                               v8 = iadd v6, v7  ; v7 = 0xffff_0000
-;; @004c                               v9 = iconst.i64 0
-;; @004c                               v10 = select_spectre_guard v4, v9, v8  ; v9 = 0
-;; @004c                               v11 = uload8.i32 little heap v10
-;; @0053                               jump block1(v11)
+;; @004c                               v7 = iadd_imm v6, 0xffff_0000
+;; @004c                               v8 = iconst.i64 0
+;; @004c                               v9 = select_spectre_guard v4, v8, v7  ; v8 = 0
+;; @004c                               v10 = uload8.i32 little heap v9
+;; @0053                               jump block1(v10)
 ;;
 ;;                                 block1(v2: i32):
 ;; @0053                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index a154f8468c10..44734b44a023 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -47,9 +47,8 @@
 ;; @0040                               trapnz v4, heap_oob
 ;; @0040                               v5 = global_value.i64 gv1
 ;; @0040                               v6 = iadd v5, v3
-;; @0040                               v7 = iconst.i64 4096
-;; @0040                               v8 = iadd v6, v7  ; v7 = 4096
-;; @0040                               store little heap v1, v8
+;; @0040                               v7 = iadd_imm v6, 4096
+;; @0040                               store little heap v1, v7
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -66,11 +65,10 @@
 ;; @0049                               trapnz v4, heap_oob
 ;; @0049                               v5 = global_value.i64 gv1
 ;; @0049                               v6 = iadd v5, v3
-;; @0049                               v7 = iconst.i64 4096
-;; @0049                               v8 = iadd v6, v7  ; v7 = 4096
-;; @0049                               v9 = load.i32 little heap v8
-;; @004d                               jump block1(v9)
+;; @0049                               v7 = iadd_imm v6, 4096
+;; @0049                               v8 = load.i32 little heap v7
+;; @004d                               jump block1(v8)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
-;; }
+;; }
\ No newline at end of file
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index 1b76510f3b2b..29d67fe8a912 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -47,9 +47,8 @@
 ;; @0040                               trapnz v4, heap_oob
 ;; @0040                               v5 = global_value.i64 gv1
 ;; @0040                               v6 = iadd v5, v3
-;; @0040                               v7 = iconst.i64 4096
-;; @0040                               v8 = iadd v6, v7  ; v7 = 4096
-;; @0040                               istore8 little heap v1, v8
+;; @0040                               v7 = iadd_imm v6, 4096
+;; @0040                               istore8 little heap v1, v7
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -66,11 +65,10 @@
 ;; @0049                               trapnz v4, heap_oob
 ;; @0049                               v5 = global_value.i64 gv1
 ;; @0049                               v6 = iadd v5, v3
-;; @0049                               v7 = iconst.i64 4096
-;; @0049                               v8 = iadd v6, v7  ; v7 = 4096
-;; @0049                               v9 = uload8.i32 little heap v8
-;; @004d                               jump block1(v9)
+;; @0049                               v7 = iadd_imm v6, 4096
+;; @0049                               v8 = uload8.i32 little heap v7
+;; @004d                               jump block1(v8)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
-;; }
+;; }
\ No newline at end of file
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
index a54456f06c3f..902597df6514 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -46,11 +46,10 @@
 ;; @0040                               v4 = icmp_imm ugt v3, 0x0fff_effc
 ;; @0040                               v5 = global_value.i64 gv1
 ;; @0040                               v6 = iadd v5, v3
-;; @0040                               v7 = iconst.i64 4096
-;; @0040                               v8 = iadd v6, v7  ; v7 = 4096
-;; @0040                               v9 = iconst.i64 0
-;; @0040                               v10 = select_spectre_guard v4, v9, v8  ; v9 = 0
-;; @0040                               store little heap v1, v10
+;; @0040                               v7 = iadd_imm v6, 4096
+;; @0040                               v8 = iconst.i64 0
+;; @0040                               v9 = select_spectre_guard v4, v8, v7  ; v8 = 0
+;; @0040                               store little heap v1, v9
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -66,12 +65,11 @@
 ;; @0049                               v4 = icmp_imm ugt v3, 0x0fff_effc
 ;; @0049                               v5 = global_value.i64 gv1
 ;; @0049                               v6 = iadd v5, v3
-;; @0049                               v7 = iconst.i64 4096
-;; @0049                               v8 = iadd v6, v7  ; v7 = 4096
-;; @0049                               v9 = iconst.i64 0
-;; @0049                               v10 = select_spectre_guard v4, v9, v8  ; v9 = 0
-;; @0049                               v11 = load.i32 little heap v10
-;; @004d                               jump block1(v11)
+;; @0049                               v7 = iadd_imm v6, 4096
+;; @0049                               v8 = iconst.i64 0
+;; @0049                               v9 = select_spectre_guard v4, v8, v7  ; v8 = 0
+;; @0049                               v10 = load.i32 little heap v9
+;; @004d                               jump block1(v10)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
index fae04d6f7a3c..a5043ee3fbbe 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -46,11 +46,10 @@
 ;; @0040                               v4 = icmp_imm ugt v3, 0x0fff_efff
 ;; @0040                               v5 = global_value.i64 gv1
 ;; @0040                               v6 = iadd v5, v3
-;; @0040                               v7 = iconst.i64 4096
-;; @0040                               v8 = iadd v6, v7  ; v7 = 4096
-;; @0040                               v9 = iconst.i64 0
-;; @0040                               v10 = select_spectre_guard v4, v9, v8  ; v9 = 0
-;; @0040                               istore8 little heap v1, v10
+;; @0040                               v7 = iadd_imm v6, 4096
+;; @0040                               v8 = iconst.i64 0
+;; @0040                               v9 = select_spectre_guard v4, v8, v7  ; v8 = 0
+;; @0040                               istore8 little heap v1, v9
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -66,12 +65,11 @@
 ;; @0049                               v4 = icmp_imm ugt v3, 0x0fff_efff
 ;; @0049                               v5 = global_value.i64 gv1
 ;; @0049                               v6 = iadd v5, v3
-;; @0049                               v7 = iconst.i64 4096
-;; @0049                               v8 = iadd v6, v7  ; v7 = 4096
-;; @0049                               v9 = iconst.i64 0
-;; @0049                               v10 = select_spectre_guard v4, v9, v8  ; v9 = 0
-;; @0049                               v11 = uload8.i32 little heap v10
-;; @004d                               jump block1(v11)
+;; @0049                               v7 = iadd_imm v6, 4096
+;; @0049                               v8 = iconst.i64 0
+;; @0049                               v9 = select_spectre_guard v4, v8, v7  ; v8 = 0
+;; @0049                               v10 = uload8.i32 little heap v9
+;; @004d                               jump block1(v10)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index 6136eebd17d0..a7b43d2075fb 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -45,9 +45,8 @@
 ;; @0040                               v3 = uextend.i64 v0
 ;; @0040                               v4 = global_value.i64 gv1
 ;; @0040                               v5 = iadd v4, v3
-;; @0040                               v6 = iconst.i64 4096
-;; @0040                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0040                               store little heap v1, v7
+;; @0040                               v6 = iadd_imm v5, 4096
+;; @0040                               store little heap v1, v6
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -62,11 +61,10 @@
 ;; @0049                               v3 = uextend.i64 v0
 ;; @0049                               v4 = global_value.i64 gv1
 ;; @0049                               v5 = iadd v4, v3
-;; @0049                               v6 = iconst.i64 4096
-;; @0049                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0049                               v8 = load.i32 little heap v7
-;; @004d                               jump block1(v8)
+;; @0049                               v6 = iadd_imm v5, 4096
+;; @0049                               v7 = load.i32 little heap v6
+;; @004d                               jump block1(v7)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
-;; }
+;; }
\ No newline at end of file
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index fae8d044e36c..2764a8734e04 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -45,9 +45,8 @@
 ;; @0040                               v3 = uextend.i64 v0
 ;; @0040                               v4 = global_value.i64 gv1
 ;; @0040                               v5 = iadd v4, v3
-;; @0040                               v6 = iconst.i64 4096
-;; @0040                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0040                               istore8 little heap v1, v7
+;; @0040                               v6 = iadd_imm v5, 4096
+;; @0040                               istore8 little heap v1, v6
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -62,11 +61,10 @@
 ;; @0049                               v3 = uextend.i64 v0
 ;; @0049                               v4 = global_value.i64 gv1
 ;; @0049                               v5 = iadd v4, v3
-;; @0049                               v6 = iconst.i64 4096
-;; @0049                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0049                               v8 = uload8.i32 little heap v7
-;; @004d                               jump block1(v8)
+;; @0049                               v6 = iadd_imm v5, 4096
+;; @0049                               v7 = uload8.i32 little heap v6
+;; @004d                               jump block1(v7)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
-;; }
+;; }
\ No newline at end of file
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
index 22be30b0149b..ff6527a8b67c 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -45,9 +45,8 @@
 ;; @0040                               v3 = uextend.i64 v0
 ;; @0040                               v4 = global_value.i64 gv1
 ;; @0040                               v5 = iadd v4, v3
-;; @0040                               v6 = iconst.i64 4096
-;; @0040                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0040                               store little heap v1, v7
+;; @0040                               v6 = iadd_imm v5, 4096
+;; @0040                               store little heap v1, v6
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -62,11 +61,10 @@
 ;; @0049                               v3 = uextend.i64 v0
 ;; @0049                               v4 = global_value.i64 gv1
 ;; @0049                               v5 = iadd v4, v3
-;; @0049                               v6 = iconst.i64 4096
-;; @0049                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0049                               v8 = load.i32 little heap v7
-;; @004d                               jump block1(v8)
+;; @0049                               v6 = iadd_imm v5, 4096
+;; @0049                               v7 = load.i32 little heap v6
+;; @004d                               jump block1(v7)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
-;; }
+;; }
\ No newline at end of file
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
index d6ba202d4a18..25153188f6bd 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -45,9 +45,8 @@
 ;; @0040                               v3 = uextend.i64 v0
 ;; @0040                               v4 = global_value.i64 gv1
 ;; @0040                               v5 = iadd v4, v3
-;; @0040                               v6 = iconst.i64 4096
-;; @0040                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0040                               istore8 little heap v1, v7
+;; @0040                               v6 = iadd_imm v5, 4096
+;; @0040                               istore8 little heap v1, v6
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -62,11 +61,10 @@
 ;; @0049                               v3 = uextend.i64 v0
 ;; @0049                               v4 = global_value.i64 gv1
 ;; @0049                               v5 = iadd v4, v3
-;; @0049                               v6 = iconst.i64 4096
-;; @0049                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0049                               v8 = uload8.i32 little heap v7
-;; @004d                               jump block1(v8)
+;; @0049                               v6 = iadd_imm v5, 4096
+;; @0049                               v7 = uload8.i32 little heap v6
+;; @004d                               jump block1(v7)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
-;; }
+;; }
\ No newline at end of file
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index 6ab0bb9b649f..bff5b7a49b84 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -46,9 +46,8 @@
 ;; @0040                               trapnz v3, heap_oob
 ;; @0040                               v4 = global_value.i64 gv1
 ;; @0040                               v5 = iadd v4, v0
-;; @0040                               v6 = iconst.i64 4096
-;; @0040                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0040                               store little heap v1, v7
+;; @0040                               v6 = iadd_imm v5, 4096
+;; @0040                               store little heap v1, v6
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -64,11 +63,10 @@
 ;; @0049                               trapnz v3, heap_oob
 ;; @0049                               v4 = global_value.i64 gv1
 ;; @0049                               v5 = iadd v4, v0
-;; @0049                               v6 = iconst.i64 4096
-;; @0049                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0049                               v8 = load.i32 little heap v7
-;; @004d                               jump block1(v8)
+;; @0049                               v6 = iadd_imm v5, 4096
+;; @0049                               v7 = load.i32 little heap v6
+;; @004d                               jump block1(v7)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
-;; }
+;; }
\ No newline at end of file
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index 08cc7a23d9ea..6218cb0e8806 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -46,9 +46,8 @@
 ;; @0040                               trapnz v3, heap_oob
 ;; @0040                               v4 = global_value.i64 gv1
 ;; @0040                               v5 = iadd v4, v0
-;; @0040                               v6 = iconst.i64 4096
-;; @0040                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0040                               istore8 little heap v1, v7
+;; @0040                               v6 = iadd_imm v5, 4096
+;; @0040                               istore8 little heap v1, v6
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -64,11 +63,10 @@
 ;; @0049                               trapnz v3, heap_oob
 ;; @0049                               v4 = global_value.i64 gv1
 ;; @0049                               v5 = iadd v4, v0
-;; @0049                               v6 = iconst.i64 4096
-;; @0049                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0049                               v8 = uload8.i32 little heap v7
-;; @004d                               jump block1(v8)
+;; @0049                               v6 = iadd_imm v5, 4096
+;; @0049                               v7 = uload8.i32 little heap v6
+;; @004d                               jump block1(v7)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
-;; }
+;; }
\ No newline at end of file
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
index 5260a4549966..44bffc8e0cf6 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -45,11 +45,10 @@
 ;; @0040                               v3 = icmp_imm ugt v0, 0x0fff_effc
 ;; @0040                               v4 = global_value.i64 gv1
 ;; @0040                               v5 = iadd v4, v0
-;; @0040                               v6 = iconst.i64 4096
-;; @0040                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0040                               v8 = iconst.i64 0
-;; @0040                               v9 = select_spectre_guard v3, v8, v7  ; v8 = 0
-;; @0040                               store little heap v1, v9
+;; @0040                               v6 = iadd_imm v5, 4096
+;; @0040                               v7 = iconst.i64 0
+;; @0040                               v8 = select_spectre_guard v3, v7, v6  ; v7 = 0
+;; @0040                               store little heap v1, v8
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -64,12 +63,11 @@
 ;; @0049                               v3 = icmp_imm ugt v0, 0x0fff_effc
 ;; @0049                               v4 = global_value.i64 gv1
 ;; @0049                               v5 = iadd v4, v0
-;; @0049                               v6 = iconst.i64 4096
-;; @0049                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0049                               v8 = iconst.i64 0
-;; @0049                               v9 = select_spectre_guard v3, v8, v7  ; v8 = 0
-;; @0049                               v10 = load.i32 little heap v9
-;; @004d                               jump block1(v10)
+;; @0049                               v6 = iadd_imm v5, 4096
+;; @0049                               v7 = iconst.i64 0
+;; @0049                               v8 = select_spectre_guard v3, v7, v6  ; v7 = 0
+;; @0049                               v9 = load.i32 little heap v8
+;; @004d                               jump block1(v9)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
index e3d9749514e2..e6597d66d1e3 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -45,11 +45,10 @@
 ;; @0040                               v3 = icmp_imm ugt v0, 0x0fff_efff
 ;; @0040                               v4 = global_value.i64 gv1
 ;; @0040                               v5 = iadd v4, v0
-;; @0040                               v6 = iconst.i64 4096
-;; @0040                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0040                               v8 = iconst.i64 0
-;; @0040                               v9 = select_spectre_guard v3, v8, v7  ; v8 = 0
-;; @0040                               istore8 little heap v1, v9
+;; @0040                               v6 = iadd_imm v5, 4096
+;; @0040                               v7 = iconst.i64 0
+;; @0040                               v8 = select_spectre_guard v3, v7, v6  ; v7 = 0
+;; @0040                               istore8 little heap v1, v8
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -64,12 +63,11 @@
 ;; @0049                               v3 = icmp_imm ugt v0, 0x0fff_efff
 ;; @0049                               v4 = global_value.i64 gv1
 ;; @0049                               v5 = iadd v4, v0
-;; @0049                               v6 = iconst.i64 4096
-;; @0049                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0049                               v8 = iconst.i64 0
-;; @0049                               v9 = select_spectre_guard v3, v8, v7  ; v8 = 0
-;; @0049                               v10 = uload8.i32 little heap v9
-;; @004d                               jump block1(v10)
+;; @0049                               v6 = iadd_imm v5, 4096
+;; @0049                               v7 = iconst.i64 0
+;; @0049                               v8 = select_spectre_guard v3, v7, v6  ; v7 = 0
+;; @0049                               v9 = uload8.i32 little heap v8
+;; @004d                               jump block1(v9)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index 3839e19c12ee..0527549ce39e 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -46,9 +46,8 @@
 ;; @0040                               trapnz v3, heap_oob
 ;; @0040                               v4 = global_value.i64 gv1
 ;; @0040                               v5 = iadd v4, v0
-;; @0040                               v6 = iconst.i64 4096
-;; @0040                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0040                               store little heap v1, v7
+;; @0040                               v6 = iadd_imm v5, 4096
+;; @0040                               store little heap v1, v6
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -64,11 +63,10 @@
 ;; @0049                               trapnz v3, heap_oob
 ;; @0049                               v4 = global_value.i64 gv1
 ;; @0049                               v5 = iadd v4, v0
-;; @0049                               v6 = iconst.i64 4096
-;; @0049                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0049                               v8 = load.i32 little heap v7
-;; @004d                               jump block1(v8)
+;; @0049                               v6 = iadd_imm v5, 4096
+;; @0049                               v7 = load.i32 little heap v6
+;; @004d                               jump block1(v7)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
-;; }
+;; }
\ No newline at end of file
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index 0132e0dba179..cb8badc5518e 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -46,9 +46,8 @@
 ;; @0040                               trapnz v3, heap_oob
 ;; @0040                               v4 = global_value.i64 gv1
 ;; @0040                               v5 = iadd v4, v0
-;; @0040                               v6 = iconst.i64 4096
-;; @0040                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0040                               istore8 little heap v1, v7
+;; @0040                               v6 = iadd_imm v5, 4096
+;; @0040                               istore8 little heap v1, v6
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -64,11 +63,10 @@
 ;; @0049                               trapnz v3, heap_oob
 ;; @0049                               v4 = global_value.i64 gv1
 ;; @0049                               v5 = iadd v4, v0
-;; @0049                               v6 = iconst.i64 4096
-;; @0049                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0049                               v8 = uload8.i32 little heap v7
-;; @004d                               jump block1(v8)
+;; @0049                               v6 = iadd_imm v5, 4096
+;; @0049                               v7 = uload8.i32 little heap v6
+;; @004d                               jump block1(v7)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
-;; }
+;; }
\ No newline at end of file
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
index 8f6750ad3d10..db80822e8fb0 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -45,11 +45,10 @@
 ;; @0040                               v3 = icmp_imm ugt v0, 0x0fff_effc
 ;; @0040                               v4 = global_value.i64 gv1
 ;; @0040                               v5 = iadd v4, v0
-;; @0040                               v6 = iconst.i64 4096
-;; @0040                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0040                               v8 = iconst.i64 0
-;; @0040                               v9 = select_spectre_guard v3, v8, v7  ; v8 = 0
-;; @0040                               store little heap v1, v9
+;; @0040                               v6 = iadd_imm v5, 4096
+;; @0040                               v7 = iconst.i64 0
+;; @0040                               v8 = select_spectre_guard v3, v7, v6  ; v7 = 0
+;; @0040                               store little heap v1, v8
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -64,12 +63,11 @@
 ;; @0049                               v3 = icmp_imm ugt v0, 0x0fff_effc
 ;; @0049                               v4 = global_value.i64 gv1
 ;; @0049                               v5 = iadd v4, v0
-;; @0049                               v6 = iconst.i64 4096
-;; @0049                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0049                               v8 = iconst.i64 0
-;; @0049                               v9 = select_spectre_guard v3, v8, v7  ; v8 = 0
-;; @0049                               v10 = load.i32 little heap v9
-;; @004d                               jump block1(v10)
+;; @0049                               v6 = iadd_imm v5, 4096
+;; @0049                               v7 = iconst.i64 0
+;; @0049                               v8 = select_spectre_guard v3, v7, v6  ; v7 = 0
+;; @0049                               v9 = load.i32 little heap v8
+;; @004d                               jump block1(v9)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
diff --git a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
index 892429c3cff9..98344abf7a8d 100644
--- a/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/cranelift/filetests/filetests/wasm/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -45,11 +45,10 @@
 ;; @0040                               v3 = icmp_imm ugt v0, 0x0fff_efff
 ;; @0040                               v4 = global_value.i64 gv1
 ;; @0040                               v5 = iadd v4, v0
-;; @0040                               v6 = iconst.i64 4096
-;; @0040                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0040                               v8 = iconst.i64 0
-;; @0040                               v9 = select_spectre_guard v3, v8, v7  ; v8 = 0
-;; @0040                               istore8 little heap v1, v9
+;; @0040                               v6 = iadd_imm v5, 4096
+;; @0040                               v7 = iconst.i64 0
+;; @0040                               v8 = select_spectre_guard v3, v7, v6  ; v7 = 0
+;; @0040                               istore8 little heap v1, v8
 ;; @0044                               jump block1
 ;;
 ;;                                 block1:
@@ -64,12 +63,11 @@
 ;; @0049                               v3 = icmp_imm ugt v0, 0x0fff_efff
 ;; @0049                               v4 = global_value.i64 gv1
 ;; @0049                               v5 = iadd v4, v0
-;; @0049                               v6 = iconst.i64 4096
-;; @0049                               v7 = iadd v5, v6  ; v6 = 4096
-;; @0049                               v8 = iconst.i64 0
-;; @0049                               v9 = select_spectre_guard v3, v8, v7  ; v8 = 0
-;; @0049                               v10 = uload8.i32 little heap v9
-;; @004d                               jump block1(v10)
+;; @0049                               v6 = iadd_imm v5, 4096
+;; @0049                               v7 = iconst.i64 0
+;; @0049                               v8 = select_spectre_guard v3, v7, v6  ; v7 = 0
+;; @0049                               v9 = uload8.i32 little heap v8
+;; @004d                               jump block1(v9)
 ;;
 ;;                                 block1(v2: i32):
 ;; @004d                               return v2
diff --git a/cranelift/filetests/filetests/wasm/non-fixed-size-memory.wat b/cranelift/filetests/filetests/wasm/non-fixed-size-memory.wat
deleted file mode 100644
index dc981fe6ffd6..000000000000
--- a/cranelift/filetests/filetests/wasm/non-fixed-size-memory.wat
+++ /dev/null
@@ -1,78 +0,0 @@
-;;! target = "x86_64"
-;;!
-;;! settings = ["enable_heap_access_spectre_mitigation=false"]
-;;!
-;;! compile = false
-;;!
-;;! [globals.vmctx]
-;;! type = "i64"
-;;! vmctx = true
-;;!
-;;! [globals.heap_base]
-;;! type = "i64"
-;;! load = { base = "vmctx", offset = 0, readonly = true }
-;;!
-;;! [globals.heap_bound]
-;;! type = "i64"
-;;! load = { base = "vmctx", offset = 8, readonly = true }
-;;!
-;;! [[heaps]]
-;;! base = "heap_base"
-;;! min_size = 0x10000
-;;! max_size = 0x20000
-;;! offset_guard_size = 0
-;;! index_type = "i32"
-;;! style = { kind = "dynamic", bound = "heap_bound" }
-
-;; Dual test to `fixed-size-memory.wat` that checks that we _don't_ use a
-;; constant for the heap bound when `min_size != max_size`.
-
-(module
-  (memory 1 2)
-
-  (func (export "do_store") (param i32 i32)
-    local.get 0
-    local.get 1
-    i32.store8 offset=0)
-
-  (func (export "do_load") (param i32) (result i32)
-    local.get 0
-    i32.load8_u offset=0))
-
-;; function u0:0(i32, i32, i64 vmctx) fast {
-;;     gv0 = vmctx
-;;     gv1 = load.i64 notrap aligned readonly gv0+8
-;;     gv2 = load.i64 notrap aligned readonly gv0
-;;
-;;                                 block0(v0: i32, v1: i32, v2: i64):
-;; @0041                               v3 = uextend.i64 v0
-;; @0041                               v4 = global_value.i64 gv1
-;; @0041                               v5 = icmp uge v3, v4
-;; @0041                               trapnz v5, heap_oob
-;; @0041                               v6 = global_value.i64 gv2
-;; @0041                               v7 = iadd v6, v3
-;; @0041                               istore8 little heap v1, v7
-;; @0044                               jump block1
-;;
-;;                                 block1:
-;; @0044                               return
-;; }
-;;
-;; function u0:1(i32, i64 vmctx) -> i32 fast {
-;;     gv0 = vmctx
-;;     gv1 = load.i64 notrap aligned readonly gv0+8
-;;     gv2 = load.i64 notrap aligned readonly gv0
-;;
-;;                                 block0(v0: i32, v1: i64):
-;; @0049                               v3 = uextend.i64 v0
-;; @0049                               v4 = global_value.i64 gv1
-;; @0049                               v5 = icmp uge v3, v4
-;; @0049                               trapnz v5, heap_oob
-;; @0049                               v6 = global_value.i64 gv2
-;; @0049                               v7 = iadd v6, v3
-;; @0049                               v8 = uload8.i32 little heap v7
-;; @004c                               jump block1(v8)
-;;
-;;                                 block1(v2: i32):
-;; @004c                               return v2
-;; }
diff --git a/cranelift/filetests/filetests/wasm/x64-bmi2.wat b/cranelift/filetests/filetests/wasm/x64-bmi2.wat
index c2ddd20370b8..21418a017e82 100644
--- a/cranelift/filetests/filetests/wasm/x64-bmi2.wat
+++ b/cranelift/filetests/filetests/wasm/x64-bmi2.wat
@@ -50,8 +50,9 @@
 ;; block0:
 ;;   jmp     label1
 ;; block1:
-;;   andl    %esi, $31, %esi
-;;   bzhi    %edi, %esi, %eax
+;;   movq    %rsi, %r8
+;;   andl    %r8d, $31, %r8d
+;;   bzhi    %edi, %r8d, %eax
 ;;   movq    %rbp, %rsp
 ;;   popq    %rbp
 ;;   ret
@@ -64,8 +65,9 @@
 ;; block0:
 ;;   jmp     label1
 ;; block1:
-;;   andq    %rsi, $63, %rsi
-;;   bzhi    %rdi, %rsi, %rax
+;;   movq    %rsi, %r8
+;;   andq    %r8, $63, %r8
+;;   bzhi    %rdi, %r8, %rax
 ;;   movq    %rbp, %rsp
 ;;   popq    %rbp
 ;;   ret
diff --git a/cranelift/filetests/filetests/wasm/x64-relaxed-simd-deterministic.wat b/cranelift/filetests/filetests/wasm/x64-relaxed-simd-deterministic.wat
index 381a74fe34c8..3d5a9fb3363b 100644
--- a/cranelift/filetests/filetests/wasm/x64-relaxed-simd-deterministic.wat
+++ b/cranelift/filetests/filetests/wasm/x64-relaxed-simd-deterministic.wat
@@ -47,10 +47,10 @@
 ;;   vcmpps  $0, %xmm0, %xmm0, %xmm3
 ;;   vandps  %xmm0, %xmm3, %xmm5
 ;;   vpxor   %xmm3, %xmm5, %xmm7
-;;   vcvttps2dq %xmm5, %xmm1
-;;   vpand   %xmm1, %xmm7, %xmm3
-;;   vpsrad  %xmm3, $31, %xmm5
-;;   vpxor   %xmm5, %xmm1, %xmm0
+;;   vcvttps2dq %xmm5, %xmm9
+;;   vpand   %xmm9, %xmm7, %xmm11
+;;   vpsrad  %xmm11, $31, %xmm13
+;;   vpxor   %xmm13, %xmm9, %xmm0
 ;;   jmp     label1
 ;; block1:
 ;;   movq    %rbp, %rsp
@@ -65,19 +65,19 @@
 ;; block0:
 ;;   uninit  %xmm3
 ;;   vxorps  %xmm3, %xmm3, %xmm5
-;;   vmaxps  %xmm0, %xmm5, %xmm0
-;;   vpcmpeqd %xmm5, %xmm5, %xmm1
-;;   vpsrld  %xmm1, $1, %xmm3
-;;   vcvtdq2ps %xmm3, %xmm5
-;;   vcvttps2dq %xmm0, %xmm7
-;;   vsubps  %xmm0, %xmm5, %xmm1
-;;   vcmpps  $2, %xmm5, %xmm1, %xmm3
+;;   vmaxps  %xmm0, %xmm5, %xmm7
+;;   vpcmpeqd %xmm5, %xmm5, %xmm9
+;;   vpsrld  %xmm9, $1, %xmm11
+;;   vcvtdq2ps %xmm11, %xmm13
+;;   vcvttps2dq %xmm7, %xmm15
+;;   vsubps  %xmm7, %xmm13, %xmm1
+;;   vcmpps  $2, %xmm13, %xmm1, %xmm3
 ;;   vcvttps2dq %xmm1, %xmm5
-;;   vpxor   %xmm5, %xmm3, %xmm0
-;;   uninit  %xmm1
-;;   vpxor   %xmm1, %xmm1, %xmm3
-;;   vpmaxsd %xmm0, %xmm3, %xmm5
-;;   vpaddd  %xmm5, %xmm7, %xmm0
+;;   vpxor   %xmm5, %xmm3, %xmm7
+;;   uninit  %xmm9
+;;   vpxor   %xmm9, %xmm9, %xmm11
+;;   vpmaxsd %xmm7, %xmm11, %xmm13
+;;   vpaddd  %xmm13, %xmm15, %xmm0
 ;;   jmp     label1
 ;; block1:
 ;;   movq    %rbp, %rsp
@@ -109,10 +109,10 @@
 ;;   uninit  %xmm3
 ;;   vxorpd  %xmm3, %xmm3, %xmm5
 ;;   vmaxpd  %xmm0, %xmm5, %xmm7
-;;   vminpd  %xmm7, const(0), %xmm1
-;;   vroundpd $3, %xmm1, %xmm3
-;;   vaddpd  %xmm3, const(1), %xmm6
-;;   vshufps $136, %xmm6, %xmm5, %xmm0
+;;   vminpd  %xmm7, const(0), %xmm9
+;;   vroundpd $3, %xmm9, %xmm11
+;;   vaddpd  %xmm11, const(1), %xmm13
+;;   vshufps $136, %xmm13, %xmm5, %xmm0
 ;;   jmp     label1
 ;; block1:
 ;;   movq    %rbp, %rsp
@@ -125,15 +125,15 @@
 ;;   movq    %rsp, %rbp
 ;;   unwind DefineNewFrame { offset_upward_to_caller_sp: 16, offset_downward_to_clobbers: 0 }
 ;; block0:
-;;   vpmovsxbw %xmm0, %xmm4
-;;   vpmovsxbw %xmm1, %xmm5
-;;   vpmullw %xmm4, %xmm5, %xmm4
-;;   vpalignr $8, %xmm0, %xmm0, %xmm3
-;;   vpmovsxbw %xmm3, %xmm5
-;;   vpalignr $8, %xmm1, %xmm1, %xmm3
-;;   vpmovsxbw %xmm3, %xmm6
-;;   vpmullw %xmm5, %xmm6, %xmm5
-;;   vphaddw %xmm4, %xmm5, %xmm0
+;;   vpmovsxbw %xmm0, %xmm12
+;;   vpmovsxbw %xmm1, %xmm13
+;;   vpmullw %xmm12, %xmm13, %xmm12
+;;   vpalignr $8, %xmm0, %xmm0, %xmm11
+;;   vpmovsxbw %xmm11, %xmm13
+;;   vpalignr $8, %xmm1, %xmm1, %xmm11
+;;   vpmovsxbw %xmm11, %xmm14
+;;   vpmullw %xmm13, %xmm14, %xmm13
+;;   vphaddw %xmm12, %xmm13, %xmm0
 ;;   jmp     label1
 ;; block1:
 ;;   movq    %rbp, %rsp
@@ -146,17 +146,17 @@
 ;;   movq    %rsp, %rbp
 ;;   unwind DefineNewFrame { offset_upward_to_caller_sp: 16, offset_downward_to_clobbers: 0 }
 ;; block0:
-;;   vpmovsxbw %xmm0, %xmm7
+;;   vpmovsxbw %xmm0, %xmm15
 ;;   vpmovsxbw %xmm1, %xmm3
-;;   vpmullw %xmm7, %xmm3, %xmm7
-;;   vpalignr $8, %xmm0, %xmm0, %xmm6
-;;   vpmovsxbw %xmm6, %xmm0
-;;   vpalignr $8, %xmm1, %xmm1, %xmm6
-;;   vpmovsxbw %xmm6, %xmm1
+;;   vpmullw %xmm15, %xmm3, %xmm15
+;;   vpalignr $8, %xmm0, %xmm0, %xmm14
+;;   vpmovsxbw %xmm14, %xmm0
+;;   vpalignr $8, %xmm1, %xmm1, %xmm14
+;;   vpmovsxbw %xmm14, %xmm1
 ;;   vpmullw %xmm0, %xmm1, %xmm0
-;;   vphaddw %xmm7, %xmm0, %xmm7
-;;   vpmaddwd %xmm7, const(0), %xmm7
-;;   vpaddd  %xmm7, %xmm2, %xmm0
+;;   vphaddw %xmm15, %xmm0, %xmm15
+;;   vpmaddwd %xmm15, const(0), %xmm15
+;;   vpaddd  %xmm15, %xmm2, %xmm0
 ;;   jmp     label1
 ;; block1:
 ;;   movq    %rbp, %rsp
diff --git a/cranelift/filetests/filetests/wasm/x64-relaxed-simd.wat b/cranelift/filetests/filetests/wasm/x64-relaxed-simd.wat
index 10e3433d61b1..39ebc2324b95 100644
--- a/cranelift/filetests/filetests/wasm/x64-relaxed-simd.wat
+++ b/cranelift/filetests/filetests/wasm/x64-relaxed-simd.wat
@@ -58,19 +58,20 @@
 ;; block0:
 ;;   uninit  %xmm7
 ;;   xorps   %xmm7, %xmm7, %xmm7
-;;   maxps   %xmm0, %xmm7, %xmm0
+;;   movdqa  %xmm0, %xmm12
+;;   maxps   %xmm12, %xmm7, %xmm12
 ;;   pcmpeqd %xmm7, %xmm7, %xmm7
 ;;   psrld   %xmm7, $1, %xmm7
 ;;   cvtdq2ps %xmm7, %xmm1
-;;   cvttps2dq %xmm0, %xmm7
-;;   subps   %xmm0, %xmm1, %xmm0
-;;   cmpps   $2, %xmm1, %xmm0, %xmm1
-;;   cvttps2dq %xmm0, %xmm0
+;;   cvttps2dq %xmm12, %xmm15
+;;   subps   %xmm12, %xmm1, %xmm12
+;;   cmpps   $2, %xmm1, %xmm12, %xmm1
+;;   cvttps2dq %xmm12, %xmm0
 ;;   pxor    %xmm0, %xmm1, %xmm0
-;;   uninit  %xmm2
-;;   pxor    %xmm2, %xmm2, %xmm2
-;;   pmaxsd  %xmm0, %xmm2, %xmm0
-;;   paddd   %xmm0, %xmm7, %xmm0
+;;   uninit  %xmm10
+;;   pxor    %xmm10, %xmm10, %xmm10
+;;   pmaxsd  %xmm0, %xmm10, %xmm0
+;;   paddd   %xmm0, %xmm15, %xmm0
 ;;   jmp     label1
 ;; block1:
 ;;   movq    %rbp, %rsp
@@ -98,9 +99,10 @@
 ;; block0:
 ;;   uninit  %xmm4
 ;;   xorpd   %xmm4, %xmm4, %xmm4
-;;   maxpd   %xmm0, %xmm4, %xmm0
-;;   minpd   %xmm0, const(0), %xmm0
-;;   roundpd $3, %xmm0, %xmm0
+;;   movdqa  %xmm0, %xmm8
+;;   maxpd   %xmm8, %xmm4, %xmm8
+;;   minpd   %xmm8, const(0), %xmm8
+;;   roundpd $3, %xmm8, %xmm0
 ;;   addpd   %xmm0, const(1), %xmm0
 ;;   shufps  $136, %xmm0, %xmm4, %xmm0
 ;;   jmp     label1
@@ -130,9 +132,10 @@
 ;;   movq    %rsp, %rbp
 ;;   unwind DefineNewFrame { offset_upward_to_caller_sp: 16, offset_downward_to_clobbers: 0 }
 ;; block0:
-;;   pmaddubsw %xmm1, %xmm0, %xmm1
-;;   pmaddwd %xmm1, const(0), %xmm1
+;;   movdqa  %xmm0, %xmm8
 ;;   movdqa  %xmm1, %xmm0
+;;   pmaddubsw %xmm0, %xmm8, %xmm0
+;;   pmaddwd %xmm0, const(0), %xmm0
 ;;   paddd   %xmm0, %xmm2, %xmm0
 ;;   jmp     label1
 ;; block1:
diff --git a/cranelift/filetests/src/test_interpret.rs b/cranelift/filetests/src/test_interpret.rs
index c9ed846316db..f8d2f1b57b48 100644
--- a/cranelift/filetests/src/test_interpret.rs
+++ b/cranelift/filetests/src/test_interpret.rs
@@ -6,17 +6,15 @@
 use crate::runone::FileUpdate;
 use crate::subtest::SubTest;
 use anyhow::Context;
-use cranelift_codegen::data_value::DataValue;
-use cranelift_codegen::ir::{Function, LibCall};
+use cranelift_codegen::ir::Function;
 use cranelift_codegen::isa::TargetIsa;
 use cranelift_codegen::settings::Flags;
 use cranelift_codegen::{self, ir};
 use cranelift_interpreter::environment::FunctionStore;
-use cranelift_interpreter::interpreter::{Interpreter, InterpreterState, LibCallValues};
+use cranelift_interpreter::interpreter::{Interpreter, InterpreterState};
 use cranelift_interpreter::step::ControlFlow;
 use cranelift_reader::{parse_run_command, Details, TestCommand, TestFile};
 use log::{info, trace};
-use smallvec::smallvec;
 use std::borrow::Cow;
 
 struct TestInterpret;
@@ -85,20 +83,7 @@ fn run_test(func_store: &FunctionStore, func: &Function, details: &Details) -> a
                 .run(|func_name, run_args| {
                     // Rebuild the interpreter state on every run to ensure that we don't accidentally depend on
                     // some leftover state
-                    let state = InterpreterState::default()
-                        .with_function_store(func_store.clone())
-                        .with_libcall_handler(|libcall: LibCall, args: LibCallValues| {
-                            use LibCall::*;
-                            Ok(smallvec![match (libcall, &args[..]) {
-                                (CeilF32, [DataValue::F32(a)]) => DataValue::F32(a.ceil()),
-                                (CeilF64, [DataValue::F64(a)]) => DataValue::F64(a.ceil()),
-                                (FloorF32, [DataValue::F32(a)]) => DataValue::F32(a.floor()),
-                                (FloorF64, [DataValue::F64(a)]) => DataValue::F64(a.floor()),
-                                (TruncF32, [DataValue::F32(a)]) => DataValue::F32(a.trunc()),
-                                (TruncF64, [DataValue::F64(a)]) => DataValue::F64(a.trunc()),
-                                _ => unreachable!(),
-                            }])
-                        });
+                    let state = InterpreterState::default().with_function_store(func_store.clone());
 
                     let mut args = Vec::with_capacity(run_args.len());
                     args.extend_from_slice(run_args);
diff --git a/cranelift/filetests/src/test_wasm/config.rs b/cranelift/filetests/src/test_wasm/config.rs
index 15ca92ec7596..ab85af333f49 100644
--- a/cranelift/filetests/src/test_wasm/config.rs
+++ b/cranelift/filetests/src/test_wasm/config.rs
@@ -113,10 +113,6 @@ impl TestGlobal {
         if self.vmctx {
             ir::GlobalValueData::VMContext
         } else if let Some(load) = &self.load {
-            let mut flags = ir::MemFlags::trusted();
-            if load.readonly {
-                flags.set_readonly();
-            }
             ir::GlobalValueData::Load {
                 base: name_to_ir_global[&load.base],
                 offset: i32::try_from(load.offset).unwrap().into(),
@@ -125,7 +121,7 @@ impl TestGlobal {
                     "i64" => ir::types::I64,
                     other => panic!("test globals cannot be of type '{other}'"),
                 },
-                flags,
+                readonly: load.readonly,
             }
         } else {
             unreachable!()
@@ -159,9 +155,6 @@ pub struct TestHeap {
     #[serde(default)]
     pub min_size: u64,
 
-    #[serde(default)]
-    pub max_size: Option<u64>,
-
     #[serde(default)]
     pub offset_guard_size: u64,
 
@@ -177,8 +170,7 @@ impl TestHeap {
     ) -> cranelift_wasm::HeapData {
         cranelift_wasm::HeapData {
             base: name_to_ir_global[&self.base],
-            min_size: self.min_size,
-            max_size: self.max_size,
+            min_size: self.min_size.into(),
             offset_guard_size: self.offset_guard_size.into(),
             style: self.style.to_ir(name_to_ir_global),
             index_type: match self.index_type.as_str() {
@@ -186,7 +178,6 @@ impl TestHeap {
                 "i64" => ir::types::I64,
                 other => panic!("heap indices may only be i32 or i64, found '{other}'"),
             },
-            memory_type: None,
         }
     }
 
diff --git a/cranelift/filetests/src/test_wasm/env.rs b/cranelift/filetests/src/test_wasm/env.rs
index efd21a5b897d..89c7ad2119eb 100644
--- a/cranelift/filetests/src/test_wasm/env.rs
+++ b/cranelift/filetests/src/test_wasm/env.rs
@@ -20,7 +20,6 @@ pub struct ModuleEnv {
     pub inner: DummyEnvironment,
     pub config: TestConfig,
     pub heap_access_spectre_mitigation: bool,
-    pub proof_carrying_code: bool,
 }
 
 impl ModuleEnv {
@@ -32,7 +31,6 @@ impl ModuleEnv {
             heap_access_spectre_mitigation: target_isa
                 .flags()
                 .enable_heap_access_spectre_mitigation(),
-            proof_carrying_code: target_isa.flags().enable_pcc(),
         }
     }
 }
@@ -53,7 +51,6 @@ impl<'data> ModuleEnvironment<'data> for ModuleEnv {
                 self.inner.expected_reachability.clone(),
                 self.config.clone(),
                 self.heap_access_spectre_mitigation,
-                self.proof_carrying_code,
             );
             let func_index = FuncIndex::new(
                 self.inner.get_num_func_imports() + self.inner.info.function_bodies.len(),
@@ -247,7 +244,6 @@ pub struct FuncEnv<'a> {
     pub name_to_ir_global: BTreeMap<String, ir::GlobalValue>,
     pub next_heap: usize,
     pub heap_access_spectre_mitigation: bool,
-    pub proof_carrying_code: bool,
 }
 
 impl<'a> FuncEnv<'a> {
@@ -256,7 +252,6 @@ impl<'a> FuncEnv<'a> {
         expected_reachability: Option<cranelift_wasm::ExpectedReachability>,
         config: TestConfig,
         heap_access_spectre_mitigation: bool,
-        proof_carrying_code: bool,
     ) -> Self {
         let inner = cranelift_wasm::DummyFuncEnvironment::new(mod_info, expected_reachability);
         Self {
@@ -265,7 +260,6 @@ impl<'a> FuncEnv<'a> {
             name_to_ir_global: Default::default(),
             next_heap: 0,
             heap_access_spectre_mitigation,
-            proof_carrying_code,
         }
     }
 }
@@ -284,10 +278,6 @@ impl<'a> TargetEnvironment for FuncEnv<'a> {
     fn heap_access_spectre_mitigation(&self) -> bool {
         self.heap_access_spectre_mitigation
     }
-
-    fn proof_carrying_code(&self) -> bool {
-        self.proof_carrying_code
-    }
 }
 
 impl<'a> FuncEnvironment for FuncEnv<'a> {
diff --git a/cranelift/frontend/Cargo.toml b/cranelift/frontend/Cargo.toml
index 7c804f44ccb7..fffa87065d7b 100644
--- a/cranelift/frontend/Cargo.toml
+++ b/cranelift/frontend/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-frontend"
-version = "0.102.0"
+version = "0.101.0"
 description = "Cranelift IR builder helper"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-frontend"
diff --git a/cranelift/fuzzgen/Cargo.toml b/cranelift/fuzzgen/Cargo.toml
index 0a19631c38b0..014d0f076a8b 100644
--- a/cranelift/fuzzgen/Cargo.toml
+++ b/cranelift/fuzzgen/Cargo.toml
@@ -15,6 +15,6 @@ cranelift = { workspace = true }
 cranelift-native = { workspace = true }
 
 anyhow = { workspace = true }
-arbitrary = { workspace = true }
+arbitrary = "1.0.0"
 once_cell = { workspace = true }
 target-lexicon = { workspace = true, features = ["std"] }
diff --git a/cranelift/fuzzgen/src/function_generator.rs b/cranelift/fuzzgen/src/function_generator.rs
index 651b784b2b53..a264155cad68 100644
--- a/cranelift/fuzzgen/src/function_generator.rs
+++ b/cranelift/fuzzgen/src/function_generator.rs
@@ -131,14 +131,7 @@ fn insert_stack_load(
 ) -> Result<()> {
     let typevar = rets[0];
     let type_size = typevar.bytes();
-    let (slot, slot_size, category) = fgen.stack_slot_with_size(type_size)?;
-
-    // `stack_load` doesen't support setting MemFlags, and it does not set any
-    // alias analysis bits, so we can only emit it for `Other` slots.
-    if category != AACategory::Other {
-        return Err(arbitrary::Error::IncorrectFormat.into());
-    }
-
+    let (slot, slot_size) = fgen.stack_slot_with_size(type_size)?;
     let offset = fgen.u.int_in_range(0..=(slot_size - type_size))? as i32;
 
     let val = builder.ins().stack_load(typevar, slot, offset);
@@ -157,15 +150,7 @@ fn insert_stack_store(
 ) -> Result<()> {
     let typevar = args[0];
     let type_size = typevar.bytes();
-
-    let (slot, slot_size, category) = fgen.stack_slot_with_size(type_size)?;
-
-    // `stack_store` doesen't support setting MemFlags, and it does not set any
-    // alias analysis bits, so we can only emit it for `Other` slots.
-    if category != AACategory::Other {
-        return Err(arbitrary::Error::IncorrectFormat.into());
-    }
-
+    let (slot, slot_size) = fgen.stack_slot_with_size(type_size)?;
     let offset = fgen.u.int_in_range(0..=(slot_size - type_size))? as i32;
 
     let arg0 = fgen.get_variable_of_type(typevar)?;
@@ -528,6 +513,8 @@ fn valid_for_target(triple: &Triple, op: Opcode, args: &[Type], rets: &[Type]) -
                 (Opcode::Udiv | Opcode::Sdiv, &[I128, I128]),
                 // https://github.com/bytecodealliance/wasmtime/issues/5474
                 (Opcode::Urem | Opcode::Srem, &[I128, I128]),
+                // https://github.com/bytecodealliance/wasmtime/issues/5466
+                (Opcode::Iabs, &[I128]),
                 // https://github.com/bytecodealliance/wasmtime/issues/3370
                 (
                     Opcode::Smin | Opcode::Umin | Opcode::Smax | Opcode::Umax,
@@ -627,6 +614,8 @@ fn valid_for_target(triple: &Triple, op: Opcode, args: &[Type], rets: &[Type]) -
                 (Opcode::Udiv | Opcode::Sdiv, &[I128, I128]),
                 // https://github.com/bytecodealliance/wasmtime/issues/5472
                 (Opcode::Urem | Opcode::Srem, &[I128, I128]),
+                // https://github.com/bytecodealliance/wasmtime/issues/5467
+                (Opcode::Iabs, &[I128]),
                 // https://github.com/bytecodealliance/wasmtime/issues/4313
                 (
                     Opcode::Smin | Opcode::Umin | Opcode::Smax | Opcode::Umax,
@@ -651,8 +640,7 @@ fn valid_for_target(triple: &Triple, op: Opcode, args: &[Type], rets: &[Type]) -
                         | Opcode::FcvtToUintSat
                         | Opcode::FcvtToSint
                         | Opcode::FcvtToSintSat,
-                    &[F32 | F64],
-                    &[I128]
+                    &[F32 | F64]
                 ),
                 // https://github.com/bytecodealliance/wasmtime/issues/4933
                 (
@@ -757,7 +745,7 @@ fn valid_for_target(triple: &Triple, op: Opcode, args: &[Type], rets: &[Type]) -
                 (
                     Opcode::FcvtToUintSat | Opcode::FcvtToSintSat,
                     &[F32 | F64],
-                    &[I128]
+                    &[I8 | I16 | I128]
                 ),
                 // https://github.com/bytecodealliance/wasmtime/issues/5528
                 (
@@ -1133,45 +1121,6 @@ enum BlockTerminatorKind {
     TailCallIndirect,
 }
 
-/// Alias Analysis Category
-///
-/// Our alias analysis pass supports 4 categories of accesses to distinguish
-/// different regions. The "Other" region is the general case, and is the default
-/// Although they have highly suggestive names there is no difference between any
-/// of the categories.
-///
-/// We assign each stack slot a category when we first generate them, and then
-/// ensure that all accesses to that stack slot are correctly tagged. We already
-/// ensure that memory accesses never cross stack slots, so there is no risk
-/// of a memory access being tagged with the wrong category.
-#[derive(Debug, PartialEq, Clone, Copy)]
-enum AACategory {
-    Other,
-    Heap,
-    Table,
-    VmCtx,
-}
-
-impl AACategory {
-    pub fn all() -> &'static [Self] {
-        &[
-            AACategory::Other,
-            AACategory::Heap,
-            AACategory::Table,
-            AACategory::VmCtx,
-        ]
-    }
-
-    pub fn update_memflags(&self, flags: &mut MemFlags) {
-        match self {
-            AACategory::Other => {}
-            AACategory::Heap => flags.set_heap(),
-            AACategory::Table => flags.set_table(),
-            AACategory::VmCtx => flags.set_vmctx(),
-        }
-    }
-}
-
 #[derive(Default)]
 struct Resources {
     vars: HashMap<Type, Vec<Variable>>,
@@ -1179,10 +1128,7 @@ struct Resources {
     blocks_without_params: Vec<Block>,
     block_terminators: Vec<BlockTerminator>,
     func_refs: Vec<(Signature, SigRef, FuncRef)>,
-    /// This field is required to be sorted by stack slot size at all times.
-    /// We use this invariant when searching for stack slots with a given size.
-    /// See [FunctionGenerator::stack_slot_with_size]
-    stack_slots: Vec<(StackSlot, StackSize, AACategory)>,
+    stack_slots: Vec<(StackSlot, StackSize)>,
     usercalls: Vec<(UserExternalName, Signature)>,
     libcalls: Vec<LibCall>,
 }
@@ -1265,11 +1211,11 @@ where
     }
 
     /// Finds a stack slot with size of at least n bytes
-    fn stack_slot_with_size(&mut self, n: u32) -> Result<(StackSlot, StackSize, AACategory)> {
+    fn stack_slot_with_size(&mut self, n: u32) -> Result<(StackSlot, StackSize)> {
         let first = self
             .resources
             .stack_slots
-            .partition_point(|&(_slot, size, _category)| size < n);
+            .partition_point(|&(_slot, size)| size < n);
         Ok(*self.u.choose(&self.resources.stack_slots[first..])?)
     }
 
@@ -1290,11 +1236,11 @@ where
         builder: &mut FunctionBuilder,
         min_size: u32,
         aligned: bool,
-    ) -> Result<(Value, u32, AACategory)> {
+    ) -> Result<(Value, u32)> {
         // TODO: Currently our only source of addresses is stack_addr, but we
         // should add global_value, symbol_value eventually
-        let (addr, available_size, category) = {
-            let (ss, slot_size, category) = self.stack_slot_with_size(min_size)?;
+        let (addr, available_size) = {
+            let (ss, slot_size) = self.stack_slot_with_size(min_size)?;
 
             // stack_slot_with_size guarantees that slot_size >= min_size
             let max_offset = slot_size - min_size;
@@ -1306,7 +1252,7 @@ where
 
             let base_addr = builder.ins().stack_addr(I64, ss, offset as i32);
             let available_size = slot_size.saturating_sub(offset);
-            (base_addr, available_size, category)
+            (base_addr, available_size)
         };
 
         // TODO: Insert a bunch of amode opcodes here to modify the address!
@@ -1314,7 +1260,7 @@ where
         // Now that we have an address and a size, we just choose a random offset to return to the
         // caller. Preserving min_size bytes.
         let max_offset = available_size.saturating_sub(min_size);
-        Ok((addr, max_offset, category))
+        Ok((addr, max_offset))
     }
 
     // Generates an address and memflags for a load or store.
@@ -1354,11 +1300,7 @@ where
             flags.set_notrap();
         }
 
-        let (address, max_offset, category) =
-            self.generate_load_store_address(builder, min_size, aligned)?;
-
-        // Set the Alias Analysis bits on the memflags
-        category.update_memflags(&mut flags);
+        let (address, max_offset) = self.generate_load_store_address(builder, min_size, aligned)?;
 
         // Pick an offset to pass into the load/store.
         let offset = if aligned {
@@ -1594,16 +1536,12 @@ where
             let bytes = self.param(&self.config.static_stack_slot_size)? as u32;
             let ss_data = StackSlotData::new(StackSlotKind::ExplicitSlot, bytes);
             let slot = builder.create_sized_stack_slot(ss_data);
-
-            // Generate one Alias Analysis Category for each slot
-            let category = *self.u.choose(AACategory::all())?;
-
-            self.resources.stack_slots.push((slot, bytes, category));
+            self.resources.stack_slots.push((slot, bytes));
         }
 
         self.resources
             .stack_slots
-            .sort_unstable_by_key(|&(_slot, bytes, _category)| bytes);
+            .sort_unstable_by_key(|&(_slot, bytes)| bytes);
 
         Ok(())
     }
@@ -1616,7 +1554,7 @@ where
         let i64_zero = builder.ins().iconst(I64, 0);
         let i128_zero = builder.ins().uextend(I128, i64_zero);
 
-        for &(slot, init_size, category) in self.resources.stack_slots.iter() {
+        for &(slot, init_size) in self.resources.stack_slots.iter() {
             let mut size = init_size;
 
             // Insert the largest available store for the remaining size.
@@ -1629,16 +1567,7 @@ where
                     sz if sz / 2 > 0 => (i16_zero, 2),
                     _ => (i8_zero, 1),
                 };
-                let addr = builder.ins().stack_addr(I64, slot, offset);
-
-                // Each stack slot has an associated category, that means we have to set the
-                // correct memflags for it. So we can't use `stack_store` directly.
-                let mut flags = MemFlags::new();
-                flags.set_notrap();
-                category.update_memflags(&mut flags);
-
-                builder.ins().store(flags, val, addr, 0);
-
+                builder.ins().stack_store(val, slot, offset);
                 size -= filled;
             }
         }
diff --git a/cranelift/interpreter/Cargo.toml b/cranelift/interpreter/Cargo.toml
index 728148e49ef0..01da71ed791e 100644
--- a/cranelift/interpreter/Cargo.toml
+++ b/cranelift/interpreter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-interpreter"
-version = "0.102.0"
+version = "0.101.0"
 authors = ["The Cranelift Project Developers"]
 description = "Interpret Cranelift IR"
 repository = "https://github.com/bytecodealliance/wasmtime"
diff --git a/cranelift/isle/docs/language-reference.md b/cranelift/isle/docs/language-reference.md
index 8f0f346c159b..cb3cadbe267a 100644
--- a/cranelift/isle/docs/language-reference.md
+++ b/cranelift/isle/docs/language-reference.md
@@ -987,7 +987,7 @@ evaluate the expression (`EXPR2` or `EXPR3` above) first. An
 expression in an if-let context is allowed to be "fallible": the
 constructors return `Option<T>` at the Rust level and can return
 `None`, in which case the whole rule application fails and we move on
-to the next rule as if the main pattern had failed to match. (More on
+to the next rule as if the main pattern had failed to match. (MOre on
 the fallible constructors below.) If the expression evaluation
 succeeds, we match the associated pattern (`PAT2` or `PAT3` above)
 against the resulting value. This too can fail, causing the whole rule
diff --git a/cranelift/isle/isle/Cargo.toml b/cranelift/isle/isle/Cargo.toml
index 44d555583118..db802bf0f06d 100644
--- a/cranelift/isle/isle/Cargo.toml
+++ b/cranelift/isle/isle/Cargo.toml
@@ -6,7 +6,7 @@ license = "Apache-2.0 WITH LLVM-exception"
 name = "cranelift-isle"
 readme = "../README.md"
 repository = "https://github.com/bytecodealliance/wasmtime/tree/main/cranelift/isle"
-version = "0.102.0"
+version = "0.101.0"
 
 [dependencies]
 codespan-reporting = { version = "0.11.1", optional = true }
diff --git a/cranelift/isle/islec/Cargo.toml b/cranelift/isle/islec/Cargo.toml
index 340c2aafdeef..96dee85792e7 100644
--- a/cranelift/isle/islec/Cargo.toml
+++ b/cranelift/isle/islec/Cargo.toml
@@ -9,4 +9,4 @@ publish = false
 [dependencies]
 cranelift-isle = { version = "*", path = "../isle/", features = ["fancy-errors", "logging"] }
 env_logger = { workspace = true }
-clap = { workspace = true, features = ['default'] }
+clap = { workspace = true }
diff --git a/cranelift/jit/Cargo.toml b/cranelift/jit/Cargo.toml
index eb137461b220..0d367c7a32cd 100644
--- a/cranelift/jit/Cargo.toml
+++ b/cranelift/jit/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-jit"
-version = "0.102.0"
+version = "0.101.0"
 authors = ["The Cranelift Project Developers"]
 description = "A JIT library backed by Cranelift"
 repository = "https://github.com/bytecodealliance/wasmtime"
diff --git a/cranelift/jit/src/backend.rs b/cranelift/jit/src/backend.rs
index f04b89d84cce..438c60d49e27 100644
--- a/cranelift/jit/src/backend.rs
+++ b/cranelift/jit/src/backend.rs
@@ -712,7 +712,7 @@ impl Module for JITModule {
             .buffer
             .relocs()
             .iter()
-            .map(|reloc| ModuleReloc::from_mach_reloc(reloc, &ctx.func, id))
+            .map(|reloc| ModuleReloc::from_mach_reloc(reloc, &ctx.func))
             .collect();
 
         self.record_function_for_perf(ptr, size, &decl.linkage_name(id));
@@ -797,7 +797,7 @@ impl Module for JITModule {
             size,
             relocs: relocs
                 .iter()
-                .map(|reloc| ModuleReloc::from_mach_reloc(reloc, func, id))
+                .map(|reloc| ModuleReloc::from_mach_reloc(reloc, func))
                 .collect(),
         });
 
diff --git a/cranelift/jit/src/compiled_blob.rs b/cranelift/jit/src/compiled_blob.rs
index f4f134023ea2..de01855c6d7b 100644
--- a/cranelift/jit/src/compiled_blob.rs
+++ b/cranelift/jit/src/compiled_blob.rs
@@ -93,8 +93,8 @@ impl CompiledBlob {
                     let imm26 = (diff as u32) << chop >> chop;
                     unsafe { modify_inst32(iptr, |inst| inst | imm26) };
                 }
-                Reloc::RiscvCallPlt => {
-                    // A R_RISCV_CALL_PLT relocation expects auipc+jalr instruction pair.
+                Reloc::RiscvCall => {
+                    // A R_RISCV_CALL relocation expects auipc+jalr instruction pair.
                     // It is the equivalent of two relocations:
                     // 1. R_RISCV_PCREL_HI20 on the `auipc`
                     // 2. R_RISCV_PCREL_LO12_I on the `jalr`
diff --git a/cranelift/module/Cargo.toml b/cranelift/module/Cargo.toml
index ad92ca3e5465..e89a1e20ed61 100644
--- a/cranelift/module/Cargo.toml
+++ b/cranelift/module/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-module"
-version = "0.102.0"
+version = "0.101.0"
 authors = ["The Cranelift Project Developers"]
 description = "Support for linking functions and data with Cranelift"
 repository = "https://github.com/bytecodealliance/wasmtime"
diff --git a/cranelift/module/src/module.rs b/cranelift/module/src/module.rs
index 76661fd86481..cae49ef17e97 100644
--- a/cranelift/module/src/module.rs
+++ b/cranelift/module/src/module.rs
@@ -11,7 +11,7 @@ use core::fmt::Display;
 use cranelift_codegen::binemit::{CodeOffset, Reloc};
 use cranelift_codegen::entity::{entity_impl, PrimaryMap};
 use cranelift_codegen::ir::function::{Function, VersionMarker};
-use cranelift_codegen::ir::ExternalName;
+use cranelift_codegen::ir::{ExternalName, UserFuncName};
 use cranelift_codegen::settings::SetError;
 use cranelift_codegen::{
     ir, isa, CodegenError, CompileError, Context, FinalizedMachReloc, FinalizedRelocTarget,
@@ -36,11 +36,7 @@ pub struct ModuleReloc {
 
 impl ModuleReloc {
     /// Converts a `FinalizedMachReloc` produced from a `Function` into a `ModuleReloc`.
-    pub fn from_mach_reloc(
-        mach_reloc: &FinalizedMachReloc,
-        func: &Function,
-        func_id: FuncId,
-    ) -> Self {
+    pub fn from_mach_reloc(mach_reloc: &FinalizedMachReloc, func: &Function) -> Self {
         let name = match mach_reloc.target {
             FinalizedRelocTarget::ExternalName(ExternalName::User(reff)) => {
                 let name = &func.params.user_named_funcs()[reff];
@@ -54,7 +50,7 @@ impl ModuleReloc {
                 ModuleRelocTarget::KnownSymbol(ks)
             }
             FinalizedRelocTarget::Func(offset) => {
-                ModuleRelocTarget::FunctionOffset(func_id, offset)
+                ModuleRelocTarget::FunctionOffset(func.name.clone(), offset)
             }
         };
         Self {
@@ -434,7 +430,7 @@ pub enum ModuleRelocTarget {
     /// Symbols known to the linker.
     KnownSymbol(ir::KnownSymbol),
     /// A offset inside a function
-    FunctionOffset(FuncId, CodeOffset),
+    FunctionOffset(UserFuncName, CodeOffset),
 }
 
 impl ModuleRelocTarget {
diff --git a/cranelift/native/Cargo.toml b/cranelift/native/Cargo.toml
index e9410c36e125..b9556a8c589d 100644
--- a/cranelift/native/Cargo.toml
+++ b/cranelift/native/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-native"
-version = "0.102.0"
+version = "0.101.0"
 authors = ["The Cranelift Project Developers"]
 description = "Support for targeting the host with Cranelift"
 documentation = "https://docs.rs/cranelift-native"
diff --git a/cranelift/object/Cargo.toml b/cranelift/object/Cargo.toml
index 33acc617c6ae..5b3260dc950f 100644
--- a/cranelift/object/Cargo.toml
+++ b/cranelift/object/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-object"
-version = "0.102.0"
+version = "0.101.0"
 authors = ["The Cranelift Project Developers"]
 description = "Emit Cranelift output to native object files with `object`"
 repository = "https://github.com/bytecodealliance/wasmtime"
diff --git a/cranelift/object/src/backend.rs b/cranelift/object/src/backend.rs
index a4e60d217e22..d083d84ce12f 100644
--- a/cranelift/object/src/backend.rs
+++ b/cranelift/object/src/backend.rs
@@ -3,6 +3,7 @@
 use anyhow::anyhow;
 use cranelift_codegen::binemit::{Addend, CodeOffset, Reloc};
 use cranelift_codegen::entity::SecondaryMap;
+use cranelift_codegen::ir::UserFuncName;
 use cranelift_codegen::isa::{OwnedTargetIsa, TargetIsa};
 use cranelift_codegen::{self, ir, FinalizedMachReloc};
 use cranelift_control::ControlPlane;
@@ -79,24 +80,11 @@ impl ObjectBuilder {
                         binary_format,
                     )));
                 }
-
-                // FIXME(#4994): Get the right float ABI variant from the TargetIsa
-                let mut eflags = object::elf::EF_RISCV_FLOAT_ABI_DOUBLE;
-
-                // Set the RVC eflag if we have the C extension enabled.
-                let has_c = isa
-                    .isa_flags()
-                    .iter()
-                    .filter(|f| f.name == "has_zca" || f.name == "has_zcd")
-                    .all(|f| f.as_bool().unwrap_or_default());
-                if has_c {
-                    eflags |= object::elf::EF_RISCV_RVC;
-                }
-
+                // FIXME(#4994) get the right variant from the TargetIsa
                 file_flags = object::FileFlags::Elf {
                     os_abi: object::elf::ELFOSABI_NONE,
                     abi_version: 0,
-                    e_flags: eflags,
+                    e_flags: object::elf::EF_RISCV_RVC | object::elf::EF_RISCV_FLOAT_ABI_DOUBLE,
                 };
                 object::Architecture::Riscv64
             }
@@ -144,7 +132,7 @@ pub struct ObjectModule {
     libcalls: HashMap<ir::LibCall, SymbolId>,
     libcall_names: Box<dyn Fn(ir::LibCall) -> String + Send + Sync>,
     known_symbols: HashMap<ir::KnownSymbol, SymbolId>,
-    known_labels: HashMap<(FuncId, CodeOffset), SymbolId>,
+    known_labels: HashMap<(UserFuncName, CodeOffset), SymbolId>,
     per_function_section: bool,
 }
 
@@ -384,9 +372,7 @@ impl Module for ObjectModule {
         if !relocs.is_empty() {
             let relocs = relocs
                 .iter()
-                .map(|record| {
-                    self.process_reloc(&ModuleReloc::from_mach_reloc(&record, func, func_id))
-                })
+                .map(|record| self.process_reloc(&ModuleReloc::from_mach_reloc(&record, func)))
                 .collect();
             self.relocs.push(SymbolRelocs {
                 section,
@@ -608,10 +594,15 @@ impl ObjectModule {
                 }
             }
 
-            ModuleRelocTarget::FunctionOffset(func_id, offset) => {
-                match self.known_labels.entry((func_id, offset)) {
+            ModuleRelocTarget::FunctionOffset(ref fname, offset) => {
+                match self.known_labels.entry((fname.clone(), offset)) {
                     Entry::Occupied(o) => *o.get(),
                     Entry::Vacant(v) => {
+                        let func_user_name = fname.get_user().unwrap();
+                        let func_id = FuncId::from_name(&ModuleRelocTarget::user(
+                            func_user_name.namespace,
+                            func_user_name.index,
+                        ));
                         let func_symbol_id = self.functions[func_id].unwrap().0;
                         let func_symbol = self.object.symbol(func_symbol_id);
 
@@ -718,55 +709,30 @@ impl ObjectModule {
                     12,
                 )
             }
-            Reloc::Aarch64TlsDescAdrPage21 => {
+            Reloc::Aarch64TlsGdAdrPage21 => {
                 assert_eq!(
                     self.object.format(),
                     object::BinaryFormat::Elf,
-                    "Aarch64TlsDescAdrPage21 is not supported for this file format"
+                    "Aarch64TlsGdAdrPrel21 is not supported for this file format"
                 );
                 (
-                    RelocationKind::Elf(object::elf::R_AARCH64_TLSDESC_ADR_PAGE21),
+                    RelocationKind::Elf(object::elf::R_AARCH64_TLSGD_ADR_PAGE21),
                     RelocationEncoding::Generic,
                     21,
                 )
             }
-            Reloc::Aarch64TlsDescLd64Lo12 => {
-                assert_eq!(
-                    self.object.format(),
-                    object::BinaryFormat::Elf,
-                    "Aarch64TlsDescLd64Lo12 is not supported for this file format"
-                );
-                (
-                    RelocationKind::Elf(object::elf::R_AARCH64_TLSDESC_LD64_LO12),
-                    RelocationEncoding::Generic,
-                    12,
-                )
-            }
-            Reloc::Aarch64TlsDescAddLo12 => {
+            Reloc::Aarch64TlsGdAddLo12Nc => {
                 assert_eq!(
                     self.object.format(),
                     object::BinaryFormat::Elf,
-                    "Aarch64TlsDescAddLo12 is not supported for this file format"
+                    "Aarch64TlsGdAddLo12Nc is not supported for this file format"
                 );
                 (
-                    RelocationKind::Elf(object::elf::R_AARCH64_TLSDESC_ADD_LO12),
+                    RelocationKind::Elf(object::elf::R_AARCH64_TLSGD_ADD_LO12_NC),
                     RelocationEncoding::Generic,
                     12,
                 )
             }
-            Reloc::Aarch64TlsDescCall => {
-                assert_eq!(
-                    self.object.format(),
-                    object::BinaryFormat::Elf,
-                    "Aarch64TlsDescCall is not supported for this file format"
-                );
-                (
-                    RelocationKind::Elf(object::elf::R_AARCH64_TLSDESC_CALL),
-                    RelocationEncoding::Generic,
-                    0,
-                )
-            }
-
             Reloc::Aarch64AdrGotPage21 => match self.object.format() {
                 object::BinaryFormat::Elf => (
                     RelocationKind::Elf(object::elf::R_AARCH64_ADR_GOT_PAGE),
@@ -829,14 +795,14 @@ impl ObjectModule {
                     0,
                 )
             }
-            Reloc::RiscvCallPlt => {
+            Reloc::RiscvCall => {
                 assert_eq!(
                     self.object.format(),
                     object::BinaryFormat::Elf,
-                    "RiscvCallPlt is not supported for this file format"
+                    "RiscvCall is not supported for this file format"
                 );
                 (
-                    RelocationKind::Elf(object::elf::R_RISCV_CALL_PLT),
+                    RelocationKind::Elf(object::elf::R_RISCV_CALL),
                     RelocationEncoding::Generic,
                     0,
                 )
@@ -865,18 +831,6 @@ impl ObjectModule {
                     0,
                 )
             }
-            Reloc::RiscvGotHi20 => {
-                assert_eq!(
-                    self.object.format(),
-                    object::BinaryFormat::Elf,
-                    "RiscvGotHi20 is not supported for this file format"
-                );
-                (
-                    RelocationKind::Elf(object::elf::R_RISCV_GOT_HI20),
-                    RelocationEncoding::Generic,
-                    0,
-                )
-            }
             // FIXME
             reloc => unimplemented!("{:?}", reloc),
         };
diff --git a/cranelift/reader/Cargo.toml b/cranelift/reader/Cargo.toml
index b45218fa0122..36f77d6cb7fb 100644
--- a/cranelift/reader/Cargo.toml
+++ b/cranelift/reader/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-reader"
-version = "0.102.0"
+version = "0.101.0"
 description = "Cranelift textual IR reader"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-reader"
diff --git a/cranelift/reader/src/lexer.rs b/cranelift/reader/src/lexer.rs
index a738096af5d5..e2c80cf93db9 100644
--- a/cranelift/reader/src/lexer.rs
+++ b/cranelift/reader/src/lexer.rs
@@ -28,7 +28,7 @@ pub enum Token<'a> {
     Dot,                   // '.'
     Colon,                 // ':'
     Equal,                 // '='
-    Bang,                  // '!'
+    Not,                   // '!'
     Arrow,                 // '->'
     Float(&'a str),        // Floating point immediate
     Integer(&'a str),      // Integer immediate
@@ -40,7 +40,6 @@ pub enum Token<'a> {
     StackSlot(u32),        // ss3
     DynamicStackSlot(u32), // dss4
     GlobalValue(u32),      // gv3
-    MemoryType(u32),       // mt0
     Table(u32),            // table2
     Constant(u32),         // const2
     FuncRef(u32),          // fn2
@@ -345,7 +344,6 @@ impl<'a> Lexer<'a> {
             "dss" => Some(Token::DynamicStackSlot(number)),
             "dt" => Some(Token::DynamicType(number)),
             "gv" => Some(Token::GlobalValue(number)),
-            "mt" => Some(Token::MemoryType(number)),
             "table" => Some(Token::Table(number)),
             "const" => Some(Token::Constant(number)),
             "fn" => Some(Token::FuncRef(number)),
@@ -476,7 +474,7 @@ impl<'a> Lexer<'a> {
                 Some('.') => Some(self.scan_char(Token::Dot)),
                 Some(':') => Some(self.scan_char(Token::Colon)),
                 Some('=') => Some(self.scan_char(Token::Equal)),
-                Some('!') => Some(self.scan_char(Token::Bang)),
+                Some('!') => Some(self.scan_char(Token::Not)),
                 Some('+') => Some(self.scan_number()),
                 Some('*') => Some(self.scan_char(Token::Multiply)),
                 Some('-') => {
diff --git a/cranelift/reader/src/parser.rs b/cranelift/reader/src/parser.rs
index dbd84d857213..28b6ae18600c 100644
--- a/cranelift/reader/src/parser.rs
+++ b/cranelift/reader/src/parser.rs
@@ -9,10 +9,9 @@ use crate::testcommand::TestCommand;
 use crate::testfile::{Comment, Details, Feature, TestFile};
 use cranelift_codegen::data_value::DataValue;
 use cranelift_codegen::entity::{EntityRef, PrimaryMap};
-use cranelift_codegen::ir::entities::{AnyEntity, DynamicType, MemoryType};
+use cranelift_codegen::ir::entities::{AnyEntity, DynamicType};
 use cranelift_codegen::ir::immediates::{Ieee32, Ieee64, Imm64, Offset32, Uimm32, Uimm64};
 use cranelift_codegen::ir::instructions::{InstructionData, InstructionFormat, VariableArgs};
-use cranelift_codegen::ir::pcc::Fact;
 use cranelift_codegen::ir::types;
 use cranelift_codegen::ir::types::INVALID;
 use cranelift_codegen::ir::types::*;
@@ -20,9 +19,8 @@ use cranelift_codegen::ir::{self, UserExternalNameRef};
 use cranelift_codegen::ir::{
     AbiParam, ArgumentExtension, ArgumentPurpose, Block, Constant, ConstantData, DynamicStackSlot,
     DynamicStackSlotData, DynamicTypeData, ExtFuncData, ExternalName, FuncRef, Function,
-    GlobalValue, GlobalValueData, JumpTableData, MemFlags, MemoryTypeData, MemoryTypeField, Opcode,
-    SigRef, Signature, StackSlot, StackSlotData, StackSlotKind, Table, TableData, Type,
-    UserFuncName, Value,
+    GlobalValue, GlobalValueData, JumpTableData, MemFlags, Opcode, SigRef, Signature, StackSlot,
+    StackSlotData, StackSlotKind, Table, TableData, Type, UserFuncName, Value,
 };
 use cranelift_codegen::isa::{self, CallConv};
 use cranelift_codegen::packed_option::ReservedValue;
@@ -305,13 +303,7 @@ impl Context {
     }
 
     // Allocate a global value slot.
-    fn add_gv(
-        &mut self,
-        gv: GlobalValue,
-        data: GlobalValueData,
-        maybe_fact: Option<Fact>,
-        loc: Location,
-    ) -> ParseResult<()> {
+    fn add_gv(&mut self, gv: GlobalValue, data: GlobalValueData, loc: Location) -> ParseResult<()> {
         self.map.def_gv(gv, loc)?;
         while self.function.global_values.next_key().index() <= gv.index() {
             self.function.create_global_value(GlobalValueData::Symbol {
@@ -322,19 +314,6 @@ impl Context {
             });
         }
         self.function.global_values[gv] = data;
-        if let Some(fact) = maybe_fact {
-            self.function.global_value_facts[gv] = Some(fact);
-        }
-        Ok(())
-    }
-
-    // Allocate a memory-type slot.
-    fn add_mt(&mut self, mt: MemoryType, data: MemoryTypeData, loc: Location) -> ParseResult<()> {
-        self.map.def_mt(mt, loc)?;
-        while self.function.memory_types.next_key().index() <= mt.index() {
-            self.function.create_memory_type(MemoryTypeData::default());
-        }
-        self.function.memory_types[mt] = data;
         Ok(())
     }
 
@@ -676,17 +655,6 @@ impl<'a> Parser<'a> {
         err!(self.loc, err_msg)
     }
 
-    // Match and consume a memory-type reference.
-    fn match_mt(&mut self, err_msg: &str) -> ParseResult<MemoryType> {
-        if let Some(Token::MemoryType(mt)) = self.token() {
-            self.consume();
-            if let Some(mt) = MemoryType::with_number(mt) {
-                return Ok(mt);
-            }
-        }
-        err!(self.loc, err_msg)
-    }
-
     // Match and consume a constant reference.
     fn match_constant(&mut self) -> ParseResult<Constant> {
         if let Some(Token::Constant(c)) = self.token() {
@@ -1167,7 +1135,7 @@ impl<'a> Parser<'a> {
         let mut list = Vec::new();
         while self.token() == Some(Token::Identifier("feature")) {
             self.consume();
-            let has = !self.optional(Token::Bang);
+            let has = !self.optional(Token::Not);
             match (self.token(), has) {
                 (Some(Token::String(flag)), true) => list.push(Feature::With(flag)),
                 (Some(Token::String(flag)), false) => list.push(Feature::Without(flag)),
@@ -1477,12 +1445,7 @@ impl<'a> Parser<'a> {
                 Some(Token::GlobalValue(..)) => {
                     self.start_gathering_comments();
                     self.parse_global_value_decl()
-                        .and_then(|(gv, dat, maybe_fact)| ctx.add_gv(gv, dat, maybe_fact, self.loc))
-                }
-                Some(Token::MemoryType(..)) => {
-                    self.start_gathering_comments();
-                    self.parse_memory_type_decl()
-                        .and_then(|(mt, dat)| ctx.add_mt(mt, dat, self.loc))
+                        .and_then(|(gv, dat)| ctx.add_gv(gv, dat, self.loc))
                 }
                 Some(Token::Table(..)) => {
                     self.start_gathering_comments();
@@ -1583,25 +1546,16 @@ impl<'a> Parser<'a> {
 
     // Parse a global value decl.
     //
-    // global-val-decl ::= * GlobalValue(gv) [ "!" fact ] "=" global-val-desc
+    // global-val-decl ::= * GlobalValue(gv) "=" global-val-desc
     // global-val-desc ::= "vmctx"
     //                   | "load" "." type "notrap" "aligned" GlobalValue(base) [offset]
     //                   | "iadd_imm" "(" GlobalValue(base) ")" imm64
     //                   | "symbol" ["colocated"] name + imm64
     //                   | "dyn_scale_target_const" "." type
     //
-    fn parse_global_value_decl(
-        &mut self,
-    ) -> ParseResult<(GlobalValue, GlobalValueData, Option<Fact>)> {
+    fn parse_global_value_decl(&mut self) -> ParseResult<(GlobalValue, GlobalValueData)> {
         let gv = self.match_gv("expected global value number: gv«n»")?;
 
-        let fact = if self.token() == Some(Token::Bang) {
-            self.consume();
-            Some(self.parse_fact()?)
-        } else {
-            None
-        };
-
         self.match_token(Token::Equal, "expected '=' in global value declaration")?;
 
         let data = match self.match_any_identifier("expected global value kind")? {
@@ -1623,7 +1577,7 @@ impl<'a> Parser<'a> {
                     base,
                     offset,
                     global_type,
-                    flags,
+                    readonly: flags.readonly(),
                 }
             }
             "iadd_imm" => {
@@ -1672,100 +1626,7 @@ impl<'a> Parser<'a> {
         self.token();
         self.claim_gathered_comments(gv);
 
-        Ok((gv, data, fact))
-    }
-
-    // Parse one field definition in a memory-type struct decl.
-    //
-    // memory-type-field ::=  offset ":" type ["readonly"] [ "!" fact ]
-    // offset ::= uimm64
-    fn parse_memory_type_field(&mut self) -> ParseResult<MemoryTypeField> {
-        let offset: u64 = self
-            .match_uimm64(
-                "expected u64 constant value for field offset in struct memory-type declaration",
-            )?
-            .into();
-        self.match_token(
-            Token::Colon,
-            "expected colon after field offset in struct memory-type declaration",
-        )?;
-        let ty = self.match_type("expected type for field in struct memory-type declaration")?;
-        let readonly = if self.token() == Some(Token::Identifier("readonly")) {
-            self.consume();
-            true
-        } else {
-            false
-        };
-        let fact = if self.token() == Some(Token::Bang) {
-            self.consume();
-            let fact = self.parse_fact()?;
-            Some(fact)
-        } else {
-            None
-        };
-        Ok(MemoryTypeField {
-            offset,
-            ty,
-            readonly,
-            fact,
-        })
-    }
-
-    // Parse a memory-type decl.
-    //
-    // memory-type-decl ::= MemoryType(mt) "=" memory-type-desc
-    // memory-type-desc ::= "struct" size "{" memory-type-field,* "}"
-    //                    | "memory" size
-    //                    | "empty"
-    // size ::= uimm64
-    fn parse_memory_type_decl(&mut self) -> ParseResult<(MemoryType, MemoryTypeData)> {
-        let mt = self.match_mt("expected memory type number: mt«n»")?;
-        self.match_token(Token::Equal, "expected '=' in memory type declaration")?;
-
-        let data = match self.token() {
-            Some(Token::Identifier("struct")) => {
-                self.consume();
-                let size: u64 = self.match_uimm64("expected u64 constant value for struct size in struct memory-type declaration")?.into();
-                self.match_token(Token::LBrace, "expected opening brace to start struct fields in struct memory-type declaration")?;
-                let mut fields = vec![];
-                while self.token() != Some(Token::RBrace) {
-                    let field = self.parse_memory_type_field()?;
-                    fields.push(field);
-                    if self.token() == Some(Token::Comma) {
-                        self.consume();
-                    } else {
-                        break;
-                    }
-                }
-                self.match_token(
-                    Token::RBrace,
-                    "expected closing brace after struct fields in struct memory-type declaration",
-                )?;
-                MemoryTypeData::Struct { size, fields }
-            }
-            Some(Token::Identifier("memory")) => {
-                self.consume();
-                let size: u64 = self.match_uimm64("expected u64 constant value for size in static-memory memory-type declaration")?.into();
-                MemoryTypeData::Memory { size }
-            }
-            Some(Token::Identifier("empty")) => {
-                self.consume();
-                MemoryTypeData::Empty
-            }
-            other => {
-                return err!(
-                    self.loc,
-                    "Unknown memory type declaration kind '{:?}'",
-                    other
-                )
-            }
-        };
-
-        // Collect any trailing comments.
-        self.token();
-        self.claim_gathered_comments(mt);
-
-        Ok((mt, data))
+        Ok((gv, data))
     }
 
     // Parse a table decl.
@@ -2082,7 +1943,7 @@ impl<'a> Parser<'a> {
             // between the parsing of value aliases and the parsing of instructions.
             //
             // inst-results ::= Value(v) { "," Value(v) }
-            let results = self.parse_inst_results(ctx)?;
+            let results = self.parse_inst_results()?;
 
             for result in &results {
                 while ctx.function.dfg.num_values() <= result.index() {
@@ -2132,23 +1993,16 @@ impl<'a> Parser<'a> {
 
     // Parse a single block parameter declaration, and append it to `block`.
     //
-    // block-param ::= * Value(v) [ "!" fact ]  ":" Type(t) arg-loc?
+    // block-param ::= * Value(v) ":" Type(t) arg-loc?
     // arg-loc ::= "[" value-location "]"
     //
     fn parse_block_param(&mut self, ctx: &mut Context, block: Block) -> ParseResult<()> {
-        // block-param ::= * Value(v) [ "!" fact ] ":" Type(t) arg-loc?
+        // block-param ::= * Value(v) ":" Type(t) arg-loc?
         let v = self.match_value("block argument must be a value")?;
         let v_location = self.loc;
-        // block-param ::= Value(v) * [ "!" fact ]  ":" Type(t) arg-loc?
-        let fact = if self.token() == Some(Token::Bang) {
-            self.consume();
-            // block-param ::= Value(v) [ "!" * fact ]  ":" Type(t) arg-loc?
-            Some(self.parse_fact()?)
-        } else {
-            None
-        };
+        // block-param ::= Value(v) * ":" Type(t) arg-loc?
         self.match_token(Token::Colon, "expected ':' after block argument")?;
-        // block-param ::= Value(v) [ "!" fact ] ":" * Type(t) arg-loc?
+        // block-param ::= Value(v) ":" * Type(t) arg-loc?
 
         while ctx.function.dfg.num_values() <= v.index() {
             ctx.function.dfg.make_invalid_value_for_parser();
@@ -2158,99 +2012,15 @@ impl<'a> Parser<'a> {
         // Allocate the block argument.
         ctx.function.dfg.append_block_param_for_parser(block, t, v);
         ctx.map.def_value(v, v_location)?;
-        ctx.function.dfg.facts[v] = fact;
 
         Ok(())
     }
 
-    // Parse a "fact" for proof-carrying code, attached to a value.
-    //
-    // fact ::= "range" "(" bit-width "," min-value "," max-value ")"
-    //        | "mem" "(" memory-type "," mt-offset "," mt-offset ")"
-    //        | "conflict"
-    // bit-width ::= uimm64
-    // min-value ::= uimm64
-    // max-value ::= uimm64
-    // valid-range ::= uimm64
-    // mt-offset ::= uimm64
-    fn parse_fact(&mut self) -> ParseResult<Fact> {
-        match self.token() {
-            Some(Token::Identifier("range")) => {
-                self.consume();
-                self.match_token(Token::LPar, "`range` fact needs an opening `(`")?;
-                let bit_width: u64 = self
-                    .match_uimm64("expected a bit-width value for `range` fact")?
-                    .into();
-                self.match_token(Token::Comma, "expected a comma")?;
-                let min: u64 = self
-                    .match_uimm64("expected a min value for `range` fact")?
-                    .into();
-                self.match_token(Token::Comma, "expected a comma")?;
-                let max: u64 = self
-                    .match_uimm64("expected a max value for `range` fact")?
-                    .into();
-                self.match_token(Token::RPar, "`range` fact needs a closing `)`")?;
-                let bit_width_max = match bit_width {
-                    x if x > 64 => {
-                        return Err(self.error("bitwidth must be <= 64 bits on a `range` fact"));
-                    }
-                    64 => u64::MAX,
-                    x => (1u64 << x) - 1,
-                };
-                if min > max {
-                    return Err(self.error(
-                        "min value must be less than or equal to max value on a `range` fact",
-                    ));
-                }
-                if max > bit_width_max {
-                    return Err(
-                        self.error("max value is out of range for bitwidth on a `range` fact")
-                    );
-                }
-                Ok(Fact::Range {
-                    bit_width: u16::try_from(bit_width).unwrap(),
-                    min: min.into(),
-                    max: max.into(),
-                })
-            }
-            Some(Token::Identifier("mem")) => {
-                self.consume();
-                self.match_token(Token::LPar, "expected a `(`")?;
-                let ty = self.match_mt("expected a memory type for `mem` fact")?;
-                self.match_token(
-                    Token::Comma,
-                    "expected a comma after memory type in `mem` fact",
-                )?;
-                let min_offset: u64 = self
-                    .match_uimm64("expected a uimm64 minimum pointer offset for `mem` fact")?
-                    .into();
-                self.match_token(
-                    Token::Comma,
-                    "expected a comma after memory type in `mem` fact",
-                )?;
-                let max_offset: u64 = self
-                    .match_uimm64("expected a uimm64 maximum pointer offset for `mem` fact")?
-                    .into();
-                self.match_token(Token::RPar, "expected a `)`")?;
-                Ok(Fact::Mem {
-                    ty,
-                    min_offset,
-                    max_offset,
-                })
-            }
-            Some(Token::Identifier("conflict")) => {
-                self.consume();
-                Ok(Fact::Conflict)
-            }
-            _ => Err(self.error("expected a `range`, `mem` or `conflict` fact")),
-        }
-    }
-
     // Parse instruction results and return them.
     //
     // inst-results ::= Value(v) { "," Value(v) }
     //
-    fn parse_inst_results(&mut self, ctx: &mut Context) -> ParseResult<SmallVec<[Value; 1]>> {
+    fn parse_inst_results(&mut self) -> ParseResult<SmallVec<[Value; 1]>> {
         // Result value numbers.
         let mut results = SmallVec::new();
 
@@ -2261,29 +2031,10 @@ impl<'a> Parser<'a> {
 
             results.push(v);
 
-            let fact = if self.token() == Some(Token::Bang) {
-                self.consume();
-                // block-param ::= Value(v) [ "!" * fact ]  ":" Type(t) arg-loc?
-                Some(self.parse_fact()?)
-            } else {
-                None
-            };
-            ctx.function.dfg.facts[v] = fact;
-
             // inst-results ::= Value(v) * { "," Value(v) }
             while self.optional(Token::Comma) {
                 // inst-results ::= Value(v) { "," * Value(v) }
-                let v = self.match_value("expected result value")?;
-                results.push(v);
-
-                let fact = if self.token() == Some(Token::Bang) {
-                    self.consume();
-                    // block-param ::= Value(v) [ "!" * fact ]  ":" Type(t) arg-loc?
-                    Some(self.parse_fact()?)
-                } else {
-                    None
-                };
-                ctx.function.dfg.facts[v] = fact;
+                results.push(self.match_value("expected result value")?);
             }
         }
 
@@ -2617,7 +2368,7 @@ impl<'a> Parser<'a> {
         if self.optional(Token::Equal) {
             self.match_token(Token::Equal, "expected another =")?;
             Ok(Comparison::Equals)
-        } else if self.optional(Token::Bang) {
+        } else if self.optional(Token::Not) {
             self.match_token(Token::Equal, "expected a =")?;
             Ok(Comparison::NotEquals)
         } else {
diff --git a/cranelift/reader/src/sourcemap.rs b/cranelift/reader/src/sourcemap.rs
index 99b55b9cb97a..d8c21ebb10b5 100644
--- a/cranelift/reader/src/sourcemap.rs
+++ b/cranelift/reader/src/sourcemap.rs
@@ -10,8 +10,8 @@ use crate::error::{Location, ParseResult};
 use crate::lexer::split_entity_name;
 use cranelift_codegen::ir::entities::{AnyEntity, DynamicType};
 use cranelift_codegen::ir::{
-    Block, Constant, DynamicStackSlot, FuncRef, GlobalValue, JumpTable, MemoryType, SigRef,
-    StackSlot, Table, Value,
+    Block, Constant, DynamicStackSlot, FuncRef, GlobalValue, JumpTable, SigRef, StackSlot, Table,
+    Value,
 };
 use std::collections::HashMap;
 
@@ -182,11 +182,6 @@ impl SourceMap {
         self.def_entity(entity.into(), loc)
     }
 
-    /// Define the memory type `entity`.
-    pub fn def_mt(&mut self, entity: MemoryType, loc: Location) -> ParseResult<()> {
-        self.def_entity(entity.into(), loc)
-    }
-
     /// Define the table `entity`.
     pub fn def_table(&mut self, entity: Table, loc: Location) -> ParseResult<()> {
         self.def_entity(entity.into(), loc)
diff --git a/cranelift/run-souper.sh b/cranelift/run-souper.sh
deleted file mode 100755
index 8643379f0f19..000000000000
--- a/cranelift/run-souper.sh
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/env bash
-
-# Runs Souper on the LHSes that were harvested by `clif-util
-# souper-harvest`.
-#
-# This script takes two inputs:
-#
-# 1. The `souper-check` binary, and
-# 2. The  directory of harvested  left-hand sides  (aka the `-o  $directory` you
-#    specified to `clif-util souper-harvest`).
-#
-# For a left-hand side file `foo` that Souper successfully synthesized a
-# right-hand side for, this script will write the whole optimization to a
-# sibling file named `foo.result`.
-#
-# The left-hand sides are processed in smallest-to-largest order. This helps
-# give you initial results more quickly, but does mean that progress will slow
-# down as we encounter larger and larger left-hand sides.
-#
-# Usage:
-#
-#     run-souper.sh path/to/souper-check path/to/left-hand-sides
-
-set -e
-
-# Knobs for configuring how large of right-hand sides Souper should try to
-# generate and how much time we give it to synthesize a result. Feel free to
-# play with these!
-MAX_INSTS=3
-TIMEOUT=5s
-
-# Run Souper on one left-hand side.
-function run_one {
-    local souper=$1
-    local lhs=$2
-    local rhs="$lhs".result
-
-    if [[ -f "$rhs" ]]; then
-        return
-    fi
-
-    local temp=$(mktemp)
-    local cmd="taskset --cpu-list 0-3 $souper --infer-rhs -souper-enumerative-synthesis-max-instructions=$MAX_INSTS $lhs > $temp"
-
-    set +e
-    $(which timeout) --foreground --kill-after=1s $TIMEOUT bash -c "$cmd"
-    local exit_code="$?"
-    set -e
-
-    case "$exit_code" in
-        "0")
-            # Success! Copy the RHS to its final destination.
-            cp $lhs $rhs
-            cat "$temp" >> "$rhs"
-            ;;
-
-        # SIGINT. Exit this whole script.
-        "130")
-            exit 1
-            ;;
-
-        # Timeout (regular).
-        "124")
-            return
-            ;;
-
-        # Timeout (with SIGKILL).
-        "137")
-            return
-            ;;
-
-        # Something else.
-        *)
-            exit 1
-    esac
-
-}
-
-# Run Souper on all the left-hand sides.
-function main {
-    local souper=$1
-    local lhs_dir=$2
-    local lhs_count=$(ls -1 $lhs_dir | grep -v result | wc -l)
-
-    echo "Processing $lhs_count left-hand sides."
-
-    cd "$lhs_dir"
-
-    local i=0;
-    for lhs in $(ls -1S $lhs_dir); do
-        # Ignore '.result' files.
-        if $(echo "$lhs" | grep -q result); then
-            continue;
-        fi
-
-        i=$(( $i + 1 ))
-        if (( $i % 5 == 0 )); then
-            local percent=$(( $i * 100 / $lhs_count ))
-            echo "$i / $lhs_count ($percent%)"
-        fi
-
-        run_one "$souper" "$lhs"
-    done
-
-    echo "Done!"
-}
-
-# Kick everything off!
-main $1 $2
diff --git a/cranelift/serde/Cargo.toml b/cranelift/serde/Cargo.toml
index c2e10d7ce7ec..e19cdfaa6826 100644
--- a/cranelift/serde/Cargo.toml
+++ b/cranelift/serde/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-serde"
-version = "0.102.0"
+version = "0.101.0"
 authors = ["The Cranelift Project Developers"]
 description = "Serializer/Deserializer for Cranelift IR"
 repository = "https://github.com/bytecodealliance/wasmtime"
diff --git a/cranelift/umbrella/Cargo.toml b/cranelift/umbrella/Cargo.toml
index 4c84099717ab..b3ed56f1404c 100644
--- a/cranelift/umbrella/Cargo.toml
+++ b/cranelift/umbrella/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift"
-version = "0.102.0"
+version = "0.101.0"
 description = "Umbrella for commonly-used cranelift crates"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift"
diff --git a/cranelift/wasm/Cargo.toml b/cranelift/wasm/Cargo.toml
index b4b98d5a68c6..fcac5021bcc5 100644
--- a/cranelift/wasm/Cargo.toml
+++ b/cranelift/wasm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-wasm"
-version = "0.102.0"
+version = "0.101.0"
 authors = ["The Cranelift Project Developers"]
 description = "Translator from WebAssembly to Cranelift IR"
 documentation = "https://docs.rs/cranelift-wasm"
diff --git a/cranelift/wasm/src/code_translator.rs b/cranelift/wasm/src/code_translator.rs
index ef6946150b41..6a0090c10089 100644
--- a/cranelift/wasm/src/code_translator.rs
+++ b/cranelift/wasm/src/code_translator.rs
@@ -2811,11 +2811,6 @@ where
     let mut flags = MemFlags::new();
     flags.set_endianness(ir::Endianness::Little);
 
-    if heap.memory_type.is_some() {
-        // Proof-carrying code is enabled; check this memory access.
-        flags.set_checked();
-    }
-
     // The access occurs to the `heap` disjoint category of abstract
     // state. This may allow alias analysis to merge redundant loads,
     // etc. when heap accesses occur interleaved with other (table,
diff --git a/cranelift/wasm/src/code_translator/bounds_checks.rs b/cranelift/wasm/src/code_translator/bounds_checks.rs
index a8e6022d1ec7..5b4d48e03cb2 100644
--- a/cranelift/wasm/src/code_translator/bounds_checks.rs
+++ b/cranelift/wasm/src/code_translator/bounds_checks.rs
@@ -23,7 +23,6 @@ use super::Reachability;
 use crate::{FuncEnvironment, HeapData, HeapStyle};
 use cranelift_codegen::{
     cursor::{Cursor, FuncCursor},
-    ir::pcc::Fact,
     ir::{self, condcodes::IntCC, InstBuilder, RelSourceLoc},
 };
 use cranelift_frontend::FunctionBuilder;
@@ -53,12 +52,10 @@ where
         index,
         heap.index_type,
         env.pointer_type(),
-        heap.memory_type.is_some(),
         &mut builder.cursor(),
     );
     let offset_and_size = offset_plus_size(offset, access_size);
     let spectre_mitigations_enabled = env.heap_access_spectre_mitigation();
-    let pcc = env.proof_carrying_code();
 
     // We need to emit code that will trap (or compute an address that will trap
     // when accessed) if
@@ -86,8 +83,8 @@ where
         //
         //            index + 1 > bound
         //        ==> index >= bound
-        HeapStyle::Dynamic { .. } if offset_and_size == 1 => {
-            let bound = get_dynamic_heap_bound(builder, env, heap);
+        HeapStyle::Dynamic { bound_gv } if offset_and_size == 1 => {
+            let bound = builder.ins().global_value(env.pointer_type(), bound_gv);
             let oob = builder
                 .ins()
                 .icmp(IntCC::UnsignedGreaterThanOrEqual, index, bound);
@@ -98,7 +95,6 @@ where
                 index,
                 offset,
                 spectre_mitigations_enabled,
-                pcc,
                 oob,
             ))
         }
@@ -128,8 +124,8 @@ where
         //    offset immediates -- which is a common code pattern when accessing
         //    multiple fields in the same struct that is in linear memory --
         //    will all emit the same `index > bound` check, which we can GVN.
-        HeapStyle::Dynamic { .. } if offset_and_size <= heap.offset_guard_size => {
-            let bound = get_dynamic_heap_bound(builder, env, heap);
+        HeapStyle::Dynamic { bound_gv } if offset_and_size <= heap.offset_guard_size => {
+            let bound = builder.ins().global_value(env.pointer_type(), bound_gv);
             let oob = builder.ins().icmp(IntCC::UnsignedGreaterThan, index, bound);
             Reachable(explicit_check_oob_condition_and_compute_addr(
                 &mut builder.cursor(),
@@ -138,7 +134,6 @@ where
                 index,
                 offset,
                 spectre_mitigations_enabled,
-                pcc,
                 oob,
             ))
         }
@@ -150,8 +145,8 @@ where
         //
         //            index + offset + access_size > bound
         //        ==> index > bound - (offset + access_size)
-        HeapStyle::Dynamic { .. } if offset_and_size <= heap.min_size.into() => {
-            let bound = get_dynamic_heap_bound(builder, env, heap);
+        HeapStyle::Dynamic { bound_gv } if offset_and_size <= heap.min_size.into() => {
+            let bound = builder.ins().global_value(env.pointer_type(), bound_gv);
             let adjusted_bound = builder.ins().iadd_imm(bound, -(offset_and_size as i64));
             let oob = builder
                 .ins()
@@ -163,7 +158,6 @@ where
                 index,
                 offset,
                 spectre_mitigations_enabled,
-                pcc,
                 oob,
             ))
         }
@@ -173,7 +167,7 @@ where
         //        index + offset + access_size > bound
         //
         //    And we have to handle the overflow case in the left-hand side.
-        HeapStyle::Dynamic { .. } => {
+        HeapStyle::Dynamic { bound_gv } => {
             let access_size_val = builder
                 .ins()
                 .iconst(env.pointer_type(), offset_and_size as i64);
@@ -182,7 +176,7 @@ where
                 access_size_val,
                 ir::TrapCode::HeapOutOfBounds,
             );
-            let bound = get_dynamic_heap_bound(builder, env, heap);
+            let bound = builder.ins().global_value(env.pointer_type(), bound_gv);
             let oob = builder
                 .ins()
                 .icmp(IntCC::UnsignedGreaterThan, adjusted_index, bound);
@@ -193,7 +187,6 @@ where
                 index,
                 offset,
                 spectre_mitigations_enabled,
-                pcc,
                 oob,
             ))
         }
@@ -261,7 +254,6 @@ where
                 env.pointer_type(),
                 index,
                 offset,
-                pcc,
             ))
         }
 
@@ -291,42 +283,16 @@ where
                 index,
                 offset,
                 spectre_mitigations_enabled,
-                pcc,
                 oob,
             ))
         }
     })
 }
 
-/// Get the bound of a dynamic heap as an `ir::Value`.
-fn get_dynamic_heap_bound<Env>(
-    builder: &mut FunctionBuilder,
-    env: &mut Env,
-    heap: &HeapData,
-) -> ir::Value
-where
-    Env: FuncEnvironment + ?Sized,
-{
-    match (heap.max_size, &heap.style) {
-        // The heap has a constant size, no need to actually load the bound.
-        (Some(max_size), _) if heap.min_size == max_size => {
-            builder.ins().iconst(env.pointer_type(), max_size as i64)
-        }
-
-        // Load the heap bound from its global variable.
-        (_, HeapStyle::Dynamic { bound_gv }) => {
-            builder.ins().global_value(env.pointer_type(), *bound_gv)
-        }
-
-        (_, HeapStyle::Static { .. }) => unreachable!("not a dynamic heap"),
-    }
-}
-
 fn cast_index_to_pointer_ty(
     index: ir::Value,
     index_ty: ir::Type,
     pointer_ty: ir::Type,
-    pcc: bool,
     pos: &mut FuncCursor,
 ) -> ir::Value {
     if index_ty == pointer_ty {
@@ -341,14 +307,6 @@ fn cast_index_to_pointer_ty(
     // Convert `index` to `addr_ty`.
     let extended_index = pos.ins().uextend(pointer_ty, index);
 
-    // Add a range fact on the extended value.
-    if pcc {
-        pos.func.dfg.facts[extended_index] = Some(Fact::max_range_for_width_extended(
-            u16::try_from(index_ty.bits()).unwrap(),
-            u16::try_from(pointer_ty.bits()).unwrap(),
-        ));
-    }
-
     // Add debug value-label alias so that debuginfo can name the extended
     // value as the address
     let loc = pos.srcloc();
@@ -374,8 +332,6 @@ fn explicit_check_oob_condition_and_compute_addr(
     offset: u32,
     // Whether Spectre mitigations are enabled for heap accesses.
     spectre_mitigations_enabled: bool,
-    // Whether we're emitting PCC facts.
-    pcc: bool,
     // The `i8` boolean value that is non-zero when the heap access is out of
     // bounds (and therefore we should trap) and is zero when the heap access is
     // in bounds (and therefore we can proceed).
@@ -386,7 +342,7 @@ fn explicit_check_oob_condition_and_compute_addr(
             .trapnz(oob_condition, ir::TrapCode::HeapOutOfBounds);
     }
 
-    let mut addr = compute_addr(pos, heap, addr_ty, index, offset, pcc);
+    let mut addr = compute_addr(pos, heap, addr_ty, index, offset);
 
     if spectre_mitigations_enabled {
         let null = pos.ins().iconst(addr_ty, 0);
@@ -396,21 +352,6 @@ fn explicit_check_oob_condition_and_compute_addr(
     addr
 }
 
-fn add_fact<F: Fn(ir::MemoryType) -> Fact>(
-    pos: &mut FuncCursor,
-    pcc_memtype: Option<ir::MemoryType>,
-    value: ir::Value,
-    make_fact: F,
-) {
-    if let Some(ty) = pcc_memtype {
-        assert!(
-            pos.func.dfg.facts[value].is_none(),
-            "Overwriting a fact is invalid"
-        );
-        pos.func.dfg.facts[value] = Some(make_fact(ty));
-    }
-}
-
 /// Emit code for the native address computation of a Wasm address,
 /// without any bounds checks or overflow checks.
 ///
@@ -423,40 +364,11 @@ fn compute_addr(
     addr_ty: ir::Type,
     index: ir::Value,
     offset: u32,
-    pcc: bool,
 ) -> ir::Value {
     debug_assert_eq!(pos.func.dfg.value_type(index), addr_ty);
 
     let heap_base = pos.ins().global_value(addr_ty, heap.base);
-
-    let pcc_memtype = if pcc {
-        Some(
-            heap.memory_type
-                .expect("A memory type is required when PCC is enabled"),
-        )
-    } else {
-        None
-    };
-
-    add_fact(pos, pcc_memtype, heap_base, |ty| Fact::Mem {
-        ty,
-        min_offset: 0,
-        max_offset: 0,
-    });
-
     let base_and_index = pos.ins().iadd(heap_base, index);
-
-    add_fact(pos, pcc_memtype, base_and_index, |ty| {
-        // TODO: handle memory64 as well. For now we assert that we
-        // have a 32-bit `heap.index_type`.
-        assert_eq!(heap.index_type, ir::types::I32);
-        Fact::Mem {
-            ty,
-            min_offset: 0,
-            max_offset: u64::from(u32::MAX),
-        }
-    });
-
     if offset == 0 {
         base_and_index
     } else {
@@ -464,21 +376,7 @@ fn compute_addr(
         // `select_spectre_guard`, if any. If it happens after, then we
         // potentially are letting speculative execution read the whole first
         // 4GiB of memory.
-        let offset_val = pos.ins().iconst(addr_ty, i64::from(offset));
-        add_fact(pos, pcc_memtype, offset_val, |_| {
-            Fact::constant(u16::try_from(addr_ty.bits()).unwrap(), u64::from(offset))
-        });
-        let result = pos.ins().iadd(base_and_index, offset_val);
-        add_fact(pos, pcc_memtype, result, |ty| Fact::Mem {
-            ty,
-            min_offset: u64::from(offset),
-            // Safety: can't overflow -- two u32s summed in a
-            // 64-bit add. TODO: when memory64 is supported here,
-            // `u32::MAX` is no longer true, and we'll need to
-            // handle overflow here.
-            max_offset: u64::from(u32::MAX) + u64::from(offset),
-        });
-        result
+        pos.ins().iadd_imm(base_and_index, offset as i64)
     }
 }
 
diff --git a/cranelift/wasm/src/environ/dummy.rs b/cranelift/wasm/src/environ/dummy.rs
index f27ffc7025e0..95f9fecece62 100644
--- a/cranelift/wasm/src/environ/dummy.rs
+++ b/cranelift/wasm/src/environ/dummy.rs
@@ -261,10 +261,6 @@ impl<'dummy_environment> TargetEnvironment for DummyFuncEnvironment<'dummy_envir
     fn heap_access_spectre_mitigation(&self) -> bool {
         false
     }
-
-    fn proof_carrying_code(&self) -> bool {
-        false
-    }
 }
 
 impl<'dummy_environment> FuncEnvironment for DummyFuncEnvironment<'dummy_environment> {
@@ -301,19 +297,17 @@ impl<'dummy_environment> FuncEnvironment for DummyFuncEnvironment<'dummy_environ
             base: addr,
             offset: Offset32::new(0),
             global_type: self.pointer_type(),
-            flags: ir::MemFlags::trusted().with_readonly(),
+            readonly: true,
         });
 
         Ok(self.heaps.push(HeapData {
             base: gv,
             min_size: 0,
-            max_size: None,
             offset_guard_size: 0x8000_0000,
             style: HeapStyle::Static {
                 bound: 0x1_0000_0000,
             },
             index_type: I32,
-            memory_type: None,
         }))
     }
 
@@ -324,14 +318,13 @@ impl<'dummy_environment> FuncEnvironment for DummyFuncEnvironment<'dummy_environ
             base: vmctx,
             offset: Offset32::new(0),
             global_type: self.pointer_type(),
-            // When tables in wasm become "growable", revisit whether this can be readonly or not.
-            flags: ir::MemFlags::trusted().with_readonly(),
+            readonly: true, // when tables in wasm become "growable", revisit whether this can be readonly or not.
         });
         let bound_gv = func.create_global_value(ir::GlobalValueData::Load {
             base: vmctx,
             offset: Offset32::new(0),
             global_type: I32,
-            flags: ir::MemFlags::trusted().with_readonly(),
+            readonly: true,
         });
 
         Ok(func.create_table(ir::TableData {
@@ -717,10 +710,6 @@ impl TargetEnvironment for DummyEnvironment {
     fn heap_access_spectre_mitigation(&self) -> bool {
         false
     }
-
-    fn proof_carrying_code(&self) -> bool {
-        false
-    }
 }
 
 impl<'data> ModuleEnvironment<'data> for DummyEnvironment {
diff --git a/cranelift/wasm/src/environ/spec.rs b/cranelift/wasm/src/environ/spec.rs
index 967839ce12ef..5d7c82ff3cdd 100644
--- a/cranelift/wasm/src/environ/spec.rs
+++ b/cranelift/wasm/src/environ/spec.rs
@@ -51,9 +51,6 @@ pub trait TargetEnvironment: TypeConvert {
     /// Whether to enable Spectre mitigations for heap accesses.
     fn heap_access_spectre_mitigation(&self) -> bool;
 
-    /// Whether to add proof-carrying-code facts to verify memory accesses.
-    fn proof_carrying_code(&self) -> bool;
-
     /// Get the Cranelift integer type to use for native pointers.
     ///
     /// This returns `I64` for 64-bit architectures and `I32` for 32-bit architectures.
diff --git a/cranelift/wasm/src/heap.rs b/cranelift/wasm/src/heap.rs
index 85d5f1d687e0..b253c62dcee0 100644
--- a/cranelift/wasm/src/heap.rs
+++ b/cranelift/wasm/src/heap.rs
@@ -1,6 +1,6 @@
 //! Heaps to implement WebAssembly linear memories.
 
-use cranelift_codegen::ir::{GlobalValue, MemoryType, Type};
+use cranelift_codegen::ir::{GlobalValue, Type};
 use cranelift_entity::entity_impl;
 
 /// An opaque reference to a [`HeapData`][crate::HeapData].
@@ -74,11 +74,6 @@ pub struct HeapData {
     /// don't need bounds checking.
     pub min_size: u64,
 
-    /// The maximum heap size in bytes.
-    ///
-    /// Heap accesses larger than this will always trap.
-    pub max_size: Option<u64>,
-
     /// Size in bytes of the offset-guard pages following the heap.
     pub offset_guard_size: u64,
 
@@ -87,9 +82,6 @@ pub struct HeapData {
 
     /// The index type for the heap.
     pub index_type: Type,
-
-    /// The memory type for the pointed-to memory, if using proof-carrying code.
-    pub memory_type: Option<MemoryType>,
 }
 
 /// Style of heap including style-specific information.
diff --git a/cranelift/wasm/wasmtests/embenchen_fannkuch.wat b/cranelift/wasm/wasmtests/embenchen_fannkuch.wat
index 391fdcd55b71..c61b5e6e2fc7 100644
--- a/cranelift/wasm/wasmtests/embenchen_fannkuch.wat
+++ b/cranelift/wasm/wasmtests/embenchen_fannkuch.wat
@@ -1,12180 +1,16725 @@
 (module
-  (type $0 (;0;) (func (param i32 i32 i32) (result i32)))
-  (type $1 (;1;) (func (param i32) (result i32)))
-  (type $2 (;2;) (func (param i32)))
-  (type $3 (;3;) (func (result i32)))
-  (type $4 (;4;) (func (param i32 i32) (result i32)))
-  (type $5 (;5;) (func (param i32 i32)))
-  (type $6 (;6;) (func))
-  (type $7 (;7;) (func (param i32 i32 i32 i32 i32) (result i32)))
-  (type $8 (;8;) (func (param i32 i32 i32)))
-  (type $9 (;9;) (func (param i64 i32) (result i32)))
-  (type $10 (;10;) (func (param i32 i32 i32 i32 i32)))
-  (type $11 (;11;) (func (param f64 i32) (result f64)))
-  (type $12 (;12;) (func (param i32 i32 i32 i32) (result i32)))
-  (import "env" "memory" (memory $16 (;0;) 2048 2048))
-  (import "env" "table" (table $timport$17 (;0;) 8 8 funcref))
-  (import "env" "DYNAMICTOP_PTR" (global $gimport$0 (;0;) i32))
-  (import "env" "STACKTOP" (global $gimport$1 (;1;) i32))
-  (import "env" "STACK_MAX" (global $gimport$2 (;2;) i32))
-  (import "env" "memoryBase" (global $gimport$18 (;3;) i32))
-  (import "env" "tableBase" (global $gimport$19 (;4;) i32))
-  (import "env" "abort" (func $fimport$3 (;0;) (type $2)))
-  (import "env" "enlargeMemory" (func $fimport$4 (;1;) (type $3)))
-  (import "env" "getTotalMemory" (func $fimport$5 (;2;) (type $3)))
-  (import "env" "abortOnCannotGrowMemory" (func $fimport$6 (;3;) (type $3)))
-  (import "env" "_pthread_cleanup_pop" (func $fimport$7 (;4;) (type $2)))
-  (import "env" "___syscall6" (func $fimport$8 (;5;) (type $4)))
-  (import "env" "_pthread_cleanup_push" (func $fimport$9 (;6;) (type $5)))
-  (import "env" "_abort" (func $fimport$10 (;7;) (type $6)))
-  (import "env" "___setErrNo" (func $fimport$11 (;8;) (type $2)))
-  (import "env" "_emscripten_memcpy_big" (func $fimport$12 (;9;) (type $0)))
-  (import "env" "___syscall54" (func $fimport$13 (;10;) (type $4)))
-  (import "env" "___syscall140" (func $fimport$14 (;11;) (type $4)))
-  (import "env" "___syscall146" (func $fimport$15 (;12;) (type $4)))
-  (func $0 (;13;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $1
-      global.get $global$1
-      local.get $0
-      i32.add
-      global.set $global$1
-      global.get $global$1
-      i32.const 15
-      i32.add
-      i32.const -16
-      i32.and
-      global.set $global$1
-      local.get $1
-    end
+ (type $0 (func (param i32 i32 i32) (result i32)))
+ (type $1 (func (param i32) (result i32)))
+ (type $2 (func (param i32)))
+ (type $3 (func (result i32)))
+ (type $4 (func (param i32 i32) (result i32)))
+ (type $5 (func (param i32 i32)))
+ (type $6 (func))
+ (type $7 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $8 (func (param i32 i32 i32)))
+ (type $9 (func (param i64 i32) (result i32)))
+ (type $10 (func (param i32 i32 i32 i32 i32)))
+ (type $11 (func (param f64 i32) (result f64)))
+ (type $12 (func (param i32 i32 i32 i32) (result i32)))
+ (import "env" "memory" (memory $16 2048 2048))
+ (data (i32.const 1024) "\04\04\00\00\05")
+ (data (i32.const 1040) "\01")
+ (data (i32.const 1064) "\01\00\00\00\02\00\00\00<\10\00\00\00\04")
+ (data (i32.const 1088) "\01")
+ (data (i32.const 1103) "\n\ff\ff\ff\ff")
+ (data (i32.const 1140) "error: %d\n\00Pfannkuchen(%d) = %d.\n\00%d\00\11\00\n\00\11\11\11\00\00\00\00\05\00\00\00\00\00\00\t\00\00\00\00\0b")
+ (data (i32.const 1209) "\11\00\0f\n\11\11\11\03\n\07\00\01\13\t\0b\0b\00\00\t\06\0b\00\00\0b\00\06\11\00\00\00\11\11\11")
+ (data (i32.const 1258) "\0b")
+ (data (i32.const 1267) "\11\00\n\n\11\11\11\00\n\00\00\02\00\t\0b\00\00\00\t\00\0b\00\00\0b")
+ (data (i32.const 1316) "\0c")
+ (data (i32.const 1328) "\0c\00\00\00\00\0c\00\00\00\00\t\0c\00\00\00\00\00\0c\00\00\0c")
+ (data (i32.const 1374) "\0e")
+ (data (i32.const 1386) "\0d\00\00\00\04\0d\00\00\00\00\t\0e\00\00\00\00\00\0e\00\00\0e")
+ (data (i32.const 1432) "\10")
+ (data (i32.const 1444) "\0f\00\00\00\00\0f\00\00\00\00\t\10\00\00\00\00\00\10\00\00\10\00\00\12\00\00\00\12\12\12")
+ (data (i32.const 1499) "\12\00\00\00\12\12\12\00\00\00\00\00\00\t")
+ (data (i32.const 1548) "\0b")
+ (data (i32.const 1560) "\n\00\00\00\00\n\00\00\00\00\t\0b\00\00\00\00\00\0b\00\00\0b")
+ (data (i32.const 1606) "\0c")
+ (data (i32.const 1618) "\0c\00\00\00\00\0c\00\00\00\00\t\0c\00\00\00\00\00\0c\00\00\0c\00\000123456789ABCDEF-+   0X0x\00(null)\00-0X+0X 0X-0x+0x 0x\00inf\00INF\00nan\00NAN\00.\00T!\"\19\0d\01\02\03\11K\1c\0c\10\04\0b\1d\12\1e\'hnopqb \05\06\0f\13\14\15\1a\08\16\07($\17\18\t\n\0e\1b\1f%#\83\82}&*+<=>?CGJMXYZ[\\]^_`acdefgijklrstyz{|\00Illegal byte sequence\00Domain error\00Result not representable\00Not a tty\00Permission denied\00Operation not permitted\00No such file or directory\00No such process\00File exists\00Value too large for data type\00No space left on device\00Out of memory\00Resource busy\00Interrupted system call\00Resource temporarily unavailable\00Invalid seek\00Cross-device link\00Read-only file system\00Directory not empty\00Connection reset by peer\00Operation timed out\00Connection refused\00Host is down\00Host is unreachable\00Address in use\00Broken pipe\00I/O error\00No such device or address\00Block device required\00No such device\00Not a directory\00Is a directory\00Text file busy\00Exec format error\00Invalid argument\00Argument list too long\00Symbolic link loop\00Filename too long\00Too many open files in system\00No file descriptors available\00Bad file descriptor\00No child process\00Bad address\00File too large\00Too many links\00No locks available\00Resource deadlock would occur\00State not recoverable\00Previous owner died\00Operation canceled\00Function not implemented\00No message of desired type\00Identifier removed\00Device not a stream\00No data available\00Device timeout\00Out of streams resources\00Link has been severed\00Protocol error\00Bad message\00File descriptor in bad state\00Not a socket\00Destination address required\00Message too large\00Protocol wrong type for socket\00Protocol not available\00Protocol not supported\00Socket type not supported\00Not supported\00Protocol family not supported\00Address family not supported by protocol\00Address not available\00Network is down\00Network unreachable\00Connection reset by network\00Connection aborted\00No buffer space available\00Socket is connected\00Socket not connected\00Cannot send after socket shutdown\00Operation already in progress\00Operation in progress\00Stale file handle\00Remote I/O error\00Quota exceeded\00No medium found\00Wrong medium type\00No error information")
+ (import "env" "table" (table $timport$17 8 8 funcref))
+ (elem (global.get $gimport$19) $45 $9 $46 $14 $10 $15 $47 $16)
+ (import "env" "DYNAMICTOP_PTR" (global $gimport$0 i32))
+ (import "env" "STACKTOP" (global $gimport$1 i32))
+ (import "env" "STACK_MAX" (global $gimport$2 i32))
+ (import "env" "memoryBase" (global $gimport$18 i32))
+ (import "env" "tableBase" (global $gimport$19 i32))
+ (import "env" "abort" (func $fimport$3 (param i32)))
+ (import "env" "enlargeMemory" (func $fimport$4 (result i32)))
+ (import "env" "getTotalMemory" (func $fimport$5 (result i32)))
+ (import "env" "abortOnCannotGrowMemory" (func $fimport$6 (result i32)))
+ (import "env" "_pthread_cleanup_pop" (func $fimport$7 (param i32)))
+ (import "env" "___syscall6" (func $fimport$8 (param i32 i32) (result i32)))
+ (import "env" "_pthread_cleanup_push" (func $fimport$9 (param i32 i32)))
+ (import "env" "_abort" (func $fimport$10))
+ (import "env" "___setErrNo" (func $fimport$11 (param i32)))
+ (import "env" "_emscripten_memcpy_big" (func $fimport$12 (param i32 i32 i32) (result i32)))
+ (import "env" "___syscall54" (func $fimport$13 (param i32 i32) (result i32)))
+ (import "env" "___syscall140" (func $fimport$14 (param i32 i32) (result i32)))
+ (import "env" "___syscall146" (func $fimport$15 (param i32 i32) (result i32)))
+ (global $global$0 (mut i32) (global.get $gimport$0))
+ (global $global$1 (mut i32) (global.get $gimport$1))
+ (global $global$2 (mut i32) (global.get $gimport$2))
+ (global $global$3 (mut i32) (i32.const 0))
+ (global $global$4 (mut i32) (i32.const 0))
+ (global $global$5 (mut i32) (i32.const 0))
+ (export "_sbrk" (func $38))
+ (export "_free" (func $36))
+ (export "_main" (func $8))
+ (export "_pthread_self" (func $41))
+ (export "_memset" (func $39))
+ (export "_malloc" (func $35))
+ (export "_memcpy" (func $40))
+ (export "___errno_location" (func $12))
+ (export "runPostSets" (func $37))
+ (export "stackAlloc" (func $0))
+ (export "stackSave" (func $1))
+ (export "stackRestore" (func $2))
+ (export "establishStackSpace" (func $3))
+ (export "setThrew" (func $4))
+ (export "setTempRet0" (func $5))
+ (export "getTempRet0" (func $6))
+ (export "dynCall_ii" (func $42))
+ (export "dynCall_iiii" (func $43))
+ (export "dynCall_vi" (func $44))
+ (func $0 (; 13 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (local.get $0)
+    )
+   )
+   (global.set $global$1
+    (i32.and
+     (i32.add
+      (global.get $global$1)
+      (i32.const 15)
+     )
+     (i32.const -16)
+    )
+   )
+   (local.get $1)
   )
-  (func $1 (;14;) (type $3) (result i32)
-    global.get $global$1
+ )
+ (func $1 (; 14 ;) (type $3) (result i32)
+  (global.get $global$1)
+ )
+ (func $2 (; 15 ;) (type $2) (param $0 i32)
+  (global.set $global$1
+   (local.get $0)
   )
-  (func $2 (;15;) (type $2) (param $0 i32)
-    local.get $0
-    global.set $global$1
+ )
+ (func $3 (; 16 ;) (type $5) (param $0 i32) (param $1 i32)
+  (block $label$1
+   (global.set $global$1
+    (local.get $0)
+   )
+   (global.set $global$2
+    (local.get $1)
+   )
   )
-  (func $3 (;16;) (type $5) (param $0 i32) (param $1 i32)
-    block $label$1 ;; label = @1
-      local.get $0
-      global.set $global$1
-      local.get $1
-      global.set $global$2
-    end
+ )
+ (func $4 (; 17 ;) (type $5) (param $0 i32) (param $1 i32)
+  (if
+   (i32.eqz
+    (global.get $global$3)
+   )
+   (block
+    (global.set $global$3
+     (local.get $0)
+    )
+    (global.set $global$4
+     (local.get $1)
+    )
+   )
   )
-  (func $4 (;17;) (type $5) (param $0 i32) (param $1 i32)
-    global.get $global$3
-    i32.eqz
-    if ;; label = @1
-      block ;; label = @2
-        local.get $0
-        global.set $global$3
-        local.get $1
-        global.set $global$4
-      end
-    end
+ )
+ (func $5 (; 18 ;) (type $2) (param $0 i32)
+  (global.set $global$5
+   (local.get $0)
   )
-  (func $5 (;18;) (type $2) (param $0 i32)
-    local.get $0
-    global.set $global$5
+ )
+ (func $6 (; 19 ;) (type $3) (result i32)
+  (global.get $global$5)
+ )
+ (func $7 (; 20 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (local $15 i32)
+  (local $16 i32)
+  (local $17 i32)
+  (block $label$1 (result i32)
+   (local.set $3
+    (call $35
+     (local.tee $15
+      (i32.shl
+       (local.tee $4
+        (i32.load offset=4
+         (local.get $0)
+        )
+       )
+       (i32.const 2)
+      )
+     )
+    )
+   )
+   (local.set $6
+    (call $35
+     (local.get $15)
+    )
+   )
+   (local.set $10
+    (call $35
+     (local.get $15)
+    )
+   )
+   (if
+    (local.tee $2
+     (i32.gt_s
+      (local.get $4)
+      (i32.const 0)
+     )
+    )
+    (block
+     (local.set $1
+      (i32.const 0)
+     )
+     (loop $label$3
+      (i32.store
+       (i32.add
+        (local.get $3)
+        (i32.shl
+         (local.get $1)
+         (i32.const 2)
+        )
+       )
+       (local.get $1)
+      )
+      (br_if $label$3
+       (i32.ne
+        (local.tee $1
+         (i32.add
+          (local.get $1)
+          (i32.const 1)
+         )
+        )
+        (local.get $4)
+       )
+      )
+     )
+     (i32.store
+      (i32.add
+       (local.get $3)
+       (i32.shl
+        (local.tee $0
+         (i32.load
+          (local.get $0)
+         )
+        )
+        (i32.const 2)
+       )
+      )
+      (local.tee $11
+       (i32.add
+        (local.get $4)
+        (i32.const -1)
+       )
+      )
+     )
+     (i32.store
+      (local.tee $14
+       (i32.add
+        (local.get $3)
+        (i32.shl
+         (local.get $11)
+         (i32.const 2)
+        )
+       )
+      )
+      (local.get $0)
+     )
+     (if
+      (local.get $2)
+      (block
+       (local.set $0
+        (i32.const 0)
+       )
+       (local.set $1
+        (local.get $4)
+       )
+       (loop $label$5
+        (block $label$6
+         (if
+          (i32.gt_s
+           (local.get $1)
+           (i32.const 1)
+          )
+          (loop $label$8
+           (i32.store
+            (i32.add
+             (local.get $10)
+             (i32.shl
+              (local.tee $2
+               (i32.add
+                (local.get $1)
+                (i32.const -1)
+               )
+              )
+              (i32.const 2)
+             )
+            )
+            (local.get $1)
+           )
+           (if
+            (i32.gt_s
+             (local.get $2)
+             (i32.const 1)
+            )
+            (block
+             (local.set $1
+              (local.get $2)
+             )
+             (br $label$8)
+            )
+            (local.set $2
+             (i32.const 1)
+            )
+           )
+          )
+          (local.set $2
+           (local.get $1)
+          )
+         )
+         (if
+          (local.tee $7
+           (i32.load
+            (local.get $3)
+           )
+          )
+          (if
+           (i32.ne
+            (i32.load
+             (local.get $14)
+            )
+            (local.get $11)
+           )
+           (block
+            (drop
+             (call $40
+              (local.get $6)
+              (local.get $3)
+              (local.get $15)
+             )
+            )
+            (local.set $8
+             (i32.const 0)
+            )
+            (local.set $9
+             (i32.load
+              (local.get $6)
+             )
+            )
+            (loop $label$14
+             (if
+              (i32.gt_s
+               (local.tee $1
+                (i32.add
+                 (local.get $9)
+                 (i32.const -1)
+                )
+               )
+               (i32.const 1)
+              )
+              (block
+               (local.set $5
+                (i32.const 1)
+               )
+               (loop $label$16
+                (local.set $17
+                 (i32.load
+                  (local.tee $12
+                   (i32.add
+                    (local.get $6)
+                    (i32.shl
+                     (local.get $5)
+                     (i32.const 2)
+                    )
+                   )
+                  )
+                 )
+                )
+                (i32.store
+                 (local.get $12)
+                 (i32.load
+                  (local.tee $12
+                   (i32.add
+                    (local.get $6)
+                    (i32.shl
+                     (local.get $1)
+                     (i32.const 2)
+                    )
+                   )
+                  )
+                 )
+                )
+                (i32.store
+                 (local.get $12)
+                 (local.get $17)
+                )
+                (br_if $label$16
+                 (i32.lt_s
+                  (local.tee $5
+                   (i32.add
+                    (local.get $5)
+                    (i32.const 1)
+                   )
+                  )
+                  (local.tee $1
+                   (i32.add
+                    (local.get $1)
+                    (i32.const -1)
+                   )
+                  )
+                 )
+                )
+               )
+              )
+             )
+             (local.set $5
+              (i32.add
+               (local.get $8)
+               (i32.const 1)
+              )
+             )
+             (local.set $1
+              (i32.load
+               (local.tee $12
+                (i32.add
+                 (local.get $6)
+                 (i32.shl
+                  (local.get $9)
+                  (i32.const 2)
+                 )
+                )
+               )
+              )
+             )
+             (i32.store
+              (local.get $12)
+              (local.get $9)
+             )
+             (if
+              (local.get $1)
+              (block
+               (local.set $8
+                (local.get $5)
+               )
+               (local.set $9
+                (local.get $1)
+               )
+               (br $label$14)
+              )
+             )
+            )
+            (if
+             (i32.le_s
+              (local.get $0)
+              (local.get $8)
+             )
+             (local.set $0
+              (local.get $5)
+             )
+            )
+           )
+          )
+         )
+         (if
+          (i32.lt_s
+           (local.get $2)
+           (local.get $11)
+          )
+          (local.set $1
+           (local.get $2)
+          )
+          (block
+           (local.set $1
+            (i32.const 31)
+           )
+           (br $label$6)
+          )
+         )
+         (loop $label$21
+          (if
+           (i32.gt_s
+            (local.get $1)
+            (i32.const 0)
+           )
+           (block
+            (local.set $2
+             (i32.const 0)
+            )
+            (loop $label$23
+             (i32.store
+              (i32.add
+               (local.get $3)
+               (i32.shl
+                (local.get $2)
+                (i32.const 2)
+               )
+              )
+              (i32.load
+               (i32.add
+                (local.get $3)
+                (i32.shl
+                 (local.tee $2
+                  (i32.add
+                   (local.get $2)
+                   (i32.const 1)
+                  )
+                 )
+                 (i32.const 2)
+                )
+               )
+              )
+             )
+             (br_if $label$23
+              (i32.lt_s
+               (local.get $2)
+               (local.get $1)
+              )
+             )
+             (local.set $2
+              (local.get $1)
+             )
+            )
+           )
+           (local.set $2
+            (i32.const 0)
+           )
+          )
+          (i32.store
+           (i32.add
+            (local.get $3)
+            (i32.shl
+             (local.get $2)
+             (i32.const 2)
+            )
+           )
+           (local.get $7)
+          )
+          (local.set $5
+           (i32.load
+            (local.tee $2
+             (i32.add
+              (local.get $10)
+              (i32.shl
+               (local.get $1)
+               (i32.const 2)
+              )
+             )
+            )
+           )
+          )
+          (i32.store
+           (local.get $2)
+           (i32.add
+            (local.get $5)
+            (i32.const -1)
+           )
+          )
+          (br_if $label$5
+           (i32.gt_s
+            (local.get $5)
+            (i32.const 1)
+           )
+          )
+          (if
+           (i32.lt_s
+            (local.tee $1
+             (i32.add
+              (local.get $1)
+              (i32.const 1)
+             )
+            )
+            (local.get $11)
+           )
+           (block
+            (local.set $7
+             (i32.load
+              (local.get $3)
+             )
+            )
+            (br $label$21)
+           )
+           (block
+            (local.set $1
+             (i32.const 31)
+            )
+            (br $label$6)
+           )
+          )
+         )
+        )
+       )
+       (if
+        (i32.eq
+         (local.get $1)
+         (i32.const 31)
+        )
+        (block
+         (call $36
+          (local.get $3)
+         )
+         (call $36
+          (local.get $6)
+         )
+         (call $36
+          (local.get $10)
+         )
+         (return
+          (local.get $0)
+         )
+        )
+       )
+      )
+      (block
+       (local.set $16
+        (local.get $14)
+       )
+       (local.set $13
+        (local.get $11)
+       )
+      )
+     )
+    )
+    (block
+     (i32.store
+      (i32.add
+       (local.get $3)
+       (i32.shl
+        (local.tee $0
+         (i32.load
+          (local.get $0)
+         )
+        )
+        (i32.const 2)
+       )
+      )
+      (local.tee $13
+       (i32.add
+        (local.get $4)
+        (i32.const -1)
+       )
+      )
+     )
+     (i32.store
+      (local.tee $16
+       (i32.add
+        (local.get $3)
+        (i32.shl
+         (local.get $13)
+         (i32.const 2)
+        )
+       )
+      )
+      (local.get $0)
+     )
+    )
+   )
+   (local.set $0
+    (i32.const 0)
+   )
+   (local.set $1
+    (local.get $4)
+   )
+   (loop $label$30
+    (block $label$31
+     (if
+      (i32.gt_s
+       (local.get $1)
+       (i32.const 1)
+      )
+      (loop $label$33
+       (i32.store
+        (i32.add
+         (local.get $10)
+         (i32.shl
+          (local.tee $2
+           (i32.add
+            (local.get $1)
+            (i32.const -1)
+           )
+          )
+          (i32.const 2)
+         )
+        )
+        (local.get $1)
+       )
+       (if
+        (i32.gt_s
+         (local.get $2)
+         (i32.const 1)
+        )
+        (block
+         (local.set $1
+          (local.get $2)
+         )
+         (br $label$33)
+        )
+        (local.set $2
+         (i32.const 1)
+        )
+       )
+      )
+      (local.set $2
+       (local.get $1)
+      )
+     )
+     (if
+      (local.tee $9
+       (i32.load
+        (local.get $3)
+       )
+      )
+      (if
+       (i32.ne
+        (i32.load
+         (local.get $16)
+        )
+        (local.get $13)
+       )
+       (block
+        (local.set $5
+         (i32.const 0)
+        )
+        (local.set $8
+         (i32.load
+          (local.get $6)
+         )
+        )
+        (loop $label$39
+         (if
+          (i32.gt_s
+           (local.tee $1
+            (i32.add
+             (local.get $8)
+             (i32.const -1)
+            )
+           )
+           (i32.const 1)
+          )
+          (block
+           (local.set $4
+            (i32.const 1)
+           )
+           (loop $label$41
+            (local.set $14
+             (i32.load
+              (local.tee $7
+               (i32.add
+                (local.get $6)
+                (i32.shl
+                 (local.get $4)
+                 (i32.const 2)
+                )
+               )
+              )
+             )
+            )
+            (i32.store
+             (local.get $7)
+             (i32.load
+              (local.tee $7
+               (i32.add
+                (local.get $6)
+                (i32.shl
+                 (local.get $1)
+                 (i32.const 2)
+                )
+               )
+              )
+             )
+            )
+            (i32.store
+             (local.get $7)
+             (local.get $14)
+            )
+            (br_if $label$41
+             (i32.lt_s
+              (local.tee $4
+               (i32.add
+                (local.get $4)
+                (i32.const 1)
+               )
+              )
+              (local.tee $1
+               (i32.add
+                (local.get $1)
+                (i32.const -1)
+               )
+              )
+             )
+            )
+           )
+          )
+         )
+         (local.set $4
+          (i32.add
+           (local.get $5)
+           (i32.const 1)
+          )
+         )
+         (local.set $1
+          (i32.load
+           (local.tee $7
+            (i32.add
+             (local.get $6)
+             (i32.shl
+              (local.get $8)
+              (i32.const 2)
+             )
+            )
+           )
+          )
+         )
+         (i32.store
+          (local.get $7)
+          (local.get $8)
+         )
+         (if
+          (local.get $1)
+          (block
+           (local.set $5
+            (local.get $4)
+           )
+           (local.set $8
+            (local.get $1)
+           )
+           (br $label$39)
+          )
+         )
+        )
+        (if
+         (i32.le_s
+          (local.get $0)
+          (local.get $5)
+         )
+         (local.set $0
+          (local.get $4)
+         )
+        )
+       )
+      )
+     )
+     (if
+      (i32.lt_s
+       (local.get $2)
+       (local.get $13)
+      )
+      (local.set $1
+       (local.get $2)
+      )
+      (block
+       (local.set $1
+        (i32.const 31)
+       )
+       (br $label$31)
+      )
+     )
+     (loop $label$46
+      (if
+       (i32.gt_s
+        (local.get $1)
+        (i32.const 0)
+       )
+       (block
+        (local.set $2
+         (i32.const 0)
+        )
+        (loop $label$48
+         (i32.store
+          (i32.add
+           (local.get $3)
+           (i32.shl
+            (local.get $2)
+            (i32.const 2)
+           )
+          )
+          (i32.load
+           (i32.add
+            (local.get $3)
+            (i32.shl
+             (local.tee $2
+              (i32.add
+               (local.get $2)
+               (i32.const 1)
+              )
+             )
+             (i32.const 2)
+            )
+           )
+          )
+         )
+         (br_if $label$48
+          (i32.lt_s
+           (local.get $2)
+           (local.get $1)
+          )
+         )
+         (local.set $2
+          (local.get $1)
+         )
+        )
+       )
+       (local.set $2
+        (i32.const 0)
+       )
+      )
+      (i32.store
+       (i32.add
+        (local.get $3)
+        (i32.shl
+         (local.get $2)
+         (i32.const 2)
+        )
+       )
+       (local.get $9)
+      )
+      (local.set $4
+       (i32.load
+        (local.tee $2
+         (i32.add
+          (local.get $10)
+          (i32.shl
+           (local.get $1)
+           (i32.const 2)
+          )
+         )
+        )
+       )
+      )
+      (i32.store
+       (local.get $2)
+       (i32.add
+        (local.get $4)
+        (i32.const -1)
+       )
+      )
+      (br_if $label$30
+       (i32.gt_s
+        (local.get $4)
+        (i32.const 1)
+       )
+      )
+      (if
+       (i32.lt_s
+        (local.tee $1
+         (i32.add
+          (local.get $1)
+          (i32.const 1)
+         )
+        )
+        (local.get $13)
+       )
+       (block
+        (local.set $9
+         (i32.load
+          (local.get $3)
+         )
+        )
+        (br $label$46)
+       )
+       (block
+        (local.set $1
+         (i32.const 31)
+        )
+        (br $label$31)
+       )
+      )
+     )
+    )
+   )
+   (if
+    (i32.eq
+     (local.get $1)
+     (i32.const 31)
+    )
+    (block
+     (call $36
+      (local.get $3)
+     )
+     (call $36
+      (local.get $6)
+     )
+     (call $36
+      (local.get $10)
+     )
+     (return
+      (local.get $0)
+     )
+    )
+   )
+   (i32.const 0)
   )
-  (func $6 (;19;) (type $3) (result i32)
-    global.get $global$5
+ )
+ (func $8 (; 21 ;) (type $4) (param $0 i32) (param $1 i32) (result i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (block $label$1 (result i32)
+   (local.set $5
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 32)
+    )
+   )
+   (local.set $7
+    (i32.add
+     (local.get $5)
+     (i32.const 16)
+    )
+   )
+   (local.set $10
+    (i32.add
+     (local.get $5)
+     (i32.const 8)
+    )
+   )
+   (local.set $2
+    (local.get $5)
+   )
+   (block $label$2
+    (block $label$3
+     (br_if $label$3
+      (i32.le_s
+       (local.get $0)
+       (i32.const 1)
+      )
+     )
+     (block $label$4
+      (block $label$5
+       (block $label$6
+        (block $label$7
+         (block $label$8
+          (block $label$9
+           (block $label$10
+            (br_table $label$5 $label$10 $label$8 $label$9 $label$7 $label$6 $label$4
+             (i32.sub
+              (local.tee $0
+               (i32.load8_s
+                (i32.load offset=4
+                 (local.get $1)
+                )
+               )
+              )
+              (i32.const 48)
+             )
+            )
+           )
+           (local.set $3
+            (i32.const 9)
+           )
+           (br $label$2)
+          )
+          (br $label$3)
+         )
+         (local.set $3
+          (i32.const 10)
+         )
+         (br $label$2)
+        )
+        (local.set $3
+         (i32.const 11)
+        )
+        (br $label$2)
+       )
+       (local.set $3
+        (i32.const 12)
+       )
+       (br $label$2)
+      )
+      (global.set $global$1
+       (local.get $5)
+      )
+      (return
+       (i32.const 0)
+      )
+     )
+     (i32.store
+      (local.get $2)
+      (i32.add
+       (local.get $0)
+       (i32.const -48)
+      )
+     )
+     (drop
+      (call $33
+       (i32.const 1140)
+       (local.get $2)
+      )
+     )
+     (global.set $global$1
+      (local.get $5)
+     )
+     (return
+      (i32.const -1)
+     )
+    )
+    (local.set $3
+     (i32.const 11)
+    )
+   )
+   (local.set $6
+    (i32.add
+     (local.get $3)
+     (i32.const -1)
+    )
+   )
+   (local.set $2
+    (i32.const 0)
+   )
+   (local.set $0
+    (i32.const 0)
+   )
+   (loop $label$11
+    (i32.store
+     (local.tee $1
+      (call $35
+       (i32.const 12)
+      )
+     )
+     (local.get $0)
+    )
+    (i32.store offset=4
+     (local.get $1)
+     (local.get $3)
+    )
+    (i32.store offset=8
+     (local.get $1)
+     (local.get $2)
+    )
+    (if
+     (i32.ne
+      (local.tee $0
+       (i32.add
+        (local.get $0)
+        (i32.const 1)
+       )
+      )
+      (local.get $6)
+     )
+     (block
+      (local.set $2
+       (local.get $1)
+      )
+      (br $label$11)
+     )
+    )
+   )
+   (local.set $4
+    (call $35
+     (local.tee $0
+      (i32.shl
+       (local.get $3)
+       (i32.const 2)
+      )
+     )
+    )
+   )
+   (local.set $8
+    (call $35
+     (local.get $0)
+    )
+   )
+   (local.set $0
+    (i32.const 0)
+   )
+   (loop $label$13
+    (i32.store
+     (i32.add
+      (local.get $4)
+      (i32.shl
+       (local.get $0)
+       (i32.const 2)
+      )
+     )
+     (local.get $0)
+    )
+    (br_if $label$13
+     (i32.ne
+      (local.tee $0
+       (i32.add
+        (local.get $0)
+        (i32.const 1)
+       )
+      )
+      (local.get $3)
+     )
+    )
+   )
+   (local.set $0
+    (local.get $3)
+   )
+   (local.set $6
+    (i32.const 30)
+   )
+   (loop $label$14
+    (block $label$15
+     (local.set $2
+      (i32.const 0)
+     )
+     (loop $label$16
+      (i32.store
+       (local.get $10)
+       (i32.add
+        (i32.load
+         (i32.add
+          (local.get $4)
+          (i32.shl
+           (local.get $2)
+           (i32.const 2)
+          )
+         )
+        )
+        (i32.const 1)
+       )
+      )
+      (drop
+       (call $33
+        (i32.const 1174)
+        (local.get $10)
+       )
+      )
+      (br_if $label$16
+       (i32.ne
+        (local.tee $2
+         (i32.add
+          (local.get $2)
+          (i32.const 1)
+         )
+        )
+        (local.get $3)
+       )
+      )
+     )
+     (drop
+      (call $34
+       (i32.const 10)
+      )
+     )
+     (if
+      (i32.gt_s
+       (local.get $0)
+       (i32.const 1)
+      )
+      (loop $label$18
+       (i32.store
+        (i32.add
+         (local.get $8)
+         (i32.shl
+          (local.tee $2
+           (i32.add
+            (local.get $0)
+            (i32.const -1)
+           )
+          )
+          (i32.const 2)
+         )
+        )
+        (local.get $0)
+       )
+       (if
+        (i32.gt_s
+         (local.get $2)
+         (i32.const 1)
+        )
+        (block
+         (local.set $0
+          (local.get $2)
+         )
+         (br $label$18)
+        )
+        (local.set $0
+         (i32.const 1)
+        )
+       )
+      )
+      (br_if $label$15
+       (i32.eq
+        (local.get $0)
+        (local.get $3)
+       )
+      )
+     )
+     (local.set $6
+      (i32.add
+       (local.get $6)
+       (i32.const -1)
+      )
+     )
+     (loop $label$22
+      (block $label$23
+       (local.set $9
+        (i32.load
+         (local.get $4)
+        )
+       )
+       (if
+        (i32.gt_s
+         (local.get $0)
+         (i32.const 0)
+        )
+        (block
+         (local.set $2
+          (i32.const 0)
+         )
+         (loop $label$25
+          (i32.store
+           (i32.add
+            (local.get $4)
+            (i32.shl
+             (local.get $2)
+             (i32.const 2)
+            )
+           )
+           (i32.load
+            (i32.add
+             (local.get $4)
+             (i32.shl
+              (local.tee $2
+               (i32.add
+                (local.get $2)
+                (i32.const 1)
+               )
+              )
+              (i32.const 2)
+             )
+            )
+           )
+          )
+          (br_if $label$25
+           (i32.lt_s
+            (local.get $2)
+            (local.get $0)
+           )
+          )
+          (local.set $2
+           (local.get $0)
+          )
+         )
+        )
+        (local.set $2
+         (i32.const 0)
+        )
+       )
+       (i32.store
+        (i32.add
+         (local.get $4)
+         (i32.shl
+          (local.get $2)
+          (i32.const 2)
+         )
+        )
+        (local.get $9)
+       )
+       (local.set $2
+        (i32.load
+         (local.tee $9
+          (i32.add
+           (local.get $8)
+           (i32.shl
+            (local.get $0)
+            (i32.const 2)
+           )
+          )
+         )
+        )
+       )
+       (i32.store
+        (local.get $9)
+        (i32.add
+         (local.get $2)
+         (i32.const -1)
+        )
+       )
+       (br_if $label$23
+        (i32.gt_s
+         (local.get $2)
+         (i32.const 1)
+        )
+       )
+       (br_if $label$22
+        (i32.ne
+         (local.tee $0
+          (i32.add
+           (local.get $0)
+           (i32.const 1)
+          )
+         )
+         (local.get $3)
+        )
+       )
+       (br $label$15)
+      )
+     )
+     (br_if $label$14
+      (local.get $6)
+     )
+    )
+   )
+   (call $36
+    (local.get $4)
+   )
+   (call $36
+    (local.get $8)
+   )
+   (if
+    (local.get $1)
+    (block
+     (local.set $0
+      (i32.const 0)
+     )
+     (loop $label$28
+      (if
+       (i32.lt_s
+        (local.get $0)
+        (local.tee $2
+         (call $7
+          (local.get $1)
+         )
+        )
+       )
+       (local.set $0
+        (local.get $2)
+       )
+      )
+      (local.set $2
+       (i32.load offset=8
+        (local.get $1)
+       )
+      )
+      (call $36
+       (local.get $1)
+      )
+      (if
+       (local.get $2)
+       (block
+        (local.set $1
+         (local.get $2)
+        )
+        (br $label$28)
+       )
+      )
+     )
+    )
+    (local.set $0
+     (i32.const 0)
+    )
+   )
+   (i32.store
+    (local.get $7)
+    (local.get $3)
+   )
+   (i32.store offset=4
+    (local.get $7)
+    (local.get $0)
+   )
+   (drop
+    (call $33
+     (i32.const 1151)
+     (local.get $7)
+    )
+   )
+   (global.set $global$1
+    (local.get $5)
+   )
+   (i32.const 0)
   )
-  (func $7 (;20;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32) (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32) (local $15 i32) (local $16 i32) (local $17 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $0
-      i32.load offset=4
-      local.tee $4
-      i32.const 2
-      i32.shl
-      local.tee $15
-      call $35
-      local.set $3
-      local.get $15
-      call $35
-      local.set $6
-      local.get $15
-      call $35
-      local.set $10
-      local.get $4
-      i32.const 0
-      i32.gt_s
-      local.tee $2
-      if ;; label = @2
-        block ;; label = @3
-          i32.const 0
-          local.set $1
-          loop $label$3 ;; label = @4
-            local.get $3
-            local.get $1
-            i32.const 2
-            i32.shl
-            i32.add
-            local.get $1
-            i32.store
-            local.get $1
-            i32.const 1
-            i32.add
-            local.tee $1
-            local.get $4
-            i32.ne
-            br_if 0 (;@4;)
-          end
-          local.get $3
-          local.get $0
-          i32.load
-          local.tee $0
-          i32.const 2
-          i32.shl
-          i32.add
-          local.get $4
-          i32.const -1
-          i32.add
-          local.tee $11
-          i32.store
-          local.get $3
-          local.get $11
-          i32.const 2
-          i32.shl
-          i32.add
-          local.tee $14
-          local.get $0
-          i32.store
-          local.get $2
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 0
-              local.set $0
-              local.get $4
-              local.set $1
-              loop $label$5 ;; label = @6
-                block $label$6 ;; label = @7
-                  local.get $1
-                  i32.const 1
-                  i32.gt_s
-                  if ;; label = @8
-                    loop $label$8 ;; label = @9
-                      local.get $10
-                      local.get $1
-                      i32.const -1
-                      i32.add
-                      local.tee $2
-                      i32.const 2
-                      i32.shl
-                      i32.add
-                      local.get $1
-                      i32.store
-                      local.get $2
-                      i32.const 1
-                      i32.gt_s
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $2
-                          local.set $1
-                          br 2 (;@9;)
-                        end
-                      else
-                        i32.const 1
-                        local.set $2
-                      end
-                    end
-                  else
-                    local.get $1
-                    local.set $2
-                  end
-                  local.get $3
-                  i32.load
-                  local.tee $7
-                  if ;; label = @8
-                    local.get $14
-                    i32.load
-                    local.get $11
-                    i32.ne
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $6
-                        local.get $3
-                        local.get $15
-                        call $40
-                        drop
-                        i32.const 0
-                        local.set $8
-                        local.get $6
-                        i32.load
-                        local.set $9
-                        loop $label$14 ;; label = @11
-                          local.get $9
-                          i32.const -1
-                          i32.add
-                          local.tee $1
-                          i32.const 1
-                          i32.gt_s
-                          if ;; label = @12
-                            block ;; label = @13
-                              i32.const 1
-                              local.set $5
-                              loop $label$16 ;; label = @14
-                                local.get $6
-                                local.get $5
-                                i32.const 2
-                                i32.shl
-                                i32.add
-                                local.tee $12
-                                i32.load
-                                local.set $17
-                                local.get $12
-                                local.get $6
-                                local.get $1
-                                i32.const 2
-                                i32.shl
-                                i32.add
-                                local.tee $12
-                                i32.load
-                                i32.store
-                                local.get $12
-                                local.get $17
-                                i32.store
-                                local.get $5
-                                i32.const 1
-                                i32.add
-                                local.tee $5
-                                local.get $1
-                                i32.const -1
-                                i32.add
-                                local.tee $1
-                                i32.lt_s
-                                br_if 0 (;@14;)
-                              end
-                            end
-                          end
-                          local.get $8
-                          i32.const 1
-                          i32.add
-                          local.set $5
-                          local.get $6
-                          local.get $9
-                          i32.const 2
-                          i32.shl
-                          i32.add
-                          local.tee $12
-                          i32.load
-                          local.set $1
-                          local.get $12
-                          local.get $9
-                          i32.store
-                          local.get $1
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $5
-                              local.set $8
-                              local.get $1
-                              local.set $9
-                              br 2 (;@11;)
-                            end
-                          end
-                        end
-                        local.get $0
-                        local.get $8
-                        i32.le_s
-                        if ;; label = @11
-                          local.get $5
-                          local.set $0
-                        end
-                      end
-                    end
-                  end
-                  local.get $2
-                  local.get $11
-                  i32.lt_s
-                  if ;; label = @8
-                    local.get $2
-                    local.set $1
-                  else
-                    block ;; label = @9
-                      i32.const 31
-                      local.set $1
-                      br 2 (;@7;)
-                    end
-                  end
-                  loop $label$21 ;; label = @8
-                    local.get $1
-                    i32.const 0
-                    i32.gt_s
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const 0
-                        local.set $2
-                        loop $label$23 ;; label = @11
-                          local.get $3
-                          local.get $2
-                          i32.const 2
-                          i32.shl
-                          i32.add
-                          local.get $3
-                          local.get $2
-                          i32.const 1
-                          i32.add
-                          local.tee $2
-                          i32.const 2
-                          i32.shl
-                          i32.add
-                          i32.load
-                          i32.store
-                          local.get $2
-                          local.get $1
-                          i32.lt_s
-                          br_if 0 (;@11;)
-                          local.get $1
-                          local.set $2
-                        end
-                      end
-                    else
-                      i32.const 0
-                      local.set $2
-                    end
-                    local.get $3
-                    local.get $2
-                    i32.const 2
-                    i32.shl
-                    i32.add
-                    local.get $7
-                    i32.store
-                    local.get $10
-                    local.get $1
-                    i32.const 2
-                    i32.shl
-                    i32.add
-                    local.tee $2
-                    i32.load
-                    local.set $5
-                    local.get $2
-                    local.get $5
-                    i32.const -1
-                    i32.add
-                    i32.store
-                    local.get $5
-                    i32.const 1
-                    i32.gt_s
-                    br_if 2 (;@6;)
-                    local.get $1
-                    i32.const 1
-                    i32.add
-                    local.tee $1
-                    local.get $11
-                    i32.lt_s
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $3
-                        i32.load
-                        local.set $7
-                        br 2 (;@8;)
-                      end
-                    else
-                      block ;; label = @10
-                        i32.const 31
-                        local.set $1
-                        br 3 (;@7;)
-                      end
-                    end
-                  end
-                end
-              end
-              local.get $1
-              i32.const 31
-              i32.eq
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $3
-                  call $36
-                  local.get $6
-                  call $36
-                  local.get $10
-                  call $36
-                  local.get $0
-                  return
-                end
-              end
-            end
-          else
-            block ;; label = @5
-              local.get $14
-              local.set $16
-              local.get $11
-              local.set $13
-            end
-          end
-        end
-      else
-        block ;; label = @3
-          local.get $3
-          local.get $0
-          i32.load
-          local.tee $0
-          i32.const 2
-          i32.shl
-          i32.add
-          local.get $4
-          i32.const -1
-          i32.add
-          local.tee $13
-          i32.store
-          local.get $3
-          local.get $13
-          i32.const 2
-          i32.shl
-          i32.add
-          local.tee $16
-          local.get $0
-          i32.store
-        end
-      end
-      i32.const 0
-      local.set $0
-      local.get $4
-      local.set $1
-      loop $label$30 ;; label = @2
-        block $label$31 ;; label = @3
-          local.get $1
-          i32.const 1
-          i32.gt_s
-          if ;; label = @4
-            loop $label$33 ;; label = @5
-              local.get $10
-              local.get $1
-              i32.const -1
-              i32.add
-              local.tee $2
-              i32.const 2
-              i32.shl
-              i32.add
-              local.get $1
-              i32.store
-              local.get $2
-              i32.const 1
-              i32.gt_s
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $2
-                  local.set $1
-                  br 2 (;@5;)
-                end
-              else
-                i32.const 1
-                local.set $2
-              end
-            end
-          else
-            local.get $1
-            local.set $2
-          end
-          local.get $3
-          i32.load
-          local.tee $9
-          if ;; label = @4
-            local.get $16
-            i32.load
-            local.get $13
-            i32.ne
-            if ;; label = @5
-              block ;; label = @6
-                i32.const 0
-                local.set $5
-                local.get $6
-                i32.load
-                local.set $8
-                loop $label$39 ;; label = @7
-                  local.get $8
-                  i32.const -1
-                  i32.add
-                  local.tee $1
-                  i32.const 1
-                  i32.gt_s
-                  if ;; label = @8
-                    block ;; label = @9
-                      i32.const 1
-                      local.set $4
-                      loop $label$41 ;; label = @10
-                        local.get $6
-                        local.get $4
-                        i32.const 2
-                        i32.shl
-                        i32.add
-                        local.tee $7
-                        i32.load
-                        local.set $14
-                        local.get $7
-                        local.get $6
-                        local.get $1
-                        i32.const 2
-                        i32.shl
-                        i32.add
-                        local.tee $7
-                        i32.load
-                        i32.store
-                        local.get $7
-                        local.get $14
-                        i32.store
-                        local.get $4
-                        i32.const 1
-                        i32.add
-                        local.tee $4
-                        local.get $1
-                        i32.const -1
-                        i32.add
-                        local.tee $1
-                        i32.lt_s
-                        br_if 0 (;@10;)
-                      end
-                    end
-                  end
-                  local.get $5
-                  i32.const 1
-                  i32.add
-                  local.set $4
-                  local.get $6
-                  local.get $8
-                  i32.const 2
-                  i32.shl
-                  i32.add
-                  local.tee $7
-                  i32.load
-                  local.set $1
-                  local.get $7
-                  local.get $8
-                  i32.store
-                  local.get $1
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $4
-                      local.set $5
-                      local.get $1
-                      local.set $8
-                      br 2 (;@7;)
-                    end
-                  end
-                end
-                local.get $0
-                local.get $5
-                i32.le_s
-                if ;; label = @7
-                  local.get $4
-                  local.set $0
-                end
-              end
-            end
-          end
-          local.get $2
-          local.get $13
-          i32.lt_s
-          if ;; label = @4
-            local.get $2
-            local.set $1
-          else
-            block ;; label = @5
-              i32.const 31
-              local.set $1
-              br 2 (;@3;)
-            end
-          end
-          loop $label$46 ;; label = @4
-            local.get $1
-            i32.const 0
-            i32.gt_s
-            if ;; label = @5
-              block ;; label = @6
-                i32.const 0
-                local.set $2
-                loop $label$48 ;; label = @7
-                  local.get $3
-                  local.get $2
-                  i32.const 2
-                  i32.shl
-                  i32.add
-                  local.get $3
-                  local.get $2
-                  i32.const 1
-                  i32.add
-                  local.tee $2
-                  i32.const 2
-                  i32.shl
-                  i32.add
-                  i32.load
-                  i32.store
-                  local.get $2
-                  local.get $1
-                  i32.lt_s
-                  br_if 0 (;@7;)
-                  local.get $1
-                  local.set $2
-                end
-              end
-            else
-              i32.const 0
-              local.set $2
-            end
-            local.get $3
-            local.get $2
-            i32.const 2
-            i32.shl
-            i32.add
-            local.get $9
-            i32.store
-            local.get $10
-            local.get $1
-            i32.const 2
-            i32.shl
-            i32.add
-            local.tee $2
-            i32.load
-            local.set $4
-            local.get $2
-            local.get $4
-            i32.const -1
-            i32.add
-            i32.store
-            local.get $4
-            i32.const 1
-            i32.gt_s
-            br_if 2 (;@2;)
-            local.get $1
-            i32.const 1
-            i32.add
-            local.tee $1
-            local.get $13
-            i32.lt_s
-            if ;; label = @5
-              block ;; label = @6
-                local.get $3
-                i32.load
-                local.set $9
-                br 2 (;@4;)
-              end
-            else
-              block ;; label = @6
-                i32.const 31
-                local.set $1
-                br 3 (;@3;)
-              end
-            end
-          end
-        end
-      end
-      local.get $1
-      i32.const 31
-      i32.eq
-      if ;; label = @2
-        block ;; label = @3
-          local.get $3
-          call $36
-          local.get $6
-          call $36
-          local.get $10
-          call $36
-          local.get $0
-          return
-        end
-      end
-      i32.const 0
-    end
+ )
+ (func $9 (; 22 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 16)
+    )
+   )
+   (i32.store
+    (local.tee $2
+     (local.get $1)
+    )
+    (i32.load offset=60
+     (local.get $0)
+    )
+   )
+   (local.set $0
+    (call $11
+     (call $fimport$8
+      (i32.const 6)
+      (local.get $2)
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $1)
+   )
+   (local.get $0)
   )
-  (func $8 (;21;) (type $4) (param $0 i32) (param $1 i32) (result i32)
-    (local $2 i32) (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $5
-      global.get $global$1
-      i32.const 32
-      i32.add
-      global.set $global$1
-      local.get $5
-      i32.const 16
-      i32.add
-      local.set $7
-      local.get $5
-      i32.const 8
-      i32.add
-      local.set $10
-      local.get $5
-      local.set $2
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          local.get $0
-          i32.const 1
-          i32.le_s
-          br_if 0 (;@3;)
-          block $label$4 ;; label = @4
-            block $label$5 ;; label = @5
-              block $label$6 ;; label = @6
-                block $label$7 ;; label = @7
-                  block $label$8 ;; label = @8
-                    block $label$9 ;; label = @9
-                      block $label$10 ;; label = @10
-                        local.get $1
-                        i32.load offset=4
-                        i32.load8_s
-                        local.tee $0
-                        i32.const 48
-                        i32.sub
-                        br_table 5 (;@5;) 0 (;@10;) 2 (;@8;) 1 (;@9;) 3 (;@7;) 4 (;@6;) 6 (;@4;)
-                      end
-                      i32.const 9
-                      local.set $3
-                      br 7 (;@2;)
-                    end
-                    br 5 (;@3;)
-                  end
-                  i32.const 10
-                  local.set $3
-                  br 5 (;@2;)
-                end
-                i32.const 11
-                local.set $3
-                br 4 (;@2;)
-              end
-              i32.const 12
-              local.set $3
-              br 3 (;@2;)
-            end
-            local.get $5
-            global.set $global$1
-            i32.const 0
-            return
-          end
-          local.get $2
-          local.get $0
-          i32.const -48
-          i32.add
-          i32.store
-          i32.const 1140
-          local.get $2
-          call $33
-          drop
-          local.get $5
-          global.set $global$1
-          i32.const -1
-          return
-        end
-        i32.const 11
-        local.set $3
-      end
-      local.get $3
-      i32.const -1
-      i32.add
-      local.set $6
-      i32.const 0
-      local.set $2
-      i32.const 0
-      local.set $0
-      loop $label$11 ;; label = @2
-        i32.const 12
-        call $35
-        local.tee $1
-        local.get $0
-        i32.store
-        local.get $1
-        local.get $3
-        i32.store offset=4
-        local.get $1
-        local.get $2
-        i32.store offset=8
-        local.get $0
-        i32.const 1
-        i32.add
-        local.tee $0
-        local.get $6
-        i32.ne
-        if ;; label = @3
-          block ;; label = @4
-            local.get $1
-            local.set $2
-            br 2 (;@2;)
-          end
-        end
-      end
-      local.get $3
-      i32.const 2
-      i32.shl
-      local.tee $0
-      call $35
-      local.set $4
-      local.get $0
-      call $35
-      local.set $8
-      i32.const 0
-      local.set $0
-      loop $label$13 ;; label = @2
-        local.get $4
-        local.get $0
-        i32.const 2
-        i32.shl
-        i32.add
-        local.get $0
-        i32.store
-        local.get $0
-        i32.const 1
-        i32.add
-        local.tee $0
-        local.get $3
-        i32.ne
-        br_if 0 (;@2;)
-      end
-      local.get $3
-      local.set $0
-      i32.const 30
-      local.set $6
-      loop $label$14 ;; label = @2
-        block $label$15 ;; label = @3
-          i32.const 0
-          local.set $2
-          loop $label$16 ;; label = @4
-            local.get $10
-            local.get $4
-            local.get $2
-            i32.const 2
-            i32.shl
-            i32.add
-            i32.load
-            i32.const 1
-            i32.add
-            i32.store
-            i32.const 1174
-            local.get $10
-            call $33
-            drop
-            local.get $2
-            i32.const 1
-            i32.add
-            local.tee $2
-            local.get $3
-            i32.ne
-            br_if 0 (;@4;)
-          end
-          i32.const 10
-          call $34
-          drop
-          local.get $0
-          i32.const 1
-          i32.gt_s
-          if ;; label = @4
-            loop $label$18 ;; label = @5
-              local.get $8
-              local.get $0
-              i32.const -1
-              i32.add
-              local.tee $2
-              i32.const 2
-              i32.shl
-              i32.add
-              local.get $0
-              i32.store
-              local.get $2
-              i32.const 1
-              i32.gt_s
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $2
-                  local.set $0
-                  br 2 (;@5;)
-                end
-              else
-                i32.const 1
-                local.set $0
-              end
-            end
-          else
-            local.get $0
-            local.get $3
-            i32.eq
-            br_if 1 (;@3;)
-          end
-          local.get $6
-          i32.const -1
-          i32.add
-          local.set $6
-          loop $label$22 ;; label = @4
-            block $label$23 ;; label = @5
-              local.get $4
-              i32.load
-              local.set $9
-              local.get $0
-              i32.const 0
-              i32.gt_s
-              if ;; label = @6
-                block ;; label = @7
-                  i32.const 0
-                  local.set $2
-                  loop $label$25 ;; label = @8
-                    local.get $4
-                    local.get $2
-                    i32.const 2
-                    i32.shl
-                    i32.add
-                    local.get $4
-                    local.get $2
-                    i32.const 1
-                    i32.add
-                    local.tee $2
-                    i32.const 2
-                    i32.shl
-                    i32.add
-                    i32.load
-                    i32.store
-                    local.get $2
-                    local.get $0
-                    i32.lt_s
-                    br_if 0 (;@8;)
-                    local.get $0
-                    local.set $2
-                  end
-                end
-              else
-                i32.const 0
-                local.set $2
-              end
-              local.get $4
-              local.get $2
-              i32.const 2
-              i32.shl
-              i32.add
-              local.get $9
-              i32.store
-              local.get $8
-              local.get $0
-              i32.const 2
-              i32.shl
-              i32.add
-              local.tee $9
-              i32.load
-              local.set $2
-              local.get $9
-              local.get $2
-              i32.const -1
-              i32.add
-              i32.store
-              local.get $2
-              i32.const 1
-              i32.gt_s
-              br_if 0 (;@5;)
-              local.get $0
-              i32.const 1
-              i32.add
-              local.tee $0
-              local.get $3
-              i32.ne
-              br_if 1 (;@4;)
-              br 2 (;@3;)
-            end
-          end
-          local.get $6
-          br_if 1 (;@2;)
-        end
-      end
-      local.get $4
-      call $36
-      local.get $8
-      call $36
-      local.get $1
-      if ;; label = @2
-        block ;; label = @3
-          i32.const 0
-          local.set $0
-          loop $label$28 ;; label = @4
-            local.get $0
-            local.get $1
-            call $7
-            local.tee $2
-            i32.lt_s
-            if ;; label = @5
-              local.get $2
-              local.set $0
-            end
-            local.get $1
-            i32.load offset=8
-            local.set $2
-            local.get $1
-            call $36
-            local.get $2
-            if ;; label = @5
-              block ;; label = @6
-                local.get $2
-                local.set $1
-                br 2 (;@4;)
-              end
-            end
-          end
-        end
-      else
-        i32.const 0
-        local.set $0
-      end
-      local.get $7
-      local.get $3
-      i32.store
-      local.get $7
-      local.get $0
-      i32.store offset=4
-      i32.const 1151
-      local.get $7
-      call $33
-      drop
-      local.get $5
-      global.set $global$1
-      i32.const 0
-    end
+ )
+ (func $10 (; 23 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 32)
+    )
+   )
+   (i32.store
+    (local.tee $3
+     (local.get $4)
+    )
+    (i32.load offset=60
+     (local.get $0)
+    )
+   )
+   (i32.store offset=4
+    (local.get $3)
+    (i32.const 0)
+   )
+   (i32.store offset=8
+    (local.get $3)
+    (local.get $1)
+   )
+   (i32.store offset=12
+    (local.get $3)
+    (local.tee $0
+     (i32.add
+      (local.get $4)
+      (i32.const 20)
+     )
+    )
+   )
+   (i32.store offset=16
+    (local.get $3)
+    (local.get $2)
+   )
+   (local.set $0
+    (if (result i32)
+     (i32.lt_s
+      (call $11
+       (call $fimport$14
+        (i32.const 140)
+        (local.get $3)
+       )
+      )
+      (i32.const 0)
+     )
+     (block (result i32)
+      (i32.store
+       (local.get $0)
+       (i32.const -1)
+      )
+      (i32.const -1)
+     )
+     (i32.load
+      (local.get $0)
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $4)
+   )
+   (local.get $0)
   )
-  (func $9 (;22;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $1
-      global.get $global$1
-      i32.const 16
-      i32.add
-      global.set $global$1
-      local.get $1
-      local.tee $2
-      local.get $0
-      i32.load offset=60
-      i32.store
-      i32.const 6
-      local.get $2
-      call $fimport$8
-      call $11
-      local.set $0
-      local.get $1
-      global.set $global$1
-      local.get $0
-    end
+ )
+ (func $11 (; 24 ;) (type $1) (param $0 i32) (result i32)
+  (if (result i32)
+   (i32.gt_u
+    (local.get $0)
+    (i32.const -4096)
+   )
+   (block (result i32)
+    (i32.store
+     (call $12)
+     (i32.sub
+      (i32.const 0)
+      (local.get $0)
+     )
+    )
+    (i32.const -1)
+   )
+   (local.get $0)
   )
-  (func $10 (;23;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $4
-      global.get $global$1
-      i32.const 32
-      i32.add
-      global.set $global$1
-      local.get $4
-      local.tee $3
-      local.get $0
-      i32.load offset=60
-      i32.store
-      local.get $3
-      i32.const 0
-      i32.store offset=4
-      local.get $3
-      local.get $1
-      i32.store offset=8
-      local.get $3
-      local.get $4
-      i32.const 20
-      i32.add
-      local.tee $0
-      i32.store offset=12
-      local.get $3
-      local.get $2
-      i32.store offset=16
-      i32.const 140
-      local.get $3
-      call $fimport$14
-      call $11
-      i32.const 0
-      i32.lt_s
-      if (result i32) ;; label = @2
-        block (result i32) ;; label = @3
-          local.get $0
-          i32.const -1
-          i32.store
-          i32.const -1
-        end
-      else
-        local.get $0
-        i32.load
-      end
-      local.set $0
-      local.get $4
-      global.set $global$1
-      local.get $0
-    end
+ )
+ (func $12 (; 25 ;) (type $3) (result i32)
+  (i32.const 3648)
+ )
+ (func $13 (; 26 ;) (type $2) (param $0 i32)
+  (nop)
+ )
+ (func $14 (; 27 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 80)
+    )
+   )
+   (local.set $3
+    (local.get $4)
+   )
+   (local.set $5
+    (i32.add
+     (local.get $4)
+     (i32.const 12)
+    )
+   )
+   (i32.store offset=36
+    (local.get $0)
+    (i32.const 3)
+   )
+   (if
+    (i32.eqz
+     (i32.and
+      (i32.load
+       (local.get $0)
+      )
+      (i32.const 64)
+     )
+    )
+    (block
+     (i32.store
+      (local.get $3)
+      (i32.load offset=60
+       (local.get $0)
+      )
+     )
+     (i32.store offset=4
+      (local.get $3)
+      (i32.const 21505)
+     )
+     (i32.store offset=8
+      (local.get $3)
+      (local.get $5)
+     )
+     (if
+      (call $fimport$13
+       (i32.const 54)
+       (local.get $3)
+      )
+      (i32.store8 offset=75
+       (local.get $0)
+       (i32.const -1)
+      )
+     )
+    )
+   )
+   (local.set $0
+    (call $15
+     (local.get $0)
+     (local.get $1)
+     (local.get $2)
+    )
+   )
+   (global.set $global$1
+    (local.get $4)
+   )
+   (local.get $0)
   )
-  (func $11 (;24;) (type $1) (param $0 i32) (result i32)
-    local.get $0
-    i32.const -4096
-    i32.gt_u
-    if (result i32) ;; label = @1
-      block (result i32) ;; label = @2
-        call $12
-        i32.const 0
-        local.get $0
-        i32.sub
-        i32.store
-        i32.const -1
-      end
-    else
-      local.get $0
-    end
+ )
+ (func $15 (; 28 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (block $label$1 (result i32)
+   (local.set $8
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 48)
+    )
+   )
+   (local.set $9
+    (i32.add
+     (local.get $8)
+     (i32.const 16)
+    )
+   )
+   (local.set $10
+    (local.get $8)
+   )
+   (i32.store
+    (local.tee $3
+     (i32.add
+      (local.get $8)
+      (i32.const 32)
+     )
+    )
+    (local.tee $4
+     (i32.load
+      (local.tee $6
+       (i32.add
+        (local.get $0)
+        (i32.const 28)
+       )
+      )
+     )
+    )
+   )
+   (i32.store offset=4
+    (local.get $3)
+    (local.tee $5
+     (i32.sub
+      (i32.load
+       (local.tee $11
+        (i32.add
+         (local.get $0)
+         (i32.const 20)
+        )
+       )
+      )
+      (local.get $4)
+     )
+    )
+   )
+   (i32.store offset=8
+    (local.get $3)
+    (local.get $1)
+   )
+   (i32.store offset=12
+    (local.get $3)
+    (local.get $2)
+   )
+   (local.set $13
+    (i32.add
+     (local.get $0)
+     (i32.const 60)
+    )
+   )
+   (local.set $14
+    (i32.add
+     (local.get $0)
+     (i32.const 44)
+    )
+   )
+   (local.set $1
+    (local.get $3)
+   )
+   (local.set $4
+    (i32.const 2)
+   )
+   (local.set $12
+    (i32.add
+     (local.get $5)
+     (local.get $2)
+    )
+   )
+   (block $label$2
+    (block $label$3
+     (block $label$4
+      (loop $label$5
+       (if
+        (i32.load
+         (i32.const 3604)
+        )
+        (block
+         (call $fimport$9
+          (i32.const 1)
+          (local.get $0)
+         )
+         (i32.store
+          (local.get $10)
+          (i32.load
+           (local.get $13)
+          )
+         )
+         (i32.store offset=4
+          (local.get $10)
+          (local.get $1)
+         )
+         (i32.store offset=8
+          (local.get $10)
+          (local.get $4)
+         )
+         (local.set $3
+          (call $11
+           (call $fimport$15
+            (i32.const 146)
+            (local.get $10)
+           )
+          )
+         )
+         (call $fimport$7
+          (i32.const 0)
+         )
+        )
+        (block
+         (i32.store
+          (local.get $9)
+          (i32.load
+           (local.get $13)
+          )
+         )
+         (i32.store offset=4
+          (local.get $9)
+          (local.get $1)
+         )
+         (i32.store offset=8
+          (local.get $9)
+          (local.get $4)
+         )
+         (local.set $3
+          (call $11
+           (call $fimport$15
+            (i32.const 146)
+            (local.get $9)
+           )
+          )
+         )
+        )
+       )
+       (br_if $label$4
+        (i32.eq
+         (local.get $12)
+         (local.get $3)
+        )
+       )
+       (br_if $label$3
+        (i32.lt_s
+         (local.get $3)
+         (i32.const 0)
+        )
+       )
+       (local.set $5
+        (if (result i32)
+         (i32.gt_u
+          (local.get $3)
+          (local.tee $5
+           (i32.load offset=4
+            (local.get $1)
+           )
+          )
+         )
+         (block (result i32)
+          (i32.store
+           (local.get $6)
+           (local.tee $7
+            (i32.load
+             (local.get $14)
+            )
+           )
+          )
+          (i32.store
+           (local.get $11)
+           (local.get $7)
+          )
+          (local.set $7
+           (i32.load offset=12
+            (local.get $1)
+           )
+          )
+          (local.set $1
+           (i32.add
+            (local.get $1)
+            (i32.const 8)
+           )
+          )
+          (local.set $4
+           (i32.add
+            (local.get $4)
+            (i32.const -1)
+           )
+          )
+          (i32.sub
+           (local.get $3)
+           (local.get $5)
+          )
+         )
+         (if (result i32)
+          (i32.eq
+           (local.get $4)
+           (i32.const 2)
+          )
+          (block (result i32)
+           (i32.store
+            (local.get $6)
+            (i32.add
+             (i32.load
+              (local.get $6)
+             )
+             (local.get $3)
+            )
+           )
+           (local.set $7
+            (local.get $5)
+           )
+           (local.set $4
+            (i32.const 2)
+           )
+           (local.get $3)
+          )
+          (block (result i32)
+           (local.set $7
+            (local.get $5)
+           )
+           (local.get $3)
+          )
+         )
+        )
+       )
+       (i32.store
+        (local.get $1)
+        (i32.add
+         (i32.load
+          (local.get $1)
+         )
+         (local.get $5)
+        )
+       )
+       (i32.store offset=4
+        (local.get $1)
+        (i32.sub
+         (local.get $7)
+         (local.get $5)
+        )
+       )
+       (local.set $12
+        (i32.sub
+         (local.get $12)
+         (local.get $3)
+        )
+       )
+       (br $label$5)
+      )
+     )
+     (i32.store offset=16
+      (local.get $0)
+      (i32.add
+       (local.tee $1
+        (i32.load
+         (local.get $14)
+        )
+       )
+       (i32.load offset=48
+        (local.get $0)
+       )
+      )
+     )
+     (i32.store
+      (local.get $6)
+      (local.get $1)
+     )
+     (i32.store
+      (local.get $11)
+      (local.get $1)
+     )
+     (br $label$2)
+    )
+    (i32.store offset=16
+     (local.get $0)
+     (i32.const 0)
+    )
+    (i32.store
+     (local.get $6)
+     (i32.const 0)
+    )
+    (i32.store
+     (local.get $11)
+     (i32.const 0)
+    )
+    (i32.store
+     (local.get $0)
+     (i32.or
+      (i32.load
+       (local.get $0)
+      )
+      (i32.const 32)
+     )
+    )
+    (local.set $2
+     (if (result i32)
+      (i32.eq
+       (local.get $4)
+       (i32.const 2)
+      )
+      (i32.const 0)
+      (i32.sub
+       (local.get $2)
+       (i32.load offset=4
+        (local.get $1)
+       )
+      )
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $8)
+   )
+   (local.get $2)
   )
-  (func $12 (;25;) (type $3) (result i32)
-    i32.const 3648
+ )
+ (func $16 (; 29 ;) (type $2) (param $0 i32)
+  (if
+   (i32.eqz
+    (i32.load offset=68
+     (local.get $0)
+    )
+   )
+   (call $13
+    (local.get $0)
+   )
   )
-  (func $13 (;26;) (type $2) (param $0 i32)
-    nop
+ )
+ (func $17 (; 30 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (block $label$1 (result i32)
+   (local.set $5
+    (i32.and
+     (local.get $1)
+     (i32.const 255)
+    )
+   )
+   (block $label$2
+    (block $label$3
+     (block $label$4
+      (if
+       (i32.and
+        (local.tee $4
+         (i32.ne
+          (local.get $2)
+          (i32.const 0)
+         )
+        )
+        (i32.ne
+         (i32.and
+          (local.get $0)
+          (i32.const 3)
+         )
+         (i32.const 0)
+        )
+       )
+       (block
+        (local.set $4
+         (i32.and
+          (local.get $1)
+          (i32.const 255)
+         )
+        )
+        (local.set $3
+         (local.get $2)
+        )
+        (local.set $2
+         (local.get $0)
+        )
+        (loop $label$6
+         (if
+          (i32.eq
+           (i32.load8_s
+            (local.get $2)
+           )
+           (i32.shr_s
+            (i32.shl
+             (local.get $4)
+             (i32.const 24)
+            )
+            (i32.const 24)
+           )
+          )
+          (block
+           (local.set $0
+            (local.get $3)
+           )
+           (br $label$3)
+          )
+         )
+         (br_if $label$6
+          (i32.and
+           (local.tee $0
+            (i32.ne
+             (local.tee $3
+              (i32.add
+               (local.get $3)
+               (i32.const -1)
+              )
+             )
+             (i32.const 0)
+            )
+           )
+           (i32.ne
+            (i32.and
+             (local.tee $2
+              (i32.add
+               (local.get $2)
+               (i32.const 1)
+              )
+             )
+             (i32.const 3)
+            )
+            (i32.const 0)
+           )
+          )
+         )
+         (br $label$4)
+        )
+       )
+       (block
+        (local.set $3
+         (local.get $2)
+        )
+        (local.set $2
+         (local.get $0)
+        )
+        (local.set $0
+         (local.get $4)
+        )
+       )
+      )
+     )
+     (if
+      (local.get $0)
+      (block
+       (local.set $0
+        (local.get $3)
+       )
+       (br $label$3)
+      )
+      (local.set $0
+       (i32.const 0)
+      )
+     )
+     (br $label$2)
+    )
+    (if
+     (i32.ne
+      (i32.load8_s
+       (local.get $2)
+      )
+      (i32.shr_s
+       (i32.shl
+        (local.tee $1
+         (i32.and
+          (local.get $1)
+          (i32.const 255)
+         )
+        )
+        (i32.const 24)
+       )
+       (i32.const 24)
+      )
+     )
+     (block
+      (local.set $3
+       (i32.mul
+        (local.get $5)
+        (i32.const 16843009)
+       )
+      )
+      (block $label$12
+       (block $label$13
+        (br_if $label$13
+         (i32.le_u
+          (local.get $0)
+          (i32.const 3)
+         )
+        )
+        (loop $label$14
+         (if
+          (i32.eqz
+           (i32.and
+            (i32.xor
+             (i32.and
+              (local.tee $4
+               (i32.xor
+                (i32.load
+                 (local.get $2)
+                )
+                (local.get $3)
+               )
+              )
+              (i32.const -2139062144)
+             )
+             (i32.const -2139062144)
+            )
+            (i32.add
+             (local.get $4)
+             (i32.const -16843009)
+            )
+           )
+          )
+          (block
+           (local.set $2
+            (i32.add
+             (local.get $2)
+             (i32.const 4)
+            )
+           )
+           (br_if $label$14
+            (i32.gt_u
+             (local.tee $0
+              (i32.add
+               (local.get $0)
+               (i32.const -4)
+              )
+             )
+             (i32.const 3)
+            )
+           )
+           (br $label$13)
+          )
+         )
+        )
+        (br $label$12)
+       )
+       (if
+        (i32.eqz
+         (local.get $0)
+        )
+        (block
+         (local.set $0
+          (i32.const 0)
+         )
+         (br $label$2)
+        )
+       )
+      )
+      (loop $label$17
+       (br_if $label$2
+        (i32.eq
+         (i32.load8_s
+          (local.get $2)
+         )
+         (i32.shr_s
+          (i32.shl
+           (local.get $1)
+           (i32.const 24)
+          )
+          (i32.const 24)
+         )
+        )
+       )
+       (local.set $2
+        (i32.add
+         (local.get $2)
+         (i32.const 1)
+        )
+       )
+       (br_if $label$17
+        (local.tee $0
+         (i32.add
+          (local.get $0)
+          (i32.const -1)
+         )
+        )
+       )
+       (local.set $0
+        (i32.const 0)
+       )
+      )
+     )
+    )
+   )
+   (if (result i32)
+    (local.get $0)
+    (local.get $2)
+    (i32.const 0)
+   )
   )
-  (func $14 (;27;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $4
-      global.get $global$1
-      i32.const 80
-      i32.add
-      global.set $global$1
-      local.get $4
-      local.set $3
-      local.get $4
-      i32.const 12
-      i32.add
-      local.set $5
-      local.get $0
-      i32.const 3
-      i32.store offset=36
-      local.get $0
-      i32.load
-      i32.const 64
-      i32.and
-      i32.eqz
-      if ;; label = @2
-        block ;; label = @3
-          local.get $3
-          local.get $0
-          i32.load offset=60
-          i32.store
-          local.get $3
-          i32.const 21505
-          i32.store offset=4
-          local.get $3
-          local.get $5
-          i32.store offset=8
-          i32.const 54
-          local.get $3
-          call $fimport$13
-          if ;; label = @4
-            local.get $0
-            i32.const -1
-            i32.store8 offset=75
-          end
-        end
-      end
-      local.get $0
-      local.get $1
-      local.get $2
-      call $15
-      local.set $0
-      local.get $4
-      global.set $global$1
-      local.get $0
-    end
+ )
+ (func $18 (; 31 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 224)
+    )
+   )
+   (local.set $5
+    (i32.add
+     (local.get $4)
+     (i32.const 136)
+    )
+   )
+   (i64.store align=4
+    (local.tee $3
+     (i32.add
+      (local.get $4)
+      (i32.const 80)
+     )
+    )
+    (i64.const 0)
+   )
+   (i64.store offset=8 align=4
+    (local.get $3)
+    (i64.const 0)
+   )
+   (i64.store offset=16 align=4
+    (local.get $3)
+    (i64.const 0)
+   )
+   (i64.store offset=24 align=4
+    (local.get $3)
+    (i64.const 0)
+   )
+   (i64.store offset=32 align=4
+    (local.get $3)
+    (i64.const 0)
+   )
+   (i32.store
+    (local.tee $6
+     (i32.add
+      (local.get $4)
+      (i32.const 120)
+     )
+    )
+    (i32.load
+     (local.get $2)
+    )
+   )
+   (if
+    (i32.lt_s
+     (call $19
+      (i32.const 0)
+      (local.get $1)
+      (local.get $6)
+      (local.tee $2
+       (local.get $4)
+      )
+      (local.get $3)
+     )
+     (i32.const 0)
+    )
+    (local.set $1
+     (i32.const -1)
+    )
+    (block
+     (local.set $12
+      (if (result i32)
+       (i32.gt_s
+        (i32.load offset=76
+         (local.get $0)
+        )
+        (i32.const -1)
+       )
+       (call $20
+        (local.get $0)
+       )
+       (i32.const 0)
+      )
+     )
+     (local.set $7
+      (i32.load
+       (local.get $0)
+      )
+     )
+     (if
+      (i32.lt_s
+       (i32.load8_s offset=74
+        (local.get $0)
+       )
+       (i32.const 1)
+      )
+      (i32.store
+       (local.get $0)
+       (i32.and
+        (local.get $7)
+        (i32.const -33)
+       )
+      )
+     )
+     (if
+      (i32.load
+       (local.tee $8
+        (i32.add
+         (local.get $0)
+         (i32.const 48)
+        )
+       )
+      )
+      (local.set $1
+       (call $19
+        (local.get $0)
+        (local.get $1)
+        (local.get $6)
+        (local.get $2)
+        (local.get $3)
+       )
+      )
+      (block
+       (local.set $10
+        (i32.load
+         (local.tee $9
+          (i32.add
+           (local.get $0)
+           (i32.const 44)
+          )
+         )
+        )
+       )
+       (i32.store
+        (local.get $9)
+        (local.get $5)
+       )
+       (i32.store
+        (local.tee $13
+         (i32.add
+          (local.get $0)
+          (i32.const 28)
+         )
+        )
+        (local.get $5)
+       )
+       (i32.store
+        (local.tee $11
+         (i32.add
+          (local.get $0)
+          (i32.const 20)
+         )
+        )
+        (local.get $5)
+       )
+       (i32.store
+        (local.get $8)
+        (i32.const 80)
+       )
+       (i32.store
+        (local.tee $14
+         (i32.add
+          (local.get $0)
+          (i32.const 16)
+         )
+        )
+        (i32.add
+         (local.get $5)
+         (i32.const 80)
+        )
+       )
+       (local.set $1
+        (call $19
+         (local.get $0)
+         (local.get $1)
+         (local.get $6)
+         (local.get $2)
+         (local.get $3)
+        )
+       )
+       (if
+        (local.get $10)
+        (block
+         (drop
+          (call_indirect (type $0)
+           (local.get $0)
+           (i32.const 0)
+           (i32.const 0)
+           (i32.add
+            (i32.and
+             (i32.load offset=36
+              (local.get $0)
+             )
+             (i32.const 3)
+            )
+            (i32.const 2)
+           )
+          )
+         )
+         (if
+          (i32.eqz
+           (i32.load
+            (local.get $11)
+           )
+          )
+          (local.set $1
+           (i32.const -1)
+          )
+         )
+         (i32.store
+          (local.get $9)
+          (local.get $10)
+         )
+         (i32.store
+          (local.get $8)
+          (i32.const 0)
+         )
+         (i32.store
+          (local.get $14)
+          (i32.const 0)
+         )
+         (i32.store
+          (local.get $13)
+          (i32.const 0)
+         )
+         (i32.store
+          (local.get $11)
+          (i32.const 0)
+         )
+        )
+       )
+      )
+     )
+     (i32.store
+      (local.get $0)
+      (i32.or
+       (local.tee $2
+        (i32.load
+         (local.get $0)
+        )
+       )
+       (i32.and
+        (local.get $7)
+        (i32.const 32)
+       )
+      )
+     )
+     (if
+      (local.get $12)
+      (call $13
+       (local.get $0)
+      )
+     )
+     (if
+      (i32.and
+       (local.get $2)
+       (i32.const 32)
+      )
+      (local.set $1
+       (i32.const -1)
+      )
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $4)
+   )
+   (local.get $1)
   )
-  (func $15 (;28;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $8
-      global.get $global$1
-      i32.const 48
-      i32.add
-      global.set $global$1
-      local.get $8
-      i32.const 16
-      i32.add
-      local.set $9
-      local.get $8
-      local.set $10
-      local.get $8
-      i32.const 32
-      i32.add
-      local.tee $3
-      local.get $0
-      i32.const 28
-      i32.add
-      local.tee $6
-      i32.load
-      local.tee $4
-      i32.store
-      local.get $3
-      local.get $0
-      i32.const 20
-      i32.add
-      local.tee $11
-      i32.load
-      local.get $4
-      i32.sub
-      local.tee $5
-      i32.store offset=4
-      local.get $3
-      local.get $1
-      i32.store offset=8
-      local.get $3
-      local.get $2
-      i32.store offset=12
-      local.get $0
-      i32.const 60
-      i32.add
-      local.set $13
-      local.get $0
-      i32.const 44
-      i32.add
-      local.set $14
-      local.get $3
-      local.set $1
-      i32.const 2
-      local.set $4
-      local.get $5
-      local.get $2
-      i32.add
-      local.set $12
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            loop $label$5 ;; label = @5
-              i32.const 3604
-              i32.load
-              if ;; label = @6
-                block ;; label = @7
-                  i32.const 1
-                  local.get $0
-                  call $fimport$9
-                  local.get $10
-                  local.get $13
-                  i32.load
-                  i32.store
-                  local.get $10
-                  local.get $1
-                  i32.store offset=4
-                  local.get $10
-                  local.get $4
-                  i32.store offset=8
-                  i32.const 146
-                  local.get $10
-                  call $fimport$15
-                  call $11
-                  local.set $3
-                  i32.const 0
-                  call $fimport$7
-                end
-              else
-                block ;; label = @7
-                  local.get $9
-                  local.get $13
-                  i32.load
-                  i32.store
-                  local.get $9
-                  local.get $1
-                  i32.store offset=4
-                  local.get $9
-                  local.get $4
-                  i32.store offset=8
-                  i32.const 146
-                  local.get $9
-                  call $fimport$15
-                  call $11
-                  local.set $3
-                end
-              end
-              local.get $12
-              local.get $3
-              i32.eq
-              br_if 1 (;@4;)
-              local.get $3
-              i32.const 0
-              i32.lt_s
-              br_if 2 (;@3;)
-              local.get $3
-              local.get $1
-              i32.load offset=4
-              local.tee $5
-              i32.gt_u
-              if (result i32) ;; label = @6
-                block (result i32) ;; label = @7
-                  local.get $6
-                  local.get $14
-                  i32.load
-                  local.tee $7
-                  i32.store
-                  local.get $11
-                  local.get $7
-                  i32.store
-                  local.get $1
-                  i32.load offset=12
-                  local.set $7
-                  local.get $1
-                  i32.const 8
-                  i32.add
-                  local.set $1
-                  local.get $4
-                  i32.const -1
-                  i32.add
-                  local.set $4
-                  local.get $3
-                  local.get $5
-                  i32.sub
-                end
-              else
-                local.get $4
-                i32.const 2
-                i32.eq
-                if (result i32) ;; label = @7
-                  block (result i32) ;; label = @8
-                    local.get $6
-                    local.get $6
-                    i32.load
-                    local.get $3
-                    i32.add
-                    i32.store
-                    local.get $5
-                    local.set $7
-                    i32.const 2
-                    local.set $4
-                    local.get $3
-                  end
-                else
-                  block (result i32) ;; label = @8
-                    local.get $5
-                    local.set $7
-                    local.get $3
-                  end
-                end
-              end
-              local.set $5
-              local.get $1
-              local.get $1
-              i32.load
-              local.get $5
-              i32.add
-              i32.store
-              local.get $1
-              local.get $7
-              local.get $5
-              i32.sub
-              i32.store offset=4
-              local.get $12
-              local.get $3
-              i32.sub
-              local.set $12
-              br 0 (;@5;)
-            end
-          end
-          local.get $0
-          local.get $14
-          i32.load
-          local.tee $1
-          local.get $0
-          i32.load offset=48
-          i32.add
-          i32.store offset=16
-          local.get $6
-          local.get $1
-          i32.store
-          local.get $11
-          local.get $1
-          i32.store
-          br 1 (;@2;)
-        end
-        local.get $0
-        i32.const 0
-        i32.store offset=16
-        local.get $6
-        i32.const 0
-        i32.store
-        local.get $11
-        i32.const 0
-        i32.store
-        local.get $0
-        local.get $0
-        i32.load
-        i32.const 32
-        i32.or
-        i32.store
-        local.get $4
-        i32.const 2
-        i32.eq
-        if (result i32) ;; label = @3
-          i32.const 0
-        else
-          local.get $2
-          local.get $1
-          i32.load offset=4
-          i32.sub
-        end
-        local.set $2
-      end
-      local.get $8
-      global.set $global$1
-      local.get $2
-    end
+ )
+ (func $19 (; 32 ;) (type $7) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (result i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (local $15 i32)
+  (local $16 i32)
+  (local $17 i32)
+  (local $18 i32)
+  (local $19 i32)
+  (local $20 i32)
+  (local $21 i32)
+  (local $22 i32)
+  (local $23 i32)
+  (local $24 i32)
+  (local $25 i32)
+  (local $26 i32)
+  (local $27 i32)
+  (local $28 i32)
+  (local $29 i32)
+  (local $30 i32)
+  (local $31 i32)
+  (local $32 i32)
+  (local $33 i32)
+  (local $34 i32)
+  (local $35 i32)
+  (local $36 i32)
+  (local $37 i32)
+  (local $38 i32)
+  (local $39 i32)
+  (local $40 i32)
+  (local $41 i32)
+  (local $42 i32)
+  (local $43 i32)
+  (local $44 i32)
+  (local $45 i32)
+  (local $46 i32)
+  (local $47 i32)
+  (local $48 i32)
+  (local $49 i32)
+  (local $50 i64)
+  (local $51 i64)
+  (local $52 f64)
+  (local $53 f64)
+  (block $label$1 (result i32)
+   (local.set $23
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 624)
+    )
+   )
+   (local.set $20
+    (i32.add
+     (local.get $23)
+     (i32.const 16)
+    )
+   )
+   (local.set $16
+    (local.get $23)
+   )
+   (local.set $36
+    (i32.add
+     (local.get $23)
+     (i32.const 528)
+    )
+   )
+   (local.set $30
+    (i32.ne
+     (local.get $0)
+     (i32.const 0)
+    )
+   )
+   (local.set $38
+    (local.tee $21
+     (i32.add
+      (local.tee $17
+       (i32.add
+        (local.get $23)
+        (i32.const 536)
+       )
+      )
+      (i32.const 40)
+     )
+    )
+   )
+   (local.set $39
+    (i32.add
+     (local.get $17)
+     (i32.const 39)
+    )
+   )
+   (local.set $42
+    (i32.add
+     (local.tee $37
+      (i32.add
+       (local.get $23)
+       (i32.const 8)
+      )
+     )
+     (i32.const 4)
+    )
+   )
+   (local.set $43
+    (i32.sub
+     (i32.const 0)
+     (local.tee $27
+      (local.tee $19
+       (i32.add
+        (local.get $23)
+        (i32.const 588)
+       )
+      )
+     )
+    )
+   )
+   (local.set $33
+    (i32.add
+     (local.tee $17
+      (i32.add
+       (local.get $23)
+       (i32.const 576)
+      )
+     )
+     (i32.const 12)
+    )
+   )
+   (local.set $40
+    (i32.add
+     (local.get $17)
+     (i32.const 11)
+    )
+   )
+   (local.set $44
+    (i32.sub
+     (local.tee $28
+      (local.get $33)
+     )
+     (local.get $27)
+    )
+   )
+   (local.set $45
+    (i32.sub
+     (i32.const -2)
+     (local.get $27)
+    )
+   )
+   (local.set $46
+    (i32.add
+     (local.get $28)
+     (i32.const 2)
+    )
+   )
+   (local.set $48
+    (i32.add
+     (local.tee $47
+      (i32.add
+       (local.get $23)
+       (i32.const 24)
+      )
+     )
+     (i32.const 288)
+    )
+   )
+   (local.set $41
+    (local.tee $31
+     (i32.add
+      (local.get $19)
+      (i32.const 9)
+     )
+    )
+   )
+   (local.set $34
+    (i32.add
+     (local.get $19)
+     (i32.const 8)
+    )
+   )
+   (local.set $15
+    (i32.const 0)
+   )
+   (local.set $10
+    (i32.const 0)
+   )
+   (local.set $17
+    (i32.const 0)
+   )
+   (block $label$2
+    (block $label$3
+     (loop $label$4
+      (block $label$5
+       (if
+        (i32.gt_s
+         (local.get $15)
+         (i32.const -1)
+        )
+        (local.set $15
+         (if (result i32)
+          (i32.gt_s
+           (local.get $10)
+           (i32.sub
+            (i32.const 2147483647)
+            (local.get $15)
+           )
+          )
+          (block (result i32)
+           (i32.store
+            (call $12)
+            (i32.const 75)
+           )
+           (i32.const -1)
+          )
+          (i32.add
+           (local.get $10)
+           (local.get $15)
+          )
+         )
+        )
+       )
+       (br_if $label$3
+        (i32.eqz
+         (i32.shr_s
+          (i32.shl
+           (local.tee $5
+            (i32.load8_s
+             (local.get $1)
+            )
+           )
+           (i32.const 24)
+          )
+          (i32.const 24)
+         )
+        )
+       )
+       (local.set $11
+        (local.get $1)
+       )
+       (block $label$9
+        (block $label$10
+         (loop $label$11
+          (block $label$12
+           (block $label$13
+            (block $label$14
+             (block $label$15
+              (br_table $label$14 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$15 $label$13
+               (i32.sub
+                (i32.shr_s
+                 (i32.shl
+                  (local.get $5)
+                  (i32.const 24)
+                 )
+                 (i32.const 24)
+                )
+                (i32.const 0)
+               )
+              )
+             )
+             (local.set $5
+              (local.get $11)
+             )
+             (br $label$10)
+            )
+            (local.set $5
+             (local.get $11)
+            )
+            (br $label$12)
+           )
+           (local.set $5
+            (i32.load8_s
+             (local.tee $11
+              (i32.add
+               (local.get $11)
+               (i32.const 1)
+              )
+             )
+            )
+           )
+           (br $label$11)
+          )
+         )
+         (br $label$9)
+        )
+        (loop $label$16
+         (br_if $label$9
+          (i32.ne
+           (i32.load8_s offset=1
+            (local.get $5)
+           )
+           (i32.const 37)
+          )
+         )
+         (local.set $11
+          (i32.add
+           (local.get $11)
+           (i32.const 1)
+          )
+         )
+         (br_if $label$16
+          (i32.eq
+           (i32.load8_s
+            (local.tee $5
+             (i32.add
+              (local.get $5)
+              (i32.const 2)
+             )
+            )
+           )
+           (i32.const 37)
+          )
+         )
+        )
+       )
+       (local.set $10
+        (i32.sub
+         (local.get $11)
+         (local.get $1)
+        )
+       )
+       (if
+        (local.get $30)
+        (if
+         (i32.eqz
+          (i32.and
+           (i32.load
+            (local.get $0)
+           )
+           (i32.const 32)
+          )
+         )
+         (drop
+          (call $21
+           (local.get $1)
+           (local.get $10)
+           (local.get $0)
+          )
+         )
+        )
+       )
+       (if
+        (local.get $10)
+        (block
+         (local.set $1
+          (local.get $5)
+         )
+         (br $label$4)
+        )
+       )
+       (local.set $10
+        (if (result i32)
+         (i32.lt_u
+          (local.tee $9
+           (i32.add
+            (i32.shr_s
+             (i32.shl
+              (local.tee $10
+               (i32.load8_s
+                (local.tee $11
+                 (i32.add
+                  (local.get $5)
+                  (i32.const 1)
+                 )
+                )
+               )
+              )
+              (i32.const 24)
+             )
+             (i32.const 24)
+            )
+            (i32.const -48)
+           )
+          )
+          (i32.const 10)
+         )
+         (block (result i32)
+          (local.set $10
+           (i32.add
+            (local.get $5)
+            (i32.const 3)
+           )
+          )
+          (if
+           (local.tee $12
+            (i32.eq
+             (i32.load8_s offset=2
+              (local.get $5)
+             )
+             (i32.const 36)
+            )
+           )
+           (local.set $11
+            (local.get $10)
+           )
+          )
+          (if
+           (local.get $12)
+           (local.set $17
+            (i32.const 1)
+           )
+          )
+          (local.set $5
+           (i32.load8_s
+            (local.get $11)
+           )
+          )
+          (if
+           (i32.eqz
+            (local.get $12)
+           )
+           (local.set $9
+            (i32.const -1)
+           )
+          )
+          (local.get $17)
+         )
+         (block (result i32)
+          (local.set $5
+           (local.get $10)
+          )
+          (local.set $9
+           (i32.const -1)
+          )
+          (local.get $17)
+         )
+        )
+       )
+       (block $label$25
+        (if
+         (i32.lt_u
+          (local.tee $12
+           (i32.add
+            (i32.shr_s
+             (i32.shl
+              (local.get $5)
+              (i32.const 24)
+             )
+             (i32.const 24)
+            )
+            (i32.const -32)
+           )
+          )
+          (i32.const 32)
+         )
+         (block
+          (local.set $17
+           (i32.const 0)
+          )
+          (loop $label$27
+           (br_if $label$25
+            (i32.eqz
+             (i32.and
+              (i32.shl
+               (i32.const 1)
+               (local.get $12)
+              )
+              (i32.const 75913)
+             )
+            )
+           )
+           (local.set $17
+            (i32.or
+             (i32.shl
+              (i32.const 1)
+              (i32.add
+               (i32.shr_s
+                (i32.shl
+                 (local.get $5)
+                 (i32.const 24)
+                )
+                (i32.const 24)
+               )
+               (i32.const -32)
+              )
+             )
+             (local.get $17)
+            )
+           )
+           (br_if $label$27
+            (i32.lt_u
+             (local.tee $12
+              (i32.add
+               (i32.shr_s
+                (i32.shl
+                 (local.tee $5
+                  (i32.load8_s
+                   (local.tee $11
+                    (i32.add
+                     (local.get $11)
+                     (i32.const 1)
+                    )
+                   )
+                  )
+                 )
+                 (i32.const 24)
+                )
+                (i32.const 24)
+               )
+               (i32.const -32)
+              )
+             )
+             (i32.const 32)
+            )
+           )
+          )
+         )
+         (local.set $17
+          (i32.const 0)
+         )
+        )
+       )
+       (block $label$29
+        (if
+         (i32.eq
+          (i32.shr_s
+           (i32.shl
+            (local.get $5)
+            (i32.const 24)
+           )
+           (i32.const 24)
+          )
+          (i32.const 42)
+         )
+         (block
+          (local.set $11
+           (block $label$31 (result i32)
+            (block $label$32
+             (br_if $label$32
+              (i32.ge_u
+               (local.tee $12
+                (i32.add
+                 (i32.shr_s
+                  (i32.shl
+                   (local.tee $5
+                    (i32.load8_s
+                     (local.tee $7
+                      (i32.add
+                       (local.get $11)
+                       (i32.const 1)
+                      )
+                     )
+                    )
+                   )
+                   (i32.const 24)
+                  )
+                  (i32.const 24)
+                 )
+                 (i32.const -48)
+                )
+               )
+               (i32.const 10)
+              )
+             )
+             (br_if $label$32
+              (i32.ne
+               (i32.load8_s offset=2
+                (local.get $11)
+               )
+               (i32.const 36)
+              )
+             )
+             (i32.store
+              (i32.add
+               (local.get $4)
+               (i32.shl
+                (local.get $12)
+                (i32.const 2)
+               )
+              )
+              (i32.const 10)
+             )
+             (local.set $8
+              (i32.const 1)
+             )
+             (local.set $10
+              (i32.wrap_i64
+               (i64.load
+                (i32.add
+                 (local.get $3)
+                 (i32.shl
+                  (i32.add
+                   (i32.load8_s
+                    (local.get $7)
+                   )
+                   (i32.const -48)
+                  )
+                  (i32.const 3)
+                 )
+                )
+               )
+              )
+             )
+             (br $label$31
+              (i32.add
+               (local.get $11)
+               (i32.const 3)
+              )
+             )
+            )
+            (if
+             (local.get $10)
+             (block
+              (local.set $15
+               (i32.const -1)
+              )
+              (br $label$5)
+             )
+            )
+            (if
+             (i32.eqz
+              (local.get $30)
+             )
+             (block
+              (local.set $12
+               (local.get $17)
+              )
+              (local.set $17
+               (i32.const 0)
+              )
+              (local.set $11
+               (local.get $7)
+              )
+              (local.set $10
+               (i32.const 0)
+              )
+              (br $label$29)
+             )
+            )
+            (local.set $10
+             (i32.load
+              (local.tee $11
+               (i32.and
+                (i32.add
+                 (i32.load
+                  (local.get $2)
+                 )
+                 (i32.const 3)
+                )
+                (i32.const -4)
+               )
+              )
+             )
+            )
+            (i32.store
+             (local.get $2)
+             (i32.add
+              (local.get $11)
+              (i32.const 4)
+             )
+            )
+            (local.set $8
+             (i32.const 0)
+            )
+            (local.get $7)
+           )
+          )
+          (local.set $12
+           (i32.or
+            (local.get $17)
+            (i32.const 8192)
+           )
+          )
+          (local.set $7
+           (i32.sub
+            (i32.const 0)
+            (local.get $10)
+           )
+          )
+          (local.set $5
+           (i32.load8_s
+            (local.get $11)
+           )
+          )
+          (if
+           (i32.eqz
+            (local.tee $6
+             (i32.lt_s
+              (local.get $10)
+              (i32.const 0)
+             )
+            )
+           )
+           (local.set $12
+            (local.get $17)
+           )
+          )
+          (local.set $17
+           (local.get $8)
+          )
+          (if
+           (local.get $6)
+           (local.set $10
+            (local.get $7)
+           )
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.tee $12
+            (i32.add
+             (i32.shr_s
+              (i32.shl
+               (local.get $5)
+               (i32.const 24)
+              )
+              (i32.const 24)
+             )
+             (i32.const -48)
+            )
+           )
+           (i32.const 10)
+          )
+          (block
+           (local.set $7
+            (i32.const 0)
+           )
+           (local.set $5
+            (local.get $12)
+           )
+           (loop $label$39
+            (local.set $7
+             (i32.add
+              (i32.mul
+               (local.get $7)
+               (i32.const 10)
+              )
+              (local.get $5)
+             )
+            )
+            (br_if $label$39
+             (i32.lt_u
+              (local.tee $5
+               (i32.add
+                (i32.shr_s
+                 (i32.shl
+                  (local.tee $12
+                   (i32.load8_s
+                    (local.tee $11
+                     (i32.add
+                      (local.get $11)
+                      (i32.const 1)
+                     )
+                    )
+                   )
+                  )
+                  (i32.const 24)
+                 )
+                 (i32.const 24)
+                )
+                (i32.const -48)
+               )
+              )
+              (i32.const 10)
+             )
+            )
+           )
+           (if
+            (i32.lt_s
+             (local.get $7)
+             (i32.const 0)
+            )
+            (block
+             (local.set $15
+              (i32.const -1)
+             )
+             (br $label$5)
+            )
+            (block
+             (local.set $5
+              (local.get $12)
+             )
+             (local.set $12
+              (local.get $17)
+             )
+             (local.set $17
+              (local.get $10)
+             )
+             (local.set $10
+              (local.get $7)
+             )
+            )
+           )
+          )
+          (block
+           (local.set $12
+            (local.get $17)
+           )
+           (local.set $17
+            (local.get $10)
+           )
+           (local.set $10
+            (i32.const 0)
+           )
+          )
+         )
+        )
+       )
+       (block $label$43
+        (if
+         (i32.eq
+          (i32.shr_s
+           (i32.shl
+            (local.get $5)
+            (i32.const 24)
+           )
+           (i32.const 24)
+          )
+          (i32.const 46)
+         )
+         (block
+          (if
+           (i32.ne
+            (i32.shr_s
+             (i32.shl
+              (local.tee $5
+               (i32.load8_s
+                (local.tee $7
+                 (i32.add
+                  (local.get $11)
+                  (i32.const 1)
+                 )
+                )
+               )
+              )
+              (i32.const 24)
+             )
+             (i32.const 24)
+            )
+            (i32.const 42)
+           )
+           (block
+            (if
+             (i32.lt_u
+              (local.tee $5
+               (i32.add
+                (i32.shr_s
+                 (i32.shl
+                  (local.get $5)
+                  (i32.const 24)
+                 )
+                 (i32.const 24)
+                )
+                (i32.const -48)
+               )
+              )
+              (i32.const 10)
+             )
+             (block
+              (local.set $11
+               (local.get $7)
+              )
+              (local.set $7
+               (i32.const 0)
+              )
+             )
+             (block
+              (local.set $5
+               (i32.const 0)
+              )
+              (local.set $11
+               (local.get $7)
+              )
+              (br $label$43)
+             )
+            )
+            (loop $label$48
+             (local.set $5
+              (i32.add
+               (i32.mul
+                (local.get $7)
+                (i32.const 10)
+               )
+               (local.get $5)
+              )
+             )
+             (br_if $label$43
+              (i32.ge_u
+               (local.tee $8
+                (i32.add
+                 (i32.load8_s
+                  (local.tee $11
+                   (i32.add
+                    (local.get $11)
+                    (i32.const 1)
+                   )
+                  )
+                 )
+                 (i32.const -48)
+                )
+               )
+               (i32.const 10)
+              )
+             )
+             (local.set $7
+              (local.get $5)
+             )
+             (local.set $5
+              (local.get $8)
+             )
+             (br $label$48)
+            )
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.tee $5
+             (i32.add
+              (i32.load8_s
+               (local.tee $7
+                (i32.add
+                 (local.get $11)
+                 (i32.const 2)
+                )
+               )
+              )
+              (i32.const -48)
+             )
+            )
+            (i32.const 10)
+           )
+           (if
+            (i32.eq
+             (i32.load8_s offset=3
+              (local.get $11)
+             )
+             (i32.const 36)
+            )
+            (block
+             (i32.store
+              (i32.add
+               (local.get $4)
+               (i32.shl
+                (local.get $5)
+                (i32.const 2)
+               )
+              )
+              (i32.const 10)
+             )
+             (local.set $5
+              (i32.wrap_i64
+               (i64.load
+                (i32.add
+                 (local.get $3)
+                 (i32.shl
+                  (i32.add
+                   (i32.load8_s
+                    (local.get $7)
+                   )
+                   (i32.const -48)
+                  )
+                  (i32.const 3)
+                 )
+                )
+               )
+              )
+             )
+             (local.set $11
+              (i32.add
+               (local.get $11)
+               (i32.const 4)
+              )
+             )
+             (br $label$43)
+            )
+           )
+          )
+          (if
+           (local.get $17)
+           (block
+            (local.set $15
+             (i32.const -1)
+            )
+            (br $label$5)
+           )
+          )
+          (local.set $11
+           (if (result i32)
+            (local.get $30)
+            (block (result i32)
+             (local.set $5
+              (i32.load
+               (local.tee $11
+                (i32.and
+                 (i32.add
+                  (i32.load
+                   (local.get $2)
+                  )
+                  (i32.const 3)
+                 )
+                 (i32.const -4)
+                )
+               )
+              )
+             )
+             (i32.store
+              (local.get $2)
+              (i32.add
+               (local.get $11)
+               (i32.const 4)
+              )
+             )
+             (local.get $7)
+            )
+            (block (result i32)
+             (local.set $5
+              (i32.const 0)
+             )
+             (local.get $7)
+            )
+           )
+          )
+         )
+         (local.set $5
+          (i32.const -1)
+         )
+        )
+       )
+       (local.set $7
+        (local.get $11)
+       )
+       (local.set $8
+        (i32.const 0)
+       )
+       (loop $label$55
+        (if
+         (i32.gt_u
+          (local.tee $6
+           (i32.add
+            (i32.load8_s
+             (local.get $7)
+            )
+            (i32.const -65)
+           )
+          )
+          (i32.const 57)
+         )
+         (block
+          (local.set $15
+           (i32.const -1)
+          )
+          (br $label$5)
+         )
+        )
+        (local.set $11
+         (i32.add
+          (local.get $7)
+          (i32.const 1)
+         )
+        )
+        (if
+         (i32.lt_u
+          (i32.add
+           (local.tee $6
+            (i32.and
+             (local.tee $13
+              (i32.load8_s
+               (i32.add
+                (i32.add
+                 (i32.mul
+                  (local.get $8)
+                  (i32.const 58)
+                 )
+                 (i32.const 1177)
+                )
+                (local.get $6)
+               )
+              )
+             )
+             (i32.const 255)
+            )
+           )
+           (i32.const -1)
+          )
+          (i32.const 8)
+         )
+         (block
+          (local.set $7
+           (local.get $11)
+          )
+          (local.set $8
+           (local.get $6)
+          )
+          (br $label$55)
+         )
+        )
+       )
+       (if
+        (i32.eqz
+         (i32.shr_s
+          (i32.shl
+           (local.get $13)
+           (i32.const 24)
+          )
+          (i32.const 24)
+         )
+        )
+        (block
+         (local.set $15
+          (i32.const -1)
+         )
+         (br $label$5)
+        )
+       )
+       (local.set $14
+        (i32.gt_s
+         (local.get $9)
+         (i32.const -1)
+        )
+       )
+       (block $label$59
+        (block $label$60
+         (if
+          (i32.eq
+           (i32.shr_s
+            (i32.shl
+             (local.get $13)
+             (i32.const 24)
+            )
+            (i32.const 24)
+           )
+           (i32.const 19)
+          )
+          (if
+           (local.get $14)
+           (block
+            (local.set $15
+             (i32.const -1)
+            )
+            (br $label$5)
+           )
+           (br $label$60)
+          )
+          (block
+           (if
+            (local.get $14)
+            (block
+             (i32.store
+              (i32.add
+               (local.get $4)
+               (i32.shl
+                (local.get $9)
+                (i32.const 2)
+               )
+              )
+              (local.get $6)
+             )
+             (i64.store
+              (local.get $16)
+              (i64.load
+               (i32.add
+                (local.get $3)
+                (i32.shl
+                 (local.get $9)
+                 (i32.const 3)
+                )
+               )
+              )
+             )
+             (br $label$60)
+            )
+           )
+           (if
+            (i32.eqz
+             (local.get $30)
+            )
+            (block
+             (local.set $15
+              (i32.const 0)
+             )
+             (br $label$5)
+            )
+           )
+           (call $22
+            (local.get $16)
+            (local.get $6)
+            (local.get $2)
+           )
+          )
+         )
+         (br $label$59)
+        )
+        (if
+         (i32.eqz
+          (local.get $30)
+         )
+         (block
+          (local.set $10
+           (i32.const 0)
+          )
+          (local.set $1
+           (local.get $11)
+          )
+          (br $label$4)
+         )
+        )
+       )
+       (local.set $9
+        (i32.and
+         (local.tee $7
+          (i32.load8_s
+           (local.get $7)
+          )
+         )
+         (i32.const -33)
+        )
+       )
+       (if
+        (i32.eqz
+         (i32.and
+          (i32.ne
+           (local.get $8)
+           (i32.const 0)
+          )
+          (i32.eq
+           (i32.and
+            (local.get $7)
+            (i32.const 15)
+           )
+           (i32.const 3)
+          )
+         )
+        )
+        (local.set $9
+         (local.get $7)
+        )
+       )
+       (local.set $7
+        (i32.and
+         (local.get $12)
+         (i32.const -65537)
+        )
+       )
+       (if
+        (i32.and
+         (local.get $12)
+         (i32.const 8192)
+        )
+        (local.set $12
+         (local.get $7)
+        )
+       )
+       (block $label$70
+        (block $label$71
+         (block $label$72
+          (block $label$73
+           (block $label$74
+            (block $label$75
+             (block $label$76
+              (block $label$77
+               (block $label$78
+                (block $label$79
+                 (block $label$80
+                  (block $label$81
+                   (block $label$82
+                    (block $label$83
+                     (block $label$84
+                      (block $label$85
+                       (block $label$86
+                        (block $label$87
+                         (block $label$88
+                          (block $label$89
+                           (br_table $label$78 $label$77 $label$80 $label$77 $label$78 $label$78 $label$78 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$79 $label$77 $label$77 $label$77 $label$77 $label$87 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$78 $label$77 $label$83 $label$85 $label$78 $label$78 $label$78 $label$77 $label$85 $label$77 $label$77 $label$77 $label$82 $label$89 $label$86 $label$88 $label$77 $label$77 $label$81 $label$77 $label$84 $label$77 $label$77 $label$87 $label$77
+                            (i32.sub
+                             (local.get $9)
+                             (i32.const 65)
+                            )
+                           )
+                          )
+                          (block $label$90
+                           (block $label$91
+                            (block $label$92
+                             (block $label$93
+                              (block $label$94
+                               (block $label$95
+                                (block $label$96
+                                 (block $label$97
+                                  (br_table $label$97 $label$96 $label$95 $label$94 $label$93 $label$90 $label$92 $label$91 $label$90
+                                   (i32.sub
+                                    (i32.shr_s
+                                     (i32.shl
+                                      (i32.and
+                                       (local.get $8)
+                                       (i32.const 255)
+                                      )
+                                      (i32.const 24)
+                                     )
+                                     (i32.const 24)
+                                    )
+                                    (i32.const 0)
+                                   )
+                                  )
+                                 )
+                                 (i32.store
+                                  (i32.load
+                                   (local.get $16)
+                                  )
+                                  (local.get $15)
+                                 )
+                                 (local.set $10
+                                  (i32.const 0)
+                                 )
+                                 (local.set $1
+                                  (local.get $11)
+                                 )
+                                 (br $label$4)
+                                )
+                                (i32.store
+                                 (i32.load
+                                  (local.get $16)
+                                 )
+                                 (local.get $15)
+                                )
+                                (local.set $10
+                                 (i32.const 0)
+                                )
+                                (local.set $1
+                                 (local.get $11)
+                                )
+                                (br $label$4)
+                               )
+                               (i64.store
+                                (i32.load
+                                 (local.get $16)
+                                )
+                                (i64.extend_i32_s
+                                 (local.get $15)
+                                )
+                               )
+                               (local.set $10
+                                (i32.const 0)
+                               )
+                               (local.set $1
+                                (local.get $11)
+                               )
+                               (br $label$4)
+                              )
+                              (i32.store16
+                               (i32.load
+                                (local.get $16)
+                               )
+                               (local.get $15)
+                              )
+                              (local.set $10
+                               (i32.const 0)
+                              )
+                              (local.set $1
+                               (local.get $11)
+                              )
+                              (br $label$4)
+                             )
+                             (i32.store8
+                              (i32.load
+                               (local.get $16)
+                              )
+                              (local.get $15)
+                             )
+                             (local.set $10
+                              (i32.const 0)
+                             )
+                             (local.set $1
+                              (local.get $11)
+                             )
+                             (br $label$4)
+                            )
+                            (i32.store
+                             (i32.load
+                              (local.get $16)
+                             )
+                             (local.get $15)
+                            )
+                            (local.set $10
+                             (i32.const 0)
+                            )
+                            (local.set $1
+                             (local.get $11)
+                            )
+                            (br $label$4)
+                           )
+                           (i64.store
+                            (i32.load
+                             (local.get $16)
+                            )
+                            (i64.extend_i32_s
+                             (local.get $15)
+                            )
+                           )
+                           (local.set $10
+                            (i32.const 0)
+                           )
+                           (local.set $1
+                            (local.get $11)
+                           )
+                           (br $label$4)
+                          )
+                          (local.set $10
+                           (i32.const 0)
+                          )
+                          (local.set $1
+                           (local.get $11)
+                          )
+                          (br $label$4)
+                         )
+                         (local.set $12
+                          (i32.or
+                           (local.get $12)
+                           (i32.const 8)
+                          )
+                         )
+                         (if
+                          (i32.le_u
+                           (local.get $5)
+                           (i32.const 8)
+                          )
+                          (local.set $5
+                           (i32.const 8)
+                          )
+                         )
+                         (local.set $9
+                          (i32.const 120)
+                         )
+                         (br $label$76)
+                        )
+                        (br $label$76)
+                       )
+                       (if
+                        (i64.eq
+                         (local.tee $50
+                          (i64.load
+                           (local.get $16)
+                          )
+                         )
+                         (i64.const 0)
+                        )
+                        (local.set $7
+                         (local.get $21)
+                        )
+                        (block
+                         (local.set $1
+                          (local.get $21)
+                         )
+                         (loop $label$101
+                          (i64.store8
+                           (local.tee $1
+                            (i32.add
+                             (local.get $1)
+                             (i32.const -1)
+                            )
+                           )
+                           (i64.or
+                            (i64.and
+                             (local.get $50)
+                             (i64.const 7)
+                            )
+                            (i64.const 48)
+                           )
+                          )
+                          (br_if $label$101
+                           (i64.ne
+                            (local.tee $50
+                             (i64.shr_u
+                              (local.get $50)
+                              (i64.const 3)
+                             )
+                            )
+                            (i64.const 0)
+                           )
+                          )
+                          (local.set $7
+                           (local.get $1)
+                          )
+                         )
+                        )
+                       )
+                       (if
+                        (i32.and
+                         (local.get $12)
+                         (i32.const 8)
+                        )
+                        (block
+                         (local.set $8
+                          (i32.add
+                           (local.tee $1
+                            (i32.sub
+                             (local.get $38)
+                             (local.get $7)
+                            )
+                           )
+                           (i32.const 1)
+                          )
+                         )
+                         (if
+                          (i32.le_s
+                           (local.get $5)
+                           (local.get $1)
+                          )
+                          (local.set $5
+                           (local.get $8)
+                          )
+                         )
+                         (local.set $6
+                          (i32.const 0)
+                         )
+                         (local.set $8
+                          (i32.const 1657)
+                         )
+                         (br $label$71)
+                        )
+                        (block
+                         (local.set $6
+                          (i32.const 0)
+                         )
+                         (local.set $8
+                          (i32.const 1657)
+                         )
+                         (br $label$71)
+                        )
+                       )
+                      )
+                      (if
+                       (i64.lt_s
+                        (local.tee $50
+                         (i64.load
+                          (local.get $16)
+                         )
+                        )
+                        (i64.const 0)
+                       )
+                       (block
+                        (i64.store
+                         (local.get $16)
+                         (local.tee $50
+                          (i64.sub
+                           (i64.const 0)
+                           (local.get $50)
+                          )
+                         )
+                        )
+                        (local.set $6
+                         (i32.const 1)
+                        )
+                        (local.set $8
+                         (i32.const 1657)
+                        )
+                        (br $label$75)
+                       )
+                      )
+                      (if
+                       (i32.and
+                        (local.get $12)
+                        (i32.const 2048)
+                       )
+                       (block
+                        (local.set $6
+                         (i32.const 1)
+                        )
+                        (local.set $8
+                         (i32.const 1658)
+                        )
+                        (br $label$75)
+                       )
+                       (block
+                        (local.set $6
+                         (local.tee $1
+                          (i32.and
+                           (local.get $12)
+                           (i32.const 1)
+                          )
+                         )
+                        )
+                        (local.set $8
+                         (if (result i32)
+                          (local.get $1)
+                          (i32.const 1659)
+                          (i32.const 1657)
+                         )
+                        )
+                        (br $label$75)
+                       )
+                      )
+                     )
+                     (local.set $50
+                      (i64.load
+                       (local.get $16)
+                      )
+                     )
+                     (local.set $6
+                      (i32.const 0)
+                     )
+                     (local.set $8
+                      (i32.const 1657)
+                     )
+                     (br $label$75)
+                    )
+                    (i64.store8
+                     (local.get $39)
+                     (i64.load
+                      (local.get $16)
+                     )
+                    )
+                    (local.set $1
+                     (local.get $39)
+                    )
+                    (local.set $12
+                     (local.get $7)
+                    )
+                    (local.set $7
+                     (i32.const 1)
+                    )
+                    (local.set $6
+                     (i32.const 0)
+                    )
+                    (local.set $8
+                     (i32.const 1657)
+                    )
+                    (local.set $5
+                     (local.get $21)
+                    )
+                    (br $label$70)
+                   )
+                   (local.set $1
+                    (call $24
+                     (i32.load
+                      (call $12)
+                     )
+                    )
+                   )
+                   (br $label$74)
+                  )
+                  (if
+                   (i32.eqz
+                    (local.tee $1
+                     (i32.load
+                      (local.get $16)
+                     )
+                    )
+                   )
+                   (local.set $1
+                    (i32.const 1667)
+                   )
+                  )
+                  (br $label$74)
+                 )
+                 (i64.store32
+                  (local.get $37)
+                  (i64.load
+                   (local.get $16)
+                  )
+                 )
+                 (i32.store
+                  (local.get $42)
+                  (i32.const 0)
+                 )
+                 (i32.store
+                  (local.get $16)
+                  (local.get $37)
+                 )
+                 (local.set $7
+                  (local.get $37)
+                 )
+                 (local.set $6
+                  (i32.const -1)
+                 )
+                 (br $label$73)
+                )
+                (local.set $7
+                 (i32.load
+                  (local.get $16)
+                 )
+                )
+                (if
+                 (local.get $5)
+                 (block
+                  (local.set $6
+                   (local.get $5)
+                  )
+                  (br $label$73)
+                 )
+                 (block
+                  (call $25
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (i32.const 0)
+                   (local.get $12)
+                  )
+                  (local.set $1
+                   (i32.const 0)
+                  )
+                  (br $label$72)
+                 )
+                )
+               )
+               (local.set $52
+                (f64.load
+                 (local.get $16)
+                )
+               )
+               (i32.store
+                (local.get $20)
+                (i32.const 0)
+               )
+               (local.set $26
+                (if (result i32)
+                 (i64.lt_s
+                  (i64.reinterpret_f64
+                   (local.get $52)
+                  )
+                  (i64.const 0)
+                 )
+                 (block (result i32)
+                  (local.set $24
+                   (i32.const 1)
+                  )
+                  (local.set $52
+                   (f64.neg
+                    (local.get $52)
+                   )
+                  )
+                  (i32.const 1674)
+                 )
+                 (block (result i32)
+                  (local.set $1
+                   (i32.and
+                    (local.get $12)
+                    (i32.const 1)
+                   )
+                  )
+                  (if (result i32)
+                   (i32.and
+                    (local.get $12)
+                    (i32.const 2048)
+                   )
+                   (block (result i32)
+                    (local.set $24
+                     (i32.const 1)
+                    )
+                    (i32.const 1677)
+                   )
+                   (block (result i32)
+                    (local.set $24
+                     (local.get $1)
+                    )
+                    (if (result i32)
+                     (local.get $1)
+                     (i32.const 1680)
+                     (i32.const 1675)
+                    )
+                   )
+                  )
+                 )
+                )
+               )
+               (block $label$119
+                (if
+                 (i64.lt_u
+                  (i64.and
+                   (i64.reinterpret_f64
+                    (local.get $52)
+                   )
+                   (i64.const 9218868437227405312)
+                  )
+                  (i64.const 9218868437227405312)
+                 )
+                 (block
+                  (if
+                   (local.tee $1
+                    (f64.ne
+                     (local.tee $52
+                      (f64.mul
+                       (call $27
+                        (local.get $52)
+                        (local.get $20)
+                       )
+                       (f64.const 2)
+                      )
+                     )
+                     (f64.const 0)
+                    )
+                   )
+                   (i32.store
+                    (local.get $20)
+                    (i32.add
+                     (i32.load
+                      (local.get $20)
+                     )
+                     (i32.const -1)
+                    )
+                   )
+                  )
+                  (if
+                   (i32.eq
+                    (local.tee $22
+                     (i32.or
+                      (local.get $9)
+                      (i32.const 32)
+                     )
+                    )
+                    (i32.const 97)
+                   )
+                   (block
+                    (local.set $1
+                     (i32.add
+                      (local.get $26)
+                      (i32.const 9)
+                     )
+                    )
+                    (if
+                     (local.tee $6
+                      (i32.and
+                       (local.get $9)
+                       (i32.const 32)
+                      )
+                     )
+                     (local.set $26
+                      (local.get $1)
+                     )
+                    )
+                    (if
+                     (i32.eqz
+                      (i32.or
+                       (i32.gt_u
+                        (local.get $5)
+                        (i32.const 11)
+                       )
+                       (i32.eqz
+                        (local.tee $1
+                         (i32.sub
+                          (i32.const 12)
+                          (local.get $5)
+                         )
+                        )
+                       )
+                      )
+                     )
+                     (block
+                      (local.set $53
+                       (f64.const 8)
+                      )
+                      (loop $label$125
+                       (local.set $53
+                        (f64.mul
+                         (local.get $53)
+                         (f64.const 16)
+                        )
+                       )
+                       (br_if $label$125
+                        (local.tee $1
+                         (i32.add
+                          (local.get $1)
+                          (i32.const -1)
+                         )
+                        )
+                       )
+                      )
+                      (local.set $52
+                       (if (result f64)
+                        (i32.eq
+                         (i32.load8_s
+                          (local.get $26)
+                         )
+                         (i32.const 45)
+                        )
+                        (f64.neg
+                         (f64.add
+                          (local.get $53)
+                          (f64.sub
+                           (f64.neg
+                            (local.get $52)
+                           )
+                           (local.get $53)
+                          )
+                         )
+                        )
+                        (f64.sub
+                         (f64.add
+                          (local.get $52)
+                          (local.get $53)
+                         )
+                         (local.get $53)
+                        )
+                       )
+                      )
+                     )
+                    )
+                    (local.set $1
+                     (i32.sub
+                      (i32.const 0)
+                      (local.tee $7
+                       (i32.load
+                        (local.get $20)
+                       )
+                      )
+                     )
+                    )
+                    (if
+                     (i32.eq
+                      (local.tee $1
+                       (call $23
+                        (i64.extend_i32_s
+                         (if (result i32)
+                          (i32.lt_s
+                           (local.get $7)
+                           (i32.const 0)
+                          )
+                          (local.get $1)
+                          (local.get $7)
+                         )
+                        )
+                        (local.get $33)
+                       )
+                      )
+                      (local.get $33)
+                     )
+                     (block
+                      (i32.store8
+                       (local.get $40)
+                       (i32.const 48)
+                      )
+                      (local.set $1
+                       (local.get $40)
+                      )
+                     )
+                    )
+                    (local.set $13
+                     (i32.or
+                      (local.get $24)
+                      (i32.const 2)
+                     )
+                    )
+                    (i32.store8
+                     (i32.add
+                      (local.get $1)
+                      (i32.const -1)
+                     )
+                     (i32.add
+                      (i32.and
+                       (i32.shr_s
+                        (local.get $7)
+                        (i32.const 31)
+                       )
+                       (i32.const 2)
+                      )
+                      (i32.const 43)
+                     )
+                    )
+                    (i32.store8
+                     (local.tee $8
+                      (i32.add
+                       (local.get $1)
+                       (i32.const -2)
+                      )
+                     )
+                     (i32.add
+                      (local.get $9)
+                      (i32.const 15)
+                     )
+                    )
+                    (local.set $9
+                     (i32.lt_s
+                      (local.get $5)
+                      (i32.const 1)
+                     )
+                    )
+                    (local.set $14
+                     (i32.eqz
+                      (i32.and
+                       (local.get $12)
+                       (i32.const 8)
+                      )
+                     )
+                    )
+                    (local.set $1
+                     (local.get $19)
+                    )
+                    (loop $label$131
+                     (i32.store8
+                      (local.get $1)
+                      (i32.or
+                       (i32.load8_u
+                        (i32.add
+                         (local.tee $7
+                          (i32.trunc_f64_s
+                           (local.get $52)
+                          )
+                         )
+                         (i32.const 1641)
+                        )
+                       )
+                       (local.get $6)
+                      )
+                     )
+                     (local.set $52
+                      (f64.mul
+                       (f64.sub
+                        (local.get $52)
+                        (f64.convert_i32_s
+                         (local.get $7)
+                        )
+                       )
+                       (f64.const 16)
+                      )
+                     )
+                     (local.set $1
+                      (block $label$132 (result i32)
+                       (if (result i32)
+                        (i32.eq
+                         (i32.sub
+                          (local.tee $7
+                           (i32.add
+                            (local.get $1)
+                            (i32.const 1)
+                           )
+                          )
+                          (local.get $27)
+                         )
+                         (i32.const 1)
+                        )
+                        (block (result i32)
+                         (drop
+                          (br_if $label$132
+                           (local.get $7)
+                           (i32.and
+                            (local.get $14)
+                            (i32.and
+                             (local.get $9)
+                             (f64.eq
+                              (local.get $52)
+                              (f64.const 0)
+                             )
+                            )
+                           )
+                          )
+                         )
+                         (i32.store8
+                          (local.get $7)
+                          (i32.const 46)
+                         )
+                         (i32.add
+                          (local.get $1)
+                          (i32.const 2)
+                         )
+                        )
+                        (local.get $7)
+                       )
+                      )
+                     )
+                     (br_if $label$131
+                      (f64.ne
+                       (local.get $52)
+                       (f64.const 0)
+                      )
+                     )
+                    )
+                    (local.set $6
+                     (i32.sub
+                      (i32.add
+                       (local.get $46)
+                       (local.get $5)
+                      )
+                      (local.tee $7
+                       (local.get $8)
+                      )
+                     )
+                    )
+                    (local.set $9
+                     (i32.add
+                      (i32.sub
+                       (local.get $44)
+                       (local.get $7)
+                      )
+                      (local.get $1)
+                     )
+                    )
+                    (call $25
+                     (local.get $0)
+                     (i32.const 32)
+                     (local.get $10)
+                     (local.tee $5
+                      (i32.add
+                       (if (result i32)
+                        (i32.and
+                         (i32.ne
+                          (local.get $5)
+                          (i32.const 0)
+                         )
+                         (i32.lt_s
+                          (i32.add
+                           (local.get $45)
+                           (local.get $1)
+                          )
+                          (local.get $5)
+                         )
+                        )
+                        (local.get $6)
+                        (local.tee $6
+                         (local.get $9)
+                        )
+                       )
+                       (local.get $13)
+                      )
+                     )
+                     (local.get $12)
+                    )
+                    (if
+                     (i32.eqz
+                      (i32.and
+                       (i32.load
+                        (local.get $0)
+                       )
+                       (i32.const 32)
+                      )
+                     )
+                     (drop
+                      (call $21
+                       (local.get $26)
+                       (local.get $13)
+                       (local.get $0)
+                      )
+                     )
+                    )
+                    (call $25
+                     (local.get $0)
+                     (i32.const 48)
+                     (local.get $10)
+                     (local.get $5)
+                     (i32.xor
+                      (local.get $12)
+                      (i32.const 65536)
+                     )
+                    )
+                    (local.set $1
+                     (i32.sub
+                      (local.get $1)
+                      (local.get $27)
+                     )
+                    )
+                    (if
+                     (i32.eqz
+                      (i32.and
+                       (i32.load
+                        (local.get $0)
+                       )
+                       (i32.const 32)
+                      )
+                     )
+                     (drop
+                      (call $21
+                       (local.get $19)
+                       (local.get $1)
+                       (local.get $0)
+                      )
+                     )
+                    )
+                    (call $25
+                     (local.get $0)
+                     (i32.const 48)
+                     (i32.sub
+                      (local.get $6)
+                      (i32.add
+                       (local.get $1)
+                       (local.tee $1
+                        (i32.sub
+                         (local.get $28)
+                         (local.get $7)
+                        )
+                       )
+                      )
+                     )
+                     (i32.const 0)
+                     (i32.const 0)
+                    )
+                    (if
+                     (i32.eqz
+                      (i32.and
+                       (i32.load
+                        (local.get $0)
+                       )
+                       (i32.const 32)
+                      )
+                     )
+                     (drop
+                      (call $21
+                       (local.get $8)
+                       (local.get $1)
+                       (local.get $0)
+                      )
+                     )
+                    )
+                    (call $25
+                     (local.get $0)
+                     (i32.const 32)
+                     (local.get $10)
+                     (local.get $5)
+                     (i32.xor
+                      (local.get $12)
+                      (i32.const 8192)
+                     )
+                    )
+                    (if
+                     (i32.ge_s
+                      (local.get $5)
+                      (local.get $10)
+                     )
+                     (local.set $10
+                      (local.get $5)
+                     )
+                    )
+                    (br $label$119)
+                   )
+                  )
+                  (if
+                   (local.get $1)
+                   (block
+                    (i32.store
+                     (local.get $20)
+                     (local.tee $6
+                      (i32.add
+                       (i32.load
+                        (local.get $20)
+                       )
+                       (i32.const -28)
+                      )
+                     )
+                    )
+                    (local.set $52
+                     (f64.mul
+                      (local.get $52)
+                      (f64.const 268435456)
+                     )
+                    )
+                   )
+                   (local.set $6
+                    (i32.load
+                     (local.get $20)
+                    )
+                   )
+                  )
+                  (local.set $8
+                   (local.tee $7
+                    (if (result i32)
+                     (i32.lt_s
+                      (local.get $6)
+                      (i32.const 0)
+                     )
+                     (local.get $47)
+                     (local.get $48)
+                    )
+                   )
+                  )
+                  (loop $label$145
+                   (i32.store
+                    (local.get $8)
+                    (local.tee $1
+                     (i32.trunc_f64_s
+                      (local.get $52)
+                     )
+                    )
+                   )
+                   (local.set $8
+                    (i32.add
+                     (local.get $8)
+                     (i32.const 4)
+                    )
+                   )
+                   (br_if $label$145
+                    (f64.ne
+                     (local.tee $52
+                      (f64.mul
+                       (f64.sub
+                        (local.get $52)
+                        (f64.convert_i32_u
+                         (local.get $1)
+                        )
+                       )
+                       (f64.const 1e9)
+                      )
+                     )
+                     (f64.const 0)
+                    )
+                   )
+                  )
+                  (if
+                   (i32.gt_s
+                    (local.get $6)
+                    (i32.const 0)
+                   )
+                   (block
+                    (local.set $1
+                     (local.get $7)
+                    )
+                    (loop $label$147
+                     (local.set $14
+                      (if (result i32)
+                       (i32.gt_s
+                        (local.get $6)
+                        (i32.const 29)
+                       )
+                       (i32.const 29)
+                       (local.get $6)
+                      )
+                     )
+                     (block $label$150
+                      (if
+                       (i32.ge_u
+                        (local.tee $6
+                         (i32.add
+                          (local.get $8)
+                          (i32.const -4)
+                         )
+                        )
+                        (local.get $1)
+                       )
+                       (block
+                        (local.set $50
+                         (i64.extend_i32_u
+                          (local.get $14)
+                         )
+                        )
+                        (local.set $13
+                         (i32.const 0)
+                        )
+                        (loop $label$152
+                         (i64.store32
+                          (local.get $6)
+                          (i64.rem_u
+                           (local.tee $51
+                            (i64.add
+                             (i64.shl
+                              (i64.extend_i32_u
+                               (i32.load
+                                (local.get $6)
+                               )
+                              )
+                              (local.get $50)
+                             )
+                             (i64.extend_i32_u
+                              (local.get $13)
+                             )
+                            )
+                           )
+                           (i64.const 1000000000)
+                          )
+                         )
+                         (local.set $13
+                          (i32.wrap_i64
+                           (i64.div_u
+                            (local.get $51)
+                            (i64.const 1000000000)
+                           )
+                          )
+                         )
+                         (br_if $label$152
+                          (i32.ge_u
+                           (local.tee $6
+                            (i32.add
+                             (local.get $6)
+                             (i32.const -4)
+                            )
+                           )
+                           (local.get $1)
+                          )
+                         )
+                        )
+                        (br_if $label$150
+                         (i32.eqz
+                          (local.get $13)
+                         )
+                        )
+                        (i32.store
+                         (local.tee $1
+                          (i32.add
+                           (local.get $1)
+                           (i32.const -4)
+                          )
+                         )
+                         (local.get $13)
+                        )
+                       )
+                      )
+                     )
+                     (loop $label$153
+                      (if
+                       (i32.gt_u
+                        (local.get $8)
+                        (local.get $1)
+                       )
+                       (if
+                        (i32.eqz
+                         (i32.load
+                          (local.tee $6
+                           (i32.add
+                            (local.get $8)
+                            (i32.const -4)
+                           )
+                          )
+                         )
+                        )
+                        (block
+                         (local.set $8
+                          (local.get $6)
+                         )
+                         (br $label$153)
+                        )
+                       )
+                      )
+                     )
+                     (i32.store
+                      (local.get $20)
+                      (local.tee $6
+                       (i32.sub
+                        (i32.load
+                         (local.get $20)
+                        )
+                        (local.get $14)
+                       )
+                      )
+                     )
+                     (br_if $label$147
+                      (i32.gt_s
+                       (local.get $6)
+                       (i32.const 0)
+                      )
+                     )
+                    )
+                   )
+                   (local.set $1
+                    (local.get $7)
+                   )
+                  )
+                  (local.set $18
+                   (if (result i32)
+                    (i32.lt_s
+                     (local.get $5)
+                     (i32.const 0)
+                    )
+                    (i32.const 6)
+                    (local.get $5)
+                   )
+                  )
+                  (if
+                   (i32.lt_s
+                    (local.get $6)
+                    (i32.const 0)
+                   )
+                   (block
+                    (local.set $14
+                     (i32.add
+                      (i32.div_s
+                       (i32.add
+                        (local.get $18)
+                        (i32.const 25)
+                       )
+                       (i32.const 9)
+                      )
+                      (i32.const 1)
+                     )
+                    )
+                    (local.set $25
+                     (i32.eq
+                      (local.get $22)
+                      (i32.const 102)
+                     )
+                    )
+                    (local.set $5
+                     (local.get $8)
+                    )
+                    (loop $label$160
+                     (if
+                      (i32.gt_s
+                       (local.tee $13
+                        (i32.sub
+                         (i32.const 0)
+                         (local.get $6)
+                        )
+                       )
+                       (i32.const 9)
+                      )
+                      (local.set $13
+                       (i32.const 9)
+                      )
+                     )
+                     (block $label$162
+                      (if
+                       (i32.lt_u
+                        (local.get $1)
+                        (local.get $5)
+                       )
+                       (block
+                        (local.set $29
+                         (i32.add
+                          (i32.shl
+                           (i32.const 1)
+                           (local.get $13)
+                          )
+                          (i32.const -1)
+                         )
+                        )
+                        (local.set $35
+                         (i32.shr_u
+                          (i32.const 1000000000)
+                          (local.get $13)
+                         )
+                        )
+                        (local.set $6
+                         (i32.const 0)
+                        )
+                        (local.set $8
+                         (local.get $1)
+                        )
+                        (loop $label$164
+                         (i32.store
+                          (local.get $8)
+                          (i32.add
+                           (i32.shr_u
+                            (local.tee $32
+                             (i32.load
+                              (local.get $8)
+                             )
+                            )
+                            (local.get $13)
+                           )
+                           (local.get $6)
+                          )
+                         )
+                         (local.set $6
+                          (i32.mul
+                           (i32.and
+                            (local.get $32)
+                            (local.get $29)
+                           )
+                           (local.get $35)
+                          )
+                         )
+                         (br_if $label$164
+                          (i32.lt_u
+                           (local.tee $8
+                            (i32.add
+                             (local.get $8)
+                             (i32.const 4)
+                            )
+                           )
+                           (local.get $5)
+                          )
+                         )
+                        )
+                        (local.set $8
+                         (i32.add
+                          (local.get $1)
+                          (i32.const 4)
+                         )
+                        )
+                        (if
+                         (i32.eqz
+                          (i32.load
+                           (local.get $1)
+                          )
+                         )
+                         (local.set $1
+                          (local.get $8)
+                         )
+                        )
+                        (br_if $label$162
+                         (i32.eqz
+                          (local.get $6)
+                         )
+                        )
+                        (i32.store
+                         (local.get $5)
+                         (local.get $6)
+                        )
+                        (local.set $5
+                         (i32.add
+                          (local.get $5)
+                          (i32.const 4)
+                         )
+                        )
+                       )
+                       (block
+                        (local.set $8
+                         (i32.add
+                          (local.get $1)
+                          (i32.const 4)
+                         )
+                        )
+                        (if
+                         (i32.eqz
+                          (i32.load
+                           (local.get $1)
+                          )
+                         )
+                         (local.set $1
+                          (local.get $8)
+                         )
+                        )
+                       )
+                      )
+                     )
+                     (local.set $6
+                      (i32.add
+                       (local.tee $8
+                        (if (result i32)
+                         (local.get $25)
+                         (local.get $7)
+                         (local.get $1)
+                        )
+                       )
+                       (i32.shl
+                        (local.get $14)
+                        (i32.const 2)
+                       )
+                      )
+                     )
+                     (if
+                      (i32.gt_s
+                       (i32.shr_s
+                        (i32.sub
+                         (local.get $5)
+                         (local.get $8)
+                        )
+                        (i32.const 2)
+                       )
+                       (local.get $14)
+                      )
+                      (local.set $5
+                       (local.get $6)
+                      )
+                     )
+                     (i32.store
+                      (local.get $20)
+                      (local.tee $6
+                       (i32.add
+                        (i32.load
+                         (local.get $20)
+                        )
+                        (local.get $13)
+                       )
+                      )
+                     )
+                     (br_if $label$160
+                      (i32.lt_s
+                       (local.get $6)
+                       (i32.const 0)
+                      )
+                     )
+                     (local.set $13
+                      (local.get $5)
+                     )
+                    )
+                   )
+                   (local.set $13
+                    (local.get $8)
+                   )
+                  )
+                  (local.set $25
+                   (local.get $7)
+                  )
+                  (block $label$172
+                   (if
+                    (i32.lt_u
+                     (local.get $1)
+                     (local.get $13)
+                    )
+                    (block
+                     (local.set $5
+                      (i32.mul
+                       (i32.shr_s
+                        (i32.sub
+                         (local.get $25)
+                         (local.get $1)
+                        )
+                        (i32.const 2)
+                       )
+                       (i32.const 9)
+                      )
+                     )
+                     (br_if $label$172
+                      (i32.lt_u
+                       (local.tee $6
+                        (i32.load
+                         (local.get $1)
+                        )
+                       )
+                       (i32.const 10)
+                      )
+                     )
+                     (local.set $8
+                      (i32.const 10)
+                     )
+                     (loop $label$174
+                      (local.set $5
+                       (i32.add
+                        (local.get $5)
+                        (i32.const 1)
+                       )
+                      )
+                      (br_if $label$174
+                       (i32.ge_u
+                        (local.get $6)
+                        (local.tee $8
+                         (i32.mul
+                          (local.get $8)
+                          (i32.const 10)
+                         )
+                        )
+                       )
+                      )
+                     )
+                    )
+                    (local.set $5
+                     (i32.const 0)
+                    )
+                   )
+                  )
+                  (local.set $29
+                   (i32.eq
+                    (local.get $22)
+                    (i32.const 103)
+                   )
+                  )
+                  (local.set $35
+                   (i32.ne
+                    (local.get $18)
+                    (i32.const 0)
+                   )
+                  )
+                  (if
+                   (i32.lt_s
+                    (local.tee $8
+                     (i32.add
+                      (i32.sub
+                       (local.get $18)
+                       (if (result i32)
+                        (i32.ne
+                         (local.get $22)
+                         (i32.const 102)
+                        )
+                        (local.get $5)
+                        (i32.const 0)
+                       )
+                      )
+                      (i32.shr_s
+                       (i32.shl
+                        (i32.and
+                         (local.get $35)
+                         (local.get $29)
+                        )
+                        (i32.const 31)
+                       )
+                       (i32.const 31)
+                      )
+                     )
+                    )
+                    (i32.add
+                     (i32.mul
+                      (i32.shr_s
+                       (i32.sub
+                        (local.get $13)
+                        (local.get $25)
+                       )
+                       (i32.const 2)
+                      )
+                      (i32.const 9)
+                     )
+                     (i32.const -9)
+                    )
+                   )
+                   (block
+                    (if
+                     (i32.lt_s
+                      (local.tee $8
+                       (i32.add
+                        (i32.rem_s
+                         (local.tee $14
+                          (i32.add
+                           (local.get $8)
+                           (i32.const 9216)
+                          )
+                         )
+                         (i32.const 9)
+                        )
+                        (i32.const 1)
+                       )
+                      )
+                      (i32.const 9)
+                     )
+                     (block
+                      (local.set $6
+                       (i32.const 10)
+                      )
+                      (loop $label$180
+                       (local.set $6
+                        (i32.mul
+                         (local.get $6)
+                         (i32.const 10)
+                        )
+                       )
+                       (br_if $label$180
+                        (i32.ne
+                         (local.tee $8
+                          (i32.add
+                           (local.get $8)
+                           (i32.const 1)
+                          )
+                         )
+                         (i32.const 9)
+                        )
+                       )
+                      )
+                     )
+                     (local.set $6
+                      (i32.const 10)
+                     )
+                    )
+                    (local.set $14
+                     (i32.rem_u
+                      (local.tee $22
+                       (i32.load
+                        (local.tee $8
+                         (i32.add
+                          (i32.add
+                           (local.get $7)
+                           (i32.const 4)
+                          )
+                          (i32.shl
+                           (i32.add
+                            (i32.div_s
+                             (local.get $14)
+                             (i32.const 9)
+                            )
+                            (i32.const -1024)
+                           )
+                           (i32.const 2)
+                          )
+                         )
+                        )
+                       )
+                      )
+                      (local.get $6)
+                     )
+                    )
+                    (block $label$182
+                     (if
+                      (i32.eqz
+                       (i32.and
+                        (local.tee $32
+                         (i32.eq
+                          (i32.add
+                           (local.get $8)
+                           (i32.const 4)
+                          )
+                          (local.get $13)
+                         )
+                        )
+                        (i32.eqz
+                         (local.get $14)
+                        )
+                       )
+                      )
+                      (block
+                       (local.set $52
+                        (if (result f64)
+                         (i32.lt_u
+                          (local.get $14)
+                          (local.tee $49
+                           (i32.div_s
+                            (local.get $6)
+                            (i32.const 2)
+                           )
+                          )
+                         )
+                         (f64.const 0.5)
+                         (if (result f64)
+                          (i32.and
+                           (local.get $32)
+                           (i32.eq
+                            (local.get $14)
+                            (local.get $49)
+                           )
+                          )
+                          (f64.const 1)
+                          (f64.const 1.5)
+                         )
+                        )
+                       )
+                       (local.set $53
+                        (if (result f64)
+                         (i32.and
+                          (i32.div_u
+                           (local.get $22)
+                           (local.get $6)
+                          )
+                          (i32.const 1)
+                         )
+                         (f64.const 9007199254740994)
+                         (f64.const 9007199254740992)
+                        )
+                       )
+                       (block $label$190
+                        (if
+                         (local.get $24)
+                         (block
+                          (br_if $label$190
+                           (i32.ne
+                            (i32.load8_s
+                             (local.get $26)
+                            )
+                            (i32.const 45)
+                           )
+                          )
+                          (local.set $53
+                           (f64.neg
+                            (local.get $53)
+                           )
+                          )
+                          (local.set $52
+                           (f64.neg
+                            (local.get $52)
+                           )
+                          )
+                         )
+                        )
+                       )
+                       (i32.store
+                        (local.get $8)
+                        (local.tee $14
+                         (i32.sub
+                          (local.get $22)
+                          (local.get $14)
+                         )
+                        )
+                       )
+                       (br_if $label$182
+                        (f64.eq
+                         (f64.add
+                          (local.get $53)
+                          (local.get $52)
+                         )
+                         (local.get $53)
+                        )
+                       )
+                       (i32.store
+                        (local.get $8)
+                        (local.tee $5
+                         (i32.add
+                          (local.get $14)
+                          (local.get $6)
+                         )
+                        )
+                       )
+                       (if
+                        (i32.gt_u
+                         (local.get $5)
+                         (i32.const 999999999)
+                        )
+                        (loop $label$193
+                         (i32.store
+                          (local.get $8)
+                          (i32.const 0)
+                         )
+                         (if
+                          (i32.lt_u
+                           (local.tee $8
+                            (i32.add
+                             (local.get $8)
+                             (i32.const -4)
+                            )
+                           )
+                           (local.get $1)
+                          )
+                          (i32.store
+                           (local.tee $1
+                            (i32.add
+                             (local.get $1)
+                             (i32.const -4)
+                            )
+                           )
+                           (i32.const 0)
+                          )
+                         )
+                         (i32.store
+                          (local.get $8)
+                          (local.tee $5
+                           (i32.add
+                            (i32.load
+                             (local.get $8)
+                            )
+                            (i32.const 1)
+                           )
+                          )
+                         )
+                         (br_if $label$193
+                          (i32.gt_u
+                           (local.get $5)
+                           (i32.const 999999999)
+                          )
+                         )
+                        )
+                       )
+                       (local.set $5
+                        (i32.mul
+                         (i32.shr_s
+                          (i32.sub
+                           (local.get $25)
+                           (local.get $1)
+                          )
+                          (i32.const 2)
+                         )
+                         (i32.const 9)
+                        )
+                       )
+                       (br_if $label$182
+                        (i32.lt_u
+                         (local.tee $14
+                          (i32.load
+                           (local.get $1)
+                          )
+                         )
+                         (i32.const 10)
+                        )
+                       )
+                       (local.set $6
+                        (i32.const 10)
+                       )
+                       (loop $label$195
+                        (local.set $5
+                         (i32.add
+                          (local.get $5)
+                          (i32.const 1)
+                         )
+                        )
+                        (br_if $label$195
+                         (i32.ge_u
+                          (local.get $14)
+                          (local.tee $6
+                           (i32.mul
+                            (local.get $6)
+                            (i32.const 10)
+                           )
+                          )
+                         )
+                        )
+                       )
+                      )
+                     )
+                    )
+                    (local.set $14
+                     (local.get $1)
+                    )
+                    (local.set $6
+                     (local.get $5)
+                    )
+                    (if
+                     (i32.le_u
+                      (local.get $13)
+                      (local.tee $8
+                       (i32.add
+                        (local.get $8)
+                        (i32.const 4)
+                       )
+                      )
+                     )
+                     (local.set $8
+                      (local.get $13)
+                     )
+                    )
+                   )
+                   (block
+                    (local.set $14
+                     (local.get $1)
+                    )
+                    (local.set $6
+                     (local.get $5)
+                    )
+                    (local.set $8
+                     (local.get $13)
+                    )
+                   )
+                  )
+                  (local.set $32
+                   (i32.sub
+                    (i32.const 0)
+                    (local.get $6)
+                   )
+                  )
+                  (loop $label$198
+                   (block $label$199
+                    (if
+                     (i32.le_u
+                      (local.get $8)
+                      (local.get $14)
+                     )
+                     (block
+                      (local.set $22
+                       (i32.const 0)
+                      )
+                      (br $label$199)
+                     )
+                    )
+                    (if
+                     (i32.load
+                      (local.tee $1
+                       (i32.add
+                        (local.get $8)
+                        (i32.const -4)
+                       )
+                      )
+                     )
+                     (local.set $22
+                      (i32.const 1)
+                     )
+                     (block
+                      (local.set $8
+                       (local.get $1)
+                      )
+                      (br $label$198)
+                     )
+                    )
+                   )
+                  )
+                  (block $label$203
+                   (if
+                    (local.get $29)
+                    (block
+                     (local.set $1
+                      (if (result i32)
+                       (i32.and
+                        (i32.gt_s
+                         (local.tee $1
+                          (i32.add
+                           (i32.xor
+                            (i32.and
+                             (local.get $35)
+                             (i32.const 1)
+                            )
+                            (i32.const 1)
+                           )
+                           (local.get $18)
+                          )
+                         )
+                         (local.get $6)
+                        )
+                        (i32.gt_s
+                         (local.get $6)
+                         (i32.const -5)
+                        )
+                       )
+                       (block (result i32)
+                        (local.set $5
+                         (i32.add
+                          (local.get $9)
+                          (i32.const -1)
+                         )
+                        )
+                        (i32.sub
+                         (i32.add
+                          (local.get $1)
+                          (i32.const -1)
+                         )
+                         (local.get $6)
+                        )
+                       )
+                       (block (result i32)
+                        (local.set $5
+                         (i32.add
+                          (local.get $9)
+                          (i32.const -2)
+                         )
+                        )
+                        (i32.add
+                         (local.get $1)
+                         (i32.const -1)
+                        )
+                       )
+                      )
+                     )
+                     (br_if $label$203
+                      (local.tee $13
+                       (i32.and
+                        (local.get $12)
+                        (i32.const 8)
+                       )
+                      )
+                     )
+                     (block $label$207
+                      (if
+                       (local.get $22)
+                       (block
+                        (if
+                         (i32.eqz
+                          (local.tee $18
+                           (i32.load
+                            (i32.add
+                             (local.get $8)
+                             (i32.const -4)
+                            )
+                           )
+                          )
+                         )
+                         (block
+                          (local.set $9
+                           (i32.const 9)
+                          )
+                          (br $label$207)
+                         )
+                        )
+                        (if
+                         (i32.rem_u
+                          (local.get $18)
+                          (i32.const 10)
+                         )
+                         (block
+                          (local.set $9
+                           (i32.const 0)
+                          )
+                          (br $label$207)
+                         )
+                         (block
+                          (local.set $13
+                           (i32.const 10)
+                          )
+                          (local.set $9
+                           (i32.const 0)
+                          )
+                         )
+                        )
+                        (loop $label$212
+                         (local.set $9
+                          (i32.add
+                           (local.get $9)
+                           (i32.const 1)
+                          )
+                         )
+                         (br_if $label$212
+                          (i32.eqz
+                           (i32.rem_u
+                            (local.get $18)
+                            (local.tee $13
+                             (i32.mul
+                              (local.get $13)
+                              (i32.const 10)
+                             )
+                            )
+                           )
+                          )
+                         )
+                        )
+                       )
+                       (local.set $9
+                        (i32.const 9)
+                       )
+                      )
+                     )
+                     (local.set $18
+                      (i32.add
+                       (i32.mul
+                        (i32.shr_s
+                         (i32.sub
+                          (local.get $8)
+                          (local.get $25)
+                         )
+                         (i32.const 2)
+                        )
+                        (i32.const 9)
+                       )
+                       (i32.const -9)
+                      )
+                     )
+                     (if
+                      (i32.eq
+                       (i32.or
+                        (local.get $5)
+                        (i32.const 32)
+                       )
+                       (i32.const 102)
+                      )
+                      (block
+                       (local.set $13
+                        (i32.const 0)
+                       )
+                       (if
+                        (i32.ge_s
+                         (local.get $1)
+                         (if (result i32)
+                          (i32.lt_s
+                           (local.tee $9
+                            (i32.sub
+                             (local.get $18)
+                             (local.get $9)
+                            )
+                           )
+                           (i32.const 0)
+                          )
+                          (local.tee $9
+                           (i32.const 0)
+                          )
+                          (local.get $9)
+                         )
+                        )
+                        (local.set $1
+                         (local.get $9)
+                        )
+                       )
+                      )
+                      (block
+                       (local.set $13
+                        (i32.const 0)
+                       )
+                       (if
+                        (i32.ge_s
+                         (local.get $1)
+                         (if (result i32)
+                          (i32.lt_s
+                           (local.tee $9
+                            (i32.sub
+                             (i32.add
+                              (local.get $18)
+                              (local.get $6)
+                             )
+                             (local.get $9)
+                            )
+                           )
+                           (i32.const 0)
+                          )
+                          (local.tee $9
+                           (i32.const 0)
+                          )
+                          (local.get $9)
+                         )
+                        )
+                        (local.set $1
+                         (local.get $9)
+                        )
+                       )
+                      )
+                     )
+                    )
+                    (block
+                     (local.set $13
+                      (i32.and
+                       (local.get $12)
+                       (i32.const 8)
+                      )
+                     )
+                     (local.set $1
+                      (local.get $18)
+                     )
+                     (local.set $5
+                      (local.get $9)
+                     )
+                    )
+                   )
+                  )
+                  (if
+                   (local.tee $25
+                    (i32.eq
+                     (i32.or
+                      (local.get $5)
+                      (i32.const 32)
+                     )
+                     (i32.const 102)
+                    )
+                   )
+                   (block
+                    (local.set $9
+                     (i32.const 0)
+                    )
+                    (if
+                     (i32.le_s
+                      (local.get $6)
+                      (i32.const 0)
+                     )
+                     (local.set $6
+                      (i32.const 0)
+                     )
+                    )
+                   )
+                   (block
+                    (if
+                     (i32.lt_s
+                      (i32.sub
+                       (local.get $28)
+                       (local.tee $9
+                        (call $23
+                         (i64.extend_i32_s
+                          (if (result i32)
+                           (i32.lt_s
+                            (local.get $6)
+                            (i32.const 0)
+                           )
+                           (local.get $32)
+                           (local.get $6)
+                          )
+                         )
+                         (local.get $33)
+                        )
+                       )
+                      )
+                      (i32.const 2)
+                     )
+                     (loop $label$229
+                      (i32.store8
+                       (local.tee $9
+                        (i32.add
+                         (local.get $9)
+                         (i32.const -1)
+                        )
+                       )
+                       (i32.const 48)
+                      )
+                      (br_if $label$229
+                       (i32.lt_s
+                        (i32.sub
+                         (local.get $28)
+                         (local.get $9)
+                        )
+                        (i32.const 2)
+                       )
+                      )
+                     )
+                    )
+                    (i32.store8
+                     (i32.add
+                      (local.get $9)
+                      (i32.const -1)
+                     )
+                     (i32.add
+                      (i32.and
+                       (i32.shr_s
+                        (local.get $6)
+                        (i32.const 31)
+                       )
+                       (i32.const 2)
+                      )
+                      (i32.const 43)
+                     )
+                    )
+                    (i32.store8
+                     (local.tee $6
+                      (i32.add
+                       (local.get $9)
+                       (i32.const -2)
+                      )
+                     )
+                     (local.get $5)
+                    )
+                    (local.set $9
+                     (local.get $6)
+                    )
+                    (local.set $6
+                     (i32.sub
+                      (local.get $28)
+                      (local.get $6)
+                     )
+                    )
+                   )
+                  )
+                  (call $25
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (local.tee $18
+                    (i32.add
+                     (i32.add
+                      (i32.add
+                       (i32.add
+                        (local.get $24)
+                        (i32.const 1)
+                       )
+                       (local.get $1)
+                      )
+                      (i32.ne
+                       (local.tee $29
+                        (i32.or
+                         (local.get $1)
+                         (local.get $13)
+                        )
+                       )
+                       (i32.const 0)
+                      )
+                     )
+                     (local.get $6)
+                    )
+                   )
+                   (local.get $12)
+                  )
+                  (if
+                   (i32.eqz
+                    (i32.and
+                     (i32.load
+                      (local.get $0)
+                     )
+                     (i32.const 32)
+                    )
+                   )
+                   (drop
+                    (call $21
+                     (local.get $26)
+                     (local.get $24)
+                     (local.get $0)
+                    )
+                   )
+                  )
+                  (call $25
+                   (local.get $0)
+                   (i32.const 48)
+                   (local.get $10)
+                   (local.get $18)
+                   (i32.xor
+                    (local.get $12)
+                    (i32.const 65536)
+                   )
+                  )
+                  (block $label$231
+                   (if
+                    (local.get $25)
+                    (block
+                     (local.set $6
+                      (local.tee $9
+                       (if (result i32)
+                        (i32.gt_u
+                         (local.get $14)
+                         (local.get $7)
+                        )
+                        (local.get $7)
+                        (local.get $14)
+                       )
+                      )
+                     )
+                     (loop $label$235
+                      (local.set $5
+                       (call $23
+                        (i64.extend_i32_u
+                         (i32.load
+                          (local.get $6)
+                         )
+                        )
+                        (local.get $31)
+                       )
+                      )
+                      (block $label$236
+                       (if
+                        (i32.eq
+                         (local.get $6)
+                         (local.get $9)
+                        )
+                        (block
+                         (br_if $label$236
+                          (i32.ne
+                           (local.get $5)
+                           (local.get $31)
+                          )
+                         )
+                         (i32.store8
+                          (local.get $34)
+                          (i32.const 48)
+                         )
+                         (local.set $5
+                          (local.get $34)
+                         )
+                        )
+                        (block
+                         (br_if $label$236
+                          (i32.le_u
+                           (local.get $5)
+                           (local.get $19)
+                          )
+                         )
+                         (drop
+                          (call $39
+                           (local.get $19)
+                           (i32.const 48)
+                           (i32.sub
+                            (local.get $5)
+                            (local.get $27)
+                           )
+                          )
+                         )
+                         (loop $label$239
+                          (br_if $label$239
+                           (i32.gt_u
+                            (local.tee $5
+                             (i32.add
+                              (local.get $5)
+                              (i32.const -1)
+                             )
+                            )
+                            (local.get $19)
+                           )
+                          )
+                         )
+                        )
+                       )
+                      )
+                      (if
+                       (i32.eqz
+                        (i32.and
+                         (i32.load
+                          (local.get $0)
+                         )
+                         (i32.const 32)
+                        )
+                       )
+                       (drop
+                        (call $21
+                         (local.get $5)
+                         (i32.sub
+                          (local.get $41)
+                          (local.get $5)
+                         )
+                         (local.get $0)
+                        )
+                       )
+                      )
+                      (if
+                       (i32.le_u
+                        (local.tee $5
+                         (i32.add
+                          (local.get $6)
+                          (i32.const 4)
+                         )
+                        )
+                        (local.get $7)
+                       )
+                       (block
+                        (local.set $6
+                         (local.get $5)
+                        )
+                        (br $label$235)
+                       )
+                      )
+                     )
+                     (block $label$242
+                      (if
+                       (local.get $29)
+                       (block
+                        (br_if $label$242
+                         (i32.and
+                          (i32.load
+                           (local.get $0)
+                          )
+                          (i32.const 32)
+                         )
+                        )
+                        (drop
+                         (call $21
+                          (i32.const 1709)
+                          (i32.const 1)
+                          (local.get $0)
+                         )
+                        )
+                       )
+                      )
+                     )
+                     (if
+                      (i32.and
+                       (i32.gt_s
+                        (local.get $1)
+                        (i32.const 0)
+                       )
+                       (i32.lt_u
+                        (local.get $5)
+                        (local.get $8)
+                       )
+                      )
+                      (loop $label$245
+                       (if
+                        (i32.gt_u
+                         (local.tee $7
+                          (call $23
+                           (i64.extend_i32_u
+                            (i32.load
+                             (local.get $5)
+                            )
+                           )
+                           (local.get $31)
+                          )
+                         )
+                         (local.get $19)
+                        )
+                        (block
+                         (drop
+                          (call $39
+                           (local.get $19)
+                           (i32.const 48)
+                           (i32.sub
+                            (local.get $7)
+                            (local.get $27)
+                           )
+                          )
+                         )
+                         (loop $label$247
+                          (br_if $label$247
+                           (i32.gt_u
+                            (local.tee $7
+                             (i32.add
+                              (local.get $7)
+                              (i32.const -1)
+                             )
+                            )
+                            (local.get $19)
+                           )
+                          )
+                         )
+                        )
+                       )
+                       (if
+                        (i32.eqz
+                         (i32.and
+                          (i32.load
+                           (local.get $0)
+                          )
+                          (i32.const 32)
+                         )
+                        )
+                        (drop
+                         (call $21
+                          (local.get $7)
+                          (if (result i32)
+                           (i32.gt_s
+                            (local.get $1)
+                            (i32.const 9)
+                           )
+                           (i32.const 9)
+                           (local.get $1)
+                          )
+                          (local.get $0)
+                         )
+                        )
+                       )
+                       (local.set $7
+                        (i32.add
+                         (local.get $1)
+                         (i32.const -9)
+                        )
+                       )
+                       (if
+                        (i32.and
+                         (i32.gt_s
+                          (local.get $1)
+                          (i32.const 9)
+                         )
+                         (i32.lt_u
+                          (local.tee $5
+                           (i32.add
+                            (local.get $5)
+                            (i32.const 4)
+                           )
+                          )
+                          (local.get $8)
+                         )
+                        )
+                        (block
+                         (local.set $1
+                          (local.get $7)
+                         )
+                         (br $label$245)
+                        )
+                        (local.set $1
+                         (local.get $7)
+                        )
+                       )
+                      )
+                     )
+                     (call $25
+                      (local.get $0)
+                      (i32.const 48)
+                      (i32.add
+                       (local.get $1)
+                       (i32.const 9)
+                      )
+                      (i32.const 9)
+                      (i32.const 0)
+                     )
+                    )
+                    (block
+                     (local.set $5
+                      (i32.add
+                       (local.get $14)
+                       (i32.const 4)
+                      )
+                     )
+                     (if
+                      (i32.eqz
+                       (local.get $22)
+                      )
+                      (local.set $8
+                       (local.get $5)
+                      )
+                     )
+                     (if
+                      (i32.gt_s
+                       (local.get $1)
+                       (i32.const -1)
+                      )
+                      (block
+                       (local.set $13
+                        (i32.eqz
+                         (local.get $13)
+                        )
+                       )
+                       (local.set $7
+                        (local.get $14)
+                       )
+                       (local.set $5
+                        (local.get $1)
+                       )
+                       (loop $label$256
+                        (if
+                         (i32.eq
+                          (local.tee $1
+                           (call $23
+                            (i64.extend_i32_u
+                             (i32.load
+                              (local.get $7)
+                             )
+                            )
+                            (local.get $31)
+                           )
+                          )
+                          (local.get $31)
+                         )
+                         (block
+                          (i32.store8
+                           (local.get $34)
+                           (i32.const 48)
+                          )
+                          (local.set $1
+                           (local.get $34)
+                          )
+                         )
+                        )
+                        (block $label$258
+                         (if
+                          (i32.eq
+                           (local.get $7)
+                           (local.get $14)
+                          )
+                          (block
+                           (if
+                            (i32.eqz
+                             (i32.and
+                              (i32.load
+                               (local.get $0)
+                              )
+                              (i32.const 32)
+                             )
+                            )
+                            (drop
+                             (call $21
+                              (local.get $1)
+                              (i32.const 1)
+                              (local.get $0)
+                             )
+                            )
+                           )
+                           (local.set $1
+                            (i32.add
+                             (local.get $1)
+                             (i32.const 1)
+                            )
+                           )
+                           (br_if $label$258
+                            (i32.and
+                             (local.get $13)
+                             (i32.lt_s
+                              (local.get $5)
+                              (i32.const 1)
+                             )
+                            )
+                           )
+                           (br_if $label$258
+                            (i32.and
+                             (i32.load
+                              (local.get $0)
+                             )
+                             (i32.const 32)
+                            )
+                           )
+                           (drop
+                            (call $21
+                             (i32.const 1709)
+                             (i32.const 1)
+                             (local.get $0)
+                            )
+                           )
+                          )
+                          (block
+                           (br_if $label$258
+                            (i32.le_u
+                             (local.get $1)
+                             (local.get $19)
+                            )
+                           )
+                           (drop
+                            (call $39
+                             (local.get $19)
+                             (i32.const 48)
+                             (i32.add
+                              (local.get $1)
+                              (local.get $43)
+                             )
+                            )
+                           )
+                           (loop $label$262
+                            (br_if $label$262
+                             (i32.gt_u
+                              (local.tee $1
+                               (i32.add
+                                (local.get $1)
+                                (i32.const -1)
+                               )
+                              )
+                              (local.get $19)
+                             )
+                            )
+                           )
+                          )
+                         )
+                        )
+                        (local.set $6
+                         (i32.sub
+                          (local.get $41)
+                          (local.get $1)
+                         )
+                        )
+                        (if
+                         (i32.eqz
+                          (i32.and
+                           (i32.load
+                            (local.get $0)
+                           )
+                           (i32.const 32)
+                          )
+                         )
+                         (drop
+                          (call $21
+                           (local.get $1)
+                           (if (result i32)
+                            (i32.gt_s
+                             (local.get $5)
+                             (local.get $6)
+                            )
+                            (local.get $6)
+                            (local.get $5)
+                           )
+                           (local.get $0)
+                          )
+                         )
+                        )
+                        (br_if $label$256
+                         (i32.and
+                          (i32.lt_u
+                           (local.tee $7
+                            (i32.add
+                             (local.get $7)
+                             (i32.const 4)
+                            )
+                           )
+                           (local.get $8)
+                          )
+                          (i32.gt_s
+                           (local.tee $5
+                            (i32.sub
+                             (local.get $5)
+                             (local.get $6)
+                            )
+                           )
+                           (i32.const -1)
+                          )
+                         )
+                        )
+                        (local.set $1
+                         (local.get $5)
+                        )
+                       )
+                      )
+                     )
+                     (call $25
+                      (local.get $0)
+                      (i32.const 48)
+                      (i32.add
+                       (local.get $1)
+                       (i32.const 18)
+                      )
+                      (i32.const 18)
+                      (i32.const 0)
+                     )
+                     (br_if $label$231
+                      (i32.and
+                       (i32.load
+                        (local.get $0)
+                       )
+                       (i32.const 32)
+                      )
+                     )
+                     (drop
+                      (call $21
+                       (local.get $9)
+                       (i32.sub
+                        (local.get $28)
+                        (local.get $9)
+                       )
+                       (local.get $0)
+                      )
+                     )
+                    )
+                   )
+                  )
+                  (call $25
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (local.get $18)
+                   (i32.xor
+                    (local.get $12)
+                    (i32.const 8192)
+                   )
+                  )
+                  (if
+                   (i32.ge_s
+                    (local.get $18)
+                    (local.get $10)
+                   )
+                   (local.set $10
+                    (local.get $18)
+                   )
+                  )
+                 )
+                 (block
+                  (call $25
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (local.tee $8
+                    (i32.add
+                     (if (result i32)
+                      (local.tee $6
+                       (i32.or
+                        (f64.ne
+                         (local.get $52)
+                         (local.get $52)
+                        )
+                        (i32.const 0)
+                       )
+                      )
+                      (local.tee $24
+                       (i32.const 0)
+                      )
+                      (local.get $24)
+                     )
+                     (i32.const 3)
+                    )
+                   )
+                   (local.get $7)
+                  )
+                  (if
+                   (i32.eqz
+                    (i32.and
+                     (local.tee $1
+                      (i32.load
+                       (local.get $0)
+                      )
+                     )
+                     (i32.const 32)
+                    )
+                   )
+                   (block
+                    (drop
+                     (call $21
+                      (local.get $26)
+                      (local.get $24)
+                      (local.get $0)
+                     )
+                    )
+                    (local.set $1
+                     (i32.load
+                      (local.get $0)
+                     )
+                    )
+                   )
+                  )
+                  (local.set $7
+                   (if (result i32)
+                    (local.tee $5
+                     (i32.ne
+                      (i32.and
+                       (local.get $9)
+                       (i32.const 32)
+                      )
+                      (i32.const 0)
+                     )
+                    )
+                    (i32.const 1693)
+                    (i32.const 1697)
+                   )
+                  )
+                  (local.set $5
+                   (if (result i32)
+                    (local.get $5)
+                    (i32.const 1701)
+                    (i32.const 1705)
+                   )
+                  )
+                  (if
+                   (i32.eqz
+                    (local.get $6)
+                   )
+                   (local.set $5
+                    (local.get $7)
+                   )
+                  )
+                  (if
+                   (i32.eqz
+                    (i32.and
+                     (local.get $1)
+                     (i32.const 32)
+                    )
+                   )
+                   (drop
+                    (call $21
+                     (local.get $5)
+                     (i32.const 3)
+                     (local.get $0)
+                    )
+                   )
+                  )
+                  (call $25
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (local.get $8)
+                   (i32.xor
+                    (local.get $12)
+                    (i32.const 8192)
+                   )
+                  )
+                  (if
+                   (i32.ge_s
+                    (local.get $8)
+                    (local.get $10)
+                   )
+                   (local.set $10
+                    (local.get $8)
+                   )
+                  )
+                 )
+                )
+               )
+               (local.set $1
+                (local.get $11)
+               )
+               (br $label$4)
+              )
+              (local.set $7
+               (local.get $5)
+              )
+              (local.set $6
+               (i32.const 0)
+              )
+              (local.set $8
+               (i32.const 1657)
+              )
+              (local.set $5
+               (local.get $21)
+              )
+              (br $label$70)
+             )
+             (local.set $7
+              (i32.and
+               (local.get $9)
+               (i32.const 32)
+              )
+             )
+             (local.set $7
+              (if (result i32)
+               (i64.eq
+                (local.tee $50
+                 (i64.load
+                  (local.get $16)
+                 )
+                )
+                (i64.const 0)
+               )
+               (block (result i32)
+                (local.set $50
+                 (i64.const 0)
+                )
+                (local.get $21)
+               )
+               (block (result i32)
+                (local.set $1
+                 (local.get $21)
+                )
+                (loop $label$280
+                 (i32.store8
+                  (local.tee $1
+                   (i32.add
+                    (local.get $1)
+                    (i32.const -1)
+                   )
+                  )
+                  (i32.or
+                   (i32.load8_u
+                    (i32.add
+                     (i32.and
+                      (i32.wrap_i64
+                       (local.get $50)
+                      )
+                      (i32.const 15)
+                     )
+                     (i32.const 1641)
+                    )
+                   )
+                   (local.get $7)
+                  )
+                 )
+                 (br_if $label$280
+                  (i64.ne
+                   (local.tee $50
+                    (i64.shr_u
+                     (local.get $50)
+                     (i64.const 4)
+                    )
+                   )
+                   (i64.const 0)
+                  )
+                 )
+                )
+                (local.set $50
+                 (i64.load
+                  (local.get $16)
+                 )
+                )
+                (local.get $1)
+               )
+              )
+             )
+             (local.set $8
+              (i32.add
+               (i32.shr_s
+                (local.get $9)
+                (i32.const 4)
+               )
+               (i32.const 1657)
+              )
+             )
+             (if
+              (local.tee $1
+               (i32.or
+                (i32.eqz
+                 (i32.and
+                  (local.get $12)
+                  (i32.const 8)
+                 )
+                )
+                (i64.eq
+                 (local.get $50)
+                 (i64.const 0)
+                )
+               )
+              )
+              (local.set $8
+               (i32.const 1657)
+              )
+             )
+             (local.set $6
+              (if (result i32)
+               (local.get $1)
+               (i32.const 0)
+               (i32.const 2)
+              )
+             )
+             (br $label$71)
+            )
+            (local.set $7
+             (call $23
+              (local.get $50)
+              (local.get $21)
+             )
+            )
+            (br $label$71)
+           )
+           (local.set $14
+            (i32.eqz
+             (local.tee $13
+              (call $17
+               (local.get $1)
+               (i32.const 0)
+               (local.get $5)
+              )
+             )
+            )
+           )
+           (local.set $8
+            (i32.sub
+             (local.get $13)
+             (local.get $1)
+            )
+           )
+           (local.set $9
+            (i32.add
+             (local.get $1)
+             (local.get $5)
+            )
+           )
+           (local.set $12
+            (local.get $7)
+           )
+           (local.set $7
+            (if (result i32)
+             (local.get $14)
+             (local.get $5)
+             (local.get $8)
+            )
+           )
+           (local.set $6
+            (i32.const 0)
+           )
+           (local.set $8
+            (i32.const 1657)
+           )
+           (local.set $5
+            (if (result i32)
+             (local.get $14)
+             (local.get $9)
+             (local.get $13)
+            )
+           )
+           (br $label$70)
+          )
+          (local.set $1
+           (i32.const 0)
+          )
+          (local.set $5
+           (i32.const 0)
+          )
+          (local.set $8
+           (local.get $7)
+          )
+          (loop $label$288
+           (block $label$289
+            (br_if $label$289
+             (i32.eqz
+              (local.tee $9
+               (i32.load
+                (local.get $8)
+               )
+              )
+             )
+            )
+            (br_if $label$289
+             (i32.or
+              (i32.lt_s
+               (local.tee $5
+                (call $26
+                 (local.get $36)
+                 (local.get $9)
+                )
+               )
+               (i32.const 0)
+              )
+              (i32.gt_u
+               (local.get $5)
+               (i32.sub
+                (local.get $6)
+                (local.get $1)
+               )
+              )
+             )
+            )
+            (local.set $8
+             (i32.add
+              (local.get $8)
+              (i32.const 4)
+             )
+            )
+            (br_if $label$288
+             (i32.gt_u
+              (local.get $6)
+              (local.tee $1
+               (i32.add
+                (local.get $5)
+                (local.get $1)
+               )
+              )
+             )
+            )
+           )
+          )
+          (if
+           (i32.lt_s
+            (local.get $5)
+            (i32.const 0)
+           )
+           (block
+            (local.set $15
+             (i32.const -1)
+            )
+            (br $label$5)
+           )
+          )
+          (call $25
+           (local.get $0)
+           (i32.const 32)
+           (local.get $10)
+           (local.get $1)
+           (local.get $12)
+          )
+          (if
+           (local.get $1)
+           (block
+            (local.set $5
+             (i32.const 0)
+            )
+            (loop $label$292
+             (br_if $label$72
+              (i32.eqz
+               (local.tee $8
+                (i32.load
+                 (local.get $7)
+                )
+               )
+              )
+             )
+             (br_if $label$72
+              (i32.gt_s
+               (local.tee $5
+                (i32.add
+                 (local.tee $8
+                  (call $26
+                   (local.get $36)
+                   (local.get $8)
+                  )
+                 )
+                 (local.get $5)
+                )
+               )
+               (local.get $1)
+              )
+             )
+             (if
+              (i32.eqz
+               (i32.and
+                (i32.load
+                 (local.get $0)
+                )
+                (i32.const 32)
+               )
+              )
+              (drop
+               (call $21
+                (local.get $36)
+                (local.get $8)
+                (local.get $0)
+               )
+              )
+             )
+             (local.set $7
+              (i32.add
+               (local.get $7)
+               (i32.const 4)
+              )
+             )
+             (br_if $label$292
+              (i32.lt_u
+               (local.get $5)
+               (local.get $1)
+              )
+             )
+             (br $label$72)
+            )
+           )
+           (block
+            (local.set $1
+             (i32.const 0)
+            )
+            (br $label$72)
+           )
+          )
+         )
+         (call $25
+          (local.get $0)
+          (i32.const 32)
+          (local.get $10)
+          (local.get $1)
+          (i32.xor
+           (local.get $12)
+           (i32.const 8192)
+          )
+         )
+         (if
+          (i32.le_s
+           (local.get $10)
+           (local.get $1)
+          )
+          (local.set $10
+           (local.get $1)
+          )
+         )
+         (local.set $1
+          (local.get $11)
+         )
+         (br $label$4)
+        )
+        (local.set $1
+         (i32.and
+          (local.get $12)
+          (i32.const -65537)
+         )
+        )
+        (if
+         (i32.gt_s
+          (local.get $5)
+          (i32.const -1)
+         )
+         (local.set $12
+          (local.get $1)
+         )
+        )
+        (local.set $5
+         (if (result i32)
+          (i32.or
+           (local.get $5)
+           (local.tee $9
+            (i64.ne
+             (i64.load
+              (local.get $16)
+             )
+             (i64.const 0)
+            )
+           )
+          )
+          (block (result i32)
+           (local.set $1
+            (local.get $7)
+           )
+           (if
+            (i32.gt_s
+             (local.get $5)
+             (local.tee $7
+              (i32.add
+               (i32.xor
+                (i32.and
+                 (local.get $9)
+                 (i32.const 1)
+                )
+                (i32.const 1)
+               )
+               (i32.sub
+                (local.get $38)
+                (local.get $7)
+               )
+              )
+             )
+            )
+            (local.set $7
+             (local.get $5)
+            )
+           )
+           (local.get $21)
+          )
+          (block (result i32)
+           (local.set $1
+            (local.get $21)
+           )
+           (local.set $7
+            (i32.const 0)
+           )
+           (local.get $21)
+          )
+         )
+        )
+       )
+       (call $25
+        (local.get $0)
+        (i32.const 32)
+        (if (result i32)
+         (i32.lt_s
+          (local.get $10)
+          (local.tee $5
+           (i32.add
+            (if (result i32)
+             (i32.lt_s
+              (local.get $7)
+              (local.tee $9
+               (i32.sub
+                (local.get $5)
+                (local.get $1)
+               )
+              )
+             )
+             (local.tee $7
+              (local.get $9)
+             )
+             (local.get $7)
+            )
+            (local.get $6)
+           )
+          )
+         )
+         (local.tee $10
+          (local.get $5)
+         )
+         (local.get $10)
+        )
+        (local.get $5)
+        (local.get $12)
+       )
+       (if
+        (i32.eqz
+         (i32.and
+          (i32.load
+           (local.get $0)
+          )
+          (i32.const 32)
+         )
+        )
+        (drop
+         (call $21
+          (local.get $8)
+          (local.get $6)
+          (local.get $0)
+         )
+        )
+       )
+       (call $25
+        (local.get $0)
+        (i32.const 48)
+        (local.get $10)
+        (local.get $5)
+        (i32.xor
+         (local.get $12)
+         (i32.const 65536)
+        )
+       )
+       (call $25
+        (local.get $0)
+        (i32.const 48)
+        (local.get $7)
+        (local.get $9)
+        (i32.const 0)
+       )
+       (if
+        (i32.eqz
+         (i32.and
+          (i32.load
+           (local.get $0)
+          )
+          (i32.const 32)
+         )
+        )
+        (drop
+         (call $21
+          (local.get $1)
+          (local.get $9)
+          (local.get $0)
+         )
+        )
+       )
+       (call $25
+        (local.get $0)
+        (i32.const 32)
+        (local.get $10)
+        (local.get $5)
+        (i32.xor
+         (local.get $12)
+         (i32.const 8192)
+        )
+       )
+       (local.set $1
+        (local.get $11)
+       )
+       (br $label$4)
+      )
+     )
+     (br $label$2)
+    )
+    (if
+     (i32.eqz
+      (local.get $0)
+     )
+     (if
+      (local.get $17)
+      (block
+       (local.set $0
+        (i32.const 1)
+       )
+       (loop $label$308
+        (if
+         (local.tee $1
+          (i32.load
+           (i32.add
+            (local.get $4)
+            (i32.shl
+             (local.get $0)
+             (i32.const 2)
+            )
+           )
+          )
+         )
+         (block
+          (call $22
+           (i32.add
+            (local.get $3)
+            (i32.shl
+             (local.get $0)
+             (i32.const 3)
+            )
+           )
+           (local.get $1)
+           (local.get $2)
+          )
+          (br_if $label$308
+           (i32.lt_s
+            (local.tee $0
+             (i32.add
+              (local.get $0)
+              (i32.const 1)
+             )
+            )
+            (i32.const 10)
+           )
+          )
+          (local.set $15
+           (i32.const 1)
+          )
+          (br $label$2)
+         )
+        )
+       )
+       (loop $label$310
+        (if
+         (i32.load
+          (i32.add
+           (local.get $4)
+           (i32.shl
+            (local.get $0)
+            (i32.const 2)
+           )
+          )
+         )
+         (block
+          (local.set $15
+           (i32.const -1)
+          )
+          (br $label$2)
+         )
+        )
+        (br_if $label$310
+         (i32.lt_s
+          (local.tee $0
+           (i32.add
+            (local.get $0)
+            (i32.const 1)
+           )
+          )
+          (i32.const 10)
+         )
+        )
+        (local.set $15
+         (i32.const 1)
+        )
+       )
+      )
+      (local.set $15
+       (i32.const 0)
+      )
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $23)
+   )
+   (local.get $15)
   )
-  (func $16 (;29;) (type $2) (param $0 i32)
-    local.get $0
-    i32.load offset=68
-    i32.eqz
-    if ;; label = @1
-      local.get $0
-      call $13
-    end
+ )
+ (func $20 (; 33 ;) (type $1) (param $0 i32) (result i32)
+  (i32.const 0)
+ )
+ (func $21 (; 34 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (block $label$1 (result i32)
+   (block $label$2
+    (block $label$3
+     (br_if $label$3
+      (local.tee $3
+       (i32.load
+        (local.tee $4
+         (i32.add
+          (local.get $2)
+          (i32.const 16)
+         )
+        )
+       )
+      )
+     )
+     (if
+      (call $30
+       (local.get $2)
+      )
+      (local.set $3
+       (i32.const 0)
+      )
+      (block
+       (local.set $3
+        (i32.load
+         (local.get $4)
+        )
+       )
+       (br $label$3)
+      )
+     )
+     (br $label$2)
+    )
+    (if
+     (i32.lt_u
+      (i32.sub
+       (local.get $3)
+       (local.tee $4
+        (i32.load
+         (local.tee $5
+          (i32.add
+           (local.get $2)
+           (i32.const 20)
+          )
+         )
+        )
+       )
+      )
+      (local.get $1)
+     )
+     (block
+      (local.set $3
+       (call_indirect (type $0)
+        (local.get $2)
+        (local.get $0)
+        (local.get $1)
+        (i32.add
+         (i32.and
+          (i32.load offset=36
+           (local.get $2)
+          )
+          (i32.const 3)
+         )
+         (i32.const 2)
+        )
+       )
+      )
+      (br $label$2)
+     )
+    )
+    (local.set $2
+     (block $label$7 (result i32)
+      (if (result i32)
+       (i32.gt_s
+        (i32.load8_s offset=75
+         (local.get $2)
+        )
+        (i32.const -1)
+       )
+       (block (result i32)
+        (local.set $3
+         (local.get $1)
+        )
+        (loop $label$9
+         (drop
+          (br_if $label$7
+           (i32.const 0)
+           (i32.eqz
+            (local.get $3)
+           )
+          )
+         )
+         (if
+          (i32.ne
+           (i32.load8_s
+            (i32.add
+             (local.get $0)
+             (local.tee $6
+              (i32.add
+               (local.get $3)
+               (i32.const -1)
+              )
+             )
+            )
+           )
+           (i32.const 10)
+          )
+          (block
+           (local.set $3
+            (local.get $6)
+           )
+           (br $label$9)
+          )
+         )
+        )
+        (br_if $label$2
+         (i32.lt_u
+          (call_indirect (type $0)
+           (local.get $2)
+           (local.get $0)
+           (local.get $3)
+           (i32.add
+            (i32.and
+             (i32.load offset=36
+              (local.get $2)
+             )
+             (i32.const 3)
+            )
+            (i32.const 2)
+           )
+          )
+          (local.get $3)
+         )
+        )
+        (local.set $4
+         (i32.load
+          (local.get $5)
+         )
+        )
+        (local.set $1
+         (i32.sub
+          (local.get $1)
+          (local.get $3)
+         )
+        )
+        (local.set $0
+         (i32.add
+          (local.get $0)
+          (local.get $3)
+         )
+        )
+        (local.get $3)
+       )
+       (i32.const 0)
+      )
+     )
+    )
+    (drop
+     (call $40
+      (local.get $4)
+      (local.get $0)
+      (local.get $1)
+     )
+    )
+    (i32.store
+     (local.get $5)
+     (i32.add
+      (i32.load
+       (local.get $5)
+      )
+      (local.get $1)
+     )
+    )
+    (local.set $3
+     (i32.add
+      (local.get $2)
+      (local.get $1)
+     )
+    )
+   )
+   (local.get $3)
   )
-  (func $17 (;30;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $1
-      i32.const 255
-      i32.and
-      local.set $5
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            local.get $2
-            i32.const 0
-            i32.ne
-            local.tee $4
-            local.get $0
-            i32.const 3
-            i32.and
-            i32.const 0
-            i32.ne
-            i32.and
-            if ;; label = @5
-              block ;; label = @6
-                local.get $1
-                i32.const 255
-                i32.and
-                local.set $4
-                local.get $2
-                local.set $3
-                local.get $0
-                local.set $2
-                loop $label$6 ;; label = @7
-                  local.get $2
-                  i32.load8_s
-                  local.get $4
-                  i32.const 24
-                  i32.shl
-                  i32.const 24
-                  i32.shr_s
-                  i32.eq
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $3
-                      local.set $0
-                      br 6 (;@3;)
-                    end
-                  end
-                  local.get $3
-                  i32.const -1
-                  i32.add
-                  local.tee $3
-                  i32.const 0
-                  i32.ne
-                  local.tee $0
-                  local.get $2
-                  i32.const 1
-                  i32.add
-                  local.tee $2
-                  i32.const 3
-                  i32.and
-                  i32.const 0
-                  i32.ne
-                  i32.and
-                  br_if 0 (;@7;)
-                  br 3 (;@4;)
-                end
-              end
-            else
-              block ;; label = @6
-                local.get $2
-                local.set $3
-                local.get $0
-                local.set $2
-                local.get $4
-                local.set $0
-              end
-            end
-          end
-          local.get $0
-          if ;; label = @4
-            block ;; label = @5
-              local.get $3
-              local.set $0
-              br 2 (;@3;)
-            end
-          else
-            i32.const 0
-            local.set $0
-          end
-          br 1 (;@2;)
-        end
-        local.get $2
-        i32.load8_s
-        local.get $1
-        i32.const 255
-        i32.and
-        local.tee $1
-        i32.const 24
-        i32.shl
-        i32.const 24
-        i32.shr_s
-        i32.ne
-        if ;; label = @3
-          block ;; label = @4
-            local.get $5
-            i32.const 16843009
-            i32.mul
-            local.set $3
-            block $label$12 ;; label = @5
-              block $label$13 ;; label = @6
-                local.get $0
-                i32.const 3
-                i32.le_u
-                br_if 0 (;@6;)
-                loop $label$14 ;; label = @7
-                  local.get $2
-                  i32.load
-                  local.get $3
-                  i32.xor
-                  local.tee $4
-                  i32.const -2139062144
-                  i32.and
-                  i32.const -2139062144
-                  i32.xor
-                  local.get $4
-                  i32.const -16843009
-                  i32.add
-                  i32.and
-                  i32.eqz
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $2
-                      i32.const 4
-                      i32.add
-                      local.set $2
-                      local.get $0
-                      i32.const -4
-                      i32.add
-                      local.tee $0
-                      i32.const 3
-                      i32.gt_u
-                      br_if 2 (;@7;)
-                      br 3 (;@6;)
-                    end
-                  end
-                end
-                br 1 (;@5;)
-              end
-              local.get $0
-              i32.eqz
-              if ;; label = @6
-                block ;; label = @7
-                  i32.const 0
-                  local.set $0
-                  br 5 (;@2;)
-                end
-              end
-            end
-            loop $label$17 ;; label = @5
-              local.get $2
-              i32.load8_s
-              local.get $1
-              i32.const 24
-              i32.shl
-              i32.const 24
-              i32.shr_s
-              i32.eq
-              br_if 3 (;@2;)
-              local.get $2
-              i32.const 1
-              i32.add
-              local.set $2
-              local.get $0
-              i32.const -1
-              i32.add
-              local.tee $0
-              br_if 0 (;@5;)
-              i32.const 0
-              local.set $0
-            end
-          end
-        end
-      end
-      local.get $0
-      if (result i32) ;; label = @2
-        local.get $2
-      else
-        i32.const 0
-      end
-    end
+ )
+ (func $22 (; 35 ;) (type $8) (param $0 i32) (param $1 i32) (param $2 i32)
+  (local $3 i32)
+  (local $4 i64)
+  (local $5 f64)
+  (block $label$1
+   (if
+    (i32.le_u
+     (local.get $1)
+     (i32.const 20)
+    )
+    (block $label$3
+     (block $label$4
+      (block $label$5
+       (block $label$6
+        (block $label$7
+         (block $label$8
+          (block $label$9
+           (block $label$10
+            (block $label$11
+             (block $label$12
+              (block $label$13
+               (br_table $label$13 $label$12 $label$11 $label$10 $label$9 $label$8 $label$7 $label$6 $label$5 $label$4 $label$3
+                (i32.sub
+                 (local.get $1)
+                 (i32.const 9)
+                )
+               )
+              )
+              (local.set $3
+               (i32.load
+                (local.tee $1
+                 (i32.and
+                  (i32.add
+                   (i32.load
+                    (local.get $2)
+                   )
+                   (i32.const 3)
+                  )
+                  (i32.const -4)
+                 )
+                )
+               )
+              )
+              (i32.store
+               (local.get $2)
+               (i32.add
+                (local.get $1)
+                (i32.const 4)
+               )
+              )
+              (i32.store
+               (local.get $0)
+               (local.get $3)
+              )
+              (br $label$1)
+             )
+             (local.set $3
+              (i32.load
+               (local.tee $1
+                (i32.and
+                 (i32.add
+                  (i32.load
+                   (local.get $2)
+                  )
+                  (i32.const 3)
+                 )
+                 (i32.const -4)
+                )
+               )
+              )
+             )
+             (i32.store
+              (local.get $2)
+              (i32.add
+               (local.get $1)
+               (i32.const 4)
+              )
+             )
+             (i64.store
+              (local.get $0)
+              (i64.extend_i32_s
+               (local.get $3)
+              )
+             )
+             (br $label$1)
+            )
+            (local.set $3
+             (i32.load
+              (local.tee $1
+               (i32.and
+                (i32.add
+                 (i32.load
+                  (local.get $2)
+                 )
+                 (i32.const 3)
+                )
+                (i32.const -4)
+               )
+              )
+             )
+            )
+            (i32.store
+             (local.get $2)
+             (i32.add
+              (local.get $1)
+              (i32.const 4)
+             )
+            )
+            (i64.store
+             (local.get $0)
+             (i64.extend_i32_u
+              (local.get $3)
+             )
+            )
+            (br $label$1)
+           )
+           (local.set $4
+            (i64.load
+             (local.tee $1
+              (i32.and
+               (i32.add
+                (i32.load
+                 (local.get $2)
+                )
+                (i32.const 7)
+               )
+               (i32.const -8)
+              )
+             )
+            )
+           )
+           (i32.store
+            (local.get $2)
+            (i32.add
+             (local.get $1)
+             (i32.const 8)
+            )
+           )
+           (i64.store
+            (local.get $0)
+            (local.get $4)
+           )
+           (br $label$1)
+          )
+          (local.set $3
+           (i32.load
+            (local.tee $1
+             (i32.and
+              (i32.add
+               (i32.load
+                (local.get $2)
+               )
+               (i32.const 3)
+              )
+              (i32.const -4)
+             )
+            )
+           )
+          )
+          (i32.store
+           (local.get $2)
+           (i32.add
+            (local.get $1)
+            (i32.const 4)
+           )
+          )
+          (i64.store
+           (local.get $0)
+           (i64.extend_i32_s
+            (i32.shr_s
+             (i32.shl
+              (i32.and
+               (local.get $3)
+               (i32.const 65535)
+              )
+              (i32.const 16)
+             )
+             (i32.const 16)
+            )
+           )
+          )
+          (br $label$1)
+         )
+         (local.set $3
+          (i32.load
+           (local.tee $1
+            (i32.and
+             (i32.add
+              (i32.load
+               (local.get $2)
+              )
+              (i32.const 3)
+             )
+             (i32.const -4)
+            )
+           )
+          )
+         )
+         (i32.store
+          (local.get $2)
+          (i32.add
+           (local.get $1)
+           (i32.const 4)
+          )
+         )
+         (i64.store
+          (local.get $0)
+          (i64.extend_i32_u
+           (i32.and
+            (local.get $3)
+            (i32.const 65535)
+           )
+          )
+         )
+         (br $label$1)
+        )
+        (local.set $3
+         (i32.load
+          (local.tee $1
+           (i32.and
+            (i32.add
+             (i32.load
+              (local.get $2)
+             )
+             (i32.const 3)
+            )
+            (i32.const -4)
+           )
+          )
+         )
+        )
+        (i32.store
+         (local.get $2)
+         (i32.add
+          (local.get $1)
+          (i32.const 4)
+         )
+        )
+        (i64.store
+         (local.get $0)
+         (i64.extend_i32_s
+          (i32.shr_s
+           (i32.shl
+            (i32.and
+             (local.get $3)
+             (i32.const 255)
+            )
+            (i32.const 24)
+           )
+           (i32.const 24)
+          )
+         )
+        )
+        (br $label$1)
+       )
+       (local.set $3
+        (i32.load
+         (local.tee $1
+          (i32.and
+           (i32.add
+            (i32.load
+             (local.get $2)
+            )
+            (i32.const 3)
+           )
+           (i32.const -4)
+          )
+         )
+        )
+       )
+       (i32.store
+        (local.get $2)
+        (i32.add
+         (local.get $1)
+         (i32.const 4)
+        )
+       )
+       (i64.store
+        (local.get $0)
+        (i64.extend_i32_u
+         (i32.and
+          (local.get $3)
+          (i32.const 255)
+         )
+        )
+       )
+       (br $label$1)
+      )
+      (local.set $5
+       (f64.load
+        (local.tee $1
+         (i32.and
+          (i32.add
+           (i32.load
+            (local.get $2)
+           )
+           (i32.const 7)
+          )
+          (i32.const -8)
+         )
+        )
+       )
+      )
+      (i32.store
+       (local.get $2)
+       (i32.add
+        (local.get $1)
+        (i32.const 8)
+       )
+      )
+      (f64.store
+       (local.get $0)
+       (local.get $5)
+      )
+      (br $label$1)
+     )
+     (local.set $5
+      (f64.load
+       (local.tee $1
+        (i32.and
+         (i32.add
+          (i32.load
+           (local.get $2)
+          )
+          (i32.const 7)
+         )
+         (i32.const -8)
+        )
+       )
+      )
+     )
+     (i32.store
+      (local.get $2)
+      (i32.add
+       (local.get $1)
+       (i32.const 8)
+      )
+     )
+     (f64.store
+      (local.get $0)
+      (local.get $5)
+     )
+    )
+   )
   )
-  (func $18 (;31;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $4
-      global.get $global$1
-      i32.const 224
-      i32.add
-      global.set $global$1
-      local.get $4
-      i32.const 136
-      i32.add
-      local.set $5
-      local.get $4
-      i32.const 80
-      i32.add
-      local.tee $3
-      i64.const 0
-      i64.store align=4
-      local.get $3
-      i64.const 0
-      i64.store offset=8 align=4
-      local.get $3
-      i64.const 0
-      i64.store offset=16 align=4
-      local.get $3
-      i64.const 0
-      i64.store offset=24 align=4
-      local.get $3
-      i64.const 0
-      i64.store offset=32 align=4
-      local.get $4
-      i32.const 120
-      i32.add
-      local.tee $6
-      local.get $2
-      i32.load
-      i32.store
-      i32.const 0
-      local.get $1
-      local.get $6
-      local.get $4
-      local.tee $2
-      local.get $3
-      call $19
-      i32.const 0
-      i32.lt_s
-      if ;; label = @2
-        i32.const -1
-        local.set $1
-      else
-        block ;; label = @3
-          local.get $0
-          i32.load offset=76
-          i32.const -1
-          i32.gt_s
-          if (result i32) ;; label = @4
-            local.get $0
-            call $20
-          else
-            i32.const 0
-          end
-          local.set $12
-          local.get $0
-          i32.load
-          local.set $7
-          local.get $0
-          i32.load8_s offset=74
-          i32.const 1
-          i32.lt_s
-          if ;; label = @4
-            local.get $0
-            local.get $7
-            i32.const -33
-            i32.and
-            i32.store
-          end
-          local.get $0
-          i32.const 48
-          i32.add
-          local.tee $8
-          i32.load
-          if ;; label = @4
-            local.get $0
-            local.get $1
-            local.get $6
-            local.get $2
-            local.get $3
-            call $19
-            local.set $1
-          else
-            block ;; label = @5
-              local.get $0
-              i32.const 44
-              i32.add
-              local.tee $9
-              i32.load
-              local.set $10
-              local.get $9
-              local.get $5
-              i32.store
-              local.get $0
-              i32.const 28
-              i32.add
-              local.tee $13
-              local.get $5
-              i32.store
-              local.get $0
-              i32.const 20
-              i32.add
-              local.tee $11
-              local.get $5
-              i32.store
-              local.get $8
-              i32.const 80
-              i32.store
-              local.get $0
-              i32.const 16
-              i32.add
-              local.tee $14
-              local.get $5
-              i32.const 80
-              i32.add
-              i32.store
-              local.get $0
-              local.get $1
-              local.get $6
-              local.get $2
-              local.get $3
-              call $19
-              local.set $1
-              local.get $10
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $0
-                  i32.const 0
-                  i32.const 0
-                  local.get $0
-                  i32.load offset=36
-                  i32.const 3
-                  i32.and
-                  i32.const 2
-                  i32.add
-                  call_indirect (type $0)
-                  drop
-                  local.get $11
-                  i32.load
-                  i32.eqz
-                  if ;; label = @8
-                    i32.const -1
-                    local.set $1
-                  end
-                  local.get $9
-                  local.get $10
-                  i32.store
-                  local.get $8
-                  i32.const 0
-                  i32.store
-                  local.get $14
-                  i32.const 0
-                  i32.store
-                  local.get $13
-                  i32.const 0
-                  i32.store
-                  local.get $11
-                  i32.const 0
-                  i32.store
-                end
-              end
-            end
-          end
-          local.get $0
-          local.get $0
-          i32.load
-          local.tee $2
-          local.get $7
-          i32.const 32
-          i32.and
-          i32.or
-          i32.store
-          local.get $12
-          if ;; label = @4
-            local.get $0
-            call $13
-          end
-          local.get $2
-          i32.const 32
-          i32.and
-          if ;; label = @4
-            i32.const -1
-            local.set $1
-          end
-        end
-      end
-      local.get $4
-      global.set $global$1
-      local.get $1
-    end
+ )
+ (func $23 (; 36 ;) (type $9) (param $0 i64) (param $1 i32) (result i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i64)
+  (block $label$1 (result i32)
+   (local.set $2
+    (i32.wrap_i64
+     (local.get $0)
+    )
+   )
+   (if
+    (i64.gt_u
+     (local.get $0)
+     (i64.const 4294967295)
+    )
+    (block
+     (loop $label$3
+      (i64.store8
+       (local.tee $1
+        (i32.add
+         (local.get $1)
+         (i32.const -1)
+        )
+       )
+       (i64.or
+        (i64.rem_u
+         (local.get $0)
+         (i64.const 10)
+        )
+        (i64.const 48)
+       )
+      )
+      (local.set $4
+       (i64.div_u
+        (local.get $0)
+        (i64.const 10)
+       )
+      )
+      (if
+       (i64.gt_u
+        (local.get $0)
+        (i64.const 42949672959)
+       )
+       (block
+        (local.set $0
+         (local.get $4)
+        )
+        (br $label$3)
+       )
+      )
+     )
+     (local.set $2
+      (i32.wrap_i64
+       (local.get $4)
+      )
+     )
+    )
+   )
+   (if
+    (local.get $2)
+    (loop $label$6
+     (i32.store8
+      (local.tee $1
+       (i32.add
+        (local.get $1)
+        (i32.const -1)
+       )
+      )
+      (i32.or
+       (i32.rem_u
+        (local.get $2)
+        (i32.const 10)
+       )
+       (i32.const 48)
+      )
+     )
+     (local.set $3
+      (i32.div_u
+       (local.get $2)
+       (i32.const 10)
+      )
+     )
+     (if
+      (i32.ge_u
+       (local.get $2)
+       (i32.const 10)
+      )
+      (block
+       (local.set $2
+        (local.get $3)
+       )
+       (br $label$6)
+      )
+     )
+    )
+   )
+   (local.get $1)
   )
-  (func $19 (;32;) (type $7) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (result i32)
-    (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32) (local $15 i32) (local $16 i32) (local $17 i32) (local $18 i32) (local $19 i32) (local $20 i32) (local $21 i32) (local $22 i32) (local $23 i32) (local $24 i32) (local $25 i32) (local $26 i32) (local $27 i32) (local $28 i32) (local $29 i32) (local $30 i32) (local $31 i32) (local $32 i32) (local $33 i32) (local $34 i32) (local $35 i32) (local $36 i32) (local $37 i32) (local $38 i32) (local $39 i32) (local $40 i32) (local $41 i32) (local $42 i32) (local $43 i32) (local $44 i32) (local $45 i32) (local $46 i32) (local $47 i32) (local $48 i32) (local $49 i32) (local $50 i64) (local $51 i64) (local $52 f64) (local $53 f64)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $23
-      global.get $global$1
-      i32.const 624
-      i32.add
-      global.set $global$1
-      local.get $23
-      i32.const 16
-      i32.add
-      local.set $20
-      local.get $23
-      local.set $16
-      local.get $23
-      i32.const 528
-      i32.add
-      local.set $36
-      local.get $0
-      i32.const 0
-      i32.ne
-      local.set $30
-      local.get $23
-      i32.const 536
-      i32.add
-      local.tee $17
-      i32.const 40
-      i32.add
-      local.tee $21
-      local.set $38
-      local.get $17
-      i32.const 39
-      i32.add
-      local.set $39
-      local.get $23
-      i32.const 8
-      i32.add
-      local.tee $37
-      i32.const 4
-      i32.add
-      local.set $42
-      i32.const 0
-      local.get $23
-      i32.const 588
-      i32.add
-      local.tee $19
-      local.tee $27
-      i32.sub
-      local.set $43
-      local.get $23
-      i32.const 576
-      i32.add
-      local.tee $17
-      i32.const 12
-      i32.add
-      local.set $33
-      local.get $17
-      i32.const 11
-      i32.add
-      local.set $40
-      local.get $33
-      local.tee $28
-      local.get $27
-      i32.sub
-      local.set $44
-      i32.const -2
-      local.get $27
-      i32.sub
-      local.set $45
-      local.get $28
-      i32.const 2
-      i32.add
-      local.set $46
-      local.get $23
-      i32.const 24
-      i32.add
-      local.tee $47
-      i32.const 288
-      i32.add
-      local.set $48
-      local.get $19
-      i32.const 9
-      i32.add
-      local.tee $31
-      local.set $41
-      local.get $19
-      i32.const 8
-      i32.add
-      local.set $34
-      i32.const 0
-      local.set $15
-      i32.const 0
-      local.set $10
-      i32.const 0
-      local.set $17
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          loop $label$4 ;; label = @4
-            block $label$5 ;; label = @5
-              local.get $15
-              i32.const -1
-              i32.gt_s
-              if ;; label = @6
-                local.get $10
-                i32.const 2147483647
-                local.get $15
-                i32.sub
-                i32.gt_s
-                if (result i32) ;; label = @7
-                  block (result i32) ;; label = @8
-                    call $12
-                    i32.const 75
-                    i32.store
-                    i32.const -1
-                  end
-                else
-                  local.get $10
-                  local.get $15
-                  i32.add
-                end
-                local.set $15
-              end
-              local.get $1
-              i32.load8_s
-              local.tee $5
-              i32.const 24
-              i32.shl
-              i32.const 24
-              i32.shr_s
-              i32.eqz
-              br_if 2 (;@3;)
-              local.get $1
-              local.set $11
-              block $label$9 ;; label = @6
-                block $label$10 ;; label = @7
-                  loop $label$11 ;; label = @8
-                    block $label$12 ;; label = @9
-                      block $label$13 ;; label = @10
-                        block $label$14 ;; label = @11
-                          block $label$15 ;; label = @12
-                            local.get $5
-                            i32.const 24
-                            i32.shl
-                            i32.const 24
-                            i32.shr_s
-                            i32.const 0
-                            i32.sub
-                            br_table 1 (;@11;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 0 (;@12;) 2 (;@10;)
-                          end
-                          local.get $11
-                          local.set $5
-                          br 4 (;@7;)
-                        end
-                        local.get $11
-                        local.set $5
-                        br 1 (;@9;)
-                      end
-                      local.get $11
-                      i32.const 1
-                      i32.add
-                      local.tee $11
-                      i32.load8_s
-                      local.set $5
-                      br 1 (;@8;)
-                    end
-                  end
-                  br 1 (;@6;)
-                end
-                loop $label$16 ;; label = @7
-                  local.get $5
-                  i32.load8_s offset=1
-                  i32.const 37
-                  i32.ne
-                  br_if 1 (;@6;)
-                  local.get $11
-                  i32.const 1
-                  i32.add
-                  local.set $11
-                  local.get $5
-                  i32.const 2
-                  i32.add
-                  local.tee $5
-                  i32.load8_s
-                  i32.const 37
-                  i32.eq
-                  br_if 0 (;@7;)
-                end
-              end
-              local.get $11
-              local.get $1
-              i32.sub
-              local.set $10
-              local.get $30
-              if ;; label = @6
-                local.get $0
-                i32.load
-                i32.const 32
-                i32.and
-                i32.eqz
-                if ;; label = @7
-                  local.get $1
-                  local.get $10
-                  local.get $0
-                  call $21
-                  drop
-                end
-              end
-              local.get $10
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $5
-                  local.set $1
-                  br 3 (;@4;)
-                end
-              end
-              local.get $5
-              i32.const 1
-              i32.add
-              local.tee $11
-              i32.load8_s
-              local.tee $10
-              i32.const 24
-              i32.shl
-              i32.const 24
-              i32.shr_s
-              i32.const -48
-              i32.add
-              local.tee $9
-              i32.const 10
-              i32.lt_u
-              if (result i32) ;; label = @6
-                block (result i32) ;; label = @7
-                  local.get $5
-                  i32.const 3
-                  i32.add
-                  local.set $10
-                  local.get $5
-                  i32.load8_s offset=2
-                  i32.const 36
-                  i32.eq
-                  local.tee $12
-                  if ;; label = @8
-                    local.get $10
-                    local.set $11
-                  end
-                  local.get $12
-                  if ;; label = @8
-                    i32.const 1
-                    local.set $17
-                  end
-                  local.get $11
-                  i32.load8_s
-                  local.set $5
-                  local.get $12
-                  i32.eqz
-                  if ;; label = @8
-                    i32.const -1
-                    local.set $9
-                  end
-                  local.get $17
-                end
-              else
-                block (result i32) ;; label = @7
-                  local.get $10
-                  local.set $5
-                  i32.const -1
-                  local.set $9
-                  local.get $17
-                end
-              end
-              local.set $10
-              block $label$25 ;; label = @6
-                local.get $5
-                i32.const 24
-                i32.shl
-                i32.const 24
-                i32.shr_s
-                i32.const -32
-                i32.add
-                local.tee $12
-                i32.const 32
-                i32.lt_u
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const 0
-                    local.set $17
-                    loop $label$27 ;; label = @9
-                      i32.const 1
-                      local.get $12
-                      i32.shl
-                      i32.const 75913
-                      i32.and
-                      i32.eqz
-                      br_if 3 (;@6;)
-                      i32.const 1
-                      local.get $5
-                      i32.const 24
-                      i32.shl
-                      i32.const 24
-                      i32.shr_s
-                      i32.const -32
-                      i32.add
-                      i32.shl
-                      local.get $17
-                      i32.or
-                      local.set $17
-                      local.get $11
-                      i32.const 1
-                      i32.add
-                      local.tee $11
-                      i32.load8_s
-                      local.tee $5
-                      i32.const 24
-                      i32.shl
-                      i32.const 24
-                      i32.shr_s
-                      i32.const -32
-                      i32.add
-                      local.tee $12
-                      i32.const 32
-                      i32.lt_u
-                      br_if 0 (;@9;)
-                    end
-                  end
-                else
-                  i32.const 0
-                  local.set $17
-                end
-              end
-              block $label$29 ;; label = @6
-                local.get $5
-                i32.const 24
-                i32.shl
-                i32.const 24
-                i32.shr_s
-                i32.const 42
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    block $label$31 (result i32) ;; label = @9
-                      block $label$32 ;; label = @10
-                        local.get $11
-                        i32.const 1
-                        i32.add
-                        local.tee $7
-                        i32.load8_s
-                        local.tee $5
-                        i32.const 24
-                        i32.shl
-                        i32.const 24
-                        i32.shr_s
-                        i32.const -48
-                        i32.add
-                        local.tee $12
-                        i32.const 10
-                        i32.ge_u
-                        br_if 0 (;@10;)
-                        local.get $11
-                        i32.load8_s offset=2
-                        i32.const 36
-                        i32.ne
-                        br_if 0 (;@10;)
-                        local.get $4
-                        local.get $12
-                        i32.const 2
-                        i32.shl
-                        i32.add
-                        i32.const 10
-                        i32.store
-                        i32.const 1
-                        local.set $8
-                        local.get $3
-                        local.get $7
-                        i32.load8_s
-                        i32.const -48
-                        i32.add
-                        i32.const 3
-                        i32.shl
-                        i32.add
-                        i64.load
-                        i32.wrap_i64
-                        local.set $10
-                        local.get $11
-                        i32.const 3
-                        i32.add
-                        br 1 (;@9;)
-                      end
-                      local.get $10
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const -1
-                          local.set $15
-                          br 6 (;@5;)
-                        end
-                      end
-                      local.get $30
-                      i32.eqz
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $17
-                          local.set $12
-                          i32.const 0
-                          local.set $17
-                          local.get $7
-                          local.set $11
-                          i32.const 0
-                          local.set $10
-                          br 5 (;@6;)
-                        end
-                      end
-                      local.get $2
-                      i32.load
-                      i32.const 3
-                      i32.add
-                      i32.const -4
-                      i32.and
-                      local.tee $11
-                      i32.load
-                      local.set $10
-                      local.get $2
-                      local.get $11
-                      i32.const 4
-                      i32.add
-                      i32.store
-                      i32.const 0
-                      local.set $8
-                      local.get $7
-                    end
-                    local.set $11
-                    local.get $17
-                    i32.const 8192
-                    i32.or
-                    local.set $12
-                    i32.const 0
-                    local.get $10
-                    i32.sub
-                    local.set $7
-                    local.get $11
-                    i32.load8_s
-                    local.set $5
-                    local.get $10
-                    i32.const 0
-                    i32.lt_s
-                    local.tee $6
-                    i32.eqz
-                    if ;; label = @9
-                      local.get $17
-                      local.set $12
-                    end
-                    local.get $8
-                    local.set $17
-                    local.get $6
-                    if ;; label = @9
-                      local.get $7
-                      local.set $10
-                    end
-                  end
-                else
-                  local.get $5
-                  i32.const 24
-                  i32.shl
-                  i32.const 24
-                  i32.shr_s
-                  i32.const -48
-                  i32.add
-                  local.tee $12
-                  i32.const 10
-                  i32.lt_u
-                  if ;; label = @8
-                    block ;; label = @9
-                      i32.const 0
-                      local.set $7
-                      local.get $12
-                      local.set $5
-                      loop $label$39 ;; label = @10
-                        local.get $7
-                        i32.const 10
-                        i32.mul
-                        local.get $5
-                        i32.add
-                        local.set $7
-                        local.get $11
-                        i32.const 1
-                        i32.add
-                        local.tee $11
-                        i32.load8_s
-                        local.tee $12
-                        i32.const 24
-                        i32.shl
-                        i32.const 24
-                        i32.shr_s
-                        i32.const -48
-                        i32.add
-                        local.tee $5
-                        i32.const 10
-                        i32.lt_u
-                        br_if 0 (;@10;)
-                      end
-                      local.get $7
-                      i32.const 0
-                      i32.lt_s
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const -1
-                          local.set $15
-                          br 6 (;@5;)
-                        end
-                      else
-                        block ;; label = @11
-                          local.get $12
-                          local.set $5
-                          local.get $17
-                          local.set $12
-                          local.get $10
-                          local.set $17
-                          local.get $7
-                          local.set $10
-                        end
-                      end
-                    end
-                  else
-                    block ;; label = @9
-                      local.get $17
-                      local.set $12
-                      local.get $10
-                      local.set $17
-                      i32.const 0
-                      local.set $10
-                    end
-                  end
-                end
-              end
-              block $label$43 ;; label = @6
-                local.get $5
-                i32.const 24
-                i32.shl
-                i32.const 24
-                i32.shr_s
-                i32.const 46
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $11
-                    i32.const 1
-                    i32.add
-                    local.tee $7
-                    i32.load8_s
-                    local.tee $5
-                    i32.const 24
-                    i32.shl
-                    i32.const 24
-                    i32.shr_s
-                    i32.const 42
-                    i32.ne
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $5
-                        i32.const 24
-                        i32.shl
-                        i32.const 24
-                        i32.shr_s
-                        i32.const -48
-                        i32.add
-                        local.tee $5
-                        i32.const 10
-                        i32.lt_u
-                        if ;; label = @11
-                          block ;; label = @12
-                            local.get $7
-                            local.set $11
-                            i32.const 0
-                            local.set $7
-                          end
-                        else
-                          block ;; label = @12
-                            i32.const 0
-                            local.set $5
-                            local.get $7
-                            local.set $11
-                            br 6 (;@6;)
-                          end
-                        end
-                        loop $label$48 ;; label = @11
-                          local.get $7
-                          i32.const 10
-                          i32.mul
-                          local.get $5
-                          i32.add
-                          local.set $5
-                          local.get $11
-                          i32.const 1
-                          i32.add
-                          local.tee $11
-                          i32.load8_s
-                          i32.const -48
-                          i32.add
-                          local.tee $8
-                          i32.const 10
-                          i32.ge_u
-                          br_if 5 (;@6;)
-                          local.get $5
-                          local.set $7
-                          local.get $8
-                          local.set $5
-                          br 0 (;@11;)
-                        end
-                      end
-                    end
-                    local.get $11
-                    i32.const 2
-                    i32.add
-                    local.tee $7
-                    i32.load8_s
-                    i32.const -48
-                    i32.add
-                    local.tee $5
-                    i32.const 10
-                    i32.lt_u
-                    if ;; label = @9
-                      local.get $11
-                      i32.load8_s offset=3
-                      i32.const 36
-                      i32.eq
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $4
-                          local.get $5
-                          i32.const 2
-                          i32.shl
-                          i32.add
-                          i32.const 10
-                          i32.store
-                          local.get $3
-                          local.get $7
-                          i32.load8_s
-                          i32.const -48
-                          i32.add
-                          i32.const 3
-                          i32.shl
-                          i32.add
-                          i64.load
-                          i32.wrap_i64
-                          local.set $5
-                          local.get $11
-                          i32.const 4
-                          i32.add
-                          local.set $11
-                          br 5 (;@6;)
-                        end
-                      end
-                    end
-                    local.get $17
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const -1
-                        local.set $15
-                        br 5 (;@5;)
-                      end
-                    end
-                    local.get $30
-                    if (result i32) ;; label = @9
-                      block (result i32) ;; label = @10
-                        local.get $2
-                        i32.load
-                        i32.const 3
-                        i32.add
-                        i32.const -4
-                        i32.and
-                        local.tee $11
-                        i32.load
-                        local.set $5
-                        local.get $2
-                        local.get $11
-                        i32.const 4
-                        i32.add
-                        i32.store
-                        local.get $7
-                      end
-                    else
-                      block (result i32) ;; label = @10
-                        i32.const 0
-                        local.set $5
-                        local.get $7
-                      end
-                    end
-                    local.set $11
-                  end
-                else
-                  i32.const -1
-                  local.set $5
-                end
-              end
-              local.get $11
-              local.set $7
-              i32.const 0
-              local.set $8
-              loop $label$55 ;; label = @6
-                local.get $7
-                i32.load8_s
-                i32.const -65
-                i32.add
-                local.tee $6
-                i32.const 57
-                i32.gt_u
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const -1
-                    local.set $15
-                    br 3 (;@5;)
-                  end
-                end
-                local.get $7
-                i32.const 1
-                i32.add
-                local.set $11
-                local.get $8
-                i32.const 58
-                i32.mul
-                i32.const 1177
-                i32.add
-                local.get $6
-                i32.add
-                i32.load8_s
-                local.tee $13
-                i32.const 255
-                i32.and
-                local.tee $6
-                i32.const -1
-                i32.add
-                i32.const 8
-                i32.lt_u
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $11
-                    local.set $7
-                    local.get $6
-                    local.set $8
-                    br 2 (;@6;)
-                  end
-                end
-              end
-              local.get $13
-              i32.const 24
-              i32.shl
-              i32.const 24
-              i32.shr_s
-              i32.eqz
-              if ;; label = @6
-                block ;; label = @7
-                  i32.const -1
-                  local.set $15
-                  br 2 (;@5;)
-                end
-              end
-              local.get $9
-              i32.const -1
-              i32.gt_s
-              local.set $14
-              block $label$59 ;; label = @6
-                block $label$60 ;; label = @7
-                  local.get $13
-                  i32.const 24
-                  i32.shl
-                  i32.const 24
-                  i32.shr_s
-                  i32.const 19
-                  i32.eq
-                  if ;; label = @8
-                    local.get $14
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const -1
-                        local.set $15
-                        br 5 (;@5;)
-                      end
-                    else
-                      br 2 (;@7;)
-                    end
-                  else
-                    block ;; label = @9
-                      local.get $14
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $4
-                          local.get $9
-                          i32.const 2
-                          i32.shl
-                          i32.add
-                          local.get $6
-                          i32.store
-                          local.get $16
-                          local.get $3
-                          local.get $9
-                          i32.const 3
-                          i32.shl
-                          i32.add
-                          i64.load
-                          i64.store
-                          br 4 (;@7;)
-                        end
-                      end
-                      local.get $30
-                      i32.eqz
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const 0
-                          local.set $15
-                          br 6 (;@5;)
-                        end
-                      end
-                      local.get $16
-                      local.get $6
-                      local.get $2
-                      call $22
-                    end
-                  end
-                  br 1 (;@6;)
-                end
-                local.get $30
-                i32.eqz
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const 0
-                    local.set $10
-                    local.get $11
-                    local.set $1
-                    br 4 (;@4;)
-                  end
-                end
-              end
-              local.get $7
-              i32.load8_s
-              local.tee $7
-              i32.const -33
-              i32.and
-              local.set $9
-              local.get $8
-              i32.const 0
-              i32.ne
-              local.get $7
-              i32.const 15
-              i32.and
-              i32.const 3
-              i32.eq
-              i32.and
-              i32.eqz
-              if ;; label = @6
-                local.get $7
-                local.set $9
-              end
-              local.get $12
-              i32.const -65537
-              i32.and
-              local.set $7
-              local.get $12
-              i32.const 8192
-              i32.and
-              if ;; label = @6
-                local.get $7
-                local.set $12
-              end
-              block $label$70 ;; label = @6
-                block $label$71 ;; label = @7
-                  block $label$72 ;; label = @8
-                    block $label$73 ;; label = @9
-                      block $label$74 ;; label = @10
-                        block $label$75 ;; label = @11
-                          block $label$76 ;; label = @12
-                            block $label$77 ;; label = @13
-                              block $label$78 ;; label = @14
-                                block $label$79 ;; label = @15
-                                  block $label$80 ;; label = @16
-                                    block $label$81 ;; label = @17
-                                      block $label$82 ;; label = @18
-                                        block $label$83 ;; label = @19
-                                          block $label$84 ;; label = @20
-                                            block $label$85 ;; label = @21
-                                              block $label$86 ;; label = @22
-                                                block $label$87 ;; label = @23
-                                                  block $label$88 ;; label = @24
-                                                    block $label$89 ;; label = @25
-                                                      local.get $9
-                                                      i32.const 65
-                                                      i32.sub
-                                                      br_table 11 (;@14;) 12 (;@13;) 9 (;@16;) 12 (;@13;) 11 (;@14;) 11 (;@14;) 11 (;@14;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 10 (;@15;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 2 (;@23;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 11 (;@14;) 12 (;@13;) 6 (;@19;) 4 (;@21;) 11 (;@14;) 11 (;@14;) 11 (;@14;) 12 (;@13;) 4 (;@21;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 7 (;@18;) 0 (;@25;) 3 (;@22;) 1 (;@24;) 12 (;@13;) 12 (;@13;) 8 (;@17;) 12 (;@13;) 5 (;@20;) 12 (;@13;) 12 (;@13;) 2 (;@23;) 12 (;@13;)
-                                                    end
-                                                    block $label$90 ;; label = @25
-                                                      block $label$91 ;; label = @26
-                                                        block $label$92 ;; label = @27
-                                                          block $label$93 ;; label = @28
-                                                            block $label$94 ;; label = @29
-                                                              block $label$95 ;; label = @30
-                                                                block $label$96 ;; label = @31
-                                                                  block $label$97 ;; label = @32
-                                                                    local.get $8
-                                                                    i32.const 255
-                                                                    i32.and
-                                                                    i32.const 24
-                                                                    i32.shl
-                                                                    i32.const 24
-                                                                    i32.shr_s
-                                                                    i32.const 0
-                                                                    i32.sub
-                                                                    br_table 0 (;@32;) 1 (;@31;) 2 (;@30;) 3 (;@29;) 4 (;@28;) 7 (;@25;) 5 (;@27;) 6 (;@26;) 7 (;@25;)
-                                                                  end
-                                                                  local.get $16
-                                                                  i32.load
-                                                                  local.get $15
-                                                                  i32.store
-                                                                  i32.const 0
-                                                                  local.set $10
-                                                                  local.get $11
-                                                                  local.set $1
-                                                                  br 27 (;@4;)
-                                                                end
-                                                                local.get $16
-                                                                i32.load
-                                                                local.get $15
-                                                                i32.store
-                                                                i32.const 0
-                                                                local.set $10
-                                                                local.get $11
-                                                                local.set $1
-                                                                br 26 (;@4;)
-                                                              end
-                                                              local.get $16
-                                                              i32.load
-                                                              local.get $15
-                                                              i64.extend_i32_s
-                                                              i64.store
-                                                              i32.const 0
-                                                              local.set $10
-                                                              local.get $11
-                                                              local.set $1
-                                                              br 25 (;@4;)
-                                                            end
-                                                            local.get $16
-                                                            i32.load
-                                                            local.get $15
-                                                            i32.store16
-                                                            i32.const 0
-                                                            local.set $10
-                                                            local.get $11
-                                                            local.set $1
-                                                            br 24 (;@4;)
-                                                          end
-                                                          local.get $16
-                                                          i32.load
-                                                          local.get $15
-                                                          i32.store8
-                                                          i32.const 0
-                                                          local.set $10
-                                                          local.get $11
-                                                          local.set $1
-                                                          br 23 (;@4;)
-                                                        end
-                                                        local.get $16
-                                                        i32.load
-                                                        local.get $15
-                                                        i32.store
-                                                        i32.const 0
-                                                        local.set $10
-                                                        local.get $11
-                                                        local.set $1
-                                                        br 22 (;@4;)
-                                                      end
-                                                      local.get $16
-                                                      i32.load
-                                                      local.get $15
-                                                      i64.extend_i32_s
-                                                      i64.store
-                                                      i32.const 0
-                                                      local.set $10
-                                                      local.get $11
-                                                      local.set $1
-                                                      br 21 (;@4;)
-                                                    end
-                                                    i32.const 0
-                                                    local.set $10
-                                                    local.get $11
-                                                    local.set $1
-                                                    br 20 (;@4;)
-                                                  end
-                                                  local.get $12
-                                                  i32.const 8
-                                                  i32.or
-                                                  local.set $12
-                                                  local.get $5
-                                                  i32.const 8
-                                                  i32.le_u
-                                                  if ;; label = @24
-                                                    i32.const 8
-                                                    local.set $5
-                                                  end
-                                                  i32.const 120
-                                                  local.set $9
-                                                  br 11 (;@12;)
-                                                end
-                                                br 10 (;@12;)
-                                              end
-                                              local.get $16
-                                              i64.load
-                                              local.tee $50
-                                              i64.const 0
-                                              i64.eq
-                                              if ;; label = @22
-                                                local.get $21
-                                                local.set $7
-                                              else
-                                                block ;; label = @23
-                                                  local.get $21
-                                                  local.set $1
-                                                  loop $label$101 ;; label = @24
-                                                    local.get $1
-                                                    i32.const -1
-                                                    i32.add
-                                                    local.tee $1
-                                                    local.get $50
-                                                    i64.const 7
-                                                    i64.and
-                                                    i64.const 48
-                                                    i64.or
-                                                    i64.store8
-                                                    local.get $50
-                                                    i64.const 3
-                                                    i64.shr_u
-                                                    local.tee $50
-                                                    i64.const 0
-                                                    i64.ne
-                                                    br_if 0 (;@24;)
-                                                    local.get $1
-                                                    local.set $7
-                                                  end
-                                                end
-                                              end
-                                              local.get $12
-                                              i32.const 8
-                                              i32.and
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $38
-                                                  local.get $7
-                                                  i32.sub
-                                                  local.tee $1
-                                                  i32.const 1
-                                                  i32.add
-                                                  local.set $8
-                                                  local.get $5
-                                                  local.get $1
-                                                  i32.le_s
-                                                  if ;; label = @24
-                                                    local.get $8
-                                                    local.set $5
-                                                  end
-                                                  i32.const 0
-                                                  local.set $6
-                                                  i32.const 1657
-                                                  local.set $8
-                                                  br 16 (;@7;)
-                                                end
-                                              else
-                                                block ;; label = @23
-                                                  i32.const 0
-                                                  local.set $6
-                                                  i32.const 1657
-                                                  local.set $8
-                                                  br 16 (;@7;)
-                                                end
-                                              end
-                                            end
-                                            local.get $16
-                                            i64.load
-                                            local.tee $50
-                                            i64.const 0
-                                            i64.lt_s
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $16
-                                                i64.const 0
-                                                local.get $50
-                                                i64.sub
-                                                local.tee $50
-                                                i64.store
-                                                i32.const 1
-                                                local.set $6
-                                                i32.const 1657
-                                                local.set $8
-                                                br 11 (;@11;)
-                                              end
-                                            end
-                                            local.get $12
-                                            i32.const 2048
-                                            i32.and
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                i32.const 1
-                                                local.set $6
-                                                i32.const 1658
-                                                local.set $8
-                                                br 11 (;@11;)
-                                              end
-                                            else
-                                              block ;; label = @22
-                                                local.get $12
-                                                i32.const 1
-                                                i32.and
-                                                local.tee $1
-                                                local.set $6
-                                                local.get $1
-                                                if (result i32) ;; label = @23
-                                                  i32.const 1659
-                                                else
-                                                  i32.const 1657
-                                                end
-                                                local.set $8
-                                                br 11 (;@11;)
-                                              end
-                                            end
-                                          end
-                                          local.get $16
-                                          i64.load
-                                          local.set $50
-                                          i32.const 0
-                                          local.set $6
-                                          i32.const 1657
-                                          local.set $8
-                                          br 8 (;@11;)
-                                        end
-                                        local.get $39
-                                        local.get $16
-                                        i64.load
-                                        i64.store8
-                                        local.get $39
-                                        local.set $1
-                                        local.get $7
-                                        local.set $12
-                                        i32.const 1
-                                        local.set $7
-                                        i32.const 0
-                                        local.set $6
-                                        i32.const 1657
-                                        local.set $8
-                                        local.get $21
-                                        local.set $5
-                                        br 12 (;@6;)
-                                      end
-                                      call $12
-                                      i32.load
-                                      call $24
-                                      local.set $1
-                                      br 7 (;@10;)
-                                    end
-                                    local.get $16
-                                    i32.load
-                                    local.tee $1
-                                    i32.eqz
-                                    if ;; label = @17
-                                      i32.const 1667
-                                      local.set $1
-                                    end
-                                    br 6 (;@10;)
-                                  end
-                                  local.get $37
-                                  local.get $16
-                                  i64.load
-                                  i64.store32
-                                  local.get $42
-                                  i32.const 0
-                                  i32.store
-                                  local.get $16
-                                  local.get $37
-                                  i32.store
-                                  local.get $37
-                                  local.set $7
-                                  i32.const -1
-                                  local.set $6
-                                  br 6 (;@9;)
-                                end
-                                local.get $16
-                                i32.load
-                                local.set $7
-                                local.get $5
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $5
-                                    local.set $6
-                                    br 7 (;@9;)
-                                  end
-                                else
-                                  block ;; label = @16
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    i32.const 0
-                                    local.get $12
-                                    call $25
-                                    i32.const 0
-                                    local.set $1
-                                    br 8 (;@8;)
-                                  end
-                                end
-                              end
-                              local.get $16
-                              f64.load
-                              local.set $52
-                              local.get $20
-                              i32.const 0
-                              i32.store
-                              local.get $52
-                              i64.reinterpret_f64
-                              i64.const 0
-                              i64.lt_s
-                              if (result i32) ;; label = @14
-                                block (result i32) ;; label = @15
-                                  i32.const 1
-                                  local.set $24
-                                  local.get $52
-                                  f64.neg
-                                  local.set $52
-                                  i32.const 1674
-                                end
-                              else
-                                block (result i32) ;; label = @15
-                                  local.get $12
-                                  i32.const 1
-                                  i32.and
-                                  local.set $1
-                                  local.get $12
-                                  i32.const 2048
-                                  i32.and
-                                  if (result i32) ;; label = @16
-                                    block (result i32) ;; label = @17
-                                      i32.const 1
-                                      local.set $24
-                                      i32.const 1677
-                                    end
-                                  else
-                                    block (result i32) ;; label = @17
-                                      local.get $1
-                                      local.set $24
-                                      local.get $1
-                                      if (result i32) ;; label = @18
-                                        i32.const 1680
-                                      else
-                                        i32.const 1675
-                                      end
-                                    end
-                                  end
-                                end
-                              end
-                              local.set $26
-                              block $label$119 ;; label = @14
-                                local.get $52
-                                i64.reinterpret_f64
-                                i64.const 9218868437227405312
-                                i64.and
-                                i64.const 9218868437227405312
-                                i64.lt_u
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $52
-                                    local.get $20
-                                    call $27
-                                    f64.const 0x1p+1 (;=2;)
-                                    f64.mul
-                                    local.tee $52
-                                    f64.const 0x0p+0 (;=0;)
-                                    f64.ne
-                                    local.tee $1
-                                    if ;; label = @17
-                                      local.get $20
-                                      local.get $20
-                                      i32.load
-                                      i32.const -1
-                                      i32.add
-                                      i32.store
-                                    end
-                                    local.get $9
-                                    i32.const 32
-                                    i32.or
-                                    local.tee $22
-                                    i32.const 97
-                                    i32.eq
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $26
-                                        i32.const 9
-                                        i32.add
-                                        local.set $1
-                                        local.get $9
-                                        i32.const 32
-                                        i32.and
-                                        local.tee $6
-                                        if ;; label = @19
-                                          local.get $1
-                                          local.set $26
-                                        end
-                                        local.get $5
-                                        i32.const 11
-                                        i32.gt_u
-                                        i32.const 12
-                                        local.get $5
-                                        i32.sub
-                                        local.tee $1
-                                        i32.eqz
-                                        i32.or
-                                        i32.eqz
-                                        if ;; label = @19
-                                          block ;; label = @20
-                                            f64.const 0x1p+3 (;=8;)
-                                            local.set $53
-                                            loop $label$125 ;; label = @21
-                                              local.get $53
-                                              f64.const 0x1p+4 (;=16;)
-                                              f64.mul
-                                              local.set $53
-                                              local.get $1
-                                              i32.const -1
-                                              i32.add
-                                              local.tee $1
-                                              br_if 0 (;@21;)
-                                            end
-                                            local.get $26
-                                            i32.load8_s
-                                            i32.const 45
-                                            i32.eq
-                                            if (result f64) ;; label = @21
-                                              local.get $53
-                                              local.get $52
-                                              f64.neg
-                                              local.get $53
-                                              f64.sub
-                                              f64.add
-                                              f64.neg
-                                            else
-                                              local.get $52
-                                              local.get $53
-                                              f64.add
-                                              local.get $53
-                                              f64.sub
-                                            end
-                                            local.set $52
-                                          end
-                                        end
-                                        i32.const 0
-                                        local.get $20
-                                        i32.load
-                                        local.tee $7
-                                        i32.sub
-                                        local.set $1
-                                        local.get $7
-                                        i32.const 0
-                                        i32.lt_s
-                                        if (result i32) ;; label = @19
-                                          local.get $1
-                                        else
-                                          local.get $7
-                                        end
-                                        i64.extend_i32_s
-                                        local.get $33
-                                        call $23
-                                        local.tee $1
-                                        local.get $33
-                                        i32.eq
-                                        if ;; label = @19
-                                          block ;; label = @20
-                                            local.get $40
-                                            i32.const 48
-                                            i32.store8
-                                            local.get $40
-                                            local.set $1
-                                          end
-                                        end
-                                        local.get $24
-                                        i32.const 2
-                                        i32.or
-                                        local.set $13
-                                        local.get $1
-                                        i32.const -1
-                                        i32.add
-                                        local.get $7
-                                        i32.const 31
-                                        i32.shr_s
-                                        i32.const 2
-                                        i32.and
-                                        i32.const 43
-                                        i32.add
-                                        i32.store8
-                                        local.get $1
-                                        i32.const -2
-                                        i32.add
-                                        local.tee $8
-                                        local.get $9
-                                        i32.const 15
-                                        i32.add
-                                        i32.store8
-                                        local.get $5
-                                        i32.const 1
-                                        i32.lt_s
-                                        local.set $9
-                                        local.get $12
-                                        i32.const 8
-                                        i32.and
-                                        i32.eqz
-                                        local.set $14
-                                        local.get $19
-                                        local.set $1
-                                        loop $label$131 ;; label = @19
-                                          local.get $1
-                                          local.get $52
-                                          i32.trunc_f64_s
-                                          local.tee $7
-                                          i32.const 1641
-                                          i32.add
-                                          i32.load8_u
-                                          local.get $6
-                                          i32.or
-                                          i32.store8
-                                          local.get $52
-                                          local.get $7
-                                          f64.convert_i32_s
-                                          f64.sub
-                                          f64.const 0x1p+4 (;=16;)
-                                          f64.mul
-                                          local.set $52
-                                          block $label$132 (result i32) ;; label = @20
-                                            local.get $1
-                                            i32.const 1
-                                            i32.add
-                                            local.tee $7
-                                            local.get $27
-                                            i32.sub
-                                            i32.const 1
-                                            i32.eq
-                                            if (result i32) ;; label = @21
-                                              block (result i32) ;; label = @22
-                                                local.get $7
-                                                local.get $14
-                                                local.get $9
-                                                local.get $52
-                                                f64.const 0x0p+0 (;=0;)
-                                                f64.eq
-                                                i32.and
-                                                i32.and
-                                                br_if 2 (;@20;)
-                                                drop
-                                                local.get $7
-                                                i32.const 46
-                                                i32.store8
-                                                local.get $1
-                                                i32.const 2
-                                                i32.add
-                                              end
-                                            else
-                                              local.get $7
-                                            end
-                                          end
-                                          local.set $1
-                                          local.get $52
-                                          f64.const 0x0p+0 (;=0;)
-                                          f64.ne
-                                          br_if 0 (;@19;)
-                                        end
-                                        local.get $46
-                                        local.get $5
-                                        i32.add
-                                        local.get $8
-                                        local.tee $7
-                                        i32.sub
-                                        local.set $6
-                                        local.get $44
-                                        local.get $7
-                                        i32.sub
-                                        local.get $1
-                                        i32.add
-                                        local.set $9
-                                        local.get $0
-                                        i32.const 32
-                                        local.get $10
-                                        local.get $5
-                                        i32.const 0
-                                        i32.ne
-                                        local.get $45
-                                        local.get $1
-                                        i32.add
-                                        local.get $5
-                                        i32.lt_s
-                                        i32.and
-                                        if (result i32) ;; label = @19
-                                          local.get $6
-                                        else
-                                          local.get $9
-                                          local.tee $6
-                                        end
-                                        local.get $13
-                                        i32.add
-                                        local.tee $5
-                                        local.get $12
-                                        call $25
-                                        local.get $0
-                                        i32.load
-                                        i32.const 32
-                                        i32.and
-                                        i32.eqz
-                                        if ;; label = @19
-                                          local.get $26
-                                          local.get $13
-                                          local.get $0
-                                          call $21
-                                          drop
-                                        end
-                                        local.get $0
-                                        i32.const 48
-                                        local.get $10
-                                        local.get $5
-                                        local.get $12
-                                        i32.const 65536
-                                        i32.xor
-                                        call $25
-                                        local.get $1
-                                        local.get $27
-                                        i32.sub
-                                        local.set $1
-                                        local.get $0
-                                        i32.load
-                                        i32.const 32
-                                        i32.and
-                                        i32.eqz
-                                        if ;; label = @19
-                                          local.get $19
-                                          local.get $1
-                                          local.get $0
-                                          call $21
-                                          drop
-                                        end
-                                        local.get $0
-                                        i32.const 48
-                                        local.get $6
-                                        local.get $1
-                                        local.get $28
-                                        local.get $7
-                                        i32.sub
-                                        local.tee $1
-                                        i32.add
-                                        i32.sub
-                                        i32.const 0
-                                        i32.const 0
-                                        call $25
-                                        local.get $0
-                                        i32.load
-                                        i32.const 32
-                                        i32.and
-                                        i32.eqz
-                                        if ;; label = @19
-                                          local.get $8
-                                          local.get $1
-                                          local.get $0
-                                          call $21
-                                          drop
-                                        end
-                                        local.get $0
-                                        i32.const 32
-                                        local.get $10
-                                        local.get $5
-                                        local.get $12
-                                        i32.const 8192
-                                        i32.xor
-                                        call $25
-                                        local.get $5
-                                        local.get $10
-                                        i32.ge_s
-                                        if ;; label = @19
-                                          local.get $5
-                                          local.set $10
-                                        end
-                                        br 4 (;@14;)
-                                      end
-                                    end
-                                    local.get $1
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $20
-                                        local.get $20
-                                        i32.load
-                                        i32.const -28
-                                        i32.add
-                                        local.tee $6
-                                        i32.store
-                                        local.get $52
-                                        f64.const 0x1p+28 (;=268435456;)
-                                        f64.mul
-                                        local.set $52
-                                      end
-                                    else
-                                      local.get $20
-                                      i32.load
-                                      local.set $6
-                                    end
-                                    local.get $6
-                                    i32.const 0
-                                    i32.lt_s
-                                    if (result i32) ;; label = @17
-                                      local.get $47
-                                    else
-                                      local.get $48
-                                    end
-                                    local.tee $7
-                                    local.set $8
-                                    loop $label$145 ;; label = @17
-                                      local.get $8
-                                      local.get $52
-                                      i32.trunc_f64_s
-                                      local.tee $1
-                                      i32.store
-                                      local.get $8
-                                      i32.const 4
-                                      i32.add
-                                      local.set $8
-                                      local.get $52
-                                      local.get $1
-                                      f64.convert_i32_u
-                                      f64.sub
-                                      f64.const 0x1.dcd65p+29 (;=1000000000;)
-                                      f64.mul
-                                      local.tee $52
-                                      f64.const 0x0p+0 (;=0;)
-                                      f64.ne
-                                      br_if 0 (;@17;)
-                                    end
-                                    local.get $6
-                                    i32.const 0
-                                    i32.gt_s
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $7
-                                        local.set $1
-                                        loop $label$147 ;; label = @19
-                                          local.get $6
-                                          i32.const 29
-                                          i32.gt_s
-                                          if (result i32) ;; label = @20
-                                            i32.const 29
-                                          else
-                                            local.get $6
-                                          end
-                                          local.set $14
-                                          block $label$150 ;; label = @20
-                                            local.get $8
-                                            i32.const -4
-                                            i32.add
-                                            local.tee $6
-                                            local.get $1
-                                            i32.ge_u
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $14
-                                                i64.extend_i32_u
-                                                local.set $50
-                                                i32.const 0
-                                                local.set $13
-                                                loop $label$152 ;; label = @23
-                                                  local.get $6
-                                                  local.get $6
-                                                  i32.load
-                                                  i64.extend_i32_u
-                                                  local.get $50
-                                                  i64.shl
-                                                  local.get $13
-                                                  i64.extend_i32_u
-                                                  i64.add
-                                                  local.tee $51
-                                                  i64.const 1000000000
-                                                  i64.rem_u
-                                                  i64.store32
-                                                  local.get $51
-                                                  i64.const 1000000000
-                                                  i64.div_u
-                                                  i32.wrap_i64
-                                                  local.set $13
-                                                  local.get $6
-                                                  i32.const -4
-                                                  i32.add
-                                                  local.tee $6
-                                                  local.get $1
-                                                  i32.ge_u
-                                                  br_if 0 (;@23;)
-                                                end
-                                                local.get $13
-                                                i32.eqz
-                                                br_if 2 (;@20;)
-                                                local.get $1
-                                                i32.const -4
-                                                i32.add
-                                                local.tee $1
-                                                local.get $13
-                                                i32.store
-                                              end
-                                            end
-                                          end
-                                          loop $label$153 ;; label = @20
-                                            local.get $8
-                                            local.get $1
-                                            i32.gt_u
-                                            if ;; label = @21
-                                              local.get $8
-                                              i32.const -4
-                                              i32.add
-                                              local.tee $6
-                                              i32.load
-                                              i32.eqz
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $6
-                                                  local.set $8
-                                                  br 3 (;@20;)
-                                                end
-                                              end
-                                            end
-                                          end
-                                          local.get $20
-                                          local.get $20
-                                          i32.load
-                                          local.get $14
-                                          i32.sub
-                                          local.tee $6
-                                          i32.store
-                                          local.get $6
-                                          i32.const 0
-                                          i32.gt_s
-                                          br_if 0 (;@19;)
-                                        end
-                                      end
-                                    else
-                                      local.get $7
-                                      local.set $1
-                                    end
-                                    local.get $5
-                                    i32.const 0
-                                    i32.lt_s
-                                    if (result i32) ;; label = @17
-                                      i32.const 6
-                                    else
-                                      local.get $5
-                                    end
-                                    local.set $18
-                                    local.get $6
-                                    i32.const 0
-                                    i32.lt_s
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $18
-                                        i32.const 25
-                                        i32.add
-                                        i32.const 9
-                                        i32.div_s
-                                        i32.const 1
-                                        i32.add
-                                        local.set $14
-                                        local.get $22
-                                        i32.const 102
-                                        i32.eq
-                                        local.set $25
-                                        local.get $8
-                                        local.set $5
-                                        loop $label$160 ;; label = @19
-                                          i32.const 0
-                                          local.get $6
-                                          i32.sub
-                                          local.tee $13
-                                          i32.const 9
-                                          i32.gt_s
-                                          if ;; label = @20
-                                            i32.const 9
-                                            local.set $13
-                                          end
-                                          block $label$162 ;; label = @20
-                                            local.get $1
-                                            local.get $5
-                                            i32.lt_u
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                i32.const 1
-                                                local.get $13
-                                                i32.shl
-                                                i32.const -1
-                                                i32.add
-                                                local.set $29
-                                                i32.const 1000000000
-                                                local.get $13
-                                                i32.shr_u
-                                                local.set $35
-                                                i32.const 0
-                                                local.set $6
-                                                local.get $1
-                                                local.set $8
-                                                loop $label$164 ;; label = @23
-                                                  local.get $8
-                                                  local.get $8
-                                                  i32.load
-                                                  local.tee $32
-                                                  local.get $13
-                                                  i32.shr_u
-                                                  local.get $6
-                                                  i32.add
-                                                  i32.store
-                                                  local.get $32
-                                                  local.get $29
-                                                  i32.and
-                                                  local.get $35
-                                                  i32.mul
-                                                  local.set $6
-                                                  local.get $8
-                                                  i32.const 4
-                                                  i32.add
-                                                  local.tee $8
-                                                  local.get $5
-                                                  i32.lt_u
-                                                  br_if 0 (;@23;)
-                                                end
-                                                local.get $1
-                                                i32.const 4
-                                                i32.add
-                                                local.set $8
-                                                local.get $1
-                                                i32.load
-                                                i32.eqz
-                                                if ;; label = @23
-                                                  local.get $8
-                                                  local.set $1
-                                                end
-                                                local.get $6
-                                                i32.eqz
-                                                br_if 2 (;@20;)
-                                                local.get $5
-                                                local.get $6
-                                                i32.store
-                                                local.get $5
-                                                i32.const 4
-                                                i32.add
-                                                local.set $5
-                                              end
-                                            else
-                                              block ;; label = @22
-                                                local.get $1
-                                                i32.const 4
-                                                i32.add
-                                                local.set $8
-                                                local.get $1
-                                                i32.load
-                                                i32.eqz
-                                                if ;; label = @23
-                                                  local.get $8
-                                                  local.set $1
-                                                end
-                                              end
-                                            end
-                                          end
-                                          local.get $25
-                                          if (result i32) ;; label = @20
-                                            local.get $7
-                                          else
-                                            local.get $1
-                                          end
-                                          local.tee $8
-                                          local.get $14
-                                          i32.const 2
-                                          i32.shl
-                                          i32.add
-                                          local.set $6
-                                          local.get $5
-                                          local.get $8
-                                          i32.sub
-                                          i32.const 2
-                                          i32.shr_s
-                                          local.get $14
-                                          i32.gt_s
-                                          if ;; label = @20
-                                            local.get $6
-                                            local.set $5
-                                          end
-                                          local.get $20
-                                          local.get $20
-                                          i32.load
-                                          local.get $13
-                                          i32.add
-                                          local.tee $6
-                                          i32.store
-                                          local.get $6
-                                          i32.const 0
-                                          i32.lt_s
-                                          br_if 0 (;@19;)
-                                          local.get $5
-                                          local.set $13
-                                        end
-                                      end
-                                    else
-                                      local.get $8
-                                      local.set $13
-                                    end
-                                    local.get $7
-                                    local.set $25
-                                    block $label$172 ;; label = @17
-                                      local.get $1
-                                      local.get $13
-                                      i32.lt_u
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $25
-                                          local.get $1
-                                          i32.sub
-                                          i32.const 2
-                                          i32.shr_s
-                                          i32.const 9
-                                          i32.mul
-                                          local.set $5
-                                          local.get $1
-                                          i32.load
-                                          local.tee $6
-                                          i32.const 10
-                                          i32.lt_u
-                                          br_if 2 (;@17;)
-                                          i32.const 10
-                                          local.set $8
-                                          loop $label$174 ;; label = @20
-                                            local.get $5
-                                            i32.const 1
-                                            i32.add
-                                            local.set $5
-                                            local.get $6
-                                            local.get $8
-                                            i32.const 10
-                                            i32.mul
-                                            local.tee $8
-                                            i32.ge_u
-                                            br_if 0 (;@20;)
-                                          end
-                                        end
-                                      else
-                                        i32.const 0
-                                        local.set $5
-                                      end
-                                    end
-                                    local.get $22
-                                    i32.const 103
-                                    i32.eq
-                                    local.set $29
-                                    local.get $18
-                                    i32.const 0
-                                    i32.ne
-                                    local.set $35
-                                    local.get $18
-                                    local.get $22
-                                    i32.const 102
-                                    i32.ne
-                                    if (result i32) ;; label = @17
-                                      local.get $5
-                                    else
-                                      i32.const 0
-                                    end
-                                    i32.sub
-                                    local.get $35
-                                    local.get $29
-                                    i32.and
-                                    i32.const 31
-                                    i32.shl
-                                    i32.const 31
-                                    i32.shr_s
-                                    i32.add
-                                    local.tee $8
-                                    local.get $13
-                                    local.get $25
-                                    i32.sub
-                                    i32.const 2
-                                    i32.shr_s
-                                    i32.const 9
-                                    i32.mul
-                                    i32.const -9
-                                    i32.add
-                                    i32.lt_s
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $8
-                                        i32.const 9216
-                                        i32.add
-                                        local.tee $14
-                                        i32.const 9
-                                        i32.rem_s
-                                        i32.const 1
-                                        i32.add
-                                        local.tee $8
-                                        i32.const 9
-                                        i32.lt_s
-                                        if ;; label = @19
-                                          block ;; label = @20
-                                            i32.const 10
-                                            local.set $6
-                                            loop $label$180 ;; label = @21
-                                              local.get $6
-                                              i32.const 10
-                                              i32.mul
-                                              local.set $6
-                                              local.get $8
-                                              i32.const 1
-                                              i32.add
-                                              local.tee $8
-                                              i32.const 9
-                                              i32.ne
-                                              br_if 0 (;@21;)
-                                            end
-                                          end
-                                        else
-                                          i32.const 10
-                                          local.set $6
-                                        end
-                                        local.get $7
-                                        i32.const 4
-                                        i32.add
-                                        local.get $14
-                                        i32.const 9
-                                        i32.div_s
-                                        i32.const -1024
-                                        i32.add
-                                        i32.const 2
-                                        i32.shl
-                                        i32.add
-                                        local.tee $8
-                                        i32.load
-                                        local.tee $22
-                                        local.get $6
-                                        i32.rem_u
-                                        local.set $14
-                                        block $label$182 ;; label = @19
-                                          local.get $8
-                                          i32.const 4
-                                          i32.add
-                                          local.get $13
-                                          i32.eq
-                                          local.tee $32
-                                          local.get $14
-                                          i32.eqz
-                                          i32.and
-                                          i32.eqz
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              local.get $14
-                                              local.get $6
-                                              i32.const 2
-                                              i32.div_s
-                                              local.tee $49
-                                              i32.lt_u
-                                              if (result f64) ;; label = @22
-                                                f64.const 0x1p-1 (;=0.5;)
-                                              else
-                                                local.get $32
-                                                local.get $14
-                                                local.get $49
-                                                i32.eq
-                                                i32.and
-                                                if (result f64) ;; label = @23
-                                                  f64.const 0x1p+0 (;=1;)
-                                                else
-                                                  f64.const 0x1.8p+0 (;=1.5;)
-                                                end
-                                              end
-                                              local.set $52
-                                              local.get $22
-                                              local.get $6
-                                              i32.div_u
-                                              i32.const 1
-                                              i32.and
-                                              if (result f64) ;; label = @22
-                                                f64.const 0x1.0000000000001p+53 (;=9007199254740994;)
-                                              else
-                                                f64.const 0x1p+53 (;=9007199254740992;)
-                                              end
-                                              local.set $53
-                                              block $label$190 ;; label = @22
-                                                local.get $24
-                                                if ;; label = @23
-                                                  block ;; label = @24
-                                                    local.get $26
-                                                    i32.load8_s
-                                                    i32.const 45
-                                                    i32.ne
-                                                    br_if 2 (;@22;)
-                                                    local.get $53
-                                                    f64.neg
-                                                    local.set $53
-                                                    local.get $52
-                                                    f64.neg
-                                                    local.set $52
-                                                  end
-                                                end
-                                              end
-                                              local.get $8
-                                              local.get $22
-                                              local.get $14
-                                              i32.sub
-                                              local.tee $14
-                                              i32.store
-                                              local.get $53
-                                              local.get $52
-                                              f64.add
-                                              local.get $53
-                                              f64.eq
-                                              br_if 2 (;@19;)
-                                              local.get $8
-                                              local.get $14
-                                              local.get $6
-                                              i32.add
-                                              local.tee $5
-                                              i32.store
-                                              local.get $5
-                                              i32.const 999999999
-                                              i32.gt_u
-                                              if ;; label = @22
-                                                loop $label$193 ;; label = @23
-                                                  local.get $8
-                                                  i32.const 0
-                                                  i32.store
-                                                  local.get $8
-                                                  i32.const -4
-                                                  i32.add
-                                                  local.tee $8
-                                                  local.get $1
-                                                  i32.lt_u
-                                                  if ;; label = @24
-                                                    local.get $1
-                                                    i32.const -4
-                                                    i32.add
-                                                    local.tee $1
-                                                    i32.const 0
-                                                    i32.store
-                                                  end
-                                                  local.get $8
-                                                  local.get $8
-                                                  i32.load
-                                                  i32.const 1
-                                                  i32.add
-                                                  local.tee $5
-                                                  i32.store
-                                                  local.get $5
-                                                  i32.const 999999999
-                                                  i32.gt_u
-                                                  br_if 0 (;@23;)
-                                                end
-                                              end
-                                              local.get $25
-                                              local.get $1
-                                              i32.sub
-                                              i32.const 2
-                                              i32.shr_s
-                                              i32.const 9
-                                              i32.mul
-                                              local.set $5
-                                              local.get $1
-                                              i32.load
-                                              local.tee $14
-                                              i32.const 10
-                                              i32.lt_u
-                                              br_if 2 (;@19;)
-                                              i32.const 10
-                                              local.set $6
-                                              loop $label$195 ;; label = @22
-                                                local.get $5
-                                                i32.const 1
-                                                i32.add
-                                                local.set $5
-                                                local.get $14
-                                                local.get $6
-                                                i32.const 10
-                                                i32.mul
-                                                local.tee $6
-                                                i32.ge_u
-                                                br_if 0 (;@22;)
-                                              end
-                                            end
-                                          end
-                                        end
-                                        local.get $1
-                                        local.set $14
-                                        local.get $5
-                                        local.set $6
-                                        local.get $13
-                                        local.get $8
-                                        i32.const 4
-                                        i32.add
-                                        local.tee $8
-                                        i32.le_u
-                                        if ;; label = @19
-                                          local.get $13
-                                          local.set $8
-                                        end
-                                      end
-                                    else
-                                      block ;; label = @18
-                                        local.get $1
-                                        local.set $14
-                                        local.get $5
-                                        local.set $6
-                                        local.get $13
-                                        local.set $8
-                                      end
-                                    end
-                                    i32.const 0
-                                    local.get $6
-                                    i32.sub
-                                    local.set $32
-                                    loop $label$198 ;; label = @17
-                                      block $label$199 ;; label = @18
-                                        local.get $8
-                                        local.get $14
-                                        i32.le_u
-                                        if ;; label = @19
-                                          block ;; label = @20
-                                            i32.const 0
-                                            local.set $22
-                                            br 2 (;@18;)
-                                          end
-                                        end
-                                        local.get $8
-                                        i32.const -4
-                                        i32.add
-                                        local.tee $1
-                                        i32.load
-                                        if ;; label = @19
-                                          i32.const 1
-                                          local.set $22
-                                        else
-                                          block ;; label = @20
-                                            local.get $1
-                                            local.set $8
-                                            br 3 (;@17;)
-                                          end
-                                        end
-                                      end
-                                    end
-                                    block $label$203 ;; label = @17
-                                      local.get $29
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $35
-                                          i32.const 1
-                                          i32.and
-                                          i32.const 1
-                                          i32.xor
-                                          local.get $18
-                                          i32.add
-                                          local.tee $1
-                                          local.get $6
-                                          i32.gt_s
-                                          local.get $6
-                                          i32.const -5
-                                          i32.gt_s
-                                          i32.and
-                                          if (result i32) ;; label = @20
-                                            block (result i32) ;; label = @21
-                                              local.get $9
-                                              i32.const -1
-                                              i32.add
-                                              local.set $5
-                                              local.get $1
-                                              i32.const -1
-                                              i32.add
-                                              local.get $6
-                                              i32.sub
-                                            end
-                                          else
-                                            block (result i32) ;; label = @21
-                                              local.get $9
-                                              i32.const -2
-                                              i32.add
-                                              local.set $5
-                                              local.get $1
-                                              i32.const -1
-                                              i32.add
-                                            end
-                                          end
-                                          local.set $1
-                                          local.get $12
-                                          i32.const 8
-                                          i32.and
-                                          local.tee $13
-                                          br_if 2 (;@17;)
-                                          block $label$207 ;; label = @20
-                                            local.get $22
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $8
-                                                i32.const -4
-                                                i32.add
-                                                i32.load
-                                                local.tee $18
-                                                i32.eqz
-                                                if ;; label = @23
-                                                  block ;; label = @24
-                                                    i32.const 9
-                                                    local.set $9
-                                                    br 4 (;@20;)
-                                                  end
-                                                end
-                                                local.get $18
-                                                i32.const 10
-                                                i32.rem_u
-                                                if ;; label = @23
-                                                  block ;; label = @24
-                                                    i32.const 0
-                                                    local.set $9
-                                                    br 4 (;@20;)
-                                                  end
-                                                else
-                                                  block ;; label = @24
-                                                    i32.const 10
-                                                    local.set $13
-                                                    i32.const 0
-                                                    local.set $9
-                                                  end
-                                                end
-                                                loop $label$212 ;; label = @23
-                                                  local.get $9
-                                                  i32.const 1
-                                                  i32.add
-                                                  local.set $9
-                                                  local.get $18
-                                                  local.get $13
-                                                  i32.const 10
-                                                  i32.mul
-                                                  local.tee $13
-                                                  i32.rem_u
-                                                  i32.eqz
-                                                  br_if 0 (;@23;)
-                                                end
-                                              end
-                                            else
-                                              i32.const 9
-                                              local.set $9
-                                            end
-                                          end
-                                          local.get $8
-                                          local.get $25
-                                          i32.sub
-                                          i32.const 2
-                                          i32.shr_s
-                                          i32.const 9
-                                          i32.mul
-                                          i32.const -9
-                                          i32.add
-                                          local.set $18
-                                          local.get $5
-                                          i32.const 32
-                                          i32.or
-                                          i32.const 102
-                                          i32.eq
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              i32.const 0
-                                              local.set $13
-                                              local.get $1
-                                              local.get $18
-                                              local.get $9
-                                              i32.sub
-                                              local.tee $9
-                                              i32.const 0
-                                              i32.lt_s
-                                              if (result i32) ;; label = @22
-                                                i32.const 0
-                                                local.tee $9
-                                              else
-                                                local.get $9
-                                              end
-                                              i32.ge_s
-                                              if ;; label = @22
-                                                local.get $9
-                                                local.set $1
-                                              end
-                                            end
-                                          else
-                                            block ;; label = @21
-                                              i32.const 0
-                                              local.set $13
-                                              local.get $1
-                                              local.get $18
-                                              local.get $6
-                                              i32.add
-                                              local.get $9
-                                              i32.sub
-                                              local.tee $9
-                                              i32.const 0
-                                              i32.lt_s
-                                              if (result i32) ;; label = @22
-                                                i32.const 0
-                                                local.tee $9
-                                              else
-                                                local.get $9
-                                              end
-                                              i32.ge_s
-                                              if ;; label = @22
-                                                local.get $9
-                                                local.set $1
-                                              end
-                                            end
-                                          end
-                                        end
-                                      else
-                                        block ;; label = @19
-                                          local.get $12
-                                          i32.const 8
-                                          i32.and
-                                          local.set $13
-                                          local.get $18
-                                          local.set $1
-                                          local.get $9
-                                          local.set $5
-                                        end
-                                      end
-                                    end
-                                    local.get $5
-                                    i32.const 32
-                                    i32.or
-                                    i32.const 102
-                                    i32.eq
-                                    local.tee $25
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        i32.const 0
-                                        local.set $9
-                                        local.get $6
-                                        i32.const 0
-                                        i32.le_s
-                                        if ;; label = @19
-                                          i32.const 0
-                                          local.set $6
-                                        end
-                                      end
-                                    else
-                                      block ;; label = @18
-                                        local.get $28
-                                        local.get $6
-                                        i32.const 0
-                                        i32.lt_s
-                                        if (result i32) ;; label = @19
-                                          local.get $32
-                                        else
-                                          local.get $6
-                                        end
-                                        i64.extend_i32_s
-                                        local.get $33
-                                        call $23
-                                        local.tee $9
-                                        i32.sub
-                                        i32.const 2
-                                        i32.lt_s
-                                        if ;; label = @19
-                                          loop $label$229 ;; label = @20
-                                            local.get $9
-                                            i32.const -1
-                                            i32.add
-                                            local.tee $9
-                                            i32.const 48
-                                            i32.store8
-                                            local.get $28
-                                            local.get $9
-                                            i32.sub
-                                            i32.const 2
-                                            i32.lt_s
-                                            br_if 0 (;@20;)
-                                          end
-                                        end
-                                        local.get $9
-                                        i32.const -1
-                                        i32.add
-                                        local.get $6
-                                        i32.const 31
-                                        i32.shr_s
-                                        i32.const 2
-                                        i32.and
-                                        i32.const 43
-                                        i32.add
-                                        i32.store8
-                                        local.get $9
-                                        i32.const -2
-                                        i32.add
-                                        local.tee $6
-                                        local.get $5
-                                        i32.store8
-                                        local.get $6
-                                        local.set $9
-                                        local.get $28
-                                        local.get $6
-                                        i32.sub
-                                        local.set $6
-                                      end
-                                    end
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    local.get $24
-                                    i32.const 1
-                                    i32.add
-                                    local.get $1
-                                    i32.add
-                                    local.get $1
-                                    local.get $13
-                                    i32.or
-                                    local.tee $29
-                                    i32.const 0
-                                    i32.ne
-                                    i32.add
-                                    local.get $6
-                                    i32.add
-                                    local.tee $18
-                                    local.get $12
-                                    call $25
-                                    local.get $0
-                                    i32.load
-                                    i32.const 32
-                                    i32.and
-                                    i32.eqz
-                                    if ;; label = @17
-                                      local.get $26
-                                      local.get $24
-                                      local.get $0
-                                      call $21
-                                      drop
-                                    end
-                                    local.get $0
-                                    i32.const 48
-                                    local.get $10
-                                    local.get $18
-                                    local.get $12
-                                    i32.const 65536
-                                    i32.xor
-                                    call $25
-                                    block $label$231 ;; label = @17
-                                      local.get $25
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $14
-                                          local.get $7
-                                          i32.gt_u
-                                          if (result i32) ;; label = @20
-                                            local.get $7
-                                          else
-                                            local.get $14
-                                          end
-                                          local.tee $9
-                                          local.set $6
-                                          loop $label$235 ;; label = @20
-                                            local.get $6
-                                            i32.load
-                                            i64.extend_i32_u
-                                            local.get $31
-                                            call $23
-                                            local.set $5
-                                            block $label$236 ;; label = @21
-                                              local.get $6
-                                              local.get $9
-                                              i32.eq
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $5
-                                                  local.get $31
-                                                  i32.ne
-                                                  br_if 2 (;@21;)
-                                                  local.get $34
-                                                  i32.const 48
-                                                  i32.store8
-                                                  local.get $34
-                                                  local.set $5
-                                                end
-                                              else
-                                                block ;; label = @23
-                                                  local.get $5
-                                                  local.get $19
-                                                  i32.le_u
-                                                  br_if 2 (;@21;)
-                                                  local.get $19
-                                                  i32.const 48
-                                                  local.get $5
-                                                  local.get $27
-                                                  i32.sub
-                                                  call $39
-                                                  drop
-                                                  loop $label$239 ;; label = @24
-                                                    local.get $5
-                                                    i32.const -1
-                                                    i32.add
-                                                    local.tee $5
-                                                    local.get $19
-                                                    i32.gt_u
-                                                    br_if 0 (;@24;)
-                                                  end
-                                                end
-                                              end
-                                            end
-                                            local.get $0
-                                            i32.load
-                                            i32.const 32
-                                            i32.and
-                                            i32.eqz
-                                            if ;; label = @21
-                                              local.get $5
-                                              local.get $41
-                                              local.get $5
-                                              i32.sub
-                                              local.get $0
-                                              call $21
-                                              drop
-                                            end
-                                            local.get $6
-                                            i32.const 4
-                                            i32.add
-                                            local.tee $5
-                                            local.get $7
-                                            i32.le_u
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $5
-                                                local.set $6
-                                                br 2 (;@20;)
-                                              end
-                                            end
-                                          end
-                                          block $label$242 ;; label = @20
-                                            local.get $29
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $0
-                                                i32.load
-                                                i32.const 32
-                                                i32.and
-                                                br_if 2 (;@20;)
-                                                i32.const 1709
-                                                i32.const 1
-                                                local.get $0
-                                                call $21
-                                                drop
-                                              end
-                                            end
-                                          end
-                                          local.get $1
-                                          i32.const 0
-                                          i32.gt_s
-                                          local.get $5
-                                          local.get $8
-                                          i32.lt_u
-                                          i32.and
-                                          if ;; label = @20
-                                            loop $label$245 ;; label = @21
-                                              local.get $5
-                                              i32.load
-                                              i64.extend_i32_u
-                                              local.get $31
-                                              call $23
-                                              local.tee $7
-                                              local.get $19
-                                              i32.gt_u
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $19
-                                                  i32.const 48
-                                                  local.get $7
-                                                  local.get $27
-                                                  i32.sub
-                                                  call $39
-                                                  drop
-                                                  loop $label$247 ;; label = @24
-                                                    local.get $7
-                                                    i32.const -1
-                                                    i32.add
-                                                    local.tee $7
-                                                    local.get $19
-                                                    i32.gt_u
-                                                    br_if 0 (;@24;)
-                                                  end
-                                                end
-                                              end
-                                              local.get $0
-                                              i32.load
-                                              i32.const 32
-                                              i32.and
-                                              i32.eqz
-                                              if ;; label = @22
-                                                local.get $7
-                                                local.get $1
-                                                i32.const 9
-                                                i32.gt_s
-                                                if (result i32) ;; label = @23
-                                                  i32.const 9
-                                                else
-                                                  local.get $1
-                                                end
-                                                local.get $0
-                                                call $21
-                                                drop
-                                              end
-                                              local.get $1
-                                              i32.const -9
-                                              i32.add
-                                              local.set $7
-                                              local.get $1
-                                              i32.const 9
-                                              i32.gt_s
-                                              local.get $5
-                                              i32.const 4
-                                              i32.add
-                                              local.tee $5
-                                              local.get $8
-                                              i32.lt_u
-                                              i32.and
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $7
-                                                  local.set $1
-                                                  br 2 (;@21;)
-                                                end
-                                              else
-                                                local.get $7
-                                                local.set $1
-                                              end
-                                            end
-                                          end
-                                          local.get $0
-                                          i32.const 48
-                                          local.get $1
-                                          i32.const 9
-                                          i32.add
-                                          i32.const 9
-                                          i32.const 0
-                                          call $25
-                                        end
-                                      else
-                                        block ;; label = @19
-                                          local.get $14
-                                          i32.const 4
-                                          i32.add
-                                          local.set $5
-                                          local.get $22
-                                          i32.eqz
-                                          if ;; label = @20
-                                            local.get $5
-                                            local.set $8
-                                          end
-                                          local.get $1
-                                          i32.const -1
-                                          i32.gt_s
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              local.get $13
-                                              i32.eqz
-                                              local.set $13
-                                              local.get $14
-                                              local.set $7
-                                              local.get $1
-                                              local.set $5
-                                              loop $label$256 ;; label = @22
-                                                local.get $7
-                                                i32.load
-                                                i64.extend_i32_u
-                                                local.get $31
-                                                call $23
-                                                local.tee $1
-                                                local.get $31
-                                                i32.eq
-                                                if ;; label = @23
-                                                  block ;; label = @24
-                                                    local.get $34
-                                                    i32.const 48
-                                                    i32.store8
-                                                    local.get $34
-                                                    local.set $1
-                                                  end
-                                                end
-                                                block $label$258 ;; label = @23
-                                                  local.get $7
-                                                  local.get $14
-                                                  i32.eq
-                                                  if ;; label = @24
-                                                    block ;; label = @25
-                                                      local.get $0
-                                                      i32.load
-                                                      i32.const 32
-                                                      i32.and
-                                                      i32.eqz
-                                                      if ;; label = @26
-                                                        local.get $1
-                                                        i32.const 1
-                                                        local.get $0
-                                                        call $21
-                                                        drop
-                                                      end
-                                                      local.get $1
-                                                      i32.const 1
-                                                      i32.add
-                                                      local.set $1
-                                                      local.get $13
-                                                      local.get $5
-                                                      i32.const 1
-                                                      i32.lt_s
-                                                      i32.and
-                                                      br_if 2 (;@23;)
-                                                      local.get $0
-                                                      i32.load
-                                                      i32.const 32
-                                                      i32.and
-                                                      br_if 2 (;@23;)
-                                                      i32.const 1709
-                                                      i32.const 1
-                                                      local.get $0
-                                                      call $21
-                                                      drop
-                                                    end
-                                                  else
-                                                    block ;; label = @25
-                                                      local.get $1
-                                                      local.get $19
-                                                      i32.le_u
-                                                      br_if 2 (;@23;)
-                                                      local.get $19
-                                                      i32.const 48
-                                                      local.get $1
-                                                      local.get $43
-                                                      i32.add
-                                                      call $39
-                                                      drop
-                                                      loop $label$262 ;; label = @26
-                                                        local.get $1
-                                                        i32.const -1
-                                                        i32.add
-                                                        local.tee $1
-                                                        local.get $19
-                                                        i32.gt_u
-                                                        br_if 0 (;@26;)
-                                                      end
-                                                    end
-                                                  end
-                                                end
-                                                local.get $41
-                                                local.get $1
-                                                i32.sub
-                                                local.set $6
-                                                local.get $0
-                                                i32.load
-                                                i32.const 32
-                                                i32.and
-                                                i32.eqz
-                                                if ;; label = @23
-                                                  local.get $1
-                                                  local.get $5
-                                                  local.get $6
-                                                  i32.gt_s
-                                                  if (result i32) ;; label = @24
-                                                    local.get $6
-                                                  else
-                                                    local.get $5
-                                                  end
-                                                  local.get $0
-                                                  call $21
-                                                  drop
-                                                end
-                                                local.get $7
-                                                i32.const 4
-                                                i32.add
-                                                local.tee $7
-                                                local.get $8
-                                                i32.lt_u
-                                                local.get $5
-                                                local.get $6
-                                                i32.sub
-                                                local.tee $5
-                                                i32.const -1
-                                                i32.gt_s
-                                                i32.and
-                                                br_if 0 (;@22;)
-                                                local.get $5
-                                                local.set $1
-                                              end
-                                            end
-                                          end
-                                          local.get $0
-                                          i32.const 48
-                                          local.get $1
-                                          i32.const 18
-                                          i32.add
-                                          i32.const 18
-                                          i32.const 0
-                                          call $25
-                                          local.get $0
-                                          i32.load
-                                          i32.const 32
-                                          i32.and
-                                          br_if 2 (;@17;)
-                                          local.get $9
-                                          local.get $28
-                                          local.get $9
-                                          i32.sub
-                                          local.get $0
-                                          call $21
-                                          drop
-                                        end
-                                      end
-                                    end
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    local.get $18
-                                    local.get $12
-                                    i32.const 8192
-                                    i32.xor
-                                    call $25
-                                    local.get $18
-                                    local.get $10
-                                    i32.ge_s
-                                    if ;; label = @17
-                                      local.get $18
-                                      local.set $10
-                                    end
-                                  end
-                                else
-                                  block ;; label = @16
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    local.get $52
-                                    local.get $52
-                                    f64.ne
-                                    i32.const 0
-                                    i32.or
-                                    local.tee $6
-                                    if (result i32) ;; label = @17
-                                      i32.const 0
-                                      local.tee $24
-                                    else
-                                      local.get $24
-                                    end
-                                    i32.const 3
-                                    i32.add
-                                    local.tee $8
-                                    local.get $7
-                                    call $25
-                                    local.get $0
-                                    i32.load
-                                    local.tee $1
-                                    i32.const 32
-                                    i32.and
-                                    i32.eqz
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $26
-                                        local.get $24
-                                        local.get $0
-                                        call $21
-                                        drop
-                                        local.get $0
-                                        i32.load
-                                        local.set $1
-                                      end
-                                    end
-                                    local.get $9
-                                    i32.const 32
-                                    i32.and
-                                    i32.const 0
-                                    i32.ne
-                                    local.tee $5
-                                    if (result i32) ;; label = @17
-                                      i32.const 1693
-                                    else
-                                      i32.const 1697
-                                    end
-                                    local.set $7
-                                    local.get $5
-                                    if (result i32) ;; label = @17
-                                      i32.const 1701
-                                    else
-                                      i32.const 1705
-                                    end
-                                    local.set $5
-                                    local.get $6
-                                    i32.eqz
-                                    if ;; label = @17
-                                      local.get $7
-                                      local.set $5
-                                    end
-                                    local.get $1
-                                    i32.const 32
-                                    i32.and
-                                    i32.eqz
-                                    if ;; label = @17
-                                      local.get $5
-                                      i32.const 3
-                                      local.get $0
-                                      call $21
-                                      drop
-                                    end
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    local.get $8
-                                    local.get $12
-                                    i32.const 8192
-                                    i32.xor
-                                    call $25
-                                    local.get $8
-                                    local.get $10
-                                    i32.ge_s
-                                    if ;; label = @17
-                                      local.get $8
-                                      local.set $10
-                                    end
-                                  end
-                                end
-                              end
-                              local.get $11
-                              local.set $1
-                              br 9 (;@4;)
-                            end
-                            local.get $5
-                            local.set $7
-                            i32.const 0
-                            local.set $6
-                            i32.const 1657
-                            local.set $8
-                            local.get $21
-                            local.set $5
-                            br 6 (;@6;)
-                          end
-                          local.get $9
-                          i32.const 32
-                          i32.and
-                          local.set $7
-                          local.get $16
-                          i64.load
-                          local.tee $50
-                          i64.const 0
-                          i64.eq
-                          if (result i32) ;; label = @12
-                            block (result i32) ;; label = @13
-                              i64.const 0
-                              local.set $50
-                              local.get $21
-                            end
-                          else
-                            block (result i32) ;; label = @13
-                              local.get $21
-                              local.set $1
-                              loop $label$280 ;; label = @14
-                                local.get $1
-                                i32.const -1
-                                i32.add
-                                local.tee $1
-                                local.get $50
-                                i32.wrap_i64
-                                i32.const 15
-                                i32.and
-                                i32.const 1641
-                                i32.add
-                                i32.load8_u
-                                local.get $7
-                                i32.or
-                                i32.store8
-                                local.get $50
-                                i64.const 4
-                                i64.shr_u
-                                local.tee $50
-                                i64.const 0
-                                i64.ne
-                                br_if 0 (;@14;)
-                              end
-                              local.get $16
-                              i64.load
-                              local.set $50
-                              local.get $1
-                            end
-                          end
-                          local.set $7
-                          local.get $9
-                          i32.const 4
-                          i32.shr_s
-                          i32.const 1657
-                          i32.add
-                          local.set $8
-                          local.get $12
-                          i32.const 8
-                          i32.and
-                          i32.eqz
-                          local.get $50
-                          i64.const 0
-                          i64.eq
-                          i32.or
-                          local.tee $1
-                          if ;; label = @12
-                            i32.const 1657
-                            local.set $8
-                          end
-                          local.get $1
-                          if (result i32) ;; label = @12
-                            i32.const 0
-                          else
-                            i32.const 2
-                          end
-                          local.set $6
-                          br 4 (;@7;)
-                        end
-                        local.get $50
-                        local.get $21
-                        call $23
-                        local.set $7
-                        br 3 (;@7;)
-                      end
-                      local.get $1
-                      i32.const 0
-                      local.get $5
-                      call $17
-                      local.tee $13
-                      i32.eqz
-                      local.set $14
-                      local.get $13
-                      local.get $1
-                      i32.sub
-                      local.set $8
-                      local.get $1
-                      local.get $5
-                      i32.add
-                      local.set $9
-                      local.get $7
-                      local.set $12
-                      local.get $14
-                      if (result i32) ;; label = @10
-                        local.get $5
-                      else
-                        local.get $8
-                      end
-                      local.set $7
-                      i32.const 0
-                      local.set $6
-                      i32.const 1657
-                      local.set $8
-                      local.get $14
-                      if (result i32) ;; label = @10
-                        local.get $9
-                      else
-                        local.get $13
-                      end
-                      local.set $5
-                      br 3 (;@6;)
-                    end
-                    i32.const 0
-                    local.set $1
-                    i32.const 0
-                    local.set $5
-                    local.get $7
-                    local.set $8
-                    loop $label$288 ;; label = @9
-                      block $label$289 ;; label = @10
-                        local.get $8
-                        i32.load
-                        local.tee $9
-                        i32.eqz
-                        br_if 0 (;@10;)
-                        local.get $36
-                        local.get $9
-                        call $26
-                        local.tee $5
-                        i32.const 0
-                        i32.lt_s
-                        local.get $5
-                        local.get $6
-                        local.get $1
-                        i32.sub
-                        i32.gt_u
-                        i32.or
-                        br_if 0 (;@10;)
-                        local.get $8
-                        i32.const 4
-                        i32.add
-                        local.set $8
-                        local.get $6
-                        local.get $5
-                        local.get $1
-                        i32.add
-                        local.tee $1
-                        i32.gt_u
-                        br_if 1 (;@9;)
-                      end
-                    end
-                    local.get $5
-                    i32.const 0
-                    i32.lt_s
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const -1
-                        local.set $15
-                        br 5 (;@5;)
-                      end
-                    end
-                    local.get $0
-                    i32.const 32
-                    local.get $10
-                    local.get $1
-                    local.get $12
-                    call $25
-                    local.get $1
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const 0
-                        local.set $5
-                        loop $label$292 ;; label = @11
-                          local.get $7
-                          i32.load
-                          local.tee $8
-                          i32.eqz
-                          br_if 3 (;@8;)
-                          local.get $36
-                          local.get $8
-                          call $26
-                          local.tee $8
-                          local.get $5
-                          i32.add
-                          local.tee $5
-                          local.get $1
-                          i32.gt_s
-                          br_if 3 (;@8;)
-                          local.get $0
-                          i32.load
-                          i32.const 32
-                          i32.and
-                          i32.eqz
-                          if ;; label = @12
-                            local.get $36
-                            local.get $8
-                            local.get $0
-                            call $21
-                            drop
-                          end
-                          local.get $7
-                          i32.const 4
-                          i32.add
-                          local.set $7
-                          local.get $5
-                          local.get $1
-                          i32.lt_u
-                          br_if 0 (;@11;)
-                          br 3 (;@8;)
-                        end
-                      end
-                    else
-                      block ;; label = @10
-                        i32.const 0
-                        local.set $1
-                        br 2 (;@8;)
-                      end
-                    end
-                  end
-                  local.get $0
-                  i32.const 32
-                  local.get $10
-                  local.get $1
-                  local.get $12
-                  i32.const 8192
-                  i32.xor
-                  call $25
-                  local.get $10
-                  local.get $1
-                  i32.le_s
-                  if ;; label = @8
-                    local.get $1
-                    local.set $10
-                  end
-                  local.get $11
-                  local.set $1
-                  br 3 (;@4;)
-                end
-                local.get $12
-                i32.const -65537
-                i32.and
-                local.set $1
-                local.get $5
-                i32.const -1
-                i32.gt_s
-                if ;; label = @7
-                  local.get $1
-                  local.set $12
-                end
-                local.get $5
-                local.get $16
-                i64.load
-                i64.const 0
-                i64.ne
-                local.tee $9
-                i32.or
-                if (result i32) ;; label = @7
-                  block (result i32) ;; label = @8
-                    local.get $7
-                    local.set $1
-                    local.get $5
-                    local.get $9
-                    i32.const 1
-                    i32.and
-                    i32.const 1
-                    i32.xor
-                    local.get $38
-                    local.get $7
-                    i32.sub
-                    i32.add
-                    local.tee $7
-                    i32.gt_s
-                    if ;; label = @9
-                      local.get $5
-                      local.set $7
-                    end
-                    local.get $21
-                  end
-                else
-                  block (result i32) ;; label = @8
-                    local.get $21
-                    local.set $1
-                    i32.const 0
-                    local.set $7
-                    local.get $21
-                  end
-                end
-                local.set $5
-              end
-              local.get $0
-              i32.const 32
-              local.get $10
-              local.get $7
-              local.get $5
-              local.get $1
-              i32.sub
-              local.tee $9
-              i32.lt_s
-              if (result i32) ;; label = @6
-                local.get $9
-                local.tee $7
-              else
-                local.get $7
-              end
-              local.get $6
-              i32.add
-              local.tee $5
-              i32.lt_s
-              if (result i32) ;; label = @6
-                local.get $5
-                local.tee $10
-              else
-                local.get $10
-              end
-              local.get $5
-              local.get $12
-              call $25
-              local.get $0
-              i32.load
-              i32.const 32
-              i32.and
-              i32.eqz
-              if ;; label = @6
-                local.get $8
-                local.get $6
-                local.get $0
-                call $21
-                drop
-              end
-              local.get $0
-              i32.const 48
-              local.get $10
-              local.get $5
-              local.get $12
-              i32.const 65536
-              i32.xor
-              call $25
-              local.get $0
-              i32.const 48
-              local.get $7
-              local.get $9
-              i32.const 0
-              call $25
-              local.get $0
-              i32.load
-              i32.const 32
-              i32.and
-              i32.eqz
-              if ;; label = @6
-                local.get $1
-                local.get $9
-                local.get $0
-                call $21
-                drop
-              end
-              local.get $0
-              i32.const 32
-              local.get $10
-              local.get $5
-              local.get $12
-              i32.const 8192
-              i32.xor
-              call $25
-              local.get $11
-              local.set $1
-              br 1 (;@4;)
-            end
-          end
-          br 1 (;@2;)
-        end
-        local.get $0
-        i32.eqz
-        if ;; label = @3
-          local.get $17
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 1
-              local.set $0
-              loop $label$308 ;; label = @6
-                local.get $4
-                local.get $0
-                i32.const 2
-                i32.shl
-                i32.add
-                i32.load
-                local.tee $1
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $3
-                    local.get $0
-                    i32.const 3
-                    i32.shl
-                    i32.add
-                    local.get $1
-                    local.get $2
-                    call $22
-                    local.get $0
-                    i32.const 1
-                    i32.add
-                    local.tee $0
-                    i32.const 10
-                    i32.lt_s
-                    br_if 2 (;@6;)
-                    i32.const 1
-                    local.set $15
-                    br 6 (;@2;)
-                  end
-                end
-              end
-              loop $label$310 ;; label = @6
-                local.get $4
-                local.get $0
-                i32.const 2
-                i32.shl
-                i32.add
-                i32.load
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const -1
-                    local.set $15
-                    br 6 (;@2;)
-                  end
-                end
-                local.get $0
-                i32.const 1
-                i32.add
-                local.tee $0
-                i32.const 10
-                i32.lt_s
-                br_if 0 (;@6;)
-                i32.const 1
-                local.set $15
-              end
-            end
-          else
-            i32.const 0
-            local.set $15
-          end
-        end
-      end
-      local.get $23
-      global.set $global$1
-      local.get $15
-    end
+ )
+ (func $24 (; 37 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (i32.const 0)
+   )
+   (block $label$2
+    (block $label$3
+     (block $label$4
+      (loop $label$5
+       (br_if $label$4
+        (i32.eq
+         (i32.load8_u
+          (i32.add
+           (local.get $1)
+           (i32.const 1711)
+          )
+         )
+         (local.get $0)
+        )
+       )
+       (br_if $label$5
+        (i32.ne
+         (local.tee $1
+          (i32.add
+           (local.get $1)
+           (i32.const 1)
+          )
+         )
+         (i32.const 87)
+        )
+       )
+       (local.set $1
+        (i32.const 87)
+       )
+       (local.set $0
+        (i32.const 1799)
+       )
+       (br $label$3)
+      )
+     )
+     (if
+      (local.get $1)
+      (block
+       (local.set $0
+        (i32.const 1799)
+       )
+       (br $label$3)
+      )
+      (local.set $0
+       (i32.const 1799)
+      )
+     )
+     (br $label$2)
+    )
+    (loop $label$8
+     (local.set $2
+      (local.get $0)
+     )
+     (loop $label$9
+      (local.set $0
+       (i32.add
+        (local.get $2)
+        (i32.const 1)
+       )
+      )
+      (if
+       (i32.load8_s
+        (local.get $2)
+       )
+       (block
+        (local.set $2
+         (local.get $0)
+        )
+        (br $label$9)
+       )
+      )
+     )
+     (br_if $label$8
+      (local.tee $1
+       (i32.add
+        (local.get $1)
+        (i32.const -1)
+       )
+      )
+     )
+    )
+   )
+   (local.get $0)
   )
-  (func $20 (;33;) (type $1) (param $0 i32) (result i32)
-    i32.const 0
+ )
+ (func $25 (; 38 ;) (type $10) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (block $label$1
+   (local.set $7
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 256)
+    )
+   )
+   (local.set $6
+    (local.get $7)
+   )
+   (block $label$2
+    (if
+     (i32.and
+      (i32.gt_s
+       (local.get $2)
+       (local.get $3)
+      )
+      (i32.eqz
+       (i32.and
+        (local.get $4)
+        (i32.const 73728)
+       )
+      )
+     )
+     (block
+      (drop
+       (call $39
+        (local.get $6)
+        (local.get $1)
+        (if (result i32)
+         (i32.gt_u
+          (local.tee $5
+           (i32.sub
+            (local.get $2)
+            (local.get $3)
+           )
+          )
+          (i32.const 256)
+         )
+         (i32.const 256)
+         (local.get $5)
+        )
+       )
+      )
+      (local.set $4
+       (i32.eqz
+        (i32.and
+         (local.tee $1
+          (i32.load
+           (local.get $0)
+          )
+         )
+         (i32.const 32)
+        )
+       )
+      )
+      (if
+       (i32.gt_u
+        (local.get $5)
+        (i32.const 255)
+       )
+       (block
+        (loop $label$7
+         (if
+          (local.get $4)
+          (block
+           (drop
+            (call $21
+             (local.get $6)
+             (i32.const 256)
+             (local.get $0)
+            )
+           )
+           (local.set $1
+            (i32.load
+             (local.get $0)
+            )
+           )
+          )
+         )
+         (local.set $4
+          (i32.eqz
+           (i32.and
+            (local.get $1)
+            (i32.const 32)
+           )
+          )
+         )
+         (br_if $label$7
+          (i32.gt_u
+           (local.tee $5
+            (i32.add
+             (local.get $5)
+             (i32.const -256)
+            )
+           )
+           (i32.const 255)
+          )
+         )
+        )
+        (br_if $label$2
+         (i32.eqz
+          (local.get $4)
+         )
+        )
+        (local.set $5
+         (i32.and
+          (i32.sub
+           (local.get $2)
+           (local.get $3)
+          )
+          (i32.const 255)
+         )
+        )
+       )
+       (br_if $label$2
+        (i32.eqz
+         (local.get $4)
+        )
+       )
+      )
+      (drop
+       (call $21
+        (local.get $6)
+        (local.get $5)
+        (local.get $0)
+       )
+      )
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $7)
+   )
   )
-  (func $21 (;34;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32)
-    block $label$1 (result i32) ;; label = @1
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          local.get $2
-          i32.const 16
-          i32.add
-          local.tee $4
-          i32.load
-          local.tee $3
-          br_if 0 (;@3;)
-          local.get $2
-          call $30
-          if ;; label = @4
-            i32.const 0
-            local.set $3
-          else
-            block ;; label = @5
-              local.get $4
-              i32.load
-              local.set $3
-              br 2 (;@3;)
-            end
-          end
-          br 1 (;@2;)
-        end
-        local.get $3
-        local.get $2
-        i32.const 20
-        i32.add
-        local.tee $5
-        i32.load
-        local.tee $4
-        i32.sub
-        local.get $1
-        i32.lt_u
-        if ;; label = @3
-          block ;; label = @4
-            local.get $2
-            local.get $0
-            local.get $1
-            local.get $2
-            i32.load offset=36
-            i32.const 3
-            i32.and
-            i32.const 2
-            i32.add
-            call_indirect (type $0)
-            local.set $3
-            br 2 (;@2;)
-          end
-        end
-        block $label$7 (result i32) ;; label = @3
-          local.get $2
-          i32.load8_s offset=75
-          i32.const -1
-          i32.gt_s
-          if (result i32) ;; label = @4
-            block (result i32) ;; label = @5
-              local.get $1
-              local.set $3
-              loop $label$9 ;; label = @6
-                i32.const 0
-                local.get $3
-                i32.eqz
-                br_if 3 (;@3;)
-                drop
-                local.get $0
-                local.get $3
-                i32.const -1
-                i32.add
-                local.tee $6
-                i32.add
-                i32.load8_s
-                i32.const 10
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $6
-                    local.set $3
-                    br 2 (;@6;)
-                  end
-                end
-              end
-              local.get $2
-              local.get $0
-              local.get $3
-              local.get $2
-              i32.load offset=36
-              i32.const 3
-              i32.and
-              i32.const 2
-              i32.add
-              call_indirect (type $0)
-              local.get $3
-              i32.lt_u
-              br_if 3 (;@2;)
-              local.get $5
-              i32.load
-              local.set $4
-              local.get $1
-              local.get $3
-              i32.sub
-              local.set $1
-              local.get $0
-              local.get $3
-              i32.add
-              local.set $0
-              local.get $3
-            end
-          else
-            i32.const 0
-          end
-        end
-        local.set $2
-        local.get $4
-        local.get $0
-        local.get $1
-        call $40
-        drop
-        local.get $5
-        local.get $5
-        i32.load
-        local.get $1
-        i32.add
-        i32.store
-        local.get $2
-        local.get $1
-        i32.add
-        local.set $3
-      end
-      local.get $3
-    end
+ )
+ (func $26 (; 39 ;) (type $4) (param $0 i32) (param $1 i32) (result i32)
+  (if (result i32)
+   (local.get $0)
+   (call $29
+    (local.get $0)
+    (local.get $1)
+    (i32.const 0)
+   )
+   (i32.const 0)
   )
-  (func $22 (;35;) (type $8) (param $0 i32) (param $1 i32) (param $2 i32)
-    (local $3 i32) (local $4 i64) (local $5 f64)
-    block $label$1 ;; label = @1
-      local.get $1
-      i32.const 20
-      i32.le_u
-      if ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            block $label$5 ;; label = @5
-              block $label$6 ;; label = @6
-                block $label$7 ;; label = @7
-                  block $label$8 ;; label = @8
-                    block $label$9 ;; label = @9
-                      block $label$10 ;; label = @10
-                        block $label$11 ;; label = @11
-                          block $label$12 ;; label = @12
-                            block $label$13 ;; label = @13
-                              local.get $1
-                              i32.const 9
-                              i32.sub
-                              br_table 0 (;@13;) 1 (;@12;) 2 (;@11;) 3 (;@10;) 4 (;@9;) 5 (;@8;) 6 (;@7;) 7 (;@6;) 8 (;@5;) 9 (;@4;) 10 (;@3;)
-                            end
-                            local.get $2
-                            i32.load
-                            i32.const 3
-                            i32.add
-                            i32.const -4
-                            i32.and
-                            local.tee $1
-                            i32.load
-                            local.set $3
-                            local.get $2
-                            local.get $1
-                            i32.const 4
-                            i32.add
-                            i32.store
-                            local.get $0
-                            local.get $3
-                            i32.store
-                            br 11 (;@1;)
-                          end
-                          local.get $2
-                          i32.load
-                          i32.const 3
-                          i32.add
-                          i32.const -4
-                          i32.and
-                          local.tee $1
-                          i32.load
-                          local.set $3
-                          local.get $2
-                          local.get $1
-                          i32.const 4
-                          i32.add
-                          i32.store
-                          local.get $0
-                          local.get $3
-                          i64.extend_i32_s
-                          i64.store
-                          br 10 (;@1;)
-                        end
-                        local.get $2
-                        i32.load
-                        i32.const 3
-                        i32.add
-                        i32.const -4
-                        i32.and
-                        local.tee $1
-                        i32.load
-                        local.set $3
-                        local.get $2
-                        local.get $1
-                        i32.const 4
-                        i32.add
-                        i32.store
-                        local.get $0
-                        local.get $3
-                        i64.extend_i32_u
-                        i64.store
-                        br 9 (;@1;)
-                      end
-                      local.get $2
-                      i32.load
-                      i32.const 7
-                      i32.add
-                      i32.const -8
-                      i32.and
-                      local.tee $1
-                      i64.load
-                      local.set $4
-                      local.get $2
-                      local.get $1
-                      i32.const 8
-                      i32.add
-                      i32.store
-                      local.get $0
-                      local.get $4
-                      i64.store
-                      br 8 (;@1;)
-                    end
-                    local.get $2
-                    i32.load
-                    i32.const 3
-                    i32.add
-                    i32.const -4
-                    i32.and
-                    local.tee $1
-                    i32.load
-                    local.set $3
-                    local.get $2
-                    local.get $1
-                    i32.const 4
-                    i32.add
-                    i32.store
-                    local.get $0
-                    local.get $3
-                    i32.const 65535
-                    i32.and
-                    i32.const 16
-                    i32.shl
-                    i32.const 16
-                    i32.shr_s
-                    i64.extend_i32_s
-                    i64.store
-                    br 7 (;@1;)
-                  end
-                  local.get $2
-                  i32.load
-                  i32.const 3
-                  i32.add
-                  i32.const -4
-                  i32.and
-                  local.tee $1
-                  i32.load
-                  local.set $3
-                  local.get $2
-                  local.get $1
-                  i32.const 4
-                  i32.add
-                  i32.store
-                  local.get $0
-                  local.get $3
-                  i32.const 65535
-                  i32.and
-                  i64.extend_i32_u
-                  i64.store
-                  br 6 (;@1;)
-                end
-                local.get $2
-                i32.load
-                i32.const 3
-                i32.add
-                i32.const -4
-                i32.and
-                local.tee $1
-                i32.load
-                local.set $3
-                local.get $2
-                local.get $1
-                i32.const 4
-                i32.add
-                i32.store
-                local.get $0
-                local.get $3
-                i32.const 255
-                i32.and
-                i32.const 24
-                i32.shl
-                i32.const 24
-                i32.shr_s
-                i64.extend_i32_s
-                i64.store
-                br 5 (;@1;)
-              end
-              local.get $2
-              i32.load
-              i32.const 3
-              i32.add
-              i32.const -4
-              i32.and
-              local.tee $1
-              i32.load
-              local.set $3
-              local.get $2
-              local.get $1
-              i32.const 4
-              i32.add
-              i32.store
-              local.get $0
-              local.get $3
-              i32.const 255
-              i32.and
-              i64.extend_i32_u
-              i64.store
-              br 4 (;@1;)
-            end
-            local.get $2
-            i32.load
-            i32.const 7
-            i32.add
-            i32.const -8
-            i32.and
-            local.tee $1
-            f64.load
-            local.set $5
-            local.get $2
-            local.get $1
-            i32.const 8
-            i32.add
-            i32.store
-            local.get $0
-            local.get $5
-            f64.store
-            br 3 (;@1;)
-          end
-          local.get $2
-          i32.load
-          i32.const 7
-          i32.add
-          i32.const -8
-          i32.and
-          local.tee $1
-          f64.load
-          local.set $5
-          local.get $2
-          local.get $1
-          i32.const 8
-          i32.add
-          i32.store
-          local.get $0
-          local.get $5
-          f64.store
-        end
-      end
-    end
+ )
+ (func $27 (; 40 ;) (type $11) (param $0 f64) (param $1 i32) (result f64)
+  (call $28
+   (local.get $0)
+   (local.get $1)
   )
-  (func $23 (;36;) (type $9) (param $0 i64) (param $1 i32) (result i32)
-    (local $2 i32) (local $3 i32) (local $4 i64)
-    block $label$1 (result i32) ;; label = @1
-      local.get $0
-      i32.wrap_i64
-      local.set $2
-      local.get $0
-      i64.const 4294967295
-      i64.gt_u
-      if ;; label = @2
-        block ;; label = @3
-          loop $label$3 ;; label = @4
-            local.get $1
-            i32.const -1
-            i32.add
-            local.tee $1
-            local.get $0
-            i64.const 10
-            i64.rem_u
-            i64.const 48
-            i64.or
-            i64.store8
-            local.get $0
-            i64.const 10
-            i64.div_u
-            local.set $4
-            local.get $0
-            i64.const 42949672959
-            i64.gt_u
-            if ;; label = @5
-              block ;; label = @6
-                local.get $4
-                local.set $0
-                br 2 (;@4;)
-              end
-            end
-          end
-          local.get $4
-          i32.wrap_i64
-          local.set $2
-        end
-      end
-      local.get $2
-      if ;; label = @2
-        loop $label$6 ;; label = @3
-          local.get $1
-          i32.const -1
-          i32.add
-          local.tee $1
-          local.get $2
-          i32.const 10
-          i32.rem_u
-          i32.const 48
-          i32.or
-          i32.store8
-          local.get $2
-          i32.const 10
-          i32.div_u
-          local.set $3
-          local.get $2
-          i32.const 10
-          i32.ge_u
-          if ;; label = @4
-            block ;; label = @5
-              local.get $3
-              local.set $2
-              br 2 (;@3;)
-            end
-          end
-        end
-      end
-      local.get $1
-    end
+ )
+ (func $28 (; 41 ;) (type $11) (param $0 f64) (param $1 i32) (result f64)
+  (local $2 i64)
+  (local $3 i64)
+  (block $label$1 (result f64)
+   (block $label$2
+    (block $label$3
+     (block $label$4
+      (block $label$5
+       (br_table $label$5 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$4 $label$3
+        (i32.sub
+         (i32.shr_s
+          (i32.shl
+           (i32.and
+            (i32.and
+             (i32.wrap_i64
+              (local.tee $3
+               (i64.shr_u
+                (local.tee $2
+                 (i64.reinterpret_f64
+                  (local.get $0)
+                 )
+                )
+                (i64.const 52)
+               )
+              )
+             )
+             (i32.const 65535)
+            )
+            (i32.const 2047)
+           )
+           (i32.const 16)
+          )
+          (i32.const 16)
+         )
+         (i32.const 0)
+        )
+       )
+      )
+      (i32.store
+       (local.get $1)
+       (if (result i32)
+        (f64.ne
+         (local.get $0)
+         (f64.const 0)
+        )
+        (block (result i32)
+         (local.set $0
+          (call $28
+           (f64.mul
+            (local.get $0)
+            (f64.const 18446744073709551615)
+           )
+           (local.get $1)
+          )
+         )
+         (i32.add
+          (i32.load
+           (local.get $1)
+          )
+          (i32.const -64)
+         )
+        )
+        (i32.const 0)
+       )
+      )
+      (br $label$2)
+     )
+     (br $label$2)
+    )
+    (i32.store
+     (local.get $1)
+     (i32.add
+      (i32.and
+       (i32.wrap_i64
+        (local.get $3)
+       )
+       (i32.const 2047)
+      )
+      (i32.const -1022)
+     )
+    )
+    (local.set $0
+     (f64.reinterpret_i64
+      (i64.or
+       (i64.and
+        (local.get $2)
+        (i64.const -9218868437227405313)
+       )
+       (i64.const 4602678819172646912)
+      )
+     )
+    )
+   )
+   (local.get $0)
   )
-  (func $24 (;37;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32)
-    block $label$1 (result i32) ;; label = @1
-      i32.const 0
-      local.set $1
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            loop $label$5 ;; label = @5
-              local.get $1
-              i32.const 1711
-              i32.add
-              i32.load8_u
-              local.get $0
-              i32.eq
-              br_if 1 (;@4;)
-              local.get $1
-              i32.const 1
-              i32.add
-              local.tee $1
-              i32.const 87
-              i32.ne
-              br_if 0 (;@5;)
-              i32.const 87
-              local.set $1
-              i32.const 1799
-              local.set $0
-              br 2 (;@3;)
-            end
-          end
-          local.get $1
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 1799
-              local.set $0
-              br 2 (;@3;)
-            end
-          else
-            i32.const 1799
-            local.set $0
-          end
-          br 1 (;@2;)
-        end
-        loop $label$8 ;; label = @3
-          local.get $0
-          local.set $2
-          loop $label$9 ;; label = @4
-            local.get $2
-            i32.const 1
-            i32.add
-            local.set $0
-            local.get $2
-            i32.load8_s
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                local.set $2
-                br 2 (;@4;)
-              end
-            end
-          end
-          local.get $1
-          i32.const -1
-          i32.add
-          local.tee $1
-          br_if 0 (;@3;)
-        end
-      end
-      local.get $0
-    end
+ )
+ (func $29 (; 42 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (block $label$1 (result i32)
+   (if (result i32)
+    (local.get $0)
+    (block (result i32)
+     (if
+      (i32.lt_u
+       (local.get $1)
+       (i32.const 128)
+      )
+      (block
+       (i32.store8
+        (local.get $0)
+        (local.get $1)
+       )
+       (br $label$1
+        (i32.const 1)
+       )
+      )
+     )
+     (if
+      (i32.lt_u
+       (local.get $1)
+       (i32.const 2048)
+      )
+      (block
+       (i32.store8
+        (local.get $0)
+        (i32.or
+         (i32.shr_u
+          (local.get $1)
+          (i32.const 6)
+         )
+         (i32.const 192)
+        )
+       )
+       (i32.store8 offset=1
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (local.get $1)
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (br $label$1
+        (i32.const 2)
+       )
+      )
+     )
+     (if
+      (i32.or
+       (i32.lt_u
+        (local.get $1)
+        (i32.const 55296)
+       )
+       (i32.eq
+        (i32.and
+         (local.get $1)
+         (i32.const -8192)
+        )
+        (i32.const 57344)
+       )
+      )
+      (block
+       (i32.store8
+        (local.get $0)
+        (i32.or
+         (i32.shr_u
+          (local.get $1)
+          (i32.const 12)
+         )
+         (i32.const 224)
+        )
+       )
+       (i32.store8 offset=1
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (i32.shr_u
+           (local.get $1)
+           (i32.const 6)
+          )
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (i32.store8 offset=2
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (local.get $1)
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (br $label$1
+        (i32.const 3)
+       )
+      )
+     )
+     (if (result i32)
+      (i32.lt_u
+       (i32.add
+        (local.get $1)
+        (i32.const -65536)
+       )
+       (i32.const 1048576)
+      )
+      (block (result i32)
+       (i32.store8
+        (local.get $0)
+        (i32.or
+         (i32.shr_u
+          (local.get $1)
+          (i32.const 18)
+         )
+         (i32.const 240)
+        )
+       )
+       (i32.store8 offset=1
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (i32.shr_u
+           (local.get $1)
+           (i32.const 12)
+          )
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (i32.store8 offset=2
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (i32.shr_u
+           (local.get $1)
+           (i32.const 6)
+          )
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (i32.store8 offset=3
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (local.get $1)
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (i32.const 4)
+      )
+      (block (result i32)
+       (i32.store
+        (call $12)
+        (i32.const 84)
+       )
+       (i32.const -1)
+      )
+     )
+    )
+    (i32.const 1)
+   )
   )
-  (func $25 (;38;) (type $10) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
-    (local $5 i32) (local $6 i32) (local $7 i32)
-    block $label$1 ;; label = @1
-      global.get $global$1
-      local.set $7
-      global.get $global$1
-      i32.const 256
-      i32.add
-      global.set $global$1
-      local.get $7
-      local.set $6
-      block $label$2 ;; label = @2
-        local.get $2
-        local.get $3
-        i32.gt_s
-        local.get $4
-        i32.const 73728
-        i32.and
-        i32.eqz
-        i32.and
-        if ;; label = @3
-          block ;; label = @4
-            local.get $6
-            local.get $1
-            local.get $2
-            local.get $3
-            i32.sub
-            local.tee $5
-            i32.const 256
-            i32.gt_u
-            if (result i32) ;; label = @5
-              i32.const 256
-            else
-              local.get $5
-            end
-            call $39
-            drop
-            local.get $0
-            i32.load
-            local.tee $1
-            i32.const 32
-            i32.and
-            i32.eqz
-            local.set $4
-            local.get $5
-            i32.const 255
-            i32.gt_u
-            if ;; label = @5
-              block ;; label = @6
-                loop $label$7 ;; label = @7
-                  local.get $4
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $6
-                      i32.const 256
-                      local.get $0
-                      call $21
-                      drop
-                      local.get $0
-                      i32.load
-                      local.set $1
-                    end
-                  end
-                  local.get $1
-                  i32.const 32
-                  i32.and
-                  i32.eqz
-                  local.set $4
-                  local.get $5
-                  i32.const -256
-                  i32.add
-                  local.tee $5
-                  i32.const 255
-                  i32.gt_u
-                  br_if 0 (;@7;)
-                end
-                local.get $4
-                i32.eqz
-                br_if 4 (;@2;)
-                local.get $2
-                local.get $3
-                i32.sub
-                i32.const 255
-                i32.and
-                local.set $5
-              end
-            else
-              local.get $4
-              i32.eqz
-              br_if 3 (;@2;)
-            end
-            local.get $6
-            local.get $5
-            local.get $0
-            call $21
-            drop
-          end
-        end
-      end
-      local.get $7
-      global.set $global$1
-    end
+ )
+ (func $30 (; 43 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (i32.load8_s
+     (local.tee $2
+      (i32.add
+       (local.get $0)
+       (i32.const 74)
+      )
+     )
+    )
+   )
+   (i32.store8
+    (local.get $2)
+    (i32.or
+     (i32.add
+      (local.get $1)
+      (i32.const 255)
+     )
+     (local.get $1)
+    )
+   )
+   (local.tee $0
+    (if (result i32)
+     (i32.and
+      (local.tee $1
+       (i32.load
+        (local.get $0)
+       )
+      )
+      (i32.const 8)
+     )
+     (block (result i32)
+      (i32.store
+       (local.get $0)
+       (i32.or
+        (local.get $1)
+        (i32.const 32)
+       )
+      )
+      (i32.const -1)
+     )
+     (block (result i32)
+      (i32.store offset=8
+       (local.get $0)
+       (i32.const 0)
+      )
+      (i32.store offset=4
+       (local.get $0)
+       (i32.const 0)
+      )
+      (i32.store offset=28
+       (local.get $0)
+       (local.tee $1
+        (i32.load offset=44
+         (local.get $0)
+        )
+       )
+      )
+      (i32.store offset=20
+       (local.get $0)
+       (local.get $1)
+      )
+      (i32.store offset=16
+       (local.get $0)
+       (i32.add
+        (local.get $1)
+        (i32.load offset=48
+         (local.get $0)
+        )
+       )
+      )
+      (i32.const 0)
+     )
+    )
+   )
   )
-  (func $26 (;39;) (type $4) (param $0 i32) (param $1 i32) (result i32)
-    local.get $0
-    if (result i32) ;; label = @1
-      local.get $0
-      local.get $1
-      i32.const 0
-      call $29
-    else
-      i32.const 0
-    end
+ )
+ (func $31 (; 44 ;) (type $4) (param $0 i32) (param $1 i32) (result i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (block $label$1 (result i32)
+   (local.set $3
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 16)
+    )
+   )
+   (i32.store8
+    (local.tee $4
+     (local.get $3)
+    )
+    (local.tee $7
+     (i32.and
+      (local.get $1)
+      (i32.const 255)
+     )
+    )
+   )
+   (block $label$2
+    (block $label$3
+     (br_if $label$3
+      (local.tee $5
+       (i32.load
+        (local.tee $2
+         (i32.add
+          (local.get $0)
+          (i32.const 16)
+         )
+        )
+       )
+      )
+     )
+     (if
+      (call $30
+       (local.get $0)
+      )
+      (local.set $1
+       (i32.const -1)
+      )
+      (block
+       (local.set $5
+        (i32.load
+         (local.get $2)
+        )
+       )
+       (br $label$3)
+      )
+     )
+     (br $label$2)
+    )
+    (if
+     (i32.lt_u
+      (local.tee $6
+       (i32.load
+        (local.tee $2
+         (i32.add
+          (local.get $0)
+          (i32.const 20)
+         )
+        )
+       )
+      )
+      (local.get $5)
+     )
+     (if
+      (i32.ne
+       (local.tee $1
+        (i32.and
+         (local.get $1)
+         (i32.const 255)
+        )
+       )
+       (i32.load8_s offset=75
+        (local.get $0)
+       )
+      )
+      (block
+       (i32.store
+        (local.get $2)
+        (i32.add
+         (local.get $6)
+         (i32.const 1)
+        )
+       )
+       (i32.store8
+        (local.get $6)
+        (local.get $7)
+       )
+       (br $label$2)
+      )
+     )
+    )
+    (local.set $1
+     (if (result i32)
+      (i32.eq
+       (call_indirect (type $0)
+        (local.get $0)
+        (local.get $4)
+        (i32.const 1)
+        (i32.add
+         (i32.and
+          (i32.load offset=36
+           (local.get $0)
+          )
+          (i32.const 3)
+         )
+         (i32.const 2)
+        )
+       )
+       (i32.const 1)
+      )
+      (i32.load8_u
+       (local.get $4)
+      )
+      (i32.const -1)
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $3)
+   )
+   (local.get $1)
   )
-  (func $27 (;40;) (type $11) (param $0 f64) (param $1 i32) (result f64)
-    local.get $0
-    local.get $1
-    call $28
+ )
+ (func $32 (; 45 ;) (type $4) (param $0 i32) (param $1 i32) (result i32)
+  (local $2 i32)
+  (local $3 i32)
+  (block $label$1 (result i32)
+   (block $label$2
+    (block $label$3
+     (br_if $label$3
+      (i32.lt_s
+       (i32.load offset=76
+        (local.get $1)
+       )
+       (i32.const 0)
+      )
+     )
+     (br_if $label$3
+      (i32.eqz
+       (call $20
+        (local.get $1)
+       )
+      )
+     )
+     (local.set $0
+      (block $label$4 (result i32)
+       (block $label$5
+        (br_if $label$5
+         (i32.eq
+          (i32.load8_s offset=75
+           (local.get $1)
+          )
+          (local.get $0)
+         )
+        )
+        (br_if $label$5
+         (i32.ge_u
+          (local.tee $2
+           (i32.load
+            (local.tee $3
+             (i32.add
+              (local.get $1)
+              (i32.const 20)
+             )
+            )
+           )
+          )
+          (i32.load offset=16
+           (local.get $1)
+          )
+         )
+        )
+        (i32.store
+         (local.get $3)
+         (i32.add
+          (local.get $2)
+          (i32.const 1)
+         )
+        )
+        (i32.store8
+         (local.get $2)
+         (local.get $0)
+        )
+        (br $label$4
+         (i32.and
+          (local.get $0)
+          (i32.const 255)
+         )
+        )
+       )
+       (call $31
+        (local.get $1)
+        (local.get $0)
+       )
+      )
+     )
+     (call $13
+      (local.get $1)
+     )
+     (br $label$2)
+    )
+    (if
+     (i32.ne
+      (i32.load8_s offset=75
+       (local.get $1)
+      )
+      (local.get $0)
+     )
+     (if
+      (i32.lt_u
+       (local.tee $2
+        (i32.load
+         (local.tee $3
+          (i32.add
+           (local.get $1)
+           (i32.const 20)
+          )
+         )
+        )
+       )
+       (i32.load offset=16
+        (local.get $1)
+       )
+      )
+      (block
+       (i32.store
+        (local.get $3)
+        (i32.add
+         (local.get $2)
+         (i32.const 1)
+        )
+       )
+       (i32.store8
+        (local.get $2)
+        (local.get $0)
+       )
+       (local.set $0
+        (i32.and
+         (local.get $0)
+         (i32.const 255)
+        )
+       )
+       (br $label$2)
+      )
+     )
+    )
+    (local.set $0
+     (call $31
+      (local.get $1)
+      (local.get $0)
+     )
+    )
+   )
+   (local.get $0)
   )
-  (func $28 (;41;) (type $11) (param $0 f64) (param $1 i32) (result f64)
-    (local $2 i64) (local $3 i64)
-    block $label$1 (result f64) ;; label = @1
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            block $label$5 ;; label = @5
-              local.get $0
-              i64.reinterpret_f64
-              local.tee $2
-              i64.const 52
-              i64.shr_u
-              local.tee $3
-              i32.wrap_i64
-              i32.const 65535
-              i32.and
-              i32.const 2047
-              i32.and
-              i32.const 16
-              i32.shl
-              i32.const 16
-              i32.shr_s
-              i32.const 0
-              i32.sub
-              br_table 0 (;@5;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 1 (;@4;) 2 (;@3;)
-            end
-            local.get $1
-            local.get $0
-            f64.const 0x0p+0 (;=0;)
-            f64.ne
-            if (result i32) ;; label = @5
-              block (result i32) ;; label = @6
-                local.get $0
-                f64.const 0x1p+64 (;=18446744073709552000;)
-                f64.mul
-                local.get $1
-                call $28
-                local.set $0
-                local.get $1
-                i32.load
-                i32.const -64
-                i32.add
-              end
-            else
-              i32.const 0
-            end
-            i32.store
-            br 2 (;@2;)
-          end
-          br 1 (;@2;)
-        end
-        local.get $1
-        local.get $3
-        i32.wrap_i64
-        i32.const 2047
-        i32.and
-        i32.const -1022
-        i32.add
-        i32.store
-        local.get $2
-        i64.const -9218868437227405313
-        i64.and
-        i64.const 4602678819172646912
-        i64.or
-        f64.reinterpret_i64
-        local.set $0
-      end
-      local.get $0
-    end
+ )
+ (func $33 (; 46 ;) (type $4) (param $0 i32) (param $1 i32) (result i32)
+  (local $2 i32)
+  (local $3 i32)
+  (block $label$1 (result i32)
+   (local.set $2
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 16)
+    )
+   )
+   (i32.store
+    (local.tee $3
+     (local.get $2)
+    )
+    (local.get $1)
+   )
+   (local.set $0
+    (call $18
+     (i32.load
+      (i32.const 1024)
+     )
+     (local.get $0)
+     (local.get $3)
+    )
+   )
+   (global.set $global$1
+    (local.get $2)
+   )
+   (local.get $0)
   )
-  (func $29 (;42;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $0
-      if (result i32) ;; label = @2
-        block (result i32) ;; label = @3
-          local.get $1
-          i32.const 128
-          i32.lt_u
-          if ;; label = @4
-            block ;; label = @5
-              local.get $0
-              local.get $1
-              i32.store8
-              i32.const 1
-              br 4 (;@1;)
-            end
-          end
-          local.get $1
-          i32.const 2048
-          i32.lt_u
-          if ;; label = @4
-            block ;; label = @5
-              local.get $0
-              local.get $1
-              i32.const 6
-              i32.shr_u
-              i32.const 192
-              i32.or
-              i32.store8
-              local.get $0
-              local.get $1
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=1
-              i32.const 2
-              br 4 (;@1;)
-            end
-          end
-          local.get $1
-          i32.const 55296
-          i32.lt_u
-          local.get $1
-          i32.const -8192
-          i32.and
-          i32.const 57344
-          i32.eq
-          i32.or
-          if ;; label = @4
-            block ;; label = @5
-              local.get $0
-              local.get $1
-              i32.const 12
-              i32.shr_u
-              i32.const 224
-              i32.or
-              i32.store8
-              local.get $0
-              local.get $1
-              i32.const 6
-              i32.shr_u
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=1
-              local.get $0
-              local.get $1
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=2
-              i32.const 3
-              br 4 (;@1;)
-            end
-          end
-          local.get $1
-          i32.const -65536
-          i32.add
-          i32.const 1048576
-          i32.lt_u
-          if (result i32) ;; label = @4
-            block (result i32) ;; label = @5
-              local.get $0
-              local.get $1
-              i32.const 18
-              i32.shr_u
-              i32.const 240
-              i32.or
-              i32.store8
-              local.get $0
-              local.get $1
-              i32.const 12
-              i32.shr_u
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=1
-              local.get $0
-              local.get $1
-              i32.const 6
-              i32.shr_u
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=2
-              local.get $0
-              local.get $1
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=3
-              i32.const 4
-            end
-          else
-            block (result i32) ;; label = @5
-              call $12
-              i32.const 84
-              i32.store
-              i32.const -1
-            end
-          end
-        end
-      else
-        i32.const 1
-      end
-    end
+ )
+ (func $34 (; 47 ;) (type $1) (param $0 i32) (result i32)
+  (call $32
+   (local.get $0)
+   (i32.load
+    (i32.const 1024)
+   )
   )
-  (func $30 (;43;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $0
-      i32.const 74
-      i32.add
-      local.tee $2
-      i32.load8_s
-      local.set $1
-      local.get $2
-      local.get $1
-      i32.const 255
-      i32.add
-      local.get $1
-      i32.or
-      i32.store8
-      local.get $0
-      i32.load
-      local.tee $1
-      i32.const 8
-      i32.and
-      if (result i32) ;; label = @2
-        block (result i32) ;; label = @3
-          local.get $0
-          local.get $1
-          i32.const 32
-          i32.or
-          i32.store
-          i32.const -1
-        end
-      else
-        block (result i32) ;; label = @3
-          local.get $0
-          i32.const 0
-          i32.store offset=8
-          local.get $0
-          i32.const 0
-          i32.store offset=4
-          local.get $0
-          local.get $0
-          i32.load offset=44
-          local.tee $1
-          i32.store offset=28
-          local.get $0
-          local.get $1
-          i32.store offset=20
-          local.get $0
-          local.get $1
-          local.get $0
-          i32.load offset=48
-          i32.add
-          i32.store offset=16
-          i32.const 0
-        end
-      end
-      local.tee $0
-    end
+ )
+ (func $35 (; 48 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (local $15 i32)
+  (local $16 i32)
+  (local $17 i32)
+  (local $18 i32)
+  (local $19 i32)
+  (local $20 i32)
+  (local $21 i32)
+  (block $label$1 (result i32)
+   (local.set $14
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 16)
+    )
+   )
+   (local.set $18
+    (local.get $14)
+   )
+   (block $label$2
+    (if
+     (i32.lt_u
+      (local.get $0)
+      (i32.const 245)
+     )
+     (block
+      (local.set $3
+       (i32.and
+        (i32.add
+         (local.get $0)
+         (i32.const 11)
+        )
+        (i32.const -8)
+       )
+      )
+      (if
+       (i32.and
+        (local.tee $0
+         (i32.shr_u
+          (local.tee $8
+           (i32.load
+            (i32.const 3652)
+           )
+          )
+          (local.tee $2
+           (i32.shr_u
+            (if (result i32)
+             (i32.lt_u
+              (local.get $0)
+              (i32.const 11)
+             )
+             (local.tee $3
+              (i32.const 16)
+             )
+             (local.get $3)
+            )
+            (i32.const 3)
+           )
+          )
+         )
+        )
+        (i32.const 3)
+       )
+       (block
+        (local.set $4
+         (i32.load
+          (local.tee $1
+           (i32.add
+            (local.tee $7
+             (i32.load
+              (local.tee $3
+               (i32.add
+                (local.tee $2
+                 (i32.add
+                  (i32.shl
+                   (i32.shl
+                    (local.tee $5
+                     (i32.add
+                      (i32.xor
+                       (i32.and
+                        (local.get $0)
+                        (i32.const 1)
+                       )
+                       (i32.const 1)
+                      )
+                      (local.get $2)
+                     )
+                    )
+                    (i32.const 1)
+                   )
+                   (i32.const 2)
+                  )
+                  (i32.const 3692)
+                 )
+                )
+                (i32.const 8)
+               )
+              )
+             )
+            )
+            (i32.const 8)
+           )
+          )
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $2)
+          (local.get $4)
+         )
+         (i32.store
+          (i32.const 3652)
+          (i32.and
+           (local.get $8)
+           (i32.xor
+            (i32.shl
+             (i32.const 1)
+             (local.get $5)
+            )
+            (i32.const -1)
+           )
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $4)
+            (i32.load
+             (i32.const 3668)
+            )
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.eq
+            (i32.load
+             (local.tee $0
+              (i32.add
+               (local.get $4)
+               (i32.const 12)
+              )
+             )
+            )
+            (local.get $7)
+           )
+           (block
+            (i32.store
+             (local.get $0)
+             (local.get $2)
+            )
+            (i32.store
+             (local.get $3)
+             (local.get $4)
+            )
+           )
+           (call $fimport$10)
+          )
+         )
+        )
+        (i32.store offset=4
+         (local.get $7)
+         (i32.or
+          (local.tee $0
+           (i32.shl
+            (local.get $5)
+            (i32.const 3)
+           )
+          )
+          (i32.const 3)
+         )
+        )
+        (i32.store
+         (local.tee $0
+          (i32.add
+           (i32.add
+            (local.get $7)
+            (local.get $0)
+           )
+           (i32.const 4)
+          )
+         )
+         (i32.or
+          (i32.load
+           (local.get $0)
+          )
+          (i32.const 1)
+         )
+        )
+        (global.set $global$1
+         (local.get $14)
+        )
+        (return
+         (local.get $1)
+        )
+       )
+      )
+      (if
+       (i32.gt_u
+        (local.get $3)
+        (local.tee $16
+         (i32.load
+          (i32.const 3660)
+         )
+        )
+       )
+       (block
+        (if
+         (local.get $0)
+         (block
+          (local.set $5
+           (i32.and
+            (i32.shr_u
+             (local.tee $0
+              (i32.add
+               (i32.and
+                (local.tee $0
+                 (i32.and
+                  (i32.shl
+                   (local.get $0)
+                   (local.get $2)
+                  )
+                  (i32.or
+                   (local.tee $0
+                    (i32.shl
+                     (i32.const 2)
+                     (local.get $2)
+                    )
+                   )
+                   (i32.sub
+                    (i32.const 0)
+                    (local.get $0)
+                   )
+                  )
+                 )
+                )
+                (i32.sub
+                 (i32.const 0)
+                 (local.get $0)
+                )
+               )
+               (i32.const -1)
+              )
+             )
+             (i32.const 12)
+            )
+            (i32.const 16)
+           )
+          )
+          (local.set $12
+           (i32.load
+            (local.tee $5
+             (i32.add
+              (local.tee $9
+               (i32.load
+                (local.tee $2
+                 (i32.add
+                  (local.tee $4
+                   (i32.add
+                    (i32.shl
+                     (i32.shl
+                      (local.tee $11
+                       (i32.add
+                        (i32.or
+                         (i32.or
+                          (i32.or
+                           (i32.or
+                            (local.tee $0
+                             (i32.and
+                              (i32.shr_u
+                               (local.tee $2
+                                (i32.shr_u
+                                 (local.get $0)
+                                 (local.get $5)
+                                )
+                               )
+                               (i32.const 5)
+                              )
+                              (i32.const 8)
+                             )
+                            )
+                            (local.get $5)
+                           )
+                           (local.tee $0
+                            (i32.and
+                             (i32.shr_u
+                              (local.tee $2
+                               (i32.shr_u
+                                (local.get $2)
+                                (local.get $0)
+                               )
+                              )
+                              (i32.const 2)
+                             )
+                             (i32.const 4)
+                            )
+                           )
+                          )
+                          (local.tee $0
+                           (i32.and
+                            (i32.shr_u
+                             (local.tee $2
+                              (i32.shr_u
+                               (local.get $2)
+                               (local.get $0)
+                              )
+                             )
+                             (i32.const 1)
+                            )
+                            (i32.const 2)
+                           )
+                          )
+                         )
+                         (local.tee $0
+                          (i32.and
+                           (i32.shr_u
+                            (local.tee $2
+                             (i32.shr_u
+                              (local.get $2)
+                              (local.get $0)
+                             )
+                            )
+                            (i32.const 1)
+                           )
+                           (i32.const 1)
+                          )
+                         )
+                        )
+                        (i32.shr_u
+                         (local.get $2)
+                         (local.get $0)
+                        )
+                       )
+                      )
+                      (i32.const 1)
+                     )
+                     (i32.const 2)
+                    )
+                    (i32.const 3692)
+                   )
+                  )
+                  (i32.const 8)
+                 )
+                )
+               )
+              )
+              (i32.const 8)
+             )
+            )
+           )
+          )
+          (if
+           (i32.eq
+            (local.get $4)
+            (local.get $12)
+           )
+           (i32.store
+            (i32.const 3652)
+            (local.tee $7
+             (i32.and
+              (local.get $8)
+              (i32.xor
+               (i32.shl
+                (i32.const 1)
+                (local.get $11)
+               )
+               (i32.const -1)
+              )
+             )
+            )
+           )
+           (block
+            (if
+             (i32.lt_u
+              (local.get $12)
+              (i32.load
+               (i32.const 3668)
+              )
+             )
+             (call $fimport$10)
+            )
+            (if
+             (i32.eq
+              (i32.load
+               (local.tee $0
+                (i32.add
+                 (local.get $12)
+                 (i32.const 12)
+                )
+               )
+              )
+              (local.get $9)
+             )
+             (block
+              (i32.store
+               (local.get $0)
+               (local.get $4)
+              )
+              (i32.store
+               (local.get $2)
+               (local.get $12)
+              )
+              (local.set $7
+               (local.get $8)
+              )
+             )
+             (call $fimport$10)
+            )
+           )
+          )
+          (i32.store offset=4
+           (local.get $9)
+           (i32.or
+            (local.get $3)
+            (i32.const 3)
+           )
+          )
+          (i32.store offset=4
+           (local.tee $4
+            (i32.add
+             (local.get $9)
+             (local.get $3)
+            )
+           )
+           (i32.or
+            (local.tee $11
+             (i32.sub
+              (i32.shl
+               (local.get $11)
+               (i32.const 3)
+              )
+              (local.get $3)
+             )
+            )
+            (i32.const 1)
+           )
+          )
+          (i32.store
+           (i32.add
+            (local.get $4)
+            (local.get $11)
+           )
+           (local.get $11)
+          )
+          (if
+           (local.get $16)
+           (block
+            (local.set $9
+             (i32.load
+              (i32.const 3672)
+             )
+            )
+            (local.set $2
+             (i32.add
+              (i32.shl
+               (i32.shl
+                (local.tee $0
+                 (i32.shr_u
+                  (local.get $16)
+                  (i32.const 3)
+                 )
+                )
+                (i32.const 1)
+               )
+               (i32.const 2)
+              )
+              (i32.const 3692)
+             )
+            )
+            (if
+             (i32.and
+              (local.get $7)
+              (local.tee $0
+               (i32.shl
+                (i32.const 1)
+                (local.get $0)
+               )
+              )
+             )
+             (if
+              (i32.lt_u
+               (local.tee $0
+                (i32.load
+                 (local.tee $3
+                  (i32.add
+                   (local.get $2)
+                   (i32.const 8)
+                  )
+                 )
+                )
+               )
+               (i32.load
+                (i32.const 3668)
+               )
+              )
+              (call $fimport$10)
+              (block
+               (local.set $6
+                (local.get $3)
+               )
+               (local.set $1
+                (local.get $0)
+               )
+              )
+             )
+             (block
+              (i32.store
+               (i32.const 3652)
+               (i32.or
+                (local.get $7)
+                (local.get $0)
+               )
+              )
+              (local.set $6
+               (i32.add
+                (local.get $2)
+                (i32.const 8)
+               )
+              )
+              (local.set $1
+               (local.get $2)
+              )
+             )
+            )
+            (i32.store
+             (local.get $6)
+             (local.get $9)
+            )
+            (i32.store offset=12
+             (local.get $1)
+             (local.get $9)
+            )
+            (i32.store offset=8
+             (local.get $9)
+             (local.get $1)
+            )
+            (i32.store offset=12
+             (local.get $9)
+             (local.get $2)
+            )
+           )
+          )
+          (i32.store
+           (i32.const 3660)
+           (local.get $11)
+          )
+          (i32.store
+           (i32.const 3672)
+           (local.get $4)
+          )
+          (global.set $global$1
+           (local.get $14)
+          )
+          (return
+           (local.get $5)
+          )
+         )
+        )
+        (if
+         (local.tee $6
+          (i32.load
+           (i32.const 3656)
+          )
+         )
+         (block
+          (local.set $2
+           (i32.and
+            (i32.shr_u
+             (local.tee $0
+              (i32.add
+               (i32.and
+                (local.get $6)
+                (i32.sub
+                 (i32.const 0)
+                 (local.get $6)
+                )
+               )
+               (i32.const -1)
+              )
+             )
+             (i32.const 12)
+            )
+            (i32.const 16)
+           )
+          )
+          (local.set $9
+           (i32.sub
+            (i32.and
+             (i32.load offset=4
+              (local.tee $2
+               (i32.load
+                (i32.add
+                 (i32.shl
+                  (i32.add
+                   (i32.or
+                    (i32.or
+                     (i32.or
+                      (i32.or
+                       (local.tee $0
+                        (i32.and
+                         (i32.shr_u
+                          (local.tee $1
+                           (i32.shr_u
+                            (local.get $0)
+                            (local.get $2)
+                           )
+                          )
+                          (i32.const 5)
+                         )
+                         (i32.const 8)
+                        )
+                       )
+                       (local.get $2)
+                      )
+                      (local.tee $0
+                       (i32.and
+                        (i32.shr_u
+                         (local.tee $1
+                          (i32.shr_u
+                           (local.get $1)
+                           (local.get $0)
+                          )
+                         )
+                         (i32.const 2)
+                        )
+                        (i32.const 4)
+                       )
+                      )
+                     )
+                     (local.tee $0
+                      (i32.and
+                       (i32.shr_u
+                        (local.tee $1
+                         (i32.shr_u
+                          (local.get $1)
+                          (local.get $0)
+                         )
+                        )
+                        (i32.const 1)
+                       )
+                       (i32.const 2)
+                      )
+                     )
+                    )
+                    (local.tee $0
+                     (i32.and
+                      (i32.shr_u
+                       (local.tee $1
+                        (i32.shr_u
+                         (local.get $1)
+                         (local.get $0)
+                        )
+                       )
+                       (i32.const 1)
+                      )
+                      (i32.const 1)
+                     )
+                    )
+                   )
+                   (i32.shr_u
+                    (local.get $1)
+                    (local.get $0)
+                   )
+                  )
+                  (i32.const 2)
+                 )
+                 (i32.const 3956)
+                )
+               )
+              )
+             )
+             (i32.const -8)
+            )
+            (local.get $3)
+           )
+          )
+          (local.set $1
+           (local.get $2)
+          )
+          (loop $label$25
+           (block $label$26
+            (if
+             (i32.eqz
+              (local.tee $0
+               (i32.load offset=16
+                (local.get $1)
+               )
+              )
+             )
+             (br_if $label$26
+              (i32.eqz
+               (local.tee $0
+                (i32.load offset=20
+                 (local.get $1)
+                )
+               )
+              )
+             )
+            )
+            (if
+             (local.tee $7
+              (i32.lt_u
+               (local.tee $1
+                (i32.sub
+                 (i32.and
+                  (i32.load offset=4
+                   (local.get $0)
+                  )
+                  (i32.const -8)
+                 )
+                 (local.get $3)
+                )
+               )
+               (local.get $9)
+              )
+             )
+             (local.set $9
+              (local.get $1)
+             )
+            )
+            (local.set $1
+             (local.get $0)
+            )
+            (if
+             (local.get $7)
+             (local.set $2
+              (local.get $0)
+             )
+            )
+            (br $label$25)
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.get $2)
+            (local.tee $12
+             (i32.load
+              (i32.const 3668)
+             )
+            )
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.ge_u
+            (local.get $2)
+            (local.tee $13
+             (i32.add
+              (local.get $2)
+              (local.get $3)
+             )
+            )
+           )
+           (call $fimport$10)
+          )
+          (local.set $15
+           (i32.load offset=24
+            (local.get $2)
+           )
+          )
+          (block $label$32
+           (if
+            (i32.eq
+             (local.tee $0
+              (i32.load offset=12
+               (local.get $2)
+              )
+             )
+             (local.get $2)
+            )
+            (block
+             (if
+              (i32.eqz
+               (local.tee $0
+                (i32.load
+                 (local.tee $1
+                  (i32.add
+                   (local.get $2)
+                   (i32.const 20)
+                  )
+                 )
+                )
+               )
+              )
+              (if
+               (i32.eqz
+                (local.tee $0
+                 (i32.load
+                  (local.tee $1
+                   (i32.add
+                    (local.get $2)
+                    (i32.const 16)
+                   )
+                  )
+                 )
+                )
+               )
+               (block
+                (local.set $4
+                 (i32.const 0)
+                )
+                (br $label$32)
+               )
+              )
+             )
+             (loop $label$36
+              (if
+               (local.tee $7
+                (i32.load
+                 (local.tee $11
+                  (i32.add
+                   (local.get $0)
+                   (i32.const 20)
+                  )
+                 )
+                )
+               )
+               (block
+                (local.set $0
+                 (local.get $7)
+                )
+                (local.set $1
+                 (local.get $11)
+                )
+                (br $label$36)
+               )
+              )
+              (if
+               (local.tee $7
+                (i32.load
+                 (local.tee $11
+                  (i32.add
+                   (local.get $0)
+                   (i32.const 16)
+                  )
+                 )
+                )
+               )
+               (block
+                (local.set $0
+                 (local.get $7)
+                )
+                (local.set $1
+                 (local.get $11)
+                )
+                (br $label$36)
+               )
+              )
+             )
+             (if
+              (i32.lt_u
+               (local.get $1)
+               (local.get $12)
+              )
+              (call $fimport$10)
+              (block
+               (i32.store
+                (local.get $1)
+                (i32.const 0)
+               )
+               (local.set $4
+                (local.get $0)
+               )
+              )
+             )
+            )
+            (block
+             (if
+              (i32.lt_u
+               (local.tee $11
+                (i32.load offset=8
+                 (local.get $2)
+                )
+               )
+               (local.get $12)
+              )
+              (call $fimport$10)
+             )
+             (if
+              (i32.ne
+               (i32.load
+                (local.tee $7
+                 (i32.add
+                  (local.get $11)
+                  (i32.const 12)
+                 )
+                )
+               )
+               (local.get $2)
+              )
+              (call $fimport$10)
+             )
+             (if
+              (i32.eq
+               (i32.load
+                (local.tee $1
+                 (i32.add
+                  (local.get $0)
+                  (i32.const 8)
+                 )
+                )
+               )
+               (local.get $2)
+              )
+              (block
+               (i32.store
+                (local.get $7)
+                (local.get $0)
+               )
+               (i32.store
+                (local.get $1)
+                (local.get $11)
+               )
+               (local.set $4
+                (local.get $0)
+               )
+              )
+              (call $fimport$10)
+             )
+            )
+           )
+          )
+          (block $label$46
+           (if
+            (local.get $15)
+            (block
+             (if
+              (i32.eq
+               (local.get $2)
+               (i32.load
+                (local.tee $0
+                 (i32.add
+                  (i32.shl
+                   (local.tee $1
+                    (i32.load offset=28
+                     (local.get $2)
+                    )
+                   )
+                   (i32.const 2)
+                  )
+                  (i32.const 3956)
+                 )
+                )
+               )
+              )
+              (block
+               (i32.store
+                (local.get $0)
+                (local.get $4)
+               )
+               (if
+                (i32.eqz
+                 (local.get $4)
+                )
+                (block
+                 (i32.store
+                  (i32.const 3656)
+                  (i32.and
+                   (local.get $6)
+                   (i32.xor
+                    (i32.shl
+                     (i32.const 1)
+                     (local.get $1)
+                    )
+                    (i32.const -1)
+                   )
+                  )
+                 )
+                 (br $label$46)
+                )
+               )
+              )
+              (block
+               (if
+                (i32.lt_u
+                 (local.get $15)
+                 (i32.load
+                  (i32.const 3668)
+                 )
+                )
+                (call $fimport$10)
+               )
+               (if
+                (i32.eq
+                 (i32.load
+                  (local.tee $0
+                   (i32.add
+                    (local.get $15)
+                    (i32.const 16)
+                   )
+                  )
+                 )
+                 (local.get $2)
+                )
+                (i32.store
+                 (local.get $0)
+                 (local.get $4)
+                )
+                (i32.store offset=20
+                 (local.get $15)
+                 (local.get $4)
+                )
+               )
+               (br_if $label$46
+                (i32.eqz
+                 (local.get $4)
+                )
+               )
+              )
+             )
+             (if
+              (i32.lt_u
+               (local.get $4)
+               (local.tee $0
+                (i32.load
+                 (i32.const 3668)
+                )
+               )
+              )
+              (call $fimport$10)
+             )
+             (i32.store offset=24
+              (local.get $4)
+              (local.get $15)
+             )
+             (if
+              (local.tee $1
+               (i32.load offset=16
+                (local.get $2)
+               )
+              )
+              (if
+               (i32.lt_u
+                (local.get $1)
+                (local.get $0)
+               )
+               (call $fimport$10)
+               (block
+                (i32.store offset=16
+                 (local.get $4)
+                 (local.get $1)
+                )
+                (i32.store offset=24
+                 (local.get $1)
+                 (local.get $4)
+                )
+               )
+              )
+             )
+             (if
+              (local.tee $0
+               (i32.load offset=20
+                (local.get $2)
+               )
+              )
+              (if
+               (i32.lt_u
+                (local.get $0)
+                (i32.load
+                 (i32.const 3668)
+                )
+               )
+               (call $fimport$10)
+               (block
+                (i32.store offset=20
+                 (local.get $4)
+                 (local.get $0)
+                )
+                (i32.store offset=24
+                 (local.get $0)
+                 (local.get $4)
+                )
+               )
+              )
+             )
+            )
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.get $9)
+            (i32.const 16)
+           )
+           (block
+            (i32.store offset=4
+             (local.get $2)
+             (i32.or
+              (local.tee $0
+               (i32.add
+                (local.get $9)
+                (local.get $3)
+               )
+              )
+              (i32.const 3)
+             )
+            )
+            (i32.store
+             (local.tee $0
+              (i32.add
+               (i32.add
+                (local.get $2)
+                (local.get $0)
+               )
+               (i32.const 4)
+              )
+             )
+             (i32.or
+              (i32.load
+               (local.get $0)
+              )
+              (i32.const 1)
+             )
+            )
+           )
+           (block
+            (i32.store offset=4
+             (local.get $2)
+             (i32.or
+              (local.get $3)
+              (i32.const 3)
+             )
+            )
+            (i32.store offset=4
+             (local.get $13)
+             (i32.or
+              (local.get $9)
+              (i32.const 1)
+             )
+            )
+            (i32.store
+             (i32.add
+              (local.get $13)
+              (local.get $9)
+             )
+             (local.get $9)
+            )
+            (if
+             (local.get $16)
+             (block
+              (local.set $7
+               (i32.load
+                (i32.const 3672)
+               )
+              )
+              (local.set $3
+               (i32.add
+                (i32.shl
+                 (i32.shl
+                  (local.tee $0
+                   (i32.shr_u
+                    (local.get $16)
+                    (i32.const 3)
+                   )
+                  )
+                  (i32.const 1)
+                 )
+                 (i32.const 2)
+                )
+                (i32.const 3692)
+               )
+              )
+              (if
+               (i32.and
+                (local.get $8)
+                (local.tee $0
+                 (i32.shl
+                  (i32.const 1)
+                  (local.get $0)
+                 )
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.tee $0
+                  (i32.load
+                   (local.tee $1
+                    (i32.add
+                     (local.get $3)
+                     (i32.const 8)
+                    )
+                   )
+                  )
+                 )
+                 (i32.load
+                  (i32.const 3668)
+                 )
+                )
+                (call $fimport$10)
+                (block
+                 (local.set $10
+                  (local.get $1)
+                 )
+                 (local.set $5
+                  (local.get $0)
+                 )
+                )
+               )
+               (block
+                (i32.store
+                 (i32.const 3652)
+                 (i32.or
+                  (local.get $8)
+                  (local.get $0)
+                 )
+                )
+                (local.set $10
+                 (i32.add
+                  (local.get $3)
+                  (i32.const 8)
+                 )
+                )
+                (local.set $5
+                 (local.get $3)
+                )
+               )
+              )
+              (i32.store
+               (local.get $10)
+               (local.get $7)
+              )
+              (i32.store offset=12
+               (local.get $5)
+               (local.get $7)
+              )
+              (i32.store offset=8
+               (local.get $7)
+               (local.get $5)
+              )
+              (i32.store offset=12
+               (local.get $7)
+               (local.get $3)
+              )
+             )
+            )
+            (i32.store
+             (i32.const 3660)
+             (local.get $9)
+            )
+            (i32.store
+             (i32.const 3672)
+             (local.get $13)
+            )
+           )
+          )
+          (global.set $global$1
+           (local.get $14)
+          )
+          (return
+           (i32.add
+            (local.get $2)
+            (i32.const 8)
+           )
+          )
+         )
+         (local.set $0
+          (local.get $3)
+         )
+        )
+       )
+       (local.set $0
+        (local.get $3)
+       )
+      )
+     )
+     (if
+      (i32.gt_u
+       (local.get $0)
+       (i32.const -65)
+      )
+      (local.set $0
+       (i32.const -1)
+      )
+      (block
+       (local.set $7
+        (i32.and
+         (local.tee $0
+          (i32.add
+           (local.get $0)
+           (i32.const 11)
+          )
+         )
+         (i32.const -8)
+        )
+       )
+       (if
+        (local.tee $5
+         (i32.load
+          (i32.const 3656)
+         )
+        )
+        (block
+         (local.set $17
+          (if (result i32)
+           (local.tee $0
+            (i32.shr_u
+             (local.get $0)
+             (i32.const 8)
+            )
+           )
+           (if (result i32)
+            (i32.gt_u
+             (local.get $7)
+             (i32.const 16777215)
+            )
+            (i32.const 31)
+            (i32.or
+             (i32.and
+              (i32.shr_u
+               (local.get $7)
+               (i32.add
+                (local.tee $0
+                 (i32.add
+                  (i32.sub
+                   (i32.const 14)
+                   (i32.or
+                    (i32.or
+                     (local.tee $0
+                      (i32.and
+                       (i32.shr_u
+                        (i32.add
+                         (local.tee $1
+                          (i32.shl
+                           (local.get $0)
+                           (local.tee $3
+                            (i32.and
+                             (i32.shr_u
+                              (i32.add
+                               (local.get $0)
+                               (i32.const 1048320)
+                              )
+                              (i32.const 16)
+                             )
+                             (i32.const 8)
+                            )
+                           )
+                          )
+                         )
+                         (i32.const 520192)
+                        )
+                        (i32.const 16)
+                       )
+                       (i32.const 4)
+                      )
+                     )
+                     (local.get $3)
+                    )
+                    (local.tee $0
+                     (i32.and
+                      (i32.shr_u
+                       (i32.add
+                        (local.tee $1
+                         (i32.shl
+                          (local.get $1)
+                          (local.get $0)
+                         )
+                        )
+                        (i32.const 245760)
+                       )
+                       (i32.const 16)
+                      )
+                      (i32.const 2)
+                     )
+                    )
+                   )
+                  )
+                  (i32.shr_u
+                   (i32.shl
+                    (local.get $1)
+                    (local.get $0)
+                   )
+                   (i32.const 15)
+                  )
+                 )
+                )
+                (i32.const 7)
+               )
+              )
+              (i32.const 1)
+             )
+             (i32.shl
+              (local.get $0)
+              (i32.const 1)
+             )
+            )
+           )
+           (i32.const 0)
+          )
+         )
+         (local.set $3
+          (i32.sub
+           (i32.const 0)
+           (local.get $7)
+          )
+         )
+         (block $label$78
+          (block $label$79
+           (block $label$80
+            (if
+             (local.tee $1
+              (i32.load
+               (i32.add
+                (i32.shl
+                 (local.get $17)
+                 (i32.const 2)
+                )
+                (i32.const 3956)
+               )
+              )
+             )
+             (block
+              (local.set $0
+               (i32.sub
+                (i32.const 25)
+                (i32.shr_u
+                 (local.get $17)
+                 (i32.const 1)
+                )
+               )
+              )
+              (local.set $4
+               (i32.const 0)
+              )
+              (local.set $10
+               (i32.shl
+                (local.get $7)
+                (if (result i32)
+                 (i32.eq
+                  (local.get $17)
+                  (i32.const 31)
+                 )
+                 (i32.const 0)
+                 (local.get $0)
+                )
+               )
+              )
+              (local.set $0
+               (i32.const 0)
+              )
+              (loop $label$84
+               (if
+                (i32.lt_u
+                 (local.tee $6
+                  (i32.sub
+                   (i32.and
+                    (i32.load offset=4
+                     (local.get $1)
+                    )
+                    (i32.const -8)
+                   )
+                   (local.get $7)
+                  )
+                 )
+                 (local.get $3)
+                )
+                (if
+                 (local.get $6)
+                 (block
+                  (local.set $3
+                   (local.get $6)
+                  )
+                  (local.set $0
+                   (local.get $1)
+                  )
+                 )
+                 (block
+                  (local.set $3
+                   (i32.const 0)
+                  )
+                  (local.set $0
+                   (local.get $1)
+                  )
+                  (br $label$79)
+                 )
+                )
+               )
+               (local.set $1
+                (if (result i32)
+                 (i32.or
+                  (i32.eqz
+                   (local.tee $19
+                    (i32.load offset=20
+                     (local.get $1)
+                    )
+                   )
+                  )
+                  (i32.eq
+                   (local.get $19)
+                   (local.tee $6
+                    (i32.load
+                     (i32.add
+                      (i32.add
+                       (local.get $1)
+                       (i32.const 16)
+                      )
+                      (i32.shl
+                       (i32.shr_u
+                        (local.get $10)
+                        (i32.const 31)
+                       )
+                       (i32.const 2)
+                      )
+                     )
+                    )
+                   )
+                  )
+                 )
+                 (local.get $4)
+                 (local.get $19)
+                )
+               )
+               (local.set $10
+                (i32.shl
+                 (local.get $10)
+                 (i32.xor
+                  (i32.and
+                   (local.tee $4
+                    (i32.eqz
+                     (local.get $6)
+                    )
+                   )
+                   (i32.const 1)
+                  )
+                  (i32.const 1)
+                 )
+                )
+               )
+               (if
+                (local.get $4)
+                (block
+                 (local.set $4
+                  (local.get $1)
+                 )
+                 (local.set $1
+                  (local.get $0)
+                 )
+                 (br $label$80)
+                )
+                (block
+                 (local.set $4
+                  (local.get $1)
+                 )
+                 (local.set $1
+                  (local.get $6)
+                 )
+                 (br $label$84)
+                )
+               )
+              )
+             )
+             (block
+              (local.set $4
+               (i32.const 0)
+              )
+              (local.set $1
+               (i32.const 0)
+              )
+             )
+            )
+           )
+           (br_if $label$79
+            (local.tee $0
+             (if (result i32)
+              (i32.and
+               (i32.eqz
+                (local.get $4)
+               )
+               (i32.eqz
+                (local.get $1)
+               )
+              )
+              (block (result i32)
+               (if
+                (i32.eqz
+                 (local.tee $0
+                  (i32.and
+                   (local.get $5)
+                   (i32.or
+                    (local.tee $0
+                     (i32.shl
+                      (i32.const 2)
+                      (local.get $17)
+                     )
+                    )
+                    (i32.sub
+                     (i32.const 0)
+                     (local.get $0)
+                    )
+                   )
+                  )
+                 )
+                )
+                (block
+                 (local.set $0
+                  (local.get $7)
+                 )
+                 (br $label$2)
+                )
+               )
+               (local.set $10
+                (i32.and
+                 (i32.shr_u
+                  (local.tee $0
+                   (i32.add
+                    (i32.and
+                     (local.get $0)
+                     (i32.sub
+                      (i32.const 0)
+                      (local.get $0)
+                     )
+                    )
+                    (i32.const -1)
+                   )
+                  )
+                  (i32.const 12)
+                 )
+                 (i32.const 16)
+                )
+               )
+               (i32.load
+                (i32.add
+                 (i32.shl
+                  (i32.add
+                   (i32.or
+                    (i32.or
+                     (i32.or
+                      (i32.or
+                       (local.tee $0
+                        (i32.and
+                         (i32.shr_u
+                          (local.tee $4
+                           (i32.shr_u
+                            (local.get $0)
+                            (local.get $10)
+                           )
+                          )
+                          (i32.const 5)
+                         )
+                         (i32.const 8)
+                        )
+                       )
+                       (local.get $10)
+                      )
+                      (local.tee $0
+                       (i32.and
+                        (i32.shr_u
+                         (local.tee $4
+                          (i32.shr_u
+                           (local.get $4)
+                           (local.get $0)
+                          )
+                         )
+                         (i32.const 2)
+                        )
+                        (i32.const 4)
+                       )
+                      )
+                     )
+                     (local.tee $0
+                      (i32.and
+                       (i32.shr_u
+                        (local.tee $4
+                         (i32.shr_u
+                          (local.get $4)
+                          (local.get $0)
+                         )
+                        )
+                        (i32.const 1)
+                       )
+                       (i32.const 2)
+                      )
+                     )
+                    )
+                    (local.tee $0
+                     (i32.and
+                      (i32.shr_u
+                       (local.tee $4
+                        (i32.shr_u
+                         (local.get $4)
+                         (local.get $0)
+                        )
+                       )
+                       (i32.const 1)
+                      )
+                      (i32.const 1)
+                     )
+                    )
+                   )
+                   (i32.shr_u
+                    (local.get $4)
+                    (local.get $0)
+                   )
+                  )
+                  (i32.const 2)
+                 )
+                 (i32.const 3956)
+                )
+               )
+              )
+              (local.get $4)
+             )
+            )
+           )
+           (local.set $4
+            (local.get $1)
+           )
+           (br $label$78)
+          )
+          (loop $label$96
+           (if
+            (local.tee $10
+             (i32.lt_u
+              (local.tee $4
+               (i32.sub
+                (i32.and
+                 (i32.load offset=4
+                  (local.get $0)
+                 )
+                 (i32.const -8)
+                )
+                (local.get $7)
+               )
+              )
+              (local.get $3)
+             )
+            )
+            (local.set $3
+             (local.get $4)
+            )
+           )
+           (if
+            (local.get $10)
+            (local.set $1
+             (local.get $0)
+            )
+           )
+           (if
+            (local.tee $4
+             (i32.load offset=16
+              (local.get $0)
+             )
+            )
+            (block
+             (local.set $0
+              (local.get $4)
+             )
+             (br $label$96)
+            )
+           )
+           (br_if $label$96
+            (local.tee $0
+             (i32.load offset=20
+              (local.get $0)
+             )
+            )
+           )
+           (local.set $4
+            (local.get $1)
+           )
+          )
+         )
+         (if
+          (local.get $4)
+          (if
+           (i32.lt_u
+            (local.get $3)
+            (i32.sub
+             (i32.load
+              (i32.const 3660)
+             )
+             (local.get $7)
+            )
+           )
+           (block
+            (if
+             (i32.lt_u
+              (local.get $4)
+              (local.tee $12
+               (i32.load
+                (i32.const 3668)
+               )
+              )
+             )
+             (call $fimport$10)
+            )
+            (if
+             (i32.ge_u
+              (local.get $4)
+              (local.tee $6
+               (i32.add
+                (local.get $4)
+                (local.get $7)
+               )
+              )
+             )
+             (call $fimport$10)
+            )
+            (local.set $10
+             (i32.load offset=24
+              (local.get $4)
+             )
+            )
+            (block $label$104
+             (if
+              (i32.eq
+               (local.tee $0
+                (i32.load offset=12
+                 (local.get $4)
+                )
+               )
+               (local.get $4)
+              )
+              (block
+               (if
+                (i32.eqz
+                 (local.tee $0
+                  (i32.load
+                   (local.tee $1
+                    (i32.add
+                     (local.get $4)
+                     (i32.const 20)
+                    )
+                   )
+                  )
+                 )
+                )
+                (if
+                 (i32.eqz
+                  (local.tee $0
+                   (i32.load
+                    (local.tee $1
+                     (i32.add
+                      (local.get $4)
+                      (i32.const 16)
+                     )
+                    )
+                   )
+                  )
+                 )
+                 (block
+                  (local.set $13
+                   (i32.const 0)
+                  )
+                  (br $label$104)
+                 )
+                )
+               )
+               (loop $label$108
+                (if
+                 (local.tee $11
+                  (i32.load
+                   (local.tee $9
+                    (i32.add
+                     (local.get $0)
+                     (i32.const 20)
+                    )
+                   )
+                  )
+                 )
+                 (block
+                  (local.set $0
+                   (local.get $11)
+                  )
+                  (local.set $1
+                   (local.get $9)
+                  )
+                  (br $label$108)
+                 )
+                )
+                (if
+                 (local.tee $11
+                  (i32.load
+                   (local.tee $9
+                    (i32.add
+                     (local.get $0)
+                     (i32.const 16)
+                    )
+                   )
+                  )
+                 )
+                 (block
+                  (local.set $0
+                   (local.get $11)
+                  )
+                  (local.set $1
+                   (local.get $9)
+                  )
+                  (br $label$108)
+                 )
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.get $1)
+                 (local.get $12)
+                )
+                (call $fimport$10)
+                (block
+                 (i32.store
+                  (local.get $1)
+                  (i32.const 0)
+                 )
+                 (local.set $13
+                  (local.get $0)
+                 )
+                )
+               )
+              )
+              (block
+               (if
+                (i32.lt_u
+                 (local.tee $9
+                  (i32.load offset=8
+                   (local.get $4)
+                  )
+                 )
+                 (local.get $12)
+                )
+                (call $fimport$10)
+               )
+               (if
+                (i32.ne
+                 (i32.load
+                  (local.tee $11
+                   (i32.add
+                    (local.get $9)
+                    (i32.const 12)
+                   )
+                  )
+                 )
+                 (local.get $4)
+                )
+                (call $fimport$10)
+               )
+               (if
+                (i32.eq
+                 (i32.load
+                  (local.tee $1
+                   (i32.add
+                    (local.get $0)
+                    (i32.const 8)
+                   )
+                  )
+                 )
+                 (local.get $4)
+                )
+                (block
+                 (i32.store
+                  (local.get $11)
+                  (local.get $0)
+                 )
+                 (i32.store
+                  (local.get $1)
+                  (local.get $9)
+                 )
+                 (local.set $13
+                  (local.get $0)
+                 )
+                )
+                (call $fimport$10)
+               )
+              )
+             )
+            )
+            (block $label$118
+             (if
+              (local.get $10)
+              (block
+               (if
+                (i32.eq
+                 (local.get $4)
+                 (i32.load
+                  (local.tee $0
+                   (i32.add
+                    (i32.shl
+                     (local.tee $1
+                      (i32.load offset=28
+                       (local.get $4)
+                      )
+                     )
+                     (i32.const 2)
+                    )
+                    (i32.const 3956)
+                   )
+                  )
+                 )
+                )
+                (block
+                 (i32.store
+                  (local.get $0)
+                  (local.get $13)
+                 )
+                 (if
+                  (i32.eqz
+                   (local.get $13)
+                  )
+                  (block
+                   (i32.store
+                    (i32.const 3656)
+                    (local.tee $2
+                     (i32.and
+                      (local.get $5)
+                      (i32.xor
+                       (i32.shl
+                        (i32.const 1)
+                        (local.get $1)
+                       )
+                       (i32.const -1)
+                      )
+                     )
+                    )
+                   )
+                   (br $label$118)
+                  )
+                 )
+                )
+                (block
+                 (if
+                  (i32.lt_u
+                   (local.get $10)
+                   (i32.load
+                    (i32.const 3668)
+                   )
+                  )
+                  (call $fimport$10)
+                 )
+                 (if
+                  (i32.eq
+                   (i32.load
+                    (local.tee $0
+                     (i32.add
+                      (local.get $10)
+                      (i32.const 16)
+                     )
+                    )
+                   )
+                   (local.get $4)
+                  )
+                  (i32.store
+                   (local.get $0)
+                   (local.get $13)
+                  )
+                  (i32.store offset=20
+                   (local.get $10)
+                   (local.get $13)
+                  )
+                 )
+                 (if
+                  (i32.eqz
+                   (local.get $13)
+                  )
+                  (block
+                   (local.set $2
+                    (local.get $5)
+                   )
+                   (br $label$118)
+                  )
+                 )
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.get $13)
+                 (local.tee $0
+                  (i32.load
+                   (i32.const 3668)
+                  )
+                 )
+                )
+                (call $fimport$10)
+               )
+               (i32.store offset=24
+                (local.get $13)
+                (local.get $10)
+               )
+               (if
+                (local.tee $1
+                 (i32.load offset=16
+                  (local.get $4)
+                 )
+                )
+                (if
+                 (i32.lt_u
+                  (local.get $1)
+                  (local.get $0)
+                 )
+                 (call $fimport$10)
+                 (block
+                  (i32.store offset=16
+                   (local.get $13)
+                   (local.get $1)
+                  )
+                  (i32.store offset=24
+                   (local.get $1)
+                   (local.get $13)
+                  )
+                 )
+                )
+               )
+               (if
+                (local.tee $0
+                 (i32.load offset=20
+                  (local.get $4)
+                 )
+                )
+                (if
+                 (i32.lt_u
+                  (local.get $0)
+                  (i32.load
+                   (i32.const 3668)
+                  )
+                 )
+                 (call $fimport$10)
+                 (block
+                  (i32.store offset=20
+                   (local.get $13)
+                   (local.get $0)
+                  )
+                  (i32.store offset=24
+                   (local.get $0)
+                   (local.get $13)
+                  )
+                  (local.set $2
+                   (local.get $5)
+                  )
+                 )
+                )
+                (local.set $2
+                 (local.get $5)
+                )
+               )
+              )
+              (local.set $2
+               (local.get $5)
+              )
+             )
+            )
+            (block $label$136
+             (if
+              (i32.lt_u
+               (local.get $3)
+               (i32.const 16)
+              )
+              (block
+               (i32.store offset=4
+                (local.get $4)
+                (i32.or
+                 (local.tee $0
+                  (i32.add
+                   (local.get $3)
+                   (local.get $7)
+                  )
+                 )
+                 (i32.const 3)
+                )
+               )
+               (i32.store
+                (local.tee $0
+                 (i32.add
+                  (i32.add
+                   (local.get $4)
+                   (local.get $0)
+                  )
+                  (i32.const 4)
+                 )
+                )
+                (i32.or
+                 (i32.load
+                  (local.get $0)
+                 )
+                 (i32.const 1)
+                )
+               )
+              )
+              (block
+               (i32.store offset=4
+                (local.get $4)
+                (i32.or
+                 (local.get $7)
+                 (i32.const 3)
+                )
+               )
+               (i32.store offset=4
+                (local.get $6)
+                (i32.or
+                 (local.get $3)
+                 (i32.const 1)
+                )
+               )
+               (i32.store
+                (i32.add
+                 (local.get $6)
+                 (local.get $3)
+                )
+                (local.get $3)
+               )
+               (local.set $0
+                (i32.shr_u
+                 (local.get $3)
+                 (i32.const 3)
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.get $3)
+                 (i32.const 256)
+                )
+                (block
+                 (local.set $3
+                  (i32.add
+                   (i32.shl
+                    (i32.shl
+                     (local.get $0)
+                     (i32.const 1)
+                    )
+                    (i32.const 2)
+                   )
+                   (i32.const 3692)
+                  )
+                 )
+                 (if
+                  (i32.and
+                   (local.tee $1
+                    (i32.load
+                     (i32.const 3652)
+                    )
+                   )
+                   (local.tee $0
+                    (i32.shl
+                     (i32.const 1)
+                     (local.get $0)
+                    )
+                   )
+                  )
+                  (if
+                   (i32.lt_u
+                    (local.tee $0
+                     (i32.load
+                      (local.tee $1
+                       (i32.add
+                        (local.get $3)
+                        (i32.const 8)
+                       )
+                      )
+                     )
+                    )
+                    (i32.load
+                     (i32.const 3668)
+                    )
+                   )
+                   (call $fimport$10)
+                   (block
+                    (local.set $16
+                     (local.get $1)
+                    )
+                    (local.set $8
+                     (local.get $0)
+                    )
+                   )
+                  )
+                  (block
+                   (i32.store
+                    (i32.const 3652)
+                    (i32.or
+                     (local.get $1)
+                     (local.get $0)
+                    )
+                   )
+                   (local.set $16
+                    (i32.add
+                     (local.get $3)
+                     (i32.const 8)
+                    )
+                   )
+                   (local.set $8
+                    (local.get $3)
+                   )
+                  )
+                 )
+                 (i32.store
+                  (local.get $16)
+                  (local.get $6)
+                 )
+                 (i32.store offset=12
+                  (local.get $8)
+                  (local.get $6)
+                 )
+                 (i32.store offset=8
+                  (local.get $6)
+                  (local.get $8)
+                 )
+                 (i32.store offset=12
+                  (local.get $6)
+                  (local.get $3)
+                 )
+                 (br $label$136)
+                )
+               )
+               (local.set $1
+                (i32.add
+                 (i32.shl
+                  (local.tee $5
+                   (if (result i32)
+                    (local.tee $0
+                     (i32.shr_u
+                      (local.get $3)
+                      (i32.const 8)
+                     )
+                    )
+                    (if (result i32)
+                     (i32.gt_u
+                      (local.get $3)
+                      (i32.const 16777215)
+                     )
+                     (i32.const 31)
+                     (i32.or
+                      (i32.and
+                       (i32.shr_u
+                        (local.get $3)
+                        (i32.add
+                         (local.tee $0
+                          (i32.add
+                           (i32.sub
+                            (i32.const 14)
+                            (i32.or
+                             (i32.or
+                              (local.tee $0
+                               (i32.and
+                                (i32.shr_u
+                                 (i32.add
+                                  (local.tee $1
+                                   (i32.shl
+                                    (local.get $0)
+                                    (local.tee $5
+                                     (i32.and
+                                      (i32.shr_u
+                                       (i32.add
+                                        (local.get $0)
+                                        (i32.const 1048320)
+                                       )
+                                       (i32.const 16)
+                                      )
+                                      (i32.const 8)
+                                     )
+                                    )
+                                   )
+                                  )
+                                  (i32.const 520192)
+                                 )
+                                 (i32.const 16)
+                                )
+                                (i32.const 4)
+                               )
+                              )
+                              (local.get $5)
+                             )
+                             (local.tee $0
+                              (i32.and
+                               (i32.shr_u
+                                (i32.add
+                                 (local.tee $1
+                                  (i32.shl
+                                   (local.get $1)
+                                   (local.get $0)
+                                  )
+                                 )
+                                 (i32.const 245760)
+                                )
+                                (i32.const 16)
+                               )
+                               (i32.const 2)
+                              )
+                             )
+                            )
+                           )
+                           (i32.shr_u
+                            (i32.shl
+                             (local.get $1)
+                             (local.get $0)
+                            )
+                            (i32.const 15)
+                           )
+                          )
+                         )
+                         (i32.const 7)
+                        )
+                       )
+                       (i32.const 1)
+                      )
+                      (i32.shl
+                       (local.get $0)
+                       (i32.const 1)
+                      )
+                     )
+                    )
+                    (i32.const 0)
+                   )
+                  )
+                  (i32.const 2)
+                 )
+                 (i32.const 3956)
+                )
+               )
+               (i32.store offset=28
+                (local.get $6)
+                (local.get $5)
+               )
+               (i32.store offset=4
+                (local.tee $0
+                 (i32.add
+                  (local.get $6)
+                  (i32.const 16)
+                 )
+                )
+                (i32.const 0)
+               )
+               (i32.store
+                (local.get $0)
+                (i32.const 0)
+               )
+               (if
+                (i32.eqz
+                 (i32.and
+                  (local.get $2)
+                  (local.tee $0
+                   (i32.shl
+                    (i32.const 1)
+                    (local.get $5)
+                   )
+                  )
+                 )
+                )
+                (block
+                 (i32.store
+                  (i32.const 3656)
+                  (i32.or
+                   (local.get $2)
+                   (local.get $0)
+                  )
+                 )
+                 (i32.store
+                  (local.get $1)
+                  (local.get $6)
+                 )
+                 (i32.store offset=24
+                  (local.get $6)
+                  (local.get $1)
+                 )
+                 (i32.store offset=12
+                  (local.get $6)
+                  (local.get $6)
+                 )
+                 (i32.store offset=8
+                  (local.get $6)
+                  (local.get $6)
+                 )
+                 (br $label$136)
+                )
+               )
+               (local.set $0
+                (i32.load
+                 (local.get $1)
+                )
+               )
+               (local.set $1
+                (i32.sub
+                 (i32.const 25)
+                 (i32.shr_u
+                  (local.get $5)
+                  (i32.const 1)
+                 )
+                )
+               )
+               (local.set $5
+                (i32.shl
+                 (local.get $3)
+                 (if (result i32)
+                  (i32.eq
+                   (local.get $5)
+                   (i32.const 31)
+                  )
+                  (i32.const 0)
+                  (local.get $1)
+                 )
+                )
+               )
+               (block $label$151
+                (block $label$152
+                 (block $label$153
+                  (loop $label$154
+                   (br_if $label$152
+                    (i32.eq
+                     (i32.and
+                      (i32.load offset=4
+                       (local.get $0)
+                      )
+                      (i32.const -8)
+                     )
+                     (local.get $3)
+                    )
+                   )
+                   (local.set $2
+                    (i32.shl
+                     (local.get $5)
+                     (i32.const 1)
+                    )
+                   )
+                   (br_if $label$153
+                    (i32.eqz
+                     (local.tee $1
+                      (i32.load
+                       (local.tee $5
+                        (i32.add
+                         (i32.add
+                          (local.get $0)
+                          (i32.const 16)
+                         )
+                         (i32.shl
+                          (i32.shr_u
+                           (local.get $5)
+                           (i32.const 31)
+                          )
+                          (i32.const 2)
+                         )
+                        )
+                       )
+                      )
+                     )
+                    )
+                   )
+                   (local.set $5
+                    (local.get $2)
+                   )
+                   (local.set $0
+                    (local.get $1)
+                   )
+                   (br $label$154)
+                  )
+                 )
+                 (if
+                  (i32.lt_u
+                   (local.get $5)
+                   (i32.load
+                    (i32.const 3668)
+                   )
+                  )
+                  (call $fimport$10)
+                  (block
+                   (i32.store
+                    (local.get $5)
+                    (local.get $6)
+                   )
+                   (i32.store offset=24
+                    (local.get $6)
+                    (local.get $0)
+                   )
+                   (i32.store offset=12
+                    (local.get $6)
+                    (local.get $6)
+                   )
+                   (i32.store offset=8
+                    (local.get $6)
+                    (local.get $6)
+                   )
+                   (br $label$136)
+                  )
+                 )
+                 (br $label$151)
+                )
+                (if
+                 (i32.and
+                  (i32.ge_u
+                   (local.tee $2
+                    (i32.load
+                     (local.tee $3
+                      (i32.add
+                       (local.get $0)
+                       (i32.const 8)
+                      )
+                     )
+                    )
+                   )
+                   (local.tee $1
+                    (i32.load
+                     (i32.const 3668)
+                    )
+                   )
+                  )
+                  (i32.ge_u
+                   (local.get $0)
+                   (local.get $1)
+                  )
+                 )
+                 (block
+                  (i32.store offset=12
+                   (local.get $2)
+                   (local.get $6)
+                  )
+                  (i32.store
+                   (local.get $3)
+                   (local.get $6)
+                  )
+                  (i32.store offset=8
+                   (local.get $6)
+                   (local.get $2)
+                  )
+                  (i32.store offset=12
+                   (local.get $6)
+                   (local.get $0)
+                  )
+                  (i32.store offset=24
+                   (local.get $6)
+                   (i32.const 0)
+                  )
+                 )
+                 (call $fimport$10)
+                )
+               )
+              )
+             )
+            )
+            (global.set $global$1
+             (local.get $14)
+            )
+            (return
+             (i32.add
+              (local.get $4)
+              (i32.const 8)
+             )
+            )
+           )
+           (local.set $0
+            (local.get $7)
+           )
+          )
+          (local.set $0
+           (local.get $7)
+          )
+         )
+        )
+        (local.set $0
+         (local.get $7)
+        )
+       )
+      )
+     )
+    )
+   )
+   (if
+    (i32.ge_u
+     (local.tee $1
+      (i32.load
+       (i32.const 3660)
+      )
+     )
+     (local.get $0)
+    )
+    (block
+     (local.set $2
+      (i32.load
+       (i32.const 3672)
+      )
+     )
+     (if
+      (i32.gt_u
+       (local.tee $3
+        (i32.sub
+         (local.get $1)
+         (local.get $0)
+        )
+       )
+       (i32.const 15)
+      )
+      (block
+       (i32.store
+        (i32.const 3672)
+        (local.tee $1
+         (i32.add
+          (local.get $2)
+          (local.get $0)
+         )
+        )
+       )
+       (i32.store
+        (i32.const 3660)
+        (local.get $3)
+       )
+       (i32.store offset=4
+        (local.get $1)
+        (i32.or
+         (local.get $3)
+         (i32.const 1)
+        )
+       )
+       (i32.store
+        (i32.add
+         (local.get $1)
+         (local.get $3)
+        )
+        (local.get $3)
+       )
+       (i32.store offset=4
+        (local.get $2)
+        (i32.or
+         (local.get $0)
+         (i32.const 3)
+        )
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 3660)
+        (i32.const 0)
+       )
+       (i32.store
+        (i32.const 3672)
+        (i32.const 0)
+       )
+       (i32.store offset=4
+        (local.get $2)
+        (i32.or
+         (local.get $1)
+         (i32.const 3)
+        )
+       )
+       (i32.store
+        (local.tee $0
+         (i32.add
+          (i32.add
+           (local.get $2)
+           (local.get $1)
+          )
+          (i32.const 4)
+         )
+        )
+        (i32.or
+         (i32.load
+          (local.get $0)
+         )
+         (i32.const 1)
+        )
+       )
+      )
+     )
+     (global.set $global$1
+      (local.get $14)
+     )
+     (return
+      (i32.add
+       (local.get $2)
+       (i32.const 8)
+      )
+     )
+    )
+   )
+   (if
+    (i32.gt_u
+     (local.tee $10
+      (i32.load
+       (i32.const 3664)
+      )
+     )
+     (local.get $0)
+    )
+    (block
+     (i32.store
+      (i32.const 3664)
+      (local.tee $3
+       (i32.sub
+        (local.get $10)
+        (local.get $0)
+       )
+      )
+     )
+     (i32.store
+      (i32.const 3676)
+      (local.tee $1
+       (i32.add
+        (local.tee $2
+         (i32.load
+          (i32.const 3676)
+         )
+        )
+        (local.get $0)
+       )
+      )
+     )
+     (i32.store offset=4
+      (local.get $1)
+      (i32.or
+       (local.get $3)
+       (i32.const 1)
+      )
+     )
+     (i32.store offset=4
+      (local.get $2)
+      (i32.or
+       (local.get $0)
+       (i32.const 3)
+      )
+     )
+     (global.set $global$1
+      (local.get $14)
+     )
+     (return
+      (i32.add
+       (local.get $2)
+       (i32.const 8)
+      )
+     )
+    )
+   )
+   (if
+    (i32.le_u
+     (local.tee $6
+      (i32.and
+       (local.tee $8
+        (i32.add
+         (local.tee $1
+          (if (result i32)
+           (i32.load
+            (i32.const 4124)
+           )
+           (i32.load
+            (i32.const 4132)
+           )
+           (block (result i32)
+            (i32.store
+             (i32.const 4132)
+             (i32.const 4096)
+            )
+            (i32.store
+             (i32.const 4128)
+             (i32.const 4096)
+            )
+            (i32.store
+             (i32.const 4136)
+             (i32.const -1)
+            )
+            (i32.store
+             (i32.const 4140)
+             (i32.const -1)
+            )
+            (i32.store
+             (i32.const 4144)
+             (i32.const 0)
+            )
+            (i32.store
+             (i32.const 4096)
+             (i32.const 0)
+            )
+            (i32.store
+             (local.get $18)
+             (local.tee $1
+              (i32.xor
+               (i32.and
+                (local.get $18)
+                (i32.const -16)
+               )
+               (i32.const 1431655768)
+              )
+             )
+            )
+            (i32.store
+             (i32.const 4124)
+             (local.get $1)
+            )
+            (i32.const 4096)
+           )
+          )
+         )
+         (local.tee $13
+          (i32.add
+           (local.get $0)
+           (i32.const 47)
+          )
+         )
+        )
+       )
+       (local.tee $4
+        (i32.sub
+         (i32.const 0)
+         (local.get $1)
+        )
+       )
+      )
+     )
+     (local.get $0)
+    )
+    (block
+     (global.set $global$1
+      (local.get $14)
+     )
+     (return
+      (i32.const 0)
+     )
+    )
+   )
+   (if
+    (local.tee $2
+     (i32.load
+      (i32.const 4092)
+     )
+    )
+    (if
+     (i32.or
+      (i32.le_u
+       (local.tee $1
+        (i32.add
+         (local.tee $3
+          (i32.load
+           (i32.const 4084)
+          )
+         )
+         (local.get $6)
+        )
+       )
+       (local.get $3)
+      )
+      (i32.gt_u
+       (local.get $1)
+       (local.get $2)
+      )
+     )
+     (block
+      (global.set $global$1
+       (local.get $14)
+      )
+      (return
+       (i32.const 0)
+      )
+     )
+    )
+   )
+   (local.set $7
+    (i32.add
+     (local.get $0)
+     (i32.const 48)
+    )
+   )
+   (block $label$171
+    (block $label$172
+     (if
+      (i32.eqz
+       (i32.and
+        (i32.load
+         (i32.const 4096)
+        )
+        (i32.const 4)
+       )
+      )
+      (block
+       (block $label$174
+        (block $label$175
+         (block $label$176
+          (br_if $label$176
+           (i32.eqz
+            (local.tee $3
+             (i32.load
+              (i32.const 3676)
+             )
+            )
+           )
+          )
+          (local.set $2
+           (i32.const 4100)
+          )
+          (loop $label$177
+           (block $label$178
+            (if
+             (i32.le_u
+              (local.tee $1
+               (i32.load
+                (local.get $2)
+               )
+              )
+              (local.get $3)
+             )
+             (br_if $label$178
+              (i32.gt_u
+               (i32.add
+                (local.get $1)
+                (i32.load
+                 (local.tee $5
+                  (i32.add
+                   (local.get $2)
+                   (i32.const 4)
+                  )
+                 )
+                )
+               )
+               (local.get $3)
+              )
+             )
+            )
+            (br_if $label$176
+             (i32.eqz
+              (local.tee $1
+               (i32.load offset=8
+                (local.get $2)
+               )
+              )
+             )
+            )
+            (local.set $2
+             (local.get $1)
+            )
+            (br $label$177)
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.tee $3
+             (i32.and
+              (i32.sub
+               (local.get $8)
+               (local.get $10)
+              )
+              (local.get $4)
+             )
+            )
+            (i32.const 2147483647)
+           )
+           (if
+            (i32.eq
+             (local.tee $1
+              (call $38
+               (local.get $3)
+              )
+             )
+             (i32.add
+              (i32.load
+               (local.get $2)
+              )
+              (i32.load
+               (local.get $5)
+              )
+             )
+            )
+            (br_if $label$172
+             (i32.ne
+              (local.get $1)
+              (i32.const -1)
+             )
+            )
+            (block
+             (local.set $2
+              (local.get $1)
+             )
+             (local.set $1
+              (local.get $3)
+             )
+             (br $label$175)
+            )
+           )
+          )
+          (br $label$174)
+         )
+         (if
+          (i32.ne
+           (local.tee $1
+            (call $38
+             (i32.const 0)
+            )
+           )
+           (i32.const -1)
+          )
+          (block
+           (local.set $2
+            (i32.sub
+             (i32.and
+              (i32.add
+               (local.tee $5
+                (i32.add
+                 (local.tee $2
+                  (i32.load
+                   (i32.const 4128)
+                  )
+                 )
+                 (i32.const -1)
+                )
+               )
+               (local.tee $3
+                (local.get $1)
+               )
+              )
+              (i32.sub
+               (i32.const 0)
+               (local.get $2)
+              )
+             )
+             (local.get $3)
+            )
+           )
+           (local.set $4
+            (i32.add
+             (local.tee $3
+              (i32.add
+               (if (result i32)
+                (i32.and
+                 (local.get $5)
+                 (local.get $3)
+                )
+                (local.get $2)
+                (i32.const 0)
+               )
+               (local.get $6)
+              )
+             )
+             (local.tee $5
+              (i32.load
+               (i32.const 4084)
+              )
+             )
+            )
+           )
+           (if
+            (i32.and
+             (i32.gt_u
+              (local.get $3)
+              (local.get $0)
+             )
+             (i32.lt_u
+              (local.get $3)
+              (i32.const 2147483647)
+             )
+            )
+            (block
+             (if
+              (local.tee $2
+               (i32.load
+                (i32.const 4092)
+               )
+              )
+              (br_if $label$174
+               (i32.or
+                (i32.le_u
+                 (local.get $4)
+                 (local.get $5)
+                )
+                (i32.gt_u
+                 (local.get $4)
+                 (local.get $2)
+                )
+               )
+              )
+             )
+             (br_if $label$172
+              (i32.eq
+               (local.tee $2
+                (call $38
+                 (local.get $3)
+                )
+               )
+               (local.get $1)
+              )
+             )
+             (local.set $1
+              (local.get $3)
+             )
+             (br $label$175)
+            )
+           )
+          )
+         )
+         (br $label$174)
+        )
+        (local.set $5
+         (i32.sub
+          (i32.const 0)
+          (local.get $1)
+         )
+        )
+        (if
+         (i32.and
+          (i32.gt_u
+           (local.get $7)
+           (local.get $1)
+          )
+          (i32.and
+           (i32.lt_u
+            (local.get $1)
+            (i32.const 2147483647)
+           )
+           (i32.ne
+            (local.get $2)
+            (i32.const -1)
+           )
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.tee $3
+            (i32.and
+             (i32.add
+              (i32.sub
+               (local.get $13)
+               (local.get $1)
+              )
+              (local.tee $3
+               (i32.load
+                (i32.const 4132)
+               )
+              )
+             )
+             (i32.sub
+              (i32.const 0)
+              (local.get $3)
+             )
+            )
+           )
+           (i32.const 2147483647)
+          )
+          (if
+           (i32.eq
+            (call $38
+             (local.get $3)
+            )
+            (i32.const -1)
+           )
+           (block
+            (drop
+             (call $38
+              (local.get $5)
+             )
+            )
+            (br $label$174)
+           )
+           (local.set $3
+            (i32.add
+             (local.get $3)
+             (local.get $1)
+            )
+           )
+          )
+          (local.set $3
+           (local.get $1)
+          )
+         )
+         (local.set $3
+          (local.get $1)
+         )
+        )
+        (if
+         (i32.ne
+          (local.get $2)
+          (i32.const -1)
+         )
+         (block
+          (local.set $1
+           (local.get $2)
+          )
+          (br $label$172)
+         )
+        )
+       )
+       (i32.store
+        (i32.const 4096)
+        (i32.or
+         (i32.load
+          (i32.const 4096)
+         )
+         (i32.const 4)
+        )
+       )
+      )
+     )
+     (if
+      (i32.lt_u
+       (local.get $6)
+       (i32.const 2147483647)
+      )
+      (if
+       (i32.and
+        (i32.lt_u
+         (local.tee $1
+          (call $38
+           (local.get $6)
+          )
+         )
+         (local.tee $3
+          (call $38
+           (i32.const 0)
+          )
+         )
+        )
+        (i32.and
+         (i32.ne
+          (local.get $1)
+          (i32.const -1)
+         )
+         (i32.ne
+          (local.get $3)
+          (i32.const -1)
+         )
+        )
+       )
+       (br_if $label$172
+        (i32.gt_u
+         (local.tee $3
+          (i32.sub
+           (local.get $3)
+           (local.get $1)
+          )
+         )
+         (i32.add
+          (local.get $0)
+          (i32.const 40)
+         )
+        )
+       )
+      )
+     )
+     (br $label$171)
+    )
+    (i32.store
+     (i32.const 4084)
+     (local.tee $2
+      (i32.add
+       (i32.load
+        (i32.const 4084)
+       )
+       (local.get $3)
+      )
+     )
+    )
+    (if
+     (i32.gt_u
+      (local.get $2)
+      (i32.load
+       (i32.const 4088)
+      )
+     )
+     (i32.store
+      (i32.const 4088)
+      (local.get $2)
+     )
+    )
+    (block $label$198
+     (if
+      (local.tee $8
+       (i32.load
+        (i32.const 3676)
+       )
+      )
+      (block
+       (local.set $2
+        (i32.const 4100)
+       )
+       (block $label$200
+        (block $label$201
+         (loop $label$202
+          (br_if $label$201
+           (i32.eq
+            (local.get $1)
+            (i32.add
+             (local.tee $4
+              (i32.load
+               (local.get $2)
+              )
+             )
+             (local.tee $5
+              (i32.load
+               (local.tee $7
+                (i32.add
+                 (local.get $2)
+                 (i32.const 4)
+                )
+               )
+              )
+             )
+            )
+           )
+          )
+          (br_if $label$202
+           (local.tee $2
+            (i32.load offset=8
+             (local.get $2)
+            )
+           )
+          )
+         )
+         (br $label$200)
+        )
+        (if
+         (i32.eqz
+          (i32.and
+           (i32.load offset=12
+            (local.get $2)
+           )
+           (i32.const 8)
+          )
+         )
+         (if
+          (i32.and
+           (i32.lt_u
+            (local.get $8)
+            (local.get $1)
+           )
+           (i32.ge_u
+            (local.get $8)
+            (local.get $4)
+           )
+          )
+          (block
+           (i32.store
+            (local.get $7)
+            (i32.add
+             (local.get $5)
+             (local.get $3)
+            )
+           )
+           (local.set $5
+            (i32.load
+             (i32.const 3664)
+            )
+           )
+           (local.set $1
+            (i32.and
+             (i32.sub
+              (i32.const 0)
+              (local.tee $2
+               (i32.add
+                (local.get $8)
+                (i32.const 8)
+               )
+              )
+             )
+             (i32.const 7)
+            )
+           )
+           (i32.store
+            (i32.const 3676)
+            (local.tee $2
+             (i32.add
+              (local.get $8)
+              (if (result i32)
+               (i32.and
+                (local.get $2)
+                (i32.const 7)
+               )
+               (local.get $1)
+               (local.tee $1
+                (i32.const 0)
+               )
+              )
+             )
+            )
+           )
+           (i32.store
+            (i32.const 3664)
+            (local.tee $1
+             (i32.add
+              (i32.sub
+               (local.get $3)
+               (local.get $1)
+              )
+              (local.get $5)
+             )
+            )
+           )
+           (i32.store offset=4
+            (local.get $2)
+            (i32.or
+             (local.get $1)
+             (i32.const 1)
+            )
+           )
+           (i32.store offset=4
+            (i32.add
+             (local.get $2)
+             (local.get $1)
+            )
+            (i32.const 40)
+           )
+           (i32.store
+            (i32.const 3680)
+            (i32.load
+             (i32.const 4140)
+            )
+           )
+           (br $label$198)
+          )
+         )
+        )
+       )
+       (if
+        (i32.lt_u
+         (local.get $1)
+         (local.tee $2
+          (i32.load
+           (i32.const 3668)
+          )
+         )
+        )
+        (block
+         (i32.store
+          (i32.const 3668)
+          (local.get $1)
+         )
+         (local.set $2
+          (local.get $1)
+         )
+        )
+       )
+       (local.set $10
+        (i32.add
+         (local.get $1)
+         (local.get $3)
+        )
+       )
+       (local.set $5
+        (i32.const 4100)
+       )
+       (block $label$208
+        (block $label$209
+         (loop $label$210
+          (br_if $label$209
+           (i32.eq
+            (i32.load
+             (local.get $5)
+            )
+            (local.get $10)
+           )
+          )
+          (br_if $label$210
+           (local.tee $5
+            (i32.load offset=8
+             (local.get $5)
+            )
+           )
+          )
+          (local.set $5
+           (i32.const 4100)
+          )
+         )
+         (br $label$208)
+        )
+        (if
+         (i32.and
+          (i32.load offset=12
+           (local.get $5)
+          )
+          (i32.const 8)
+         )
+         (local.set $5
+          (i32.const 4100)
+         )
+         (block
+          (i32.store
+           (local.get $5)
+           (local.get $1)
+          )
+          (i32.store
+           (local.tee $5
+            (i32.add
+             (local.get $5)
+             (i32.const 4)
+            )
+           )
+           (i32.add
+            (i32.load
+             (local.get $5)
+            )
+            (local.get $3)
+           )
+          )
+          (local.set $7
+           (i32.and
+            (i32.sub
+             (i32.const 0)
+             (local.tee $4
+              (i32.add
+               (local.get $1)
+               (i32.const 8)
+              )
+             )
+            )
+            (i32.const 7)
+           )
+          )
+          (local.set $3
+           (i32.and
+            (i32.sub
+             (i32.const 0)
+             (local.tee $5
+              (i32.add
+               (local.get $10)
+               (i32.const 8)
+              )
+             )
+            )
+            (i32.const 7)
+           )
+          )
+          (local.set $6
+           (i32.add
+            (local.tee $13
+             (i32.add
+              (local.get $1)
+              (if (result i32)
+               (i32.and
+                (local.get $4)
+                (i32.const 7)
+               )
+               (local.get $7)
+               (i32.const 0)
+              )
+             )
+            )
+            (local.get $0)
+           )
+          )
+          (local.set $7
+           (i32.sub
+            (i32.sub
+             (local.tee $4
+              (i32.add
+               (local.get $10)
+               (if (result i32)
+                (i32.and
+                 (local.get $5)
+                 (i32.const 7)
+                )
+                (local.get $3)
+                (i32.const 0)
+               )
+              )
+             )
+             (local.get $13)
+            )
+            (local.get $0)
+           )
+          )
+          (i32.store offset=4
+           (local.get $13)
+           (i32.or
+            (local.get $0)
+            (i32.const 3)
+           )
+          )
+          (block $label$217
+           (if
+            (i32.eq
+             (local.get $4)
+             (local.get $8)
+            )
+            (block
+             (i32.store
+              (i32.const 3664)
+              (local.tee $0
+               (i32.add
+                (i32.load
+                 (i32.const 3664)
+                )
+                (local.get $7)
+               )
+              )
+             )
+             (i32.store
+              (i32.const 3676)
+              (local.get $6)
+             )
+             (i32.store offset=4
+              (local.get $6)
+              (i32.or
+               (local.get $0)
+               (i32.const 1)
+              )
+             )
+            )
+            (block
+             (if
+              (i32.eq
+               (local.get $4)
+               (i32.load
+                (i32.const 3672)
+               )
+              )
+              (block
+               (i32.store
+                (i32.const 3660)
+                (local.tee $0
+                 (i32.add
+                  (i32.load
+                   (i32.const 3660)
+                  )
+                  (local.get $7)
+                 )
+                )
+               )
+               (i32.store
+                (i32.const 3672)
+                (local.get $6)
+               )
+               (i32.store offset=4
+                (local.get $6)
+                (i32.or
+                 (local.get $0)
+                 (i32.const 1)
+                )
+               )
+               (i32.store
+                (i32.add
+                 (local.get $6)
+                 (local.get $0)
+                )
+                (local.get $0)
+               )
+               (br $label$217)
+              )
+             )
+             (i32.store
+              (local.tee $0
+               (i32.add
+                (local.tee $0
+                 (if (result i32)
+                  (i32.eq
+                   (i32.and
+                    (local.tee $0
+                     (i32.load offset=4
+                      (local.get $4)
+                     )
+                    )
+                    (i32.const 3)
+                   )
+                   (i32.const 1)
+                  )
+                  (block (result i32)
+                   (local.set $11
+                    (i32.and
+                     (local.get $0)
+                     (i32.const -8)
+                    )
+                   )
+                   (local.set $1
+                    (i32.shr_u
+                     (local.get $0)
+                     (i32.const 3)
+                    )
+                   )
+                   (block $label$222
+                    (if
+                     (i32.lt_u
+                      (local.get $0)
+                      (i32.const 256)
+                     )
+                     (block
+                      (local.set $5
+                       (i32.load offset=12
+                        (local.get $4)
+                       )
+                      )
+                      (block $label$224
+                       (if
+                        (i32.ne
+                         (local.tee $3
+                          (i32.load offset=8
+                           (local.get $4)
+                          )
+                         )
+                         (local.tee $0
+                          (i32.add
+                           (i32.shl
+                            (i32.shl
+                             (local.get $1)
+                             (i32.const 1)
+                            )
+                            (i32.const 2)
+                           )
+                           (i32.const 3692)
+                          )
+                         )
+                        )
+                        (block
+                         (if
+                          (i32.lt_u
+                           (local.get $3)
+                           (local.get $2)
+                          )
+                          (call $fimport$10)
+                         )
+                         (br_if $label$224
+                          (i32.eq
+                           (i32.load offset=12
+                            (local.get $3)
+                           )
+                           (local.get $4)
+                          )
+                         )
+                         (call $fimport$10)
+                        )
+                       )
+                      )
+                      (if
+                       (i32.eq
+                        (local.get $5)
+                        (local.get $3)
+                       )
+                       (block
+                        (i32.store
+                         (i32.const 3652)
+                         (i32.and
+                          (i32.load
+                           (i32.const 3652)
+                          )
+                          (i32.xor
+                           (i32.shl
+                            (i32.const 1)
+                            (local.get $1)
+                           )
+                           (i32.const -1)
+                          )
+                         )
+                        )
+                        (br $label$222)
+                       )
+                      )
+                      (block $label$228
+                       (if
+                        (i32.eq
+                         (local.get $5)
+                         (local.get $0)
+                        )
+                        (local.set $20
+                         (i32.add
+                          (local.get $5)
+                          (i32.const 8)
+                         )
+                        )
+                        (block
+                         (if
+                          (i32.lt_u
+                           (local.get $5)
+                           (local.get $2)
+                          )
+                          (call $fimport$10)
+                         )
+                         (if
+                          (i32.eq
+                           (i32.load
+                            (local.tee $0
+                             (i32.add
+                              (local.get $5)
+                              (i32.const 8)
+                             )
+                            )
+                           )
+                           (local.get $4)
+                          )
+                          (block
+                           (local.set $20
+                            (local.get $0)
+                           )
+                           (br $label$228)
+                          )
+                         )
+                         (call $fimport$10)
+                        )
+                       )
+                      )
+                      (i32.store offset=12
+                       (local.get $3)
+                       (local.get $5)
+                      )
+                      (i32.store
+                       (local.get $20)
+                       (local.get $3)
+                      )
+                     )
+                     (block
+                      (local.set $8
+                       (i32.load offset=24
+                        (local.get $4)
+                       )
+                      )
+                      (block $label$234
+                       (if
+                        (i32.eq
+                         (local.tee $0
+                          (i32.load offset=12
+                           (local.get $4)
+                          )
+                         )
+                         (local.get $4)
+                        )
+                        (block
+                         (if
+                          (i32.eqz
+                           (local.tee $0
+                            (i32.load
+                             (local.tee $1
+                              (i32.add
+                               (local.tee $3
+                                (i32.add
+                                 (local.get $4)
+                                 (i32.const 16)
+                                )
+                               )
+                               (i32.const 4)
+                              )
+                             )
+                            )
+                           )
+                          )
+                          (if
+                           (local.tee $0
+                            (i32.load
+                             (local.get $3)
+                            )
+                           )
+                           (local.set $1
+                            (local.get $3)
+                           )
+                           (block
+                            (local.set $12
+                             (i32.const 0)
+                            )
+                            (br $label$234)
+                           )
+                          )
+                         )
+                         (loop $label$239
+                          (if
+                           (local.tee $3
+                            (i32.load
+                             (local.tee $5
+                              (i32.add
+                               (local.get $0)
+                               (i32.const 20)
+                              )
+                             )
+                            )
+                           )
+                           (block
+                            (local.set $0
+                             (local.get $3)
+                            )
+                            (local.set $1
+                             (local.get $5)
+                            )
+                            (br $label$239)
+                           )
+                          )
+                          (if
+                           (local.tee $3
+                            (i32.load
+                             (local.tee $5
+                              (i32.add
+                               (local.get $0)
+                               (i32.const 16)
+                              )
+                             )
+                            )
+                           )
+                           (block
+                            (local.set $0
+                             (local.get $3)
+                            )
+                            (local.set $1
+                             (local.get $5)
+                            )
+                            (br $label$239)
+                           )
+                          )
+                         )
+                         (if
+                          (i32.lt_u
+                           (local.get $1)
+                           (local.get $2)
+                          )
+                          (call $fimport$10)
+                          (block
+                           (i32.store
+                            (local.get $1)
+                            (i32.const 0)
+                           )
+                           (local.set $12
+                            (local.get $0)
+                           )
+                          )
+                         )
+                        )
+                        (block
+                         (if
+                          (i32.lt_u
+                           (local.tee $5
+                            (i32.load offset=8
+                             (local.get $4)
+                            )
+                           )
+                           (local.get $2)
+                          )
+                          (call $fimport$10)
+                         )
+                         (if
+                          (i32.ne
+                           (i32.load
+                            (local.tee $3
+                             (i32.add
+                              (local.get $5)
+                              (i32.const 12)
+                             )
+                            )
+                           )
+                           (local.get $4)
+                          )
+                          (call $fimport$10)
+                         )
+                         (if
+                          (i32.eq
+                           (i32.load
+                            (local.tee $1
+                             (i32.add
+                              (local.get $0)
+                              (i32.const 8)
+                             )
+                            )
+                           )
+                           (local.get $4)
+                          )
+                          (block
+                           (i32.store
+                            (local.get $3)
+                            (local.get $0)
+                           )
+                           (i32.store
+                            (local.get $1)
+                            (local.get $5)
+                           )
+                           (local.set $12
+                            (local.get $0)
+                           )
+                          )
+                          (call $fimport$10)
+                         )
+                        )
+                       )
+                      )
+                      (br_if $label$222
+                       (i32.eqz
+                        (local.get $8)
+                       )
+                      )
+                      (block $label$249
+                       (if
+                        (i32.eq
+                         (local.get $4)
+                         (i32.load
+                          (local.tee $0
+                           (i32.add
+                            (i32.shl
+                             (local.tee $1
+                              (i32.load offset=28
+                               (local.get $4)
+                              )
+                             )
+                             (i32.const 2)
+                            )
+                            (i32.const 3956)
+                           )
+                          )
+                         )
+                        )
+                        (block
+                         (i32.store
+                          (local.get $0)
+                          (local.get $12)
+                         )
+                         (br_if $label$249
+                          (local.get $12)
+                         )
+                         (i32.store
+                          (i32.const 3656)
+                          (i32.and
+                           (i32.load
+                            (i32.const 3656)
+                           )
+                           (i32.xor
+                            (i32.shl
+                             (i32.const 1)
+                             (local.get $1)
+                            )
+                            (i32.const -1)
+                           )
+                          )
+                         )
+                         (br $label$222)
+                        )
+                        (block
+                         (if
+                          (i32.lt_u
+                           (local.get $8)
+                           (i32.load
+                            (i32.const 3668)
+                           )
+                          )
+                          (call $fimport$10)
+                         )
+                         (if
+                          (i32.eq
+                           (i32.load
+                            (local.tee $0
+                             (i32.add
+                              (local.get $8)
+                              (i32.const 16)
+                             )
+                            )
+                           )
+                           (local.get $4)
+                          )
+                          (i32.store
+                           (local.get $0)
+                           (local.get $12)
+                          )
+                          (i32.store offset=20
+                           (local.get $8)
+                           (local.get $12)
+                          )
+                         )
+                         (br_if $label$222
+                          (i32.eqz
+                           (local.get $12)
+                          )
+                         )
+                        )
+                       )
+                      )
+                      (if
+                       (i32.lt_u
+                        (local.get $12)
+                        (local.tee $1
+                         (i32.load
+                          (i32.const 3668)
+                         )
+                        )
+                       )
+                       (call $fimport$10)
+                      )
+                      (i32.store offset=24
+                       (local.get $12)
+                       (local.get $8)
+                      )
+                      (if
+                       (local.tee $3
+                        (i32.load
+                         (local.tee $0
+                          (i32.add
+                           (local.get $4)
+                           (i32.const 16)
+                          )
+                         )
+                        )
+                       )
+                       (if
+                        (i32.lt_u
+                         (local.get $3)
+                         (local.get $1)
+                        )
+                        (call $fimport$10)
+                        (block
+                         (i32.store offset=16
+                          (local.get $12)
+                          (local.get $3)
+                         )
+                         (i32.store offset=24
+                          (local.get $3)
+                          (local.get $12)
+                         )
+                        )
+                       )
+                      )
+                      (br_if $label$222
+                       (i32.eqz
+                        (local.tee $0
+                         (i32.load offset=4
+                          (local.get $0)
+                         )
+                        )
+                       )
+                      )
+                      (if
+                       (i32.lt_u
+                        (local.get $0)
+                        (i32.load
+                         (i32.const 3668)
+                        )
+                       )
+                       (call $fimport$10)
+                       (block
+                        (i32.store offset=20
+                         (local.get $12)
+                         (local.get $0)
+                        )
+                        (i32.store offset=24
+                         (local.get $0)
+                         (local.get $12)
+                        )
+                       )
+                      )
+                     )
+                    )
+                   )
+                   (local.set $7
+                    (i32.add
+                     (local.get $11)
+                     (local.get $7)
+                    )
+                   )
+                   (i32.add
+                    (local.get $4)
+                    (local.get $11)
+                   )
+                  )
+                  (local.get $4)
+                 )
+                )
+                (i32.const 4)
+               )
+              )
+              (i32.and
+               (i32.load
+                (local.get $0)
+               )
+               (i32.const -2)
+              )
+             )
+             (i32.store offset=4
+              (local.get $6)
+              (i32.or
+               (local.get $7)
+               (i32.const 1)
+              )
+             )
+             (i32.store
+              (i32.add
+               (local.get $6)
+               (local.get $7)
+              )
+              (local.get $7)
+             )
+             (local.set $0
+              (i32.shr_u
+               (local.get $7)
+               (i32.const 3)
+              )
+             )
+             (if
+              (i32.lt_u
+               (local.get $7)
+               (i32.const 256)
+              )
+              (block
+               (local.set $3
+                (i32.add
+                 (i32.shl
+                  (i32.shl
+                   (local.get $0)
+                   (i32.const 1)
+                  )
+                  (i32.const 2)
+                 )
+                 (i32.const 3692)
+                )
+               )
+               (block $label$263
+                (if
+                 (i32.and
+                  (local.tee $1
+                   (i32.load
+                    (i32.const 3652)
+                   )
+                  )
+                  (local.tee $0
+                   (i32.shl
+                    (i32.const 1)
+                    (local.get $0)
+                   )
+                  )
+                 )
+                 (block
+                  (if
+                   (i32.ge_u
+                    (local.tee $0
+                     (i32.load
+                      (local.tee $1
+                       (i32.add
+                        (local.get $3)
+                        (i32.const 8)
+                       )
+                      )
+                     )
+                    )
+                    (i32.load
+                     (i32.const 3668)
+                    )
+                   )
+                   (block
+                    (local.set $21
+                     (local.get $1)
+                    )
+                    (local.set $9
+                     (local.get $0)
+                    )
+                    (br $label$263)
+                   )
+                  )
+                  (call $fimport$10)
+                 )
+                 (block
+                  (i32.store
+                   (i32.const 3652)
+                   (i32.or
+                    (local.get $1)
+                    (local.get $0)
+                   )
+                  )
+                  (local.set $21
+                   (i32.add
+                    (local.get $3)
+                    (i32.const 8)
+                   )
+                  )
+                  (local.set $9
+                   (local.get $3)
+                  )
+                 )
+                )
+               )
+               (i32.store
+                (local.get $21)
+                (local.get $6)
+               )
+               (i32.store offset=12
+                (local.get $9)
+                (local.get $6)
+               )
+               (i32.store offset=8
+                (local.get $6)
+                (local.get $9)
+               )
+               (i32.store offset=12
+                (local.get $6)
+                (local.get $3)
+               )
+               (br $label$217)
+              )
+             )
+             (local.set $3
+              (i32.add
+               (i32.shl
+                (local.tee $2
+                 (block $label$267 (result i32)
+                  (if (result i32)
+                   (local.tee $0
+                    (i32.shr_u
+                     (local.get $7)
+                     (i32.const 8)
+                    )
+                   )
+                   (block (result i32)
+                    (drop
+                     (br_if $label$267
+                      (i32.const 31)
+                      (i32.gt_u
+                       (local.get $7)
+                       (i32.const 16777215)
+                      )
+                     )
+                    )
+                    (i32.or
+                     (i32.and
+                      (i32.shr_u
+                       (local.get $7)
+                       (i32.add
+                        (local.tee $0
+                         (i32.add
+                          (i32.sub
+                           (i32.const 14)
+                           (i32.or
+                            (i32.or
+                             (local.tee $0
+                              (i32.and
+                               (i32.shr_u
+                                (i32.add
+                                 (local.tee $1
+                                  (i32.shl
+                                   (local.get $0)
+                                   (local.tee $3
+                                    (i32.and
+                                     (i32.shr_u
+                                      (i32.add
+                                       (local.get $0)
+                                       (i32.const 1048320)
+                                      )
+                                      (i32.const 16)
+                                     )
+                                     (i32.const 8)
+                                    )
+                                   )
+                                  )
+                                 )
+                                 (i32.const 520192)
+                                )
+                                (i32.const 16)
+                               )
+                               (i32.const 4)
+                              )
+                             )
+                             (local.get $3)
+                            )
+                            (local.tee $0
+                             (i32.and
+                              (i32.shr_u
+                               (i32.add
+                                (local.tee $1
+                                 (i32.shl
+                                  (local.get $1)
+                                  (local.get $0)
+                                 )
+                                )
+                                (i32.const 245760)
+                               )
+                               (i32.const 16)
+                              )
+                              (i32.const 2)
+                             )
+                            )
+                           )
+                          )
+                          (i32.shr_u
+                           (i32.shl
+                            (local.get $1)
+                            (local.get $0)
+                           )
+                           (i32.const 15)
+                          )
+                         )
+                        )
+                        (i32.const 7)
+                       )
+                      )
+                      (i32.const 1)
+                     )
+                     (i32.shl
+                      (local.get $0)
+                      (i32.const 1)
+                     )
+                    )
+                   )
+                   (i32.const 0)
+                  )
+                 )
+                )
+                (i32.const 2)
+               )
+               (i32.const 3956)
+              )
+             )
+             (i32.store offset=28
+              (local.get $6)
+              (local.get $2)
+             )
+             (i32.store offset=4
+              (local.tee $0
+               (i32.add
+                (local.get $6)
+                (i32.const 16)
+               )
+              )
+              (i32.const 0)
+             )
+             (i32.store
+              (local.get $0)
+              (i32.const 0)
+             )
+             (if
+              (i32.eqz
+               (i32.and
+                (local.tee $1
+                 (i32.load
+                  (i32.const 3656)
+                 )
+                )
+                (local.tee $0
+                 (i32.shl
+                  (i32.const 1)
+                  (local.get $2)
+                 )
+                )
+               )
+              )
+              (block
+               (i32.store
+                (i32.const 3656)
+                (i32.or
+                 (local.get $1)
+                 (local.get $0)
+                )
+               )
+               (i32.store
+                (local.get $3)
+                (local.get $6)
+               )
+               (i32.store offset=24
+                (local.get $6)
+                (local.get $3)
+               )
+               (i32.store offset=12
+                (local.get $6)
+                (local.get $6)
+               )
+               (i32.store offset=8
+                (local.get $6)
+                (local.get $6)
+               )
+               (br $label$217)
+              )
+             )
+             (local.set $0
+              (i32.load
+               (local.get $3)
+              )
+             )
+             (local.set $1
+              (i32.sub
+               (i32.const 25)
+               (i32.shr_u
+                (local.get $2)
+                (i32.const 1)
+               )
+              )
+             )
+             (local.set $2
+              (i32.shl
+               (local.get $7)
+               (if (result i32)
+                (i32.eq
+                 (local.get $2)
+                 (i32.const 31)
+                )
+                (i32.const 0)
+                (local.get $1)
+               )
+              )
+             )
+             (block $label$273
+              (block $label$274
+               (block $label$275
+                (loop $label$276
+                 (br_if $label$274
+                  (i32.eq
+                   (i32.and
+                    (i32.load offset=4
+                     (local.get $0)
+                    )
+                    (i32.const -8)
+                   )
+                   (local.get $7)
+                  )
+                 )
+                 (local.set $3
+                  (i32.shl
+                   (local.get $2)
+                   (i32.const 1)
+                  )
+                 )
+                 (br_if $label$275
+                  (i32.eqz
+                   (local.tee $1
+                    (i32.load
+                     (local.tee $2
+                      (i32.add
+                       (i32.add
+                        (local.get $0)
+                        (i32.const 16)
+                       )
+                       (i32.shl
+                        (i32.shr_u
+                         (local.get $2)
+                         (i32.const 31)
+                        )
+                        (i32.const 2)
+                       )
+                      )
+                     )
+                    )
+                   )
+                  )
+                 )
+                 (local.set $2
+                  (local.get $3)
+                 )
+                 (local.set $0
+                  (local.get $1)
+                 )
+                 (br $label$276)
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.get $2)
+                 (i32.load
+                  (i32.const 3668)
+                 )
+                )
+                (call $fimport$10)
+                (block
+                 (i32.store
+                  (local.get $2)
+                  (local.get $6)
+                 )
+                 (i32.store offset=24
+                  (local.get $6)
+                  (local.get $0)
+                 )
+                 (i32.store offset=12
+                  (local.get $6)
+                  (local.get $6)
+                 )
+                 (i32.store offset=8
+                  (local.get $6)
+                  (local.get $6)
+                 )
+                 (br $label$217)
+                )
+               )
+               (br $label$273)
+              )
+              (if
+               (i32.and
+                (i32.ge_u
+                 (local.tee $2
+                  (i32.load
+                   (local.tee $3
+                    (i32.add
+                     (local.get $0)
+                     (i32.const 8)
+                    )
+                   )
+                  )
+                 )
+                 (local.tee $1
+                  (i32.load
+                   (i32.const 3668)
+                  )
+                 )
+                )
+                (i32.ge_u
+                 (local.get $0)
+                 (local.get $1)
+                )
+               )
+               (block
+                (i32.store offset=12
+                 (local.get $2)
+                 (local.get $6)
+                )
+                (i32.store
+                 (local.get $3)
+                 (local.get $6)
+                )
+                (i32.store offset=8
+                 (local.get $6)
+                 (local.get $2)
+                )
+                (i32.store offset=12
+                 (local.get $6)
+                 (local.get $0)
+                )
+                (i32.store offset=24
+                 (local.get $6)
+                 (i32.const 0)
+                )
+               )
+               (call $fimport$10)
+              )
+             )
+            )
+           )
+          )
+          (global.set $global$1
+           (local.get $14)
+          )
+          (return
+           (i32.add
+            (local.get $13)
+            (i32.const 8)
+           )
+          )
+         )
+        )
+       )
+       (loop $label$281
+        (block $label$282
+         (if
+          (i32.le_u
+           (local.tee $2
+            (i32.load
+             (local.get $5)
+            )
+           )
+           (local.get $8)
+          )
+          (br_if $label$282
+           (i32.gt_u
+            (local.tee $13
+             (i32.add
+              (local.get $2)
+              (i32.load offset=4
+               (local.get $5)
+              )
+             )
+            )
+            (local.get $8)
+           )
+          )
+         )
+         (local.set $5
+          (i32.load offset=8
+           (local.get $5)
+          )
+         )
+         (br $label$281)
+        )
+       )
+       (local.set $2
+        (i32.and
+         (i32.sub
+          (i32.const 0)
+          (local.tee $5
+           (i32.add
+            (local.tee $7
+             (i32.add
+              (local.get $13)
+              (i32.const -47)
+             )
+            )
+            (i32.const 8)
+           )
+          )
+         )
+         (i32.const 7)
+        )
+       )
+       (local.set $10
+        (i32.add
+         (local.tee $7
+          (if (result i32)
+           (i32.lt_u
+            (local.tee $2
+             (i32.add
+              (local.get $7)
+              (if (result i32)
+               (i32.and
+                (local.get $5)
+                (i32.const 7)
+               )
+               (local.get $2)
+               (i32.const 0)
+              )
+             )
+            )
+            (local.tee $12
+             (i32.add
+              (local.get $8)
+              (i32.const 16)
+             )
+            )
+           )
+           (local.get $8)
+           (local.get $2)
+          )
+         )
+         (i32.const 8)
+        )
+       )
+       (local.set $5
+        (i32.add
+         (local.get $7)
+         (i32.const 24)
+        )
+       )
+       (local.set $9
+        (i32.add
+         (local.get $3)
+         (i32.const -40)
+        )
+       )
+       (local.set $2
+        (i32.and
+         (i32.sub
+          (i32.const 0)
+          (local.tee $4
+           (i32.add
+            (local.get $1)
+            (i32.const 8)
+           )
+          )
+         )
+         (i32.const 7)
+        )
+       )
+       (i32.store
+        (i32.const 3676)
+        (local.tee $4
+         (i32.add
+          (local.get $1)
+          (if (result i32)
+           (i32.and
+            (local.get $4)
+            (i32.const 7)
+           )
+           (local.get $2)
+           (local.tee $2
+            (i32.const 0)
+           )
+          )
+         )
+        )
+       )
+       (i32.store
+        (i32.const 3664)
+        (local.tee $2
+         (i32.sub
+          (local.get $9)
+          (local.get $2)
+         )
+        )
+       )
+       (i32.store offset=4
+        (local.get $4)
+        (i32.or
+         (local.get $2)
+         (i32.const 1)
+        )
+       )
+       (i32.store offset=4
+        (i32.add
+         (local.get $4)
+         (local.get $2)
+        )
+        (i32.const 40)
+       )
+       (i32.store
+        (i32.const 3680)
+        (i32.load
+         (i32.const 4140)
+        )
+       )
+       (i32.store
+        (local.tee $2
+         (i32.add
+          (local.get $7)
+          (i32.const 4)
+         )
+        )
+        (i32.const 27)
+       )
+       (i64.store align=4
+        (local.get $10)
+        (i64.load align=4
+         (i32.const 4100)
+        )
+       )
+       (i64.store offset=8 align=4
+        (local.get $10)
+        (i64.load align=4
+         (i32.const 4108)
+        )
+       )
+       (i32.store
+        (i32.const 4100)
+        (local.get $1)
+       )
+       (i32.store
+        (i32.const 4104)
+        (local.get $3)
+       )
+       (i32.store
+        (i32.const 4112)
+        (i32.const 0)
+       )
+       (i32.store
+        (i32.const 4108)
+        (local.get $10)
+       )
+       (local.set $1
+        (local.get $5)
+       )
+       (loop $label$290
+        (i32.store
+         (local.tee $1
+          (i32.add
+           (local.get $1)
+           (i32.const 4)
+          )
+         )
+         (i32.const 7)
+        )
+        (br_if $label$290
+         (i32.lt_u
+          (i32.add
+           (local.get $1)
+           (i32.const 4)
+          )
+          (local.get $13)
+         )
+        )
+       )
+       (if
+        (i32.ne
+         (local.get $7)
+         (local.get $8)
+        )
+        (block
+         (i32.store
+          (local.get $2)
+          (i32.and
+           (i32.load
+            (local.get $2)
+           )
+           (i32.const -2)
+          )
+         )
+         (i32.store offset=4
+          (local.get $8)
+          (i32.or
+           (local.tee $4
+            (i32.sub
+             (local.get $7)
+             (local.get $8)
+            )
+           )
+           (i32.const 1)
+          )
+         )
+         (i32.store
+          (local.get $7)
+          (local.get $4)
+         )
+         (local.set $1
+          (i32.shr_u
+           (local.get $4)
+           (i32.const 3)
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.get $4)
+           (i32.const 256)
+          )
+          (block
+           (local.set $2
+            (i32.add
+             (i32.shl
+              (i32.shl
+               (local.get $1)
+               (i32.const 1)
+              )
+              (i32.const 2)
+             )
+             (i32.const 3692)
+            )
+           )
+           (if
+            (i32.and
+             (local.tee $3
+              (i32.load
+               (i32.const 3652)
+              )
+             )
+             (local.tee $1
+              (i32.shl
+               (i32.const 1)
+               (local.get $1)
+              )
+             )
+            )
+            (if
+             (i32.lt_u
+              (local.tee $1
+               (i32.load
+                (local.tee $3
+                 (i32.add
+                  (local.get $2)
+                  (i32.const 8)
+                 )
+                )
+               )
+              )
+              (i32.load
+               (i32.const 3668)
+              )
+             )
+             (call $fimport$10)
+             (block
+              (local.set $15
+               (local.get $3)
+              )
+              (local.set $11
+               (local.get $1)
+              )
+             )
+            )
+            (block
+             (i32.store
+              (i32.const 3652)
+              (i32.or
+               (local.get $3)
+               (local.get $1)
+              )
+             )
+             (local.set $15
+              (i32.add
+               (local.get $2)
+               (i32.const 8)
+              )
+             )
+             (local.set $11
+              (local.get $2)
+             )
+            )
+           )
+           (i32.store
+            (local.get $15)
+            (local.get $8)
+           )
+           (i32.store offset=12
+            (local.get $11)
+            (local.get $8)
+           )
+           (i32.store offset=8
+            (local.get $8)
+            (local.get $11)
+           )
+           (i32.store offset=12
+            (local.get $8)
+            (local.get $2)
+           )
+           (br $label$198)
+          )
+         )
+         (local.set $2
+          (i32.add
+           (i32.shl
+            (local.tee $5
+             (if (result i32)
+              (local.tee $1
+               (i32.shr_u
+                (local.get $4)
+                (i32.const 8)
+               )
+              )
+              (if (result i32)
+               (i32.gt_u
+                (local.get $4)
+                (i32.const 16777215)
+               )
+               (i32.const 31)
+               (i32.or
+                (i32.and
+                 (i32.shr_u
+                  (local.get $4)
+                  (i32.add
+                   (local.tee $1
+                    (i32.add
+                     (i32.sub
+                      (i32.const 14)
+                      (i32.or
+                       (i32.or
+                        (local.tee $1
+                         (i32.and
+                          (i32.shr_u
+                           (i32.add
+                            (local.tee $3
+                             (i32.shl
+                              (local.get $1)
+                              (local.tee $2
+                               (i32.and
+                                (i32.shr_u
+                                 (i32.add
+                                  (local.get $1)
+                                  (i32.const 1048320)
+                                 )
+                                 (i32.const 16)
+                                )
+                                (i32.const 8)
+                               )
+                              )
+                             )
+                            )
+                            (i32.const 520192)
+                           )
+                           (i32.const 16)
+                          )
+                          (i32.const 4)
+                         )
+                        )
+                        (local.get $2)
+                       )
+                       (local.tee $1
+                        (i32.and
+                         (i32.shr_u
+                          (i32.add
+                           (local.tee $3
+                            (i32.shl
+                             (local.get $3)
+                             (local.get $1)
+                            )
+                           )
+                           (i32.const 245760)
+                          )
+                          (i32.const 16)
+                         )
+                         (i32.const 2)
+                        )
+                       )
+                      )
+                     )
+                     (i32.shr_u
+                      (i32.shl
+                       (local.get $3)
+                       (local.get $1)
+                      )
+                      (i32.const 15)
+                     )
+                    )
+                   )
+                   (i32.const 7)
+                  )
+                 )
+                 (i32.const 1)
+                )
+                (i32.shl
+                 (local.get $1)
+                 (i32.const 1)
+                )
+               )
+              )
+              (i32.const 0)
+             )
+            )
+            (i32.const 2)
+           )
+           (i32.const 3956)
+          )
+         )
+         (i32.store offset=28
+          (local.get $8)
+          (local.get $5)
+         )
+         (i32.store offset=20
+          (local.get $8)
+          (i32.const 0)
+         )
+         (i32.store
+          (local.get $12)
+          (i32.const 0)
+         )
+         (if
+          (i32.eqz
+           (i32.and
+            (local.tee $3
+             (i32.load
+              (i32.const 3656)
+             )
+            )
+            (local.tee $1
+             (i32.shl
+              (i32.const 1)
+              (local.get $5)
+             )
+            )
+           )
+          )
+          (block
+           (i32.store
+            (i32.const 3656)
+            (i32.or
+             (local.get $3)
+             (local.get $1)
+            )
+           )
+           (i32.store
+            (local.get $2)
+            (local.get $8)
+           )
+           (i32.store offset=24
+            (local.get $8)
+            (local.get $2)
+           )
+           (i32.store offset=12
+            (local.get $8)
+            (local.get $8)
+           )
+           (i32.store offset=8
+            (local.get $8)
+            (local.get $8)
+           )
+           (br $label$198)
+          )
+         )
+         (local.set $1
+          (i32.load
+           (local.get $2)
+          )
+         )
+         (local.set $3
+          (i32.sub
+           (i32.const 25)
+           (i32.shr_u
+            (local.get $5)
+            (i32.const 1)
+           )
+          )
+         )
+         (local.set $5
+          (i32.shl
+           (local.get $4)
+           (if (result i32)
+            (i32.eq
+             (local.get $5)
+             (i32.const 31)
+            )
+            (i32.const 0)
+            (local.get $3)
+           )
+          )
+         )
+         (block $label$304
+          (block $label$305
+           (block $label$306
+            (loop $label$307
+             (br_if $label$305
+              (i32.eq
+               (i32.and
+                (i32.load offset=4
+                 (local.get $1)
+                )
+                (i32.const -8)
+               )
+               (local.get $4)
+              )
+             )
+             (local.set $2
+              (i32.shl
+               (local.get $5)
+               (i32.const 1)
+              )
+             )
+             (br_if $label$306
+              (i32.eqz
+               (local.tee $3
+                (i32.load
+                 (local.tee $5
+                  (i32.add
+                   (i32.add
+                    (local.get $1)
+                    (i32.const 16)
+                   )
+                   (i32.shl
+                    (i32.shr_u
+                     (local.get $5)
+                     (i32.const 31)
+                    )
+                    (i32.const 2)
+                   )
+                  )
+                 )
+                )
+               )
+              )
+             )
+             (local.set $5
+              (local.get $2)
+             )
+             (local.set $1
+              (local.get $3)
+             )
+             (br $label$307)
+            )
+           )
+           (if
+            (i32.lt_u
+             (local.get $5)
+             (i32.load
+              (i32.const 3668)
+             )
+            )
+            (call $fimport$10)
+            (block
+             (i32.store
+              (local.get $5)
+              (local.get $8)
+             )
+             (i32.store offset=24
+              (local.get $8)
+              (local.get $1)
+             )
+             (i32.store offset=12
+              (local.get $8)
+              (local.get $8)
+             )
+             (i32.store offset=8
+              (local.get $8)
+              (local.get $8)
+             )
+             (br $label$198)
+            )
+           )
+           (br $label$304)
+          )
+          (if
+           (i32.and
+            (i32.ge_u
+             (local.tee $5
+              (i32.load
+               (local.tee $2
+                (i32.add
+                 (local.get $1)
+                 (i32.const 8)
+                )
+               )
+              )
+             )
+             (local.tee $3
+              (i32.load
+               (i32.const 3668)
+              )
+             )
+            )
+            (i32.ge_u
+             (local.get $1)
+             (local.get $3)
+            )
+           )
+           (block
+            (i32.store offset=12
+             (local.get $5)
+             (local.get $8)
+            )
+            (i32.store
+             (local.get $2)
+             (local.get $8)
+            )
+            (i32.store offset=8
+             (local.get $8)
+             (local.get $5)
+            )
+            (i32.store offset=12
+             (local.get $8)
+             (local.get $1)
+            )
+            (i32.store offset=24
+             (local.get $8)
+             (i32.const 0)
+            )
+           )
+           (call $fimport$10)
+          )
+         )
+        )
+       )
+      )
+      (block
+       (if
+        (i32.or
+         (i32.eqz
+          (local.tee $2
+           (i32.load
+            (i32.const 3668)
+           )
+          )
+         )
+         (i32.lt_u
+          (local.get $1)
+          (local.get $2)
+         )
+        )
+        (i32.store
+         (i32.const 3668)
+         (local.get $1)
+        )
+       )
+       (i32.store
+        (i32.const 4100)
+        (local.get $1)
+       )
+       (i32.store
+        (i32.const 4104)
+        (local.get $3)
+       )
+       (i32.store
+        (i32.const 4112)
+        (i32.const 0)
+       )
+       (i32.store
+        (i32.const 3688)
+        (i32.load
+         (i32.const 4124)
+        )
+       )
+       (i32.store
+        (i32.const 3684)
+        (i32.const -1)
+       )
+       (local.set $2
+        (i32.const 0)
+       )
+       (loop $label$314
+        (i32.store offset=12
+         (local.tee $5
+          (i32.add
+           (i32.shl
+            (i32.shl
+             (local.get $2)
+             (i32.const 1)
+            )
+            (i32.const 2)
+           )
+           (i32.const 3692)
+          )
+         )
+         (local.get $5)
+        )
+        (i32.store offset=8
+         (local.get $5)
+         (local.get $5)
+        )
+        (br_if $label$314
+         (i32.ne
+          (local.tee $2
+           (i32.add
+            (local.get $2)
+            (i32.const 1)
+           )
+          )
+          (i32.const 32)
+         )
+        )
+       )
+       (local.set $5
+        (i32.add
+         (local.get $3)
+         (i32.const -40)
+        )
+       )
+       (local.set $3
+        (i32.and
+         (i32.sub
+          (i32.const 0)
+          (local.tee $2
+           (i32.add
+            (local.get $1)
+            (i32.const 8)
+           )
+          )
+         )
+         (i32.const 7)
+        )
+       )
+       (i32.store
+        (i32.const 3676)
+        (local.tee $3
+         (i32.add
+          (local.get $1)
+          (local.tee $1
+           (if (result i32)
+            (i32.and
+             (local.get $2)
+             (i32.const 7)
+            )
+            (local.get $3)
+            (i32.const 0)
+           )
+          )
+         )
+        )
+       )
+       (i32.store
+        (i32.const 3664)
+        (local.tee $1
+         (i32.sub
+          (local.get $5)
+          (local.get $1)
+         )
+        )
+       )
+       (i32.store offset=4
+        (local.get $3)
+        (i32.or
+         (local.get $1)
+         (i32.const 1)
+        )
+       )
+       (i32.store offset=4
+        (i32.add
+         (local.get $3)
+         (local.get $1)
+        )
+        (i32.const 40)
+       )
+       (i32.store
+        (i32.const 3680)
+        (i32.load
+         (i32.const 4140)
+        )
+       )
+      )
+     )
+    )
+    (if
+     (i32.gt_u
+      (local.tee $1
+       (i32.load
+        (i32.const 3664)
+       )
+      )
+      (local.get $0)
+     )
+     (block
+      (i32.store
+       (i32.const 3664)
+       (local.tee $3
+        (i32.sub
+         (local.get $1)
+         (local.get $0)
+        )
+       )
+      )
+      (i32.store
+       (i32.const 3676)
+       (local.tee $1
+        (i32.add
+         (local.tee $2
+          (i32.load
+           (i32.const 3676)
+          )
+         )
+         (local.get $0)
+        )
+       )
+      )
+      (i32.store offset=4
+       (local.get $1)
+       (i32.or
+        (local.get $3)
+        (i32.const 1)
+       )
+      )
+      (i32.store offset=4
+       (local.get $2)
+       (i32.or
+        (local.get $0)
+        (i32.const 3)
+       )
+      )
+      (global.set $global$1
+       (local.get $14)
+      )
+      (return
+       (i32.add
+        (local.get $2)
+        (i32.const 8)
+       )
+      )
+     )
+    )
+   )
+   (i32.store
+    (call $12)
+    (i32.const 12)
+   )
+   (global.set $global$1
+    (local.get $14)
+   )
+   (i32.const 0)
   )
-  (func $31 (;44;) (type $4) (param $0 i32) (param $1 i32) (result i32)
-    (local $2 i32) (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $3
-      global.get $global$1
-      i32.const 16
-      i32.add
-      global.set $global$1
-      local.get $3
-      local.tee $4
-      local.get $1
-      i32.const 255
-      i32.and
-      local.tee $7
-      i32.store8
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          local.get $0
-          i32.const 16
-          i32.add
-          local.tee $2
-          i32.load
-          local.tee $5
-          br_if 0 (;@3;)
-          local.get $0
-          call $30
-          if ;; label = @4
-            i32.const -1
-            local.set $1
-          else
-            block ;; label = @5
-              local.get $2
-              i32.load
-              local.set $5
-              br 2 (;@3;)
-            end
-          end
-          br 1 (;@2;)
-        end
-        local.get $0
-        i32.const 20
-        i32.add
-        local.tee $2
-        i32.load
-        local.tee $6
-        local.get $5
-        i32.lt_u
-        if ;; label = @3
-          local.get $1
-          i32.const 255
-          i32.and
-          local.tee $1
-          local.get $0
-          i32.load8_s offset=75
-          i32.ne
-          if ;; label = @4
-            block ;; label = @5
-              local.get $2
-              local.get $6
-              i32.const 1
-              i32.add
-              i32.store
-              local.get $6
-              local.get $7
-              i32.store8
-              br 3 (;@2;)
-            end
-          end
-        end
-        local.get $0
-        local.get $4
-        i32.const 1
-        local.get $0
-        i32.load offset=36
-        i32.const 3
-        i32.and
-        i32.const 2
-        i32.add
-        call_indirect (type $0)
-        i32.const 1
-        i32.eq
-        if (result i32) ;; label = @3
-          local.get $4
-          i32.load8_u
-        else
-          i32.const -1
-        end
-        local.set $1
-      end
-      local.get $3
-      global.set $global$1
-      local.get $1
-    end
+ )
+ (func $36 (; 49 ;) (type $2) (param $0 i32)
+  (local $1 i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (local $15 i32)
+  (block $label$1
+   (if
+    (i32.eqz
+     (local.get $0)
+    )
+    (return)
+   )
+   (if
+    (i32.lt_u
+     (local.tee $1
+      (i32.add
+       (local.get $0)
+       (i32.const -8)
+      )
+     )
+     (local.tee $11
+      (i32.load
+       (i32.const 3668)
+      )
+     )
+    )
+    (call $fimport$10)
+   )
+   (if
+    (i32.eq
+     (local.tee $8
+      (i32.and
+       (local.tee $0
+        (i32.load
+         (i32.add
+          (local.get $0)
+          (i32.const -4)
+         )
+        )
+       )
+       (i32.const 3)
+      )
+     )
+     (i32.const 1)
+    )
+    (call $fimport$10)
+   )
+   (local.set $6
+    (i32.add
+     (local.get $1)
+     (local.tee $4
+      (i32.and
+       (local.get $0)
+       (i32.const -8)
+      )
+     )
+    )
+   )
+   (block $label$5
+    (if
+     (i32.and
+      (local.get $0)
+      (i32.const 1)
+     )
+     (block
+      (local.set $3
+       (local.get $1)
+      )
+      (local.set $2
+       (local.get $4)
+      )
+     )
+     (block
+      (if
+       (i32.eqz
+        (local.get $8)
+       )
+       (return)
+      )
+      (if
+       (i32.lt_u
+        (local.tee $0
+         (i32.add
+          (local.get $1)
+          (i32.sub
+           (i32.const 0)
+           (local.tee $8
+            (i32.load
+             (local.get $1)
+            )
+           )
+          )
+         )
+        )
+        (local.get $11)
+       )
+       (call $fimport$10)
+      )
+      (local.set $1
+       (i32.add
+        (local.get $8)
+        (local.get $4)
+       )
+      )
+      (if
+       (i32.eq
+        (local.get $0)
+        (i32.load
+         (i32.const 3672)
+        )
+       )
+       (block
+        (if
+         (i32.ne
+          (i32.and
+           (local.tee $3
+            (i32.load
+             (local.tee $2
+              (i32.add
+               (local.get $6)
+               (i32.const 4)
+              )
+             )
+            )
+           )
+           (i32.const 3)
+          )
+          (i32.const 3)
+         )
+         (block
+          (local.set $3
+           (local.get $0)
+          )
+          (local.set $2
+           (local.get $1)
+          )
+          (br $label$5)
+         )
+        )
+        (i32.store
+         (i32.const 3660)
+         (local.get $1)
+        )
+        (i32.store
+         (local.get $2)
+         (i32.and
+          (local.get $3)
+          (i32.const -2)
+         )
+        )
+        (i32.store offset=4
+         (local.get $0)
+         (i32.or
+          (local.get $1)
+          (i32.const 1)
+         )
+        )
+        (i32.store
+         (i32.add
+          (local.get $0)
+          (local.get $1)
+         )
+         (local.get $1)
+        )
+        (return)
+       )
+      )
+      (local.set $10
+       (i32.shr_u
+        (local.get $8)
+        (i32.const 3)
+       )
+      )
+      (if
+       (i32.lt_u
+        (local.get $8)
+        (i32.const 256)
+       )
+       (block
+        (local.set $3
+         (i32.load offset=12
+          (local.get $0)
+         )
+        )
+        (if
+         (i32.ne
+          (local.tee $4
+           (i32.load offset=8
+            (local.get $0)
+           )
+          )
+          (local.tee $2
+           (i32.add
+            (i32.shl
+             (i32.shl
+              (local.get $10)
+              (i32.const 1)
+             )
+             (i32.const 2)
+            )
+            (i32.const 3692)
+           )
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $4)
+            (local.get $11)
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.ne
+            (i32.load offset=12
+             (local.get $4)
+            )
+            (local.get $0)
+           )
+           (call $fimport$10)
+          )
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $3)
+          (local.get $4)
+         )
+         (block
+          (i32.store
+           (i32.const 3652)
+           (i32.and
+            (i32.load
+             (i32.const 3652)
+            )
+            (i32.xor
+             (i32.shl
+              (i32.const 1)
+              (local.get $10)
+             )
+             (i32.const -1)
+            )
+           )
+          )
+          (local.set $3
+           (local.get $0)
+          )
+          (local.set $2
+           (local.get $1)
+          )
+          (br $label$5)
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $3)
+          (local.get $2)
+         )
+         (local.set $5
+          (i32.add
+           (local.get $3)
+           (i32.const 8)
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $3)
+            (local.get $11)
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.eq
+            (i32.load
+             (local.tee $2
+              (i32.add
+               (local.get $3)
+               (i32.const 8)
+              )
+             )
+            )
+            (local.get $0)
+           )
+           (local.set $5
+            (local.get $2)
+           )
+           (call $fimport$10)
+          )
+         )
+        )
+        (i32.store offset=12
+         (local.get $4)
+         (local.get $3)
+        )
+        (i32.store
+         (local.get $5)
+         (local.get $4)
+        )
+        (local.set $3
+         (local.get $0)
+        )
+        (local.set $2
+         (local.get $1)
+        )
+        (br $label$5)
+       )
+      )
+      (local.set $12
+       (i32.load offset=24
+        (local.get $0)
+       )
+      )
+      (block $label$22
+       (if
+        (i32.eq
+         (local.tee $4
+          (i32.load offset=12
+           (local.get $0)
+          )
+         )
+         (local.get $0)
+        )
+        (block
+         (if
+          (local.tee $4
+           (i32.load
+            (local.tee $8
+             (i32.add
+              (local.tee $5
+               (i32.add
+                (local.get $0)
+                (i32.const 16)
+               )
+              )
+              (i32.const 4)
+             )
+            )
+           )
+          )
+          (local.set $5
+           (local.get $8)
+          )
+          (if
+           (i32.eqz
+            (local.tee $4
+             (i32.load
+              (local.get $5)
+             )
+            )
+           )
+           (block
+            (local.set $7
+             (i32.const 0)
+            )
+            (br $label$22)
+           )
+          )
+         )
+         (loop $label$27
+          (if
+           (local.tee $10
+            (i32.load
+             (local.tee $8
+              (i32.add
+               (local.get $4)
+               (i32.const 20)
+              )
+             )
+            )
+           )
+           (block
+            (local.set $4
+             (local.get $10)
+            )
+            (local.set $5
+             (local.get $8)
+            )
+            (br $label$27)
+           )
+          )
+          (if
+           (local.tee $10
+            (i32.load
+             (local.tee $8
+              (i32.add
+               (local.get $4)
+               (i32.const 16)
+              )
+             )
+            )
+           )
+           (block
+            (local.set $4
+             (local.get $10)
+            )
+            (local.set $5
+             (local.get $8)
+            )
+            (br $label$27)
+           )
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.get $5)
+           (local.get $11)
+          )
+          (call $fimport$10)
+          (block
+           (i32.store
+            (local.get $5)
+            (i32.const 0)
+           )
+           (local.set $7
+            (local.get $4)
+           )
+          )
+         )
+        )
+        (block
+         (if
+          (i32.lt_u
+           (local.tee $5
+            (i32.load offset=8
+             (local.get $0)
+            )
+           )
+           (local.get $11)
+          )
+          (call $fimport$10)
+         )
+         (if
+          (i32.ne
+           (i32.load
+            (local.tee $8
+             (i32.add
+              (local.get $5)
+              (i32.const 12)
+             )
+            )
+           )
+           (local.get $0)
+          )
+          (call $fimport$10)
+         )
+         (if
+          (i32.eq
+           (i32.load
+            (local.tee $10
+             (i32.add
+              (local.get $4)
+              (i32.const 8)
+             )
+            )
+           )
+           (local.get $0)
+          )
+          (block
+           (i32.store
+            (local.get $8)
+            (local.get $4)
+           )
+           (i32.store
+            (local.get $10)
+            (local.get $5)
+           )
+           (local.set $7
+            (local.get $4)
+           )
+          )
+          (call $fimport$10)
+         )
+        )
+       )
+      )
+      (if
+       (local.get $12)
+       (block
+        (if
+         (i32.eq
+          (local.get $0)
+          (i32.load
+           (local.tee $5
+            (i32.add
+             (i32.shl
+              (local.tee $4
+               (i32.load offset=28
+                (local.get $0)
+               )
+              )
+              (i32.const 2)
+             )
+             (i32.const 3956)
+            )
+           )
+          )
+         )
+         (block
+          (i32.store
+           (local.get $5)
+           (local.get $7)
+          )
+          (if
+           (i32.eqz
+            (local.get $7)
+           )
+           (block
+            (i32.store
+             (i32.const 3656)
+             (i32.and
+              (i32.load
+               (i32.const 3656)
+              )
+              (i32.xor
+               (i32.shl
+                (i32.const 1)
+                (local.get $4)
+               )
+               (i32.const -1)
+              )
+             )
+            )
+            (local.set $3
+             (local.get $0)
+            )
+            (local.set $2
+             (local.get $1)
+            )
+            (br $label$5)
+           )
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $12)
+            (i32.load
+             (i32.const 3668)
+            )
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.eq
+            (i32.load
+             (local.tee $4
+              (i32.add
+               (local.get $12)
+               (i32.const 16)
+              )
+             )
+            )
+            (local.get $0)
+           )
+           (i32.store
+            (local.get $4)
+            (local.get $7)
+           )
+           (i32.store offset=20
+            (local.get $12)
+            (local.get $7)
+           )
+          )
+          (if
+           (i32.eqz
+            (local.get $7)
+           )
+           (block
+            (local.set $3
+             (local.get $0)
+            )
+            (local.set $2
+             (local.get $1)
+            )
+            (br $label$5)
+           )
+          )
+         )
+        )
+        (if
+         (i32.lt_u
+          (local.get $7)
+          (local.tee $5
+           (i32.load
+            (i32.const 3668)
+           )
+          )
+         )
+         (call $fimport$10)
+        )
+        (i32.store offset=24
+         (local.get $7)
+         (local.get $12)
+        )
+        (if
+         (local.tee $4
+          (i32.load
+           (local.tee $8
+            (i32.add
+             (local.get $0)
+             (i32.const 16)
+            )
+           )
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.get $4)
+           (local.get $5)
+          )
+          (call $fimport$10)
+          (block
+           (i32.store offset=16
+            (local.get $7)
+            (local.get $4)
+           )
+           (i32.store offset=24
+            (local.get $4)
+            (local.get $7)
+           )
+          )
+         )
+        )
+        (if
+         (local.tee $4
+          (i32.load offset=4
+           (local.get $8)
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.get $4)
+           (i32.load
+            (i32.const 3668)
+           )
+          )
+          (call $fimport$10)
+          (block
+           (i32.store offset=20
+            (local.get $7)
+            (local.get $4)
+           )
+           (i32.store offset=24
+            (local.get $4)
+            (local.get $7)
+           )
+           (local.set $3
+            (local.get $0)
+           )
+           (local.set $2
+            (local.get $1)
+           )
+          )
+         )
+         (block
+          (local.set $3
+           (local.get $0)
+          )
+          (local.set $2
+           (local.get $1)
+          )
+         )
+        )
+       )
+       (block
+        (local.set $3
+         (local.get $0)
+        )
+        (local.set $2
+         (local.get $1)
+        )
+       )
+      )
+     )
+    )
+   )
+   (if
+    (i32.ge_u
+     (local.get $3)
+     (local.get $6)
+    )
+    (call $fimport$10)
+   )
+   (if
+    (i32.eqz
+     (i32.and
+      (local.tee $0
+       (i32.load
+        (local.tee $1
+         (i32.add
+          (local.get $6)
+          (i32.const 4)
+         )
+        )
+       )
+      )
+      (i32.const 1)
+     )
+    )
+    (call $fimport$10)
+   )
+   (if
+    (i32.and
+     (local.get $0)
+     (i32.const 2)
+    )
+    (block
+     (i32.store
+      (local.get $1)
+      (i32.and
+       (local.get $0)
+       (i32.const -2)
+      )
+     )
+     (i32.store offset=4
+      (local.get $3)
+      (i32.or
+       (local.get $2)
+       (i32.const 1)
+      )
+     )
+     (i32.store
+      (i32.add
+       (local.get $3)
+       (local.get $2)
+      )
+      (local.get $2)
+     )
+    )
+    (block
+     (if
+      (i32.eq
+       (local.get $6)
+       (i32.load
+        (i32.const 3676)
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 3664)
+        (local.tee $0
+         (i32.add
+          (i32.load
+           (i32.const 3664)
+          )
+          (local.get $2)
+         )
+        )
+       )
+       (i32.store
+        (i32.const 3676)
+        (local.get $3)
+       )
+       (i32.store offset=4
+        (local.get $3)
+        (i32.or
+         (local.get $0)
+         (i32.const 1)
+        )
+       )
+       (if
+        (i32.ne
+         (local.get $3)
+         (i32.load
+          (i32.const 3672)
+         )
+        )
+        (return)
+       )
+       (i32.store
+        (i32.const 3672)
+        (i32.const 0)
+       )
+       (i32.store
+        (i32.const 3660)
+        (i32.const 0)
+       )
+       (return)
+      )
+     )
+     (if
+      (i32.eq
+       (local.get $6)
+       (i32.load
+        (i32.const 3672)
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 3660)
+        (local.tee $0
+         (i32.add
+          (i32.load
+           (i32.const 3660)
+          )
+          (local.get $2)
+         )
+        )
+       )
+       (i32.store
+        (i32.const 3672)
+        (local.get $3)
+       )
+       (i32.store offset=4
+        (local.get $3)
+        (i32.or
+         (local.get $0)
+         (i32.const 1)
+        )
+       )
+       (i32.store
+        (i32.add
+         (local.get $3)
+         (local.get $0)
+        )
+        (local.get $0)
+       )
+       (return)
+      )
+     )
+     (local.set $5
+      (i32.add
+       (i32.and
+        (local.get $0)
+        (i32.const -8)
+       )
+       (local.get $2)
+      )
+     )
+     (local.set $4
+      (i32.shr_u
+       (local.get $0)
+       (i32.const 3)
+      )
+     )
+     (block $label$61
+      (if
+       (i32.lt_u
+        (local.get $0)
+        (i32.const 256)
+       )
+       (block
+        (local.set $2
+         (i32.load offset=12
+          (local.get $6)
+         )
+        )
+        (if
+         (i32.ne
+          (local.tee $1
+           (i32.load offset=8
+            (local.get $6)
+           )
+          )
+          (local.tee $0
+           (i32.add
+            (i32.shl
+             (i32.shl
+              (local.get $4)
+              (i32.const 1)
+             )
+             (i32.const 2)
+            )
+            (i32.const 3692)
+           )
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $1)
+            (i32.load
+             (i32.const 3668)
+            )
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.ne
+            (i32.load offset=12
+             (local.get $1)
+            )
+            (local.get $6)
+           )
+           (call $fimport$10)
+          )
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $2)
+          (local.get $1)
+         )
+         (block
+          (i32.store
+           (i32.const 3652)
+           (i32.and
+            (i32.load
+             (i32.const 3652)
+            )
+            (i32.xor
+             (i32.shl
+              (i32.const 1)
+              (local.get $4)
+             )
+             (i32.const -1)
+            )
+           )
+          )
+          (br $label$61)
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $2)
+          (local.get $0)
+         )
+         (local.set $14
+          (i32.add
+           (local.get $2)
+           (i32.const 8)
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $2)
+            (i32.load
+             (i32.const 3668)
+            )
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.eq
+            (i32.load
+             (local.tee $0
+              (i32.add
+               (local.get $2)
+               (i32.const 8)
+              )
+             )
+            )
+            (local.get $6)
+           )
+           (local.set $14
+            (local.get $0)
+           )
+           (call $fimport$10)
+          )
+         )
+        )
+        (i32.store offset=12
+         (local.get $1)
+         (local.get $2)
+        )
+        (i32.store
+         (local.get $14)
+         (local.get $1)
+        )
+       )
+       (block
+        (local.set $7
+         (i32.load offset=24
+          (local.get $6)
+         )
+        )
+        (block $label$73
+         (if
+          (i32.eq
+           (local.tee $0
+            (i32.load offset=12
+             (local.get $6)
+            )
+           )
+           (local.get $6)
+          )
+          (block
+           (if
+            (local.tee $0
+             (i32.load
+              (local.tee $1
+               (i32.add
+                (local.tee $2
+                 (i32.add
+                  (local.get $6)
+                  (i32.const 16)
+                 )
+                )
+                (i32.const 4)
+               )
+              )
+             )
+            )
+            (local.set $2
+             (local.get $1)
+            )
+            (if
+             (i32.eqz
+              (local.tee $0
+               (i32.load
+                (local.get $2)
+               )
+              )
+             )
+             (block
+              (local.set $9
+               (i32.const 0)
+              )
+              (br $label$73)
+             )
+            )
+           )
+           (loop $label$78
+            (if
+             (local.tee $4
+              (i32.load
+               (local.tee $1
+                (i32.add
+                 (local.get $0)
+                 (i32.const 20)
+                )
+               )
+              )
+             )
+             (block
+              (local.set $0
+               (local.get $4)
+              )
+              (local.set $2
+               (local.get $1)
+              )
+              (br $label$78)
+             )
+            )
+            (if
+             (local.tee $4
+              (i32.load
+               (local.tee $1
+                (i32.add
+                 (local.get $0)
+                 (i32.const 16)
+                )
+               )
+              )
+             )
+             (block
+              (local.set $0
+               (local.get $4)
+              )
+              (local.set $2
+               (local.get $1)
+              )
+              (br $label$78)
+             )
+            )
+           )
+           (if
+            (i32.lt_u
+             (local.get $2)
+             (i32.load
+              (i32.const 3668)
+             )
+            )
+            (call $fimport$10)
+            (block
+             (i32.store
+              (local.get $2)
+              (i32.const 0)
+             )
+             (local.set $9
+              (local.get $0)
+             )
+            )
+           )
+          )
+          (block
+           (if
+            (i32.lt_u
+             (local.tee $2
+              (i32.load offset=8
+               (local.get $6)
+              )
+             )
+             (i32.load
+              (i32.const 3668)
+             )
+            )
+            (call $fimport$10)
+           )
+           (if
+            (i32.ne
+             (i32.load
+              (local.tee $1
+               (i32.add
+                (local.get $2)
+                (i32.const 12)
+               )
+              )
+             )
+             (local.get $6)
+            )
+            (call $fimport$10)
+           )
+           (if
+            (i32.eq
+             (i32.load
+              (local.tee $4
+               (i32.add
+                (local.get $0)
+                (i32.const 8)
+               )
+              )
+             )
+             (local.get $6)
+            )
+            (block
+             (i32.store
+              (local.get $1)
+              (local.get $0)
+             )
+             (i32.store
+              (local.get $4)
+              (local.get $2)
+             )
+             (local.set $9
+              (local.get $0)
+             )
+            )
+            (call $fimport$10)
+           )
+          )
+         )
+        )
+        (if
+         (local.get $7)
+         (block
+          (if
+           (i32.eq
+            (local.get $6)
+            (i32.load
+             (local.tee $2
+              (i32.add
+               (i32.shl
+                (local.tee $0
+                 (i32.load offset=28
+                  (local.get $6)
+                 )
+                )
+                (i32.const 2)
+               )
+               (i32.const 3956)
+              )
+             )
+            )
+           )
+           (block
+            (i32.store
+             (local.get $2)
+             (local.get $9)
+            )
+            (if
+             (i32.eqz
+              (local.get $9)
+             )
+             (block
+              (i32.store
+               (i32.const 3656)
+               (i32.and
+                (i32.load
+                 (i32.const 3656)
+                )
+                (i32.xor
+                 (i32.shl
+                  (i32.const 1)
+                  (local.get $0)
+                 )
+                 (i32.const -1)
+                )
+               )
+              )
+              (br $label$61)
+             )
+            )
+           )
+           (block
+            (if
+             (i32.lt_u
+              (local.get $7)
+              (i32.load
+               (i32.const 3668)
+              )
+             )
+             (call $fimport$10)
+            )
+            (if
+             (i32.eq
+              (i32.load
+               (local.tee $0
+                (i32.add
+                 (local.get $7)
+                 (i32.const 16)
+                )
+               )
+              )
+              (local.get $6)
+             )
+             (i32.store
+              (local.get $0)
+              (local.get $9)
+             )
+             (i32.store offset=20
+              (local.get $7)
+              (local.get $9)
+             )
+            )
+            (br_if $label$61
+             (i32.eqz
+              (local.get $9)
+             )
+            )
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.get $9)
+            (local.tee $2
+             (i32.load
+              (i32.const 3668)
+             )
+            )
+           )
+           (call $fimport$10)
+          )
+          (i32.store offset=24
+           (local.get $9)
+           (local.get $7)
+          )
+          (if
+           (local.tee $0
+            (i32.load
+             (local.tee $1
+              (i32.add
+               (local.get $6)
+               (i32.const 16)
+              )
+             )
+            )
+           )
+           (if
+            (i32.lt_u
+             (local.get $0)
+             (local.get $2)
+            )
+            (call $fimport$10)
+            (block
+             (i32.store offset=16
+              (local.get $9)
+              (local.get $0)
+             )
+             (i32.store offset=24
+              (local.get $0)
+              (local.get $9)
+             )
+            )
+           )
+          )
+          (if
+           (local.tee $0
+            (i32.load offset=4
+             (local.get $1)
+            )
+           )
+           (if
+            (i32.lt_u
+             (local.get $0)
+             (i32.load
+              (i32.const 3668)
+             )
+            )
+            (call $fimport$10)
+            (block
+             (i32.store offset=20
+              (local.get $9)
+              (local.get $0)
+             )
+             (i32.store offset=24
+              (local.get $0)
+              (local.get $9)
+             )
+            )
+           )
+          )
+         )
+        )
+       )
+      )
+     )
+     (i32.store offset=4
+      (local.get $3)
+      (i32.or
+       (local.get $5)
+       (i32.const 1)
+      )
+     )
+     (i32.store
+      (i32.add
+       (local.get $3)
+       (local.get $5)
+      )
+      (local.get $5)
+     )
+     (if
+      (i32.eq
+       (local.get $3)
+       (i32.load
+        (i32.const 3672)
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 3660)
+        (local.get $5)
+       )
+       (return)
+      )
+      (local.set $2
+       (local.get $5)
+      )
+     )
+    )
+   )
+   (local.set $1
+    (i32.shr_u
+     (local.get $2)
+     (i32.const 3)
+    )
+   )
+   (if
+    (i32.lt_u
+     (local.get $2)
+     (i32.const 256)
+    )
+    (block
+     (local.set $0
+      (i32.add
+       (i32.shl
+        (i32.shl
+         (local.get $1)
+         (i32.const 1)
+        )
+        (i32.const 2)
+       )
+       (i32.const 3692)
+      )
+     )
+     (if
+      (i32.and
+       (local.tee $2
+        (i32.load
+         (i32.const 3652)
+        )
+       )
+       (local.tee $1
+        (i32.shl
+         (i32.const 1)
+         (local.get $1)
+        )
+       )
+      )
+      (if
+       (i32.lt_u
+        (local.tee $1
+         (i32.load
+          (local.tee $2
+           (i32.add
+            (local.get $0)
+            (i32.const 8)
+           )
+          )
+         )
+        )
+        (i32.load
+         (i32.const 3668)
+        )
+       )
+       (call $fimport$10)
+       (block
+        (local.set $15
+         (local.get $2)
+        )
+        (local.set $13
+         (local.get $1)
+        )
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 3652)
+        (i32.or
+         (local.get $2)
+         (local.get $1)
+        )
+       )
+       (local.set $15
+        (i32.add
+         (local.get $0)
+         (i32.const 8)
+        )
+       )
+       (local.set $13
+        (local.get $0)
+       )
+      )
+     )
+     (i32.store
+      (local.get $15)
+      (local.get $3)
+     )
+     (i32.store offset=12
+      (local.get $13)
+      (local.get $3)
+     )
+     (i32.store offset=8
+      (local.get $3)
+      (local.get $13)
+     )
+     (i32.store offset=12
+      (local.get $3)
+      (local.get $0)
+     )
+     (return)
+    )
+   )
+   (local.set $0
+    (i32.add
+     (i32.shl
+      (local.tee $1
+       (if (result i32)
+        (local.tee $0
+         (i32.shr_u
+          (local.get $2)
+          (i32.const 8)
+         )
+        )
+        (if (result i32)
+         (i32.gt_u
+          (local.get $2)
+          (i32.const 16777215)
+         )
+         (i32.const 31)
+         (i32.or
+          (i32.and
+           (i32.shr_u
+            (local.get $2)
+            (i32.add
+             (local.tee $0
+              (i32.add
+               (i32.sub
+                (i32.const 14)
+                (i32.or
+                 (i32.or
+                  (local.tee $4
+                   (i32.and
+                    (i32.shr_u
+                     (i32.add
+                      (local.tee $1
+                       (i32.shl
+                        (local.get $0)
+                        (local.tee $0
+                         (i32.and
+                          (i32.shr_u
+                           (i32.add
+                            (local.get $0)
+                            (i32.const 1048320)
+                           )
+                           (i32.const 16)
+                          )
+                          (i32.const 8)
+                         )
+                        )
+                       )
+                      )
+                      (i32.const 520192)
+                     )
+                     (i32.const 16)
+                    )
+                    (i32.const 4)
+                   )
+                  )
+                  (local.get $0)
+                 )
+                 (local.tee $1
+                  (i32.and
+                   (i32.shr_u
+                    (i32.add
+                     (local.tee $0
+                      (i32.shl
+                       (local.get $1)
+                       (local.get $4)
+                      )
+                     )
+                     (i32.const 245760)
+                    )
+                    (i32.const 16)
+                   )
+                   (i32.const 2)
+                  )
+                 )
+                )
+               )
+               (i32.shr_u
+                (i32.shl
+                 (local.get $0)
+                 (local.get $1)
+                )
+                (i32.const 15)
+               )
+              )
+             )
+             (i32.const 7)
+            )
+           )
+           (i32.const 1)
+          )
+          (i32.shl
+           (local.get $0)
+           (i32.const 1)
+          )
+         )
+        )
+        (i32.const 0)
+       )
+      )
+      (i32.const 2)
+     )
+     (i32.const 3956)
+    )
+   )
+   (i32.store offset=28
+    (local.get $3)
+    (local.get $1)
+   )
+   (i32.store offset=20
+    (local.get $3)
+    (i32.const 0)
+   )
+   (i32.store offset=16
+    (local.get $3)
+    (i32.const 0)
+   )
+   (block $label$113
+    (if
+     (i32.and
+      (local.tee $4
+       (i32.load
+        (i32.const 3656)
+       )
+      )
+      (local.tee $5
+       (i32.shl
+        (i32.const 1)
+        (local.get $1)
+       )
+      )
+     )
+     (block
+      (local.set $0
+       (i32.load
+        (local.get $0)
+       )
+      )
+      (local.set $4
+       (i32.sub
+        (i32.const 25)
+        (i32.shr_u
+         (local.get $1)
+         (i32.const 1)
+        )
+       )
+      )
+      (local.set $1
+       (i32.shl
+        (local.get $2)
+        (if (result i32)
+         (i32.eq
+          (local.get $1)
+          (i32.const 31)
+         )
+         (i32.const 0)
+         (local.get $4)
+        )
+       )
+      )
+      (block $label$117
+       (block $label$118
+        (block $label$119
+         (loop $label$120
+          (br_if $label$118
+           (i32.eq
+            (i32.and
+             (i32.load offset=4
+              (local.get $0)
+             )
+             (i32.const -8)
+            )
+            (local.get $2)
+           )
+          )
+          (local.set $4
+           (i32.shl
+            (local.get $1)
+            (i32.const 1)
+           )
+          )
+          (br_if $label$119
+           (i32.eqz
+            (local.tee $5
+             (i32.load
+              (local.tee $1
+               (i32.add
+                (i32.add
+                 (local.get $0)
+                 (i32.const 16)
+                )
+                (i32.shl
+                 (i32.shr_u
+                  (local.get $1)
+                  (i32.const 31)
+                 )
+                 (i32.const 2)
+                )
+               )
+              )
+             )
+            )
+           )
+          )
+          (local.set $1
+           (local.get $4)
+          )
+          (local.set $0
+           (local.get $5)
+          )
+          (br $label$120)
+         )
+        )
+        (if
+         (i32.lt_u
+          (local.get $1)
+          (i32.load
+           (i32.const 3668)
+          )
+         )
+         (call $fimport$10)
+         (block
+          (i32.store
+           (local.get $1)
+           (local.get $3)
+          )
+          (i32.store offset=24
+           (local.get $3)
+           (local.get $0)
+          )
+          (i32.store offset=12
+           (local.get $3)
+           (local.get $3)
+          )
+          (i32.store offset=8
+           (local.get $3)
+           (local.get $3)
+          )
+          (br $label$113)
+         )
+        )
+        (br $label$117)
+       )
+       (if
+        (i32.and
+         (i32.ge_u
+          (local.tee $2
+           (i32.load
+            (local.tee $1
+             (i32.add
+              (local.get $0)
+              (i32.const 8)
+             )
+            )
+           )
+          )
+          (local.tee $4
+           (i32.load
+            (i32.const 3668)
+           )
+          )
+         )
+         (i32.ge_u
+          (local.get $0)
+          (local.get $4)
+         )
+        )
+        (block
+         (i32.store offset=12
+          (local.get $2)
+          (local.get $3)
+         )
+         (i32.store
+          (local.get $1)
+          (local.get $3)
+         )
+         (i32.store offset=8
+          (local.get $3)
+          (local.get $2)
+         )
+         (i32.store offset=12
+          (local.get $3)
+          (local.get $0)
+         )
+         (i32.store offset=24
+          (local.get $3)
+          (i32.const 0)
+         )
+        )
+        (call $fimport$10)
+       )
+      )
+     )
+     (block
+      (i32.store
+       (i32.const 3656)
+       (i32.or
+        (local.get $4)
+        (local.get $5)
+       )
+      )
+      (i32.store
+       (local.get $0)
+       (local.get $3)
+      )
+      (i32.store offset=24
+       (local.get $3)
+       (local.get $0)
+      )
+      (i32.store offset=12
+       (local.get $3)
+       (local.get $3)
+      )
+      (i32.store offset=8
+       (local.get $3)
+       (local.get $3)
+      )
+     )
+    )
+   )
+   (i32.store
+    (i32.const 3684)
+    (local.tee $0
+     (i32.add
+      (i32.load
+       (i32.const 3684)
+      )
+      (i32.const -1)
+     )
+    )
+   )
+   (if
+    (local.get $0)
+    (return)
+    (local.set $0
+     (i32.const 4108)
+    )
+   )
+   (loop $label$128
+    (local.set $0
+     (i32.add
+      (local.tee $2
+       (i32.load
+        (local.get $0)
+       )
+      )
+      (i32.const 8)
+     )
+    )
+    (br_if $label$128
+     (local.get $2)
+    )
+   )
+   (i32.store
+    (i32.const 3684)
+    (i32.const -1)
+   )
   )
-  (func $32 (;45;) (type $4) (param $0 i32) (param $1 i32) (result i32)
-    (local $2 i32) (local $3 i32)
-    block $label$1 (result i32) ;; label = @1
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          local.get $1
-          i32.load offset=76
-          i32.const 0
-          i32.lt_s
-          br_if 0 (;@3;)
-          local.get $1
-          call $20
-          i32.eqz
-          br_if 0 (;@3;)
-          block $label$4 (result i32) ;; label = @4
-            block $label$5 ;; label = @5
-              local.get $1
-              i32.load8_s offset=75
-              local.get $0
-              i32.eq
-              br_if 0 (;@5;)
-              local.get $1
-              i32.const 20
-              i32.add
-              local.tee $3
-              i32.load
-              local.tee $2
-              local.get $1
-              i32.load offset=16
-              i32.ge_u
-              br_if 0 (;@5;)
-              local.get $3
-              local.get $2
-              i32.const 1
-              i32.add
-              i32.store
-              local.get $2
-              local.get $0
-              i32.store8
-              local.get $0
-              i32.const 255
-              i32.and
-              br 1 (;@4;)
-            end
-            local.get $1
-            local.get $0
-            call $31
-          end
-          local.set $0
-          local.get $1
-          call $13
-          br 1 (;@2;)
-        end
-        local.get $1
-        i32.load8_s offset=75
-        local.get $0
-        i32.ne
-        if ;; label = @3
-          local.get $1
-          i32.const 20
-          i32.add
-          local.tee $3
-          i32.load
-          local.tee $2
-          local.get $1
-          i32.load offset=16
-          i32.lt_u
-          if ;; label = @4
-            block ;; label = @5
-              local.get $3
-              local.get $2
-              i32.const 1
-              i32.add
-              i32.store
-              local.get $2
-              local.get $0
-              i32.store8
-              local.get $0
-              i32.const 255
-              i32.and
-              local.set $0
-              br 3 (;@2;)
-            end
-          end
-        end
-        local.get $1
-        local.get $0
-        call $31
-        local.set $0
-      end
-      local.get $0
-    end
+ )
+ (func $37 (; 50 ;) (type $6)
+  (nop)
+ )
+ (func $38 (; 51 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (i32.add
+     (local.tee $2
+      (i32.load
+       (global.get $global$0)
+      )
+     )
+     (local.tee $0
+      (i32.and
+       (i32.add
+        (local.get $0)
+        (i32.const 15)
+       )
+       (i32.const -16)
+      )
+     )
+    )
+   )
+   (if
+    (i32.or
+     (i32.and
+      (i32.gt_s
+       (local.get $0)
+       (i32.const 0)
+      )
+      (i32.lt_s
+       (local.get $1)
+       (local.get $2)
+      )
+     )
+     (i32.lt_s
+      (local.get $1)
+      (i32.const 0)
+     )
+    )
+    (block
+     (drop
+      (call $fimport$6)
+     )
+     (call $fimport$11
+      (i32.const 12)
+     )
+     (return
+      (i32.const -1)
+     )
+    )
+   )
+   (i32.store
+    (global.get $global$0)
+    (local.get $1)
+   )
+   (if
+    (i32.gt_s
+     (local.get $1)
+     (call $fimport$5)
+    )
+    (if
+     (i32.eqz
+      (call $fimport$4)
+     )
+     (block
+      (call $fimport$11
+       (i32.const 12)
+      )
+      (i32.store
+       (global.get $global$0)
+       (local.get $2)
+      )
+      (return
+       (i32.const -1)
+      )
+     )
+    )
+   )
+   (local.get $2)
   )
-  (func $33 (;46;) (type $4) (param $0 i32) (param $1 i32) (result i32)
-    (local $2 i32) (local $3 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $2
-      global.get $global$1
-      i32.const 16
-      i32.add
-      global.set $global$1
-      local.get $2
-      local.tee $3
-      local.get $1
-      i32.store
-      i32.const 1024
-      i32.load
-      local.get $0
-      local.get $3
-      call $18
-      local.set $0
-      local.get $2
-      global.set $global$1
-      local.get $0
-    end
+ )
+ (func $39 (; 52 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (i32.add
+     (local.get $0)
+     (local.get $2)
+    )
+   )
+   (if
+    (i32.ge_s
+     (local.get $2)
+     (i32.const 20)
+    )
+    (block
+     (local.set $1
+      (i32.and
+       (local.get $1)
+       (i32.const 255)
+      )
+     )
+     (if
+      (local.tee $3
+       (i32.and
+        (local.get $0)
+        (i32.const 3)
+       )
+      )
+      (block
+       (local.set $3
+        (i32.sub
+         (i32.add
+          (local.get $0)
+          (i32.const 4)
+         )
+         (local.get $3)
+        )
+       )
+       (loop $label$4
+        (if
+         (i32.lt_s
+          (local.get $0)
+          (local.get $3)
+         )
+         (block
+          (i32.store8
+           (local.get $0)
+           (local.get $1)
+          )
+          (local.set $0
+           (i32.add
+            (local.get $0)
+            (i32.const 1)
+           )
+          )
+          (br $label$4)
+         )
+        )
+       )
+      )
+     )
+     (local.set $3
+      (i32.or
+       (i32.or
+        (i32.or
+         (local.get $1)
+         (i32.shl
+          (local.get $1)
+          (i32.const 8)
+         )
+        )
+        (i32.shl
+         (local.get $1)
+         (i32.const 16)
+        )
+       )
+       (i32.shl
+        (local.get $1)
+        (i32.const 24)
+       )
+      )
+     )
+     (local.set $5
+      (i32.and
+       (local.get $4)
+       (i32.const -4)
+      )
+     )
+     (loop $label$6
+      (if
+       (i32.lt_s
+        (local.get $0)
+        (local.get $5)
+       )
+       (block
+        (i32.store
+         (local.get $0)
+         (local.get $3)
+        )
+        (local.set $0
+         (i32.add
+          (local.get $0)
+          (i32.const 4)
+         )
+        )
+        (br $label$6)
+       )
+      )
+     )
+    )
+   )
+   (loop $label$8
+    (if
+     (i32.lt_s
+      (local.get $0)
+      (local.get $4)
+     )
+     (block
+      (i32.store8
+       (local.get $0)
+       (local.get $1)
+      )
+      (local.set $0
+       (i32.add
+        (local.get $0)
+        (i32.const 1)
+       )
+      )
+      (br $label$8)
+     )
+    )
+   )
+   (i32.sub
+    (local.get $0)
+    (local.get $2)
+   )
   )
-  (func $34 (;47;) (type $1) (param $0 i32) (result i32)
-    local.get $0
-    i32.const 1024
-    i32.load
-    call $32
+ )
+ (func $40 (; 53 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (block $label$1 (result i32)
+   (if
+    (i32.ge_s
+     (local.get $2)
+     (i32.const 4096)
+    )
+    (return
+     (call $fimport$12
+      (local.get $0)
+      (local.get $1)
+      (local.get $2)
+     )
+    )
+   )
+   (local.set $3
+    (local.get $0)
+   )
+   (if
+    (i32.eq
+     (i32.and
+      (local.get $0)
+      (i32.const 3)
+     )
+     (i32.and
+      (local.get $1)
+      (i32.const 3)
+     )
+    )
+    (block
+     (loop $label$4
+      (if
+       (i32.and
+        (local.get $0)
+        (i32.const 3)
+       )
+       (block
+        (if
+         (i32.eqz
+          (local.get $2)
+         )
+         (return
+          (local.get $3)
+         )
+        )
+        (i32.store8
+         (local.get $0)
+         (i32.load8_s
+          (local.get $1)
+         )
+        )
+        (local.set $0
+         (i32.add
+          (local.get $0)
+          (i32.const 1)
+         )
+        )
+        (local.set $1
+         (i32.add
+          (local.get $1)
+          (i32.const 1)
+         )
+        )
+        (local.set $2
+         (i32.sub
+          (local.get $2)
+          (i32.const 1)
+         )
+        )
+        (br $label$4)
+       )
+      )
+     )
+     (loop $label$7
+      (if
+       (i32.ge_s
+        (local.get $2)
+        (i32.const 4)
+       )
+       (block
+        (i32.store
+         (local.get $0)
+         (i32.load
+          (local.get $1)
+         )
+        )
+        (local.set $0
+         (i32.add
+          (local.get $0)
+          (i32.const 4)
+         )
+        )
+        (local.set $1
+         (i32.add
+          (local.get $1)
+          (i32.const 4)
+         )
+        )
+        (local.set $2
+         (i32.sub
+          (local.get $2)
+          (i32.const 4)
+         )
+        )
+        (br $label$7)
+       )
+      )
+     )
+    )
+   )
+   (loop $label$9
+    (if
+     (i32.gt_s
+      (local.get $2)
+      (i32.const 0)
+     )
+     (block
+      (i32.store8
+       (local.get $0)
+       (i32.load8_s
+        (local.get $1)
+       )
+      )
+      (local.set $0
+       (i32.add
+        (local.get $0)
+        (i32.const 1)
+       )
+      )
+      (local.set $1
+       (i32.add
+        (local.get $1)
+        (i32.const 1)
+       )
+      )
+      (local.set $2
+       (i32.sub
+        (local.get $2)
+        (i32.const 1)
+       )
+      )
+      (br $label$9)
+     )
+    )
+   )
+   (local.get $3)
   )
-  (func $35 (;48;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32) (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32) (local $15 i32) (local $16 i32) (local $17 i32) (local $18 i32) (local $19 i32) (local $20 i32) (local $21 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $14
-      global.get $global$1
-      i32.const 16
-      i32.add
-      global.set $global$1
-      local.get $14
-      local.set $18
-      block $label$2 ;; label = @2
-        local.get $0
-        i32.const 245
-        i32.lt_u
-        if ;; label = @3
-          block ;; label = @4
-            local.get $0
-            i32.const 11
-            i32.add
-            i32.const -8
-            i32.and
-            local.set $3
-            i32.const 3652
-            i32.load
-            local.tee $8
-            local.get $0
-            i32.const 11
-            i32.lt_u
-            if (result i32) ;; label = @5
-              i32.const 16
-              local.tee $3
-            else
-              local.get $3
-            end
-            i32.const 3
-            i32.shr_u
-            local.tee $2
-            i32.shr_u
-            local.tee $0
-            i32.const 3
-            i32.and
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                i32.const 1
-                i32.and
-                i32.const 1
-                i32.xor
-                local.get $2
-                i32.add
-                local.tee $5
-                i32.const 1
-                i32.shl
-                i32.const 2
-                i32.shl
-                i32.const 3692
-                i32.add
-                local.tee $2
-                i32.const 8
-                i32.add
-                local.tee $3
-                i32.load
-                local.tee $7
-                i32.const 8
-                i32.add
-                local.tee $1
-                i32.load
-                local.set $4
-                local.get $2
-                local.get $4
-                i32.eq
-                if ;; label = @7
-                  i32.const 3652
-                  local.get $8
-                  i32.const 1
-                  local.get $5
-                  i32.shl
-                  i32.const -1
-                  i32.xor
-                  i32.and
-                  i32.store
-                else
-                  block ;; label = @8
-                    local.get $4
-                    i32.const 3668
-                    i32.load
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $4
-                    i32.const 12
-                    i32.add
-                    local.tee $0
-                    i32.load
-                    local.get $7
-                    i32.eq
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $0
-                        local.get $2
-                        i32.store
-                        local.get $3
-                        local.get $4
-                        i32.store
-                      end
-                    else
-                      call $fimport$10
-                    end
-                  end
-                end
-                local.get $7
-                local.get $5
-                i32.const 3
-                i32.shl
-                local.tee $0
-                i32.const 3
-                i32.or
-                i32.store offset=4
-                local.get $7
-                local.get $0
-                i32.add
-                i32.const 4
-                i32.add
-                local.tee $0
-                local.get $0
-                i32.load
-                i32.const 1
-                i32.or
-                i32.store
-                local.get $14
-                global.set $global$1
-                local.get $1
-                return
-              end
-            end
-            local.get $3
-            i32.const 3660
-            i32.load
-            local.tee $16
-            i32.gt_u
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $0
-                    local.get $2
-                    i32.shl
-                    i32.const 2
-                    local.get $2
-                    i32.shl
-                    local.tee $0
-                    i32.const 0
-                    local.get $0
-                    i32.sub
-                    i32.or
-                    i32.and
-                    local.tee $0
-                    i32.const 0
-                    local.get $0
-                    i32.sub
-                    i32.and
-                    i32.const -1
-                    i32.add
-                    local.tee $0
-                    i32.const 12
-                    i32.shr_u
-                    i32.const 16
-                    i32.and
-                    local.set $5
-                    local.get $0
-                    local.get $5
-                    i32.shr_u
-                    local.tee $2
-                    i32.const 5
-                    i32.shr_u
-                    i32.const 8
-                    i32.and
-                    local.tee $0
-                    local.get $5
-                    i32.or
-                    local.get $2
-                    local.get $0
-                    i32.shr_u
-                    local.tee $2
-                    i32.const 2
-                    i32.shr_u
-                    i32.const 4
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $2
-                    local.get $0
-                    i32.shr_u
-                    local.tee $2
-                    i32.const 1
-                    i32.shr_u
-                    i32.const 2
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $2
-                    local.get $0
-                    i32.shr_u
-                    local.tee $2
-                    i32.const 1
-                    i32.shr_u
-                    i32.const 1
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $2
-                    local.get $0
-                    i32.shr_u
-                    i32.add
-                    local.tee $11
-                    i32.const 1
-                    i32.shl
-                    i32.const 2
-                    i32.shl
-                    i32.const 3692
-                    i32.add
-                    local.tee $4
-                    i32.const 8
-                    i32.add
-                    local.tee $2
-                    i32.load
-                    local.tee $9
-                    i32.const 8
-                    i32.add
-                    local.tee $5
-                    i32.load
-                    local.set $12
-                    local.get $4
-                    local.get $12
-                    i32.eq
-                    if ;; label = @9
-                      i32.const 3652
-                      local.get $8
-                      i32.const 1
-                      local.get $11
-                      i32.shl
-                      i32.const -1
-                      i32.xor
-                      i32.and
-                      local.tee $7
-                      i32.store
-                    else
-                      block ;; label = @10
-                        local.get $12
-                        i32.const 3668
-                        i32.load
-                        i32.lt_u
-                        if ;; label = @11
-                          call $fimport$10
-                        end
-                        local.get $12
-                        i32.const 12
-                        i32.add
-                        local.tee $0
-                        i32.load
-                        local.get $9
-                        i32.eq
-                        if ;; label = @11
-                          block ;; label = @12
-                            local.get $0
-                            local.get $4
-                            i32.store
-                            local.get $2
-                            local.get $12
-                            i32.store
-                            local.get $8
-                            local.set $7
-                          end
-                        else
-                          call $fimport$10
-                        end
-                      end
-                    end
-                    local.get $9
-                    local.get $3
-                    i32.const 3
-                    i32.or
-                    i32.store offset=4
-                    local.get $9
-                    local.get $3
-                    i32.add
-                    local.tee $4
-                    local.get $11
-                    i32.const 3
-                    i32.shl
-                    local.get $3
-                    i32.sub
-                    local.tee $11
-                    i32.const 1
-                    i32.or
-                    i32.store offset=4
-                    local.get $4
-                    local.get $11
-                    i32.add
-                    local.get $11
-                    i32.store
-                    local.get $16
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const 3672
-                        i32.load
-                        local.set $9
-                        local.get $16
-                        i32.const 3
-                        i32.shr_u
-                        local.tee $0
-                        i32.const 1
-                        i32.shl
-                        i32.const 2
-                        i32.shl
-                        i32.const 3692
-                        i32.add
-                        local.set $2
-                        local.get $7
-                        i32.const 1
-                        local.get $0
-                        i32.shl
-                        local.tee $0
-                        i32.and
-                        if ;; label = @11
-                          local.get $2
-                          i32.const 8
-                          i32.add
-                          local.tee $3
-                          i32.load
-                          local.tee $0
-                          i32.const 3668
-                          i32.load
-                          i32.lt_u
-                          if ;; label = @12
-                            call $fimport$10
-                          else
-                            block ;; label = @13
-                              local.get $3
-                              local.set $6
-                              local.get $0
-                              local.set $1
-                            end
-                          end
-                        else
-                          block ;; label = @12
-                            i32.const 3652
-                            local.get $7
-                            local.get $0
-                            i32.or
-                            i32.store
-                            local.get $2
-                            i32.const 8
-                            i32.add
-                            local.set $6
-                            local.get $2
-                            local.set $1
-                          end
-                        end
-                        local.get $6
-                        local.get $9
-                        i32.store
-                        local.get $1
-                        local.get $9
-                        i32.store offset=12
-                        local.get $9
-                        local.get $1
-                        i32.store offset=8
-                        local.get $9
-                        local.get $2
-                        i32.store offset=12
-                      end
-                    end
-                    i32.const 3660
-                    local.get $11
-                    i32.store
-                    i32.const 3672
-                    local.get $4
-                    i32.store
-                    local.get $14
-                    global.set $global$1
-                    local.get $5
-                    return
-                  end
-                end
-                i32.const 3656
-                i32.load
-                local.tee $6
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $6
-                    i32.const 0
-                    local.get $6
-                    i32.sub
-                    i32.and
-                    i32.const -1
-                    i32.add
-                    local.tee $0
-                    i32.const 12
-                    i32.shr_u
-                    i32.const 16
-                    i32.and
-                    local.set $2
-                    local.get $0
-                    local.get $2
-                    i32.shr_u
-                    local.tee $1
-                    i32.const 5
-                    i32.shr_u
-                    i32.const 8
-                    i32.and
-                    local.tee $0
-                    local.get $2
-                    i32.or
-                    local.get $1
-                    local.get $0
-                    i32.shr_u
-                    local.tee $1
-                    i32.const 2
-                    i32.shr_u
-                    i32.const 4
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $1
-                    local.get $0
-                    i32.shr_u
-                    local.tee $1
-                    i32.const 1
-                    i32.shr_u
-                    i32.const 2
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $1
-                    local.get $0
-                    i32.shr_u
-                    local.tee $1
-                    i32.const 1
-                    i32.shr_u
-                    i32.const 1
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $1
-                    local.get $0
-                    i32.shr_u
-                    i32.add
-                    i32.const 2
-                    i32.shl
-                    i32.const 3956
-                    i32.add
-                    i32.load
-                    local.tee $2
-                    i32.load offset=4
-                    i32.const -8
-                    i32.and
-                    local.get $3
-                    i32.sub
-                    local.set $9
-                    local.get $2
-                    local.set $1
-                    loop $label$25 ;; label = @9
-                      block $label$26 ;; label = @10
-                        local.get $1
-                        i32.load offset=16
-                        local.tee $0
-                        i32.eqz
-                        if ;; label = @11
-                          local.get $1
-                          i32.load offset=20
-                          local.tee $0
-                          i32.eqz
-                          br_if 1 (;@10;)
-                        end
-                        local.get $0
-                        i32.load offset=4
-                        i32.const -8
-                        i32.and
-                        local.get $3
-                        i32.sub
-                        local.tee $1
-                        local.get $9
-                        i32.lt_u
-                        local.tee $7
-                        if ;; label = @11
-                          local.get $1
-                          local.set $9
-                        end
-                        local.get $0
-                        local.set $1
-                        local.get $7
-                        if ;; label = @11
-                          local.get $0
-                          local.set $2
-                        end
-                        br 1 (;@9;)
-                      end
-                    end
-                    local.get $2
-                    i32.const 3668
-                    i32.load
-                    local.tee $12
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $2
-                    local.get $2
-                    local.get $3
-                    i32.add
-                    local.tee $13
-                    i32.ge_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $2
-                    i32.load offset=24
-                    local.set $15
-                    block $label$32 ;; label = @9
-                      local.get $2
-                      i32.load offset=12
-                      local.tee $0
-                      local.get $2
-                      i32.eq
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $2
-                          i32.const 20
-                          i32.add
-                          local.tee $1
-                          i32.load
-                          local.tee $0
-                          i32.eqz
-                          if ;; label = @12
-                            local.get $2
-                            i32.const 16
-                            i32.add
-                            local.tee $1
-                            i32.load
-                            local.tee $0
-                            i32.eqz
-                            if ;; label = @13
-                              block ;; label = @14
-                                i32.const 0
-                                local.set $4
-                                br 5 (;@9;)
-                              end
-                            end
-                          end
-                          loop $label$36 ;; label = @12
-                            local.get $0
-                            i32.const 20
-                            i32.add
-                            local.tee $11
-                            i32.load
-                            local.tee $7
-                            if ;; label = @13
-                              block ;; label = @14
-                                local.get $7
-                                local.set $0
-                                local.get $11
-                                local.set $1
-                                br 2 (;@12;)
-                              end
-                            end
-                            local.get $0
-                            i32.const 16
-                            i32.add
-                            local.tee $11
-                            i32.load
-                            local.tee $7
-                            if ;; label = @13
-                              block ;; label = @14
-                                local.get $7
-                                local.set $0
-                                local.get $11
-                                local.set $1
-                                br 2 (;@12;)
-                              end
-                            end
-                          end
-                          local.get $1
-                          local.get $12
-                          i32.lt_u
-                          if ;; label = @12
-                            call $fimport$10
-                          else
-                            block ;; label = @13
-                              local.get $1
-                              i32.const 0
-                              i32.store
-                              local.get $0
-                              local.set $4
-                            end
-                          end
-                        end
-                      else
-                        block ;; label = @11
-                          local.get $2
-                          i32.load offset=8
-                          local.tee $11
-                          local.get $12
-                          i32.lt_u
-                          if ;; label = @12
-                            call $fimport$10
-                          end
-                          local.get $11
-                          i32.const 12
-                          i32.add
-                          local.tee $7
-                          i32.load
-                          local.get $2
-                          i32.ne
-                          if ;; label = @12
-                            call $fimport$10
-                          end
-                          local.get $0
-                          i32.const 8
-                          i32.add
-                          local.tee $1
-                          i32.load
-                          local.get $2
-                          i32.eq
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $7
-                              local.get $0
-                              i32.store
-                              local.get $1
-                              local.get $11
-                              i32.store
-                              local.get $0
-                              local.set $4
-                            end
-                          else
-                            call $fimport$10
-                          end
-                        end
-                      end
-                    end
-                    block $label$46 ;; label = @9
-                      local.get $15
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $2
-                          local.get $2
-                          i32.load offset=28
-                          local.tee $1
-                          i32.const 2
-                          i32.shl
-                          i32.const 3956
-                          i32.add
-                          local.tee $0
-                          i32.load
-                          i32.eq
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $0
-                              local.get $4
-                              i32.store
-                              local.get $4
-                              i32.eqz
-                              if ;; label = @14
-                                block ;; label = @15
-                                  i32.const 3656
-                                  local.get $6
-                                  i32.const 1
-                                  local.get $1
-                                  i32.shl
-                                  i32.const -1
-                                  i32.xor
-                                  i32.and
-                                  i32.store
-                                  br 6 (;@9;)
-                                end
-                              end
-                            end
-                          else
-                            block ;; label = @13
-                              local.get $15
-                              i32.const 3668
-                              i32.load
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$10
-                              end
-                              local.get $15
-                              i32.const 16
-                              i32.add
-                              local.tee $0
-                              i32.load
-                              local.get $2
-                              i32.eq
-                              if ;; label = @14
-                                local.get $0
-                                local.get $4
-                                i32.store
-                              else
-                                local.get $15
-                                local.get $4
-                                i32.store offset=20
-                              end
-                              local.get $4
-                              i32.eqz
-                              br_if 4 (;@9;)
-                            end
-                          end
-                          local.get $4
-                          i32.const 3668
-                          i32.load
-                          local.tee $0
-                          i32.lt_u
-                          if ;; label = @12
-                            call $fimport$10
-                          end
-                          local.get $4
-                          local.get $15
-                          i32.store offset=24
-                          local.get $2
-                          i32.load offset=16
-                          local.tee $1
-                          if ;; label = @12
-                            local.get $1
-                            local.get $0
-                            i32.lt_u
-                            if ;; label = @13
-                              call $fimport$10
-                            else
-                              block ;; label = @14
-                                local.get $4
-                                local.get $1
-                                i32.store offset=16
-                                local.get $1
-                                local.get $4
-                                i32.store offset=24
-                              end
-                            end
-                          end
-                          local.get $2
-                          i32.load offset=20
-                          local.tee $0
-                          if ;; label = @12
-                            local.get $0
-                            i32.const 3668
-                            i32.load
-                            i32.lt_u
-                            if ;; label = @13
-                              call $fimport$10
-                            else
-                              block ;; label = @14
-                                local.get $4
-                                local.get $0
-                                i32.store offset=20
-                                local.get $0
-                                local.get $4
-                                i32.store offset=24
-                              end
-                            end
-                          end
-                        end
-                      end
-                    end
-                    local.get $9
-                    i32.const 16
-                    i32.lt_u
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $2
-                        local.get $9
-                        local.get $3
-                        i32.add
-                        local.tee $0
-                        i32.const 3
-                        i32.or
-                        i32.store offset=4
-                        local.get $2
-                        local.get $0
-                        i32.add
-                        i32.const 4
-                        i32.add
-                        local.tee $0
-                        local.get $0
-                        i32.load
-                        i32.const 1
-                        i32.or
-                        i32.store
-                      end
-                    else
-                      block ;; label = @10
-                        local.get $2
-                        local.get $3
-                        i32.const 3
-                        i32.or
-                        i32.store offset=4
-                        local.get $13
-                        local.get $9
-                        i32.const 1
-                        i32.or
-                        i32.store offset=4
-                        local.get $13
-                        local.get $9
-                        i32.add
-                        local.get $9
-                        i32.store
-                        local.get $16
-                        if ;; label = @11
-                          block ;; label = @12
-                            i32.const 3672
-                            i32.load
-                            local.set $7
-                            local.get $16
-                            i32.const 3
-                            i32.shr_u
-                            local.tee $0
-                            i32.const 1
-                            i32.shl
-                            i32.const 2
-                            i32.shl
-                            i32.const 3692
-                            i32.add
-                            local.set $3
-                            local.get $8
-                            i32.const 1
-                            local.get $0
-                            i32.shl
-                            local.tee $0
-                            i32.and
-                            if ;; label = @13
-                              local.get $3
-                              i32.const 8
-                              i32.add
-                              local.tee $1
-                              i32.load
-                              local.tee $0
-                              i32.const 3668
-                              i32.load
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$10
-                              else
-                                block ;; label = @15
-                                  local.get $1
-                                  local.set $10
-                                  local.get $0
-                                  local.set $5
-                                end
-                              end
-                            else
-                              block ;; label = @14
-                                i32.const 3652
-                                local.get $8
-                                local.get $0
-                                i32.or
-                                i32.store
-                                local.get $3
-                                i32.const 8
-                                i32.add
-                                local.set $10
-                                local.get $3
-                                local.set $5
-                              end
-                            end
-                            local.get $10
-                            local.get $7
-                            i32.store
-                            local.get $5
-                            local.get $7
-                            i32.store offset=12
-                            local.get $7
-                            local.get $5
-                            i32.store offset=8
-                            local.get $7
-                            local.get $3
-                            i32.store offset=12
-                          end
-                        end
-                        i32.const 3660
-                        local.get $9
-                        i32.store
-                        i32.const 3672
-                        local.get $13
-                        i32.store
-                      end
-                    end
-                    local.get $14
-                    global.set $global$1
-                    local.get $2
-                    i32.const 8
-                    i32.add
-                    return
-                  end
-                else
-                  local.get $3
-                  local.set $0
-                end
-              end
-            else
-              local.get $3
-              local.set $0
-            end
-          end
-        else
-          local.get $0
-          i32.const -65
-          i32.gt_u
-          if ;; label = @4
-            i32.const -1
-            local.set $0
-          else
-            block ;; label = @5
-              local.get $0
-              i32.const 11
-              i32.add
-              local.tee $0
-              i32.const -8
-              i32.and
-              local.set $7
-              i32.const 3656
-              i32.load
-              local.tee $5
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $0
-                  i32.const 8
-                  i32.shr_u
-                  local.tee $0
-                  if (result i32) ;; label = @8
-                    local.get $7
-                    i32.const 16777215
-                    i32.gt_u
-                    if (result i32) ;; label = @9
-                      i32.const 31
-                    else
-                      local.get $7
-                      i32.const 14
-                      local.get $0
-                      local.get $0
-                      i32.const 1048320
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 8
-                      i32.and
-                      local.tee $3
-                      i32.shl
-                      local.tee $1
-                      i32.const 520192
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 4
-                      i32.and
-                      local.tee $0
-                      local.get $3
-                      i32.or
-                      local.get $1
-                      local.get $0
-                      i32.shl
-                      local.tee $1
-                      i32.const 245760
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 2
-                      i32.and
-                      local.tee $0
-                      i32.or
-                      i32.sub
-                      local.get $1
-                      local.get $0
-                      i32.shl
-                      i32.const 15
-                      i32.shr_u
-                      i32.add
-                      local.tee $0
-                      i32.const 7
-                      i32.add
-                      i32.shr_u
-                      i32.const 1
-                      i32.and
-                      local.get $0
-                      i32.const 1
-                      i32.shl
-                      i32.or
-                    end
-                  else
-                    i32.const 0
-                  end
-                  local.set $17
-                  i32.const 0
-                  local.get $7
-                  i32.sub
-                  local.set $3
-                  block $label$78 ;; label = @8
-                    block $label$79 ;; label = @9
-                      block $label$80 ;; label = @10
-                        local.get $17
-                        i32.const 2
-                        i32.shl
-                        i32.const 3956
-                        i32.add
-                        i32.load
-                        local.tee $1
-                        if ;; label = @11
-                          block ;; label = @12
-                            i32.const 25
-                            local.get $17
-                            i32.const 1
-                            i32.shr_u
-                            i32.sub
-                            local.set $0
-                            i32.const 0
-                            local.set $4
-                            local.get $7
-                            local.get $17
-                            i32.const 31
-                            i32.eq
-                            if (result i32) ;; label = @13
-                              i32.const 0
-                            else
-                              local.get $0
-                            end
-                            i32.shl
-                            local.set $10
-                            i32.const 0
-                            local.set $0
-                            loop $label$84 ;; label = @13
-                              local.get $1
-                              i32.load offset=4
-                              i32.const -8
-                              i32.and
-                              local.get $7
-                              i32.sub
-                              local.tee $6
-                              local.get $3
-                              i32.lt_u
-                              if ;; label = @14
-                                local.get $6
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $6
-                                    local.set $3
-                                    local.get $1
-                                    local.set $0
-                                  end
-                                else
-                                  block ;; label = @16
-                                    i32.const 0
-                                    local.set $3
-                                    local.get $1
-                                    local.set $0
-                                    br 7 (;@9;)
-                                  end
-                                end
-                              end
-                              local.get $1
-                              i32.load offset=20
-                              local.tee $19
-                              i32.eqz
-                              local.get $19
-                              local.get $1
-                              i32.const 16
-                              i32.add
-                              local.get $10
-                              i32.const 31
-                              i32.shr_u
-                              i32.const 2
-                              i32.shl
-                              i32.add
-                              i32.load
-                              local.tee $6
-                              i32.eq
-                              i32.or
-                              if (result i32) ;; label = @14
-                                local.get $4
-                              else
-                                local.get $19
-                              end
-                              local.set $1
-                              local.get $10
-                              local.get $6
-                              i32.eqz
-                              local.tee $4
-                              i32.const 1
-                              i32.and
-                              i32.const 1
-                              i32.xor
-                              i32.shl
-                              local.set $10
-                              local.get $4
-                              if ;; label = @14
-                                block ;; label = @15
-                                  local.get $1
-                                  local.set $4
-                                  local.get $0
-                                  local.set $1
-                                  br 5 (;@10;)
-                                end
-                              else
-                                block ;; label = @15
-                                  local.get $1
-                                  local.set $4
-                                  local.get $6
-                                  local.set $1
-                                  br 2 (;@13;)
-                                end
-                              end
-                            end
-                          end
-                        else
-                          block ;; label = @12
-                            i32.const 0
-                            local.set $4
-                            i32.const 0
-                            local.set $1
-                          end
-                        end
-                      end
-                      local.get $4
-                      i32.eqz
-                      local.get $1
-                      i32.eqz
-                      i32.and
-                      if (result i32) ;; label = @10
-                        block (result i32) ;; label = @11
-                          local.get $5
-                          i32.const 2
-                          local.get $17
-                          i32.shl
-                          local.tee $0
-                          i32.const 0
-                          local.get $0
-                          i32.sub
-                          i32.or
-                          i32.and
-                          local.tee $0
-                          i32.eqz
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $7
-                              local.set $0
-                              br 11 (;@2;)
-                            end
-                          end
-                          local.get $0
-                          i32.const 0
-                          local.get $0
-                          i32.sub
-                          i32.and
-                          i32.const -1
-                          i32.add
-                          local.tee $0
-                          i32.const 12
-                          i32.shr_u
-                          i32.const 16
-                          i32.and
-                          local.set $10
-                          local.get $0
-                          local.get $10
-                          i32.shr_u
-                          local.tee $4
-                          i32.const 5
-                          i32.shr_u
-                          i32.const 8
-                          i32.and
-                          local.tee $0
-                          local.get $10
-                          i32.or
-                          local.get $4
-                          local.get $0
-                          i32.shr_u
-                          local.tee $4
-                          i32.const 2
-                          i32.shr_u
-                          i32.const 4
-                          i32.and
-                          local.tee $0
-                          i32.or
-                          local.get $4
-                          local.get $0
-                          i32.shr_u
-                          local.tee $4
-                          i32.const 1
-                          i32.shr_u
-                          i32.const 2
-                          i32.and
-                          local.tee $0
-                          i32.or
-                          local.get $4
-                          local.get $0
-                          i32.shr_u
-                          local.tee $4
-                          i32.const 1
-                          i32.shr_u
-                          i32.const 1
-                          i32.and
-                          local.tee $0
-                          i32.or
-                          local.get $4
-                          local.get $0
-                          i32.shr_u
-                          i32.add
-                          i32.const 2
-                          i32.shl
-                          i32.const 3956
-                          i32.add
-                          i32.load
-                        end
-                      else
-                        local.get $4
-                      end
-                      local.tee $0
-                      br_if 0 (;@9;)
-                      local.get $1
-                      local.set $4
-                      br 1 (;@8;)
-                    end
-                    loop $label$96 ;; label = @9
-                      local.get $0
-                      i32.load offset=4
-                      i32.const -8
-                      i32.and
-                      local.get $7
-                      i32.sub
-                      local.tee $4
-                      local.get $3
-                      i32.lt_u
-                      local.tee $10
-                      if ;; label = @10
-                        local.get $4
-                        local.set $3
-                      end
-                      local.get $10
-                      if ;; label = @10
-                        local.get $0
-                        local.set $1
-                      end
-                      local.get $0
-                      i32.load offset=16
-                      local.tee $4
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $4
-                          local.set $0
-                          br 2 (;@9;)
-                        end
-                      end
-                      local.get $0
-                      i32.load offset=20
-                      local.tee $0
-                      br_if 0 (;@9;)
-                      local.get $1
-                      local.set $4
-                    end
-                  end
-                  local.get $4
-                  if ;; label = @8
-                    local.get $3
-                    i32.const 3660
-                    i32.load
-                    local.get $7
-                    i32.sub
-                    i32.lt_u
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $4
-                        i32.const 3668
-                        i32.load
-                        local.tee $12
-                        i32.lt_u
-                        if ;; label = @11
-                          call $fimport$10
-                        end
-                        local.get $4
-                        local.get $4
-                        local.get $7
-                        i32.add
-                        local.tee $6
-                        i32.ge_u
-                        if ;; label = @11
-                          call $fimport$10
-                        end
-                        local.get $4
-                        i32.load offset=24
-                        local.set $10
-                        block $label$104 ;; label = @11
-                          local.get $4
-                          i32.load offset=12
-                          local.tee $0
-                          local.get $4
-                          i32.eq
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $4
-                              i32.const 20
-                              i32.add
-                              local.tee $1
-                              i32.load
-                              local.tee $0
-                              i32.eqz
-                              if ;; label = @14
-                                local.get $4
-                                i32.const 16
-                                i32.add
-                                local.tee $1
-                                i32.load
-                                local.tee $0
-                                i32.eqz
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    i32.const 0
-                                    local.set $13
-                                    br 5 (;@11;)
-                                  end
-                                end
-                              end
-                              loop $label$108 ;; label = @14
-                                local.get $0
-                                i32.const 20
-                                i32.add
-                                local.tee $9
-                                i32.load
-                                local.tee $11
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $11
-                                    local.set $0
-                                    local.get $9
-                                    local.set $1
-                                    br 2 (;@14;)
-                                  end
-                                end
-                                local.get $0
-                                i32.const 16
-                                i32.add
-                                local.tee $9
-                                i32.load
-                                local.tee $11
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $11
-                                    local.set $0
-                                    local.get $9
-                                    local.set $1
-                                    br 2 (;@14;)
-                                  end
-                                end
-                              end
-                              local.get $1
-                              local.get $12
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$10
-                              else
-                                block ;; label = @15
-                                  local.get $1
-                                  i32.const 0
-                                  i32.store
-                                  local.get $0
-                                  local.set $13
-                                end
-                              end
-                            end
-                          else
-                            block ;; label = @13
-                              local.get $4
-                              i32.load offset=8
-                              local.tee $9
-                              local.get $12
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$10
-                              end
-                              local.get $9
-                              i32.const 12
-                              i32.add
-                              local.tee $11
-                              i32.load
-                              local.get $4
-                              i32.ne
-                              if ;; label = @14
-                                call $fimport$10
-                              end
-                              local.get $0
-                              i32.const 8
-                              i32.add
-                              local.tee $1
-                              i32.load
-                              local.get $4
-                              i32.eq
-                              if ;; label = @14
-                                block ;; label = @15
-                                  local.get $11
-                                  local.get $0
-                                  i32.store
-                                  local.get $1
-                                  local.get $9
-                                  i32.store
-                                  local.get $0
-                                  local.set $13
-                                end
-                              else
-                                call $fimport$10
-                              end
-                            end
-                          end
-                        end
-                        block $label$118 ;; label = @11
-                          local.get $10
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $4
-                              local.get $4
-                              i32.load offset=28
-                              local.tee $1
-                              i32.const 2
-                              i32.shl
-                              i32.const 3956
-                              i32.add
-                              local.tee $0
-                              i32.load
-                              i32.eq
-                              if ;; label = @14
-                                block ;; label = @15
-                                  local.get $0
-                                  local.get $13
-                                  i32.store
-                                  local.get $13
-                                  i32.eqz
-                                  if ;; label = @16
-                                    block ;; label = @17
-                                      i32.const 3656
-                                      local.get $5
-                                      i32.const 1
-                                      local.get $1
-                                      i32.shl
-                                      i32.const -1
-                                      i32.xor
-                                      i32.and
-                                      local.tee $2
-                                      i32.store
-                                      br 6 (;@11;)
-                                    end
-                                  end
-                                end
-                              else
-                                block ;; label = @15
-                                  local.get $10
-                                  i32.const 3668
-                                  i32.load
-                                  i32.lt_u
-                                  if ;; label = @16
-                                    call $fimport$10
-                                  end
-                                  local.get $10
-                                  i32.const 16
-                                  i32.add
-                                  local.tee $0
-                                  i32.load
-                                  local.get $4
-                                  i32.eq
-                                  if ;; label = @16
-                                    local.get $0
-                                    local.get $13
-                                    i32.store
-                                  else
-                                    local.get $10
-                                    local.get $13
-                                    i32.store offset=20
-                                  end
-                                  local.get $13
-                                  i32.eqz
-                                  if ;; label = @16
-                                    block ;; label = @17
-                                      local.get $5
-                                      local.set $2
-                                      br 6 (;@11;)
-                                    end
-                                  end
-                                end
-                              end
-                              local.get $13
-                              i32.const 3668
-                              i32.load
-                              local.tee $0
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$10
-                              end
-                              local.get $13
-                              local.get $10
-                              i32.store offset=24
-                              local.get $4
-                              i32.load offset=16
-                              local.tee $1
-                              if ;; label = @14
-                                local.get $1
-                                local.get $0
-                                i32.lt_u
-                                if ;; label = @15
-                                  call $fimport$10
-                                else
-                                  block ;; label = @16
-                                    local.get $13
-                                    local.get $1
-                                    i32.store offset=16
-                                    local.get $1
-                                    local.get $13
-                                    i32.store offset=24
-                                  end
-                                end
-                              end
-                              local.get $4
-                              i32.load offset=20
-                              local.tee $0
-                              if ;; label = @14
-                                local.get $0
-                                i32.const 3668
-                                i32.load
-                                i32.lt_u
-                                if ;; label = @15
-                                  call $fimport$10
-                                else
-                                  block ;; label = @16
-                                    local.get $13
-                                    local.get $0
-                                    i32.store offset=20
-                                    local.get $0
-                                    local.get $13
-                                    i32.store offset=24
-                                    local.get $5
-                                    local.set $2
-                                  end
-                                end
-                              else
-                                local.get $5
-                                local.set $2
-                              end
-                            end
-                          else
-                            local.get $5
-                            local.set $2
-                          end
-                        end
-                        block $label$136 ;; label = @11
-                          local.get $3
-                          i32.const 16
-                          i32.lt_u
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $4
-                              local.get $3
-                              local.get $7
-                              i32.add
-                              local.tee $0
-                              i32.const 3
-                              i32.or
-                              i32.store offset=4
-                              local.get $4
-                              local.get $0
-                              i32.add
-                              i32.const 4
-                              i32.add
-                              local.tee $0
-                              local.get $0
-                              i32.load
-                              i32.const 1
-                              i32.or
-                              i32.store
-                            end
-                          else
-                            block ;; label = @13
-                              local.get $4
-                              local.get $7
-                              i32.const 3
-                              i32.or
-                              i32.store offset=4
-                              local.get $6
-                              local.get $3
-                              i32.const 1
-                              i32.or
-                              i32.store offset=4
-                              local.get $6
-                              local.get $3
-                              i32.add
-                              local.get $3
-                              i32.store
-                              local.get $3
-                              i32.const 3
-                              i32.shr_u
-                              local.set $0
-                              local.get $3
-                              i32.const 256
-                              i32.lt_u
-                              if ;; label = @14
-                                block ;; label = @15
-                                  local.get $0
-                                  i32.const 1
-                                  i32.shl
-                                  i32.const 2
-                                  i32.shl
-                                  i32.const 3692
-                                  i32.add
-                                  local.set $3
-                                  i32.const 3652
-                                  i32.load
-                                  local.tee $1
-                                  i32.const 1
-                                  local.get $0
-                                  i32.shl
-                                  local.tee $0
-                                  i32.and
-                                  if ;; label = @16
-                                    local.get $3
-                                    i32.const 8
-                                    i32.add
-                                    local.tee $1
-                                    i32.load
-                                    local.tee $0
-                                    i32.const 3668
-                                    i32.load
-                                    i32.lt_u
-                                    if ;; label = @17
-                                      call $fimport$10
-                                    else
-                                      block ;; label = @18
-                                        local.get $1
-                                        local.set $16
-                                        local.get $0
-                                        local.set $8
-                                      end
-                                    end
-                                  else
-                                    block ;; label = @17
-                                      i32.const 3652
-                                      local.get $1
-                                      local.get $0
-                                      i32.or
-                                      i32.store
-                                      local.get $3
-                                      i32.const 8
-                                      i32.add
-                                      local.set $16
-                                      local.get $3
-                                      local.set $8
-                                    end
-                                  end
-                                  local.get $16
-                                  local.get $6
-                                  i32.store
-                                  local.get $8
-                                  local.get $6
-                                  i32.store offset=12
-                                  local.get $6
-                                  local.get $8
-                                  i32.store offset=8
-                                  local.get $6
-                                  local.get $3
-                                  i32.store offset=12
-                                  br 4 (;@11;)
-                                end
-                              end
-                              local.get $3
-                              i32.const 8
-                              i32.shr_u
-                              local.tee $0
-                              if (result i32) ;; label = @14
-                                local.get $3
-                                i32.const 16777215
-                                i32.gt_u
-                                if (result i32) ;; label = @15
-                                  i32.const 31
-                                else
-                                  local.get $3
-                                  i32.const 14
-                                  local.get $0
-                                  local.get $0
-                                  i32.const 1048320
-                                  i32.add
-                                  i32.const 16
-                                  i32.shr_u
-                                  i32.const 8
-                                  i32.and
-                                  local.tee $5
-                                  i32.shl
-                                  local.tee $1
-                                  i32.const 520192
-                                  i32.add
-                                  i32.const 16
-                                  i32.shr_u
-                                  i32.const 4
-                                  i32.and
-                                  local.tee $0
-                                  local.get $5
-                                  i32.or
-                                  local.get $1
-                                  local.get $0
-                                  i32.shl
-                                  local.tee $1
-                                  i32.const 245760
-                                  i32.add
-                                  i32.const 16
-                                  i32.shr_u
-                                  i32.const 2
-                                  i32.and
-                                  local.tee $0
-                                  i32.or
-                                  i32.sub
-                                  local.get $1
-                                  local.get $0
-                                  i32.shl
-                                  i32.const 15
-                                  i32.shr_u
-                                  i32.add
-                                  local.tee $0
-                                  i32.const 7
-                                  i32.add
-                                  i32.shr_u
-                                  i32.const 1
-                                  i32.and
-                                  local.get $0
-                                  i32.const 1
-                                  i32.shl
-                                  i32.or
-                                end
-                              else
-                                i32.const 0
-                              end
-                              local.tee $5
-                              i32.const 2
-                              i32.shl
-                              i32.const 3956
-                              i32.add
-                              local.set $1
-                              local.get $6
-                              local.get $5
-                              i32.store offset=28
-                              local.get $6
-                              i32.const 16
-                              i32.add
-                              local.tee $0
-                              i32.const 0
-                              i32.store offset=4
-                              local.get $0
-                              i32.const 0
-                              i32.store
-                              local.get $2
-                              i32.const 1
-                              local.get $5
-                              i32.shl
-                              local.tee $0
-                              i32.and
-                              i32.eqz
-                              if ;; label = @14
-                                block ;; label = @15
-                                  i32.const 3656
-                                  local.get $2
-                                  local.get $0
-                                  i32.or
-                                  i32.store
-                                  local.get $1
-                                  local.get $6
-                                  i32.store
-                                  local.get $6
-                                  local.get $1
-                                  i32.store offset=24
-                                  local.get $6
-                                  local.get $6
-                                  i32.store offset=12
-                                  local.get $6
-                                  local.get $6
-                                  i32.store offset=8
-                                  br 4 (;@11;)
-                                end
-                              end
-                              local.get $1
-                              i32.load
-                              local.set $0
-                              i32.const 25
-                              local.get $5
-                              i32.const 1
-                              i32.shr_u
-                              i32.sub
-                              local.set $1
-                              local.get $3
-                              local.get $5
-                              i32.const 31
-                              i32.eq
-                              if (result i32) ;; label = @14
-                                i32.const 0
-                              else
-                                local.get $1
-                              end
-                              i32.shl
-                              local.set $5
-                              block $label$151 ;; label = @14
-                                block $label$152 ;; label = @15
-                                  block $label$153 ;; label = @16
-                                    loop $label$154 ;; label = @17
-                                      local.get $0
-                                      i32.load offset=4
-                                      i32.const -8
-                                      i32.and
-                                      local.get $3
-                                      i32.eq
-                                      br_if 2 (;@15;)
-                                      local.get $5
-                                      i32.const 1
-                                      i32.shl
-                                      local.set $2
-                                      local.get $0
-                                      i32.const 16
-                                      i32.add
-                                      local.get $5
-                                      i32.const 31
-                                      i32.shr_u
-                                      i32.const 2
-                                      i32.shl
-                                      i32.add
-                                      local.tee $5
-                                      i32.load
-                                      local.tee $1
-                                      i32.eqz
-                                      br_if 1 (;@16;)
-                                      local.get $2
-                                      local.set $5
-                                      local.get $1
-                                      local.set $0
-                                      br 0 (;@17;)
-                                    end
-                                  end
-                                  local.get $5
-                                  i32.const 3668
-                                  i32.load
-                                  i32.lt_u
-                                  if ;; label = @16
-                                    call $fimport$10
-                                  else
-                                    block ;; label = @17
-                                      local.get $5
-                                      local.get $6
-                                      i32.store
-                                      local.get $6
-                                      local.get $0
-                                      i32.store offset=24
-                                      local.get $6
-                                      local.get $6
-                                      i32.store offset=12
-                                      local.get $6
-                                      local.get $6
-                                      i32.store offset=8
-                                      br 6 (;@11;)
-                                    end
-                                  end
-                                  br 1 (;@14;)
-                                end
-                                local.get $0
-                                i32.const 8
-                                i32.add
-                                local.tee $3
-                                i32.load
-                                local.tee $2
-                                i32.const 3668
-                                i32.load
-                                local.tee $1
-                                i32.ge_u
-                                local.get $0
-                                local.get $1
-                                i32.ge_u
-                                i32.and
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $2
-                                    local.get $6
-                                    i32.store offset=12
-                                    local.get $3
-                                    local.get $6
-                                    i32.store
-                                    local.get $6
-                                    local.get $2
-                                    i32.store offset=8
-                                    local.get $6
-                                    local.get $0
-                                    i32.store offset=12
-                                    local.get $6
-                                    i32.const 0
-                                    i32.store offset=24
-                                  end
-                                else
-                                  call $fimport$10
-                                end
-                              end
-                            end
-                          end
-                        end
-                        local.get $14
-                        global.set $global$1
-                        local.get $4
-                        i32.const 8
-                        i32.add
-                        return
-                      end
-                    else
-                      local.get $7
-                      local.set $0
-                    end
-                  else
-                    local.get $7
-                    local.set $0
-                  end
-                end
-              else
-                local.get $7
-                local.set $0
-              end
-            end
-          end
-        end
-      end
-      i32.const 3660
-      i32.load
-      local.tee $1
-      local.get $0
-      i32.ge_u
-      if ;; label = @2
-        block ;; label = @3
-          i32.const 3672
-          i32.load
-          local.set $2
-          local.get $1
-          local.get $0
-          i32.sub
-          local.tee $3
-          i32.const 15
-          i32.gt_u
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 3672
-              local.get $2
-              local.get $0
-              i32.add
-              local.tee $1
-              i32.store
-              i32.const 3660
-              local.get $3
-              i32.store
-              local.get $1
-              local.get $3
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $1
-              local.get $3
-              i32.add
-              local.get $3
-              i32.store
-              local.get $2
-              local.get $0
-              i32.const 3
-              i32.or
-              i32.store offset=4
-            end
-          else
-            block ;; label = @5
-              i32.const 3660
-              i32.const 0
-              i32.store
-              i32.const 3672
-              i32.const 0
-              i32.store
-              local.get $2
-              local.get $1
-              i32.const 3
-              i32.or
-              i32.store offset=4
-              local.get $2
-              local.get $1
-              i32.add
-              i32.const 4
-              i32.add
-              local.tee $0
-              local.get $0
-              i32.load
-              i32.const 1
-              i32.or
-              i32.store
-            end
-          end
-          local.get $14
-          global.set $global$1
-          local.get $2
-          i32.const 8
-          i32.add
-          return
-        end
-      end
-      i32.const 3664
-      i32.load
-      local.tee $10
-      local.get $0
-      i32.gt_u
-      if ;; label = @2
-        block ;; label = @3
-          i32.const 3664
-          local.get $10
-          local.get $0
-          i32.sub
-          local.tee $3
-          i32.store
-          i32.const 3676
-          i32.const 3676
-          i32.load
-          local.tee $2
-          local.get $0
-          i32.add
-          local.tee $1
-          i32.store
-          local.get $1
-          local.get $3
-          i32.const 1
-          i32.or
-          i32.store offset=4
-          local.get $2
-          local.get $0
-          i32.const 3
-          i32.or
-          i32.store offset=4
-          local.get $14
-          global.set $global$1
-          local.get $2
-          i32.const 8
-          i32.add
-          return
-        end
-      end
-      i32.const 4124
-      i32.load
-      if (result i32) ;; label = @2
-        i32.const 4132
-        i32.load
-      else
-        block (result i32) ;; label = @3
-          i32.const 4132
-          i32.const 4096
-          i32.store
-          i32.const 4128
-          i32.const 4096
-          i32.store
-          i32.const 4136
-          i32.const -1
-          i32.store
-          i32.const 4140
-          i32.const -1
-          i32.store
-          i32.const 4144
-          i32.const 0
-          i32.store
-          i32.const 4096
-          i32.const 0
-          i32.store
-          local.get $18
-          local.get $18
-          i32.const -16
-          i32.and
-          i32.const 1431655768
-          i32.xor
-          local.tee $1
-          i32.store
-          i32.const 4124
-          local.get $1
-          i32.store
-          i32.const 4096
-        end
-      end
-      local.tee $1
-      local.get $0
-      i32.const 47
-      i32.add
-      local.tee $13
-      i32.add
-      local.tee $8
-      i32.const 0
-      local.get $1
-      i32.sub
-      local.tee $4
-      i32.and
-      local.tee $6
-      local.get $0
-      i32.le_u
-      if ;; label = @2
-        block ;; label = @3
-          local.get $14
-          global.set $global$1
-          i32.const 0
-          return
-        end
-      end
-      i32.const 4092
-      i32.load
-      local.tee $2
-      if ;; label = @2
-        i32.const 4084
-        i32.load
-        local.tee $3
-        local.get $6
-        i32.add
-        local.tee $1
-        local.get $3
-        i32.le_u
-        local.get $1
-        local.get $2
-        i32.gt_u
-        i32.or
-        if ;; label = @3
-          block ;; label = @4
-            local.get $14
-            global.set $global$1
-            i32.const 0
-            return
-          end
-        end
-      end
-      local.get $0
-      i32.const 48
-      i32.add
-      local.set $7
-      block $label$171 ;; label = @2
-        block $label$172 ;; label = @3
-          i32.const 4096
-          i32.load
-          i32.const 4
-          i32.and
-          i32.eqz
-          if ;; label = @4
-            block ;; label = @5
-              block $label$174 ;; label = @6
-                block $label$175 ;; label = @7
-                  block $label$176 ;; label = @8
-                    i32.const 3676
-                    i32.load
-                    local.tee $3
-                    i32.eqz
-                    br_if 0 (;@8;)
-                    i32.const 4100
-                    local.set $2
-                    loop $label$177 ;; label = @9
-                      block $label$178 ;; label = @10
-                        local.get $2
-                        i32.load
-                        local.tee $1
-                        local.get $3
-                        i32.le_u
-                        if ;; label = @11
-                          local.get $1
-                          local.get $2
-                          i32.const 4
-                          i32.add
-                          local.tee $5
-                          i32.load
-                          i32.add
-                          local.get $3
-                          i32.gt_u
-                          br_if 1 (;@10;)
-                        end
-                        local.get $2
-                        i32.load offset=8
-                        local.tee $1
-                        i32.eqz
-                        br_if 2 (;@8;)
-                        local.get $1
-                        local.set $2
-                        br 1 (;@9;)
-                      end
-                    end
-                    local.get $8
-                    local.get $10
-                    i32.sub
-                    local.get $4
-                    i32.and
-                    local.tee $3
-                    i32.const 2147483647
-                    i32.lt_u
-                    if ;; label = @9
-                      local.get $3
-                      call $38
-                      local.tee $1
-                      local.get $2
-                      i32.load
-                      local.get $5
-                      i32.load
-                      i32.add
-                      i32.eq
-                      if ;; label = @10
-                        local.get $1
-                        i32.const -1
-                        i32.ne
-                        br_if 7 (;@3;)
-                      else
-                        block ;; label = @11
-                          local.get $1
-                          local.set $2
-                          local.get $3
-                          local.set $1
-                          br 4 (;@7;)
-                        end
-                      end
-                    end
-                    br 2 (;@6;)
-                  end
-                  i32.const 0
-                  call $38
-                  local.tee $1
-                  i32.const -1
-                  i32.ne
-                  if ;; label = @8
-                    block ;; label = @9
-                      i32.const 4128
-                      i32.load
-                      local.tee $2
-                      i32.const -1
-                      i32.add
-                      local.tee $5
-                      local.get $1
-                      local.tee $3
-                      i32.add
-                      i32.const 0
-                      local.get $2
-                      i32.sub
-                      i32.and
-                      local.get $3
-                      i32.sub
-                      local.set $2
-                      local.get $5
-                      local.get $3
-                      i32.and
-                      if (result i32) ;; label = @10
-                        local.get $2
-                      else
-                        i32.const 0
-                      end
-                      local.get $6
-                      i32.add
-                      local.tee $3
-                      i32.const 4084
-                      i32.load
-                      local.tee $5
-                      i32.add
-                      local.set $4
-                      local.get $3
-                      local.get $0
-                      i32.gt_u
-                      local.get $3
-                      i32.const 2147483647
-                      i32.lt_u
-                      i32.and
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const 4092
-                          i32.load
-                          local.tee $2
-                          if ;; label = @12
-                            local.get $4
-                            local.get $5
-                            i32.le_u
-                            local.get $4
-                            local.get $2
-                            i32.gt_u
-                            i32.or
-                            br_if 6 (;@6;)
-                          end
-                          local.get $3
-                          call $38
-                          local.tee $2
-                          local.get $1
-                          i32.eq
-                          br_if 8 (;@3;)
-                          local.get $3
-                          local.set $1
-                          br 4 (;@7;)
-                        end
-                      end
-                    end
-                  end
-                  br 1 (;@6;)
-                end
-                i32.const 0
-                local.get $1
-                i32.sub
-                local.set $5
-                local.get $7
-                local.get $1
-                i32.gt_u
-                local.get $1
-                i32.const 2147483647
-                i32.lt_u
-                local.get $2
-                i32.const -1
-                i32.ne
-                i32.and
-                i32.and
-                if ;; label = @7
-                  local.get $13
-                  local.get $1
-                  i32.sub
-                  i32.const 4132
-                  i32.load
-                  local.tee $3
-                  i32.add
-                  i32.const 0
-                  local.get $3
-                  i32.sub
-                  i32.and
-                  local.tee $3
-                  i32.const 2147483647
-                  i32.lt_u
-                  if ;; label = @8
-                    local.get $3
-                    call $38
-                    i32.const -1
-                    i32.eq
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $5
-                        call $38
-                        drop
-                        br 4 (;@6;)
-                      end
-                    else
-                      local.get $3
-                      local.get $1
-                      i32.add
-                      local.set $3
-                    end
-                  else
-                    local.get $1
-                    local.set $3
-                  end
-                else
-                  local.get $1
-                  local.set $3
-                end
-                local.get $2
-                i32.const -1
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $2
-                    local.set $1
-                    br 5 (;@3;)
-                  end
-                end
-              end
-              i32.const 4096
-              i32.const 4096
-              i32.load
-              i32.const 4
-              i32.or
-              i32.store
-            end
-          end
-          local.get $6
-          i32.const 2147483647
-          i32.lt_u
-          if ;; label = @4
-            local.get $6
-            call $38
-            local.tee $1
-            i32.const 0
-            call $38
-            local.tee $3
-            i32.lt_u
-            local.get $1
-            i32.const -1
-            i32.ne
-            local.get $3
-            i32.const -1
-            i32.ne
-            i32.and
-            i32.and
-            if ;; label = @5
-              local.get $3
-              local.get $1
-              i32.sub
-              local.tee $3
-              local.get $0
-              i32.const 40
-              i32.add
-              i32.gt_u
-              br_if 2 (;@3;)
-            end
-          end
-          br 1 (;@2;)
-        end
-        i32.const 4084
-        i32.const 4084
-        i32.load
-        local.get $3
-        i32.add
-        local.tee $2
-        i32.store
-        local.get $2
-        i32.const 4088
-        i32.load
-        i32.gt_u
-        if ;; label = @3
-          i32.const 4088
-          local.get $2
-          i32.store
-        end
-        block $label$198 ;; label = @3
-          i32.const 3676
-          i32.load
-          local.tee $8
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 4100
-              local.set $2
-              block $label$200 ;; label = @6
-                block $label$201 ;; label = @7
-                  loop $label$202 ;; label = @8
-                    local.get $1
-                    local.get $2
-                    i32.load
-                    local.tee $4
-                    local.get $2
-                    i32.const 4
-                    i32.add
-                    local.tee $7
-                    i32.load
-                    local.tee $5
-                    i32.add
-                    i32.eq
-                    br_if 1 (;@7;)
-                    local.get $2
-                    i32.load offset=8
-                    local.tee $2
-                    br_if 0 (;@8;)
-                  end
-                  br 1 (;@6;)
-                end
-                local.get $2
-                i32.load offset=12
-                i32.const 8
-                i32.and
-                i32.eqz
-                if ;; label = @7
-                  local.get $8
-                  local.get $1
-                  i32.lt_u
-                  local.get $8
-                  local.get $4
-                  i32.ge_u
-                  i32.and
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $7
-                      local.get $5
-                      local.get $3
-                      i32.add
-                      i32.store
-                      i32.const 3664
-                      i32.load
-                      local.set $5
-                      i32.const 0
-                      local.get $8
-                      i32.const 8
-                      i32.add
-                      local.tee $2
-                      i32.sub
-                      i32.const 7
-                      i32.and
-                      local.set $1
-                      i32.const 3676
-                      local.get $8
-                      local.get $2
-                      i32.const 7
-                      i32.and
-                      if (result i32) ;; label = @10
-                        local.get $1
-                      else
-                        i32.const 0
-                        local.tee $1
-                      end
-                      i32.add
-                      local.tee $2
-                      i32.store
-                      i32.const 3664
-                      local.get $3
-                      local.get $1
-                      i32.sub
-                      local.get $5
-                      i32.add
-                      local.tee $1
-                      i32.store
-                      local.get $2
-                      local.get $1
-                      i32.const 1
-                      i32.or
-                      i32.store offset=4
-                      local.get $2
-                      local.get $1
-                      i32.add
-                      i32.const 40
-                      i32.store offset=4
-                      i32.const 3680
-                      i32.const 4140
-                      i32.load
-                      i32.store
-                      br 6 (;@3;)
-                    end
-                  end
-                end
-              end
-              local.get $1
-              i32.const 3668
-              i32.load
-              local.tee $2
-              i32.lt_u
-              if ;; label = @6
-                block ;; label = @7
-                  i32.const 3668
-                  local.get $1
-                  i32.store
-                  local.get $1
-                  local.set $2
-                end
-              end
-              local.get $1
-              local.get $3
-              i32.add
-              local.set $10
-              i32.const 4100
-              local.set $5
-              block $label$208 ;; label = @6
-                block $label$209 ;; label = @7
-                  loop $label$210 ;; label = @8
-                    local.get $5
-                    i32.load
-                    local.get $10
-                    i32.eq
-                    br_if 1 (;@7;)
-                    local.get $5
-                    i32.load offset=8
-                    local.tee $5
-                    br_if 0 (;@8;)
-                    i32.const 4100
-                    local.set $5
-                  end
-                  br 1 (;@6;)
-                end
-                local.get $5
-                i32.load offset=12
-                i32.const 8
-                i32.and
-                if ;; label = @7
-                  i32.const 4100
-                  local.set $5
-                else
-                  block ;; label = @8
-                    local.get $5
-                    local.get $1
-                    i32.store
-                    local.get $5
-                    i32.const 4
-                    i32.add
-                    local.tee $5
-                    local.get $5
-                    i32.load
-                    local.get $3
-                    i32.add
-                    i32.store
-                    i32.const 0
-                    local.get $1
-                    i32.const 8
-                    i32.add
-                    local.tee $4
-                    i32.sub
-                    i32.const 7
-                    i32.and
-                    local.set $7
-                    i32.const 0
-                    local.get $10
-                    i32.const 8
-                    i32.add
-                    local.tee $5
-                    i32.sub
-                    i32.const 7
-                    i32.and
-                    local.set $3
-                    local.get $1
-                    local.get $4
-                    i32.const 7
-                    i32.and
-                    if (result i32) ;; label = @9
-                      local.get $7
-                    else
-                      i32.const 0
-                    end
-                    i32.add
-                    local.tee $13
-                    local.get $0
-                    i32.add
-                    local.set $6
-                    local.get $10
-                    local.get $5
-                    i32.const 7
-                    i32.and
-                    if (result i32) ;; label = @9
-                      local.get $3
-                    else
-                      i32.const 0
-                    end
-                    i32.add
-                    local.tee $4
-                    local.get $13
-                    i32.sub
-                    local.get $0
-                    i32.sub
-                    local.set $7
-                    local.get $13
-                    local.get $0
-                    i32.const 3
-                    i32.or
-                    i32.store offset=4
-                    block $label$217 ;; label = @9
-                      local.get $4
-                      local.get $8
-                      i32.eq
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const 3664
-                          i32.const 3664
-                          i32.load
-                          local.get $7
-                          i32.add
-                          local.tee $0
-                          i32.store
-                          i32.const 3676
-                          local.get $6
-                          i32.store
-                          local.get $6
-                          local.get $0
-                          i32.const 1
-                          i32.or
-                          i32.store offset=4
-                        end
-                      else
-                        block ;; label = @11
-                          local.get $4
-                          i32.const 3672
-                          i32.load
-                          i32.eq
-                          if ;; label = @12
-                            block ;; label = @13
-                              i32.const 3660
-                              i32.const 3660
-                              i32.load
-                              local.get $7
-                              i32.add
-                              local.tee $0
-                              i32.store
-                              i32.const 3672
-                              local.get $6
-                              i32.store
-                              local.get $6
-                              local.get $0
-                              i32.const 1
-                              i32.or
-                              i32.store offset=4
-                              local.get $6
-                              local.get $0
-                              i32.add
-                              local.get $0
-                              i32.store
-                              br 4 (;@9;)
-                            end
-                          end
-                          local.get $4
-                          i32.load offset=4
-                          local.tee $0
-                          i32.const 3
-                          i32.and
-                          i32.const 1
-                          i32.eq
-                          if (result i32) ;; label = @12
-                            block (result i32) ;; label = @13
-                              local.get $0
-                              i32.const -8
-                              i32.and
-                              local.set $11
-                              local.get $0
-                              i32.const 3
-                              i32.shr_u
-                              local.set $1
-                              block $label$222 ;; label = @14
-                                local.get $0
-                                i32.const 256
-                                i32.lt_u
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $4
-                                    i32.load offset=12
-                                    local.set $5
-                                    block $label$224 ;; label = @17
-                                      local.get $4
-                                      i32.load offset=8
-                                      local.tee $3
-                                      local.get $1
-                                      i32.const 1
-                                      i32.shl
-                                      i32.const 2
-                                      i32.shl
-                                      i32.const 3692
-                                      i32.add
-                                      local.tee $0
-                                      i32.ne
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $3
-                                          local.get $2
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$10
-                                          end
-                                          local.get $3
-                                          i32.load offset=12
-                                          local.get $4
-                                          i32.eq
-                                          br_if 2 (;@17;)
-                                          call $fimport$10
-                                        end
-                                      end
-                                    end
-                                    local.get $5
-                                    local.get $3
-                                    i32.eq
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        i32.const 3652
-                                        i32.const 3652
-                                        i32.load
-                                        i32.const 1
-                                        local.get $1
-                                        i32.shl
-                                        i32.const -1
-                                        i32.xor
-                                        i32.and
-                                        i32.store
-                                        br 4 (;@14;)
-                                      end
-                                    end
-                                    block $label$228 ;; label = @17
-                                      local.get $5
-                                      local.get $0
-                                      i32.eq
-                                      if ;; label = @18
-                                        local.get $5
-                                        i32.const 8
-                                        i32.add
-                                        local.set $20
-                                      else
-                                        block ;; label = @19
-                                          local.get $5
-                                          local.get $2
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$10
-                                          end
-                                          local.get $5
-                                          i32.const 8
-                                          i32.add
-                                          local.tee $0
-                                          i32.load
-                                          local.get $4
-                                          i32.eq
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              local.get $0
-                                              local.set $20
-                                              br 4 (;@17;)
-                                            end
-                                          end
-                                          call $fimport$10
-                                        end
-                                      end
-                                    end
-                                    local.get $3
-                                    local.get $5
-                                    i32.store offset=12
-                                    local.get $20
-                                    local.get $3
-                                    i32.store
-                                  end
-                                else
-                                  block ;; label = @16
-                                    local.get $4
-                                    i32.load offset=24
-                                    local.set $8
-                                    block $label$234 ;; label = @17
-                                      local.get $4
-                                      i32.load offset=12
-                                      local.tee $0
-                                      local.get $4
-                                      i32.eq
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $4
-                                          i32.const 16
-                                          i32.add
-                                          local.tee $3
-                                          i32.const 4
-                                          i32.add
-                                          local.tee $1
-                                          i32.load
-                                          local.tee $0
-                                          i32.eqz
-                                          if ;; label = @20
-                                            local.get $3
-                                            i32.load
-                                            local.tee $0
-                                            if ;; label = @21
-                                              local.get $3
-                                              local.set $1
-                                            else
-                                              block ;; label = @22
-                                                i32.const 0
-                                                local.set $12
-                                                br 5 (;@17;)
-                                              end
-                                            end
-                                          end
-                                          loop $label$239 ;; label = @20
-                                            local.get $0
-                                            i32.const 20
-                                            i32.add
-                                            local.tee $5
-                                            i32.load
-                                            local.tee $3
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $3
-                                                local.set $0
-                                                local.get $5
-                                                local.set $1
-                                                br 2 (;@20;)
-                                              end
-                                            end
-                                            local.get $0
-                                            i32.const 16
-                                            i32.add
-                                            local.tee $5
-                                            i32.load
-                                            local.tee $3
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $3
-                                                local.set $0
-                                                local.get $5
-                                                local.set $1
-                                                br 2 (;@20;)
-                                              end
-                                            end
-                                          end
-                                          local.get $1
-                                          local.get $2
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$10
-                                          else
-                                            block ;; label = @21
-                                              local.get $1
-                                              i32.const 0
-                                              i32.store
-                                              local.get $0
-                                              local.set $12
-                                            end
-                                          end
-                                        end
-                                      else
-                                        block ;; label = @19
-                                          local.get $4
-                                          i32.load offset=8
-                                          local.tee $5
-                                          local.get $2
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$10
-                                          end
-                                          local.get $5
-                                          i32.const 12
-                                          i32.add
-                                          local.tee $3
-                                          i32.load
-                                          local.get $4
-                                          i32.ne
-                                          if ;; label = @20
-                                            call $fimport$10
-                                          end
-                                          local.get $0
-                                          i32.const 8
-                                          i32.add
-                                          local.tee $1
-                                          i32.load
-                                          local.get $4
-                                          i32.eq
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              local.get $3
-                                              local.get $0
-                                              i32.store
-                                              local.get $1
-                                              local.get $5
-                                              i32.store
-                                              local.get $0
-                                              local.set $12
-                                            end
-                                          else
-                                            call $fimport$10
-                                          end
-                                        end
-                                      end
-                                    end
-                                    local.get $8
-                                    i32.eqz
-                                    br_if 2 (;@14;)
-                                    block $label$249 ;; label = @17
-                                      local.get $4
-                                      local.get $4
-                                      i32.load offset=28
-                                      local.tee $1
-                                      i32.const 2
-                                      i32.shl
-                                      i32.const 3956
-                                      i32.add
-                                      local.tee $0
-                                      i32.load
-                                      i32.eq
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $0
-                                          local.get $12
-                                          i32.store
-                                          local.get $12
-                                          br_if 2 (;@17;)
-                                          i32.const 3656
-                                          i32.const 3656
-                                          i32.load
-                                          i32.const 1
-                                          local.get $1
-                                          i32.shl
-                                          i32.const -1
-                                          i32.xor
-                                          i32.and
-                                          i32.store
-                                          br 5 (;@14;)
-                                        end
-                                      else
-                                        block ;; label = @19
-                                          local.get $8
-                                          i32.const 3668
-                                          i32.load
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$10
-                                          end
-                                          local.get $8
-                                          i32.const 16
-                                          i32.add
-                                          local.tee $0
-                                          i32.load
-                                          local.get $4
-                                          i32.eq
-                                          if ;; label = @20
-                                            local.get $0
-                                            local.get $12
-                                            i32.store
-                                          else
-                                            local.get $8
-                                            local.get $12
-                                            i32.store offset=20
-                                          end
-                                          local.get $12
-                                          i32.eqz
-                                          br_if 5 (;@14;)
-                                        end
-                                      end
-                                    end
-                                    local.get $12
-                                    i32.const 3668
-                                    i32.load
-                                    local.tee $1
-                                    i32.lt_u
-                                    if ;; label = @17
-                                      call $fimport$10
-                                    end
-                                    local.get $12
-                                    local.get $8
-                                    i32.store offset=24
-                                    local.get $4
-                                    i32.const 16
-                                    i32.add
-                                    local.tee $0
-                                    i32.load
-                                    local.tee $3
-                                    if ;; label = @17
-                                      local.get $3
-                                      local.get $1
-                                      i32.lt_u
-                                      if ;; label = @18
-                                        call $fimport$10
-                                      else
-                                        block ;; label = @19
-                                          local.get $12
-                                          local.get $3
-                                          i32.store offset=16
-                                          local.get $3
-                                          local.get $12
-                                          i32.store offset=24
-                                        end
-                                      end
-                                    end
-                                    local.get $0
-                                    i32.load offset=4
-                                    local.tee $0
-                                    i32.eqz
-                                    br_if 2 (;@14;)
-                                    local.get $0
-                                    i32.const 3668
-                                    i32.load
-                                    i32.lt_u
-                                    if ;; label = @17
-                                      call $fimport$10
-                                    else
-                                      block ;; label = @18
-                                        local.get $12
-                                        local.get $0
-                                        i32.store offset=20
-                                        local.get $0
-                                        local.get $12
-                                        i32.store offset=24
-                                      end
-                                    end
-                                  end
-                                end
-                              end
-                              local.get $11
-                              local.get $7
-                              i32.add
-                              local.set $7
-                              local.get $4
-                              local.get $11
-                              i32.add
-                            end
-                          else
-                            local.get $4
-                          end
-                          local.tee $0
-                          i32.const 4
-                          i32.add
-                          local.tee $0
-                          local.get $0
-                          i32.load
-                          i32.const -2
-                          i32.and
-                          i32.store
-                          local.get $6
-                          local.get $7
-                          i32.const 1
-                          i32.or
-                          i32.store offset=4
-                          local.get $6
-                          local.get $7
-                          i32.add
-                          local.get $7
-                          i32.store
-                          local.get $7
-                          i32.const 3
-                          i32.shr_u
-                          local.set $0
-                          local.get $7
-                          i32.const 256
-                          i32.lt_u
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $0
-                              i32.const 1
-                              i32.shl
-                              i32.const 2
-                              i32.shl
-                              i32.const 3692
-                              i32.add
-                              local.set $3
-                              block $label$263 ;; label = @14
-                                i32.const 3652
-                                i32.load
-                                local.tee $1
-                                i32.const 1
-                                local.get $0
-                                i32.shl
-                                local.tee $0
-                                i32.and
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $3
-                                    i32.const 8
-                                    i32.add
-                                    local.tee $1
-                                    i32.load
-                                    local.tee $0
-                                    i32.const 3668
-                                    i32.load
-                                    i32.ge_u
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $1
-                                        local.set $21
-                                        local.get $0
-                                        local.set $9
-                                        br 4 (;@14;)
-                                      end
-                                    end
-                                    call $fimport$10
-                                  end
-                                else
-                                  block ;; label = @16
-                                    i32.const 3652
-                                    local.get $1
-                                    local.get $0
-                                    i32.or
-                                    i32.store
-                                    local.get $3
-                                    i32.const 8
-                                    i32.add
-                                    local.set $21
-                                    local.get $3
-                                    local.set $9
-                                  end
-                                end
-                              end
-                              local.get $21
-                              local.get $6
-                              i32.store
-                              local.get $9
-                              local.get $6
-                              i32.store offset=12
-                              local.get $6
-                              local.get $9
-                              i32.store offset=8
-                              local.get $6
-                              local.get $3
-                              i32.store offset=12
-                              br 4 (;@9;)
-                            end
-                          end
-                          block $label$267 (result i32) ;; label = @12
-                            local.get $7
-                            i32.const 8
-                            i32.shr_u
-                            local.tee $0
-                            if (result i32) ;; label = @13
-                              block (result i32) ;; label = @14
-                                i32.const 31
-                                local.get $7
-                                i32.const 16777215
-                                i32.gt_u
-                                br_if 2 (;@12;)
-                                drop
-                                local.get $7
-                                i32.const 14
-                                local.get $0
-                                local.get $0
-                                i32.const 1048320
-                                i32.add
-                                i32.const 16
-                                i32.shr_u
-                                i32.const 8
-                                i32.and
-                                local.tee $3
-                                i32.shl
-                                local.tee $1
-                                i32.const 520192
-                                i32.add
-                                i32.const 16
-                                i32.shr_u
-                                i32.const 4
-                                i32.and
-                                local.tee $0
-                                local.get $3
-                                i32.or
-                                local.get $1
-                                local.get $0
-                                i32.shl
-                                local.tee $1
-                                i32.const 245760
-                                i32.add
-                                i32.const 16
-                                i32.shr_u
-                                i32.const 2
-                                i32.and
-                                local.tee $0
-                                i32.or
-                                i32.sub
-                                local.get $1
-                                local.get $0
-                                i32.shl
-                                i32.const 15
-                                i32.shr_u
-                                i32.add
-                                local.tee $0
-                                i32.const 7
-                                i32.add
-                                i32.shr_u
-                                i32.const 1
-                                i32.and
-                                local.get $0
-                                i32.const 1
-                                i32.shl
-                                i32.or
-                              end
-                            else
-                              i32.const 0
-                            end
-                          end
-                          local.tee $2
-                          i32.const 2
-                          i32.shl
-                          i32.const 3956
-                          i32.add
-                          local.set $3
-                          local.get $6
-                          local.get $2
-                          i32.store offset=28
-                          local.get $6
-                          i32.const 16
-                          i32.add
-                          local.tee $0
-                          i32.const 0
-                          i32.store offset=4
-                          local.get $0
-                          i32.const 0
-                          i32.store
-                          i32.const 3656
-                          i32.load
-                          local.tee $1
-                          i32.const 1
-                          local.get $2
-                          i32.shl
-                          local.tee $0
-                          i32.and
-                          i32.eqz
-                          if ;; label = @12
-                            block ;; label = @13
-                              i32.const 3656
-                              local.get $1
-                              local.get $0
-                              i32.or
-                              i32.store
-                              local.get $3
-                              local.get $6
-                              i32.store
-                              local.get $6
-                              local.get $3
-                              i32.store offset=24
-                              local.get $6
-                              local.get $6
-                              i32.store offset=12
-                              local.get $6
-                              local.get $6
-                              i32.store offset=8
-                              br 4 (;@9;)
-                            end
-                          end
-                          local.get $3
-                          i32.load
-                          local.set $0
-                          i32.const 25
-                          local.get $2
-                          i32.const 1
-                          i32.shr_u
-                          i32.sub
-                          local.set $1
-                          local.get $7
-                          local.get $2
-                          i32.const 31
-                          i32.eq
-                          if (result i32) ;; label = @12
-                            i32.const 0
-                          else
-                            local.get $1
-                          end
-                          i32.shl
-                          local.set $2
-                          block $label$273 ;; label = @12
-                            block $label$274 ;; label = @13
-                              block $label$275 ;; label = @14
-                                loop $label$276 ;; label = @15
-                                  local.get $0
-                                  i32.load offset=4
-                                  i32.const -8
-                                  i32.and
-                                  local.get $7
-                                  i32.eq
-                                  br_if 2 (;@13;)
-                                  local.get $2
-                                  i32.const 1
-                                  i32.shl
-                                  local.set $3
-                                  local.get $0
-                                  i32.const 16
-                                  i32.add
-                                  local.get $2
-                                  i32.const 31
-                                  i32.shr_u
-                                  i32.const 2
-                                  i32.shl
-                                  i32.add
-                                  local.tee $2
-                                  i32.load
-                                  local.tee $1
-                                  i32.eqz
-                                  br_if 1 (;@14;)
-                                  local.get $3
-                                  local.set $2
-                                  local.get $1
-                                  local.set $0
-                                  br 0 (;@15;)
-                                end
-                              end
-                              local.get $2
-                              i32.const 3668
-                              i32.load
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$10
-                              else
-                                block ;; label = @15
-                                  local.get $2
-                                  local.get $6
-                                  i32.store
-                                  local.get $6
-                                  local.get $0
-                                  i32.store offset=24
-                                  local.get $6
-                                  local.get $6
-                                  i32.store offset=12
-                                  local.get $6
-                                  local.get $6
-                                  i32.store offset=8
-                                  br 6 (;@9;)
-                                end
-                              end
-                              br 1 (;@12;)
-                            end
-                            local.get $0
-                            i32.const 8
-                            i32.add
-                            local.tee $3
-                            i32.load
-                            local.tee $2
-                            i32.const 3668
-                            i32.load
-                            local.tee $1
-                            i32.ge_u
-                            local.get $0
-                            local.get $1
-                            i32.ge_u
-                            i32.and
-                            if ;; label = @13
-                              block ;; label = @14
-                                local.get $2
-                                local.get $6
-                                i32.store offset=12
-                                local.get $3
-                                local.get $6
-                                i32.store
-                                local.get $6
-                                local.get $2
-                                i32.store offset=8
-                                local.get $6
-                                local.get $0
-                                i32.store offset=12
-                                local.get $6
-                                i32.const 0
-                                i32.store offset=24
-                              end
-                            else
-                              call $fimport$10
-                            end
-                          end
-                        end
-                      end
-                    end
-                    local.get $14
-                    global.set $global$1
-                    local.get $13
-                    i32.const 8
-                    i32.add
-                    return
-                  end
-                end
-              end
-              loop $label$281 ;; label = @6
-                block $label$282 ;; label = @7
-                  local.get $5
-                  i32.load
-                  local.tee $2
-                  local.get $8
-                  i32.le_u
-                  if ;; label = @8
-                    local.get $2
-                    local.get $5
-                    i32.load offset=4
-                    i32.add
-                    local.tee $13
-                    local.get $8
-                    i32.gt_u
-                    br_if 1 (;@7;)
-                  end
-                  local.get $5
-                  i32.load offset=8
-                  local.set $5
-                  br 1 (;@6;)
-                end
-              end
-              i32.const 0
-              local.get $13
-              i32.const -47
-              i32.add
-              local.tee $7
-              i32.const 8
-              i32.add
-              local.tee $5
-              i32.sub
-              i32.const 7
-              i32.and
-              local.set $2
-              local.get $7
-              local.get $5
-              i32.const 7
-              i32.and
-              if (result i32) ;; label = @6
-                local.get $2
-              else
-                i32.const 0
-              end
-              i32.add
-              local.tee $2
-              local.get $8
-              i32.const 16
-              i32.add
-              local.tee $12
-              i32.lt_u
-              if (result i32) ;; label = @6
-                local.get $8
-              else
-                local.get $2
-              end
-              local.tee $7
-              i32.const 8
-              i32.add
-              local.set $10
-              local.get $7
-              i32.const 24
-              i32.add
-              local.set $5
-              local.get $3
-              i32.const -40
-              i32.add
-              local.set $9
-              i32.const 0
-              local.get $1
-              i32.const 8
-              i32.add
-              local.tee $4
-              i32.sub
-              i32.const 7
-              i32.and
-              local.set $2
-              i32.const 3676
-              local.get $1
-              local.get $4
-              i32.const 7
-              i32.and
-              if (result i32) ;; label = @6
-                local.get $2
-              else
-                i32.const 0
-                local.tee $2
-              end
-              i32.add
-              local.tee $4
-              i32.store
-              i32.const 3664
-              local.get $9
-              local.get $2
-              i32.sub
-              local.tee $2
-              i32.store
-              local.get $4
-              local.get $2
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $4
-              local.get $2
-              i32.add
-              i32.const 40
-              i32.store offset=4
-              i32.const 3680
-              i32.const 4140
-              i32.load
-              i32.store
-              local.get $7
-              i32.const 4
-              i32.add
-              local.tee $2
-              i32.const 27
-              i32.store
-              local.get $10
-              i32.const 4100
-              i64.load align=4
-              i64.store align=4
-              local.get $10
-              i32.const 4108
-              i64.load align=4
-              i64.store offset=8 align=4
-              i32.const 4100
-              local.get $1
-              i32.store
-              i32.const 4104
-              local.get $3
-              i32.store
-              i32.const 4112
-              i32.const 0
-              i32.store
-              i32.const 4108
-              local.get $10
-              i32.store
-              local.get $5
-              local.set $1
-              loop $label$290 ;; label = @6
-                local.get $1
-                i32.const 4
-                i32.add
-                local.tee $1
-                i32.const 7
-                i32.store
-                local.get $1
-                i32.const 4
-                i32.add
-                local.get $13
-                i32.lt_u
-                br_if 0 (;@6;)
-              end
-              local.get $7
-              local.get $8
-              i32.ne
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $2
-                  local.get $2
-                  i32.load
-                  i32.const -2
-                  i32.and
-                  i32.store
-                  local.get $8
-                  local.get $7
-                  local.get $8
-                  i32.sub
-                  local.tee $4
-                  i32.const 1
-                  i32.or
-                  i32.store offset=4
-                  local.get $7
-                  local.get $4
-                  i32.store
-                  local.get $4
-                  i32.const 3
-                  i32.shr_u
-                  local.set $1
-                  local.get $4
-                  i32.const 256
-                  i32.lt_u
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $1
-                      i32.const 1
-                      i32.shl
-                      i32.const 2
-                      i32.shl
-                      i32.const 3692
-                      i32.add
-                      local.set $2
-                      i32.const 3652
-                      i32.load
-                      local.tee $3
-                      i32.const 1
-                      local.get $1
-                      i32.shl
-                      local.tee $1
-                      i32.and
-                      if ;; label = @10
-                        local.get $2
-                        i32.const 8
-                        i32.add
-                        local.tee $3
-                        i32.load
-                        local.tee $1
-                        i32.const 3668
-                        i32.load
-                        i32.lt_u
-                        if ;; label = @11
-                          call $fimport$10
-                        else
-                          block ;; label = @12
-                            local.get $3
-                            local.set $15
-                            local.get $1
-                            local.set $11
-                          end
-                        end
-                      else
-                        block ;; label = @11
-                          i32.const 3652
-                          local.get $3
-                          local.get $1
-                          i32.or
-                          i32.store
-                          local.get $2
-                          i32.const 8
-                          i32.add
-                          local.set $15
-                          local.get $2
-                          local.set $11
-                        end
-                      end
-                      local.get $15
-                      local.get $8
-                      i32.store
-                      local.get $11
-                      local.get $8
-                      i32.store offset=12
-                      local.get $8
-                      local.get $11
-                      i32.store offset=8
-                      local.get $8
-                      local.get $2
-                      i32.store offset=12
-                      br 6 (;@3;)
-                    end
-                  end
-                  local.get $4
-                  i32.const 8
-                  i32.shr_u
-                  local.tee $1
-                  if (result i32) ;; label = @8
-                    local.get $4
-                    i32.const 16777215
-                    i32.gt_u
-                    if (result i32) ;; label = @9
-                      i32.const 31
-                    else
-                      local.get $4
-                      i32.const 14
-                      local.get $1
-                      local.get $1
-                      i32.const 1048320
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 8
-                      i32.and
-                      local.tee $2
-                      i32.shl
-                      local.tee $3
-                      i32.const 520192
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 4
-                      i32.and
-                      local.tee $1
-                      local.get $2
-                      i32.or
-                      local.get $3
-                      local.get $1
-                      i32.shl
-                      local.tee $3
-                      i32.const 245760
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 2
-                      i32.and
-                      local.tee $1
-                      i32.or
-                      i32.sub
-                      local.get $3
-                      local.get $1
-                      i32.shl
-                      i32.const 15
-                      i32.shr_u
-                      i32.add
-                      local.tee $1
-                      i32.const 7
-                      i32.add
-                      i32.shr_u
-                      i32.const 1
-                      i32.and
-                      local.get $1
-                      i32.const 1
-                      i32.shl
-                      i32.or
-                    end
-                  else
-                    i32.const 0
-                  end
-                  local.tee $5
-                  i32.const 2
-                  i32.shl
-                  i32.const 3956
-                  i32.add
-                  local.set $2
-                  local.get $8
-                  local.get $5
-                  i32.store offset=28
-                  local.get $8
-                  i32.const 0
-                  i32.store offset=20
-                  local.get $12
-                  i32.const 0
-                  i32.store
-                  i32.const 3656
-                  i32.load
-                  local.tee $3
-                  i32.const 1
-                  local.get $5
-                  i32.shl
-                  local.tee $1
-                  i32.and
-                  i32.eqz
-                  if ;; label = @8
-                    block ;; label = @9
-                      i32.const 3656
-                      local.get $3
-                      local.get $1
-                      i32.or
-                      i32.store
-                      local.get $2
-                      local.get $8
-                      i32.store
-                      local.get $8
-                      local.get $2
-                      i32.store offset=24
-                      local.get $8
-                      local.get $8
-                      i32.store offset=12
-                      local.get $8
-                      local.get $8
-                      i32.store offset=8
-                      br 6 (;@3;)
-                    end
-                  end
-                  local.get $2
-                  i32.load
-                  local.set $1
-                  i32.const 25
-                  local.get $5
-                  i32.const 1
-                  i32.shr_u
-                  i32.sub
-                  local.set $3
-                  local.get $4
-                  local.get $5
-                  i32.const 31
-                  i32.eq
-                  if (result i32) ;; label = @8
-                    i32.const 0
-                  else
-                    local.get $3
-                  end
-                  i32.shl
-                  local.set $5
-                  block $label$304 ;; label = @8
-                    block $label$305 ;; label = @9
-                      block $label$306 ;; label = @10
-                        loop $label$307 ;; label = @11
-                          local.get $1
-                          i32.load offset=4
-                          i32.const -8
-                          i32.and
-                          local.get $4
-                          i32.eq
-                          br_if 2 (;@9;)
-                          local.get $5
-                          i32.const 1
-                          i32.shl
-                          local.set $2
-                          local.get $1
-                          i32.const 16
-                          i32.add
-                          local.get $5
-                          i32.const 31
-                          i32.shr_u
-                          i32.const 2
-                          i32.shl
-                          i32.add
-                          local.tee $5
-                          i32.load
-                          local.tee $3
-                          i32.eqz
-                          br_if 1 (;@10;)
-                          local.get $2
-                          local.set $5
-                          local.get $3
-                          local.set $1
-                          br 0 (;@11;)
-                        end
-                      end
-                      local.get $5
-                      i32.const 3668
-                      i32.load
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$10
-                      else
-                        block ;; label = @11
-                          local.get $5
-                          local.get $8
-                          i32.store
-                          local.get $8
-                          local.get $1
-                          i32.store offset=24
-                          local.get $8
-                          local.get $8
-                          i32.store offset=12
-                          local.get $8
-                          local.get $8
-                          i32.store offset=8
-                          br 8 (;@3;)
-                        end
-                      end
-                      br 1 (;@8;)
-                    end
-                    local.get $1
-                    i32.const 8
-                    i32.add
-                    local.tee $2
-                    i32.load
-                    local.tee $5
-                    i32.const 3668
-                    i32.load
-                    local.tee $3
-                    i32.ge_u
-                    local.get $1
-                    local.get $3
-                    i32.ge_u
-                    i32.and
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $5
-                        local.get $8
-                        i32.store offset=12
-                        local.get $2
-                        local.get $8
-                        i32.store
-                        local.get $8
-                        local.get $5
-                        i32.store offset=8
-                        local.get $8
-                        local.get $1
-                        i32.store offset=12
-                        local.get $8
-                        i32.const 0
-                        i32.store offset=24
-                      end
-                    else
-                      call $fimport$10
-                    end
-                  end
-                end
-              end
-            end
-          else
-            block ;; label = @5
-              i32.const 3668
-              i32.load
-              local.tee $2
-              i32.eqz
-              local.get $1
-              local.get $2
-              i32.lt_u
-              i32.or
-              if ;; label = @6
-                i32.const 3668
-                local.get $1
-                i32.store
-              end
-              i32.const 4100
-              local.get $1
-              i32.store
-              i32.const 4104
-              local.get $3
-              i32.store
-              i32.const 4112
-              i32.const 0
-              i32.store
-              i32.const 3688
-              i32.const 4124
-              i32.load
-              i32.store
-              i32.const 3684
-              i32.const -1
-              i32.store
-              i32.const 0
-              local.set $2
-              loop $label$314 ;; label = @6
-                local.get $2
-                i32.const 1
-                i32.shl
-                i32.const 2
-                i32.shl
-                i32.const 3692
-                i32.add
-                local.tee $5
-                local.get $5
-                i32.store offset=12
-                local.get $5
-                local.get $5
-                i32.store offset=8
-                local.get $2
-                i32.const 1
-                i32.add
-                local.tee $2
-                i32.const 32
-                i32.ne
-                br_if 0 (;@6;)
-              end
-              local.get $3
-              i32.const -40
-              i32.add
-              local.set $5
-              i32.const 0
-              local.get $1
-              i32.const 8
-              i32.add
-              local.tee $2
-              i32.sub
-              i32.const 7
-              i32.and
-              local.set $3
-              i32.const 3676
-              local.get $1
-              local.get $2
-              i32.const 7
-              i32.and
-              if (result i32) ;; label = @6
-                local.get $3
-              else
-                i32.const 0
-              end
-              local.tee $1
-              i32.add
-              local.tee $3
-              i32.store
-              i32.const 3664
-              local.get $5
-              local.get $1
-              i32.sub
-              local.tee $1
-              i32.store
-              local.get $3
-              local.get $1
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $3
-              local.get $1
-              i32.add
-              i32.const 40
-              i32.store offset=4
-              i32.const 3680
-              i32.const 4140
-              i32.load
-              i32.store
-            end
-          end
-        end
-        i32.const 3664
-        i32.load
-        local.tee $1
-        local.get $0
-        i32.gt_u
-        if ;; label = @3
-          block ;; label = @4
-            i32.const 3664
-            local.get $1
-            local.get $0
-            i32.sub
-            local.tee $3
-            i32.store
-            i32.const 3676
-            i32.const 3676
-            i32.load
-            local.tee $2
-            local.get $0
-            i32.add
-            local.tee $1
-            i32.store
-            local.get $1
-            local.get $3
-            i32.const 1
-            i32.or
-            i32.store offset=4
-            local.get $2
-            local.get $0
-            i32.const 3
-            i32.or
-            i32.store offset=4
-            local.get $14
-            global.set $global$1
-            local.get $2
-            i32.const 8
-            i32.add
-            return
-          end
-        end
-      end
-      call $12
-      i32.const 12
-      i32.store
-      local.get $14
-      global.set $global$1
-      i32.const 0
-    end
+ )
+ (func $41 (; 54 ;) (type $3) (result i32)
+  (i32.const 0)
+ )
+ (func $42 (; 55 ;) (type $4) (param $0 i32) (param $1 i32) (result i32)
+  (call_indirect (type $1)
+   (local.get $1)
+   (i32.add
+    (i32.and
+     (local.get $0)
+     (i32.const 1)
+    )
+    (i32.const 0)
+   )
   )
-  (func $36 (;49;) (type $2) (param $0 i32)
-    (local $1 i32) (local $2 i32) (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32) (local $15 i32)
-    block $label$1 ;; label = @1
-      local.get $0
-      i32.eqz
-      if ;; label = @2
-        return
-      end
-      local.get $0
-      i32.const -8
-      i32.add
-      local.tee $1
-      i32.const 3668
-      i32.load
-      local.tee $11
-      i32.lt_u
-      if ;; label = @2
-        call $fimport$10
-      end
-      local.get $0
-      i32.const -4
-      i32.add
-      i32.load
-      local.tee $0
-      i32.const 3
-      i32.and
-      local.tee $8
-      i32.const 1
-      i32.eq
-      if ;; label = @2
-        call $fimport$10
-      end
-      local.get $1
-      local.get $0
-      i32.const -8
-      i32.and
-      local.tee $4
-      i32.add
-      local.set $6
-      block $label$5 ;; label = @2
-        local.get $0
-        i32.const 1
-        i32.and
-        if ;; label = @3
-          block ;; label = @4
-            local.get $1
-            local.set $3
-            local.get $4
-            local.set $2
-          end
-        else
-          block ;; label = @4
-            local.get $8
-            i32.eqz
-            if ;; label = @5
-              return
-            end
-            local.get $1
-            i32.const 0
-            local.get $1
-            i32.load
-            local.tee $8
-            i32.sub
-            i32.add
-            local.tee $0
-            local.get $11
-            i32.lt_u
-            if ;; label = @5
-              call $fimport$10
-            end
-            local.get $8
-            local.get $4
-            i32.add
-            local.set $1
-            local.get $0
-            i32.const 3672
-            i32.load
-            i32.eq
-            if ;; label = @5
-              block ;; label = @6
-                local.get $6
-                i32.const 4
-                i32.add
-                local.tee $2
-                i32.load
-                local.tee $3
-                i32.const 3
-                i32.and
-                i32.const 3
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $0
-                    local.set $3
-                    local.get $1
-                    local.set $2
-                    br 6 (;@2;)
-                  end
-                end
-                i32.const 3660
-                local.get $1
-                i32.store
-                local.get $2
-                local.get $3
-                i32.const -2
-                i32.and
-                i32.store
-                local.get $0
-                local.get $1
-                i32.const 1
-                i32.or
-                i32.store offset=4
-                local.get $0
-                local.get $1
-                i32.add
-                local.get $1
-                i32.store
-                return
-              end
-            end
-            local.get $8
-            i32.const 3
-            i32.shr_u
-            local.set $10
-            local.get $8
-            i32.const 256
-            i32.lt_u
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                i32.load offset=12
-                local.set $3
-                local.get $0
-                i32.load offset=8
-                local.tee $4
-                local.get $10
-                i32.const 1
-                i32.shl
-                i32.const 2
-                i32.shl
-                i32.const 3692
-                i32.add
-                local.tee $2
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $4
-                    local.get $11
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $4
-                    i32.load offset=12
-                    local.get $0
-                    i32.ne
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                  end
-                end
-                local.get $3
-                local.get $4
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const 3652
-                    i32.const 3652
-                    i32.load
-                    i32.const 1
-                    local.get $10
-                    i32.shl
-                    i32.const -1
-                    i32.xor
-                    i32.and
-                    i32.store
-                    local.get $0
-                    local.set $3
-                    local.get $1
-                    local.set $2
-                    br 6 (;@2;)
-                  end
-                end
-                local.get $3
-                local.get $2
-                i32.eq
-                if ;; label = @7
-                  local.get $3
-                  i32.const 8
-                  i32.add
-                  local.set $5
-                else
-                  block ;; label = @8
-                    local.get $3
-                    local.get $11
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $3
-                    i32.const 8
-                    i32.add
-                    local.tee $2
-                    i32.load
-                    local.get $0
-                    i32.eq
-                    if ;; label = @9
-                      local.get $2
-                      local.set $5
-                    else
-                      call $fimport$10
-                    end
-                  end
-                end
-                local.get $4
-                local.get $3
-                i32.store offset=12
-                local.get $5
-                local.get $4
-                i32.store
-                local.get $0
-                local.set $3
-                local.get $1
-                local.set $2
-                br 4 (;@2;)
-              end
-            end
-            local.get $0
-            i32.load offset=24
-            local.set $12
-            block $label$22 ;; label = @5
-              local.get $0
-              i32.load offset=12
-              local.tee $4
-              local.get $0
-              i32.eq
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $0
-                  i32.const 16
-                  i32.add
-                  local.tee $5
-                  i32.const 4
-                  i32.add
-                  local.tee $8
-                  i32.load
-                  local.tee $4
-                  if ;; label = @8
-                    local.get $8
-                    local.set $5
-                  else
-                    local.get $5
-                    i32.load
-                    local.tee $4
-                    i32.eqz
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const 0
-                        local.set $7
-                        br 5 (;@5;)
-                      end
-                    end
-                  end
-                  loop $label$27 ;; label = @8
-                    local.get $4
-                    i32.const 20
-                    i32.add
-                    local.tee $8
-                    i32.load
-                    local.tee $10
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $10
-                        local.set $4
-                        local.get $8
-                        local.set $5
-                        br 2 (;@8;)
-                      end
-                    end
-                    local.get $4
-                    i32.const 16
-                    i32.add
-                    local.tee $8
-                    i32.load
-                    local.tee $10
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $10
-                        local.set $4
-                        local.get $8
-                        local.set $5
-                        br 2 (;@8;)
-                      end
-                    end
-                  end
-                  local.get $5
-                  local.get $11
-                  i32.lt_u
-                  if ;; label = @8
-                    call $fimport$10
-                  else
-                    block ;; label = @9
-                      local.get $5
-                      i32.const 0
-                      i32.store
-                      local.get $4
-                      local.set $7
-                    end
-                  end
-                end
-              else
-                block ;; label = @7
-                  local.get $0
-                  i32.load offset=8
-                  local.tee $5
-                  local.get $11
-                  i32.lt_u
-                  if ;; label = @8
-                    call $fimport$10
-                  end
-                  local.get $5
-                  i32.const 12
-                  i32.add
-                  local.tee $8
-                  i32.load
-                  local.get $0
-                  i32.ne
-                  if ;; label = @8
-                    call $fimport$10
-                  end
-                  local.get $4
-                  i32.const 8
-                  i32.add
-                  local.tee $10
-                  i32.load
-                  local.get $0
-                  i32.eq
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $8
-                      local.get $4
-                      i32.store
-                      local.get $10
-                      local.get $5
-                      i32.store
-                      local.get $4
-                      local.set $7
-                    end
-                  else
-                    call $fimport$10
-                  end
-                end
-              end
-            end
-            local.get $12
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                local.get $0
-                i32.load offset=28
-                local.tee $4
-                i32.const 2
-                i32.shl
-                i32.const 3956
-                i32.add
-                local.tee $5
-                i32.load
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $5
-                    local.get $7
-                    i32.store
-                    local.get $7
-                    i32.eqz
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const 3656
-                        i32.const 3656
-                        i32.load
-                        i32.const 1
-                        local.get $4
-                        i32.shl
-                        i32.const -1
-                        i32.xor
-                        i32.and
-                        i32.store
-                        local.get $0
-                        local.set $3
-                        local.get $1
-                        local.set $2
-                        br 8 (;@2;)
-                      end
-                    end
-                  end
-                else
-                  block ;; label = @8
-                    local.get $12
-                    i32.const 3668
-                    i32.load
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $12
-                    i32.const 16
-                    i32.add
-                    local.tee $4
-                    i32.load
-                    local.get $0
-                    i32.eq
-                    if ;; label = @9
-                      local.get $4
-                      local.get $7
-                      i32.store
-                    else
-                      local.get $12
-                      local.get $7
-                      i32.store offset=20
-                    end
-                    local.get $7
-                    i32.eqz
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $0
-                        local.set $3
-                        local.get $1
-                        local.set $2
-                        br 8 (;@2;)
-                      end
-                    end
-                  end
-                end
-                local.get $7
-                i32.const 3668
-                i32.load
-                local.tee $5
-                i32.lt_u
-                if ;; label = @7
-                  call $fimport$10
-                end
-                local.get $7
-                local.get $12
-                i32.store offset=24
-                local.get $0
-                i32.const 16
-                i32.add
-                local.tee $8
-                i32.load
-                local.tee $4
-                if ;; label = @7
-                  local.get $4
-                  local.get $5
-                  i32.lt_u
-                  if ;; label = @8
-                    call $fimport$10
-                  else
-                    block ;; label = @9
-                      local.get $7
-                      local.get $4
-                      i32.store offset=16
-                      local.get $4
-                      local.get $7
-                      i32.store offset=24
-                    end
-                  end
-                end
-                local.get $8
-                i32.load offset=4
-                local.tee $4
-                if ;; label = @7
-                  local.get $4
-                  i32.const 3668
-                  i32.load
-                  i32.lt_u
-                  if ;; label = @8
-                    call $fimport$10
-                  else
-                    block ;; label = @9
-                      local.get $7
-                      local.get $4
-                      i32.store offset=20
-                      local.get $4
-                      local.get $7
-                      i32.store offset=24
-                      local.get $0
-                      local.set $3
-                      local.get $1
-                      local.set $2
-                    end
-                  end
-                else
-                  block ;; label = @8
-                    local.get $0
-                    local.set $3
-                    local.get $1
-                    local.set $2
-                  end
-                end
-              end
-            else
-              block ;; label = @6
-                local.get $0
-                local.set $3
-                local.get $1
-                local.set $2
-              end
-            end
-          end
-        end
-      end
-      local.get $3
-      local.get $6
-      i32.ge_u
-      if ;; label = @2
-        call $fimport$10
-      end
-      local.get $6
-      i32.const 4
-      i32.add
-      local.tee $1
-      i32.load
-      local.tee $0
-      i32.const 1
-      i32.and
-      i32.eqz
-      if ;; label = @2
-        call $fimport$10
-      end
-      local.get $0
-      i32.const 2
-      i32.and
-      if ;; label = @2
-        block ;; label = @3
-          local.get $1
-          local.get $0
-          i32.const -2
-          i32.and
-          i32.store
-          local.get $3
-          local.get $2
-          i32.const 1
-          i32.or
-          i32.store offset=4
-          local.get $3
-          local.get $2
-          i32.add
-          local.get $2
-          i32.store
-        end
-      else
-        block ;; label = @3
-          local.get $6
-          i32.const 3676
-          i32.load
-          i32.eq
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 3664
-              i32.const 3664
-              i32.load
-              local.get $2
-              i32.add
-              local.tee $0
-              i32.store
-              i32.const 3676
-              local.get $3
-              i32.store
-              local.get $3
-              local.get $0
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $3
-              i32.const 3672
-              i32.load
-              i32.ne
-              if ;; label = @6
-                return
-              end
-              i32.const 3672
-              i32.const 0
-              i32.store
-              i32.const 3660
-              i32.const 0
-              i32.store
-              return
-            end
-          end
-          local.get $6
-          i32.const 3672
-          i32.load
-          i32.eq
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 3660
-              i32.const 3660
-              i32.load
-              local.get $2
-              i32.add
-              local.tee $0
-              i32.store
-              i32.const 3672
-              local.get $3
-              i32.store
-              local.get $3
-              local.get $0
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $3
-              local.get $0
-              i32.add
-              local.get $0
-              i32.store
-              return
-            end
-          end
-          local.get $0
-          i32.const -8
-          i32.and
-          local.get $2
-          i32.add
-          local.set $5
-          local.get $0
-          i32.const 3
-          i32.shr_u
-          local.set $4
-          block $label$61 ;; label = @4
-            local.get $0
-            i32.const 256
-            i32.lt_u
-            if ;; label = @5
-              block ;; label = @6
-                local.get $6
-                i32.load offset=12
-                local.set $2
-                local.get $6
-                i32.load offset=8
-                local.tee $1
-                local.get $4
-                i32.const 1
-                i32.shl
-                i32.const 2
-                i32.shl
-                i32.const 3692
-                i32.add
-                local.tee $0
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $1
-                    i32.const 3668
-                    i32.load
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $1
-                    i32.load offset=12
-                    local.get $6
-                    i32.ne
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                  end
-                end
-                local.get $2
-                local.get $1
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const 3652
-                    i32.const 3652
-                    i32.load
-                    i32.const 1
-                    local.get $4
-                    i32.shl
-                    i32.const -1
-                    i32.xor
-                    i32.and
-                    i32.store
-                    br 4 (;@4;)
-                  end
-                end
-                local.get $2
-                local.get $0
-                i32.eq
-                if ;; label = @7
-                  local.get $2
-                  i32.const 8
-                  i32.add
-                  local.set $14
-                else
-                  block ;; label = @8
-                    local.get $2
-                    i32.const 3668
-                    i32.load
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $2
-                    i32.const 8
-                    i32.add
-                    local.tee $0
-                    i32.load
-                    local.get $6
-                    i32.eq
-                    if ;; label = @9
-                      local.get $0
-                      local.set $14
-                    else
-                      call $fimport$10
-                    end
-                  end
-                end
-                local.get $1
-                local.get $2
-                i32.store offset=12
-                local.get $14
-                local.get $1
-                i32.store
-              end
-            else
-              block ;; label = @6
-                local.get $6
-                i32.load offset=24
-                local.set $7
-                block $label$73 ;; label = @7
-                  local.get $6
-                  i32.load offset=12
-                  local.tee $0
-                  local.get $6
-                  i32.eq
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $6
-                      i32.const 16
-                      i32.add
-                      local.tee $2
-                      i32.const 4
-                      i32.add
-                      local.tee $1
-                      i32.load
-                      local.tee $0
-                      if ;; label = @10
-                        local.get $1
-                        local.set $2
-                      else
-                        local.get $2
-                        i32.load
-                        local.tee $0
-                        i32.eqz
-                        if ;; label = @11
-                          block ;; label = @12
-                            i32.const 0
-                            local.set $9
-                            br 5 (;@7;)
-                          end
-                        end
-                      end
-                      loop $label$78 ;; label = @10
-                        local.get $0
-                        i32.const 20
-                        i32.add
-                        local.tee $1
-                        i32.load
-                        local.tee $4
-                        if ;; label = @11
-                          block ;; label = @12
-                            local.get $4
-                            local.set $0
-                            local.get $1
-                            local.set $2
-                            br 2 (;@10;)
-                          end
-                        end
-                        local.get $0
-                        i32.const 16
-                        i32.add
-                        local.tee $1
-                        i32.load
-                        local.tee $4
-                        if ;; label = @11
-                          block ;; label = @12
-                            local.get $4
-                            local.set $0
-                            local.get $1
-                            local.set $2
-                            br 2 (;@10;)
-                          end
-                        end
-                      end
-                      local.get $2
-                      i32.const 3668
-                      i32.load
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$10
-                      else
-                        block ;; label = @11
-                          local.get $2
-                          i32.const 0
-                          i32.store
-                          local.get $0
-                          local.set $9
-                        end
-                      end
-                    end
-                  else
-                    block ;; label = @9
-                      local.get $6
-                      i32.load offset=8
-                      local.tee $2
-                      i32.const 3668
-                      i32.load
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$10
-                      end
-                      local.get $2
-                      i32.const 12
-                      i32.add
-                      local.tee $1
-                      i32.load
-                      local.get $6
-                      i32.ne
-                      if ;; label = @10
-                        call $fimport$10
-                      end
-                      local.get $0
-                      i32.const 8
-                      i32.add
-                      local.tee $4
-                      i32.load
-                      local.get $6
-                      i32.eq
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $1
-                          local.get $0
-                          i32.store
-                          local.get $4
-                          local.get $2
-                          i32.store
-                          local.get $0
-                          local.set $9
-                        end
-                      else
-                        call $fimport$10
-                      end
-                    end
-                  end
-                end
-                local.get $7
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $6
-                    local.get $6
-                    i32.load offset=28
-                    local.tee $0
-                    i32.const 2
-                    i32.shl
-                    i32.const 3956
-                    i32.add
-                    local.tee $2
-                    i32.load
-                    i32.eq
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $2
-                        local.get $9
-                        i32.store
-                        local.get $9
-                        i32.eqz
-                        if ;; label = @11
-                          block ;; label = @12
-                            i32.const 3656
-                            i32.const 3656
-                            i32.load
-                            i32.const 1
-                            local.get $0
-                            i32.shl
-                            i32.const -1
-                            i32.xor
-                            i32.and
-                            i32.store
-                            br 8 (;@4;)
-                          end
-                        end
-                      end
-                    else
-                      block ;; label = @10
-                        local.get $7
-                        i32.const 3668
-                        i32.load
-                        i32.lt_u
-                        if ;; label = @11
-                          call $fimport$10
-                        end
-                        local.get $7
-                        i32.const 16
-                        i32.add
-                        local.tee $0
-                        i32.load
-                        local.get $6
-                        i32.eq
-                        if ;; label = @11
-                          local.get $0
-                          local.get $9
-                          i32.store
-                        else
-                          local.get $7
-                          local.get $9
-                          i32.store offset=20
-                        end
-                        local.get $9
-                        i32.eqz
-                        br_if 6 (;@4;)
-                      end
-                    end
-                    local.get $9
-                    i32.const 3668
-                    i32.load
-                    local.tee $2
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $9
-                    local.get $7
-                    i32.store offset=24
-                    local.get $6
-                    i32.const 16
-                    i32.add
-                    local.tee $1
-                    i32.load
-                    local.tee $0
-                    if ;; label = @9
-                      local.get $0
-                      local.get $2
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$10
-                      else
-                        block ;; label = @11
-                          local.get $9
-                          local.get $0
-                          i32.store offset=16
-                          local.get $0
-                          local.get $9
-                          i32.store offset=24
-                        end
-                      end
-                    end
-                    local.get $1
-                    i32.load offset=4
-                    local.tee $0
-                    if ;; label = @9
-                      local.get $0
-                      i32.const 3668
-                      i32.load
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$10
-                      else
-                        block ;; label = @11
-                          local.get $9
-                          local.get $0
-                          i32.store offset=20
-                          local.get $0
-                          local.get $9
-                          i32.store offset=24
-                        end
-                      end
-                    end
-                  end
-                end
-              end
-            end
-          end
-          local.get $3
-          local.get $5
-          i32.const 1
-          i32.or
-          i32.store offset=4
-          local.get $3
-          local.get $5
-          i32.add
-          local.get $5
-          i32.store
-          local.get $3
-          i32.const 3672
-          i32.load
-          i32.eq
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 3660
-              local.get $5
-              i32.store
-              return
-            end
-          else
-            local.get $5
-            local.set $2
-          end
-        end
-      end
-      local.get $2
-      i32.const 3
-      i32.shr_u
-      local.set $1
-      local.get $2
-      i32.const 256
-      i32.lt_u
-      if ;; label = @2
-        block ;; label = @3
-          local.get $1
-          i32.const 1
-          i32.shl
-          i32.const 2
-          i32.shl
-          i32.const 3692
-          i32.add
-          local.set $0
-          i32.const 3652
-          i32.load
-          local.tee $2
-          i32.const 1
-          local.get $1
-          i32.shl
-          local.tee $1
-          i32.and
-          if ;; label = @4
-            local.get $0
-            i32.const 8
-            i32.add
-            local.tee $2
-            i32.load
-            local.tee $1
-            i32.const 3668
-            i32.load
-            i32.lt_u
-            if ;; label = @5
-              call $fimport$10
-            else
-              block ;; label = @6
-                local.get $2
-                local.set $15
-                local.get $1
-                local.set $13
-              end
-            end
-          else
-            block ;; label = @5
-              i32.const 3652
-              local.get $2
-              local.get $1
-              i32.or
-              i32.store
-              local.get $0
-              i32.const 8
-              i32.add
-              local.set $15
-              local.get $0
-              local.set $13
-            end
-          end
-          local.get $15
-          local.get $3
-          i32.store
-          local.get $13
-          local.get $3
-          i32.store offset=12
-          local.get $3
-          local.get $13
-          i32.store offset=8
-          local.get $3
-          local.get $0
-          i32.store offset=12
-          return
-        end
-      end
-      local.get $2
-      i32.const 8
-      i32.shr_u
-      local.tee $0
-      if (result i32) ;; label = @2
-        local.get $2
-        i32.const 16777215
-        i32.gt_u
-        if (result i32) ;; label = @3
-          i32.const 31
-        else
-          local.get $2
-          i32.const 14
-          local.get $0
-          local.get $0
-          i32.const 1048320
-          i32.add
-          i32.const 16
-          i32.shr_u
-          i32.const 8
-          i32.and
-          local.tee $0
-          i32.shl
-          local.tee $1
-          i32.const 520192
-          i32.add
-          i32.const 16
-          i32.shr_u
-          i32.const 4
-          i32.and
-          local.tee $4
-          local.get $0
-          i32.or
-          local.get $1
-          local.get $4
-          i32.shl
-          local.tee $0
-          i32.const 245760
-          i32.add
-          i32.const 16
-          i32.shr_u
-          i32.const 2
-          i32.and
-          local.tee $1
-          i32.or
-          i32.sub
-          local.get $0
-          local.get $1
-          i32.shl
-          i32.const 15
-          i32.shr_u
-          i32.add
-          local.tee $0
-          i32.const 7
-          i32.add
-          i32.shr_u
-          i32.const 1
-          i32.and
-          local.get $0
-          i32.const 1
-          i32.shl
-          i32.or
-        end
-      else
-        i32.const 0
-      end
-      local.tee $1
-      i32.const 2
-      i32.shl
-      i32.const 3956
-      i32.add
-      local.set $0
-      local.get $3
-      local.get $1
-      i32.store offset=28
-      local.get $3
-      i32.const 0
-      i32.store offset=20
-      local.get $3
-      i32.const 0
-      i32.store offset=16
-      block $label$113 ;; label = @2
-        i32.const 3656
-        i32.load
-        local.tee $4
-        i32.const 1
-        local.get $1
-        i32.shl
-        local.tee $5
-        i32.and
-        if ;; label = @3
-          block ;; label = @4
-            local.get $0
-            i32.load
-            local.set $0
-            i32.const 25
-            local.get $1
-            i32.const 1
-            i32.shr_u
-            i32.sub
-            local.set $4
-            local.get $2
-            local.get $1
-            i32.const 31
-            i32.eq
-            if (result i32) ;; label = @5
-              i32.const 0
-            else
-              local.get $4
-            end
-            i32.shl
-            local.set $1
-            block $label$117 ;; label = @5
-              block $label$118 ;; label = @6
-                block $label$119 ;; label = @7
-                  loop $label$120 ;; label = @8
-                    local.get $0
-                    i32.load offset=4
-                    i32.const -8
-                    i32.and
-                    local.get $2
-                    i32.eq
-                    br_if 2 (;@6;)
-                    local.get $1
-                    i32.const 1
-                    i32.shl
-                    local.set $4
-                    local.get $0
-                    i32.const 16
-                    i32.add
-                    local.get $1
-                    i32.const 31
-                    i32.shr_u
-                    i32.const 2
-                    i32.shl
-                    i32.add
-                    local.tee $1
-                    i32.load
-                    local.tee $5
-                    i32.eqz
-                    br_if 1 (;@7;)
-                    local.get $4
-                    local.set $1
-                    local.get $5
-                    local.set $0
-                    br 0 (;@8;)
-                  end
-                end
-                local.get $1
-                i32.const 3668
-                i32.load
-                i32.lt_u
-                if ;; label = @7
-                  call $fimport$10
-                else
-                  block ;; label = @8
-                    local.get $1
-                    local.get $3
-                    i32.store
-                    local.get $3
-                    local.get $0
-                    i32.store offset=24
-                    local.get $3
-                    local.get $3
-                    i32.store offset=12
-                    local.get $3
-                    local.get $3
-                    i32.store offset=8
-                    br 6 (;@2;)
-                  end
-                end
-                br 1 (;@5;)
-              end
-              local.get $0
-              i32.const 8
-              i32.add
-              local.tee $1
-              i32.load
-              local.tee $2
-              i32.const 3668
-              i32.load
-              local.tee $4
-              i32.ge_u
-              local.get $0
-              local.get $4
-              i32.ge_u
-              i32.and
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $2
-                  local.get $3
-                  i32.store offset=12
-                  local.get $1
-                  local.get $3
-                  i32.store
-                  local.get $3
-                  local.get $2
-                  i32.store offset=8
-                  local.get $3
-                  local.get $0
-                  i32.store offset=12
-                  local.get $3
-                  i32.const 0
-                  i32.store offset=24
-                end
-              else
-                call $fimport$10
-              end
-            end
-          end
-        else
-          block ;; label = @4
-            i32.const 3656
-            local.get $4
-            local.get $5
-            i32.or
-            i32.store
-            local.get $0
-            local.get $3
-            i32.store
-            local.get $3
-            local.get $0
-            i32.store offset=24
-            local.get $3
-            local.get $3
-            i32.store offset=12
-            local.get $3
-            local.get $3
-            i32.store offset=8
-          end
-        end
-      end
-      i32.const 3684
-      i32.const 3684
-      i32.load
-      i32.const -1
-      i32.add
-      local.tee $0
-      i32.store
-      local.get $0
-      if ;; label = @2
-        return
-      else
-        i32.const 4108
-        local.set $0
-      end
-      loop $label$128 ;; label = @2
-        local.get $0
-        i32.load
-        local.tee $2
-        i32.const 8
-        i32.add
-        local.set $0
-        local.get $2
-        br_if 0 (;@2;)
-      end
-      i32.const 3684
-      i32.const -1
-      i32.store
-    end
+ )
+ (func $43 (; 56 ;) (type $12) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+  (call_indirect (type $0)
+   (local.get $1)
+   (local.get $2)
+   (local.get $3)
+   (i32.add
+    (i32.and
+     (local.get $0)
+     (i32.const 3)
+    )
+    (i32.const 2)
+   )
   )
-  (func $37 (;50;) (type $6)
-    nop
+ )
+ (func $44 (; 57 ;) (type $5) (param $0 i32) (param $1 i32)
+  (call_indirect (type $2)
+   (local.get $1)
+   (i32.add
+    (i32.and
+     (local.get $0)
+     (i32.const 1)
+    )
+    (i32.const 6)
+   )
   )
-  (func $38 (;51;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$0
-      i32.load
-      local.tee $2
-      local.get $0
-      i32.const 15
-      i32.add
-      i32.const -16
-      i32.and
-      local.tee $0
-      i32.add
-      local.set $1
-      local.get $0
-      i32.const 0
-      i32.gt_s
-      local.get $1
-      local.get $2
-      i32.lt_s
-      i32.and
-      local.get $1
-      i32.const 0
-      i32.lt_s
-      i32.or
-      if ;; label = @2
-        block ;; label = @3
-          call $fimport$6
-          drop
-          i32.const 12
-          call $fimport$11
-          i32.const -1
-          return
-        end
-      end
-      global.get $global$0
-      local.get $1
-      i32.store
-      local.get $1
-      call $fimport$5
-      i32.gt_s
-      if ;; label = @2
-        call $fimport$4
-        i32.eqz
-        if ;; label = @3
-          block ;; label = @4
-            i32.const 12
-            call $fimport$11
-            global.get $global$0
-            local.get $2
-            i32.store
-            i32.const -1
-            return
-          end
-        end
-      end
-      local.get $2
-    end
+ )
+ (func $45 (; 58 ;) (type $1) (param $0 i32) (result i32)
+  (block $label$1 (result i32)
+   (call $fimport$3
+    (i32.const 0)
+   )
+   (i32.const 0)
   )
-  (func $39 (;52;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $0
-      local.get $2
-      i32.add
-      local.set $4
-      local.get $2
-      i32.const 20
-      i32.ge_s
-      if ;; label = @2
-        block ;; label = @3
-          local.get $1
-          i32.const 255
-          i32.and
-          local.set $1
-          local.get $0
-          i32.const 3
-          i32.and
-          local.tee $3
-          if ;; label = @4
-            block ;; label = @5
-              local.get $0
-              i32.const 4
-              i32.add
-              local.get $3
-              i32.sub
-              local.set $3
-              loop $label$4 ;; label = @6
-                local.get $0
-                local.get $3
-                i32.lt_s
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $0
-                    local.get $1
-                    i32.store8
-                    local.get $0
-                    i32.const 1
-                    i32.add
-                    local.set $0
-                    br 2 (;@6;)
-                  end
-                end
-              end
-            end
-          end
-          local.get $1
-          local.get $1
-          i32.const 8
-          i32.shl
-          i32.or
-          local.get $1
-          i32.const 16
-          i32.shl
-          i32.or
-          local.get $1
-          i32.const 24
-          i32.shl
-          i32.or
-          local.set $3
-          local.get $4
-          i32.const -4
-          i32.and
-          local.set $5
-          loop $label$6 ;; label = @4
-            local.get $0
-            local.get $5
-            i32.lt_s
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                local.get $3
-                i32.store
-                local.get $0
-                i32.const 4
-                i32.add
-                local.set $0
-                br 2 (;@4;)
-              end
-            end
-          end
-        end
-      end
-      loop $label$8 ;; label = @2
-        local.get $0
-        local.get $4
-        i32.lt_s
-        if ;; label = @3
-          block ;; label = @4
-            local.get $0
-            local.get $1
-            i32.store8
-            local.get $0
-            i32.const 1
-            i32.add
-            local.set $0
-            br 2 (;@2;)
-          end
-        end
-      end
-      local.get $0
-      local.get $2
-      i32.sub
-    end
+ )
+ (func $46 (; 59 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (block $label$1 (result i32)
+   (call $fimport$3
+    (i32.const 1)
+   )
+   (i32.const 0)
   )
-  (func $40 (;53;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $2
-      i32.const 4096
-      i32.ge_s
-      if ;; label = @2
-        local.get $0
-        local.get $1
-        local.get $2
-        call $fimport$12
-        return
-      end
-      local.get $0
-      local.set $3
-      local.get $0
-      i32.const 3
-      i32.and
-      local.get $1
-      i32.const 3
-      i32.and
-      i32.eq
-      if ;; label = @2
-        block ;; label = @3
-          loop $label$4 ;; label = @4
-            local.get $0
-            i32.const 3
-            i32.and
-            if ;; label = @5
-              block ;; label = @6
-                local.get $2
-                i32.eqz
-                if ;; label = @7
-                  local.get $3
-                  return
-                end
-                local.get $0
-                local.get $1
-                i32.load8_s
-                i32.store8
-                local.get $0
-                i32.const 1
-                i32.add
-                local.set $0
-                local.get $1
-                i32.const 1
-                i32.add
-                local.set $1
-                local.get $2
-                i32.const 1
-                i32.sub
-                local.set $2
-                br 2 (;@4;)
-              end
-            end
-          end
-          loop $label$7 ;; label = @4
-            local.get $2
-            i32.const 4
-            i32.ge_s
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                local.get $1
-                i32.load
-                i32.store
-                local.get $0
-                i32.const 4
-                i32.add
-                local.set $0
-                local.get $1
-                i32.const 4
-                i32.add
-                local.set $1
-                local.get $2
-                i32.const 4
-                i32.sub
-                local.set $2
-                br 2 (;@4;)
-              end
-            end
-          end
-        end
-      end
-      loop $label$9 ;; label = @2
-        local.get $2
-        i32.const 0
-        i32.gt_s
-        if ;; label = @3
-          block ;; label = @4
-            local.get $0
-            local.get $1
-            i32.load8_s
-            i32.store8
-            local.get $0
-            i32.const 1
-            i32.add
-            local.set $0
-            local.get $1
-            i32.const 1
-            i32.add
-            local.set $1
-            local.get $2
-            i32.const 1
-            i32.sub
-            local.set $2
-            br 2 (;@2;)
-          end
-        end
-      end
-      local.get $3
-    end
+ )
+ (func $47 (; 60 ;) (type $2) (param $0 i32)
+  (call $fimport$3
+   (i32.const 2)
   )
-  (func $41 (;54;) (type $3) (result i32)
-    i32.const 0
-  )
-  (func $42 (;55;) (type $4) (param $0 i32) (param $1 i32) (result i32)
-    local.get $1
-    local.get $0
-    i32.const 1
-    i32.and
-    i32.const 0
-    i32.add
-    call_indirect (type $1)
-  )
-  (func $43 (;56;) (type $12) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
-    local.get $1
-    local.get $2
-    local.get $3
-    local.get $0
-    i32.const 3
-    i32.and
-    i32.const 2
-    i32.add
-    call_indirect (type $0)
-  )
-  (func $44 (;57;) (type $5) (param $0 i32) (param $1 i32)
-    local.get $1
-    local.get $0
-    i32.const 1
-    i32.and
-    i32.const 6
-    i32.add
-    call_indirect (type $2)
-  )
-  (func $45 (;58;) (type $1) (param $0 i32) (result i32)
-    block $label$1 (result i32) ;; label = @1
-      i32.const 0
-      call $fimport$3
-      i32.const 0
-    end
-  )
-  (func $46 (;59;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    block $label$1 (result i32) ;; label = @1
-      i32.const 1
-      call $fimport$3
-      i32.const 0
-    end
-  )
-  (func $47 (;60;) (type $2) (param $0 i32)
-    i32.const 2
-    call $fimport$3
-  )
-  (global $global$0 (;5;) (mut i32) global.get $gimport$0)
-  (global $global$1 (;6;) (mut i32) global.get $gimport$1)
-  (global $global$2 (;7;) (mut i32) global.get $gimport$2)
-  (global $global$3 (;8;) (mut i32) i32.const 0)
-  (global $global$4 (;9;) (mut i32) i32.const 0)
-  (global $global$5 (;10;) (mut i32) i32.const 0)
-  (export "_sbrk" (func $38))
-  (export "_free" (func $36))
-  (export "_main" (func $8))
-  (export "_pthread_self" (func $41))
-  (export "_memset" (func $39))
-  (export "_malloc" (func $35))
-  (export "_memcpy" (func $40))
-  (export "___errno_location" (func $12))
-  (export "runPostSets" (func $37))
-  (export "stackAlloc" (func $0))
-  (export "stackSave" (func $1))
-  (export "stackRestore" (func $2))
-  (export "establishStackSpace" (func $3))
-  (export "setThrew" (func $4))
-  (export "setTempRet0" (func $5))
-  (export "getTempRet0" (func $6))
-  (export "dynCall_ii" (func $42))
-  (export "dynCall_iiii" (func $43))
-  (export "dynCall_vi" (func $44))
-  (elem (;0;) (global.get $gimport$19) func $45 $9 $46 $14 $10 $15 $47 $16)
-  (data (;0;) (i32.const 1024) "\04\04\00\00\05")
-  (data (;1;) (i32.const 1040) "\01")
-  (data (;2;) (i32.const 1064) "\01\00\00\00\02\00\00\00<\10\00\00\00\04")
-  (data (;3;) (i32.const 1088) "\01")
-  (data (;4;) (i32.const 1103) "\0a\ff\ff\ff\ff")
-  (data (;5;) (i32.const 1140) "error: %d\0a\00Pfannkuchen(%d) = %d.\0a\00%d\00\11\00\0a\00\11\11\11\00\00\00\00\05\00\00\00\00\00\00\09\00\00\00\00\0b")
-  (data (;6;) (i32.const 1209) "\11\00\0f\0a\11\11\11\03\0a\07\00\01\13\09\0b\0b\00\00\09\06\0b\00\00\0b\00\06\11\00\00\00\11\11\11")
-  (data (;7;) (i32.const 1258) "\0b")
-  (data (;8;) (i32.const 1267) "\11\00\0a\0a\11\11\11\00\0a\00\00\02\00\09\0b\00\00\00\09\00\0b\00\00\0b")
-  (data (;9;) (i32.const 1316) "\0c")
-  (data (;10;) (i32.const 1328) "\0c\00\00\00\00\0c\00\00\00\00\09\0c\00\00\00\00\00\0c\00\00\0c")
-  (data (;11;) (i32.const 1374) "\0e")
-  (data (;12;) (i32.const 1386) "\0d\00\00\00\04\0d\00\00\00\00\09\0e\00\00\00\00\00\0e\00\00\0e")
-  (data (;13;) (i32.const 1432) "\10")
-  (data (;14;) (i32.const 1444) "\0f\00\00\00\00\0f\00\00\00\00\09\10\00\00\00\00\00\10\00\00\10\00\00\12\00\00\00\12\12\12")
-  (data (;15;) (i32.const 1499) "\12\00\00\00\12\12\12\00\00\00\00\00\00\09")
-  (data (;16;) (i32.const 1548) "\0b")
-  (data (;17;) (i32.const 1560) "\0a\00\00\00\00\0a\00\00\00\00\09\0b\00\00\00\00\00\0b\00\00\0b")
-  (data (;18;) (i32.const 1606) "\0c")
-  (data (;19;) (i32.const 1618) "\0c\00\00\00\00\0c\00\00\00\00\09\0c\00\00\00\00\00\0c\00\00\0c\00\000123456789ABCDEF-+   0X0x\00(null)\00-0X+0X 0X-0x+0x 0x\00inf\00INF\00nan\00NAN\00.\00T!\22\19\0d\01\02\03\11K\1c\0c\10\04\0b\1d\12\1e'hnopqb \05\06\0f\13\14\15\1a\08\16\07($\17\18\09\0a\0e\1b\1f%#\83\82}&*+<=>?CGJMXYZ[\5c]^_`acdefgijklrstyz{|\00Illegal byte sequence\00Domain error\00Result not representable\00Not a tty\00Permission denied\00Operation not permitted\00No such file or directory\00No such process\00File exists\00Value too large for data type\00No space left on device\00Out of memory\00Resource busy\00Interrupted system call\00Resource temporarily unavailable\00Invalid seek\00Cross-device link\00Read-only file system\00Directory not empty\00Connection reset by peer\00Operation timed out\00Connection refused\00Host is down\00Host is unreachable\00Address in use\00Broken pipe\00I/O error\00No such device or address\00Block device required\00No such device\00Not a directory\00Is a directory\00Text file busy\00Exec format error\00Invalid argument\00Argument list too long\00Symbolic link loop\00Filename too long\00Too many open files in system\00No file descriptors available\00Bad file descriptor\00No child process\00Bad address\00File too large\00Too many links\00No locks available\00Resource deadlock would occur\00State not recoverable\00Previous owner died\00Operation canceled\00Function not implemented\00No message of desired type\00Identifier removed\00Device not a stream\00No data available\00Device timeout\00Out of streams resources\00Link has been severed\00Protocol error\00Bad message\00File descriptor in bad state\00Not a socket\00Destination address required\00Message too large\00Protocol wrong type for socket\00Protocol not available\00Protocol not supported\00Socket type not supported\00Not supported\00Protocol family not supported\00Address family not supported by protocol\00Address not available\00Network is down\00Network unreachable\00Connection reset by network\00Connection aborted\00No buffer space available\00Socket is connected\00Socket not connected\00Cannot send after socket shutdown\00Operation already in progress\00Operation in progress\00Stale file handle\00Remote I/O error\00Quota exceeded\00No medium found\00Wrong medium type\00No error information")
-)
\ No newline at end of file
+ )
+)
+
diff --git a/cranelift/wasm/wasmtests/embenchen_fasta.wat b/cranelift/wasm/wasmtests/embenchen_fasta.wat
index 028615e9f3d4..54baa68e151a 100644
--- a/cranelift/wasm/wasmtests/embenchen_fasta.wat
+++ b/cranelift/wasm/wasmtests/embenchen_fasta.wat
@@ -1,12056 +1,16547 @@
 (module
-  (type $0 (;0;) (func (param i32 i32 i32) (result i32)))
-  (type $1 (;1;) (func))
-  (type $2 (;2;) (func (param i32) (result i32)))
-  (type $3 (;3;) (func (param i32)))
-  (type $4 (;4;) (func (result i32)))
-  (type $5 (;5;) (func (param i32 i32)))
-  (type $6 (;6;) (func (param i32 i32) (result i32)))
-  (type $7 (;7;) (func (param i32 i32 i32 i32 i32) (result i32)))
-  (type $8 (;8;) (func (param i32 i32 i32)))
-  (type $9 (;9;) (func (param i64 i32) (result i32)))
-  (type $10 (;10;) (func (param i32 i32 i32 i32 i32)))
-  (type $11 (;11;) (func (param f64 i32) (result f64)))
-  (type $12 (;12;) (func (param i32 i32 i32 i32) (result i32)))
-  (import "env" "memory" (memory $16 (;0;) 2048 2048))
-  (import "env" "table" (table $timport$17 (;0;) 9 9 funcref))
-  (import "env" "DYNAMICTOP_PTR" (global $gimport$0 (;0;) i32))
-  (import "env" "STACKTOP" (global $gimport$1 (;1;) i32))
-  (import "env" "STACK_MAX" (global $gimport$2 (;2;) i32))
-  (import "env" "memoryBase" (global $gimport$18 (;3;) i32))
-  (import "env" "tableBase" (global $gimport$19 (;4;) i32))
-  (import "env" "abort" (func $fimport$3 (;0;) (type $3)))
-  (import "env" "enlargeMemory" (func $fimport$4 (;1;) (type $4)))
-  (import "env" "getTotalMemory" (func $fimport$5 (;2;) (type $4)))
-  (import "env" "abortOnCannotGrowMemory" (func $fimport$6 (;3;) (type $4)))
-  (import "env" "_pthread_cleanup_pop" (func $fimport$7 (;4;) (type $3)))
-  (import "env" "_abort" (func $fimport$8 (;5;) (type $1)))
-  (import "env" "_pthread_cleanup_push" (func $fimport$9 (;6;) (type $5)))
-  (import "env" "___syscall6" (func $fimport$10 (;7;) (type $6)))
-  (import "env" "___setErrNo" (func $fimport$11 (;8;) (type $3)))
-  (import "env" "_emscripten_memcpy_big" (func $fimport$12 (;9;) (type $0)))
-  (import "env" "___syscall54" (func $fimport$13 (;10;) (type $6)))
-  (import "env" "___syscall140" (func $fimport$14 (;11;) (type $6)))
-  (import "env" "___syscall146" (func $fimport$15 (;12;) (type $6)))
-  (func $0 (;13;) (type $2) (param $0 i32) (result i32)
-    (local $1 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $1
-      global.get $global$1
-      local.get $0
-      i32.add
-      global.set $global$1
-      global.get $global$1
-      i32.const 15
-      i32.add
-      i32.const -16
-      i32.and
-      global.set $global$1
-      local.get $1
-    end
+ (type $0 (func (param i32 i32 i32) (result i32)))
+ (type $1 (func))
+ (type $2 (func (param i32) (result i32)))
+ (type $3 (func (param i32)))
+ (type $4 (func (result i32)))
+ (type $5 (func (param i32 i32)))
+ (type $6 (func (param i32 i32) (result i32)))
+ (type $7 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $8 (func (param i32 i32 i32)))
+ (type $9 (func (param i64 i32) (result i32)))
+ (type $10 (func (param i32 i32 i32 i32 i32)))
+ (type $11 (func (param f64 i32) (result f64)))
+ (type $12 (func (param i32 i32 i32 i32) (result i32)))
+ (import "env" "memory" (memory $16 2048 2048))
+ (data (i32.const 1024) "&\02\00\00a\00\00\00q=\8a>\00\00\00\00c\00\00\00\8f\c2\f5=\00\00\00\00g\00\00\00\8f\c2\f5=\00\00\00\00t\00\00\00q=\8a>\00\00\00\00B\00\00\00\n\d7\a3<\00\00\00\00D\00\00\00\n\d7\a3<\00\00\00\00H\00\00\00\n\d7\a3<\00\00\00\00K\00\00\00\n\d7\a3<\00\00\00\00M\00\00\00\n\d7\a3<\00\00\00\00N\00\00\00\n\d7\a3<\00\00\00\00R\00\00\00\n\d7\a3<\00\00\00\00S\00\00\00\n\d7\a3<\00\00\00\00V\00\00\00\n\d7\a3<\00\00\00\00W\00\00\00\n\d7\a3<\00\00\00\00Y\00\00\00\n\d7\a3<")
+ (data (i32.const 1220) "a\00\00\00\e9\1c\9b>\00\00\00\00c\00\00\00r\bdJ>\00\00\00\00g\00\00\00\d7IJ>\00\00\00\00t\00\00\00r_\9a>")
+ (data (i32.const 1280) "\04\05\00\00\05")
+ (data (i32.const 1296) "\01")
+ (data (i32.const 1320) "\01\00\00\00\02\00\00\00L\12\00\00\00\04")
+ (data (i32.const 1344) "\01")
+ (data (i32.const 1359) "\n\ff\ff\ff\ff")
+ (data (i32.const 1396) "*\00\00\00error: %d\n\00GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA\00\11\00\n\00\11\11\11\00\00\00\00\05\00\00\00\00\00\00\t\00\00\00\00\0b")
+ (data (i32.const 1731) "\11\00\0f\n\11\11\11\03\n\07\00\01\13\t\0b\0b\00\00\t\06\0b\00\00\0b\00\06\11\00\00\00\11\11\11")
+ (data (i32.const 1780) "\0b")
+ (data (i32.const 1789) "\11\00\n\n\11\11\11\00\n\00\00\02\00\t\0b\00\00\00\t\00\0b\00\00\0b")
+ (data (i32.const 1838) "\0c")
+ (data (i32.const 1850) "\0c\00\00\00\00\0c\00\00\00\00\t\0c\00\00\00\00\00\0c\00\00\0c")
+ (data (i32.const 1896) "\0e")
+ (data (i32.const 1908) "\0d\00\00\00\04\0d\00\00\00\00\t\0e\00\00\00\00\00\0e\00\00\0e")
+ (data (i32.const 1954) "\10")
+ (data (i32.const 1966) "\0f\00\00\00\00\0f\00\00\00\00\t\10\00\00\00\00\00\10\00\00\10\00\00\12\00\00\00\12\12\12")
+ (data (i32.const 2021) "\12\00\00\00\12\12\12\00\00\00\00\00\00\t")
+ (data (i32.const 2070) "\0b")
+ (data (i32.const 2082) "\n\00\00\00\00\n\00\00\00\00\t\0b\00\00\00\00\00\0b\00\00\0b")
+ (data (i32.const 2128) "\0c")
+ (data (i32.const 2140) "\0c\00\00\00\00\0c\00\00\00\00\t\0c\00\00\00\00\00\0c\00\00\0c\00\000123456789ABCDEF-+   0X0x\00(null)\00-0X+0X 0X-0x+0x 0x\00inf\00INF\00nan\00NAN\00.\00T!\"\19\0d\01\02\03\11K\1c\0c\10\04\0b\1d\12\1e\'hnopqb \05\06\0f\13\14\15\1a\08\16\07($\17\18\t\n\0e\1b\1f%#\83\82}&*+<=>?CGJMXYZ[\\]^_`acdefgijklrstyz{|\00Illegal byte sequence\00Domain error\00Result not representable\00Not a tty\00Permission denied\00Operation not permitted\00No such file or directory\00No such process\00File exists\00Value too large for data type\00No space left on device\00Out of memory\00Resource busy\00Interrupted system call\00Resource temporarily unavailable\00Invalid seek\00Cross-device link\00Read-only file system\00Directory not empty\00Connection reset by peer\00Operation timed out\00Connection refused\00Host is down\00Host is unreachable\00Address in use\00Broken pipe\00I/O error\00No such device or address\00Block device required\00No such device\00Not a directory\00Is a directory\00Text file busy\00Exec format error\00Invalid argument\00Argument list too long\00Symbolic link loop\00Filename too long\00Too many open files in system\00No file descriptors available\00Bad file descriptor\00No child process\00Bad address\00File too large\00Too many links\00No locks available\00Resource deadlock would occur\00State not recoverable\00Previous owner died\00Operation canceled\00Function not implemented\00No message of desired type\00Identifier removed\00Device not a stream\00No data available\00Device timeout\00Out of streams resources\00Link has been severed\00Protocol error\00Bad message\00File descriptor in bad state\00Not a socket\00Destination address required\00Message too large\00Protocol wrong type for socket\00Protocol not available\00Protocol not supported\00Socket type not supported\00Not supported\00Protocol family not supported\00Address family not supported by protocol\00Address not available\00Network is down\00Network unreachable\00Connection reset by network\00Connection aborted\00No buffer space available\00Socket is connected\00Socket not connected\00Cannot send after socket shutdown\00Operation already in progress\00Operation in progress\00Stale file handle\00Remote I/O error\00Quota exceeded\00No medium found\00Wrong medium type\00No error information")
+ (import "env" "table" (table $timport$17 9 9 funcref))
+ (elem (global.get $gimport$19) $53 $9 $54 $14 $10 $15 $55 $16 $56)
+ (import "env" "DYNAMICTOP_PTR" (global $gimport$0 i32))
+ (import "env" "STACKTOP" (global $gimport$1 i32))
+ (import "env" "STACK_MAX" (global $gimport$2 i32))
+ (import "env" "memoryBase" (global $gimport$18 i32))
+ (import "env" "tableBase" (global $gimport$19 i32))
+ (import "env" "abort" (func $fimport$3 (param i32)))
+ (import "env" "enlargeMemory" (func $fimport$4 (result i32)))
+ (import "env" "getTotalMemory" (func $fimport$5 (result i32)))
+ (import "env" "abortOnCannotGrowMemory" (func $fimport$6 (result i32)))
+ (import "env" "_pthread_cleanup_pop" (func $fimport$7 (param i32)))
+ (import "env" "_abort" (func $fimport$8))
+ (import "env" "_pthread_cleanup_push" (func $fimport$9 (param i32 i32)))
+ (import "env" "___syscall6" (func $fimport$10 (param i32 i32) (result i32)))
+ (import "env" "___setErrNo" (func $fimport$11 (param i32)))
+ (import "env" "_emscripten_memcpy_big" (func $fimport$12 (param i32 i32 i32) (result i32)))
+ (import "env" "___syscall54" (func $fimport$13 (param i32 i32) (result i32)))
+ (import "env" "___syscall140" (func $fimport$14 (param i32 i32) (result i32)))
+ (import "env" "___syscall146" (func $fimport$15 (param i32 i32) (result i32)))
+ (global $global$0 (mut i32) (global.get $gimport$0))
+ (global $global$1 (mut i32) (global.get $gimport$1))
+ (global $global$2 (mut i32) (global.get $gimport$2))
+ (global $global$3 (mut i32) (i32.const 0))
+ (global $global$4 (mut i32) (i32.const 0))
+ (global $global$5 (mut i32) (i32.const 0))
+ (export "_sbrk" (func $45))
+ (export "_free" (func $38))
+ (export "_main" (func $7))
+ (export "_pthread_self" (func $48))
+ (export "_memset" (func $46))
+ (export "_malloc" (func $37))
+ (export "_memcpy" (func $47))
+ (export "___errno_location" (func $12))
+ (export "runPostSets" (func $44))
+ (export "stackAlloc" (func $0))
+ (export "stackSave" (func $1))
+ (export "stackRestore" (func $2))
+ (export "establishStackSpace" (func $3))
+ (export "setThrew" (func $4))
+ (export "setTempRet0" (func $5))
+ (export "getTempRet0" (func $6))
+ (export "dynCall_ii" (func $49))
+ (export "dynCall_iiii" (func $50))
+ (export "dynCall_vi" (func $51))
+ (export "dynCall_v" (func $52))
+ (func $0 (; 13 ;) (type $2) (param $0 i32) (result i32)
+  (local $1 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (local.get $0)
+    )
+   )
+   (global.set $global$1
+    (i32.and
+     (i32.add
+      (global.get $global$1)
+      (i32.const 15)
+     )
+     (i32.const -16)
+    )
+   )
+   (local.get $1)
   )
-  (func $1 (;14;) (type $4) (result i32)
-    global.get $global$1
+ )
+ (func $1 (; 14 ;) (type $4) (result i32)
+  (global.get $global$1)
+ )
+ (func $2 (; 15 ;) (type $3) (param $0 i32)
+  (global.set $global$1
+   (local.get $0)
   )
-  (func $2 (;15;) (type $3) (param $0 i32)
-    local.get $0
-    global.set $global$1
+ )
+ (func $3 (; 16 ;) (type $5) (param $0 i32) (param $1 i32)
+  (block $label$1
+   (global.set $global$1
+    (local.get $0)
+   )
+   (global.set $global$2
+    (local.get $1)
+   )
   )
-  (func $3 (;16;) (type $5) (param $0 i32) (param $1 i32)
-    block $label$1 ;; label = @1
-      local.get $0
-      global.set $global$1
-      local.get $1
-      global.set $global$2
-    end
+ )
+ (func $4 (; 17 ;) (type $5) (param $0 i32) (param $1 i32)
+  (if
+   (i32.eqz
+    (global.get $global$3)
+   )
+   (block
+    (global.set $global$3
+     (local.get $0)
+    )
+    (global.set $global$4
+     (local.get $1)
+    )
+   )
   )
-  (func $4 (;17;) (type $5) (param $0 i32) (param $1 i32)
-    global.get $global$3
-    i32.eqz
-    if ;; label = @1
-      block ;; label = @2
-        local.get $0
-        global.set $global$3
-        local.get $1
-        global.set $global$4
-      end
-    end
+ )
+ (func $5 (; 18 ;) (type $3) (param $0 i32)
+  (global.set $global$5
+   (local.get $0)
   )
-  (func $5 (;18;) (type $3) (param $0 i32)
-    local.get $0
-    global.set $global$5
+ )
+ (func $6 (; 19 ;) (type $4) (result i32)
+  (global.get $global$5)
+ )
+ (func $7 (; 20 ;) (type $6) (param $0 i32) (param $1 i32) (result i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 f32)
+  (local $12 f32)
+  (local $13 f64)
+  (block $label$1 (result i32)
+   (local.set $5
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 4256)
+    )
+   )
+   (local.set $3
+    (local.get $5)
+   )
+   (local.set $6
+    (i32.add
+     (local.get $5)
+     (i32.const 2128)
+    )
+   )
+   (local.set $7
+    (i32.add
+     (local.get $5)
+     (i32.const 8)
+    )
+   )
+   (block $label$2
+    (block $label$3
+     (br_if $label$3
+      (i32.le_s
+       (local.get $0)
+       (i32.const 1)
+      )
+     )
+     (block $label$4
+      (block $label$5
+       (block $label$6
+        (block $label$7
+         (block $label$8
+          (block $label$9
+           (block $label$10
+            (br_table $label$5 $label$10 $label$8 $label$9 $label$7 $label$6 $label$4
+             (i32.sub
+              (local.tee $0
+               (i32.load8_s
+                (i32.load offset=4
+                 (local.get $1)
+                )
+               )
+              )
+              (i32.const 48)
+             )
+            )
+           )
+           (local.set $4
+            (i32.const 950000)
+           )
+           (br $label$2)
+          )
+          (br $label$3)
+         )
+         (local.set $4
+          (i32.const 9500000)
+         )
+         (br $label$2)
+        )
+        (local.set $4
+         (i32.const 95000000)
+        )
+        (br $label$2)
+       )
+       (local.set $4
+        (i32.const 190000000)
+       )
+       (br $label$2)
+      )
+      (global.set $global$1
+       (local.get $5)
+      )
+      (return
+       (i32.const 0)
+      )
+     )
+     (i32.store
+      (local.get $3)
+      (i32.add
+       (local.get $0)
+       (i32.const -48)
+      )
+     )
+     (drop
+      (call $34
+       (i32.const 1400)
+       (local.get $3)
+      )
+     )
+     (global.set $global$1
+      (local.get $5)
+     )
+     (return
+      (i32.const -1)
+     )
+    )
+    (local.set $4
+     (i32.const 19000000)
+    )
+   )
+   (drop
+    (call $47
+     (local.tee $8
+      (call $40
+       (i32.const 347)
+      )
+     )
+     (i32.const 1411)
+     (i32.const 287)
+    )
+   )
+   (i64.store align=1
+    (local.tee $0
+     (i32.add
+      (local.get $8)
+      (i32.const 287)
+     )
+    )
+    (i64.load align=1
+     (i32.const 1411)
+    )
+   )
+   (i64.store offset=8 align=1
+    (local.get $0)
+    (i64.load align=1
+     (i32.const 1419)
+    )
+   )
+   (i64.store offset=16 align=1
+    (local.get $0)
+    (i64.load align=1
+     (i32.const 1427)
+    )
+   )
+   (i64.store offset=24 align=1
+    (local.get $0)
+    (i64.load align=1
+     (i32.const 1435)
+    )
+   )
+   (i64.store offset=32 align=1
+    (local.get $0)
+    (i64.load align=1
+     (i32.const 1443)
+    )
+   )
+   (i64.store offset=40 align=1
+    (local.get $0)
+    (i64.load align=1
+     (i32.const 1451)
+    )
+   )
+   (i64.store offset=48 align=1
+    (local.get $0)
+    (i64.load align=1
+     (i32.const 1459)
+    )
+   )
+   (i32.store offset=56 align=1
+    (local.get $0)
+    (i32.load align=1
+     (i32.const 1467)
+    )
+   )
+   (local.set $0
+    (i32.shl
+     (local.get $4)
+     (i32.const 1)
+    )
+   )
+   (local.set $1
+    (i32.const 0)
+   )
+   (loop $label$11
+    (drop
+     (call $47
+      (local.tee $2
+       (call $40
+        (i32.add
+         (local.tee $3
+          (if (result i32)
+           (i32.lt_u
+            (local.get $0)
+            (i32.const 60)
+           )
+           (local.get $0)
+           (i32.const 60)
+          )
+         )
+         (i32.const 2)
+        )
+       )
+      )
+      (i32.add
+       (local.get $8)
+       (local.get $1)
+      )
+      (local.get $3)
+     )
+    )
+    (i32.store8
+     (i32.add
+      (local.get $2)
+      (local.get $3)
+     )
+     (i32.const 0)
+    )
+    (if
+     (i32.gt_s
+      (local.tee $10
+       (call $31
+        (local.get $2)
+       )
+      )
+      (local.tee $9
+       (i32.load
+        (i32.const 1024)
+       )
+      )
+     )
+     (if
+      (i32.gt_s
+       (local.get $9)
+       (i32.const 0)
+      )
+      (block
+       (i32.store8
+        (i32.add
+         (local.get $2)
+         (local.get $9)
+        )
+        (i32.const 0)
+       )
+       (drop
+        (call $35
+         (local.get $2)
+        )
+       )
+       (i32.store
+        (i32.const 1024)
+        (i32.const 0)
+       )
+      )
+     )
+     (block
+      (drop
+       (call $35
+        (local.get $2)
+       )
+      )
+      (i32.store
+       (i32.const 1024)
+       (i32.sub
+        (i32.load
+         (i32.const 1024)
+        )
+        (local.get $10)
+       )
+      )
+     )
+    )
+    (call $41
+     (local.get $2)
+    )
+    (local.set $1
+     (i32.add
+      (local.tee $2
+       (i32.add
+        (local.get $3)
+        (local.get $1)
+       )
+      )
+      (i32.const -287)
+     )
+    )
+    (if
+     (i32.le_u
+      (local.get $2)
+      (i32.const 287)
+     )
+     (local.set $1
+      (local.get $2)
+     )
+    )
+    (br_if $label$11
+     (local.tee $0
+      (i32.sub
+       (local.get $0)
+       (local.get $3)
+      )
+     )
+    )
+   )
+   (call $42
+    (local.get $8)
+   )
+   (if
+    (i32.load
+     (i32.const 1028)
+    )
+    (block
+     (local.set $0
+      (i32.const 1028)
+     )
+     (local.set $11
+      (f32.const 0)
+     )
+     (loop $label$19
+      (local.set $12
+       (f32.demote_f64
+        (if (result f64)
+         (f64.lt
+          (local.tee $13
+           (f64.promote_f32
+            (local.tee $11
+             (f32.add
+              (local.get $11)
+              (f32.load
+               (local.tee $1
+                (i32.add
+                 (local.get $0)
+                 (i32.const 4)
+                )
+               )
+              )
+             )
+            )
+           )
+          )
+          (f64.const 1)
+         )
+         (local.get $13)
+         (f64.const 1)
+        )
+       )
+      )
+      (f32.store
+       (local.get $1)
+       (local.get $12)
+      )
+      (i32.store offset=8
+       (local.get $0)
+       (i32.trunc_f32_s
+        (f32.mul
+         (local.get $12)
+         (f32.const 512)
+        )
+       )
+      )
+      (br_if $label$19
+       (i32.load
+        (local.tee $0
+         (i32.add
+          (local.get $0)
+          (i32.const 12)
+         )
+        )
+       )
+      )
+      (local.set $1
+       (i32.const 0)
+      )
+      (local.set $0
+       (i32.const 1028)
+      )
+     )
+    )
+    (block
+     (local.set $1
+      (i32.const 0)
+     )
+     (local.set $0
+      (i32.const 1028)
+     )
+    )
+   )
+   (loop $label$23
+    (loop $label$24
+     (local.set $3
+      (i32.add
+       (local.get $0)
+       (i32.const 12)
+      )
+     )
+     (if
+      (i32.and
+       (i32.gt_u
+        (local.get $1)
+        (local.tee $2
+         (i32.load offset=8
+          (local.get $0)
+         )
+        )
+       )
+       (i32.ne
+        (local.get $2)
+        (i32.const 0)
+       )
+      )
+      (block
+       (local.set $0
+        (local.get $3)
+       )
+       (br $label$24)
+      )
+     )
+    )
+    (i32.store
+     (i32.add
+      (local.get $6)
+      (i32.shl
+       (local.get $1)
+       (i32.const 2)
+      )
+     )
+     (local.get $0)
+    )
+    (br_if $label$23
+     (i32.ne
+      (local.tee $1
+       (i32.add
+        (local.get $1)
+        (i32.const 1)
+       )
+      )
+      (i32.const 513)
+     )
+    )
+   )
+   (i32.store
+    (i32.add
+     (local.get $6)
+     (i32.const 2116)
+    )
+    (i32.const 0)
+   )
+   (local.set $0
+    (i32.mul
+     (local.get $4)
+     (i32.const 3)
+    )
+   )
+   (loop $label$26
+    (call $8
+     (local.get $6)
+     (local.tee $1
+      (if (result i32)
+       (i32.lt_u
+        (local.get $0)
+        (i32.const 60)
+       )
+       (local.get $0)
+       (i32.const 60)
+      )
+     )
+    )
+    (br_if $label$26
+     (local.tee $0
+      (i32.sub
+       (local.get $0)
+       (local.get $1)
+      )
+     )
+    )
+   )
+   (if
+    (i32.load
+     (i32.const 1220)
+    )
+    (block
+     (local.set $0
+      (i32.const 1220)
+     )
+     (local.set $11
+      (f32.const 0)
+     )
+     (loop $label$30
+      (local.set $12
+       (f32.demote_f64
+        (if (result f64)
+         (f64.lt
+          (local.tee $13
+           (f64.promote_f32
+            (local.tee $11
+             (f32.add
+              (local.get $11)
+              (f32.load
+               (local.tee $1
+                (i32.add
+                 (local.get $0)
+                 (i32.const 4)
+                )
+               )
+              )
+             )
+            )
+           )
+          )
+          (f64.const 1)
+         )
+         (local.get $13)
+         (f64.const 1)
+        )
+       )
+      )
+      (f32.store
+       (local.get $1)
+       (local.get $12)
+      )
+      (i32.store offset=8
+       (local.get $0)
+       (i32.trunc_f32_s
+        (f32.mul
+         (local.get $12)
+         (f32.const 512)
+        )
+       )
+      )
+      (br_if $label$30
+       (i32.load
+        (local.tee $0
+         (i32.add
+          (local.get $0)
+          (i32.const 12)
+         )
+        )
+       )
+      )
+      (local.set $1
+       (i32.const 0)
+      )
+      (local.set $0
+       (i32.const 1220)
+      )
+     )
+    )
+    (block
+     (local.set $1
+      (i32.const 0)
+     )
+     (local.set $0
+      (i32.const 1220)
+     )
+    )
+   )
+   (loop $label$34
+    (loop $label$35
+     (local.set $3
+      (i32.add
+       (local.get $0)
+       (i32.const 12)
+      )
+     )
+     (if
+      (i32.and
+       (i32.gt_u
+        (local.get $1)
+        (local.tee $2
+         (i32.load offset=8
+          (local.get $0)
+         )
+        )
+       )
+       (i32.ne
+        (local.get $2)
+        (i32.const 0)
+       )
+      )
+      (block
+       (local.set $0
+        (local.get $3)
+       )
+       (br $label$35)
+      )
+     )
+    )
+    (i32.store
+     (i32.add
+      (local.get $7)
+      (i32.shl
+       (local.get $1)
+       (i32.const 2)
+      )
+     )
+     (local.get $0)
+    )
+    (br_if $label$34
+     (i32.ne
+      (local.tee $1
+       (i32.add
+        (local.get $1)
+        (i32.const 1)
+       )
+      )
+      (i32.const 513)
+     )
+    )
+   )
+   (i32.store
+    (i32.add
+     (local.get $7)
+     (i32.const 2116)
+    )
+    (i32.const 0)
+   )
+   (local.set $0
+    (i32.mul
+     (local.get $4)
+     (i32.const 5)
+    )
+   )
+   (loop $label$37
+    (call $8
+     (local.get $7)
+     (local.tee $1
+      (if (result i32)
+       (i32.lt_u
+        (local.get $0)
+        (i32.const 60)
+       )
+       (local.get $0)
+       (i32.const 60)
+      )
+     )
+    )
+    (br_if $label$37
+     (local.tee $0
+      (i32.sub
+       (local.get $0)
+       (local.get $1)
+      )
+     )
+    )
+    (local.set $0
+     (i32.const 0)
+    )
+   )
+   (global.set $global$1
+    (local.get $5)
+   )
+   (local.get $0)
   )
-  (func $6 (;19;) (type $4) (result i32)
-    global.get $global$5
+ )
+ (func $8 (; 21 ;) (type $5) (param $0 i32) (param $1 i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 f32)
+  (block $label$1
+   (if
+    (local.get $1)
+    (block
+     (local.set $3
+      (i32.const 0)
+     )
+     (local.set $2
+      (i32.load
+       (i32.const 1396)
+      )
+     )
+     (loop $label$3
+      (local.set $2
+       (i32.load
+        (i32.add
+         (local.get $0)
+         (i32.shl
+          (i32.trunc_f32_s
+           (f32.mul
+            (local.tee $6
+             (f32.div
+              (f32.convert_i32_u
+               (local.tee $4
+                (i32.rem_u
+                 (i32.add
+                  (i32.mul
+                   (local.get $2)
+                   (i32.const 3877)
+                  )
+                  (i32.const 29573)
+                 )
+                 (i32.const 139968)
+                )
+               )
+              )
+              (f32.const 139968)
+             )
+            )
+            (f32.const 512)
+           )
+          )
+          (i32.const 2)
+         )
+        )
+       )
+      )
+      (loop $label$4
+       (local.set $5
+        (i32.add
+         (local.get $2)
+         (i32.const 12)
+        )
+       )
+       (if
+        (f32.lt
+         (f32.load offset=4
+          (local.get $2)
+         )
+         (local.get $6)
+        )
+        (block
+         (local.set $2
+          (local.get $5)
+         )
+         (br $label$4)
+        )
+       )
+      )
+      (i32.store8
+       (i32.add
+        (i32.add
+         (local.get $0)
+         (i32.const 2052)
+        )
+        (local.get $3)
+       )
+       (i32.load
+        (local.get $2)
+       )
+      )
+      (if
+       (i32.ne
+        (local.tee $3
+         (i32.add
+          (local.get $3)
+          (i32.const 1)
+         )
+        )
+        (local.get $1)
+       )
+       (block
+        (local.set $2
+         (local.get $4)
+        )
+        (br $label$3)
+       )
+      )
+     )
+     (i32.store
+      (i32.const 1396)
+      (local.get $4)
+     )
+    )
+   )
+   (i32.store8
+    (i32.add
+     (i32.add
+      (local.get $0)
+      (i32.const 2052)
+     )
+     (local.get $1)
+    )
+    (i32.const 10)
+   )
+   (i32.store8
+    (i32.add
+     (i32.add
+      (local.get $0)
+      (i32.const 2052)
+     )
+     (local.tee $1
+      (i32.add
+       (local.get $1)
+       (i32.const 1)
+      )
+     )
+    )
+    (i32.const 0)
+   )
+   (i32.store
+    (i32.add
+     (local.get $0)
+     (i32.const 2116)
+    )
+    (local.get $1)
+   )
+   (if
+    (i32.le_s
+     (local.tee $3
+      (call $31
+       (local.tee $1
+        (i32.add
+         (local.get $0)
+         (i32.const 2052)
+        )
+       )
+      )
+     )
+     (local.tee $2
+      (i32.load
+       (i32.const 1024)
+      )
+     )
+    )
+    (block
+     (drop
+      (call $35
+       (local.get $1)
+      )
+     )
+     (i32.store
+      (i32.const 1024)
+      (i32.sub
+       (i32.load
+        (i32.const 1024)
+       )
+       (local.get $3)
+      )
+     )
+     (return)
+    )
+   )
+   (if
+    (i32.le_s
+     (local.get $2)
+     (i32.const 0)
+    )
+    (return)
+   )
+   (i32.store8
+    (i32.add
+     (i32.add
+      (local.get $0)
+      (i32.const 2052)
+     )
+     (local.get $2)
+    )
+    (i32.const 0)
+   )
+   (drop
+    (call $35
+     (local.get $1)
+    )
+   )
+   (i32.store8
+    (i32.add
+     (i32.add
+      (local.get $0)
+      (i32.const 2052)
+     )
+     (i32.load
+      (i32.const 1024)
+     )
+    )
+    (i32.const 122)
+   )
+   (i32.store
+    (i32.const 1024)
+    (i32.const 0)
+   )
   )
-  (func $7 (;20;) (type $6) (param $0 i32) (param $1 i32) (result i32)
-    (local $2 i32) (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 f32) (local $12 f32) (local $13 f64)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $5
-      global.get $global$1
-      i32.const 4256
-      i32.add
-      global.set $global$1
-      local.get $5
-      local.set $3
-      local.get $5
-      i32.const 2128
-      i32.add
-      local.set $6
-      local.get $5
-      i32.const 8
-      i32.add
-      local.set $7
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          local.get $0
-          i32.const 1
-          i32.le_s
-          br_if 0 (;@3;)
-          block $label$4 ;; label = @4
-            block $label$5 ;; label = @5
-              block $label$6 ;; label = @6
-                block $label$7 ;; label = @7
-                  block $label$8 ;; label = @8
-                    block $label$9 ;; label = @9
-                      block $label$10 ;; label = @10
-                        local.get $1
-                        i32.load offset=4
-                        i32.load8_s
-                        local.tee $0
-                        i32.const 48
-                        i32.sub
-                        br_table 5 (;@5;) 0 (;@10;) 2 (;@8;) 1 (;@9;) 3 (;@7;) 4 (;@6;) 6 (;@4;)
-                      end
-                      i32.const 950000
-                      local.set $4
-                      br 7 (;@2;)
-                    end
-                    br 5 (;@3;)
-                  end
-                  i32.const 9500000
-                  local.set $4
-                  br 5 (;@2;)
-                end
-                i32.const 95000000
-                local.set $4
-                br 4 (;@2;)
-              end
-              i32.const 190000000
-              local.set $4
-              br 3 (;@2;)
-            end
-            local.get $5
-            global.set $global$1
-            i32.const 0
-            return
-          end
-          local.get $3
-          local.get $0
-          i32.const -48
-          i32.add
-          i32.store
-          i32.const 1400
-          local.get $3
-          call $34
-          drop
-          local.get $5
-          global.set $global$1
-          i32.const -1
-          return
-        end
-        i32.const 19000000
-        local.set $4
-      end
-      i32.const 347
-      call $40
-      local.tee $8
-      i32.const 1411
-      i32.const 287
-      call $47
-      drop
-      local.get $8
-      i32.const 287
-      i32.add
-      local.tee $0
-      i32.const 1411
-      i64.load align=1
-      i64.store align=1
-      local.get $0
-      i32.const 1419
-      i64.load align=1
-      i64.store offset=8 align=1
-      local.get $0
-      i32.const 1427
-      i64.load align=1
-      i64.store offset=16 align=1
-      local.get $0
-      i32.const 1435
-      i64.load align=1
-      i64.store offset=24 align=1
-      local.get $0
-      i32.const 1443
-      i64.load align=1
-      i64.store offset=32 align=1
-      local.get $0
-      i32.const 1451
-      i64.load align=1
-      i64.store offset=40 align=1
-      local.get $0
-      i32.const 1459
-      i64.load align=1
-      i64.store offset=48 align=1
-      local.get $0
-      i32.const 1467
-      i32.load align=1
-      i32.store offset=56 align=1
-      local.get $4
-      i32.const 1
-      i32.shl
-      local.set $0
-      i32.const 0
-      local.set $1
-      loop $label$11 ;; label = @2
-        local.get $0
-        i32.const 60
-        i32.lt_u
-        if (result i32) ;; label = @3
-          local.get $0
-        else
-          i32.const 60
-        end
-        local.tee $3
-        i32.const 2
-        i32.add
-        call $40
-        local.tee $2
-        local.get $8
-        local.get $1
-        i32.add
-        local.get $3
-        call $47
-        drop
-        local.get $2
-        local.get $3
-        i32.add
-        i32.const 0
-        i32.store8
-        local.get $2
-        call $31
-        local.tee $10
-        i32.const 1024
-        i32.load
-        local.tee $9
-        i32.gt_s
-        if ;; label = @3
-          local.get $9
-          i32.const 0
-          i32.gt_s
-          if ;; label = @4
-            block ;; label = @5
-              local.get $2
-              local.get $9
-              i32.add
-              i32.const 0
-              i32.store8
-              local.get $2
-              call $35
-              drop
-              i32.const 1024
-              i32.const 0
-              i32.store
-            end
-          end
-        else
-          block ;; label = @4
-            local.get $2
-            call $35
-            drop
-            i32.const 1024
-            i32.const 1024
-            i32.load
-            local.get $10
-            i32.sub
-            i32.store
-          end
-        end
-        local.get $2
-        call $41
-        local.get $3
-        local.get $1
-        i32.add
-        local.tee $2
-        i32.const -287
-        i32.add
-        local.set $1
-        local.get $2
-        i32.const 287
-        i32.le_u
-        if ;; label = @3
-          local.get $2
-          local.set $1
-        end
-        local.get $0
-        local.get $3
-        i32.sub
-        local.tee $0
-        br_if 0 (;@2;)
-      end
-      local.get $8
-      call $42
-      i32.const 1028
-      i32.load
-      if ;; label = @2
-        block ;; label = @3
-          i32.const 1028
-          local.set $0
-          f32.const 0x0p+0 (;=0;)
-          local.set $11
-          loop $label$19 ;; label = @4
-            local.get $11
-            local.get $0
-            i32.const 4
-            i32.add
-            local.tee $1
-            f32.load
-            f32.add
-            local.tee $11
-            f64.promote_f32
-            local.tee $13
-            f64.const 0x1p+0 (;=1;)
-            f64.lt
-            if (result f64) ;; label = @5
-              local.get $13
-            else
-              f64.const 0x1p+0 (;=1;)
-            end
-            f32.demote_f64
-            local.set $12
-            local.get $1
-            local.get $12
-            f32.store
-            local.get $0
-            local.get $12
-            f32.const 0x1p+9 (;=512;)
-            f32.mul
-            i32.trunc_f32_s
-            i32.store offset=8
-            local.get $0
-            i32.const 12
-            i32.add
-            local.tee $0
-            i32.load
-            br_if 0 (;@4;)
-            i32.const 0
-            local.set $1
-            i32.const 1028
-            local.set $0
-          end
-        end
-      else
-        block ;; label = @3
-          i32.const 0
-          local.set $1
-          i32.const 1028
-          local.set $0
-        end
-      end
-      loop $label$23 ;; label = @2
-        loop $label$24 ;; label = @3
-          local.get $0
-          i32.const 12
-          i32.add
-          local.set $3
-          local.get $1
-          local.get $0
-          i32.load offset=8
-          local.tee $2
-          i32.gt_u
-          local.get $2
-          i32.const 0
-          i32.ne
-          i32.and
-          if ;; label = @4
-            block ;; label = @5
-              local.get $3
-              local.set $0
-              br 2 (;@3;)
-            end
-          end
-        end
-        local.get $6
-        local.get $1
-        i32.const 2
-        i32.shl
-        i32.add
-        local.get $0
-        i32.store
-        local.get $1
-        i32.const 1
-        i32.add
-        local.tee $1
-        i32.const 513
-        i32.ne
-        br_if 0 (;@2;)
-      end
-      local.get $6
-      i32.const 2116
-      i32.add
-      i32.const 0
-      i32.store
-      local.get $4
-      i32.const 3
-      i32.mul
-      local.set $0
-      loop $label$26 ;; label = @2
-        local.get $6
-        local.get $0
-        i32.const 60
-        i32.lt_u
-        if (result i32) ;; label = @3
-          local.get $0
-        else
-          i32.const 60
-        end
-        local.tee $1
-        call $8
-        local.get $0
-        local.get $1
-        i32.sub
-        local.tee $0
-        br_if 0 (;@2;)
-      end
-      i32.const 1220
-      i32.load
-      if ;; label = @2
-        block ;; label = @3
-          i32.const 1220
-          local.set $0
-          f32.const 0x0p+0 (;=0;)
-          local.set $11
-          loop $label$30 ;; label = @4
-            local.get $11
-            local.get $0
-            i32.const 4
-            i32.add
-            local.tee $1
-            f32.load
-            f32.add
-            local.tee $11
-            f64.promote_f32
-            local.tee $13
-            f64.const 0x1p+0 (;=1;)
-            f64.lt
-            if (result f64) ;; label = @5
-              local.get $13
-            else
-              f64.const 0x1p+0 (;=1;)
-            end
-            f32.demote_f64
-            local.set $12
-            local.get $1
-            local.get $12
-            f32.store
-            local.get $0
-            local.get $12
-            f32.const 0x1p+9 (;=512;)
-            f32.mul
-            i32.trunc_f32_s
-            i32.store offset=8
-            local.get $0
-            i32.const 12
-            i32.add
-            local.tee $0
-            i32.load
-            br_if 0 (;@4;)
-            i32.const 0
-            local.set $1
-            i32.const 1220
-            local.set $0
-          end
-        end
-      else
-        block ;; label = @3
-          i32.const 0
-          local.set $1
-          i32.const 1220
-          local.set $0
-        end
-      end
-      loop $label$34 ;; label = @2
-        loop $label$35 ;; label = @3
-          local.get $0
-          i32.const 12
-          i32.add
-          local.set $3
-          local.get $1
-          local.get $0
-          i32.load offset=8
-          local.tee $2
-          i32.gt_u
-          local.get $2
-          i32.const 0
-          i32.ne
-          i32.and
-          if ;; label = @4
-            block ;; label = @5
-              local.get $3
-              local.set $0
-              br 2 (;@3;)
-            end
-          end
-        end
-        local.get $7
-        local.get $1
-        i32.const 2
-        i32.shl
-        i32.add
-        local.get $0
-        i32.store
-        local.get $1
-        i32.const 1
-        i32.add
-        local.tee $1
-        i32.const 513
-        i32.ne
-        br_if 0 (;@2;)
-      end
-      local.get $7
-      i32.const 2116
-      i32.add
-      i32.const 0
-      i32.store
-      local.get $4
-      i32.const 5
-      i32.mul
-      local.set $0
-      loop $label$37 ;; label = @2
-        local.get $7
-        local.get $0
-        i32.const 60
-        i32.lt_u
-        if (result i32) ;; label = @3
-          local.get $0
-        else
-          i32.const 60
-        end
-        local.tee $1
-        call $8
-        local.get $0
-        local.get $1
-        i32.sub
-        local.tee $0
-        br_if 0 (;@2;)
-        i32.const 0
-        local.set $0
-      end
-      local.get $5
-      global.set $global$1
-      local.get $0
-    end
+ )
+ (func $9 (; 22 ;) (type $2) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 16)
+    )
+   )
+   (i32.store
+    (local.tee $2
+     (local.get $1)
+    )
+    (i32.load offset=60
+     (local.get $0)
+    )
+   )
+   (local.set $0
+    (call $11
+     (call $fimport$10
+      (i32.const 6)
+      (local.get $2)
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $1)
+   )
+   (local.get $0)
   )
-  (func $8 (;21;) (type $5) (param $0 i32) (param $1 i32)
-    (local $2 i32) (local $3 i32) (local $4 i32) (local $5 i32) (local $6 f32)
-    block $label$1 ;; label = @1
-      local.get $1
-      if ;; label = @2
-        block ;; label = @3
-          i32.const 0
-          local.set $3
-          i32.const 1396
-          i32.load
-          local.set $2
-          loop $label$3 ;; label = @4
-            local.get $0
-            local.get $2
-            i32.const 3877
-            i32.mul
-            i32.const 29573
-            i32.add
-            i32.const 139968
-            i32.rem_u
-            local.tee $4
-            f32.convert_i32_u
-            f32.const 0x1.116p+17 (;=139968;)
-            f32.div
-            local.tee $6
-            f32.const 0x1p+9 (;=512;)
-            f32.mul
-            i32.trunc_f32_s
-            i32.const 2
-            i32.shl
-            i32.add
-            i32.load
-            local.set $2
-            loop $label$4 ;; label = @5
-              local.get $2
-              i32.const 12
-              i32.add
-              local.set $5
-              local.get $2
-              f32.load offset=4
-              local.get $6
-              f32.lt
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $5
-                  local.set $2
-                  br 2 (;@5;)
-                end
-              end
-            end
-            local.get $0
-            i32.const 2052
-            i32.add
-            local.get $3
-            i32.add
-            local.get $2
-            i32.load
-            i32.store8
-            local.get $3
-            i32.const 1
-            i32.add
-            local.tee $3
-            local.get $1
-            i32.ne
-            if ;; label = @5
-              block ;; label = @6
-                local.get $4
-                local.set $2
-                br 2 (;@4;)
-              end
-            end
-          end
-          i32.const 1396
-          local.get $4
-          i32.store
-        end
-      end
-      local.get $0
-      i32.const 2052
-      i32.add
-      local.get $1
-      i32.add
-      i32.const 10
-      i32.store8
-      local.get $0
-      i32.const 2052
-      i32.add
-      local.get $1
-      i32.const 1
-      i32.add
-      local.tee $1
-      i32.add
-      i32.const 0
-      i32.store8
-      local.get $0
-      i32.const 2116
-      i32.add
-      local.get $1
-      i32.store
-      local.get $0
-      i32.const 2052
-      i32.add
-      local.tee $1
-      call $31
-      local.tee $3
-      i32.const 1024
-      i32.load
-      local.tee $2
-      i32.le_s
-      if ;; label = @2
-        block ;; label = @3
-          local.get $1
-          call $35
-          drop
-          i32.const 1024
-          i32.const 1024
-          i32.load
-          local.get $3
-          i32.sub
-          i32.store
-          return
-        end
-      end
-      local.get $2
-      i32.const 0
-      i32.le_s
-      if ;; label = @2
-        return
-      end
-      local.get $0
-      i32.const 2052
-      i32.add
-      local.get $2
-      i32.add
-      i32.const 0
-      i32.store8
-      local.get $1
-      call $35
-      drop
-      local.get $0
-      i32.const 2052
-      i32.add
-      i32.const 1024
-      i32.load
-      i32.add
-      i32.const 122
-      i32.store8
-      i32.const 1024
-      i32.const 0
-      i32.store
-    end
+ )
+ (func $10 (; 23 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 32)
+    )
+   )
+   (i32.store
+    (local.tee $3
+     (local.get $4)
+    )
+    (i32.load offset=60
+     (local.get $0)
+    )
+   )
+   (i32.store offset=4
+    (local.get $3)
+    (i32.const 0)
+   )
+   (i32.store offset=8
+    (local.get $3)
+    (local.get $1)
+   )
+   (i32.store offset=12
+    (local.get $3)
+    (local.tee $0
+     (i32.add
+      (local.get $4)
+      (i32.const 20)
+     )
+    )
+   )
+   (i32.store offset=16
+    (local.get $3)
+    (local.get $2)
+   )
+   (local.set $0
+    (if (result i32)
+     (i32.lt_s
+      (call $11
+       (call $fimport$14
+        (i32.const 140)
+        (local.get $3)
+       )
+      )
+      (i32.const 0)
+     )
+     (block (result i32)
+      (i32.store
+       (local.get $0)
+       (i32.const -1)
+      )
+      (i32.const -1)
+     )
+     (i32.load
+      (local.get $0)
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $4)
+   )
+   (local.get $0)
   )
-  (func $9 (;22;) (type $2) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $1
-      global.get $global$1
-      i32.const 16
-      i32.add
-      global.set $global$1
-      local.get $1
-      local.tee $2
-      local.get $0
-      i32.load offset=60
-      i32.store
-      i32.const 6
-      local.get $2
-      call $fimport$10
-      call $11
-      local.set $0
-      local.get $1
-      global.set $global$1
-      local.get $0
-    end
+ )
+ (func $11 (; 24 ;) (type $2) (param $0 i32) (result i32)
+  (if (result i32)
+   (i32.gt_u
+    (local.get $0)
+    (i32.const -4096)
+   )
+   (block (result i32)
+    (i32.store
+     (call $12)
+     (i32.sub
+      (i32.const 0)
+      (local.get $0)
+     )
+    )
+    (i32.const -1)
+   )
+   (local.get $0)
   )
-  (func $10 (;23;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $4
-      global.get $global$1
-      i32.const 32
-      i32.add
-      global.set $global$1
-      local.get $4
-      local.tee $3
-      local.get $0
-      i32.load offset=60
-      i32.store
-      local.get $3
-      i32.const 0
-      i32.store offset=4
-      local.get $3
-      local.get $1
-      i32.store offset=8
-      local.get $3
-      local.get $4
-      i32.const 20
-      i32.add
-      local.tee $0
-      i32.store offset=12
-      local.get $3
-      local.get $2
-      i32.store offset=16
-      i32.const 140
-      local.get $3
-      call $fimport$14
-      call $11
-      i32.const 0
-      i32.lt_s
-      if (result i32) ;; label = @2
-        block (result i32) ;; label = @3
-          local.get $0
-          i32.const -1
-          i32.store
-          i32.const -1
-        end
-      else
-        local.get $0
-        i32.load
-      end
-      local.set $0
-      local.get $4
-      global.set $global$1
-      local.get $0
-    end
+ )
+ (func $12 (; 25 ;) (type $4) (result i32)
+  (i32.const 4172)
+ )
+ (func $13 (; 26 ;) (type $3) (param $0 i32)
+  (nop)
+ )
+ (func $14 (; 27 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 80)
+    )
+   )
+   (local.set $3
+    (local.get $4)
+   )
+   (local.set $5
+    (i32.add
+     (local.get $4)
+     (i32.const 12)
+    )
+   )
+   (i32.store offset=36
+    (local.get $0)
+    (i32.const 3)
+   )
+   (if
+    (i32.eqz
+     (i32.and
+      (i32.load
+       (local.get $0)
+      )
+      (i32.const 64)
+     )
+    )
+    (block
+     (i32.store
+      (local.get $3)
+      (i32.load offset=60
+       (local.get $0)
+      )
+     )
+     (i32.store offset=4
+      (local.get $3)
+      (i32.const 21505)
+     )
+     (i32.store offset=8
+      (local.get $3)
+      (local.get $5)
+     )
+     (if
+      (call $fimport$13
+       (i32.const 54)
+       (local.get $3)
+      )
+      (i32.store8 offset=75
+       (local.get $0)
+       (i32.const -1)
+      )
+     )
+    )
+   )
+   (local.set $0
+    (call $15
+     (local.get $0)
+     (local.get $1)
+     (local.get $2)
+    )
+   )
+   (global.set $global$1
+    (local.get $4)
+   )
+   (local.get $0)
   )
-  (func $11 (;24;) (type $2) (param $0 i32) (result i32)
-    local.get $0
-    i32.const -4096
-    i32.gt_u
-    if (result i32) ;; label = @1
-      block (result i32) ;; label = @2
-        call $12
-        i32.const 0
-        local.get $0
-        i32.sub
-        i32.store
-        i32.const -1
-      end
-    else
-      local.get $0
-    end
+ )
+ (func $15 (; 28 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (block $label$1 (result i32)
+   (local.set $8
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 48)
+    )
+   )
+   (local.set $9
+    (i32.add
+     (local.get $8)
+     (i32.const 16)
+    )
+   )
+   (local.set $10
+    (local.get $8)
+   )
+   (i32.store
+    (local.tee $3
+     (i32.add
+      (local.get $8)
+      (i32.const 32)
+     )
+    )
+    (local.tee $4
+     (i32.load
+      (local.tee $6
+       (i32.add
+        (local.get $0)
+        (i32.const 28)
+       )
+      )
+     )
+    )
+   )
+   (i32.store offset=4
+    (local.get $3)
+    (local.tee $5
+     (i32.sub
+      (i32.load
+       (local.tee $11
+        (i32.add
+         (local.get $0)
+         (i32.const 20)
+        )
+       )
+      )
+      (local.get $4)
+     )
+    )
+   )
+   (i32.store offset=8
+    (local.get $3)
+    (local.get $1)
+   )
+   (i32.store offset=12
+    (local.get $3)
+    (local.get $2)
+   )
+   (local.set $13
+    (i32.add
+     (local.get $0)
+     (i32.const 60)
+    )
+   )
+   (local.set $14
+    (i32.add
+     (local.get $0)
+     (i32.const 44)
+    )
+   )
+   (local.set $1
+    (local.get $3)
+   )
+   (local.set $4
+    (i32.const 2)
+   )
+   (local.set $12
+    (i32.add
+     (local.get $5)
+     (local.get $2)
+    )
+   )
+   (block $label$2
+    (block $label$3
+     (block $label$4
+      (loop $label$5
+       (if
+        (i32.load
+         (i32.const 4128)
+        )
+        (block
+         (call $fimport$9
+          (i32.const 1)
+          (local.get $0)
+         )
+         (i32.store
+          (local.get $10)
+          (i32.load
+           (local.get $13)
+          )
+         )
+         (i32.store offset=4
+          (local.get $10)
+          (local.get $1)
+         )
+         (i32.store offset=8
+          (local.get $10)
+          (local.get $4)
+         )
+         (local.set $3
+          (call $11
+           (call $fimport$15
+            (i32.const 146)
+            (local.get $10)
+           )
+          )
+         )
+         (call $fimport$7
+          (i32.const 0)
+         )
+        )
+        (block
+         (i32.store
+          (local.get $9)
+          (i32.load
+           (local.get $13)
+          )
+         )
+         (i32.store offset=4
+          (local.get $9)
+          (local.get $1)
+         )
+         (i32.store offset=8
+          (local.get $9)
+          (local.get $4)
+         )
+         (local.set $3
+          (call $11
+           (call $fimport$15
+            (i32.const 146)
+            (local.get $9)
+           )
+          )
+         )
+        )
+       )
+       (br_if $label$4
+        (i32.eq
+         (local.get $12)
+         (local.get $3)
+        )
+       )
+       (br_if $label$3
+        (i32.lt_s
+         (local.get $3)
+         (i32.const 0)
+        )
+       )
+       (local.set $5
+        (if (result i32)
+         (i32.gt_u
+          (local.get $3)
+          (local.tee $5
+           (i32.load offset=4
+            (local.get $1)
+           )
+          )
+         )
+         (block (result i32)
+          (i32.store
+           (local.get $6)
+           (local.tee $7
+            (i32.load
+             (local.get $14)
+            )
+           )
+          )
+          (i32.store
+           (local.get $11)
+           (local.get $7)
+          )
+          (local.set $7
+           (i32.load offset=12
+            (local.get $1)
+           )
+          )
+          (local.set $1
+           (i32.add
+            (local.get $1)
+            (i32.const 8)
+           )
+          )
+          (local.set $4
+           (i32.add
+            (local.get $4)
+            (i32.const -1)
+           )
+          )
+          (i32.sub
+           (local.get $3)
+           (local.get $5)
+          )
+         )
+         (if (result i32)
+          (i32.eq
+           (local.get $4)
+           (i32.const 2)
+          )
+          (block (result i32)
+           (i32.store
+            (local.get $6)
+            (i32.add
+             (i32.load
+              (local.get $6)
+             )
+             (local.get $3)
+            )
+           )
+           (local.set $7
+            (local.get $5)
+           )
+           (local.set $4
+            (i32.const 2)
+           )
+           (local.get $3)
+          )
+          (block (result i32)
+           (local.set $7
+            (local.get $5)
+           )
+           (local.get $3)
+          )
+         )
+        )
+       )
+       (i32.store
+        (local.get $1)
+        (i32.add
+         (i32.load
+          (local.get $1)
+         )
+         (local.get $5)
+        )
+       )
+       (i32.store offset=4
+        (local.get $1)
+        (i32.sub
+         (local.get $7)
+         (local.get $5)
+        )
+       )
+       (local.set $12
+        (i32.sub
+         (local.get $12)
+         (local.get $3)
+        )
+       )
+       (br $label$5)
+      )
+     )
+     (i32.store offset=16
+      (local.get $0)
+      (i32.add
+       (local.tee $1
+        (i32.load
+         (local.get $14)
+        )
+       )
+       (i32.load offset=48
+        (local.get $0)
+       )
+      )
+     )
+     (i32.store
+      (local.get $6)
+      (local.get $1)
+     )
+     (i32.store
+      (local.get $11)
+      (local.get $1)
+     )
+     (br $label$2)
+    )
+    (i32.store offset=16
+     (local.get $0)
+     (i32.const 0)
+    )
+    (i32.store
+     (local.get $6)
+     (i32.const 0)
+    )
+    (i32.store
+     (local.get $11)
+     (i32.const 0)
+    )
+    (i32.store
+     (local.get $0)
+     (i32.or
+      (i32.load
+       (local.get $0)
+      )
+      (i32.const 32)
+     )
+    )
+    (local.set $2
+     (if (result i32)
+      (i32.eq
+       (local.get $4)
+       (i32.const 2)
+      )
+      (i32.const 0)
+      (i32.sub
+       (local.get $2)
+       (i32.load offset=4
+        (local.get $1)
+       )
+      )
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $8)
+   )
+   (local.get $2)
   )
-  (func $12 (;25;) (type $4) (result i32)
-    i32.const 4172
+ )
+ (func $16 (; 29 ;) (type $3) (param $0 i32)
+  (if
+   (i32.eqz
+    (i32.load offset=68
+     (local.get $0)
+    )
+   )
+   (call $13
+    (local.get $0)
+   )
   )
-  (func $13 (;26;) (type $3) (param $0 i32)
-    nop
+ )
+ (func $17 (; 30 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (block $label$1 (result i32)
+   (local.set $5
+    (i32.and
+     (local.get $1)
+     (i32.const 255)
+    )
+   )
+   (block $label$2
+    (block $label$3
+     (block $label$4
+      (if
+       (i32.and
+        (local.tee $4
+         (i32.ne
+          (local.get $2)
+          (i32.const 0)
+         )
+        )
+        (i32.ne
+         (i32.and
+          (local.get $0)
+          (i32.const 3)
+         )
+         (i32.const 0)
+        )
+       )
+       (block
+        (local.set $4
+         (i32.and
+          (local.get $1)
+          (i32.const 255)
+         )
+        )
+        (local.set $3
+         (local.get $2)
+        )
+        (local.set $2
+         (local.get $0)
+        )
+        (loop $label$6
+         (if
+          (i32.eq
+           (i32.load8_s
+            (local.get $2)
+           )
+           (i32.shr_s
+            (i32.shl
+             (local.get $4)
+             (i32.const 24)
+            )
+            (i32.const 24)
+           )
+          )
+          (block
+           (local.set $0
+            (local.get $3)
+           )
+           (br $label$3)
+          )
+         )
+         (br_if $label$6
+          (i32.and
+           (local.tee $0
+            (i32.ne
+             (local.tee $3
+              (i32.add
+               (local.get $3)
+               (i32.const -1)
+              )
+             )
+             (i32.const 0)
+            )
+           )
+           (i32.ne
+            (i32.and
+             (local.tee $2
+              (i32.add
+               (local.get $2)
+               (i32.const 1)
+              )
+             )
+             (i32.const 3)
+            )
+            (i32.const 0)
+           )
+          )
+         )
+         (br $label$4)
+        )
+       )
+       (block
+        (local.set $3
+         (local.get $2)
+        )
+        (local.set $2
+         (local.get $0)
+        )
+        (local.set $0
+         (local.get $4)
+        )
+       )
+      )
+     )
+     (if
+      (local.get $0)
+      (block
+       (local.set $0
+        (local.get $3)
+       )
+       (br $label$3)
+      )
+      (local.set $0
+       (i32.const 0)
+      )
+     )
+     (br $label$2)
+    )
+    (if
+     (i32.ne
+      (i32.load8_s
+       (local.get $2)
+      )
+      (i32.shr_s
+       (i32.shl
+        (local.tee $1
+         (i32.and
+          (local.get $1)
+          (i32.const 255)
+         )
+        )
+        (i32.const 24)
+       )
+       (i32.const 24)
+      )
+     )
+     (block
+      (local.set $3
+       (i32.mul
+        (local.get $5)
+        (i32.const 16843009)
+       )
+      )
+      (block $label$12
+       (block $label$13
+        (br_if $label$13
+         (i32.le_u
+          (local.get $0)
+          (i32.const 3)
+         )
+        )
+        (loop $label$14
+         (if
+          (i32.eqz
+           (i32.and
+            (i32.xor
+             (i32.and
+              (local.tee $4
+               (i32.xor
+                (i32.load
+                 (local.get $2)
+                )
+                (local.get $3)
+               )
+              )
+              (i32.const -2139062144)
+             )
+             (i32.const -2139062144)
+            )
+            (i32.add
+             (local.get $4)
+             (i32.const -16843009)
+            )
+           )
+          )
+          (block
+           (local.set $2
+            (i32.add
+             (local.get $2)
+             (i32.const 4)
+            )
+           )
+           (br_if $label$14
+            (i32.gt_u
+             (local.tee $0
+              (i32.add
+               (local.get $0)
+               (i32.const -4)
+              )
+             )
+             (i32.const 3)
+            )
+           )
+           (br $label$13)
+          )
+         )
+        )
+        (br $label$12)
+       )
+       (if
+        (i32.eqz
+         (local.get $0)
+        )
+        (block
+         (local.set $0
+          (i32.const 0)
+         )
+         (br $label$2)
+        )
+       )
+      )
+      (loop $label$17
+       (br_if $label$2
+        (i32.eq
+         (i32.load8_s
+          (local.get $2)
+         )
+         (i32.shr_s
+          (i32.shl
+           (local.get $1)
+           (i32.const 24)
+          )
+          (i32.const 24)
+         )
+        )
+       )
+       (local.set $2
+        (i32.add
+         (local.get $2)
+         (i32.const 1)
+        )
+       )
+       (br_if $label$17
+        (local.tee $0
+         (i32.add
+          (local.get $0)
+          (i32.const -1)
+         )
+        )
+       )
+       (local.set $0
+        (i32.const 0)
+       )
+      )
+     )
+    )
+   )
+   (if (result i32)
+    (local.get $0)
+    (local.get $2)
+    (i32.const 0)
+   )
   )
-  (func $14 (;27;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $4
-      global.get $global$1
-      i32.const 80
-      i32.add
-      global.set $global$1
-      local.get $4
-      local.set $3
-      local.get $4
-      i32.const 12
-      i32.add
-      local.set $5
-      local.get $0
-      i32.const 3
-      i32.store offset=36
-      local.get $0
-      i32.load
-      i32.const 64
-      i32.and
-      i32.eqz
-      if ;; label = @2
-        block ;; label = @3
-          local.get $3
-          local.get $0
-          i32.load offset=60
-          i32.store
-          local.get $3
-          i32.const 21505
-          i32.store offset=4
-          local.get $3
-          local.get $5
-          i32.store offset=8
-          i32.const 54
-          local.get $3
-          call $fimport$13
-          if ;; label = @4
-            local.get $0
-            i32.const -1
-            i32.store8 offset=75
-          end
-        end
-      end
-      local.get $0
-      local.get $1
-      local.get $2
-      call $15
-      local.set $0
-      local.get $4
-      global.set $global$1
-      local.get $0
-    end
+ )
+ (func $18 (; 31 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 224)
+    )
+   )
+   (local.set $5
+    (i32.add
+     (local.get $4)
+     (i32.const 136)
+    )
+   )
+   (i64.store align=4
+    (local.tee $3
+     (i32.add
+      (local.get $4)
+      (i32.const 80)
+     )
+    )
+    (i64.const 0)
+   )
+   (i64.store offset=8 align=4
+    (local.get $3)
+    (i64.const 0)
+   )
+   (i64.store offset=16 align=4
+    (local.get $3)
+    (i64.const 0)
+   )
+   (i64.store offset=24 align=4
+    (local.get $3)
+    (i64.const 0)
+   )
+   (i64.store offset=32 align=4
+    (local.get $3)
+    (i64.const 0)
+   )
+   (i32.store
+    (local.tee $6
+     (i32.add
+      (local.get $4)
+      (i32.const 120)
+     )
+    )
+    (i32.load
+     (local.get $2)
+    )
+   )
+   (if
+    (i32.lt_s
+     (call $19
+      (i32.const 0)
+      (local.get $1)
+      (local.get $6)
+      (local.tee $2
+       (local.get $4)
+      )
+      (local.get $3)
+     )
+     (i32.const 0)
+    )
+    (local.set $1
+     (i32.const -1)
+    )
+    (block
+     (local.set $12
+      (if (result i32)
+       (i32.gt_s
+        (i32.load offset=76
+         (local.get $0)
+        )
+        (i32.const -1)
+       )
+       (call $20
+        (local.get $0)
+       )
+       (i32.const 0)
+      )
+     )
+     (local.set $7
+      (i32.load
+       (local.get $0)
+      )
+     )
+     (if
+      (i32.lt_s
+       (i32.load8_s offset=74
+        (local.get $0)
+       )
+       (i32.const 1)
+      )
+      (i32.store
+       (local.get $0)
+       (i32.and
+        (local.get $7)
+        (i32.const -33)
+       )
+      )
+     )
+     (if
+      (i32.load
+       (local.tee $8
+        (i32.add
+         (local.get $0)
+         (i32.const 48)
+        )
+       )
+      )
+      (local.set $1
+       (call $19
+        (local.get $0)
+        (local.get $1)
+        (local.get $6)
+        (local.get $2)
+        (local.get $3)
+       )
+      )
+      (block
+       (local.set $10
+        (i32.load
+         (local.tee $9
+          (i32.add
+           (local.get $0)
+           (i32.const 44)
+          )
+         )
+        )
+       )
+       (i32.store
+        (local.get $9)
+        (local.get $5)
+       )
+       (i32.store
+        (local.tee $13
+         (i32.add
+          (local.get $0)
+          (i32.const 28)
+         )
+        )
+        (local.get $5)
+       )
+       (i32.store
+        (local.tee $11
+         (i32.add
+          (local.get $0)
+          (i32.const 20)
+         )
+        )
+        (local.get $5)
+       )
+       (i32.store
+        (local.get $8)
+        (i32.const 80)
+       )
+       (i32.store
+        (local.tee $14
+         (i32.add
+          (local.get $0)
+          (i32.const 16)
+         )
+        )
+        (i32.add
+         (local.get $5)
+         (i32.const 80)
+        )
+       )
+       (local.set $1
+        (call $19
+         (local.get $0)
+         (local.get $1)
+         (local.get $6)
+         (local.get $2)
+         (local.get $3)
+        )
+       )
+       (if
+        (local.get $10)
+        (block
+         (drop
+          (call_indirect (type $0)
+           (local.get $0)
+           (i32.const 0)
+           (i32.const 0)
+           (i32.add
+            (i32.and
+             (i32.load offset=36
+              (local.get $0)
+             )
+             (i32.const 3)
+            )
+            (i32.const 2)
+           )
+          )
+         )
+         (if
+          (i32.eqz
+           (i32.load
+            (local.get $11)
+           )
+          )
+          (local.set $1
+           (i32.const -1)
+          )
+         )
+         (i32.store
+          (local.get $9)
+          (local.get $10)
+         )
+         (i32.store
+          (local.get $8)
+          (i32.const 0)
+         )
+         (i32.store
+          (local.get $14)
+          (i32.const 0)
+         )
+         (i32.store
+          (local.get $13)
+          (i32.const 0)
+         )
+         (i32.store
+          (local.get $11)
+          (i32.const 0)
+         )
+        )
+       )
+      )
+     )
+     (i32.store
+      (local.get $0)
+      (i32.or
+       (local.tee $2
+        (i32.load
+         (local.get $0)
+        )
+       )
+       (i32.and
+        (local.get $7)
+        (i32.const 32)
+       )
+      )
+     )
+     (if
+      (local.get $12)
+      (call $13
+       (local.get $0)
+      )
+     )
+     (if
+      (i32.and
+       (local.get $2)
+       (i32.const 32)
+      )
+      (local.set $1
+       (i32.const -1)
+      )
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $4)
+   )
+   (local.get $1)
   )
-  (func $15 (;28;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $8
-      global.get $global$1
-      i32.const 48
-      i32.add
-      global.set $global$1
-      local.get $8
-      i32.const 16
-      i32.add
-      local.set $9
-      local.get $8
-      local.set $10
-      local.get $8
-      i32.const 32
-      i32.add
-      local.tee $3
-      local.get $0
-      i32.const 28
-      i32.add
-      local.tee $6
-      i32.load
-      local.tee $4
-      i32.store
-      local.get $3
-      local.get $0
-      i32.const 20
-      i32.add
-      local.tee $11
-      i32.load
-      local.get $4
-      i32.sub
-      local.tee $5
-      i32.store offset=4
-      local.get $3
-      local.get $1
-      i32.store offset=8
-      local.get $3
-      local.get $2
-      i32.store offset=12
-      local.get $0
-      i32.const 60
-      i32.add
-      local.set $13
-      local.get $0
-      i32.const 44
-      i32.add
-      local.set $14
-      local.get $3
-      local.set $1
-      i32.const 2
-      local.set $4
-      local.get $5
-      local.get $2
-      i32.add
-      local.set $12
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            loop $label$5 ;; label = @5
-              i32.const 4128
-              i32.load
-              if ;; label = @6
-                block ;; label = @7
-                  i32.const 1
-                  local.get $0
-                  call $fimport$9
-                  local.get $10
-                  local.get $13
-                  i32.load
-                  i32.store
-                  local.get $10
-                  local.get $1
-                  i32.store offset=4
-                  local.get $10
-                  local.get $4
-                  i32.store offset=8
-                  i32.const 146
-                  local.get $10
-                  call $fimport$15
-                  call $11
-                  local.set $3
-                  i32.const 0
-                  call $fimport$7
-                end
-              else
-                block ;; label = @7
-                  local.get $9
-                  local.get $13
-                  i32.load
-                  i32.store
-                  local.get $9
-                  local.get $1
-                  i32.store offset=4
-                  local.get $9
-                  local.get $4
-                  i32.store offset=8
-                  i32.const 146
-                  local.get $9
-                  call $fimport$15
-                  call $11
-                  local.set $3
-                end
-              end
-              local.get $12
-              local.get $3
-              i32.eq
-              br_if 1 (;@4;)
-              local.get $3
-              i32.const 0
-              i32.lt_s
-              br_if 2 (;@3;)
-              local.get $3
-              local.get $1
-              i32.load offset=4
-              local.tee $5
-              i32.gt_u
-              if (result i32) ;; label = @6
-                block (result i32) ;; label = @7
-                  local.get $6
-                  local.get $14
-                  i32.load
-                  local.tee $7
-                  i32.store
-                  local.get $11
-                  local.get $7
-                  i32.store
-                  local.get $1
-                  i32.load offset=12
-                  local.set $7
-                  local.get $1
-                  i32.const 8
-                  i32.add
-                  local.set $1
-                  local.get $4
-                  i32.const -1
-                  i32.add
-                  local.set $4
-                  local.get $3
-                  local.get $5
-                  i32.sub
-                end
-              else
-                local.get $4
-                i32.const 2
-                i32.eq
-                if (result i32) ;; label = @7
-                  block (result i32) ;; label = @8
-                    local.get $6
-                    local.get $6
-                    i32.load
-                    local.get $3
-                    i32.add
-                    i32.store
-                    local.get $5
-                    local.set $7
-                    i32.const 2
-                    local.set $4
-                    local.get $3
-                  end
-                else
-                  block (result i32) ;; label = @8
-                    local.get $5
-                    local.set $7
-                    local.get $3
-                  end
-                end
-              end
-              local.set $5
-              local.get $1
-              local.get $1
-              i32.load
-              local.get $5
-              i32.add
-              i32.store
-              local.get $1
-              local.get $7
-              local.get $5
-              i32.sub
-              i32.store offset=4
-              local.get $12
-              local.get $3
-              i32.sub
-              local.set $12
-              br 0 (;@5;)
-            end
-          end
-          local.get $0
-          local.get $14
-          i32.load
-          local.tee $1
-          local.get $0
-          i32.load offset=48
-          i32.add
-          i32.store offset=16
-          local.get $6
-          local.get $1
-          i32.store
-          local.get $11
-          local.get $1
-          i32.store
-          br 1 (;@2;)
-        end
-        local.get $0
-        i32.const 0
-        i32.store offset=16
-        local.get $6
-        i32.const 0
-        i32.store
-        local.get $11
-        i32.const 0
-        i32.store
-        local.get $0
-        local.get $0
-        i32.load
-        i32.const 32
-        i32.or
-        i32.store
-        local.get $4
-        i32.const 2
-        i32.eq
-        if (result i32) ;; label = @3
-          i32.const 0
-        else
-          local.get $2
-          local.get $1
-          i32.load offset=4
-          i32.sub
-        end
-        local.set $2
-      end
-      local.get $8
-      global.set $global$1
-      local.get $2
-    end
+ )
+ (func $19 (; 32 ;) (type $7) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (result i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (local $15 i32)
+  (local $16 i32)
+  (local $17 i32)
+  (local $18 i32)
+  (local $19 i32)
+  (local $20 i32)
+  (local $21 i32)
+  (local $22 i32)
+  (local $23 i32)
+  (local $24 i32)
+  (local $25 i32)
+  (local $26 i32)
+  (local $27 i32)
+  (local $28 i32)
+  (local $29 i32)
+  (local $30 i32)
+  (local $31 i32)
+  (local $32 i32)
+  (local $33 i32)
+  (local $34 i32)
+  (local $35 i32)
+  (local $36 i32)
+  (local $37 i32)
+  (local $38 i32)
+  (local $39 i32)
+  (local $40 i32)
+  (local $41 i32)
+  (local $42 i32)
+  (local $43 i32)
+  (local $44 i32)
+  (local $45 i32)
+  (local $46 i32)
+  (local $47 i32)
+  (local $48 i32)
+  (local $49 i32)
+  (local $50 i64)
+  (local $51 i64)
+  (local $52 f64)
+  (local $53 f64)
+  (block $label$1 (result i32)
+   (local.set $23
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 624)
+    )
+   )
+   (local.set $20
+    (i32.add
+     (local.get $23)
+     (i32.const 16)
+    )
+   )
+   (local.set $16
+    (local.get $23)
+   )
+   (local.set $36
+    (i32.add
+     (local.get $23)
+     (i32.const 528)
+    )
+   )
+   (local.set $30
+    (i32.ne
+     (local.get $0)
+     (i32.const 0)
+    )
+   )
+   (local.set $38
+    (local.tee $21
+     (i32.add
+      (local.tee $17
+       (i32.add
+        (local.get $23)
+        (i32.const 536)
+       )
+      )
+      (i32.const 40)
+     )
+    )
+   )
+   (local.set $39
+    (i32.add
+     (local.get $17)
+     (i32.const 39)
+    )
+   )
+   (local.set $42
+    (i32.add
+     (local.tee $37
+      (i32.add
+       (local.get $23)
+       (i32.const 8)
+      )
+     )
+     (i32.const 4)
+    )
+   )
+   (local.set $43
+    (i32.sub
+     (i32.const 0)
+     (local.tee $27
+      (local.tee $19
+       (i32.add
+        (local.get $23)
+        (i32.const 588)
+       )
+      )
+     )
+    )
+   )
+   (local.set $33
+    (i32.add
+     (local.tee $17
+      (i32.add
+       (local.get $23)
+       (i32.const 576)
+      )
+     )
+     (i32.const 12)
+    )
+   )
+   (local.set $40
+    (i32.add
+     (local.get $17)
+     (i32.const 11)
+    )
+   )
+   (local.set $44
+    (i32.sub
+     (local.tee $28
+      (local.get $33)
+     )
+     (local.get $27)
+    )
+   )
+   (local.set $45
+    (i32.sub
+     (i32.const -2)
+     (local.get $27)
+    )
+   )
+   (local.set $46
+    (i32.add
+     (local.get $28)
+     (i32.const 2)
+    )
+   )
+   (local.set $48
+    (i32.add
+     (local.tee $47
+      (i32.add
+       (local.get $23)
+       (i32.const 24)
+      )
+     )
+     (i32.const 288)
+    )
+   )
+   (local.set $41
+    (local.tee $31
+     (i32.add
+      (local.get $19)
+      (i32.const 9)
+     )
+    )
+   )
+   (local.set $34
+    (i32.add
+     (local.get $19)
+     (i32.const 8)
+    )
+   )
+   (local.set $15
+    (i32.const 0)
+   )
+   (local.set $10
+    (i32.const 0)
+   )
+   (local.set $17
+    (i32.const 0)
+   )
+   (block $label$2
+    (block $label$3
+     (loop $label$4
+      (block $label$5
+       (if
+        (i32.gt_s
+         (local.get $15)
+         (i32.const -1)
+        )
+        (local.set $15
+         (if (result i32)
+          (i32.gt_s
+           (local.get $10)
+           (i32.sub
+            (i32.const 2147483647)
+            (local.get $15)
+           )
+          )
+          (block (result i32)
+           (i32.store
+            (call $12)
+            (i32.const 75)
+           )
+           (i32.const -1)
+          )
+          (i32.add
+           (local.get $10)
+           (local.get $15)
+          )
+         )
+        )
+       )
+       (br_if $label$3
+        (i32.eqz
+         (i32.shr_s
+          (i32.shl
+           (local.tee $5
+            (i32.load8_s
+             (local.get $1)
+            )
+           )
+           (i32.const 24)
+          )
+          (i32.const 24)
+         )
+        )
+       )
+       (local.set $11
+        (local.get $1)
+       )
+       (block $label$9
+        (block $label$10
+         (loop $label$11
+          (block $label$12
+           (block $label$13
+            (block $label$14
+             (block $label$15
+              (br_table $label$14 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$15 $label$13
+               (i32.sub
+                (i32.shr_s
+                 (i32.shl
+                  (local.get $5)
+                  (i32.const 24)
+                 )
+                 (i32.const 24)
+                )
+                (i32.const 0)
+               )
+              )
+             )
+             (local.set $5
+              (local.get $11)
+             )
+             (br $label$10)
+            )
+            (local.set $5
+             (local.get $11)
+            )
+            (br $label$12)
+           )
+           (local.set $5
+            (i32.load8_s
+             (local.tee $11
+              (i32.add
+               (local.get $11)
+               (i32.const 1)
+              )
+             )
+            )
+           )
+           (br $label$11)
+          )
+         )
+         (br $label$9)
+        )
+        (loop $label$16
+         (br_if $label$9
+          (i32.ne
+           (i32.load8_s offset=1
+            (local.get $5)
+           )
+           (i32.const 37)
+          )
+         )
+         (local.set $11
+          (i32.add
+           (local.get $11)
+           (i32.const 1)
+          )
+         )
+         (br_if $label$16
+          (i32.eq
+           (i32.load8_s
+            (local.tee $5
+             (i32.add
+              (local.get $5)
+              (i32.const 2)
+             )
+            )
+           )
+           (i32.const 37)
+          )
+         )
+        )
+       )
+       (local.set $10
+        (i32.sub
+         (local.get $11)
+         (local.get $1)
+        )
+       )
+       (if
+        (local.get $30)
+        (if
+         (i32.eqz
+          (i32.and
+           (i32.load
+            (local.get $0)
+           )
+           (i32.const 32)
+          )
+         )
+         (drop
+          (call $21
+           (local.get $1)
+           (local.get $10)
+           (local.get $0)
+          )
+         )
+        )
+       )
+       (if
+        (local.get $10)
+        (block
+         (local.set $1
+          (local.get $5)
+         )
+         (br $label$4)
+        )
+       )
+       (local.set $10
+        (if (result i32)
+         (i32.lt_u
+          (local.tee $9
+           (i32.add
+            (i32.shr_s
+             (i32.shl
+              (local.tee $10
+               (i32.load8_s
+                (local.tee $11
+                 (i32.add
+                  (local.get $5)
+                  (i32.const 1)
+                 )
+                )
+               )
+              )
+              (i32.const 24)
+             )
+             (i32.const 24)
+            )
+            (i32.const -48)
+           )
+          )
+          (i32.const 10)
+         )
+         (block (result i32)
+          (local.set $10
+           (i32.add
+            (local.get $5)
+            (i32.const 3)
+           )
+          )
+          (if
+           (local.tee $12
+            (i32.eq
+             (i32.load8_s offset=2
+              (local.get $5)
+             )
+             (i32.const 36)
+            )
+           )
+           (local.set $11
+            (local.get $10)
+           )
+          )
+          (if
+           (local.get $12)
+           (local.set $17
+            (i32.const 1)
+           )
+          )
+          (local.set $5
+           (i32.load8_s
+            (local.get $11)
+           )
+          )
+          (if
+           (i32.eqz
+            (local.get $12)
+           )
+           (local.set $9
+            (i32.const -1)
+           )
+          )
+          (local.get $17)
+         )
+         (block (result i32)
+          (local.set $5
+           (local.get $10)
+          )
+          (local.set $9
+           (i32.const -1)
+          )
+          (local.get $17)
+         )
+        )
+       )
+       (block $label$25
+        (if
+         (i32.lt_u
+          (local.tee $12
+           (i32.add
+            (i32.shr_s
+             (i32.shl
+              (local.get $5)
+              (i32.const 24)
+             )
+             (i32.const 24)
+            )
+            (i32.const -32)
+           )
+          )
+          (i32.const 32)
+         )
+         (block
+          (local.set $17
+           (i32.const 0)
+          )
+          (loop $label$27
+           (br_if $label$25
+            (i32.eqz
+             (i32.and
+              (i32.shl
+               (i32.const 1)
+               (local.get $12)
+              )
+              (i32.const 75913)
+             )
+            )
+           )
+           (local.set $17
+            (i32.or
+             (i32.shl
+              (i32.const 1)
+              (i32.add
+               (i32.shr_s
+                (i32.shl
+                 (local.get $5)
+                 (i32.const 24)
+                )
+                (i32.const 24)
+               )
+               (i32.const -32)
+              )
+             )
+             (local.get $17)
+            )
+           )
+           (br_if $label$27
+            (i32.lt_u
+             (local.tee $12
+              (i32.add
+               (i32.shr_s
+                (i32.shl
+                 (local.tee $5
+                  (i32.load8_s
+                   (local.tee $11
+                    (i32.add
+                     (local.get $11)
+                     (i32.const 1)
+                    )
+                   )
+                  )
+                 )
+                 (i32.const 24)
+                )
+                (i32.const 24)
+               )
+               (i32.const -32)
+              )
+             )
+             (i32.const 32)
+            )
+           )
+          )
+         )
+         (local.set $17
+          (i32.const 0)
+         )
+        )
+       )
+       (block $label$29
+        (if
+         (i32.eq
+          (i32.shr_s
+           (i32.shl
+            (local.get $5)
+            (i32.const 24)
+           )
+           (i32.const 24)
+          )
+          (i32.const 42)
+         )
+         (block
+          (local.set $11
+           (block $label$31 (result i32)
+            (block $label$32
+             (br_if $label$32
+              (i32.ge_u
+               (local.tee $12
+                (i32.add
+                 (i32.shr_s
+                  (i32.shl
+                   (local.tee $5
+                    (i32.load8_s
+                     (local.tee $7
+                      (i32.add
+                       (local.get $11)
+                       (i32.const 1)
+                      )
+                     )
+                    )
+                   )
+                   (i32.const 24)
+                  )
+                  (i32.const 24)
+                 )
+                 (i32.const -48)
+                )
+               )
+               (i32.const 10)
+              )
+             )
+             (br_if $label$32
+              (i32.ne
+               (i32.load8_s offset=2
+                (local.get $11)
+               )
+               (i32.const 36)
+              )
+             )
+             (i32.store
+              (i32.add
+               (local.get $4)
+               (i32.shl
+                (local.get $12)
+                (i32.const 2)
+               )
+              )
+              (i32.const 10)
+             )
+             (local.set $8
+              (i32.const 1)
+             )
+             (local.set $10
+              (i32.wrap_i64
+               (i64.load
+                (i32.add
+                 (local.get $3)
+                 (i32.shl
+                  (i32.add
+                   (i32.load8_s
+                    (local.get $7)
+                   )
+                   (i32.const -48)
+                  )
+                  (i32.const 3)
+                 )
+                )
+               )
+              )
+             )
+             (br $label$31
+              (i32.add
+               (local.get $11)
+               (i32.const 3)
+              )
+             )
+            )
+            (if
+             (local.get $10)
+             (block
+              (local.set $15
+               (i32.const -1)
+              )
+              (br $label$5)
+             )
+            )
+            (if
+             (i32.eqz
+              (local.get $30)
+             )
+             (block
+              (local.set $12
+               (local.get $17)
+              )
+              (local.set $17
+               (i32.const 0)
+              )
+              (local.set $11
+               (local.get $7)
+              )
+              (local.set $10
+               (i32.const 0)
+              )
+              (br $label$29)
+             )
+            )
+            (local.set $10
+             (i32.load
+              (local.tee $11
+               (i32.and
+                (i32.add
+                 (i32.load
+                  (local.get $2)
+                 )
+                 (i32.const 3)
+                )
+                (i32.const -4)
+               )
+              )
+             )
+            )
+            (i32.store
+             (local.get $2)
+             (i32.add
+              (local.get $11)
+              (i32.const 4)
+             )
+            )
+            (local.set $8
+             (i32.const 0)
+            )
+            (local.get $7)
+           )
+          )
+          (local.set $12
+           (i32.or
+            (local.get $17)
+            (i32.const 8192)
+           )
+          )
+          (local.set $7
+           (i32.sub
+            (i32.const 0)
+            (local.get $10)
+           )
+          )
+          (local.set $5
+           (i32.load8_s
+            (local.get $11)
+           )
+          )
+          (if
+           (i32.eqz
+            (local.tee $6
+             (i32.lt_s
+              (local.get $10)
+              (i32.const 0)
+             )
+            )
+           )
+           (local.set $12
+            (local.get $17)
+           )
+          )
+          (local.set $17
+           (local.get $8)
+          )
+          (if
+           (local.get $6)
+           (local.set $10
+            (local.get $7)
+           )
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.tee $12
+            (i32.add
+             (i32.shr_s
+              (i32.shl
+               (local.get $5)
+               (i32.const 24)
+              )
+              (i32.const 24)
+             )
+             (i32.const -48)
+            )
+           )
+           (i32.const 10)
+          )
+          (block
+           (local.set $7
+            (i32.const 0)
+           )
+           (local.set $5
+            (local.get $12)
+           )
+           (loop $label$39
+            (local.set $7
+             (i32.add
+              (i32.mul
+               (local.get $7)
+               (i32.const 10)
+              )
+              (local.get $5)
+             )
+            )
+            (br_if $label$39
+             (i32.lt_u
+              (local.tee $5
+               (i32.add
+                (i32.shr_s
+                 (i32.shl
+                  (local.tee $12
+                   (i32.load8_s
+                    (local.tee $11
+                     (i32.add
+                      (local.get $11)
+                      (i32.const 1)
+                     )
+                    )
+                   )
+                  )
+                  (i32.const 24)
+                 )
+                 (i32.const 24)
+                )
+                (i32.const -48)
+               )
+              )
+              (i32.const 10)
+             )
+            )
+           )
+           (if
+            (i32.lt_s
+             (local.get $7)
+             (i32.const 0)
+            )
+            (block
+             (local.set $15
+              (i32.const -1)
+             )
+             (br $label$5)
+            )
+            (block
+             (local.set $5
+              (local.get $12)
+             )
+             (local.set $12
+              (local.get $17)
+             )
+             (local.set $17
+              (local.get $10)
+             )
+             (local.set $10
+              (local.get $7)
+             )
+            )
+           )
+          )
+          (block
+           (local.set $12
+            (local.get $17)
+           )
+           (local.set $17
+            (local.get $10)
+           )
+           (local.set $10
+            (i32.const 0)
+           )
+          )
+         )
+        )
+       )
+       (block $label$43
+        (if
+         (i32.eq
+          (i32.shr_s
+           (i32.shl
+            (local.get $5)
+            (i32.const 24)
+           )
+           (i32.const 24)
+          )
+          (i32.const 46)
+         )
+         (block
+          (if
+           (i32.ne
+            (i32.shr_s
+             (i32.shl
+              (local.tee $5
+               (i32.load8_s
+                (local.tee $7
+                 (i32.add
+                  (local.get $11)
+                  (i32.const 1)
+                 )
+                )
+               )
+              )
+              (i32.const 24)
+             )
+             (i32.const 24)
+            )
+            (i32.const 42)
+           )
+           (block
+            (if
+             (i32.lt_u
+              (local.tee $5
+               (i32.add
+                (i32.shr_s
+                 (i32.shl
+                  (local.get $5)
+                  (i32.const 24)
+                 )
+                 (i32.const 24)
+                )
+                (i32.const -48)
+               )
+              )
+              (i32.const 10)
+             )
+             (block
+              (local.set $11
+               (local.get $7)
+              )
+              (local.set $7
+               (i32.const 0)
+              )
+             )
+             (block
+              (local.set $5
+               (i32.const 0)
+              )
+              (local.set $11
+               (local.get $7)
+              )
+              (br $label$43)
+             )
+            )
+            (loop $label$48
+             (local.set $5
+              (i32.add
+               (i32.mul
+                (local.get $7)
+                (i32.const 10)
+               )
+               (local.get $5)
+              )
+             )
+             (br_if $label$43
+              (i32.ge_u
+               (local.tee $8
+                (i32.add
+                 (i32.load8_s
+                  (local.tee $11
+                   (i32.add
+                    (local.get $11)
+                    (i32.const 1)
+                   )
+                  )
+                 )
+                 (i32.const -48)
+                )
+               )
+               (i32.const 10)
+              )
+             )
+             (local.set $7
+              (local.get $5)
+             )
+             (local.set $5
+              (local.get $8)
+             )
+             (br $label$48)
+            )
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.tee $5
+             (i32.add
+              (i32.load8_s
+               (local.tee $7
+                (i32.add
+                 (local.get $11)
+                 (i32.const 2)
+                )
+               )
+              )
+              (i32.const -48)
+             )
+            )
+            (i32.const 10)
+           )
+           (if
+            (i32.eq
+             (i32.load8_s offset=3
+              (local.get $11)
+             )
+             (i32.const 36)
+            )
+            (block
+             (i32.store
+              (i32.add
+               (local.get $4)
+               (i32.shl
+                (local.get $5)
+                (i32.const 2)
+               )
+              )
+              (i32.const 10)
+             )
+             (local.set $5
+              (i32.wrap_i64
+               (i64.load
+                (i32.add
+                 (local.get $3)
+                 (i32.shl
+                  (i32.add
+                   (i32.load8_s
+                    (local.get $7)
+                   )
+                   (i32.const -48)
+                  )
+                  (i32.const 3)
+                 )
+                )
+               )
+              )
+             )
+             (local.set $11
+              (i32.add
+               (local.get $11)
+               (i32.const 4)
+              )
+             )
+             (br $label$43)
+            )
+           )
+          )
+          (if
+           (local.get $17)
+           (block
+            (local.set $15
+             (i32.const -1)
+            )
+            (br $label$5)
+           )
+          )
+          (local.set $11
+           (if (result i32)
+            (local.get $30)
+            (block (result i32)
+             (local.set $5
+              (i32.load
+               (local.tee $11
+                (i32.and
+                 (i32.add
+                  (i32.load
+                   (local.get $2)
+                  )
+                  (i32.const 3)
+                 )
+                 (i32.const -4)
+                )
+               )
+              )
+             )
+             (i32.store
+              (local.get $2)
+              (i32.add
+               (local.get $11)
+               (i32.const 4)
+              )
+             )
+             (local.get $7)
+            )
+            (block (result i32)
+             (local.set $5
+              (i32.const 0)
+             )
+             (local.get $7)
+            )
+           )
+          )
+         )
+         (local.set $5
+          (i32.const -1)
+         )
+        )
+       )
+       (local.set $7
+        (local.get $11)
+       )
+       (local.set $8
+        (i32.const 0)
+       )
+       (loop $label$55
+        (if
+         (i32.gt_u
+          (local.tee $6
+           (i32.add
+            (i32.load8_s
+             (local.get $7)
+            )
+            (i32.const -65)
+           )
+          )
+          (i32.const 57)
+         )
+         (block
+          (local.set $15
+           (i32.const -1)
+          )
+          (br $label$5)
+         )
+        )
+        (local.set $11
+         (i32.add
+          (local.get $7)
+          (i32.const 1)
+         )
+        )
+        (if
+         (i32.lt_u
+          (i32.add
+           (local.tee $6
+            (i32.and
+             (local.tee $13
+              (i32.load8_s
+               (i32.add
+                (i32.add
+                 (i32.mul
+                  (local.get $8)
+                  (i32.const 58)
+                 )
+                 (i32.const 1699)
+                )
+                (local.get $6)
+               )
+              )
+             )
+             (i32.const 255)
+            )
+           )
+           (i32.const -1)
+          )
+          (i32.const 8)
+         )
+         (block
+          (local.set $7
+           (local.get $11)
+          )
+          (local.set $8
+           (local.get $6)
+          )
+          (br $label$55)
+         )
+        )
+       )
+       (if
+        (i32.eqz
+         (i32.shr_s
+          (i32.shl
+           (local.get $13)
+           (i32.const 24)
+          )
+          (i32.const 24)
+         )
+        )
+        (block
+         (local.set $15
+          (i32.const -1)
+         )
+         (br $label$5)
+        )
+       )
+       (local.set $14
+        (i32.gt_s
+         (local.get $9)
+         (i32.const -1)
+        )
+       )
+       (block $label$59
+        (block $label$60
+         (if
+          (i32.eq
+           (i32.shr_s
+            (i32.shl
+             (local.get $13)
+             (i32.const 24)
+            )
+            (i32.const 24)
+           )
+           (i32.const 19)
+          )
+          (if
+           (local.get $14)
+           (block
+            (local.set $15
+             (i32.const -1)
+            )
+            (br $label$5)
+           )
+           (br $label$60)
+          )
+          (block
+           (if
+            (local.get $14)
+            (block
+             (i32.store
+              (i32.add
+               (local.get $4)
+               (i32.shl
+                (local.get $9)
+                (i32.const 2)
+               )
+              )
+              (local.get $6)
+             )
+             (i64.store
+              (local.get $16)
+              (i64.load
+               (i32.add
+                (local.get $3)
+                (i32.shl
+                 (local.get $9)
+                 (i32.const 3)
+                )
+               )
+              )
+             )
+             (br $label$60)
+            )
+           )
+           (if
+            (i32.eqz
+             (local.get $30)
+            )
+            (block
+             (local.set $15
+              (i32.const 0)
+             )
+             (br $label$5)
+            )
+           )
+           (call $22
+            (local.get $16)
+            (local.get $6)
+            (local.get $2)
+           )
+          )
+         )
+         (br $label$59)
+        )
+        (if
+         (i32.eqz
+          (local.get $30)
+         )
+         (block
+          (local.set $10
+           (i32.const 0)
+          )
+          (local.set $1
+           (local.get $11)
+          )
+          (br $label$4)
+         )
+        )
+       )
+       (local.set $9
+        (i32.and
+         (local.tee $7
+          (i32.load8_s
+           (local.get $7)
+          )
+         )
+         (i32.const -33)
+        )
+       )
+       (if
+        (i32.eqz
+         (i32.and
+          (i32.ne
+           (local.get $8)
+           (i32.const 0)
+          )
+          (i32.eq
+           (i32.and
+            (local.get $7)
+            (i32.const 15)
+           )
+           (i32.const 3)
+          )
+         )
+        )
+        (local.set $9
+         (local.get $7)
+        )
+       )
+       (local.set $7
+        (i32.and
+         (local.get $12)
+         (i32.const -65537)
+        )
+       )
+       (if
+        (i32.and
+         (local.get $12)
+         (i32.const 8192)
+        )
+        (local.set $12
+         (local.get $7)
+        )
+       )
+       (block $label$70
+        (block $label$71
+         (block $label$72
+          (block $label$73
+           (block $label$74
+            (block $label$75
+             (block $label$76
+              (block $label$77
+               (block $label$78
+                (block $label$79
+                 (block $label$80
+                  (block $label$81
+                   (block $label$82
+                    (block $label$83
+                     (block $label$84
+                      (block $label$85
+                       (block $label$86
+                        (block $label$87
+                         (block $label$88
+                          (block $label$89
+                           (br_table $label$78 $label$77 $label$80 $label$77 $label$78 $label$78 $label$78 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$79 $label$77 $label$77 $label$77 $label$77 $label$87 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$78 $label$77 $label$83 $label$85 $label$78 $label$78 $label$78 $label$77 $label$85 $label$77 $label$77 $label$77 $label$82 $label$89 $label$86 $label$88 $label$77 $label$77 $label$81 $label$77 $label$84 $label$77 $label$77 $label$87 $label$77
+                            (i32.sub
+                             (local.get $9)
+                             (i32.const 65)
+                            )
+                           )
+                          )
+                          (block $label$90
+                           (block $label$91
+                            (block $label$92
+                             (block $label$93
+                              (block $label$94
+                               (block $label$95
+                                (block $label$96
+                                 (block $label$97
+                                  (br_table $label$97 $label$96 $label$95 $label$94 $label$93 $label$90 $label$92 $label$91 $label$90
+                                   (i32.sub
+                                    (i32.shr_s
+                                     (i32.shl
+                                      (i32.and
+                                       (local.get $8)
+                                       (i32.const 255)
+                                      )
+                                      (i32.const 24)
+                                     )
+                                     (i32.const 24)
+                                    )
+                                    (i32.const 0)
+                                   )
+                                  )
+                                 )
+                                 (i32.store
+                                  (i32.load
+                                   (local.get $16)
+                                  )
+                                  (local.get $15)
+                                 )
+                                 (local.set $10
+                                  (i32.const 0)
+                                 )
+                                 (local.set $1
+                                  (local.get $11)
+                                 )
+                                 (br $label$4)
+                                )
+                                (i32.store
+                                 (i32.load
+                                  (local.get $16)
+                                 )
+                                 (local.get $15)
+                                )
+                                (local.set $10
+                                 (i32.const 0)
+                                )
+                                (local.set $1
+                                 (local.get $11)
+                                )
+                                (br $label$4)
+                               )
+                               (i64.store
+                                (i32.load
+                                 (local.get $16)
+                                )
+                                (i64.extend_i32_s
+                                 (local.get $15)
+                                )
+                               )
+                               (local.set $10
+                                (i32.const 0)
+                               )
+                               (local.set $1
+                                (local.get $11)
+                               )
+                               (br $label$4)
+                              )
+                              (i32.store16
+                               (i32.load
+                                (local.get $16)
+                               )
+                               (local.get $15)
+                              )
+                              (local.set $10
+                               (i32.const 0)
+                              )
+                              (local.set $1
+                               (local.get $11)
+                              )
+                              (br $label$4)
+                             )
+                             (i32.store8
+                              (i32.load
+                               (local.get $16)
+                              )
+                              (local.get $15)
+                             )
+                             (local.set $10
+                              (i32.const 0)
+                             )
+                             (local.set $1
+                              (local.get $11)
+                             )
+                             (br $label$4)
+                            )
+                            (i32.store
+                             (i32.load
+                              (local.get $16)
+                             )
+                             (local.get $15)
+                            )
+                            (local.set $10
+                             (i32.const 0)
+                            )
+                            (local.set $1
+                             (local.get $11)
+                            )
+                            (br $label$4)
+                           )
+                           (i64.store
+                            (i32.load
+                             (local.get $16)
+                            )
+                            (i64.extend_i32_s
+                             (local.get $15)
+                            )
+                           )
+                           (local.set $10
+                            (i32.const 0)
+                           )
+                           (local.set $1
+                            (local.get $11)
+                           )
+                           (br $label$4)
+                          )
+                          (local.set $10
+                           (i32.const 0)
+                          )
+                          (local.set $1
+                           (local.get $11)
+                          )
+                          (br $label$4)
+                         )
+                         (local.set $12
+                          (i32.or
+                           (local.get $12)
+                           (i32.const 8)
+                          )
+                         )
+                         (if
+                          (i32.le_u
+                           (local.get $5)
+                           (i32.const 8)
+                          )
+                          (local.set $5
+                           (i32.const 8)
+                          )
+                         )
+                         (local.set $9
+                          (i32.const 120)
+                         )
+                         (br $label$76)
+                        )
+                        (br $label$76)
+                       )
+                       (if
+                        (i64.eq
+                         (local.tee $50
+                          (i64.load
+                           (local.get $16)
+                          )
+                         )
+                         (i64.const 0)
+                        )
+                        (local.set $7
+                         (local.get $21)
+                        )
+                        (block
+                         (local.set $1
+                          (local.get $21)
+                         )
+                         (loop $label$101
+                          (i64.store8
+                           (local.tee $1
+                            (i32.add
+                             (local.get $1)
+                             (i32.const -1)
+                            )
+                           )
+                           (i64.or
+                            (i64.and
+                             (local.get $50)
+                             (i64.const 7)
+                            )
+                            (i64.const 48)
+                           )
+                          )
+                          (br_if $label$101
+                           (i64.ne
+                            (local.tee $50
+                             (i64.shr_u
+                              (local.get $50)
+                              (i64.const 3)
+                             )
+                            )
+                            (i64.const 0)
+                           )
+                          )
+                          (local.set $7
+                           (local.get $1)
+                          )
+                         )
+                        )
+                       )
+                       (if
+                        (i32.and
+                         (local.get $12)
+                         (i32.const 8)
+                        )
+                        (block
+                         (local.set $8
+                          (i32.add
+                           (local.tee $1
+                            (i32.sub
+                             (local.get $38)
+                             (local.get $7)
+                            )
+                           )
+                           (i32.const 1)
+                          )
+                         )
+                         (if
+                          (i32.le_s
+                           (local.get $5)
+                           (local.get $1)
+                          )
+                          (local.set $5
+                           (local.get $8)
+                          )
+                         )
+                         (local.set $6
+                          (i32.const 0)
+                         )
+                         (local.set $8
+                          (i32.const 2179)
+                         )
+                         (br $label$71)
+                        )
+                        (block
+                         (local.set $6
+                          (i32.const 0)
+                         )
+                         (local.set $8
+                          (i32.const 2179)
+                         )
+                         (br $label$71)
+                        )
+                       )
+                      )
+                      (if
+                       (i64.lt_s
+                        (local.tee $50
+                         (i64.load
+                          (local.get $16)
+                         )
+                        )
+                        (i64.const 0)
+                       )
+                       (block
+                        (i64.store
+                         (local.get $16)
+                         (local.tee $50
+                          (i64.sub
+                           (i64.const 0)
+                           (local.get $50)
+                          )
+                         )
+                        )
+                        (local.set $6
+                         (i32.const 1)
+                        )
+                        (local.set $8
+                         (i32.const 2179)
+                        )
+                        (br $label$75)
+                       )
+                      )
+                      (if
+                       (i32.and
+                        (local.get $12)
+                        (i32.const 2048)
+                       )
+                       (block
+                        (local.set $6
+                         (i32.const 1)
+                        )
+                        (local.set $8
+                         (i32.const 2180)
+                        )
+                        (br $label$75)
+                       )
+                       (block
+                        (local.set $6
+                         (local.tee $1
+                          (i32.and
+                           (local.get $12)
+                           (i32.const 1)
+                          )
+                         )
+                        )
+                        (local.set $8
+                         (if (result i32)
+                          (local.get $1)
+                          (i32.const 2181)
+                          (i32.const 2179)
+                         )
+                        )
+                        (br $label$75)
+                       )
+                      )
+                     )
+                     (local.set $50
+                      (i64.load
+                       (local.get $16)
+                      )
+                     )
+                     (local.set $6
+                      (i32.const 0)
+                     )
+                     (local.set $8
+                      (i32.const 2179)
+                     )
+                     (br $label$75)
+                    )
+                    (i64.store8
+                     (local.get $39)
+                     (i64.load
+                      (local.get $16)
+                     )
+                    )
+                    (local.set $1
+                     (local.get $39)
+                    )
+                    (local.set $12
+                     (local.get $7)
+                    )
+                    (local.set $7
+                     (i32.const 1)
+                    )
+                    (local.set $6
+                     (i32.const 0)
+                    )
+                    (local.set $8
+                     (i32.const 2179)
+                    )
+                    (local.set $5
+                     (local.get $21)
+                    )
+                    (br $label$70)
+                   )
+                   (local.set $1
+                    (call $24
+                     (i32.load
+                      (call $12)
+                     )
+                    )
+                   )
+                   (br $label$74)
+                  )
+                  (if
+                   (i32.eqz
+                    (local.tee $1
+                     (i32.load
+                      (local.get $16)
+                     )
+                    )
+                   )
+                   (local.set $1
+                    (i32.const 2189)
+                   )
+                  )
+                  (br $label$74)
+                 )
+                 (i64.store32
+                  (local.get $37)
+                  (i64.load
+                   (local.get $16)
+                  )
+                 )
+                 (i32.store
+                  (local.get $42)
+                  (i32.const 0)
+                 )
+                 (i32.store
+                  (local.get $16)
+                  (local.get $37)
+                 )
+                 (local.set $7
+                  (local.get $37)
+                 )
+                 (local.set $6
+                  (i32.const -1)
+                 )
+                 (br $label$73)
+                )
+                (local.set $7
+                 (i32.load
+                  (local.get $16)
+                 )
+                )
+                (if
+                 (local.get $5)
+                 (block
+                  (local.set $6
+                   (local.get $5)
+                  )
+                  (br $label$73)
+                 )
+                 (block
+                  (call $25
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (i32.const 0)
+                   (local.get $12)
+                  )
+                  (local.set $1
+                   (i32.const 0)
+                  )
+                  (br $label$72)
+                 )
+                )
+               )
+               (local.set $52
+                (f64.load
+                 (local.get $16)
+                )
+               )
+               (i32.store
+                (local.get $20)
+                (i32.const 0)
+               )
+               (local.set $26
+                (if (result i32)
+                 (i64.lt_s
+                  (i64.reinterpret_f64
+                   (local.get $52)
+                  )
+                  (i64.const 0)
+                 )
+                 (block (result i32)
+                  (local.set $24
+                   (i32.const 1)
+                  )
+                  (local.set $52
+                   (f64.neg
+                    (local.get $52)
+                   )
+                  )
+                  (i32.const 2196)
+                 )
+                 (block (result i32)
+                  (local.set $1
+                   (i32.and
+                    (local.get $12)
+                    (i32.const 1)
+                   )
+                  )
+                  (if (result i32)
+                   (i32.and
+                    (local.get $12)
+                    (i32.const 2048)
+                   )
+                   (block (result i32)
+                    (local.set $24
+                     (i32.const 1)
+                    )
+                    (i32.const 2199)
+                   )
+                   (block (result i32)
+                    (local.set $24
+                     (local.get $1)
+                    )
+                    (if (result i32)
+                     (local.get $1)
+                     (i32.const 2202)
+                     (i32.const 2197)
+                    )
+                   )
+                  )
+                 )
+                )
+               )
+               (block $label$119
+                (if
+                 (i64.lt_u
+                  (i64.and
+                   (i64.reinterpret_f64
+                    (local.get $52)
+                   )
+                   (i64.const 9218868437227405312)
+                  )
+                  (i64.const 9218868437227405312)
+                 )
+                 (block
+                  (if
+                   (local.tee $1
+                    (f64.ne
+                     (local.tee $52
+                      (f64.mul
+                       (call $27
+                        (local.get $52)
+                        (local.get $20)
+                       )
+                       (f64.const 2)
+                      )
+                     )
+                     (f64.const 0)
+                    )
+                   )
+                   (i32.store
+                    (local.get $20)
+                    (i32.add
+                     (i32.load
+                      (local.get $20)
+                     )
+                     (i32.const -1)
+                    )
+                   )
+                  )
+                  (if
+                   (i32.eq
+                    (local.tee $22
+                     (i32.or
+                      (local.get $9)
+                      (i32.const 32)
+                     )
+                    )
+                    (i32.const 97)
+                   )
+                   (block
+                    (local.set $1
+                     (i32.add
+                      (local.get $26)
+                      (i32.const 9)
+                     )
+                    )
+                    (if
+                     (local.tee $6
+                      (i32.and
+                       (local.get $9)
+                       (i32.const 32)
+                      )
+                     )
+                     (local.set $26
+                      (local.get $1)
+                     )
+                    )
+                    (if
+                     (i32.eqz
+                      (i32.or
+                       (i32.gt_u
+                        (local.get $5)
+                        (i32.const 11)
+                       )
+                       (i32.eqz
+                        (local.tee $1
+                         (i32.sub
+                          (i32.const 12)
+                          (local.get $5)
+                         )
+                        )
+                       )
+                      )
+                     )
+                     (block
+                      (local.set $53
+                       (f64.const 8)
+                      )
+                      (loop $label$125
+                       (local.set $53
+                        (f64.mul
+                         (local.get $53)
+                         (f64.const 16)
+                        )
+                       )
+                       (br_if $label$125
+                        (local.tee $1
+                         (i32.add
+                          (local.get $1)
+                          (i32.const -1)
+                         )
+                        )
+                       )
+                      )
+                      (local.set $52
+                       (if (result f64)
+                        (i32.eq
+                         (i32.load8_s
+                          (local.get $26)
+                         )
+                         (i32.const 45)
+                        )
+                        (f64.neg
+                         (f64.add
+                          (local.get $53)
+                          (f64.sub
+                           (f64.neg
+                            (local.get $52)
+                           )
+                           (local.get $53)
+                          )
+                         )
+                        )
+                        (f64.sub
+                         (f64.add
+                          (local.get $52)
+                          (local.get $53)
+                         )
+                         (local.get $53)
+                        )
+                       )
+                      )
+                     )
+                    )
+                    (local.set $1
+                     (i32.sub
+                      (i32.const 0)
+                      (local.tee $7
+                       (i32.load
+                        (local.get $20)
+                       )
+                      )
+                     )
+                    )
+                    (if
+                     (i32.eq
+                      (local.tee $1
+                       (call $23
+                        (i64.extend_i32_s
+                         (if (result i32)
+                          (i32.lt_s
+                           (local.get $7)
+                           (i32.const 0)
+                          )
+                          (local.get $1)
+                          (local.get $7)
+                         )
+                        )
+                        (local.get $33)
+                       )
+                      )
+                      (local.get $33)
+                     )
+                     (block
+                      (i32.store8
+                       (local.get $40)
+                       (i32.const 48)
+                      )
+                      (local.set $1
+                       (local.get $40)
+                      )
+                     )
+                    )
+                    (local.set $13
+                     (i32.or
+                      (local.get $24)
+                      (i32.const 2)
+                     )
+                    )
+                    (i32.store8
+                     (i32.add
+                      (local.get $1)
+                      (i32.const -1)
+                     )
+                     (i32.add
+                      (i32.and
+                       (i32.shr_s
+                        (local.get $7)
+                        (i32.const 31)
+                       )
+                       (i32.const 2)
+                      )
+                      (i32.const 43)
+                     )
+                    )
+                    (i32.store8
+                     (local.tee $8
+                      (i32.add
+                       (local.get $1)
+                       (i32.const -2)
+                      )
+                     )
+                     (i32.add
+                      (local.get $9)
+                      (i32.const 15)
+                     )
+                    )
+                    (local.set $9
+                     (i32.lt_s
+                      (local.get $5)
+                      (i32.const 1)
+                     )
+                    )
+                    (local.set $14
+                     (i32.eqz
+                      (i32.and
+                       (local.get $12)
+                       (i32.const 8)
+                      )
+                     )
+                    )
+                    (local.set $1
+                     (local.get $19)
+                    )
+                    (loop $label$131
+                     (i32.store8
+                      (local.get $1)
+                      (i32.or
+                       (i32.load8_u
+                        (i32.add
+                         (local.tee $7
+                          (i32.trunc_f64_s
+                           (local.get $52)
+                          )
+                         )
+                         (i32.const 2163)
+                        )
+                       )
+                       (local.get $6)
+                      )
+                     )
+                     (local.set $52
+                      (f64.mul
+                       (f64.sub
+                        (local.get $52)
+                        (f64.convert_i32_s
+                         (local.get $7)
+                        )
+                       )
+                       (f64.const 16)
+                      )
+                     )
+                     (local.set $1
+                      (block $label$132 (result i32)
+                       (if (result i32)
+                        (i32.eq
+                         (i32.sub
+                          (local.tee $7
+                           (i32.add
+                            (local.get $1)
+                            (i32.const 1)
+                           )
+                          )
+                          (local.get $27)
+                         )
+                         (i32.const 1)
+                        )
+                        (block (result i32)
+                         (drop
+                          (br_if $label$132
+                           (local.get $7)
+                           (i32.and
+                            (local.get $14)
+                            (i32.and
+                             (local.get $9)
+                             (f64.eq
+                              (local.get $52)
+                              (f64.const 0)
+                             )
+                            )
+                           )
+                          )
+                         )
+                         (i32.store8
+                          (local.get $7)
+                          (i32.const 46)
+                         )
+                         (i32.add
+                          (local.get $1)
+                          (i32.const 2)
+                         )
+                        )
+                        (local.get $7)
+                       )
+                      )
+                     )
+                     (br_if $label$131
+                      (f64.ne
+                       (local.get $52)
+                       (f64.const 0)
+                      )
+                     )
+                    )
+                    (local.set $6
+                     (i32.sub
+                      (i32.add
+                       (local.get $46)
+                       (local.get $5)
+                      )
+                      (local.tee $7
+                       (local.get $8)
+                      )
+                     )
+                    )
+                    (local.set $9
+                     (i32.add
+                      (i32.sub
+                       (local.get $44)
+                       (local.get $7)
+                      )
+                      (local.get $1)
+                     )
+                    )
+                    (call $25
+                     (local.get $0)
+                     (i32.const 32)
+                     (local.get $10)
+                     (local.tee $5
+                      (i32.add
+                       (if (result i32)
+                        (i32.and
+                         (i32.ne
+                          (local.get $5)
+                          (i32.const 0)
+                         )
+                         (i32.lt_s
+                          (i32.add
+                           (local.get $45)
+                           (local.get $1)
+                          )
+                          (local.get $5)
+                         )
+                        )
+                        (local.get $6)
+                        (local.tee $6
+                         (local.get $9)
+                        )
+                       )
+                       (local.get $13)
+                      )
+                     )
+                     (local.get $12)
+                    )
+                    (if
+                     (i32.eqz
+                      (i32.and
+                       (i32.load
+                        (local.get $0)
+                       )
+                       (i32.const 32)
+                      )
+                     )
+                     (drop
+                      (call $21
+                       (local.get $26)
+                       (local.get $13)
+                       (local.get $0)
+                      )
+                     )
+                    )
+                    (call $25
+                     (local.get $0)
+                     (i32.const 48)
+                     (local.get $10)
+                     (local.get $5)
+                     (i32.xor
+                      (local.get $12)
+                      (i32.const 65536)
+                     )
+                    )
+                    (local.set $1
+                     (i32.sub
+                      (local.get $1)
+                      (local.get $27)
+                     )
+                    )
+                    (if
+                     (i32.eqz
+                      (i32.and
+                       (i32.load
+                        (local.get $0)
+                       )
+                       (i32.const 32)
+                      )
+                     )
+                     (drop
+                      (call $21
+                       (local.get $19)
+                       (local.get $1)
+                       (local.get $0)
+                      )
+                     )
+                    )
+                    (call $25
+                     (local.get $0)
+                     (i32.const 48)
+                     (i32.sub
+                      (local.get $6)
+                      (i32.add
+                       (local.get $1)
+                       (local.tee $1
+                        (i32.sub
+                         (local.get $28)
+                         (local.get $7)
+                        )
+                       )
+                      )
+                     )
+                     (i32.const 0)
+                     (i32.const 0)
+                    )
+                    (if
+                     (i32.eqz
+                      (i32.and
+                       (i32.load
+                        (local.get $0)
+                       )
+                       (i32.const 32)
+                      )
+                     )
+                     (drop
+                      (call $21
+                       (local.get $8)
+                       (local.get $1)
+                       (local.get $0)
+                      )
+                     )
+                    )
+                    (call $25
+                     (local.get $0)
+                     (i32.const 32)
+                     (local.get $10)
+                     (local.get $5)
+                     (i32.xor
+                      (local.get $12)
+                      (i32.const 8192)
+                     )
+                    )
+                    (if
+                     (i32.ge_s
+                      (local.get $5)
+                      (local.get $10)
+                     )
+                     (local.set $10
+                      (local.get $5)
+                     )
+                    )
+                    (br $label$119)
+                   )
+                  )
+                  (if
+                   (local.get $1)
+                   (block
+                    (i32.store
+                     (local.get $20)
+                     (local.tee $6
+                      (i32.add
+                       (i32.load
+                        (local.get $20)
+                       )
+                       (i32.const -28)
+                      )
+                     )
+                    )
+                    (local.set $52
+                     (f64.mul
+                      (local.get $52)
+                      (f64.const 268435456)
+                     )
+                    )
+                   )
+                   (local.set $6
+                    (i32.load
+                     (local.get $20)
+                    )
+                   )
+                  )
+                  (local.set $8
+                   (local.tee $7
+                    (if (result i32)
+                     (i32.lt_s
+                      (local.get $6)
+                      (i32.const 0)
+                     )
+                     (local.get $47)
+                     (local.get $48)
+                    )
+                   )
+                  )
+                  (loop $label$145
+                   (i32.store
+                    (local.get $8)
+                    (local.tee $1
+                     (i32.trunc_f64_s
+                      (local.get $52)
+                     )
+                    )
+                   )
+                   (local.set $8
+                    (i32.add
+                     (local.get $8)
+                     (i32.const 4)
+                    )
+                   )
+                   (br_if $label$145
+                    (f64.ne
+                     (local.tee $52
+                      (f64.mul
+                       (f64.sub
+                        (local.get $52)
+                        (f64.convert_i32_u
+                         (local.get $1)
+                        )
+                       )
+                       (f64.const 1e9)
+                      )
+                     )
+                     (f64.const 0)
+                    )
+                   )
+                  )
+                  (if
+                   (i32.gt_s
+                    (local.get $6)
+                    (i32.const 0)
+                   )
+                   (block
+                    (local.set $1
+                     (local.get $7)
+                    )
+                    (loop $label$147
+                     (local.set $14
+                      (if (result i32)
+                       (i32.gt_s
+                        (local.get $6)
+                        (i32.const 29)
+                       )
+                       (i32.const 29)
+                       (local.get $6)
+                      )
+                     )
+                     (block $label$150
+                      (if
+                       (i32.ge_u
+                        (local.tee $6
+                         (i32.add
+                          (local.get $8)
+                          (i32.const -4)
+                         )
+                        )
+                        (local.get $1)
+                       )
+                       (block
+                        (local.set $50
+                         (i64.extend_i32_u
+                          (local.get $14)
+                         )
+                        )
+                        (local.set $13
+                         (i32.const 0)
+                        )
+                        (loop $label$152
+                         (i64.store32
+                          (local.get $6)
+                          (i64.rem_u
+                           (local.tee $51
+                            (i64.add
+                             (i64.shl
+                              (i64.extend_i32_u
+                               (i32.load
+                                (local.get $6)
+                               )
+                              )
+                              (local.get $50)
+                             )
+                             (i64.extend_i32_u
+                              (local.get $13)
+                             )
+                            )
+                           )
+                           (i64.const 1000000000)
+                          )
+                         )
+                         (local.set $13
+                          (i32.wrap_i64
+                           (i64.div_u
+                            (local.get $51)
+                            (i64.const 1000000000)
+                           )
+                          )
+                         )
+                         (br_if $label$152
+                          (i32.ge_u
+                           (local.tee $6
+                            (i32.add
+                             (local.get $6)
+                             (i32.const -4)
+                            )
+                           )
+                           (local.get $1)
+                          )
+                         )
+                        )
+                        (br_if $label$150
+                         (i32.eqz
+                          (local.get $13)
+                         )
+                        )
+                        (i32.store
+                         (local.tee $1
+                          (i32.add
+                           (local.get $1)
+                           (i32.const -4)
+                          )
+                         )
+                         (local.get $13)
+                        )
+                       )
+                      )
+                     )
+                     (loop $label$153
+                      (if
+                       (i32.gt_u
+                        (local.get $8)
+                        (local.get $1)
+                       )
+                       (if
+                        (i32.eqz
+                         (i32.load
+                          (local.tee $6
+                           (i32.add
+                            (local.get $8)
+                            (i32.const -4)
+                           )
+                          )
+                         )
+                        )
+                        (block
+                         (local.set $8
+                          (local.get $6)
+                         )
+                         (br $label$153)
+                        )
+                       )
+                      )
+                     )
+                     (i32.store
+                      (local.get $20)
+                      (local.tee $6
+                       (i32.sub
+                        (i32.load
+                         (local.get $20)
+                        )
+                        (local.get $14)
+                       )
+                      )
+                     )
+                     (br_if $label$147
+                      (i32.gt_s
+                       (local.get $6)
+                       (i32.const 0)
+                      )
+                     )
+                    )
+                   )
+                   (local.set $1
+                    (local.get $7)
+                   )
+                  )
+                  (local.set $18
+                   (if (result i32)
+                    (i32.lt_s
+                     (local.get $5)
+                     (i32.const 0)
+                    )
+                    (i32.const 6)
+                    (local.get $5)
+                   )
+                  )
+                  (if
+                   (i32.lt_s
+                    (local.get $6)
+                    (i32.const 0)
+                   )
+                   (block
+                    (local.set $14
+                     (i32.add
+                      (i32.div_s
+                       (i32.add
+                        (local.get $18)
+                        (i32.const 25)
+                       )
+                       (i32.const 9)
+                      )
+                      (i32.const 1)
+                     )
+                    )
+                    (local.set $25
+                     (i32.eq
+                      (local.get $22)
+                      (i32.const 102)
+                     )
+                    )
+                    (local.set $5
+                     (local.get $8)
+                    )
+                    (loop $label$160
+                     (if
+                      (i32.gt_s
+                       (local.tee $13
+                        (i32.sub
+                         (i32.const 0)
+                         (local.get $6)
+                        )
+                       )
+                       (i32.const 9)
+                      )
+                      (local.set $13
+                       (i32.const 9)
+                      )
+                     )
+                     (block $label$162
+                      (if
+                       (i32.lt_u
+                        (local.get $1)
+                        (local.get $5)
+                       )
+                       (block
+                        (local.set $29
+                         (i32.add
+                          (i32.shl
+                           (i32.const 1)
+                           (local.get $13)
+                          )
+                          (i32.const -1)
+                         )
+                        )
+                        (local.set $35
+                         (i32.shr_u
+                          (i32.const 1000000000)
+                          (local.get $13)
+                         )
+                        )
+                        (local.set $6
+                         (i32.const 0)
+                        )
+                        (local.set $8
+                         (local.get $1)
+                        )
+                        (loop $label$164
+                         (i32.store
+                          (local.get $8)
+                          (i32.add
+                           (i32.shr_u
+                            (local.tee $32
+                             (i32.load
+                              (local.get $8)
+                             )
+                            )
+                            (local.get $13)
+                           )
+                           (local.get $6)
+                          )
+                         )
+                         (local.set $6
+                          (i32.mul
+                           (i32.and
+                            (local.get $32)
+                            (local.get $29)
+                           )
+                           (local.get $35)
+                          )
+                         )
+                         (br_if $label$164
+                          (i32.lt_u
+                           (local.tee $8
+                            (i32.add
+                             (local.get $8)
+                             (i32.const 4)
+                            )
+                           )
+                           (local.get $5)
+                          )
+                         )
+                        )
+                        (local.set $8
+                         (i32.add
+                          (local.get $1)
+                          (i32.const 4)
+                         )
+                        )
+                        (if
+                         (i32.eqz
+                          (i32.load
+                           (local.get $1)
+                          )
+                         )
+                         (local.set $1
+                          (local.get $8)
+                         )
+                        )
+                        (br_if $label$162
+                         (i32.eqz
+                          (local.get $6)
+                         )
+                        )
+                        (i32.store
+                         (local.get $5)
+                         (local.get $6)
+                        )
+                        (local.set $5
+                         (i32.add
+                          (local.get $5)
+                          (i32.const 4)
+                         )
+                        )
+                       )
+                       (block
+                        (local.set $8
+                         (i32.add
+                          (local.get $1)
+                          (i32.const 4)
+                         )
+                        )
+                        (if
+                         (i32.eqz
+                          (i32.load
+                           (local.get $1)
+                          )
+                         )
+                         (local.set $1
+                          (local.get $8)
+                         )
+                        )
+                       )
+                      )
+                     )
+                     (local.set $6
+                      (i32.add
+                       (local.tee $8
+                        (if (result i32)
+                         (local.get $25)
+                         (local.get $7)
+                         (local.get $1)
+                        )
+                       )
+                       (i32.shl
+                        (local.get $14)
+                        (i32.const 2)
+                       )
+                      )
+                     )
+                     (if
+                      (i32.gt_s
+                       (i32.shr_s
+                        (i32.sub
+                         (local.get $5)
+                         (local.get $8)
+                        )
+                        (i32.const 2)
+                       )
+                       (local.get $14)
+                      )
+                      (local.set $5
+                       (local.get $6)
+                      )
+                     )
+                     (i32.store
+                      (local.get $20)
+                      (local.tee $6
+                       (i32.add
+                        (i32.load
+                         (local.get $20)
+                        )
+                        (local.get $13)
+                       )
+                      )
+                     )
+                     (br_if $label$160
+                      (i32.lt_s
+                       (local.get $6)
+                       (i32.const 0)
+                      )
+                     )
+                     (local.set $13
+                      (local.get $5)
+                     )
+                    )
+                   )
+                   (local.set $13
+                    (local.get $8)
+                   )
+                  )
+                  (local.set $25
+                   (local.get $7)
+                  )
+                  (block $label$172
+                   (if
+                    (i32.lt_u
+                     (local.get $1)
+                     (local.get $13)
+                    )
+                    (block
+                     (local.set $5
+                      (i32.mul
+                       (i32.shr_s
+                        (i32.sub
+                         (local.get $25)
+                         (local.get $1)
+                        )
+                        (i32.const 2)
+                       )
+                       (i32.const 9)
+                      )
+                     )
+                     (br_if $label$172
+                      (i32.lt_u
+                       (local.tee $6
+                        (i32.load
+                         (local.get $1)
+                        )
+                       )
+                       (i32.const 10)
+                      )
+                     )
+                     (local.set $8
+                      (i32.const 10)
+                     )
+                     (loop $label$174
+                      (local.set $5
+                       (i32.add
+                        (local.get $5)
+                        (i32.const 1)
+                       )
+                      )
+                      (br_if $label$174
+                       (i32.ge_u
+                        (local.get $6)
+                        (local.tee $8
+                         (i32.mul
+                          (local.get $8)
+                          (i32.const 10)
+                         )
+                        )
+                       )
+                      )
+                     )
+                    )
+                    (local.set $5
+                     (i32.const 0)
+                    )
+                   )
+                  )
+                  (local.set $29
+                   (i32.eq
+                    (local.get $22)
+                    (i32.const 103)
+                   )
+                  )
+                  (local.set $35
+                   (i32.ne
+                    (local.get $18)
+                    (i32.const 0)
+                   )
+                  )
+                  (if
+                   (i32.lt_s
+                    (local.tee $8
+                     (i32.add
+                      (i32.sub
+                       (local.get $18)
+                       (if (result i32)
+                        (i32.ne
+                         (local.get $22)
+                         (i32.const 102)
+                        )
+                        (local.get $5)
+                        (i32.const 0)
+                       )
+                      )
+                      (i32.shr_s
+                       (i32.shl
+                        (i32.and
+                         (local.get $35)
+                         (local.get $29)
+                        )
+                        (i32.const 31)
+                       )
+                       (i32.const 31)
+                      )
+                     )
+                    )
+                    (i32.add
+                     (i32.mul
+                      (i32.shr_s
+                       (i32.sub
+                        (local.get $13)
+                        (local.get $25)
+                       )
+                       (i32.const 2)
+                      )
+                      (i32.const 9)
+                     )
+                     (i32.const -9)
+                    )
+                   )
+                   (block
+                    (if
+                     (i32.lt_s
+                      (local.tee $8
+                       (i32.add
+                        (i32.rem_s
+                         (local.tee $14
+                          (i32.add
+                           (local.get $8)
+                           (i32.const 9216)
+                          )
+                         )
+                         (i32.const 9)
+                        )
+                        (i32.const 1)
+                       )
+                      )
+                      (i32.const 9)
+                     )
+                     (block
+                      (local.set $6
+                       (i32.const 10)
+                      )
+                      (loop $label$180
+                       (local.set $6
+                        (i32.mul
+                         (local.get $6)
+                         (i32.const 10)
+                        )
+                       )
+                       (br_if $label$180
+                        (i32.ne
+                         (local.tee $8
+                          (i32.add
+                           (local.get $8)
+                           (i32.const 1)
+                          )
+                         )
+                         (i32.const 9)
+                        )
+                       )
+                      )
+                     )
+                     (local.set $6
+                      (i32.const 10)
+                     )
+                    )
+                    (local.set $14
+                     (i32.rem_u
+                      (local.tee $22
+                       (i32.load
+                        (local.tee $8
+                         (i32.add
+                          (i32.add
+                           (local.get $7)
+                           (i32.const 4)
+                          )
+                          (i32.shl
+                           (i32.add
+                            (i32.div_s
+                             (local.get $14)
+                             (i32.const 9)
+                            )
+                            (i32.const -1024)
+                           )
+                           (i32.const 2)
+                          )
+                         )
+                        )
+                       )
+                      )
+                      (local.get $6)
+                     )
+                    )
+                    (block $label$182
+                     (if
+                      (i32.eqz
+                       (i32.and
+                        (local.tee $32
+                         (i32.eq
+                          (i32.add
+                           (local.get $8)
+                           (i32.const 4)
+                          )
+                          (local.get $13)
+                         )
+                        )
+                        (i32.eqz
+                         (local.get $14)
+                        )
+                       )
+                      )
+                      (block
+                       (local.set $52
+                        (if (result f64)
+                         (i32.lt_u
+                          (local.get $14)
+                          (local.tee $49
+                           (i32.div_s
+                            (local.get $6)
+                            (i32.const 2)
+                           )
+                          )
+                         )
+                         (f64.const 0.5)
+                         (if (result f64)
+                          (i32.and
+                           (local.get $32)
+                           (i32.eq
+                            (local.get $14)
+                            (local.get $49)
+                           )
+                          )
+                          (f64.const 1)
+                          (f64.const 1.5)
+                         )
+                        )
+                       )
+                       (local.set $53
+                        (if (result f64)
+                         (i32.and
+                          (i32.div_u
+                           (local.get $22)
+                           (local.get $6)
+                          )
+                          (i32.const 1)
+                         )
+                         (f64.const 9007199254740994)
+                         (f64.const 9007199254740992)
+                        )
+                       )
+                       (block $label$190
+                        (if
+                         (local.get $24)
+                         (block
+                          (br_if $label$190
+                           (i32.ne
+                            (i32.load8_s
+                             (local.get $26)
+                            )
+                            (i32.const 45)
+                           )
+                          )
+                          (local.set $53
+                           (f64.neg
+                            (local.get $53)
+                           )
+                          )
+                          (local.set $52
+                           (f64.neg
+                            (local.get $52)
+                           )
+                          )
+                         )
+                        )
+                       )
+                       (i32.store
+                        (local.get $8)
+                        (local.tee $14
+                         (i32.sub
+                          (local.get $22)
+                          (local.get $14)
+                         )
+                        )
+                       )
+                       (br_if $label$182
+                        (f64.eq
+                         (f64.add
+                          (local.get $53)
+                          (local.get $52)
+                         )
+                         (local.get $53)
+                        )
+                       )
+                       (i32.store
+                        (local.get $8)
+                        (local.tee $5
+                         (i32.add
+                          (local.get $14)
+                          (local.get $6)
+                         )
+                        )
+                       )
+                       (if
+                        (i32.gt_u
+                         (local.get $5)
+                         (i32.const 999999999)
+                        )
+                        (loop $label$193
+                         (i32.store
+                          (local.get $8)
+                          (i32.const 0)
+                         )
+                         (if
+                          (i32.lt_u
+                           (local.tee $8
+                            (i32.add
+                             (local.get $8)
+                             (i32.const -4)
+                            )
+                           )
+                           (local.get $1)
+                          )
+                          (i32.store
+                           (local.tee $1
+                            (i32.add
+                             (local.get $1)
+                             (i32.const -4)
+                            )
+                           )
+                           (i32.const 0)
+                          )
+                         )
+                         (i32.store
+                          (local.get $8)
+                          (local.tee $5
+                           (i32.add
+                            (i32.load
+                             (local.get $8)
+                            )
+                            (i32.const 1)
+                           )
+                          )
+                         )
+                         (br_if $label$193
+                          (i32.gt_u
+                           (local.get $5)
+                           (i32.const 999999999)
+                          )
+                         )
+                        )
+                       )
+                       (local.set $5
+                        (i32.mul
+                         (i32.shr_s
+                          (i32.sub
+                           (local.get $25)
+                           (local.get $1)
+                          )
+                          (i32.const 2)
+                         )
+                         (i32.const 9)
+                        )
+                       )
+                       (br_if $label$182
+                        (i32.lt_u
+                         (local.tee $14
+                          (i32.load
+                           (local.get $1)
+                          )
+                         )
+                         (i32.const 10)
+                        )
+                       )
+                       (local.set $6
+                        (i32.const 10)
+                       )
+                       (loop $label$195
+                        (local.set $5
+                         (i32.add
+                          (local.get $5)
+                          (i32.const 1)
+                         )
+                        )
+                        (br_if $label$195
+                         (i32.ge_u
+                          (local.get $14)
+                          (local.tee $6
+                           (i32.mul
+                            (local.get $6)
+                            (i32.const 10)
+                           )
+                          )
+                         )
+                        )
+                       )
+                      )
+                     )
+                    )
+                    (local.set $14
+                     (local.get $1)
+                    )
+                    (local.set $6
+                     (local.get $5)
+                    )
+                    (if
+                     (i32.le_u
+                      (local.get $13)
+                      (local.tee $8
+                       (i32.add
+                        (local.get $8)
+                        (i32.const 4)
+                       )
+                      )
+                     )
+                     (local.set $8
+                      (local.get $13)
+                     )
+                    )
+                   )
+                   (block
+                    (local.set $14
+                     (local.get $1)
+                    )
+                    (local.set $6
+                     (local.get $5)
+                    )
+                    (local.set $8
+                     (local.get $13)
+                    )
+                   )
+                  )
+                  (local.set $32
+                   (i32.sub
+                    (i32.const 0)
+                    (local.get $6)
+                   )
+                  )
+                  (loop $label$198
+                   (block $label$199
+                    (if
+                     (i32.le_u
+                      (local.get $8)
+                      (local.get $14)
+                     )
+                     (block
+                      (local.set $22
+                       (i32.const 0)
+                      )
+                      (br $label$199)
+                     )
+                    )
+                    (if
+                     (i32.load
+                      (local.tee $1
+                       (i32.add
+                        (local.get $8)
+                        (i32.const -4)
+                       )
+                      )
+                     )
+                     (local.set $22
+                      (i32.const 1)
+                     )
+                     (block
+                      (local.set $8
+                       (local.get $1)
+                      )
+                      (br $label$198)
+                     )
+                    )
+                   )
+                  )
+                  (block $label$203
+                   (if
+                    (local.get $29)
+                    (block
+                     (local.set $1
+                      (if (result i32)
+                       (i32.and
+                        (i32.gt_s
+                         (local.tee $1
+                          (i32.add
+                           (i32.xor
+                            (i32.and
+                             (local.get $35)
+                             (i32.const 1)
+                            )
+                            (i32.const 1)
+                           )
+                           (local.get $18)
+                          )
+                         )
+                         (local.get $6)
+                        )
+                        (i32.gt_s
+                         (local.get $6)
+                         (i32.const -5)
+                        )
+                       )
+                       (block (result i32)
+                        (local.set $5
+                         (i32.add
+                          (local.get $9)
+                          (i32.const -1)
+                         )
+                        )
+                        (i32.sub
+                         (i32.add
+                          (local.get $1)
+                          (i32.const -1)
+                         )
+                         (local.get $6)
+                        )
+                       )
+                       (block (result i32)
+                        (local.set $5
+                         (i32.add
+                          (local.get $9)
+                          (i32.const -2)
+                         )
+                        )
+                        (i32.add
+                         (local.get $1)
+                         (i32.const -1)
+                        )
+                       )
+                      )
+                     )
+                     (br_if $label$203
+                      (local.tee $13
+                       (i32.and
+                        (local.get $12)
+                        (i32.const 8)
+                       )
+                      )
+                     )
+                     (block $label$207
+                      (if
+                       (local.get $22)
+                       (block
+                        (if
+                         (i32.eqz
+                          (local.tee $18
+                           (i32.load
+                            (i32.add
+                             (local.get $8)
+                             (i32.const -4)
+                            )
+                           )
+                          )
+                         )
+                         (block
+                          (local.set $9
+                           (i32.const 9)
+                          )
+                          (br $label$207)
+                         )
+                        )
+                        (if
+                         (i32.rem_u
+                          (local.get $18)
+                          (i32.const 10)
+                         )
+                         (block
+                          (local.set $9
+                           (i32.const 0)
+                          )
+                          (br $label$207)
+                         )
+                         (block
+                          (local.set $13
+                           (i32.const 10)
+                          )
+                          (local.set $9
+                           (i32.const 0)
+                          )
+                         )
+                        )
+                        (loop $label$212
+                         (local.set $9
+                          (i32.add
+                           (local.get $9)
+                           (i32.const 1)
+                          )
+                         )
+                         (br_if $label$212
+                          (i32.eqz
+                           (i32.rem_u
+                            (local.get $18)
+                            (local.tee $13
+                             (i32.mul
+                              (local.get $13)
+                              (i32.const 10)
+                             )
+                            )
+                           )
+                          )
+                         )
+                        )
+                       )
+                       (local.set $9
+                        (i32.const 9)
+                       )
+                      )
+                     )
+                     (local.set $18
+                      (i32.add
+                       (i32.mul
+                        (i32.shr_s
+                         (i32.sub
+                          (local.get $8)
+                          (local.get $25)
+                         )
+                         (i32.const 2)
+                        )
+                        (i32.const 9)
+                       )
+                       (i32.const -9)
+                      )
+                     )
+                     (if
+                      (i32.eq
+                       (i32.or
+                        (local.get $5)
+                        (i32.const 32)
+                       )
+                       (i32.const 102)
+                      )
+                      (block
+                       (local.set $13
+                        (i32.const 0)
+                       )
+                       (if
+                        (i32.ge_s
+                         (local.get $1)
+                         (if (result i32)
+                          (i32.lt_s
+                           (local.tee $9
+                            (i32.sub
+                             (local.get $18)
+                             (local.get $9)
+                            )
+                           )
+                           (i32.const 0)
+                          )
+                          (local.tee $9
+                           (i32.const 0)
+                          )
+                          (local.get $9)
+                         )
+                        )
+                        (local.set $1
+                         (local.get $9)
+                        )
+                       )
+                      )
+                      (block
+                       (local.set $13
+                        (i32.const 0)
+                       )
+                       (if
+                        (i32.ge_s
+                         (local.get $1)
+                         (if (result i32)
+                          (i32.lt_s
+                           (local.tee $9
+                            (i32.sub
+                             (i32.add
+                              (local.get $18)
+                              (local.get $6)
+                             )
+                             (local.get $9)
+                            )
+                           )
+                           (i32.const 0)
+                          )
+                          (local.tee $9
+                           (i32.const 0)
+                          )
+                          (local.get $9)
+                         )
+                        )
+                        (local.set $1
+                         (local.get $9)
+                        )
+                       )
+                      )
+                     )
+                    )
+                    (block
+                     (local.set $13
+                      (i32.and
+                       (local.get $12)
+                       (i32.const 8)
+                      )
+                     )
+                     (local.set $1
+                      (local.get $18)
+                     )
+                     (local.set $5
+                      (local.get $9)
+                     )
+                    )
+                   )
+                  )
+                  (if
+                   (local.tee $25
+                    (i32.eq
+                     (i32.or
+                      (local.get $5)
+                      (i32.const 32)
+                     )
+                     (i32.const 102)
+                    )
+                   )
+                   (block
+                    (local.set $9
+                     (i32.const 0)
+                    )
+                    (if
+                     (i32.le_s
+                      (local.get $6)
+                      (i32.const 0)
+                     )
+                     (local.set $6
+                      (i32.const 0)
+                     )
+                    )
+                   )
+                   (block
+                    (if
+                     (i32.lt_s
+                      (i32.sub
+                       (local.get $28)
+                       (local.tee $9
+                        (call $23
+                         (i64.extend_i32_s
+                          (if (result i32)
+                           (i32.lt_s
+                            (local.get $6)
+                            (i32.const 0)
+                           )
+                           (local.get $32)
+                           (local.get $6)
+                          )
+                         )
+                         (local.get $33)
+                        )
+                       )
+                      )
+                      (i32.const 2)
+                     )
+                     (loop $label$229
+                      (i32.store8
+                       (local.tee $9
+                        (i32.add
+                         (local.get $9)
+                         (i32.const -1)
+                        )
+                       )
+                       (i32.const 48)
+                      )
+                      (br_if $label$229
+                       (i32.lt_s
+                        (i32.sub
+                         (local.get $28)
+                         (local.get $9)
+                        )
+                        (i32.const 2)
+                       )
+                      )
+                     )
+                    )
+                    (i32.store8
+                     (i32.add
+                      (local.get $9)
+                      (i32.const -1)
+                     )
+                     (i32.add
+                      (i32.and
+                       (i32.shr_s
+                        (local.get $6)
+                        (i32.const 31)
+                       )
+                       (i32.const 2)
+                      )
+                      (i32.const 43)
+                     )
+                    )
+                    (i32.store8
+                     (local.tee $6
+                      (i32.add
+                       (local.get $9)
+                       (i32.const -2)
+                      )
+                     )
+                     (local.get $5)
+                    )
+                    (local.set $9
+                     (local.get $6)
+                    )
+                    (local.set $6
+                     (i32.sub
+                      (local.get $28)
+                      (local.get $6)
+                     )
+                    )
+                   )
+                  )
+                  (call $25
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (local.tee $18
+                    (i32.add
+                     (i32.add
+                      (i32.add
+                       (i32.add
+                        (local.get $24)
+                        (i32.const 1)
+                       )
+                       (local.get $1)
+                      )
+                      (i32.ne
+                       (local.tee $29
+                        (i32.or
+                         (local.get $1)
+                         (local.get $13)
+                        )
+                       )
+                       (i32.const 0)
+                      )
+                     )
+                     (local.get $6)
+                    )
+                   )
+                   (local.get $12)
+                  )
+                  (if
+                   (i32.eqz
+                    (i32.and
+                     (i32.load
+                      (local.get $0)
+                     )
+                     (i32.const 32)
+                    )
+                   )
+                   (drop
+                    (call $21
+                     (local.get $26)
+                     (local.get $24)
+                     (local.get $0)
+                    )
+                   )
+                  )
+                  (call $25
+                   (local.get $0)
+                   (i32.const 48)
+                   (local.get $10)
+                   (local.get $18)
+                   (i32.xor
+                    (local.get $12)
+                    (i32.const 65536)
+                   )
+                  )
+                  (block $label$231
+                   (if
+                    (local.get $25)
+                    (block
+                     (local.set $6
+                      (local.tee $9
+                       (if (result i32)
+                        (i32.gt_u
+                         (local.get $14)
+                         (local.get $7)
+                        )
+                        (local.get $7)
+                        (local.get $14)
+                       )
+                      )
+                     )
+                     (loop $label$235
+                      (local.set $5
+                       (call $23
+                        (i64.extend_i32_u
+                         (i32.load
+                          (local.get $6)
+                         )
+                        )
+                        (local.get $31)
+                       )
+                      )
+                      (block $label$236
+                       (if
+                        (i32.eq
+                         (local.get $6)
+                         (local.get $9)
+                        )
+                        (block
+                         (br_if $label$236
+                          (i32.ne
+                           (local.get $5)
+                           (local.get $31)
+                          )
+                         )
+                         (i32.store8
+                          (local.get $34)
+                          (i32.const 48)
+                         )
+                         (local.set $5
+                          (local.get $34)
+                         )
+                        )
+                        (block
+                         (br_if $label$236
+                          (i32.le_u
+                           (local.get $5)
+                           (local.get $19)
+                          )
+                         )
+                         (drop
+                          (call $46
+                           (local.get $19)
+                           (i32.const 48)
+                           (i32.sub
+                            (local.get $5)
+                            (local.get $27)
+                           )
+                          )
+                         )
+                         (loop $label$239
+                          (br_if $label$239
+                           (i32.gt_u
+                            (local.tee $5
+                             (i32.add
+                              (local.get $5)
+                              (i32.const -1)
+                             )
+                            )
+                            (local.get $19)
+                           )
+                          )
+                         )
+                        )
+                       )
+                      )
+                      (if
+                       (i32.eqz
+                        (i32.and
+                         (i32.load
+                          (local.get $0)
+                         )
+                         (i32.const 32)
+                        )
+                       )
+                       (drop
+                        (call $21
+                         (local.get $5)
+                         (i32.sub
+                          (local.get $41)
+                          (local.get $5)
+                         )
+                         (local.get $0)
+                        )
+                       )
+                      )
+                      (if
+                       (i32.le_u
+                        (local.tee $5
+                         (i32.add
+                          (local.get $6)
+                          (i32.const 4)
+                         )
+                        )
+                        (local.get $7)
+                       )
+                       (block
+                        (local.set $6
+                         (local.get $5)
+                        )
+                        (br $label$235)
+                       )
+                      )
+                     )
+                     (block $label$242
+                      (if
+                       (local.get $29)
+                       (block
+                        (br_if $label$242
+                         (i32.and
+                          (i32.load
+                           (local.get $0)
+                          )
+                          (i32.const 32)
+                         )
+                        )
+                        (drop
+                         (call $21
+                          (i32.const 2231)
+                          (i32.const 1)
+                          (local.get $0)
+                         )
+                        )
+                       )
+                      )
+                     )
+                     (if
+                      (i32.and
+                       (i32.gt_s
+                        (local.get $1)
+                        (i32.const 0)
+                       )
+                       (i32.lt_u
+                        (local.get $5)
+                        (local.get $8)
+                       )
+                      )
+                      (loop $label$245
+                       (if
+                        (i32.gt_u
+                         (local.tee $7
+                          (call $23
+                           (i64.extend_i32_u
+                            (i32.load
+                             (local.get $5)
+                            )
+                           )
+                           (local.get $31)
+                          )
+                         )
+                         (local.get $19)
+                        )
+                        (block
+                         (drop
+                          (call $46
+                           (local.get $19)
+                           (i32.const 48)
+                           (i32.sub
+                            (local.get $7)
+                            (local.get $27)
+                           )
+                          )
+                         )
+                         (loop $label$247
+                          (br_if $label$247
+                           (i32.gt_u
+                            (local.tee $7
+                             (i32.add
+                              (local.get $7)
+                              (i32.const -1)
+                             )
+                            )
+                            (local.get $19)
+                           )
+                          )
+                         )
+                        )
+                       )
+                       (if
+                        (i32.eqz
+                         (i32.and
+                          (i32.load
+                           (local.get $0)
+                          )
+                          (i32.const 32)
+                         )
+                        )
+                        (drop
+                         (call $21
+                          (local.get $7)
+                          (if (result i32)
+                           (i32.gt_s
+                            (local.get $1)
+                            (i32.const 9)
+                           )
+                           (i32.const 9)
+                           (local.get $1)
+                          )
+                          (local.get $0)
+                         )
+                        )
+                       )
+                       (local.set $7
+                        (i32.add
+                         (local.get $1)
+                         (i32.const -9)
+                        )
+                       )
+                       (if
+                        (i32.and
+                         (i32.gt_s
+                          (local.get $1)
+                          (i32.const 9)
+                         )
+                         (i32.lt_u
+                          (local.tee $5
+                           (i32.add
+                            (local.get $5)
+                            (i32.const 4)
+                           )
+                          )
+                          (local.get $8)
+                         )
+                        )
+                        (block
+                         (local.set $1
+                          (local.get $7)
+                         )
+                         (br $label$245)
+                        )
+                        (local.set $1
+                         (local.get $7)
+                        )
+                       )
+                      )
+                     )
+                     (call $25
+                      (local.get $0)
+                      (i32.const 48)
+                      (i32.add
+                       (local.get $1)
+                       (i32.const 9)
+                      )
+                      (i32.const 9)
+                      (i32.const 0)
+                     )
+                    )
+                    (block
+                     (local.set $5
+                      (i32.add
+                       (local.get $14)
+                       (i32.const 4)
+                      )
+                     )
+                     (if
+                      (i32.eqz
+                       (local.get $22)
+                      )
+                      (local.set $8
+                       (local.get $5)
+                      )
+                     )
+                     (if
+                      (i32.gt_s
+                       (local.get $1)
+                       (i32.const -1)
+                      )
+                      (block
+                       (local.set $13
+                        (i32.eqz
+                         (local.get $13)
+                        )
+                       )
+                       (local.set $7
+                        (local.get $14)
+                       )
+                       (local.set $5
+                        (local.get $1)
+                       )
+                       (loop $label$256
+                        (if
+                         (i32.eq
+                          (local.tee $1
+                           (call $23
+                            (i64.extend_i32_u
+                             (i32.load
+                              (local.get $7)
+                             )
+                            )
+                            (local.get $31)
+                           )
+                          )
+                          (local.get $31)
+                         )
+                         (block
+                          (i32.store8
+                           (local.get $34)
+                           (i32.const 48)
+                          )
+                          (local.set $1
+                           (local.get $34)
+                          )
+                         )
+                        )
+                        (block $label$258
+                         (if
+                          (i32.eq
+                           (local.get $7)
+                           (local.get $14)
+                          )
+                          (block
+                           (if
+                            (i32.eqz
+                             (i32.and
+                              (i32.load
+                               (local.get $0)
+                              )
+                              (i32.const 32)
+                             )
+                            )
+                            (drop
+                             (call $21
+                              (local.get $1)
+                              (i32.const 1)
+                              (local.get $0)
+                             )
+                            )
+                           )
+                           (local.set $1
+                            (i32.add
+                             (local.get $1)
+                             (i32.const 1)
+                            )
+                           )
+                           (br_if $label$258
+                            (i32.and
+                             (local.get $13)
+                             (i32.lt_s
+                              (local.get $5)
+                              (i32.const 1)
+                             )
+                            )
+                           )
+                           (br_if $label$258
+                            (i32.and
+                             (i32.load
+                              (local.get $0)
+                             )
+                             (i32.const 32)
+                            )
+                           )
+                           (drop
+                            (call $21
+                             (i32.const 2231)
+                             (i32.const 1)
+                             (local.get $0)
+                            )
+                           )
+                          )
+                          (block
+                           (br_if $label$258
+                            (i32.le_u
+                             (local.get $1)
+                             (local.get $19)
+                            )
+                           )
+                           (drop
+                            (call $46
+                             (local.get $19)
+                             (i32.const 48)
+                             (i32.add
+                              (local.get $1)
+                              (local.get $43)
+                             )
+                            )
+                           )
+                           (loop $label$262
+                            (br_if $label$262
+                             (i32.gt_u
+                              (local.tee $1
+                               (i32.add
+                                (local.get $1)
+                                (i32.const -1)
+                               )
+                              )
+                              (local.get $19)
+                             )
+                            )
+                           )
+                          )
+                         )
+                        )
+                        (local.set $6
+                         (i32.sub
+                          (local.get $41)
+                          (local.get $1)
+                         )
+                        )
+                        (if
+                         (i32.eqz
+                          (i32.and
+                           (i32.load
+                            (local.get $0)
+                           )
+                           (i32.const 32)
+                          )
+                         )
+                         (drop
+                          (call $21
+                           (local.get $1)
+                           (if (result i32)
+                            (i32.gt_s
+                             (local.get $5)
+                             (local.get $6)
+                            )
+                            (local.get $6)
+                            (local.get $5)
+                           )
+                           (local.get $0)
+                          )
+                         )
+                        )
+                        (br_if $label$256
+                         (i32.and
+                          (i32.lt_u
+                           (local.tee $7
+                            (i32.add
+                             (local.get $7)
+                             (i32.const 4)
+                            )
+                           )
+                           (local.get $8)
+                          )
+                          (i32.gt_s
+                           (local.tee $5
+                            (i32.sub
+                             (local.get $5)
+                             (local.get $6)
+                            )
+                           )
+                           (i32.const -1)
+                          )
+                         )
+                        )
+                        (local.set $1
+                         (local.get $5)
+                        )
+                       )
+                      )
+                     )
+                     (call $25
+                      (local.get $0)
+                      (i32.const 48)
+                      (i32.add
+                       (local.get $1)
+                       (i32.const 18)
+                      )
+                      (i32.const 18)
+                      (i32.const 0)
+                     )
+                     (br_if $label$231
+                      (i32.and
+                       (i32.load
+                        (local.get $0)
+                       )
+                       (i32.const 32)
+                      )
+                     )
+                     (drop
+                      (call $21
+                       (local.get $9)
+                       (i32.sub
+                        (local.get $28)
+                        (local.get $9)
+                       )
+                       (local.get $0)
+                      )
+                     )
+                    )
+                   )
+                  )
+                  (call $25
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (local.get $18)
+                   (i32.xor
+                    (local.get $12)
+                    (i32.const 8192)
+                   )
+                  )
+                  (if
+                   (i32.ge_s
+                    (local.get $18)
+                    (local.get $10)
+                   )
+                   (local.set $10
+                    (local.get $18)
+                   )
+                  )
+                 )
+                 (block
+                  (call $25
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (local.tee $8
+                    (i32.add
+                     (if (result i32)
+                      (local.tee $6
+                       (i32.or
+                        (f64.ne
+                         (local.get $52)
+                         (local.get $52)
+                        )
+                        (i32.const 0)
+                       )
+                      )
+                      (local.tee $24
+                       (i32.const 0)
+                      )
+                      (local.get $24)
+                     )
+                     (i32.const 3)
+                    )
+                   )
+                   (local.get $7)
+                  )
+                  (if
+                   (i32.eqz
+                    (i32.and
+                     (local.tee $1
+                      (i32.load
+                       (local.get $0)
+                      )
+                     )
+                     (i32.const 32)
+                    )
+                   )
+                   (block
+                    (drop
+                     (call $21
+                      (local.get $26)
+                      (local.get $24)
+                      (local.get $0)
+                     )
+                    )
+                    (local.set $1
+                     (i32.load
+                      (local.get $0)
+                     )
+                    )
+                   )
+                  )
+                  (local.set $7
+                   (if (result i32)
+                    (local.tee $5
+                     (i32.ne
+                      (i32.and
+                       (local.get $9)
+                       (i32.const 32)
+                      )
+                      (i32.const 0)
+                     )
+                    )
+                    (i32.const 2215)
+                    (i32.const 2219)
+                   )
+                  )
+                  (local.set $5
+                   (if (result i32)
+                    (local.get $5)
+                    (i32.const 2223)
+                    (i32.const 2227)
+                   )
+                  )
+                  (if
+                   (i32.eqz
+                    (local.get $6)
+                   )
+                   (local.set $5
+                    (local.get $7)
+                   )
+                  )
+                  (if
+                   (i32.eqz
+                    (i32.and
+                     (local.get $1)
+                     (i32.const 32)
+                    )
+                   )
+                   (drop
+                    (call $21
+                     (local.get $5)
+                     (i32.const 3)
+                     (local.get $0)
+                    )
+                   )
+                  )
+                  (call $25
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (local.get $8)
+                   (i32.xor
+                    (local.get $12)
+                    (i32.const 8192)
+                   )
+                  )
+                  (if
+                   (i32.ge_s
+                    (local.get $8)
+                    (local.get $10)
+                   )
+                   (local.set $10
+                    (local.get $8)
+                   )
+                  )
+                 )
+                )
+               )
+               (local.set $1
+                (local.get $11)
+               )
+               (br $label$4)
+              )
+              (local.set $7
+               (local.get $5)
+              )
+              (local.set $6
+               (i32.const 0)
+              )
+              (local.set $8
+               (i32.const 2179)
+              )
+              (local.set $5
+               (local.get $21)
+              )
+              (br $label$70)
+             )
+             (local.set $7
+              (i32.and
+               (local.get $9)
+               (i32.const 32)
+              )
+             )
+             (local.set $7
+              (if (result i32)
+               (i64.eq
+                (local.tee $50
+                 (i64.load
+                  (local.get $16)
+                 )
+                )
+                (i64.const 0)
+               )
+               (block (result i32)
+                (local.set $50
+                 (i64.const 0)
+                )
+                (local.get $21)
+               )
+               (block (result i32)
+                (local.set $1
+                 (local.get $21)
+                )
+                (loop $label$280
+                 (i32.store8
+                  (local.tee $1
+                   (i32.add
+                    (local.get $1)
+                    (i32.const -1)
+                   )
+                  )
+                  (i32.or
+                   (i32.load8_u
+                    (i32.add
+                     (i32.and
+                      (i32.wrap_i64
+                       (local.get $50)
+                      )
+                      (i32.const 15)
+                     )
+                     (i32.const 2163)
+                    )
+                   )
+                   (local.get $7)
+                  )
+                 )
+                 (br_if $label$280
+                  (i64.ne
+                   (local.tee $50
+                    (i64.shr_u
+                     (local.get $50)
+                     (i64.const 4)
+                    )
+                   )
+                   (i64.const 0)
+                  )
+                 )
+                )
+                (local.set $50
+                 (i64.load
+                  (local.get $16)
+                 )
+                )
+                (local.get $1)
+               )
+              )
+             )
+             (local.set $8
+              (i32.add
+               (i32.shr_s
+                (local.get $9)
+                (i32.const 4)
+               )
+               (i32.const 2179)
+              )
+             )
+             (if
+              (local.tee $1
+               (i32.or
+                (i32.eqz
+                 (i32.and
+                  (local.get $12)
+                  (i32.const 8)
+                 )
+                )
+                (i64.eq
+                 (local.get $50)
+                 (i64.const 0)
+                )
+               )
+              )
+              (local.set $8
+               (i32.const 2179)
+              )
+             )
+             (local.set $6
+              (if (result i32)
+               (local.get $1)
+               (i32.const 0)
+               (i32.const 2)
+              )
+             )
+             (br $label$71)
+            )
+            (local.set $7
+             (call $23
+              (local.get $50)
+              (local.get $21)
+             )
+            )
+            (br $label$71)
+           )
+           (local.set $14
+            (i32.eqz
+             (local.tee $13
+              (call $17
+               (local.get $1)
+               (i32.const 0)
+               (local.get $5)
+              )
+             )
+            )
+           )
+           (local.set $8
+            (i32.sub
+             (local.get $13)
+             (local.get $1)
+            )
+           )
+           (local.set $9
+            (i32.add
+             (local.get $1)
+             (local.get $5)
+            )
+           )
+           (local.set $12
+            (local.get $7)
+           )
+           (local.set $7
+            (if (result i32)
+             (local.get $14)
+             (local.get $5)
+             (local.get $8)
+            )
+           )
+           (local.set $6
+            (i32.const 0)
+           )
+           (local.set $8
+            (i32.const 2179)
+           )
+           (local.set $5
+            (if (result i32)
+             (local.get $14)
+             (local.get $9)
+             (local.get $13)
+            )
+           )
+           (br $label$70)
+          )
+          (local.set $1
+           (i32.const 0)
+          )
+          (local.set $5
+           (i32.const 0)
+          )
+          (local.set $8
+           (local.get $7)
+          )
+          (loop $label$288
+           (block $label$289
+            (br_if $label$289
+             (i32.eqz
+              (local.tee $9
+               (i32.load
+                (local.get $8)
+               )
+              )
+             )
+            )
+            (br_if $label$289
+             (i32.or
+              (i32.lt_s
+               (local.tee $5
+                (call $26
+                 (local.get $36)
+                 (local.get $9)
+                )
+               )
+               (i32.const 0)
+              )
+              (i32.gt_u
+               (local.get $5)
+               (i32.sub
+                (local.get $6)
+                (local.get $1)
+               )
+              )
+             )
+            )
+            (local.set $8
+             (i32.add
+              (local.get $8)
+              (i32.const 4)
+             )
+            )
+            (br_if $label$288
+             (i32.gt_u
+              (local.get $6)
+              (local.tee $1
+               (i32.add
+                (local.get $5)
+                (local.get $1)
+               )
+              )
+             )
+            )
+           )
+          )
+          (if
+           (i32.lt_s
+            (local.get $5)
+            (i32.const 0)
+           )
+           (block
+            (local.set $15
+             (i32.const -1)
+            )
+            (br $label$5)
+           )
+          )
+          (call $25
+           (local.get $0)
+           (i32.const 32)
+           (local.get $10)
+           (local.get $1)
+           (local.get $12)
+          )
+          (if
+           (local.get $1)
+           (block
+            (local.set $5
+             (i32.const 0)
+            )
+            (loop $label$292
+             (br_if $label$72
+              (i32.eqz
+               (local.tee $8
+                (i32.load
+                 (local.get $7)
+                )
+               )
+              )
+             )
+             (br_if $label$72
+              (i32.gt_s
+               (local.tee $5
+                (i32.add
+                 (local.tee $8
+                  (call $26
+                   (local.get $36)
+                   (local.get $8)
+                  )
+                 )
+                 (local.get $5)
+                )
+               )
+               (local.get $1)
+              )
+             )
+             (if
+              (i32.eqz
+               (i32.and
+                (i32.load
+                 (local.get $0)
+                )
+                (i32.const 32)
+               )
+              )
+              (drop
+               (call $21
+                (local.get $36)
+                (local.get $8)
+                (local.get $0)
+               )
+              )
+             )
+             (local.set $7
+              (i32.add
+               (local.get $7)
+               (i32.const 4)
+              )
+             )
+             (br_if $label$292
+              (i32.lt_u
+               (local.get $5)
+               (local.get $1)
+              )
+             )
+             (br $label$72)
+            )
+           )
+           (block
+            (local.set $1
+             (i32.const 0)
+            )
+            (br $label$72)
+           )
+          )
+         )
+         (call $25
+          (local.get $0)
+          (i32.const 32)
+          (local.get $10)
+          (local.get $1)
+          (i32.xor
+           (local.get $12)
+           (i32.const 8192)
+          )
+         )
+         (if
+          (i32.le_s
+           (local.get $10)
+           (local.get $1)
+          )
+          (local.set $10
+           (local.get $1)
+          )
+         )
+         (local.set $1
+          (local.get $11)
+         )
+         (br $label$4)
+        )
+        (local.set $1
+         (i32.and
+          (local.get $12)
+          (i32.const -65537)
+         )
+        )
+        (if
+         (i32.gt_s
+          (local.get $5)
+          (i32.const -1)
+         )
+         (local.set $12
+          (local.get $1)
+         )
+        )
+        (local.set $5
+         (if (result i32)
+          (i32.or
+           (local.get $5)
+           (local.tee $9
+            (i64.ne
+             (i64.load
+              (local.get $16)
+             )
+             (i64.const 0)
+            )
+           )
+          )
+          (block (result i32)
+           (local.set $1
+            (local.get $7)
+           )
+           (if
+            (i32.gt_s
+             (local.get $5)
+             (local.tee $7
+              (i32.add
+               (i32.xor
+                (i32.and
+                 (local.get $9)
+                 (i32.const 1)
+                )
+                (i32.const 1)
+               )
+               (i32.sub
+                (local.get $38)
+                (local.get $7)
+               )
+              )
+             )
+            )
+            (local.set $7
+             (local.get $5)
+            )
+           )
+           (local.get $21)
+          )
+          (block (result i32)
+           (local.set $1
+            (local.get $21)
+           )
+           (local.set $7
+            (i32.const 0)
+           )
+           (local.get $21)
+          )
+         )
+        )
+       )
+       (call $25
+        (local.get $0)
+        (i32.const 32)
+        (if (result i32)
+         (i32.lt_s
+          (local.get $10)
+          (local.tee $5
+           (i32.add
+            (if (result i32)
+             (i32.lt_s
+              (local.get $7)
+              (local.tee $9
+               (i32.sub
+                (local.get $5)
+                (local.get $1)
+               )
+              )
+             )
+             (local.tee $7
+              (local.get $9)
+             )
+             (local.get $7)
+            )
+            (local.get $6)
+           )
+          )
+         )
+         (local.tee $10
+          (local.get $5)
+         )
+         (local.get $10)
+        )
+        (local.get $5)
+        (local.get $12)
+       )
+       (if
+        (i32.eqz
+         (i32.and
+          (i32.load
+           (local.get $0)
+          )
+          (i32.const 32)
+         )
+        )
+        (drop
+         (call $21
+          (local.get $8)
+          (local.get $6)
+          (local.get $0)
+         )
+        )
+       )
+       (call $25
+        (local.get $0)
+        (i32.const 48)
+        (local.get $10)
+        (local.get $5)
+        (i32.xor
+         (local.get $12)
+         (i32.const 65536)
+        )
+       )
+       (call $25
+        (local.get $0)
+        (i32.const 48)
+        (local.get $7)
+        (local.get $9)
+        (i32.const 0)
+       )
+       (if
+        (i32.eqz
+         (i32.and
+          (i32.load
+           (local.get $0)
+          )
+          (i32.const 32)
+         )
+        )
+        (drop
+         (call $21
+          (local.get $1)
+          (local.get $9)
+          (local.get $0)
+         )
+        )
+       )
+       (call $25
+        (local.get $0)
+        (i32.const 32)
+        (local.get $10)
+        (local.get $5)
+        (i32.xor
+         (local.get $12)
+         (i32.const 8192)
+        )
+       )
+       (local.set $1
+        (local.get $11)
+       )
+       (br $label$4)
+      )
+     )
+     (br $label$2)
+    )
+    (if
+     (i32.eqz
+      (local.get $0)
+     )
+     (if
+      (local.get $17)
+      (block
+       (local.set $0
+        (i32.const 1)
+       )
+       (loop $label$308
+        (if
+         (local.tee $1
+          (i32.load
+           (i32.add
+            (local.get $4)
+            (i32.shl
+             (local.get $0)
+             (i32.const 2)
+            )
+           )
+          )
+         )
+         (block
+          (call $22
+           (i32.add
+            (local.get $3)
+            (i32.shl
+             (local.get $0)
+             (i32.const 3)
+            )
+           )
+           (local.get $1)
+           (local.get $2)
+          )
+          (br_if $label$308
+           (i32.lt_s
+            (local.tee $0
+             (i32.add
+              (local.get $0)
+              (i32.const 1)
+             )
+            )
+            (i32.const 10)
+           )
+          )
+          (local.set $15
+           (i32.const 1)
+          )
+          (br $label$2)
+         )
+        )
+       )
+       (loop $label$310
+        (if
+         (i32.load
+          (i32.add
+           (local.get $4)
+           (i32.shl
+            (local.get $0)
+            (i32.const 2)
+           )
+          )
+         )
+         (block
+          (local.set $15
+           (i32.const -1)
+          )
+          (br $label$2)
+         )
+        )
+        (br_if $label$310
+         (i32.lt_s
+          (local.tee $0
+           (i32.add
+            (local.get $0)
+            (i32.const 1)
+           )
+          )
+          (i32.const 10)
+         )
+        )
+        (local.set $15
+         (i32.const 1)
+        )
+       )
+      )
+      (local.set $15
+       (i32.const 0)
+      )
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $23)
+   )
+   (local.get $15)
   )
-  (func $16 (;29;) (type $3) (param $0 i32)
-    local.get $0
-    i32.load offset=68
-    i32.eqz
-    if ;; label = @1
-      local.get $0
-      call $13
-    end
+ )
+ (func $20 (; 33 ;) (type $2) (param $0 i32) (result i32)
+  (i32.const 0)
+ )
+ (func $21 (; 34 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (block $label$1 (result i32)
+   (block $label$2
+    (block $label$3
+     (br_if $label$3
+      (local.tee $3
+       (i32.load
+        (local.tee $4
+         (i32.add
+          (local.get $2)
+          (i32.const 16)
+         )
+        )
+       )
+      )
+     )
+     (if
+      (call $30
+       (local.get $2)
+      )
+      (local.set $3
+       (i32.const 0)
+      )
+      (block
+       (local.set $3
+        (i32.load
+         (local.get $4)
+        )
+       )
+       (br $label$3)
+      )
+     )
+     (br $label$2)
+    )
+    (if
+     (i32.lt_u
+      (i32.sub
+       (local.get $3)
+       (local.tee $4
+        (i32.load
+         (local.tee $5
+          (i32.add
+           (local.get $2)
+           (i32.const 20)
+          )
+         )
+        )
+       )
+      )
+      (local.get $1)
+     )
+     (block
+      (local.set $3
+       (call_indirect (type $0)
+        (local.get $2)
+        (local.get $0)
+        (local.get $1)
+        (i32.add
+         (i32.and
+          (i32.load offset=36
+           (local.get $2)
+          )
+          (i32.const 3)
+         )
+         (i32.const 2)
+        )
+       )
+      )
+      (br $label$2)
+     )
+    )
+    (local.set $2
+     (block $label$7 (result i32)
+      (if (result i32)
+       (i32.gt_s
+        (i32.load8_s offset=75
+         (local.get $2)
+        )
+        (i32.const -1)
+       )
+       (block (result i32)
+        (local.set $3
+         (local.get $1)
+        )
+        (loop $label$9
+         (drop
+          (br_if $label$7
+           (i32.const 0)
+           (i32.eqz
+            (local.get $3)
+           )
+          )
+         )
+         (if
+          (i32.ne
+           (i32.load8_s
+            (i32.add
+             (local.get $0)
+             (local.tee $6
+              (i32.add
+               (local.get $3)
+               (i32.const -1)
+              )
+             )
+            )
+           )
+           (i32.const 10)
+          )
+          (block
+           (local.set $3
+            (local.get $6)
+           )
+           (br $label$9)
+          )
+         )
+        )
+        (br_if $label$2
+         (i32.lt_u
+          (call_indirect (type $0)
+           (local.get $2)
+           (local.get $0)
+           (local.get $3)
+           (i32.add
+            (i32.and
+             (i32.load offset=36
+              (local.get $2)
+             )
+             (i32.const 3)
+            )
+            (i32.const 2)
+           )
+          )
+          (local.get $3)
+         )
+        )
+        (local.set $4
+         (i32.load
+          (local.get $5)
+         )
+        )
+        (local.set $1
+         (i32.sub
+          (local.get $1)
+          (local.get $3)
+         )
+        )
+        (local.set $0
+         (i32.add
+          (local.get $0)
+          (local.get $3)
+         )
+        )
+        (local.get $3)
+       )
+       (i32.const 0)
+      )
+     )
+    )
+    (drop
+     (call $47
+      (local.get $4)
+      (local.get $0)
+      (local.get $1)
+     )
+    )
+    (i32.store
+     (local.get $5)
+     (i32.add
+      (i32.load
+       (local.get $5)
+      )
+      (local.get $1)
+     )
+    )
+    (local.set $3
+     (i32.add
+      (local.get $2)
+      (local.get $1)
+     )
+    )
+   )
+   (local.get $3)
   )
-  (func $17 (;30;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $1
-      i32.const 255
-      i32.and
-      local.set $5
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            local.get $2
-            i32.const 0
-            i32.ne
-            local.tee $4
-            local.get $0
-            i32.const 3
-            i32.and
-            i32.const 0
-            i32.ne
-            i32.and
-            if ;; label = @5
-              block ;; label = @6
-                local.get $1
-                i32.const 255
-                i32.and
-                local.set $4
-                local.get $2
-                local.set $3
-                local.get $0
-                local.set $2
-                loop $label$6 ;; label = @7
-                  local.get $2
-                  i32.load8_s
-                  local.get $4
-                  i32.const 24
-                  i32.shl
-                  i32.const 24
-                  i32.shr_s
-                  i32.eq
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $3
-                      local.set $0
-                      br 6 (;@3;)
-                    end
-                  end
-                  local.get $3
-                  i32.const -1
-                  i32.add
-                  local.tee $3
-                  i32.const 0
-                  i32.ne
-                  local.tee $0
-                  local.get $2
-                  i32.const 1
-                  i32.add
-                  local.tee $2
-                  i32.const 3
-                  i32.and
-                  i32.const 0
-                  i32.ne
-                  i32.and
-                  br_if 0 (;@7;)
-                  br 3 (;@4;)
-                end
-              end
-            else
-              block ;; label = @6
-                local.get $2
-                local.set $3
-                local.get $0
-                local.set $2
-                local.get $4
-                local.set $0
-              end
-            end
-          end
-          local.get $0
-          if ;; label = @4
-            block ;; label = @5
-              local.get $3
-              local.set $0
-              br 2 (;@3;)
-            end
-          else
-            i32.const 0
-            local.set $0
-          end
-          br 1 (;@2;)
-        end
-        local.get $2
-        i32.load8_s
-        local.get $1
-        i32.const 255
-        i32.and
-        local.tee $1
-        i32.const 24
-        i32.shl
-        i32.const 24
-        i32.shr_s
-        i32.ne
-        if ;; label = @3
-          block ;; label = @4
-            local.get $5
-            i32.const 16843009
-            i32.mul
-            local.set $3
-            block $label$12 ;; label = @5
-              block $label$13 ;; label = @6
-                local.get $0
-                i32.const 3
-                i32.le_u
-                br_if 0 (;@6;)
-                loop $label$14 ;; label = @7
-                  local.get $2
-                  i32.load
-                  local.get $3
-                  i32.xor
-                  local.tee $4
-                  i32.const -2139062144
-                  i32.and
-                  i32.const -2139062144
-                  i32.xor
-                  local.get $4
-                  i32.const -16843009
-                  i32.add
-                  i32.and
-                  i32.eqz
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $2
-                      i32.const 4
-                      i32.add
-                      local.set $2
-                      local.get $0
-                      i32.const -4
-                      i32.add
-                      local.tee $0
-                      i32.const 3
-                      i32.gt_u
-                      br_if 2 (;@7;)
-                      br 3 (;@6;)
-                    end
-                  end
-                end
-                br 1 (;@5;)
-              end
-              local.get $0
-              i32.eqz
-              if ;; label = @6
-                block ;; label = @7
-                  i32.const 0
-                  local.set $0
-                  br 5 (;@2;)
-                end
-              end
-            end
-            loop $label$17 ;; label = @5
-              local.get $2
-              i32.load8_s
-              local.get $1
-              i32.const 24
-              i32.shl
-              i32.const 24
-              i32.shr_s
-              i32.eq
-              br_if 3 (;@2;)
-              local.get $2
-              i32.const 1
-              i32.add
-              local.set $2
-              local.get $0
-              i32.const -1
-              i32.add
-              local.tee $0
-              br_if 0 (;@5;)
-              i32.const 0
-              local.set $0
-            end
-          end
-        end
-      end
-      local.get $0
-      if (result i32) ;; label = @2
-        local.get $2
-      else
-        i32.const 0
-      end
-    end
+ )
+ (func $22 (; 35 ;) (type $8) (param $0 i32) (param $1 i32) (param $2 i32)
+  (local $3 i32)
+  (local $4 i64)
+  (local $5 f64)
+  (block $label$1
+   (if
+    (i32.le_u
+     (local.get $1)
+     (i32.const 20)
+    )
+    (block $label$3
+     (block $label$4
+      (block $label$5
+       (block $label$6
+        (block $label$7
+         (block $label$8
+          (block $label$9
+           (block $label$10
+            (block $label$11
+             (block $label$12
+              (block $label$13
+               (br_table $label$13 $label$12 $label$11 $label$10 $label$9 $label$8 $label$7 $label$6 $label$5 $label$4 $label$3
+                (i32.sub
+                 (local.get $1)
+                 (i32.const 9)
+                )
+               )
+              )
+              (local.set $3
+               (i32.load
+                (local.tee $1
+                 (i32.and
+                  (i32.add
+                   (i32.load
+                    (local.get $2)
+                   )
+                   (i32.const 3)
+                  )
+                  (i32.const -4)
+                 )
+                )
+               )
+              )
+              (i32.store
+               (local.get $2)
+               (i32.add
+                (local.get $1)
+                (i32.const 4)
+               )
+              )
+              (i32.store
+               (local.get $0)
+               (local.get $3)
+              )
+              (br $label$1)
+             )
+             (local.set $3
+              (i32.load
+               (local.tee $1
+                (i32.and
+                 (i32.add
+                  (i32.load
+                   (local.get $2)
+                  )
+                  (i32.const 3)
+                 )
+                 (i32.const -4)
+                )
+               )
+              )
+             )
+             (i32.store
+              (local.get $2)
+              (i32.add
+               (local.get $1)
+               (i32.const 4)
+              )
+             )
+             (i64.store
+              (local.get $0)
+              (i64.extend_i32_s
+               (local.get $3)
+              )
+             )
+             (br $label$1)
+            )
+            (local.set $3
+             (i32.load
+              (local.tee $1
+               (i32.and
+                (i32.add
+                 (i32.load
+                  (local.get $2)
+                 )
+                 (i32.const 3)
+                )
+                (i32.const -4)
+               )
+              )
+             )
+            )
+            (i32.store
+             (local.get $2)
+             (i32.add
+              (local.get $1)
+              (i32.const 4)
+             )
+            )
+            (i64.store
+             (local.get $0)
+             (i64.extend_i32_u
+              (local.get $3)
+             )
+            )
+            (br $label$1)
+           )
+           (local.set $4
+            (i64.load
+             (local.tee $1
+              (i32.and
+               (i32.add
+                (i32.load
+                 (local.get $2)
+                )
+                (i32.const 7)
+               )
+               (i32.const -8)
+              )
+             )
+            )
+           )
+           (i32.store
+            (local.get $2)
+            (i32.add
+             (local.get $1)
+             (i32.const 8)
+            )
+           )
+           (i64.store
+            (local.get $0)
+            (local.get $4)
+           )
+           (br $label$1)
+          )
+          (local.set $3
+           (i32.load
+            (local.tee $1
+             (i32.and
+              (i32.add
+               (i32.load
+                (local.get $2)
+               )
+               (i32.const 3)
+              )
+              (i32.const -4)
+             )
+            )
+           )
+          )
+          (i32.store
+           (local.get $2)
+           (i32.add
+            (local.get $1)
+            (i32.const 4)
+           )
+          )
+          (i64.store
+           (local.get $0)
+           (i64.extend_i32_s
+            (i32.shr_s
+             (i32.shl
+              (i32.and
+               (local.get $3)
+               (i32.const 65535)
+              )
+              (i32.const 16)
+             )
+             (i32.const 16)
+            )
+           )
+          )
+          (br $label$1)
+         )
+         (local.set $3
+          (i32.load
+           (local.tee $1
+            (i32.and
+             (i32.add
+              (i32.load
+               (local.get $2)
+              )
+              (i32.const 3)
+             )
+             (i32.const -4)
+            )
+           )
+          )
+         )
+         (i32.store
+          (local.get $2)
+          (i32.add
+           (local.get $1)
+           (i32.const 4)
+          )
+         )
+         (i64.store
+          (local.get $0)
+          (i64.extend_i32_u
+           (i32.and
+            (local.get $3)
+            (i32.const 65535)
+           )
+          )
+         )
+         (br $label$1)
+        )
+        (local.set $3
+         (i32.load
+          (local.tee $1
+           (i32.and
+            (i32.add
+             (i32.load
+              (local.get $2)
+             )
+             (i32.const 3)
+            )
+            (i32.const -4)
+           )
+          )
+         )
+        )
+        (i32.store
+         (local.get $2)
+         (i32.add
+          (local.get $1)
+          (i32.const 4)
+         )
+        )
+        (i64.store
+         (local.get $0)
+         (i64.extend_i32_s
+          (i32.shr_s
+           (i32.shl
+            (i32.and
+             (local.get $3)
+             (i32.const 255)
+            )
+            (i32.const 24)
+           )
+           (i32.const 24)
+          )
+         )
+        )
+        (br $label$1)
+       )
+       (local.set $3
+        (i32.load
+         (local.tee $1
+          (i32.and
+           (i32.add
+            (i32.load
+             (local.get $2)
+            )
+            (i32.const 3)
+           )
+           (i32.const -4)
+          )
+         )
+        )
+       )
+       (i32.store
+        (local.get $2)
+        (i32.add
+         (local.get $1)
+         (i32.const 4)
+        )
+       )
+       (i64.store
+        (local.get $0)
+        (i64.extend_i32_u
+         (i32.and
+          (local.get $3)
+          (i32.const 255)
+         )
+        )
+       )
+       (br $label$1)
+      )
+      (local.set $5
+       (f64.load
+        (local.tee $1
+         (i32.and
+          (i32.add
+           (i32.load
+            (local.get $2)
+           )
+           (i32.const 7)
+          )
+          (i32.const -8)
+         )
+        )
+       )
+      )
+      (i32.store
+       (local.get $2)
+       (i32.add
+        (local.get $1)
+        (i32.const 8)
+       )
+      )
+      (f64.store
+       (local.get $0)
+       (local.get $5)
+      )
+      (br $label$1)
+     )
+     (local.set $5
+      (f64.load
+       (local.tee $1
+        (i32.and
+         (i32.add
+          (i32.load
+           (local.get $2)
+          )
+          (i32.const 7)
+         )
+         (i32.const -8)
+        )
+       )
+      )
+     )
+     (i32.store
+      (local.get $2)
+      (i32.add
+       (local.get $1)
+       (i32.const 8)
+      )
+     )
+     (f64.store
+      (local.get $0)
+      (local.get $5)
+     )
+    )
+   )
   )
-  (func $18 (;31;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $4
-      global.get $global$1
-      i32.const 224
-      i32.add
-      global.set $global$1
-      local.get $4
-      i32.const 136
-      i32.add
-      local.set $5
-      local.get $4
-      i32.const 80
-      i32.add
-      local.tee $3
-      i64.const 0
-      i64.store align=4
-      local.get $3
-      i64.const 0
-      i64.store offset=8 align=4
-      local.get $3
-      i64.const 0
-      i64.store offset=16 align=4
-      local.get $3
-      i64.const 0
-      i64.store offset=24 align=4
-      local.get $3
-      i64.const 0
-      i64.store offset=32 align=4
-      local.get $4
-      i32.const 120
-      i32.add
-      local.tee $6
-      local.get $2
-      i32.load
-      i32.store
-      i32.const 0
-      local.get $1
-      local.get $6
-      local.get $4
-      local.tee $2
-      local.get $3
-      call $19
-      i32.const 0
-      i32.lt_s
-      if ;; label = @2
-        i32.const -1
-        local.set $1
-      else
-        block ;; label = @3
-          local.get $0
-          i32.load offset=76
-          i32.const -1
-          i32.gt_s
-          if (result i32) ;; label = @4
-            local.get $0
-            call $20
-          else
-            i32.const 0
-          end
-          local.set $12
-          local.get $0
-          i32.load
-          local.set $7
-          local.get $0
-          i32.load8_s offset=74
-          i32.const 1
-          i32.lt_s
-          if ;; label = @4
-            local.get $0
-            local.get $7
-            i32.const -33
-            i32.and
-            i32.store
-          end
-          local.get $0
-          i32.const 48
-          i32.add
-          local.tee $8
-          i32.load
-          if ;; label = @4
-            local.get $0
-            local.get $1
-            local.get $6
-            local.get $2
-            local.get $3
-            call $19
-            local.set $1
-          else
-            block ;; label = @5
-              local.get $0
-              i32.const 44
-              i32.add
-              local.tee $9
-              i32.load
-              local.set $10
-              local.get $9
-              local.get $5
-              i32.store
-              local.get $0
-              i32.const 28
-              i32.add
-              local.tee $13
-              local.get $5
-              i32.store
-              local.get $0
-              i32.const 20
-              i32.add
-              local.tee $11
-              local.get $5
-              i32.store
-              local.get $8
-              i32.const 80
-              i32.store
-              local.get $0
-              i32.const 16
-              i32.add
-              local.tee $14
-              local.get $5
-              i32.const 80
-              i32.add
-              i32.store
-              local.get $0
-              local.get $1
-              local.get $6
-              local.get $2
-              local.get $3
-              call $19
-              local.set $1
-              local.get $10
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $0
-                  i32.const 0
-                  i32.const 0
-                  local.get $0
-                  i32.load offset=36
-                  i32.const 3
-                  i32.and
-                  i32.const 2
-                  i32.add
-                  call_indirect (type $0)
-                  drop
-                  local.get $11
-                  i32.load
-                  i32.eqz
-                  if ;; label = @8
-                    i32.const -1
-                    local.set $1
-                  end
-                  local.get $9
-                  local.get $10
-                  i32.store
-                  local.get $8
-                  i32.const 0
-                  i32.store
-                  local.get $14
-                  i32.const 0
-                  i32.store
-                  local.get $13
-                  i32.const 0
-                  i32.store
-                  local.get $11
-                  i32.const 0
-                  i32.store
-                end
-              end
-            end
-          end
-          local.get $0
-          local.get $0
-          i32.load
-          local.tee $2
-          local.get $7
-          i32.const 32
-          i32.and
-          i32.or
-          i32.store
-          local.get $12
-          if ;; label = @4
-            local.get $0
-            call $13
-          end
-          local.get $2
-          i32.const 32
-          i32.and
-          if ;; label = @4
-            i32.const -1
-            local.set $1
-          end
-        end
-      end
-      local.get $4
-      global.set $global$1
-      local.get $1
-    end
+ )
+ (func $23 (; 36 ;) (type $9) (param $0 i64) (param $1 i32) (result i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i64)
+  (block $label$1 (result i32)
+   (local.set $2
+    (i32.wrap_i64
+     (local.get $0)
+    )
+   )
+   (if
+    (i64.gt_u
+     (local.get $0)
+     (i64.const 4294967295)
+    )
+    (block
+     (loop $label$3
+      (i64.store8
+       (local.tee $1
+        (i32.add
+         (local.get $1)
+         (i32.const -1)
+        )
+       )
+       (i64.or
+        (i64.rem_u
+         (local.get $0)
+         (i64.const 10)
+        )
+        (i64.const 48)
+       )
+      )
+      (local.set $4
+       (i64.div_u
+        (local.get $0)
+        (i64.const 10)
+       )
+      )
+      (if
+       (i64.gt_u
+        (local.get $0)
+        (i64.const 42949672959)
+       )
+       (block
+        (local.set $0
+         (local.get $4)
+        )
+        (br $label$3)
+       )
+      )
+     )
+     (local.set $2
+      (i32.wrap_i64
+       (local.get $4)
+      )
+     )
+    )
+   )
+   (if
+    (local.get $2)
+    (loop $label$6
+     (i32.store8
+      (local.tee $1
+       (i32.add
+        (local.get $1)
+        (i32.const -1)
+       )
+      )
+      (i32.or
+       (i32.rem_u
+        (local.get $2)
+        (i32.const 10)
+       )
+       (i32.const 48)
+      )
+     )
+     (local.set $3
+      (i32.div_u
+       (local.get $2)
+       (i32.const 10)
+      )
+     )
+     (if
+      (i32.ge_u
+       (local.get $2)
+       (i32.const 10)
+      )
+      (block
+       (local.set $2
+        (local.get $3)
+       )
+       (br $label$6)
+      )
+     )
+    )
+   )
+   (local.get $1)
   )
-  (func $19 (;32;) (type $7) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (result i32)
-    (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32) (local $15 i32) (local $16 i32) (local $17 i32) (local $18 i32) (local $19 i32) (local $20 i32) (local $21 i32) (local $22 i32) (local $23 i32) (local $24 i32) (local $25 i32) (local $26 i32) (local $27 i32) (local $28 i32) (local $29 i32) (local $30 i32) (local $31 i32) (local $32 i32) (local $33 i32) (local $34 i32) (local $35 i32) (local $36 i32) (local $37 i32) (local $38 i32) (local $39 i32) (local $40 i32) (local $41 i32) (local $42 i32) (local $43 i32) (local $44 i32) (local $45 i32) (local $46 i32) (local $47 i32) (local $48 i32) (local $49 i32) (local $50 i64) (local $51 i64) (local $52 f64) (local $53 f64)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $23
-      global.get $global$1
-      i32.const 624
-      i32.add
-      global.set $global$1
-      local.get $23
-      i32.const 16
-      i32.add
-      local.set $20
-      local.get $23
-      local.set $16
-      local.get $23
-      i32.const 528
-      i32.add
-      local.set $36
-      local.get $0
-      i32.const 0
-      i32.ne
-      local.set $30
-      local.get $23
-      i32.const 536
-      i32.add
-      local.tee $17
-      i32.const 40
-      i32.add
-      local.tee $21
-      local.set $38
-      local.get $17
-      i32.const 39
-      i32.add
-      local.set $39
-      local.get $23
-      i32.const 8
-      i32.add
-      local.tee $37
-      i32.const 4
-      i32.add
-      local.set $42
-      i32.const 0
-      local.get $23
-      i32.const 588
-      i32.add
-      local.tee $19
-      local.tee $27
-      i32.sub
-      local.set $43
-      local.get $23
-      i32.const 576
-      i32.add
-      local.tee $17
-      i32.const 12
-      i32.add
-      local.set $33
-      local.get $17
-      i32.const 11
-      i32.add
-      local.set $40
-      local.get $33
-      local.tee $28
-      local.get $27
-      i32.sub
-      local.set $44
-      i32.const -2
-      local.get $27
-      i32.sub
-      local.set $45
-      local.get $28
-      i32.const 2
-      i32.add
-      local.set $46
-      local.get $23
-      i32.const 24
-      i32.add
-      local.tee $47
-      i32.const 288
-      i32.add
-      local.set $48
-      local.get $19
-      i32.const 9
-      i32.add
-      local.tee $31
-      local.set $41
-      local.get $19
-      i32.const 8
-      i32.add
-      local.set $34
-      i32.const 0
-      local.set $15
-      i32.const 0
-      local.set $10
-      i32.const 0
-      local.set $17
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          loop $label$4 ;; label = @4
-            block $label$5 ;; label = @5
-              local.get $15
-              i32.const -1
-              i32.gt_s
-              if ;; label = @6
-                local.get $10
-                i32.const 2147483647
-                local.get $15
-                i32.sub
-                i32.gt_s
-                if (result i32) ;; label = @7
-                  block (result i32) ;; label = @8
-                    call $12
-                    i32.const 75
-                    i32.store
-                    i32.const -1
-                  end
-                else
-                  local.get $10
-                  local.get $15
-                  i32.add
-                end
-                local.set $15
-              end
-              local.get $1
-              i32.load8_s
-              local.tee $5
-              i32.const 24
-              i32.shl
-              i32.const 24
-              i32.shr_s
-              i32.eqz
-              br_if 2 (;@3;)
-              local.get $1
-              local.set $11
-              block $label$9 ;; label = @6
-                block $label$10 ;; label = @7
-                  loop $label$11 ;; label = @8
-                    block $label$12 ;; label = @9
-                      block $label$13 ;; label = @10
-                        block $label$14 ;; label = @11
-                          block $label$15 ;; label = @12
-                            local.get $5
-                            i32.const 24
-                            i32.shl
-                            i32.const 24
-                            i32.shr_s
-                            i32.const 0
-                            i32.sub
-                            br_table 1 (;@11;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 0 (;@12;) 2 (;@10;)
-                          end
-                          local.get $11
-                          local.set $5
-                          br 4 (;@7;)
-                        end
-                        local.get $11
-                        local.set $5
-                        br 1 (;@9;)
-                      end
-                      local.get $11
-                      i32.const 1
-                      i32.add
-                      local.tee $11
-                      i32.load8_s
-                      local.set $5
-                      br 1 (;@8;)
-                    end
-                  end
-                  br 1 (;@6;)
-                end
-                loop $label$16 ;; label = @7
-                  local.get $5
-                  i32.load8_s offset=1
-                  i32.const 37
-                  i32.ne
-                  br_if 1 (;@6;)
-                  local.get $11
-                  i32.const 1
-                  i32.add
-                  local.set $11
-                  local.get $5
-                  i32.const 2
-                  i32.add
-                  local.tee $5
-                  i32.load8_s
-                  i32.const 37
-                  i32.eq
-                  br_if 0 (;@7;)
-                end
-              end
-              local.get $11
-              local.get $1
-              i32.sub
-              local.set $10
-              local.get $30
-              if ;; label = @6
-                local.get $0
-                i32.load
-                i32.const 32
-                i32.and
-                i32.eqz
-                if ;; label = @7
-                  local.get $1
-                  local.get $10
-                  local.get $0
-                  call $21
-                  drop
-                end
-              end
-              local.get $10
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $5
-                  local.set $1
-                  br 3 (;@4;)
-                end
-              end
-              local.get $5
-              i32.const 1
-              i32.add
-              local.tee $11
-              i32.load8_s
-              local.tee $10
-              i32.const 24
-              i32.shl
-              i32.const 24
-              i32.shr_s
-              i32.const -48
-              i32.add
-              local.tee $9
-              i32.const 10
-              i32.lt_u
-              if (result i32) ;; label = @6
-                block (result i32) ;; label = @7
-                  local.get $5
-                  i32.const 3
-                  i32.add
-                  local.set $10
-                  local.get $5
-                  i32.load8_s offset=2
-                  i32.const 36
-                  i32.eq
-                  local.tee $12
-                  if ;; label = @8
-                    local.get $10
-                    local.set $11
-                  end
-                  local.get $12
-                  if ;; label = @8
-                    i32.const 1
-                    local.set $17
-                  end
-                  local.get $11
-                  i32.load8_s
-                  local.set $5
-                  local.get $12
-                  i32.eqz
-                  if ;; label = @8
-                    i32.const -1
-                    local.set $9
-                  end
-                  local.get $17
-                end
-              else
-                block (result i32) ;; label = @7
-                  local.get $10
-                  local.set $5
-                  i32.const -1
-                  local.set $9
-                  local.get $17
-                end
-              end
-              local.set $10
-              block $label$25 ;; label = @6
-                local.get $5
-                i32.const 24
-                i32.shl
-                i32.const 24
-                i32.shr_s
-                i32.const -32
-                i32.add
-                local.tee $12
-                i32.const 32
-                i32.lt_u
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const 0
-                    local.set $17
-                    loop $label$27 ;; label = @9
-                      i32.const 1
-                      local.get $12
-                      i32.shl
-                      i32.const 75913
-                      i32.and
-                      i32.eqz
-                      br_if 3 (;@6;)
-                      i32.const 1
-                      local.get $5
-                      i32.const 24
-                      i32.shl
-                      i32.const 24
-                      i32.shr_s
-                      i32.const -32
-                      i32.add
-                      i32.shl
-                      local.get $17
-                      i32.or
-                      local.set $17
-                      local.get $11
-                      i32.const 1
-                      i32.add
-                      local.tee $11
-                      i32.load8_s
-                      local.tee $5
-                      i32.const 24
-                      i32.shl
-                      i32.const 24
-                      i32.shr_s
-                      i32.const -32
-                      i32.add
-                      local.tee $12
-                      i32.const 32
-                      i32.lt_u
-                      br_if 0 (;@9;)
-                    end
-                  end
-                else
-                  i32.const 0
-                  local.set $17
-                end
-              end
-              block $label$29 ;; label = @6
-                local.get $5
-                i32.const 24
-                i32.shl
-                i32.const 24
-                i32.shr_s
-                i32.const 42
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    block $label$31 (result i32) ;; label = @9
-                      block $label$32 ;; label = @10
-                        local.get $11
-                        i32.const 1
-                        i32.add
-                        local.tee $7
-                        i32.load8_s
-                        local.tee $5
-                        i32.const 24
-                        i32.shl
-                        i32.const 24
-                        i32.shr_s
-                        i32.const -48
-                        i32.add
-                        local.tee $12
-                        i32.const 10
-                        i32.ge_u
-                        br_if 0 (;@10;)
-                        local.get $11
-                        i32.load8_s offset=2
-                        i32.const 36
-                        i32.ne
-                        br_if 0 (;@10;)
-                        local.get $4
-                        local.get $12
-                        i32.const 2
-                        i32.shl
-                        i32.add
-                        i32.const 10
-                        i32.store
-                        i32.const 1
-                        local.set $8
-                        local.get $3
-                        local.get $7
-                        i32.load8_s
-                        i32.const -48
-                        i32.add
-                        i32.const 3
-                        i32.shl
-                        i32.add
-                        i64.load
-                        i32.wrap_i64
-                        local.set $10
-                        local.get $11
-                        i32.const 3
-                        i32.add
-                        br 1 (;@9;)
-                      end
-                      local.get $10
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const -1
-                          local.set $15
-                          br 6 (;@5;)
-                        end
-                      end
-                      local.get $30
-                      i32.eqz
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $17
-                          local.set $12
-                          i32.const 0
-                          local.set $17
-                          local.get $7
-                          local.set $11
-                          i32.const 0
-                          local.set $10
-                          br 5 (;@6;)
-                        end
-                      end
-                      local.get $2
-                      i32.load
-                      i32.const 3
-                      i32.add
-                      i32.const -4
-                      i32.and
-                      local.tee $11
-                      i32.load
-                      local.set $10
-                      local.get $2
-                      local.get $11
-                      i32.const 4
-                      i32.add
-                      i32.store
-                      i32.const 0
-                      local.set $8
-                      local.get $7
-                    end
-                    local.set $11
-                    local.get $17
-                    i32.const 8192
-                    i32.or
-                    local.set $12
-                    i32.const 0
-                    local.get $10
-                    i32.sub
-                    local.set $7
-                    local.get $11
-                    i32.load8_s
-                    local.set $5
-                    local.get $10
-                    i32.const 0
-                    i32.lt_s
-                    local.tee $6
-                    i32.eqz
-                    if ;; label = @9
-                      local.get $17
-                      local.set $12
-                    end
-                    local.get $8
-                    local.set $17
-                    local.get $6
-                    if ;; label = @9
-                      local.get $7
-                      local.set $10
-                    end
-                  end
-                else
-                  local.get $5
-                  i32.const 24
-                  i32.shl
-                  i32.const 24
-                  i32.shr_s
-                  i32.const -48
-                  i32.add
-                  local.tee $12
-                  i32.const 10
-                  i32.lt_u
-                  if ;; label = @8
-                    block ;; label = @9
-                      i32.const 0
-                      local.set $7
-                      local.get $12
-                      local.set $5
-                      loop $label$39 ;; label = @10
-                        local.get $7
-                        i32.const 10
-                        i32.mul
-                        local.get $5
-                        i32.add
-                        local.set $7
-                        local.get $11
-                        i32.const 1
-                        i32.add
-                        local.tee $11
-                        i32.load8_s
-                        local.tee $12
-                        i32.const 24
-                        i32.shl
-                        i32.const 24
-                        i32.shr_s
-                        i32.const -48
-                        i32.add
-                        local.tee $5
-                        i32.const 10
-                        i32.lt_u
-                        br_if 0 (;@10;)
-                      end
-                      local.get $7
-                      i32.const 0
-                      i32.lt_s
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const -1
-                          local.set $15
-                          br 6 (;@5;)
-                        end
-                      else
-                        block ;; label = @11
-                          local.get $12
-                          local.set $5
-                          local.get $17
-                          local.set $12
-                          local.get $10
-                          local.set $17
-                          local.get $7
-                          local.set $10
-                        end
-                      end
-                    end
-                  else
-                    block ;; label = @9
-                      local.get $17
-                      local.set $12
-                      local.get $10
-                      local.set $17
-                      i32.const 0
-                      local.set $10
-                    end
-                  end
-                end
-              end
-              block $label$43 ;; label = @6
-                local.get $5
-                i32.const 24
-                i32.shl
-                i32.const 24
-                i32.shr_s
-                i32.const 46
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $11
-                    i32.const 1
-                    i32.add
-                    local.tee $7
-                    i32.load8_s
-                    local.tee $5
-                    i32.const 24
-                    i32.shl
-                    i32.const 24
-                    i32.shr_s
-                    i32.const 42
-                    i32.ne
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $5
-                        i32.const 24
-                        i32.shl
-                        i32.const 24
-                        i32.shr_s
-                        i32.const -48
-                        i32.add
-                        local.tee $5
-                        i32.const 10
-                        i32.lt_u
-                        if ;; label = @11
-                          block ;; label = @12
-                            local.get $7
-                            local.set $11
-                            i32.const 0
-                            local.set $7
-                          end
-                        else
-                          block ;; label = @12
-                            i32.const 0
-                            local.set $5
-                            local.get $7
-                            local.set $11
-                            br 6 (;@6;)
-                          end
-                        end
-                        loop $label$48 ;; label = @11
-                          local.get $7
-                          i32.const 10
-                          i32.mul
-                          local.get $5
-                          i32.add
-                          local.set $5
-                          local.get $11
-                          i32.const 1
-                          i32.add
-                          local.tee $11
-                          i32.load8_s
-                          i32.const -48
-                          i32.add
-                          local.tee $8
-                          i32.const 10
-                          i32.ge_u
-                          br_if 5 (;@6;)
-                          local.get $5
-                          local.set $7
-                          local.get $8
-                          local.set $5
-                          br 0 (;@11;)
-                        end
-                      end
-                    end
-                    local.get $11
-                    i32.const 2
-                    i32.add
-                    local.tee $7
-                    i32.load8_s
-                    i32.const -48
-                    i32.add
-                    local.tee $5
-                    i32.const 10
-                    i32.lt_u
-                    if ;; label = @9
-                      local.get $11
-                      i32.load8_s offset=3
-                      i32.const 36
-                      i32.eq
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $4
-                          local.get $5
-                          i32.const 2
-                          i32.shl
-                          i32.add
-                          i32.const 10
-                          i32.store
-                          local.get $3
-                          local.get $7
-                          i32.load8_s
-                          i32.const -48
-                          i32.add
-                          i32.const 3
-                          i32.shl
-                          i32.add
-                          i64.load
-                          i32.wrap_i64
-                          local.set $5
-                          local.get $11
-                          i32.const 4
-                          i32.add
-                          local.set $11
-                          br 5 (;@6;)
-                        end
-                      end
-                    end
-                    local.get $17
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const -1
-                        local.set $15
-                        br 5 (;@5;)
-                      end
-                    end
-                    local.get $30
-                    if (result i32) ;; label = @9
-                      block (result i32) ;; label = @10
-                        local.get $2
-                        i32.load
-                        i32.const 3
-                        i32.add
-                        i32.const -4
-                        i32.and
-                        local.tee $11
-                        i32.load
-                        local.set $5
-                        local.get $2
-                        local.get $11
-                        i32.const 4
-                        i32.add
-                        i32.store
-                        local.get $7
-                      end
-                    else
-                      block (result i32) ;; label = @10
-                        i32.const 0
-                        local.set $5
-                        local.get $7
-                      end
-                    end
-                    local.set $11
-                  end
-                else
-                  i32.const -1
-                  local.set $5
-                end
-              end
-              local.get $11
-              local.set $7
-              i32.const 0
-              local.set $8
-              loop $label$55 ;; label = @6
-                local.get $7
-                i32.load8_s
-                i32.const -65
-                i32.add
-                local.tee $6
-                i32.const 57
-                i32.gt_u
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const -1
-                    local.set $15
-                    br 3 (;@5;)
-                  end
-                end
-                local.get $7
-                i32.const 1
-                i32.add
-                local.set $11
-                local.get $8
-                i32.const 58
-                i32.mul
-                i32.const 1699
-                i32.add
-                local.get $6
-                i32.add
-                i32.load8_s
-                local.tee $13
-                i32.const 255
-                i32.and
-                local.tee $6
-                i32.const -1
-                i32.add
-                i32.const 8
-                i32.lt_u
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $11
-                    local.set $7
-                    local.get $6
-                    local.set $8
-                    br 2 (;@6;)
-                  end
-                end
-              end
-              local.get $13
-              i32.const 24
-              i32.shl
-              i32.const 24
-              i32.shr_s
-              i32.eqz
-              if ;; label = @6
-                block ;; label = @7
-                  i32.const -1
-                  local.set $15
-                  br 2 (;@5;)
-                end
-              end
-              local.get $9
-              i32.const -1
-              i32.gt_s
-              local.set $14
-              block $label$59 ;; label = @6
-                block $label$60 ;; label = @7
-                  local.get $13
-                  i32.const 24
-                  i32.shl
-                  i32.const 24
-                  i32.shr_s
-                  i32.const 19
-                  i32.eq
-                  if ;; label = @8
-                    local.get $14
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const -1
-                        local.set $15
-                        br 5 (;@5;)
-                      end
-                    else
-                      br 2 (;@7;)
-                    end
-                  else
-                    block ;; label = @9
-                      local.get $14
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $4
-                          local.get $9
-                          i32.const 2
-                          i32.shl
-                          i32.add
-                          local.get $6
-                          i32.store
-                          local.get $16
-                          local.get $3
-                          local.get $9
-                          i32.const 3
-                          i32.shl
-                          i32.add
-                          i64.load
-                          i64.store
-                          br 4 (;@7;)
-                        end
-                      end
-                      local.get $30
-                      i32.eqz
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const 0
-                          local.set $15
-                          br 6 (;@5;)
-                        end
-                      end
-                      local.get $16
-                      local.get $6
-                      local.get $2
-                      call $22
-                    end
-                  end
-                  br 1 (;@6;)
-                end
-                local.get $30
-                i32.eqz
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const 0
-                    local.set $10
-                    local.get $11
-                    local.set $1
-                    br 4 (;@4;)
-                  end
-                end
-              end
-              local.get $7
-              i32.load8_s
-              local.tee $7
-              i32.const -33
-              i32.and
-              local.set $9
-              local.get $8
-              i32.const 0
-              i32.ne
-              local.get $7
-              i32.const 15
-              i32.and
-              i32.const 3
-              i32.eq
-              i32.and
-              i32.eqz
-              if ;; label = @6
-                local.get $7
-                local.set $9
-              end
-              local.get $12
-              i32.const -65537
-              i32.and
-              local.set $7
-              local.get $12
-              i32.const 8192
-              i32.and
-              if ;; label = @6
-                local.get $7
-                local.set $12
-              end
-              block $label$70 ;; label = @6
-                block $label$71 ;; label = @7
-                  block $label$72 ;; label = @8
-                    block $label$73 ;; label = @9
-                      block $label$74 ;; label = @10
-                        block $label$75 ;; label = @11
-                          block $label$76 ;; label = @12
-                            block $label$77 ;; label = @13
-                              block $label$78 ;; label = @14
-                                block $label$79 ;; label = @15
-                                  block $label$80 ;; label = @16
-                                    block $label$81 ;; label = @17
-                                      block $label$82 ;; label = @18
-                                        block $label$83 ;; label = @19
-                                          block $label$84 ;; label = @20
-                                            block $label$85 ;; label = @21
-                                              block $label$86 ;; label = @22
-                                                block $label$87 ;; label = @23
-                                                  block $label$88 ;; label = @24
-                                                    block $label$89 ;; label = @25
-                                                      local.get $9
-                                                      i32.const 65
-                                                      i32.sub
-                                                      br_table 11 (;@14;) 12 (;@13;) 9 (;@16;) 12 (;@13;) 11 (;@14;) 11 (;@14;) 11 (;@14;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 10 (;@15;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 2 (;@23;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 11 (;@14;) 12 (;@13;) 6 (;@19;) 4 (;@21;) 11 (;@14;) 11 (;@14;) 11 (;@14;) 12 (;@13;) 4 (;@21;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 7 (;@18;) 0 (;@25;) 3 (;@22;) 1 (;@24;) 12 (;@13;) 12 (;@13;) 8 (;@17;) 12 (;@13;) 5 (;@20;) 12 (;@13;) 12 (;@13;) 2 (;@23;) 12 (;@13;)
-                                                    end
-                                                    block $label$90 ;; label = @25
-                                                      block $label$91 ;; label = @26
-                                                        block $label$92 ;; label = @27
-                                                          block $label$93 ;; label = @28
-                                                            block $label$94 ;; label = @29
-                                                              block $label$95 ;; label = @30
-                                                                block $label$96 ;; label = @31
-                                                                  block $label$97 ;; label = @32
-                                                                    local.get $8
-                                                                    i32.const 255
-                                                                    i32.and
-                                                                    i32.const 24
-                                                                    i32.shl
-                                                                    i32.const 24
-                                                                    i32.shr_s
-                                                                    i32.const 0
-                                                                    i32.sub
-                                                                    br_table 0 (;@32;) 1 (;@31;) 2 (;@30;) 3 (;@29;) 4 (;@28;) 7 (;@25;) 5 (;@27;) 6 (;@26;) 7 (;@25;)
-                                                                  end
-                                                                  local.get $16
-                                                                  i32.load
-                                                                  local.get $15
-                                                                  i32.store
-                                                                  i32.const 0
-                                                                  local.set $10
-                                                                  local.get $11
-                                                                  local.set $1
-                                                                  br 27 (;@4;)
-                                                                end
-                                                                local.get $16
-                                                                i32.load
-                                                                local.get $15
-                                                                i32.store
-                                                                i32.const 0
-                                                                local.set $10
-                                                                local.get $11
-                                                                local.set $1
-                                                                br 26 (;@4;)
-                                                              end
-                                                              local.get $16
-                                                              i32.load
-                                                              local.get $15
-                                                              i64.extend_i32_s
-                                                              i64.store
-                                                              i32.const 0
-                                                              local.set $10
-                                                              local.get $11
-                                                              local.set $1
-                                                              br 25 (;@4;)
-                                                            end
-                                                            local.get $16
-                                                            i32.load
-                                                            local.get $15
-                                                            i32.store16
-                                                            i32.const 0
-                                                            local.set $10
-                                                            local.get $11
-                                                            local.set $1
-                                                            br 24 (;@4;)
-                                                          end
-                                                          local.get $16
-                                                          i32.load
-                                                          local.get $15
-                                                          i32.store8
-                                                          i32.const 0
-                                                          local.set $10
-                                                          local.get $11
-                                                          local.set $1
-                                                          br 23 (;@4;)
-                                                        end
-                                                        local.get $16
-                                                        i32.load
-                                                        local.get $15
-                                                        i32.store
-                                                        i32.const 0
-                                                        local.set $10
-                                                        local.get $11
-                                                        local.set $1
-                                                        br 22 (;@4;)
-                                                      end
-                                                      local.get $16
-                                                      i32.load
-                                                      local.get $15
-                                                      i64.extend_i32_s
-                                                      i64.store
-                                                      i32.const 0
-                                                      local.set $10
-                                                      local.get $11
-                                                      local.set $1
-                                                      br 21 (;@4;)
-                                                    end
-                                                    i32.const 0
-                                                    local.set $10
-                                                    local.get $11
-                                                    local.set $1
-                                                    br 20 (;@4;)
-                                                  end
-                                                  local.get $12
-                                                  i32.const 8
-                                                  i32.or
-                                                  local.set $12
-                                                  local.get $5
-                                                  i32.const 8
-                                                  i32.le_u
-                                                  if ;; label = @24
-                                                    i32.const 8
-                                                    local.set $5
-                                                  end
-                                                  i32.const 120
-                                                  local.set $9
-                                                  br 11 (;@12;)
-                                                end
-                                                br 10 (;@12;)
-                                              end
-                                              local.get $16
-                                              i64.load
-                                              local.tee $50
-                                              i64.const 0
-                                              i64.eq
-                                              if ;; label = @22
-                                                local.get $21
-                                                local.set $7
-                                              else
-                                                block ;; label = @23
-                                                  local.get $21
-                                                  local.set $1
-                                                  loop $label$101 ;; label = @24
-                                                    local.get $1
-                                                    i32.const -1
-                                                    i32.add
-                                                    local.tee $1
-                                                    local.get $50
-                                                    i64.const 7
-                                                    i64.and
-                                                    i64.const 48
-                                                    i64.or
-                                                    i64.store8
-                                                    local.get $50
-                                                    i64.const 3
-                                                    i64.shr_u
-                                                    local.tee $50
-                                                    i64.const 0
-                                                    i64.ne
-                                                    br_if 0 (;@24;)
-                                                    local.get $1
-                                                    local.set $7
-                                                  end
-                                                end
-                                              end
-                                              local.get $12
-                                              i32.const 8
-                                              i32.and
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $38
-                                                  local.get $7
-                                                  i32.sub
-                                                  local.tee $1
-                                                  i32.const 1
-                                                  i32.add
-                                                  local.set $8
-                                                  local.get $5
-                                                  local.get $1
-                                                  i32.le_s
-                                                  if ;; label = @24
-                                                    local.get $8
-                                                    local.set $5
-                                                  end
-                                                  i32.const 0
-                                                  local.set $6
-                                                  i32.const 2179
-                                                  local.set $8
-                                                  br 16 (;@7;)
-                                                end
-                                              else
-                                                block ;; label = @23
-                                                  i32.const 0
-                                                  local.set $6
-                                                  i32.const 2179
-                                                  local.set $8
-                                                  br 16 (;@7;)
-                                                end
-                                              end
-                                            end
-                                            local.get $16
-                                            i64.load
-                                            local.tee $50
-                                            i64.const 0
-                                            i64.lt_s
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $16
-                                                i64.const 0
-                                                local.get $50
-                                                i64.sub
-                                                local.tee $50
-                                                i64.store
-                                                i32.const 1
-                                                local.set $6
-                                                i32.const 2179
-                                                local.set $8
-                                                br 11 (;@11;)
-                                              end
-                                            end
-                                            local.get $12
-                                            i32.const 2048
-                                            i32.and
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                i32.const 1
-                                                local.set $6
-                                                i32.const 2180
-                                                local.set $8
-                                                br 11 (;@11;)
-                                              end
-                                            else
-                                              block ;; label = @22
-                                                local.get $12
-                                                i32.const 1
-                                                i32.and
-                                                local.tee $1
-                                                local.set $6
-                                                local.get $1
-                                                if (result i32) ;; label = @23
-                                                  i32.const 2181
-                                                else
-                                                  i32.const 2179
-                                                end
-                                                local.set $8
-                                                br 11 (;@11;)
-                                              end
-                                            end
-                                          end
-                                          local.get $16
-                                          i64.load
-                                          local.set $50
-                                          i32.const 0
-                                          local.set $6
-                                          i32.const 2179
-                                          local.set $8
-                                          br 8 (;@11;)
-                                        end
-                                        local.get $39
-                                        local.get $16
-                                        i64.load
-                                        i64.store8
-                                        local.get $39
-                                        local.set $1
-                                        local.get $7
-                                        local.set $12
-                                        i32.const 1
-                                        local.set $7
-                                        i32.const 0
-                                        local.set $6
-                                        i32.const 2179
-                                        local.set $8
-                                        local.get $21
-                                        local.set $5
-                                        br 12 (;@6;)
-                                      end
-                                      call $12
-                                      i32.load
-                                      call $24
-                                      local.set $1
-                                      br 7 (;@10;)
-                                    end
-                                    local.get $16
-                                    i32.load
-                                    local.tee $1
-                                    i32.eqz
-                                    if ;; label = @17
-                                      i32.const 2189
-                                      local.set $1
-                                    end
-                                    br 6 (;@10;)
-                                  end
-                                  local.get $37
-                                  local.get $16
-                                  i64.load
-                                  i64.store32
-                                  local.get $42
-                                  i32.const 0
-                                  i32.store
-                                  local.get $16
-                                  local.get $37
-                                  i32.store
-                                  local.get $37
-                                  local.set $7
-                                  i32.const -1
-                                  local.set $6
-                                  br 6 (;@9;)
-                                end
-                                local.get $16
-                                i32.load
-                                local.set $7
-                                local.get $5
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $5
-                                    local.set $6
-                                    br 7 (;@9;)
-                                  end
-                                else
-                                  block ;; label = @16
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    i32.const 0
-                                    local.get $12
-                                    call $25
-                                    i32.const 0
-                                    local.set $1
-                                    br 8 (;@8;)
-                                  end
-                                end
-                              end
-                              local.get $16
-                              f64.load
-                              local.set $52
-                              local.get $20
-                              i32.const 0
-                              i32.store
-                              local.get $52
-                              i64.reinterpret_f64
-                              i64.const 0
-                              i64.lt_s
-                              if (result i32) ;; label = @14
-                                block (result i32) ;; label = @15
-                                  i32.const 1
-                                  local.set $24
-                                  local.get $52
-                                  f64.neg
-                                  local.set $52
-                                  i32.const 2196
-                                end
-                              else
-                                block (result i32) ;; label = @15
-                                  local.get $12
-                                  i32.const 1
-                                  i32.and
-                                  local.set $1
-                                  local.get $12
-                                  i32.const 2048
-                                  i32.and
-                                  if (result i32) ;; label = @16
-                                    block (result i32) ;; label = @17
-                                      i32.const 1
-                                      local.set $24
-                                      i32.const 2199
-                                    end
-                                  else
-                                    block (result i32) ;; label = @17
-                                      local.get $1
-                                      local.set $24
-                                      local.get $1
-                                      if (result i32) ;; label = @18
-                                        i32.const 2202
-                                      else
-                                        i32.const 2197
-                                      end
-                                    end
-                                  end
-                                end
-                              end
-                              local.set $26
-                              block $label$119 ;; label = @14
-                                local.get $52
-                                i64.reinterpret_f64
-                                i64.const 9218868437227405312
-                                i64.and
-                                i64.const 9218868437227405312
-                                i64.lt_u
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $52
-                                    local.get $20
-                                    call $27
-                                    f64.const 0x1p+1 (;=2;)
-                                    f64.mul
-                                    local.tee $52
-                                    f64.const 0x0p+0 (;=0;)
-                                    f64.ne
-                                    local.tee $1
-                                    if ;; label = @17
-                                      local.get $20
-                                      local.get $20
-                                      i32.load
-                                      i32.const -1
-                                      i32.add
-                                      i32.store
-                                    end
-                                    local.get $9
-                                    i32.const 32
-                                    i32.or
-                                    local.tee $22
-                                    i32.const 97
-                                    i32.eq
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $26
-                                        i32.const 9
-                                        i32.add
-                                        local.set $1
-                                        local.get $9
-                                        i32.const 32
-                                        i32.and
-                                        local.tee $6
-                                        if ;; label = @19
-                                          local.get $1
-                                          local.set $26
-                                        end
-                                        local.get $5
-                                        i32.const 11
-                                        i32.gt_u
-                                        i32.const 12
-                                        local.get $5
-                                        i32.sub
-                                        local.tee $1
-                                        i32.eqz
-                                        i32.or
-                                        i32.eqz
-                                        if ;; label = @19
-                                          block ;; label = @20
-                                            f64.const 0x1p+3 (;=8;)
-                                            local.set $53
-                                            loop $label$125 ;; label = @21
-                                              local.get $53
-                                              f64.const 0x1p+4 (;=16;)
-                                              f64.mul
-                                              local.set $53
-                                              local.get $1
-                                              i32.const -1
-                                              i32.add
-                                              local.tee $1
-                                              br_if 0 (;@21;)
-                                            end
-                                            local.get $26
-                                            i32.load8_s
-                                            i32.const 45
-                                            i32.eq
-                                            if (result f64) ;; label = @21
-                                              local.get $53
-                                              local.get $52
-                                              f64.neg
-                                              local.get $53
-                                              f64.sub
-                                              f64.add
-                                              f64.neg
-                                            else
-                                              local.get $52
-                                              local.get $53
-                                              f64.add
-                                              local.get $53
-                                              f64.sub
-                                            end
-                                            local.set $52
-                                          end
-                                        end
-                                        i32.const 0
-                                        local.get $20
-                                        i32.load
-                                        local.tee $7
-                                        i32.sub
-                                        local.set $1
-                                        local.get $7
-                                        i32.const 0
-                                        i32.lt_s
-                                        if (result i32) ;; label = @19
-                                          local.get $1
-                                        else
-                                          local.get $7
-                                        end
-                                        i64.extend_i32_s
-                                        local.get $33
-                                        call $23
-                                        local.tee $1
-                                        local.get $33
-                                        i32.eq
-                                        if ;; label = @19
-                                          block ;; label = @20
-                                            local.get $40
-                                            i32.const 48
-                                            i32.store8
-                                            local.get $40
-                                            local.set $1
-                                          end
-                                        end
-                                        local.get $24
-                                        i32.const 2
-                                        i32.or
-                                        local.set $13
-                                        local.get $1
-                                        i32.const -1
-                                        i32.add
-                                        local.get $7
-                                        i32.const 31
-                                        i32.shr_s
-                                        i32.const 2
-                                        i32.and
-                                        i32.const 43
-                                        i32.add
-                                        i32.store8
-                                        local.get $1
-                                        i32.const -2
-                                        i32.add
-                                        local.tee $8
-                                        local.get $9
-                                        i32.const 15
-                                        i32.add
-                                        i32.store8
-                                        local.get $5
-                                        i32.const 1
-                                        i32.lt_s
-                                        local.set $9
-                                        local.get $12
-                                        i32.const 8
-                                        i32.and
-                                        i32.eqz
-                                        local.set $14
-                                        local.get $19
-                                        local.set $1
-                                        loop $label$131 ;; label = @19
-                                          local.get $1
-                                          local.get $52
-                                          i32.trunc_f64_s
-                                          local.tee $7
-                                          i32.const 2163
-                                          i32.add
-                                          i32.load8_u
-                                          local.get $6
-                                          i32.or
-                                          i32.store8
-                                          local.get $52
-                                          local.get $7
-                                          f64.convert_i32_s
-                                          f64.sub
-                                          f64.const 0x1p+4 (;=16;)
-                                          f64.mul
-                                          local.set $52
-                                          block $label$132 (result i32) ;; label = @20
-                                            local.get $1
-                                            i32.const 1
-                                            i32.add
-                                            local.tee $7
-                                            local.get $27
-                                            i32.sub
-                                            i32.const 1
-                                            i32.eq
-                                            if (result i32) ;; label = @21
-                                              block (result i32) ;; label = @22
-                                                local.get $7
-                                                local.get $14
-                                                local.get $9
-                                                local.get $52
-                                                f64.const 0x0p+0 (;=0;)
-                                                f64.eq
-                                                i32.and
-                                                i32.and
-                                                br_if 2 (;@20;)
-                                                drop
-                                                local.get $7
-                                                i32.const 46
-                                                i32.store8
-                                                local.get $1
-                                                i32.const 2
-                                                i32.add
-                                              end
-                                            else
-                                              local.get $7
-                                            end
-                                          end
-                                          local.set $1
-                                          local.get $52
-                                          f64.const 0x0p+0 (;=0;)
-                                          f64.ne
-                                          br_if 0 (;@19;)
-                                        end
-                                        local.get $46
-                                        local.get $5
-                                        i32.add
-                                        local.get $8
-                                        local.tee $7
-                                        i32.sub
-                                        local.set $6
-                                        local.get $44
-                                        local.get $7
-                                        i32.sub
-                                        local.get $1
-                                        i32.add
-                                        local.set $9
-                                        local.get $0
-                                        i32.const 32
-                                        local.get $10
-                                        local.get $5
-                                        i32.const 0
-                                        i32.ne
-                                        local.get $45
-                                        local.get $1
-                                        i32.add
-                                        local.get $5
-                                        i32.lt_s
-                                        i32.and
-                                        if (result i32) ;; label = @19
-                                          local.get $6
-                                        else
-                                          local.get $9
-                                          local.tee $6
-                                        end
-                                        local.get $13
-                                        i32.add
-                                        local.tee $5
-                                        local.get $12
-                                        call $25
-                                        local.get $0
-                                        i32.load
-                                        i32.const 32
-                                        i32.and
-                                        i32.eqz
-                                        if ;; label = @19
-                                          local.get $26
-                                          local.get $13
-                                          local.get $0
-                                          call $21
-                                          drop
-                                        end
-                                        local.get $0
-                                        i32.const 48
-                                        local.get $10
-                                        local.get $5
-                                        local.get $12
-                                        i32.const 65536
-                                        i32.xor
-                                        call $25
-                                        local.get $1
-                                        local.get $27
-                                        i32.sub
-                                        local.set $1
-                                        local.get $0
-                                        i32.load
-                                        i32.const 32
-                                        i32.and
-                                        i32.eqz
-                                        if ;; label = @19
-                                          local.get $19
-                                          local.get $1
-                                          local.get $0
-                                          call $21
-                                          drop
-                                        end
-                                        local.get $0
-                                        i32.const 48
-                                        local.get $6
-                                        local.get $1
-                                        local.get $28
-                                        local.get $7
-                                        i32.sub
-                                        local.tee $1
-                                        i32.add
-                                        i32.sub
-                                        i32.const 0
-                                        i32.const 0
-                                        call $25
-                                        local.get $0
-                                        i32.load
-                                        i32.const 32
-                                        i32.and
-                                        i32.eqz
-                                        if ;; label = @19
-                                          local.get $8
-                                          local.get $1
-                                          local.get $0
-                                          call $21
-                                          drop
-                                        end
-                                        local.get $0
-                                        i32.const 32
-                                        local.get $10
-                                        local.get $5
-                                        local.get $12
-                                        i32.const 8192
-                                        i32.xor
-                                        call $25
-                                        local.get $5
-                                        local.get $10
-                                        i32.ge_s
-                                        if ;; label = @19
-                                          local.get $5
-                                          local.set $10
-                                        end
-                                        br 4 (;@14;)
-                                      end
-                                    end
-                                    local.get $1
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $20
-                                        local.get $20
-                                        i32.load
-                                        i32.const -28
-                                        i32.add
-                                        local.tee $6
-                                        i32.store
-                                        local.get $52
-                                        f64.const 0x1p+28 (;=268435456;)
-                                        f64.mul
-                                        local.set $52
-                                      end
-                                    else
-                                      local.get $20
-                                      i32.load
-                                      local.set $6
-                                    end
-                                    local.get $6
-                                    i32.const 0
-                                    i32.lt_s
-                                    if (result i32) ;; label = @17
-                                      local.get $47
-                                    else
-                                      local.get $48
-                                    end
-                                    local.tee $7
-                                    local.set $8
-                                    loop $label$145 ;; label = @17
-                                      local.get $8
-                                      local.get $52
-                                      i32.trunc_f64_s
-                                      local.tee $1
-                                      i32.store
-                                      local.get $8
-                                      i32.const 4
-                                      i32.add
-                                      local.set $8
-                                      local.get $52
-                                      local.get $1
-                                      f64.convert_i32_u
-                                      f64.sub
-                                      f64.const 0x1.dcd65p+29 (;=1000000000;)
-                                      f64.mul
-                                      local.tee $52
-                                      f64.const 0x0p+0 (;=0;)
-                                      f64.ne
-                                      br_if 0 (;@17;)
-                                    end
-                                    local.get $6
-                                    i32.const 0
-                                    i32.gt_s
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $7
-                                        local.set $1
-                                        loop $label$147 ;; label = @19
-                                          local.get $6
-                                          i32.const 29
-                                          i32.gt_s
-                                          if (result i32) ;; label = @20
-                                            i32.const 29
-                                          else
-                                            local.get $6
-                                          end
-                                          local.set $14
-                                          block $label$150 ;; label = @20
-                                            local.get $8
-                                            i32.const -4
-                                            i32.add
-                                            local.tee $6
-                                            local.get $1
-                                            i32.ge_u
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $14
-                                                i64.extend_i32_u
-                                                local.set $50
-                                                i32.const 0
-                                                local.set $13
-                                                loop $label$152 ;; label = @23
-                                                  local.get $6
-                                                  local.get $6
-                                                  i32.load
-                                                  i64.extend_i32_u
-                                                  local.get $50
-                                                  i64.shl
-                                                  local.get $13
-                                                  i64.extend_i32_u
-                                                  i64.add
-                                                  local.tee $51
-                                                  i64.const 1000000000
-                                                  i64.rem_u
-                                                  i64.store32
-                                                  local.get $51
-                                                  i64.const 1000000000
-                                                  i64.div_u
-                                                  i32.wrap_i64
-                                                  local.set $13
-                                                  local.get $6
-                                                  i32.const -4
-                                                  i32.add
-                                                  local.tee $6
-                                                  local.get $1
-                                                  i32.ge_u
-                                                  br_if 0 (;@23;)
-                                                end
-                                                local.get $13
-                                                i32.eqz
-                                                br_if 2 (;@20;)
-                                                local.get $1
-                                                i32.const -4
-                                                i32.add
-                                                local.tee $1
-                                                local.get $13
-                                                i32.store
-                                              end
-                                            end
-                                          end
-                                          loop $label$153 ;; label = @20
-                                            local.get $8
-                                            local.get $1
-                                            i32.gt_u
-                                            if ;; label = @21
-                                              local.get $8
-                                              i32.const -4
-                                              i32.add
-                                              local.tee $6
-                                              i32.load
-                                              i32.eqz
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $6
-                                                  local.set $8
-                                                  br 3 (;@20;)
-                                                end
-                                              end
-                                            end
-                                          end
-                                          local.get $20
-                                          local.get $20
-                                          i32.load
-                                          local.get $14
-                                          i32.sub
-                                          local.tee $6
-                                          i32.store
-                                          local.get $6
-                                          i32.const 0
-                                          i32.gt_s
-                                          br_if 0 (;@19;)
-                                        end
-                                      end
-                                    else
-                                      local.get $7
-                                      local.set $1
-                                    end
-                                    local.get $5
-                                    i32.const 0
-                                    i32.lt_s
-                                    if (result i32) ;; label = @17
-                                      i32.const 6
-                                    else
-                                      local.get $5
-                                    end
-                                    local.set $18
-                                    local.get $6
-                                    i32.const 0
-                                    i32.lt_s
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $18
-                                        i32.const 25
-                                        i32.add
-                                        i32.const 9
-                                        i32.div_s
-                                        i32.const 1
-                                        i32.add
-                                        local.set $14
-                                        local.get $22
-                                        i32.const 102
-                                        i32.eq
-                                        local.set $25
-                                        local.get $8
-                                        local.set $5
-                                        loop $label$160 ;; label = @19
-                                          i32.const 0
-                                          local.get $6
-                                          i32.sub
-                                          local.tee $13
-                                          i32.const 9
-                                          i32.gt_s
-                                          if ;; label = @20
-                                            i32.const 9
-                                            local.set $13
-                                          end
-                                          block $label$162 ;; label = @20
-                                            local.get $1
-                                            local.get $5
-                                            i32.lt_u
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                i32.const 1
-                                                local.get $13
-                                                i32.shl
-                                                i32.const -1
-                                                i32.add
-                                                local.set $29
-                                                i32.const 1000000000
-                                                local.get $13
-                                                i32.shr_u
-                                                local.set $35
-                                                i32.const 0
-                                                local.set $6
-                                                local.get $1
-                                                local.set $8
-                                                loop $label$164 ;; label = @23
-                                                  local.get $8
-                                                  local.get $8
-                                                  i32.load
-                                                  local.tee $32
-                                                  local.get $13
-                                                  i32.shr_u
-                                                  local.get $6
-                                                  i32.add
-                                                  i32.store
-                                                  local.get $32
-                                                  local.get $29
-                                                  i32.and
-                                                  local.get $35
-                                                  i32.mul
-                                                  local.set $6
-                                                  local.get $8
-                                                  i32.const 4
-                                                  i32.add
-                                                  local.tee $8
-                                                  local.get $5
-                                                  i32.lt_u
-                                                  br_if 0 (;@23;)
-                                                end
-                                                local.get $1
-                                                i32.const 4
-                                                i32.add
-                                                local.set $8
-                                                local.get $1
-                                                i32.load
-                                                i32.eqz
-                                                if ;; label = @23
-                                                  local.get $8
-                                                  local.set $1
-                                                end
-                                                local.get $6
-                                                i32.eqz
-                                                br_if 2 (;@20;)
-                                                local.get $5
-                                                local.get $6
-                                                i32.store
-                                                local.get $5
-                                                i32.const 4
-                                                i32.add
-                                                local.set $5
-                                              end
-                                            else
-                                              block ;; label = @22
-                                                local.get $1
-                                                i32.const 4
-                                                i32.add
-                                                local.set $8
-                                                local.get $1
-                                                i32.load
-                                                i32.eqz
-                                                if ;; label = @23
-                                                  local.get $8
-                                                  local.set $1
-                                                end
-                                              end
-                                            end
-                                          end
-                                          local.get $25
-                                          if (result i32) ;; label = @20
-                                            local.get $7
-                                          else
-                                            local.get $1
-                                          end
-                                          local.tee $8
-                                          local.get $14
-                                          i32.const 2
-                                          i32.shl
-                                          i32.add
-                                          local.set $6
-                                          local.get $5
-                                          local.get $8
-                                          i32.sub
-                                          i32.const 2
-                                          i32.shr_s
-                                          local.get $14
-                                          i32.gt_s
-                                          if ;; label = @20
-                                            local.get $6
-                                            local.set $5
-                                          end
-                                          local.get $20
-                                          local.get $20
-                                          i32.load
-                                          local.get $13
-                                          i32.add
-                                          local.tee $6
-                                          i32.store
-                                          local.get $6
-                                          i32.const 0
-                                          i32.lt_s
-                                          br_if 0 (;@19;)
-                                          local.get $5
-                                          local.set $13
-                                        end
-                                      end
-                                    else
-                                      local.get $8
-                                      local.set $13
-                                    end
-                                    local.get $7
-                                    local.set $25
-                                    block $label$172 ;; label = @17
-                                      local.get $1
-                                      local.get $13
-                                      i32.lt_u
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $25
-                                          local.get $1
-                                          i32.sub
-                                          i32.const 2
-                                          i32.shr_s
-                                          i32.const 9
-                                          i32.mul
-                                          local.set $5
-                                          local.get $1
-                                          i32.load
-                                          local.tee $6
-                                          i32.const 10
-                                          i32.lt_u
-                                          br_if 2 (;@17;)
-                                          i32.const 10
-                                          local.set $8
-                                          loop $label$174 ;; label = @20
-                                            local.get $5
-                                            i32.const 1
-                                            i32.add
-                                            local.set $5
-                                            local.get $6
-                                            local.get $8
-                                            i32.const 10
-                                            i32.mul
-                                            local.tee $8
-                                            i32.ge_u
-                                            br_if 0 (;@20;)
-                                          end
-                                        end
-                                      else
-                                        i32.const 0
-                                        local.set $5
-                                      end
-                                    end
-                                    local.get $22
-                                    i32.const 103
-                                    i32.eq
-                                    local.set $29
-                                    local.get $18
-                                    i32.const 0
-                                    i32.ne
-                                    local.set $35
-                                    local.get $18
-                                    local.get $22
-                                    i32.const 102
-                                    i32.ne
-                                    if (result i32) ;; label = @17
-                                      local.get $5
-                                    else
-                                      i32.const 0
-                                    end
-                                    i32.sub
-                                    local.get $35
-                                    local.get $29
-                                    i32.and
-                                    i32.const 31
-                                    i32.shl
-                                    i32.const 31
-                                    i32.shr_s
-                                    i32.add
-                                    local.tee $8
-                                    local.get $13
-                                    local.get $25
-                                    i32.sub
-                                    i32.const 2
-                                    i32.shr_s
-                                    i32.const 9
-                                    i32.mul
-                                    i32.const -9
-                                    i32.add
-                                    i32.lt_s
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $8
-                                        i32.const 9216
-                                        i32.add
-                                        local.tee $14
-                                        i32.const 9
-                                        i32.rem_s
-                                        i32.const 1
-                                        i32.add
-                                        local.tee $8
-                                        i32.const 9
-                                        i32.lt_s
-                                        if ;; label = @19
-                                          block ;; label = @20
-                                            i32.const 10
-                                            local.set $6
-                                            loop $label$180 ;; label = @21
-                                              local.get $6
-                                              i32.const 10
-                                              i32.mul
-                                              local.set $6
-                                              local.get $8
-                                              i32.const 1
-                                              i32.add
-                                              local.tee $8
-                                              i32.const 9
-                                              i32.ne
-                                              br_if 0 (;@21;)
-                                            end
-                                          end
-                                        else
-                                          i32.const 10
-                                          local.set $6
-                                        end
-                                        local.get $7
-                                        i32.const 4
-                                        i32.add
-                                        local.get $14
-                                        i32.const 9
-                                        i32.div_s
-                                        i32.const -1024
-                                        i32.add
-                                        i32.const 2
-                                        i32.shl
-                                        i32.add
-                                        local.tee $8
-                                        i32.load
-                                        local.tee $22
-                                        local.get $6
-                                        i32.rem_u
-                                        local.set $14
-                                        block $label$182 ;; label = @19
-                                          local.get $8
-                                          i32.const 4
-                                          i32.add
-                                          local.get $13
-                                          i32.eq
-                                          local.tee $32
-                                          local.get $14
-                                          i32.eqz
-                                          i32.and
-                                          i32.eqz
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              local.get $14
-                                              local.get $6
-                                              i32.const 2
-                                              i32.div_s
-                                              local.tee $49
-                                              i32.lt_u
-                                              if (result f64) ;; label = @22
-                                                f64.const 0x1p-1 (;=0.5;)
-                                              else
-                                                local.get $32
-                                                local.get $14
-                                                local.get $49
-                                                i32.eq
-                                                i32.and
-                                                if (result f64) ;; label = @23
-                                                  f64.const 0x1p+0 (;=1;)
-                                                else
-                                                  f64.const 0x1.8p+0 (;=1.5;)
-                                                end
-                                              end
-                                              local.set $52
-                                              local.get $22
-                                              local.get $6
-                                              i32.div_u
-                                              i32.const 1
-                                              i32.and
-                                              if (result f64) ;; label = @22
-                                                f64.const 0x1.0000000000001p+53 (;=9007199254740994;)
-                                              else
-                                                f64.const 0x1p+53 (;=9007199254740992;)
-                                              end
-                                              local.set $53
-                                              block $label$190 ;; label = @22
-                                                local.get $24
-                                                if ;; label = @23
-                                                  block ;; label = @24
-                                                    local.get $26
-                                                    i32.load8_s
-                                                    i32.const 45
-                                                    i32.ne
-                                                    br_if 2 (;@22;)
-                                                    local.get $53
-                                                    f64.neg
-                                                    local.set $53
-                                                    local.get $52
-                                                    f64.neg
-                                                    local.set $52
-                                                  end
-                                                end
-                                              end
-                                              local.get $8
-                                              local.get $22
-                                              local.get $14
-                                              i32.sub
-                                              local.tee $14
-                                              i32.store
-                                              local.get $53
-                                              local.get $52
-                                              f64.add
-                                              local.get $53
-                                              f64.eq
-                                              br_if 2 (;@19;)
-                                              local.get $8
-                                              local.get $14
-                                              local.get $6
-                                              i32.add
-                                              local.tee $5
-                                              i32.store
-                                              local.get $5
-                                              i32.const 999999999
-                                              i32.gt_u
-                                              if ;; label = @22
-                                                loop $label$193 ;; label = @23
-                                                  local.get $8
-                                                  i32.const 0
-                                                  i32.store
-                                                  local.get $8
-                                                  i32.const -4
-                                                  i32.add
-                                                  local.tee $8
-                                                  local.get $1
-                                                  i32.lt_u
-                                                  if ;; label = @24
-                                                    local.get $1
-                                                    i32.const -4
-                                                    i32.add
-                                                    local.tee $1
-                                                    i32.const 0
-                                                    i32.store
-                                                  end
-                                                  local.get $8
-                                                  local.get $8
-                                                  i32.load
-                                                  i32.const 1
-                                                  i32.add
-                                                  local.tee $5
-                                                  i32.store
-                                                  local.get $5
-                                                  i32.const 999999999
-                                                  i32.gt_u
-                                                  br_if 0 (;@23;)
-                                                end
-                                              end
-                                              local.get $25
-                                              local.get $1
-                                              i32.sub
-                                              i32.const 2
-                                              i32.shr_s
-                                              i32.const 9
-                                              i32.mul
-                                              local.set $5
-                                              local.get $1
-                                              i32.load
-                                              local.tee $14
-                                              i32.const 10
-                                              i32.lt_u
-                                              br_if 2 (;@19;)
-                                              i32.const 10
-                                              local.set $6
-                                              loop $label$195 ;; label = @22
-                                                local.get $5
-                                                i32.const 1
-                                                i32.add
-                                                local.set $5
-                                                local.get $14
-                                                local.get $6
-                                                i32.const 10
-                                                i32.mul
-                                                local.tee $6
-                                                i32.ge_u
-                                                br_if 0 (;@22;)
-                                              end
-                                            end
-                                          end
-                                        end
-                                        local.get $1
-                                        local.set $14
-                                        local.get $5
-                                        local.set $6
-                                        local.get $13
-                                        local.get $8
-                                        i32.const 4
-                                        i32.add
-                                        local.tee $8
-                                        i32.le_u
-                                        if ;; label = @19
-                                          local.get $13
-                                          local.set $8
-                                        end
-                                      end
-                                    else
-                                      block ;; label = @18
-                                        local.get $1
-                                        local.set $14
-                                        local.get $5
-                                        local.set $6
-                                        local.get $13
-                                        local.set $8
-                                      end
-                                    end
-                                    i32.const 0
-                                    local.get $6
-                                    i32.sub
-                                    local.set $32
-                                    loop $label$198 ;; label = @17
-                                      block $label$199 ;; label = @18
-                                        local.get $8
-                                        local.get $14
-                                        i32.le_u
-                                        if ;; label = @19
-                                          block ;; label = @20
-                                            i32.const 0
-                                            local.set $22
-                                            br 2 (;@18;)
-                                          end
-                                        end
-                                        local.get $8
-                                        i32.const -4
-                                        i32.add
-                                        local.tee $1
-                                        i32.load
-                                        if ;; label = @19
-                                          i32.const 1
-                                          local.set $22
-                                        else
-                                          block ;; label = @20
-                                            local.get $1
-                                            local.set $8
-                                            br 3 (;@17;)
-                                          end
-                                        end
-                                      end
-                                    end
-                                    block $label$203 ;; label = @17
-                                      local.get $29
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $35
-                                          i32.const 1
-                                          i32.and
-                                          i32.const 1
-                                          i32.xor
-                                          local.get $18
-                                          i32.add
-                                          local.tee $1
-                                          local.get $6
-                                          i32.gt_s
-                                          local.get $6
-                                          i32.const -5
-                                          i32.gt_s
-                                          i32.and
-                                          if (result i32) ;; label = @20
-                                            block (result i32) ;; label = @21
-                                              local.get $9
-                                              i32.const -1
-                                              i32.add
-                                              local.set $5
-                                              local.get $1
-                                              i32.const -1
-                                              i32.add
-                                              local.get $6
-                                              i32.sub
-                                            end
-                                          else
-                                            block (result i32) ;; label = @21
-                                              local.get $9
-                                              i32.const -2
-                                              i32.add
-                                              local.set $5
-                                              local.get $1
-                                              i32.const -1
-                                              i32.add
-                                            end
-                                          end
-                                          local.set $1
-                                          local.get $12
-                                          i32.const 8
-                                          i32.and
-                                          local.tee $13
-                                          br_if 2 (;@17;)
-                                          block $label$207 ;; label = @20
-                                            local.get $22
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $8
-                                                i32.const -4
-                                                i32.add
-                                                i32.load
-                                                local.tee $18
-                                                i32.eqz
-                                                if ;; label = @23
-                                                  block ;; label = @24
-                                                    i32.const 9
-                                                    local.set $9
-                                                    br 4 (;@20;)
-                                                  end
-                                                end
-                                                local.get $18
-                                                i32.const 10
-                                                i32.rem_u
-                                                if ;; label = @23
-                                                  block ;; label = @24
-                                                    i32.const 0
-                                                    local.set $9
-                                                    br 4 (;@20;)
-                                                  end
-                                                else
-                                                  block ;; label = @24
-                                                    i32.const 10
-                                                    local.set $13
-                                                    i32.const 0
-                                                    local.set $9
-                                                  end
-                                                end
-                                                loop $label$212 ;; label = @23
-                                                  local.get $9
-                                                  i32.const 1
-                                                  i32.add
-                                                  local.set $9
-                                                  local.get $18
-                                                  local.get $13
-                                                  i32.const 10
-                                                  i32.mul
-                                                  local.tee $13
-                                                  i32.rem_u
-                                                  i32.eqz
-                                                  br_if 0 (;@23;)
-                                                end
-                                              end
-                                            else
-                                              i32.const 9
-                                              local.set $9
-                                            end
-                                          end
-                                          local.get $8
-                                          local.get $25
-                                          i32.sub
-                                          i32.const 2
-                                          i32.shr_s
-                                          i32.const 9
-                                          i32.mul
-                                          i32.const -9
-                                          i32.add
-                                          local.set $18
-                                          local.get $5
-                                          i32.const 32
-                                          i32.or
-                                          i32.const 102
-                                          i32.eq
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              i32.const 0
-                                              local.set $13
-                                              local.get $1
-                                              local.get $18
-                                              local.get $9
-                                              i32.sub
-                                              local.tee $9
-                                              i32.const 0
-                                              i32.lt_s
-                                              if (result i32) ;; label = @22
-                                                i32.const 0
-                                                local.tee $9
-                                              else
-                                                local.get $9
-                                              end
-                                              i32.ge_s
-                                              if ;; label = @22
-                                                local.get $9
-                                                local.set $1
-                                              end
-                                            end
-                                          else
-                                            block ;; label = @21
-                                              i32.const 0
-                                              local.set $13
-                                              local.get $1
-                                              local.get $18
-                                              local.get $6
-                                              i32.add
-                                              local.get $9
-                                              i32.sub
-                                              local.tee $9
-                                              i32.const 0
-                                              i32.lt_s
-                                              if (result i32) ;; label = @22
-                                                i32.const 0
-                                                local.tee $9
-                                              else
-                                                local.get $9
-                                              end
-                                              i32.ge_s
-                                              if ;; label = @22
-                                                local.get $9
-                                                local.set $1
-                                              end
-                                            end
-                                          end
-                                        end
-                                      else
-                                        block ;; label = @19
-                                          local.get $12
-                                          i32.const 8
-                                          i32.and
-                                          local.set $13
-                                          local.get $18
-                                          local.set $1
-                                          local.get $9
-                                          local.set $5
-                                        end
-                                      end
-                                    end
-                                    local.get $5
-                                    i32.const 32
-                                    i32.or
-                                    i32.const 102
-                                    i32.eq
-                                    local.tee $25
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        i32.const 0
-                                        local.set $9
-                                        local.get $6
-                                        i32.const 0
-                                        i32.le_s
-                                        if ;; label = @19
-                                          i32.const 0
-                                          local.set $6
-                                        end
-                                      end
-                                    else
-                                      block ;; label = @18
-                                        local.get $28
-                                        local.get $6
-                                        i32.const 0
-                                        i32.lt_s
-                                        if (result i32) ;; label = @19
-                                          local.get $32
-                                        else
-                                          local.get $6
-                                        end
-                                        i64.extend_i32_s
-                                        local.get $33
-                                        call $23
-                                        local.tee $9
-                                        i32.sub
-                                        i32.const 2
-                                        i32.lt_s
-                                        if ;; label = @19
-                                          loop $label$229 ;; label = @20
-                                            local.get $9
-                                            i32.const -1
-                                            i32.add
-                                            local.tee $9
-                                            i32.const 48
-                                            i32.store8
-                                            local.get $28
-                                            local.get $9
-                                            i32.sub
-                                            i32.const 2
-                                            i32.lt_s
-                                            br_if 0 (;@20;)
-                                          end
-                                        end
-                                        local.get $9
-                                        i32.const -1
-                                        i32.add
-                                        local.get $6
-                                        i32.const 31
-                                        i32.shr_s
-                                        i32.const 2
-                                        i32.and
-                                        i32.const 43
-                                        i32.add
-                                        i32.store8
-                                        local.get $9
-                                        i32.const -2
-                                        i32.add
-                                        local.tee $6
-                                        local.get $5
-                                        i32.store8
-                                        local.get $6
-                                        local.set $9
-                                        local.get $28
-                                        local.get $6
-                                        i32.sub
-                                        local.set $6
-                                      end
-                                    end
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    local.get $24
-                                    i32.const 1
-                                    i32.add
-                                    local.get $1
-                                    i32.add
-                                    local.get $1
-                                    local.get $13
-                                    i32.or
-                                    local.tee $29
-                                    i32.const 0
-                                    i32.ne
-                                    i32.add
-                                    local.get $6
-                                    i32.add
-                                    local.tee $18
-                                    local.get $12
-                                    call $25
-                                    local.get $0
-                                    i32.load
-                                    i32.const 32
-                                    i32.and
-                                    i32.eqz
-                                    if ;; label = @17
-                                      local.get $26
-                                      local.get $24
-                                      local.get $0
-                                      call $21
-                                      drop
-                                    end
-                                    local.get $0
-                                    i32.const 48
-                                    local.get $10
-                                    local.get $18
-                                    local.get $12
-                                    i32.const 65536
-                                    i32.xor
-                                    call $25
-                                    block $label$231 ;; label = @17
-                                      local.get $25
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $14
-                                          local.get $7
-                                          i32.gt_u
-                                          if (result i32) ;; label = @20
-                                            local.get $7
-                                          else
-                                            local.get $14
-                                          end
-                                          local.tee $9
-                                          local.set $6
-                                          loop $label$235 ;; label = @20
-                                            local.get $6
-                                            i32.load
-                                            i64.extend_i32_u
-                                            local.get $31
-                                            call $23
-                                            local.set $5
-                                            block $label$236 ;; label = @21
-                                              local.get $6
-                                              local.get $9
-                                              i32.eq
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $5
-                                                  local.get $31
-                                                  i32.ne
-                                                  br_if 2 (;@21;)
-                                                  local.get $34
-                                                  i32.const 48
-                                                  i32.store8
-                                                  local.get $34
-                                                  local.set $5
-                                                end
-                                              else
-                                                block ;; label = @23
-                                                  local.get $5
-                                                  local.get $19
-                                                  i32.le_u
-                                                  br_if 2 (;@21;)
-                                                  local.get $19
-                                                  i32.const 48
-                                                  local.get $5
-                                                  local.get $27
-                                                  i32.sub
-                                                  call $46
-                                                  drop
-                                                  loop $label$239 ;; label = @24
-                                                    local.get $5
-                                                    i32.const -1
-                                                    i32.add
-                                                    local.tee $5
-                                                    local.get $19
-                                                    i32.gt_u
-                                                    br_if 0 (;@24;)
-                                                  end
-                                                end
-                                              end
-                                            end
-                                            local.get $0
-                                            i32.load
-                                            i32.const 32
-                                            i32.and
-                                            i32.eqz
-                                            if ;; label = @21
-                                              local.get $5
-                                              local.get $41
-                                              local.get $5
-                                              i32.sub
-                                              local.get $0
-                                              call $21
-                                              drop
-                                            end
-                                            local.get $6
-                                            i32.const 4
-                                            i32.add
-                                            local.tee $5
-                                            local.get $7
-                                            i32.le_u
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $5
-                                                local.set $6
-                                                br 2 (;@20;)
-                                              end
-                                            end
-                                          end
-                                          block $label$242 ;; label = @20
-                                            local.get $29
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $0
-                                                i32.load
-                                                i32.const 32
-                                                i32.and
-                                                br_if 2 (;@20;)
-                                                i32.const 2231
-                                                i32.const 1
-                                                local.get $0
-                                                call $21
-                                                drop
-                                              end
-                                            end
-                                          end
-                                          local.get $1
-                                          i32.const 0
-                                          i32.gt_s
-                                          local.get $5
-                                          local.get $8
-                                          i32.lt_u
-                                          i32.and
-                                          if ;; label = @20
-                                            loop $label$245 ;; label = @21
-                                              local.get $5
-                                              i32.load
-                                              i64.extend_i32_u
-                                              local.get $31
-                                              call $23
-                                              local.tee $7
-                                              local.get $19
-                                              i32.gt_u
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $19
-                                                  i32.const 48
-                                                  local.get $7
-                                                  local.get $27
-                                                  i32.sub
-                                                  call $46
-                                                  drop
-                                                  loop $label$247 ;; label = @24
-                                                    local.get $7
-                                                    i32.const -1
-                                                    i32.add
-                                                    local.tee $7
-                                                    local.get $19
-                                                    i32.gt_u
-                                                    br_if 0 (;@24;)
-                                                  end
-                                                end
-                                              end
-                                              local.get $0
-                                              i32.load
-                                              i32.const 32
-                                              i32.and
-                                              i32.eqz
-                                              if ;; label = @22
-                                                local.get $7
-                                                local.get $1
-                                                i32.const 9
-                                                i32.gt_s
-                                                if (result i32) ;; label = @23
-                                                  i32.const 9
-                                                else
-                                                  local.get $1
-                                                end
-                                                local.get $0
-                                                call $21
-                                                drop
-                                              end
-                                              local.get $1
-                                              i32.const -9
-                                              i32.add
-                                              local.set $7
-                                              local.get $1
-                                              i32.const 9
-                                              i32.gt_s
-                                              local.get $5
-                                              i32.const 4
-                                              i32.add
-                                              local.tee $5
-                                              local.get $8
-                                              i32.lt_u
-                                              i32.and
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $7
-                                                  local.set $1
-                                                  br 2 (;@21;)
-                                                end
-                                              else
-                                                local.get $7
-                                                local.set $1
-                                              end
-                                            end
-                                          end
-                                          local.get $0
-                                          i32.const 48
-                                          local.get $1
-                                          i32.const 9
-                                          i32.add
-                                          i32.const 9
-                                          i32.const 0
-                                          call $25
-                                        end
-                                      else
-                                        block ;; label = @19
-                                          local.get $14
-                                          i32.const 4
-                                          i32.add
-                                          local.set $5
-                                          local.get $22
-                                          i32.eqz
-                                          if ;; label = @20
-                                            local.get $5
-                                            local.set $8
-                                          end
-                                          local.get $1
-                                          i32.const -1
-                                          i32.gt_s
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              local.get $13
-                                              i32.eqz
-                                              local.set $13
-                                              local.get $14
-                                              local.set $7
-                                              local.get $1
-                                              local.set $5
-                                              loop $label$256 ;; label = @22
-                                                local.get $7
-                                                i32.load
-                                                i64.extend_i32_u
-                                                local.get $31
-                                                call $23
-                                                local.tee $1
-                                                local.get $31
-                                                i32.eq
-                                                if ;; label = @23
-                                                  block ;; label = @24
-                                                    local.get $34
-                                                    i32.const 48
-                                                    i32.store8
-                                                    local.get $34
-                                                    local.set $1
-                                                  end
-                                                end
-                                                block $label$258 ;; label = @23
-                                                  local.get $7
-                                                  local.get $14
-                                                  i32.eq
-                                                  if ;; label = @24
-                                                    block ;; label = @25
-                                                      local.get $0
-                                                      i32.load
-                                                      i32.const 32
-                                                      i32.and
-                                                      i32.eqz
-                                                      if ;; label = @26
-                                                        local.get $1
-                                                        i32.const 1
-                                                        local.get $0
-                                                        call $21
-                                                        drop
-                                                      end
-                                                      local.get $1
-                                                      i32.const 1
-                                                      i32.add
-                                                      local.set $1
-                                                      local.get $13
-                                                      local.get $5
-                                                      i32.const 1
-                                                      i32.lt_s
-                                                      i32.and
-                                                      br_if 2 (;@23;)
-                                                      local.get $0
-                                                      i32.load
-                                                      i32.const 32
-                                                      i32.and
-                                                      br_if 2 (;@23;)
-                                                      i32.const 2231
-                                                      i32.const 1
-                                                      local.get $0
-                                                      call $21
-                                                      drop
-                                                    end
-                                                  else
-                                                    block ;; label = @25
-                                                      local.get $1
-                                                      local.get $19
-                                                      i32.le_u
-                                                      br_if 2 (;@23;)
-                                                      local.get $19
-                                                      i32.const 48
-                                                      local.get $1
-                                                      local.get $43
-                                                      i32.add
-                                                      call $46
-                                                      drop
-                                                      loop $label$262 ;; label = @26
-                                                        local.get $1
-                                                        i32.const -1
-                                                        i32.add
-                                                        local.tee $1
-                                                        local.get $19
-                                                        i32.gt_u
-                                                        br_if 0 (;@26;)
-                                                      end
-                                                    end
-                                                  end
-                                                end
-                                                local.get $41
-                                                local.get $1
-                                                i32.sub
-                                                local.set $6
-                                                local.get $0
-                                                i32.load
-                                                i32.const 32
-                                                i32.and
-                                                i32.eqz
-                                                if ;; label = @23
-                                                  local.get $1
-                                                  local.get $5
-                                                  local.get $6
-                                                  i32.gt_s
-                                                  if (result i32) ;; label = @24
-                                                    local.get $6
-                                                  else
-                                                    local.get $5
-                                                  end
-                                                  local.get $0
-                                                  call $21
-                                                  drop
-                                                end
-                                                local.get $7
-                                                i32.const 4
-                                                i32.add
-                                                local.tee $7
-                                                local.get $8
-                                                i32.lt_u
-                                                local.get $5
-                                                local.get $6
-                                                i32.sub
-                                                local.tee $5
-                                                i32.const -1
-                                                i32.gt_s
-                                                i32.and
-                                                br_if 0 (;@22;)
-                                                local.get $5
-                                                local.set $1
-                                              end
-                                            end
-                                          end
-                                          local.get $0
-                                          i32.const 48
-                                          local.get $1
-                                          i32.const 18
-                                          i32.add
-                                          i32.const 18
-                                          i32.const 0
-                                          call $25
-                                          local.get $0
-                                          i32.load
-                                          i32.const 32
-                                          i32.and
-                                          br_if 2 (;@17;)
-                                          local.get $9
-                                          local.get $28
-                                          local.get $9
-                                          i32.sub
-                                          local.get $0
-                                          call $21
-                                          drop
-                                        end
-                                      end
-                                    end
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    local.get $18
-                                    local.get $12
-                                    i32.const 8192
-                                    i32.xor
-                                    call $25
-                                    local.get $18
-                                    local.get $10
-                                    i32.ge_s
-                                    if ;; label = @17
-                                      local.get $18
-                                      local.set $10
-                                    end
-                                  end
-                                else
-                                  block ;; label = @16
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    local.get $52
-                                    local.get $52
-                                    f64.ne
-                                    i32.const 0
-                                    i32.or
-                                    local.tee $6
-                                    if (result i32) ;; label = @17
-                                      i32.const 0
-                                      local.tee $24
-                                    else
-                                      local.get $24
-                                    end
-                                    i32.const 3
-                                    i32.add
-                                    local.tee $8
-                                    local.get $7
-                                    call $25
-                                    local.get $0
-                                    i32.load
-                                    local.tee $1
-                                    i32.const 32
-                                    i32.and
-                                    i32.eqz
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $26
-                                        local.get $24
-                                        local.get $0
-                                        call $21
-                                        drop
-                                        local.get $0
-                                        i32.load
-                                        local.set $1
-                                      end
-                                    end
-                                    local.get $9
-                                    i32.const 32
-                                    i32.and
-                                    i32.const 0
-                                    i32.ne
-                                    local.tee $5
-                                    if (result i32) ;; label = @17
-                                      i32.const 2215
-                                    else
-                                      i32.const 2219
-                                    end
-                                    local.set $7
-                                    local.get $5
-                                    if (result i32) ;; label = @17
-                                      i32.const 2223
-                                    else
-                                      i32.const 2227
-                                    end
-                                    local.set $5
-                                    local.get $6
-                                    i32.eqz
-                                    if ;; label = @17
-                                      local.get $7
-                                      local.set $5
-                                    end
-                                    local.get $1
-                                    i32.const 32
-                                    i32.and
-                                    i32.eqz
-                                    if ;; label = @17
-                                      local.get $5
-                                      i32.const 3
-                                      local.get $0
-                                      call $21
-                                      drop
-                                    end
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    local.get $8
-                                    local.get $12
-                                    i32.const 8192
-                                    i32.xor
-                                    call $25
-                                    local.get $8
-                                    local.get $10
-                                    i32.ge_s
-                                    if ;; label = @17
-                                      local.get $8
-                                      local.set $10
-                                    end
-                                  end
-                                end
-                              end
-                              local.get $11
-                              local.set $1
-                              br 9 (;@4;)
-                            end
-                            local.get $5
-                            local.set $7
-                            i32.const 0
-                            local.set $6
-                            i32.const 2179
-                            local.set $8
-                            local.get $21
-                            local.set $5
-                            br 6 (;@6;)
-                          end
-                          local.get $9
-                          i32.const 32
-                          i32.and
-                          local.set $7
-                          local.get $16
-                          i64.load
-                          local.tee $50
-                          i64.const 0
-                          i64.eq
-                          if (result i32) ;; label = @12
-                            block (result i32) ;; label = @13
-                              i64.const 0
-                              local.set $50
-                              local.get $21
-                            end
-                          else
-                            block (result i32) ;; label = @13
-                              local.get $21
-                              local.set $1
-                              loop $label$280 ;; label = @14
-                                local.get $1
-                                i32.const -1
-                                i32.add
-                                local.tee $1
-                                local.get $50
-                                i32.wrap_i64
-                                i32.const 15
-                                i32.and
-                                i32.const 2163
-                                i32.add
-                                i32.load8_u
-                                local.get $7
-                                i32.or
-                                i32.store8
-                                local.get $50
-                                i64.const 4
-                                i64.shr_u
-                                local.tee $50
-                                i64.const 0
-                                i64.ne
-                                br_if 0 (;@14;)
-                              end
-                              local.get $16
-                              i64.load
-                              local.set $50
-                              local.get $1
-                            end
-                          end
-                          local.set $7
-                          local.get $9
-                          i32.const 4
-                          i32.shr_s
-                          i32.const 2179
-                          i32.add
-                          local.set $8
-                          local.get $12
-                          i32.const 8
-                          i32.and
-                          i32.eqz
-                          local.get $50
-                          i64.const 0
-                          i64.eq
-                          i32.or
-                          local.tee $1
-                          if ;; label = @12
-                            i32.const 2179
-                            local.set $8
-                          end
-                          local.get $1
-                          if (result i32) ;; label = @12
-                            i32.const 0
-                          else
-                            i32.const 2
-                          end
-                          local.set $6
-                          br 4 (;@7;)
-                        end
-                        local.get $50
-                        local.get $21
-                        call $23
-                        local.set $7
-                        br 3 (;@7;)
-                      end
-                      local.get $1
-                      i32.const 0
-                      local.get $5
-                      call $17
-                      local.tee $13
-                      i32.eqz
-                      local.set $14
-                      local.get $13
-                      local.get $1
-                      i32.sub
-                      local.set $8
-                      local.get $1
-                      local.get $5
-                      i32.add
-                      local.set $9
-                      local.get $7
-                      local.set $12
-                      local.get $14
-                      if (result i32) ;; label = @10
-                        local.get $5
-                      else
-                        local.get $8
-                      end
-                      local.set $7
-                      i32.const 0
-                      local.set $6
-                      i32.const 2179
-                      local.set $8
-                      local.get $14
-                      if (result i32) ;; label = @10
-                        local.get $9
-                      else
-                        local.get $13
-                      end
-                      local.set $5
-                      br 3 (;@6;)
-                    end
-                    i32.const 0
-                    local.set $1
-                    i32.const 0
-                    local.set $5
-                    local.get $7
-                    local.set $8
-                    loop $label$288 ;; label = @9
-                      block $label$289 ;; label = @10
-                        local.get $8
-                        i32.load
-                        local.tee $9
-                        i32.eqz
-                        br_if 0 (;@10;)
-                        local.get $36
-                        local.get $9
-                        call $26
-                        local.tee $5
-                        i32.const 0
-                        i32.lt_s
-                        local.get $5
-                        local.get $6
-                        local.get $1
-                        i32.sub
-                        i32.gt_u
-                        i32.or
-                        br_if 0 (;@10;)
-                        local.get $8
-                        i32.const 4
-                        i32.add
-                        local.set $8
-                        local.get $6
-                        local.get $5
-                        local.get $1
-                        i32.add
-                        local.tee $1
-                        i32.gt_u
-                        br_if 1 (;@9;)
-                      end
-                    end
-                    local.get $5
-                    i32.const 0
-                    i32.lt_s
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const -1
-                        local.set $15
-                        br 5 (;@5;)
-                      end
-                    end
-                    local.get $0
-                    i32.const 32
-                    local.get $10
-                    local.get $1
-                    local.get $12
-                    call $25
-                    local.get $1
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const 0
-                        local.set $5
-                        loop $label$292 ;; label = @11
-                          local.get $7
-                          i32.load
-                          local.tee $8
-                          i32.eqz
-                          br_if 3 (;@8;)
-                          local.get $36
-                          local.get $8
-                          call $26
-                          local.tee $8
-                          local.get $5
-                          i32.add
-                          local.tee $5
-                          local.get $1
-                          i32.gt_s
-                          br_if 3 (;@8;)
-                          local.get $0
-                          i32.load
-                          i32.const 32
-                          i32.and
-                          i32.eqz
-                          if ;; label = @12
-                            local.get $36
-                            local.get $8
-                            local.get $0
-                            call $21
-                            drop
-                          end
-                          local.get $7
-                          i32.const 4
-                          i32.add
-                          local.set $7
-                          local.get $5
-                          local.get $1
-                          i32.lt_u
-                          br_if 0 (;@11;)
-                          br 3 (;@8;)
-                        end
-                      end
-                    else
-                      block ;; label = @10
-                        i32.const 0
-                        local.set $1
-                        br 2 (;@8;)
-                      end
-                    end
-                  end
-                  local.get $0
-                  i32.const 32
-                  local.get $10
-                  local.get $1
-                  local.get $12
-                  i32.const 8192
-                  i32.xor
-                  call $25
-                  local.get $10
-                  local.get $1
-                  i32.le_s
-                  if ;; label = @8
-                    local.get $1
-                    local.set $10
-                  end
-                  local.get $11
-                  local.set $1
-                  br 3 (;@4;)
-                end
-                local.get $12
-                i32.const -65537
-                i32.and
-                local.set $1
-                local.get $5
-                i32.const -1
-                i32.gt_s
-                if ;; label = @7
-                  local.get $1
-                  local.set $12
-                end
-                local.get $5
-                local.get $16
-                i64.load
-                i64.const 0
-                i64.ne
-                local.tee $9
-                i32.or
-                if (result i32) ;; label = @7
-                  block (result i32) ;; label = @8
-                    local.get $7
-                    local.set $1
-                    local.get $5
-                    local.get $9
-                    i32.const 1
-                    i32.and
-                    i32.const 1
-                    i32.xor
-                    local.get $38
-                    local.get $7
-                    i32.sub
-                    i32.add
-                    local.tee $7
-                    i32.gt_s
-                    if ;; label = @9
-                      local.get $5
-                      local.set $7
-                    end
-                    local.get $21
-                  end
-                else
-                  block (result i32) ;; label = @8
-                    local.get $21
-                    local.set $1
-                    i32.const 0
-                    local.set $7
-                    local.get $21
-                  end
-                end
-                local.set $5
-              end
-              local.get $0
-              i32.const 32
-              local.get $10
-              local.get $7
-              local.get $5
-              local.get $1
-              i32.sub
-              local.tee $9
-              i32.lt_s
-              if (result i32) ;; label = @6
-                local.get $9
-                local.tee $7
-              else
-                local.get $7
-              end
-              local.get $6
-              i32.add
-              local.tee $5
-              i32.lt_s
-              if (result i32) ;; label = @6
-                local.get $5
-                local.tee $10
-              else
-                local.get $10
-              end
-              local.get $5
-              local.get $12
-              call $25
-              local.get $0
-              i32.load
-              i32.const 32
-              i32.and
-              i32.eqz
-              if ;; label = @6
-                local.get $8
-                local.get $6
-                local.get $0
-                call $21
-                drop
-              end
-              local.get $0
-              i32.const 48
-              local.get $10
-              local.get $5
-              local.get $12
-              i32.const 65536
-              i32.xor
-              call $25
-              local.get $0
-              i32.const 48
-              local.get $7
-              local.get $9
-              i32.const 0
-              call $25
-              local.get $0
-              i32.load
-              i32.const 32
-              i32.and
-              i32.eqz
-              if ;; label = @6
-                local.get $1
-                local.get $9
-                local.get $0
-                call $21
-                drop
-              end
-              local.get $0
-              i32.const 32
-              local.get $10
-              local.get $5
-              local.get $12
-              i32.const 8192
-              i32.xor
-              call $25
-              local.get $11
-              local.set $1
-              br 1 (;@4;)
-            end
-          end
-          br 1 (;@2;)
-        end
-        local.get $0
-        i32.eqz
-        if ;; label = @3
-          local.get $17
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 1
-              local.set $0
-              loop $label$308 ;; label = @6
-                local.get $4
-                local.get $0
-                i32.const 2
-                i32.shl
-                i32.add
-                i32.load
-                local.tee $1
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $3
-                    local.get $0
-                    i32.const 3
-                    i32.shl
-                    i32.add
-                    local.get $1
-                    local.get $2
-                    call $22
-                    local.get $0
-                    i32.const 1
-                    i32.add
-                    local.tee $0
-                    i32.const 10
-                    i32.lt_s
-                    br_if 2 (;@6;)
-                    i32.const 1
-                    local.set $15
-                    br 6 (;@2;)
-                  end
-                end
-              end
-              loop $label$310 ;; label = @6
-                local.get $4
-                local.get $0
-                i32.const 2
-                i32.shl
-                i32.add
-                i32.load
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const -1
-                    local.set $15
-                    br 6 (;@2;)
-                  end
-                end
-                local.get $0
-                i32.const 1
-                i32.add
-                local.tee $0
-                i32.const 10
-                i32.lt_s
-                br_if 0 (;@6;)
-                i32.const 1
-                local.set $15
-              end
-            end
-          else
-            i32.const 0
-            local.set $15
-          end
-        end
-      end
-      local.get $23
-      global.set $global$1
-      local.get $15
-    end
+ )
+ (func $24 (; 37 ;) (type $2) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (i32.const 0)
+   )
+   (block $label$2
+    (block $label$3
+     (block $label$4
+      (loop $label$5
+       (br_if $label$4
+        (i32.eq
+         (i32.load8_u
+          (i32.add
+           (local.get $1)
+           (i32.const 2233)
+          )
+         )
+         (local.get $0)
+        )
+       )
+       (br_if $label$5
+        (i32.ne
+         (local.tee $1
+          (i32.add
+           (local.get $1)
+           (i32.const 1)
+          )
+         )
+         (i32.const 87)
+        )
+       )
+       (local.set $1
+        (i32.const 87)
+       )
+       (local.set $0
+        (i32.const 2321)
+       )
+       (br $label$3)
+      )
+     )
+     (if
+      (local.get $1)
+      (block
+       (local.set $0
+        (i32.const 2321)
+       )
+       (br $label$3)
+      )
+      (local.set $0
+       (i32.const 2321)
+      )
+     )
+     (br $label$2)
+    )
+    (loop $label$8
+     (local.set $2
+      (local.get $0)
+     )
+     (loop $label$9
+      (local.set $0
+       (i32.add
+        (local.get $2)
+        (i32.const 1)
+       )
+      )
+      (if
+       (i32.load8_s
+        (local.get $2)
+       )
+       (block
+        (local.set $2
+         (local.get $0)
+        )
+        (br $label$9)
+       )
+      )
+     )
+     (br_if $label$8
+      (local.tee $1
+       (i32.add
+        (local.get $1)
+        (i32.const -1)
+       )
+      )
+     )
+    )
+   )
+   (local.get $0)
   )
-  (func $20 (;33;) (type $2) (param $0 i32) (result i32)
-    i32.const 0
+ )
+ (func $25 (; 38 ;) (type $10) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (block $label$1
+   (local.set $7
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 256)
+    )
+   )
+   (local.set $6
+    (local.get $7)
+   )
+   (block $label$2
+    (if
+     (i32.and
+      (i32.gt_s
+       (local.get $2)
+       (local.get $3)
+      )
+      (i32.eqz
+       (i32.and
+        (local.get $4)
+        (i32.const 73728)
+       )
+      )
+     )
+     (block
+      (drop
+       (call $46
+        (local.get $6)
+        (local.get $1)
+        (if (result i32)
+         (i32.gt_u
+          (local.tee $5
+           (i32.sub
+            (local.get $2)
+            (local.get $3)
+           )
+          )
+          (i32.const 256)
+         )
+         (i32.const 256)
+         (local.get $5)
+        )
+       )
+      )
+      (local.set $4
+       (i32.eqz
+        (i32.and
+         (local.tee $1
+          (i32.load
+           (local.get $0)
+          )
+         )
+         (i32.const 32)
+        )
+       )
+      )
+      (if
+       (i32.gt_u
+        (local.get $5)
+        (i32.const 255)
+       )
+       (block
+        (loop $label$7
+         (if
+          (local.get $4)
+          (block
+           (drop
+            (call $21
+             (local.get $6)
+             (i32.const 256)
+             (local.get $0)
+            )
+           )
+           (local.set $1
+            (i32.load
+             (local.get $0)
+            )
+           )
+          )
+         )
+         (local.set $4
+          (i32.eqz
+           (i32.and
+            (local.get $1)
+            (i32.const 32)
+           )
+          )
+         )
+         (br_if $label$7
+          (i32.gt_u
+           (local.tee $5
+            (i32.add
+             (local.get $5)
+             (i32.const -256)
+            )
+           )
+           (i32.const 255)
+          )
+         )
+        )
+        (br_if $label$2
+         (i32.eqz
+          (local.get $4)
+         )
+        )
+        (local.set $5
+         (i32.and
+          (i32.sub
+           (local.get $2)
+           (local.get $3)
+          )
+          (i32.const 255)
+         )
+        )
+       )
+       (br_if $label$2
+        (i32.eqz
+         (local.get $4)
+        )
+       )
+      )
+      (drop
+       (call $21
+        (local.get $6)
+        (local.get $5)
+        (local.get $0)
+       )
+      )
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $7)
+   )
   )
-  (func $21 (;34;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32)
-    block $label$1 (result i32) ;; label = @1
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          local.get $2
-          i32.const 16
-          i32.add
-          local.tee $4
-          i32.load
-          local.tee $3
-          br_if 0 (;@3;)
-          local.get $2
-          call $30
-          if ;; label = @4
-            i32.const 0
-            local.set $3
-          else
-            block ;; label = @5
-              local.get $4
-              i32.load
-              local.set $3
-              br 2 (;@3;)
-            end
-          end
-          br 1 (;@2;)
-        end
-        local.get $3
-        local.get $2
-        i32.const 20
-        i32.add
-        local.tee $5
-        i32.load
-        local.tee $4
-        i32.sub
-        local.get $1
-        i32.lt_u
-        if ;; label = @3
-          block ;; label = @4
-            local.get $2
-            local.get $0
-            local.get $1
-            local.get $2
-            i32.load offset=36
-            i32.const 3
-            i32.and
-            i32.const 2
-            i32.add
-            call_indirect (type $0)
-            local.set $3
-            br 2 (;@2;)
-          end
-        end
-        block $label$7 (result i32) ;; label = @3
-          local.get $2
-          i32.load8_s offset=75
-          i32.const -1
-          i32.gt_s
-          if (result i32) ;; label = @4
-            block (result i32) ;; label = @5
-              local.get $1
-              local.set $3
-              loop $label$9 ;; label = @6
-                i32.const 0
-                local.get $3
-                i32.eqz
-                br_if 3 (;@3;)
-                drop
-                local.get $0
-                local.get $3
-                i32.const -1
-                i32.add
-                local.tee $6
-                i32.add
-                i32.load8_s
-                i32.const 10
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $6
-                    local.set $3
-                    br 2 (;@6;)
-                  end
-                end
-              end
-              local.get $2
-              local.get $0
-              local.get $3
-              local.get $2
-              i32.load offset=36
-              i32.const 3
-              i32.and
-              i32.const 2
-              i32.add
-              call_indirect (type $0)
-              local.get $3
-              i32.lt_u
-              br_if 3 (;@2;)
-              local.get $5
-              i32.load
-              local.set $4
-              local.get $1
-              local.get $3
-              i32.sub
-              local.set $1
-              local.get $0
-              local.get $3
-              i32.add
-              local.set $0
-              local.get $3
-            end
-          else
-            i32.const 0
-          end
-        end
-        local.set $2
-        local.get $4
-        local.get $0
-        local.get $1
-        call $47
-        drop
-        local.get $5
-        local.get $5
-        i32.load
-        local.get $1
-        i32.add
-        i32.store
-        local.get $2
-        local.get $1
-        i32.add
-        local.set $3
-      end
-      local.get $3
-    end
+ )
+ (func $26 (; 39 ;) (type $6) (param $0 i32) (param $1 i32) (result i32)
+  (if (result i32)
+   (local.get $0)
+   (call $29
+    (local.get $0)
+    (local.get $1)
+    (i32.const 0)
+   )
+   (i32.const 0)
   )
-  (func $22 (;35;) (type $8) (param $0 i32) (param $1 i32) (param $2 i32)
-    (local $3 i32) (local $4 i64) (local $5 f64)
-    block $label$1 ;; label = @1
-      local.get $1
-      i32.const 20
-      i32.le_u
-      if ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            block $label$5 ;; label = @5
-              block $label$6 ;; label = @6
-                block $label$7 ;; label = @7
-                  block $label$8 ;; label = @8
-                    block $label$9 ;; label = @9
-                      block $label$10 ;; label = @10
-                        block $label$11 ;; label = @11
-                          block $label$12 ;; label = @12
-                            block $label$13 ;; label = @13
-                              local.get $1
-                              i32.const 9
-                              i32.sub
-                              br_table 0 (;@13;) 1 (;@12;) 2 (;@11;) 3 (;@10;) 4 (;@9;) 5 (;@8;) 6 (;@7;) 7 (;@6;) 8 (;@5;) 9 (;@4;) 10 (;@3;)
-                            end
-                            local.get $2
-                            i32.load
-                            i32.const 3
-                            i32.add
-                            i32.const -4
-                            i32.and
-                            local.tee $1
-                            i32.load
-                            local.set $3
-                            local.get $2
-                            local.get $1
-                            i32.const 4
-                            i32.add
-                            i32.store
-                            local.get $0
-                            local.get $3
-                            i32.store
-                            br 11 (;@1;)
-                          end
-                          local.get $2
-                          i32.load
-                          i32.const 3
-                          i32.add
-                          i32.const -4
-                          i32.and
-                          local.tee $1
-                          i32.load
-                          local.set $3
-                          local.get $2
-                          local.get $1
-                          i32.const 4
-                          i32.add
-                          i32.store
-                          local.get $0
-                          local.get $3
-                          i64.extend_i32_s
-                          i64.store
-                          br 10 (;@1;)
-                        end
-                        local.get $2
-                        i32.load
-                        i32.const 3
-                        i32.add
-                        i32.const -4
-                        i32.and
-                        local.tee $1
-                        i32.load
-                        local.set $3
-                        local.get $2
-                        local.get $1
-                        i32.const 4
-                        i32.add
-                        i32.store
-                        local.get $0
-                        local.get $3
-                        i64.extend_i32_u
-                        i64.store
-                        br 9 (;@1;)
-                      end
-                      local.get $2
-                      i32.load
-                      i32.const 7
-                      i32.add
-                      i32.const -8
-                      i32.and
-                      local.tee $1
-                      i64.load
-                      local.set $4
-                      local.get $2
-                      local.get $1
-                      i32.const 8
-                      i32.add
-                      i32.store
-                      local.get $0
-                      local.get $4
-                      i64.store
-                      br 8 (;@1;)
-                    end
-                    local.get $2
-                    i32.load
-                    i32.const 3
-                    i32.add
-                    i32.const -4
-                    i32.and
-                    local.tee $1
-                    i32.load
-                    local.set $3
-                    local.get $2
-                    local.get $1
-                    i32.const 4
-                    i32.add
-                    i32.store
-                    local.get $0
-                    local.get $3
-                    i32.const 65535
-                    i32.and
-                    i32.const 16
-                    i32.shl
-                    i32.const 16
-                    i32.shr_s
-                    i64.extend_i32_s
-                    i64.store
-                    br 7 (;@1;)
-                  end
-                  local.get $2
-                  i32.load
-                  i32.const 3
-                  i32.add
-                  i32.const -4
-                  i32.and
-                  local.tee $1
-                  i32.load
-                  local.set $3
-                  local.get $2
-                  local.get $1
-                  i32.const 4
-                  i32.add
-                  i32.store
-                  local.get $0
-                  local.get $3
-                  i32.const 65535
-                  i32.and
-                  i64.extend_i32_u
-                  i64.store
-                  br 6 (;@1;)
-                end
-                local.get $2
-                i32.load
-                i32.const 3
-                i32.add
-                i32.const -4
-                i32.and
-                local.tee $1
-                i32.load
-                local.set $3
-                local.get $2
-                local.get $1
-                i32.const 4
-                i32.add
-                i32.store
-                local.get $0
-                local.get $3
-                i32.const 255
-                i32.and
-                i32.const 24
-                i32.shl
-                i32.const 24
-                i32.shr_s
-                i64.extend_i32_s
-                i64.store
-                br 5 (;@1;)
-              end
-              local.get $2
-              i32.load
-              i32.const 3
-              i32.add
-              i32.const -4
-              i32.and
-              local.tee $1
-              i32.load
-              local.set $3
-              local.get $2
-              local.get $1
-              i32.const 4
-              i32.add
-              i32.store
-              local.get $0
-              local.get $3
-              i32.const 255
-              i32.and
-              i64.extend_i32_u
-              i64.store
-              br 4 (;@1;)
-            end
-            local.get $2
-            i32.load
-            i32.const 7
-            i32.add
-            i32.const -8
-            i32.and
-            local.tee $1
-            f64.load
-            local.set $5
-            local.get $2
-            local.get $1
-            i32.const 8
-            i32.add
-            i32.store
-            local.get $0
-            local.get $5
-            f64.store
-            br 3 (;@1;)
-          end
-          local.get $2
-          i32.load
-          i32.const 7
-          i32.add
-          i32.const -8
-          i32.and
-          local.tee $1
-          f64.load
-          local.set $5
-          local.get $2
-          local.get $1
-          i32.const 8
-          i32.add
-          i32.store
-          local.get $0
-          local.get $5
-          f64.store
-        end
-      end
-    end
+ )
+ (func $27 (; 40 ;) (type $11) (param $0 f64) (param $1 i32) (result f64)
+  (call $28
+   (local.get $0)
+   (local.get $1)
   )
-  (func $23 (;36;) (type $9) (param $0 i64) (param $1 i32) (result i32)
-    (local $2 i32) (local $3 i32) (local $4 i64)
-    block $label$1 (result i32) ;; label = @1
-      local.get $0
-      i32.wrap_i64
-      local.set $2
-      local.get $0
-      i64.const 4294967295
-      i64.gt_u
-      if ;; label = @2
-        block ;; label = @3
-          loop $label$3 ;; label = @4
-            local.get $1
-            i32.const -1
-            i32.add
-            local.tee $1
-            local.get $0
-            i64.const 10
-            i64.rem_u
-            i64.const 48
-            i64.or
-            i64.store8
-            local.get $0
-            i64.const 10
-            i64.div_u
-            local.set $4
-            local.get $0
-            i64.const 42949672959
-            i64.gt_u
-            if ;; label = @5
-              block ;; label = @6
-                local.get $4
-                local.set $0
-                br 2 (;@4;)
-              end
-            end
-          end
-          local.get $4
-          i32.wrap_i64
-          local.set $2
-        end
-      end
-      local.get $2
-      if ;; label = @2
-        loop $label$6 ;; label = @3
-          local.get $1
-          i32.const -1
-          i32.add
-          local.tee $1
-          local.get $2
-          i32.const 10
-          i32.rem_u
-          i32.const 48
-          i32.or
-          i32.store8
-          local.get $2
-          i32.const 10
-          i32.div_u
-          local.set $3
-          local.get $2
-          i32.const 10
-          i32.ge_u
-          if ;; label = @4
-            block ;; label = @5
-              local.get $3
-              local.set $2
-              br 2 (;@3;)
-            end
-          end
-        end
-      end
-      local.get $1
-    end
+ )
+ (func $28 (; 41 ;) (type $11) (param $0 f64) (param $1 i32) (result f64)
+  (local $2 i64)
+  (local $3 i64)
+  (block $label$1 (result f64)
+   (block $label$2
+    (block $label$3
+     (block $label$4
+      (block $label$5
+       (br_table $label$5 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$4 $label$3
+        (i32.sub
+         (i32.shr_s
+          (i32.shl
+           (i32.and
+            (i32.and
+             (i32.wrap_i64
+              (local.tee $3
+               (i64.shr_u
+                (local.tee $2
+                 (i64.reinterpret_f64
+                  (local.get $0)
+                 )
+                )
+                (i64.const 52)
+               )
+              )
+             )
+             (i32.const 65535)
+            )
+            (i32.const 2047)
+           )
+           (i32.const 16)
+          )
+          (i32.const 16)
+         )
+         (i32.const 0)
+        )
+       )
+      )
+      (i32.store
+       (local.get $1)
+       (if (result i32)
+        (f64.ne
+         (local.get $0)
+         (f64.const 0)
+        )
+        (block (result i32)
+         (local.set $0
+          (call $28
+           (f64.mul
+            (local.get $0)
+            (f64.const 18446744073709551615)
+           )
+           (local.get $1)
+          )
+         )
+         (i32.add
+          (i32.load
+           (local.get $1)
+          )
+          (i32.const -64)
+         )
+        )
+        (i32.const 0)
+       )
+      )
+      (br $label$2)
+     )
+     (br $label$2)
+    )
+    (i32.store
+     (local.get $1)
+     (i32.add
+      (i32.and
+       (i32.wrap_i64
+        (local.get $3)
+       )
+       (i32.const 2047)
+      )
+      (i32.const -1022)
+     )
+    )
+    (local.set $0
+     (f64.reinterpret_i64
+      (i64.or
+       (i64.and
+        (local.get $2)
+        (i64.const -9218868437227405313)
+       )
+       (i64.const 4602678819172646912)
+      )
+     )
+    )
+   )
+   (local.get $0)
   )
-  (func $24 (;37;) (type $2) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32)
-    block $label$1 (result i32) ;; label = @1
-      i32.const 0
-      local.set $1
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            loop $label$5 ;; label = @5
-              local.get $1
-              i32.const 2233
-              i32.add
-              i32.load8_u
-              local.get $0
-              i32.eq
-              br_if 1 (;@4;)
-              local.get $1
-              i32.const 1
-              i32.add
-              local.tee $1
-              i32.const 87
-              i32.ne
-              br_if 0 (;@5;)
-              i32.const 87
-              local.set $1
-              i32.const 2321
-              local.set $0
-              br 2 (;@3;)
-            end
-          end
-          local.get $1
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 2321
-              local.set $0
-              br 2 (;@3;)
-            end
-          else
-            i32.const 2321
-            local.set $0
-          end
-          br 1 (;@2;)
-        end
-        loop $label$8 ;; label = @3
-          local.get $0
-          local.set $2
-          loop $label$9 ;; label = @4
-            local.get $2
-            i32.const 1
-            i32.add
-            local.set $0
-            local.get $2
-            i32.load8_s
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                local.set $2
-                br 2 (;@4;)
-              end
-            end
-          end
-          local.get $1
-          i32.const -1
-          i32.add
-          local.tee $1
-          br_if 0 (;@3;)
-        end
-      end
-      local.get $0
-    end
+ )
+ (func $29 (; 42 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (block $label$1 (result i32)
+   (if (result i32)
+    (local.get $0)
+    (block (result i32)
+     (if
+      (i32.lt_u
+       (local.get $1)
+       (i32.const 128)
+      )
+      (block
+       (i32.store8
+        (local.get $0)
+        (local.get $1)
+       )
+       (br $label$1
+        (i32.const 1)
+       )
+      )
+     )
+     (if
+      (i32.lt_u
+       (local.get $1)
+       (i32.const 2048)
+      )
+      (block
+       (i32.store8
+        (local.get $0)
+        (i32.or
+         (i32.shr_u
+          (local.get $1)
+          (i32.const 6)
+         )
+         (i32.const 192)
+        )
+       )
+       (i32.store8 offset=1
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (local.get $1)
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (br $label$1
+        (i32.const 2)
+       )
+      )
+     )
+     (if
+      (i32.or
+       (i32.lt_u
+        (local.get $1)
+        (i32.const 55296)
+       )
+       (i32.eq
+        (i32.and
+         (local.get $1)
+         (i32.const -8192)
+        )
+        (i32.const 57344)
+       )
+      )
+      (block
+       (i32.store8
+        (local.get $0)
+        (i32.or
+         (i32.shr_u
+          (local.get $1)
+          (i32.const 12)
+         )
+         (i32.const 224)
+        )
+       )
+       (i32.store8 offset=1
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (i32.shr_u
+           (local.get $1)
+           (i32.const 6)
+          )
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (i32.store8 offset=2
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (local.get $1)
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (br $label$1
+        (i32.const 3)
+       )
+      )
+     )
+     (if (result i32)
+      (i32.lt_u
+       (i32.add
+        (local.get $1)
+        (i32.const -65536)
+       )
+       (i32.const 1048576)
+      )
+      (block (result i32)
+       (i32.store8
+        (local.get $0)
+        (i32.or
+         (i32.shr_u
+          (local.get $1)
+          (i32.const 18)
+         )
+         (i32.const 240)
+        )
+       )
+       (i32.store8 offset=1
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (i32.shr_u
+           (local.get $1)
+           (i32.const 12)
+          )
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (i32.store8 offset=2
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (i32.shr_u
+           (local.get $1)
+           (i32.const 6)
+          )
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (i32.store8 offset=3
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (local.get $1)
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (i32.const 4)
+      )
+      (block (result i32)
+       (i32.store
+        (call $12)
+        (i32.const 84)
+       )
+       (i32.const -1)
+      )
+     )
+    )
+    (i32.const 1)
+   )
   )
-  (func $25 (;38;) (type $10) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
-    (local $5 i32) (local $6 i32) (local $7 i32)
-    block $label$1 ;; label = @1
-      global.get $global$1
-      local.set $7
-      global.get $global$1
-      i32.const 256
-      i32.add
-      global.set $global$1
-      local.get $7
-      local.set $6
-      block $label$2 ;; label = @2
-        local.get $2
-        local.get $3
-        i32.gt_s
-        local.get $4
-        i32.const 73728
-        i32.and
-        i32.eqz
-        i32.and
-        if ;; label = @3
-          block ;; label = @4
-            local.get $6
-            local.get $1
-            local.get $2
-            local.get $3
-            i32.sub
-            local.tee $5
-            i32.const 256
-            i32.gt_u
-            if (result i32) ;; label = @5
-              i32.const 256
-            else
-              local.get $5
-            end
-            call $46
-            drop
-            local.get $0
-            i32.load
-            local.tee $1
-            i32.const 32
-            i32.and
-            i32.eqz
-            local.set $4
-            local.get $5
-            i32.const 255
-            i32.gt_u
-            if ;; label = @5
-              block ;; label = @6
-                loop $label$7 ;; label = @7
-                  local.get $4
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $6
-                      i32.const 256
-                      local.get $0
-                      call $21
-                      drop
-                      local.get $0
-                      i32.load
-                      local.set $1
-                    end
-                  end
-                  local.get $1
-                  i32.const 32
-                  i32.and
-                  i32.eqz
-                  local.set $4
-                  local.get $5
-                  i32.const -256
-                  i32.add
-                  local.tee $5
-                  i32.const 255
-                  i32.gt_u
-                  br_if 0 (;@7;)
-                end
-                local.get $4
-                i32.eqz
-                br_if 4 (;@2;)
-                local.get $2
-                local.get $3
-                i32.sub
-                i32.const 255
-                i32.and
-                local.set $5
-              end
-            else
-              local.get $4
-              i32.eqz
-              br_if 3 (;@2;)
-            end
-            local.get $6
-            local.get $5
-            local.get $0
-            call $21
-            drop
-          end
-        end
-      end
-      local.get $7
-      global.set $global$1
-    end
+ )
+ (func $30 (; 43 ;) (type $2) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (i32.load8_s
+     (local.tee $2
+      (i32.add
+       (local.get $0)
+       (i32.const 74)
+      )
+     )
+    )
+   )
+   (i32.store8
+    (local.get $2)
+    (i32.or
+     (i32.add
+      (local.get $1)
+      (i32.const 255)
+     )
+     (local.get $1)
+    )
+   )
+   (local.tee $0
+    (if (result i32)
+     (i32.and
+      (local.tee $1
+       (i32.load
+        (local.get $0)
+       )
+      )
+      (i32.const 8)
+     )
+     (block (result i32)
+      (i32.store
+       (local.get $0)
+       (i32.or
+        (local.get $1)
+        (i32.const 32)
+       )
+      )
+      (i32.const -1)
+     )
+     (block (result i32)
+      (i32.store offset=8
+       (local.get $0)
+       (i32.const 0)
+      )
+      (i32.store offset=4
+       (local.get $0)
+       (i32.const 0)
+      )
+      (i32.store offset=28
+       (local.get $0)
+       (local.tee $1
+        (i32.load offset=44
+         (local.get $0)
+        )
+       )
+      )
+      (i32.store offset=20
+       (local.get $0)
+       (local.get $1)
+      )
+      (i32.store offset=16
+       (local.get $0)
+       (i32.add
+        (local.get $1)
+        (i32.load offset=48
+         (local.get $0)
+        )
+       )
+      )
+      (i32.const 0)
+     )
+    )
+   )
   )
-  (func $26 (;39;) (type $6) (param $0 i32) (param $1 i32) (result i32)
-    local.get $0
-    if (result i32) ;; label = @1
-      local.get $0
-      local.get $1
-      i32.const 0
-      call $29
-    else
-      i32.const 0
-    end
+ )
+ (func $31 (; 44 ;) (type $2) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (local $3 i32)
+  (block $label$1 (result i32)
+   (block $label$2
+    (block $label$3
+     (br_if $label$3
+      (i32.eqz
+       (i32.and
+        (local.tee $2
+         (local.get $0)
+        )
+        (i32.const 3)
+       )
+      )
+     )
+     (local.set $1
+      (local.get $2)
+     )
+     (loop $label$4
+      (if
+       (i32.eqz
+        (i32.load8_s
+         (local.get $0)
+        )
+       )
+       (block
+        (local.set $0
+         (local.get $1)
+        )
+        (br $label$2)
+       )
+      )
+      (br_if $label$4
+       (i32.and
+        (local.tee $1
+         (local.tee $0
+          (i32.add
+           (local.get $0)
+           (i32.const 1)
+          )
+         )
+        )
+        (i32.const 3)
+       )
+      )
+      (br $label$3)
+     )
+    )
+    (loop $label$6
+     (local.set $1
+      (i32.add
+       (local.get $0)
+       (i32.const 4)
+      )
+     )
+     (if
+      (i32.eqz
+       (i32.and
+        (i32.xor
+         (i32.and
+          (local.tee $3
+           (i32.load
+            (local.get $0)
+           )
+          )
+          (i32.const -2139062144)
+         )
+         (i32.const -2139062144)
+        )
+        (i32.add
+         (local.get $3)
+         (i32.const -16843009)
+        )
+       )
+      )
+      (block
+       (local.set $0
+        (local.get $1)
+       )
+       (br $label$6)
+      )
+     )
+    )
+    (if
+     (i32.shr_s
+      (i32.shl
+       (i32.and
+        (local.get $3)
+        (i32.const 255)
+       )
+       (i32.const 24)
+      )
+      (i32.const 24)
+     )
+     (loop $label$9
+      (br_if $label$9
+       (i32.load8_s
+        (local.tee $0
+         (i32.add
+          (local.get $0)
+          (i32.const 1)
+         )
+        )
+       )
+      )
+     )
+    )
+   )
+   (i32.sub
+    (local.get $0)
+    (local.get $2)
+   )
   )
-  (func $27 (;40;) (type $11) (param $0 f64) (param $1 i32) (result f64)
-    local.get $0
-    local.get $1
-    call $28
+ )
+ (func $32 (; 45 ;) (type $6) (param $0 i32) (param $1 i32) (result i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (block $label$1 (result i32)
+   (local.set $3
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 16)
+    )
+   )
+   (i32.store8
+    (local.tee $4
+     (local.get $3)
+    )
+    (local.tee $7
+     (i32.and
+      (local.get $1)
+      (i32.const 255)
+     )
+    )
+   )
+   (block $label$2
+    (block $label$3
+     (br_if $label$3
+      (local.tee $5
+       (i32.load
+        (local.tee $2
+         (i32.add
+          (local.get $0)
+          (i32.const 16)
+         )
+        )
+       )
+      )
+     )
+     (if
+      (call $30
+       (local.get $0)
+      )
+      (local.set $1
+       (i32.const -1)
+      )
+      (block
+       (local.set $5
+        (i32.load
+         (local.get $2)
+        )
+       )
+       (br $label$3)
+      )
+     )
+     (br $label$2)
+    )
+    (if
+     (i32.lt_u
+      (local.tee $6
+       (i32.load
+        (local.tee $2
+         (i32.add
+          (local.get $0)
+          (i32.const 20)
+         )
+        )
+       )
+      )
+      (local.get $5)
+     )
+     (if
+      (i32.ne
+       (local.tee $1
+        (i32.and
+         (local.get $1)
+         (i32.const 255)
+        )
+       )
+       (i32.load8_s offset=75
+        (local.get $0)
+       )
+      )
+      (block
+       (i32.store
+        (local.get $2)
+        (i32.add
+         (local.get $6)
+         (i32.const 1)
+        )
+       )
+       (i32.store8
+        (local.get $6)
+        (local.get $7)
+       )
+       (br $label$2)
+      )
+     )
+    )
+    (local.set $1
+     (if (result i32)
+      (i32.eq
+       (call_indirect (type $0)
+        (local.get $0)
+        (local.get $4)
+        (i32.const 1)
+        (i32.add
+         (i32.and
+          (i32.load offset=36
+           (local.get $0)
+          )
+          (i32.const 3)
+         )
+         (i32.const 2)
+        )
+       )
+       (i32.const 1)
+      )
+      (i32.load8_u
+       (local.get $4)
+      )
+      (i32.const -1)
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $3)
+   )
+   (local.get $1)
   )
-  (func $28 (;41;) (type $11) (param $0 f64) (param $1 i32) (result f64)
-    (local $2 i64) (local $3 i64)
-    block $label$1 (result f64) ;; label = @1
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            block $label$5 ;; label = @5
-              local.get $0
-              i64.reinterpret_f64
-              local.tee $2
-              i64.const 52
-              i64.shr_u
-              local.tee $3
-              i32.wrap_i64
-              i32.const 65535
-              i32.and
-              i32.const 2047
-              i32.and
-              i32.const 16
-              i32.shl
-              i32.const 16
-              i32.shr_s
-              i32.const 0
-              i32.sub
-              br_table 0 (;@5;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 1 (;@4;) 2 (;@3;)
-            end
-            local.get $1
-            local.get $0
-            f64.const 0x0p+0 (;=0;)
-            f64.ne
-            if (result i32) ;; label = @5
-              block (result i32) ;; label = @6
-                local.get $0
-                f64.const 0x1p+64 (;=18446744073709552000;)
-                f64.mul
-                local.get $1
-                call $28
-                local.set $0
-                local.get $1
-                i32.load
-                i32.const -64
-                i32.add
-              end
-            else
-              i32.const 0
-            end
-            i32.store
-            br 2 (;@2;)
-          end
-          br 1 (;@2;)
-        end
-        local.get $1
-        local.get $3
-        i32.wrap_i64
-        i32.const 2047
-        i32.and
-        i32.const -1022
-        i32.add
-        i32.store
-        local.get $2
-        i64.const -9218868437227405313
-        i64.and
-        i64.const 4602678819172646912
-        i64.or
-        f64.reinterpret_i64
-        local.set $0
-      end
-      local.get $0
-    end
+ )
+ (func $33 (; 46 ;) (type $12) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+  (local $4 i32)
+  (local $5 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (i32.mul
+     (local.get $2)
+     (local.get $1)
+    )
+   )
+   (if
+    (i32.gt_s
+     (i32.load offset=76
+      (local.get $3)
+     )
+     (i32.const -1)
+    )
+    (block
+     (local.set $5
+      (i32.eqz
+       (call $20
+        (local.get $3)
+       )
+      )
+     )
+     (local.set $0
+      (call $21
+       (local.get $0)
+       (local.get $4)
+       (local.get $3)
+      )
+     )
+     (if
+      (i32.eqz
+       (local.get $5)
+      )
+      (call $13
+       (local.get $3)
+      )
+     )
+    )
+    (local.set $0
+     (call $21
+      (local.get $0)
+      (local.get $4)
+      (local.get $3)
+     )
+    )
+   )
+   (if
+    (i32.ne
+     (local.get $0)
+     (local.get $4)
+    )
+    (local.set $2
+     (i32.div_u
+      (local.get $0)
+      (local.get $1)
+     )
+    )
+   )
+   (local.get $2)
   )
-  (func $29 (;42;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $0
-      if (result i32) ;; label = @2
-        block (result i32) ;; label = @3
-          local.get $1
-          i32.const 128
-          i32.lt_u
-          if ;; label = @4
-            block ;; label = @5
-              local.get $0
-              local.get $1
-              i32.store8
-              i32.const 1
-              br 4 (;@1;)
-            end
-          end
-          local.get $1
-          i32.const 2048
-          i32.lt_u
-          if ;; label = @4
-            block ;; label = @5
-              local.get $0
-              local.get $1
-              i32.const 6
-              i32.shr_u
-              i32.const 192
-              i32.or
-              i32.store8
-              local.get $0
-              local.get $1
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=1
-              i32.const 2
-              br 4 (;@1;)
-            end
-          end
-          local.get $1
-          i32.const 55296
-          i32.lt_u
-          local.get $1
-          i32.const -8192
-          i32.and
-          i32.const 57344
-          i32.eq
-          i32.or
-          if ;; label = @4
-            block ;; label = @5
-              local.get $0
-              local.get $1
-              i32.const 12
-              i32.shr_u
-              i32.const 224
-              i32.or
-              i32.store8
-              local.get $0
-              local.get $1
-              i32.const 6
-              i32.shr_u
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=1
-              local.get $0
-              local.get $1
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=2
-              i32.const 3
-              br 4 (;@1;)
-            end
-          end
-          local.get $1
-          i32.const -65536
-          i32.add
-          i32.const 1048576
-          i32.lt_u
-          if (result i32) ;; label = @4
-            block (result i32) ;; label = @5
-              local.get $0
-              local.get $1
-              i32.const 18
-              i32.shr_u
-              i32.const 240
-              i32.or
-              i32.store8
-              local.get $0
-              local.get $1
-              i32.const 12
-              i32.shr_u
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=1
-              local.get $0
-              local.get $1
-              i32.const 6
-              i32.shr_u
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=2
-              local.get $0
-              local.get $1
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=3
-              i32.const 4
-            end
-          else
-            block (result i32) ;; label = @5
-              call $12
-              i32.const 84
-              i32.store
-              i32.const -1
-            end
-          end
-        end
-      else
-        i32.const 1
-      end
-    end
+ )
+ (func $34 (; 47 ;) (type $6) (param $0 i32) (param $1 i32) (result i32)
+  (local $2 i32)
+  (local $3 i32)
+  (block $label$1 (result i32)
+   (local.set $2
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 16)
+    )
+   )
+   (i32.store
+    (local.tee $3
+     (local.get $2)
+    )
+    (local.get $1)
+   )
+   (local.set $0
+    (call $18
+     (i32.load
+      (i32.const 1280)
+     )
+     (local.get $0)
+     (local.get $3)
+    )
+   )
+   (global.set $global$1
+    (local.get $2)
+   )
+   (local.get $0)
   )
-  (func $30 (;43;) (type $2) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $0
-      i32.const 74
-      i32.add
-      local.tee $2
-      i32.load8_s
-      local.set $1
-      local.get $2
-      local.get $1
-      i32.const 255
-      i32.add
-      local.get $1
-      i32.or
-      i32.store8
-      local.get $0
-      i32.load
-      local.tee $1
-      i32.const 8
-      i32.and
-      if (result i32) ;; label = @2
-        block (result i32) ;; label = @3
-          local.get $0
-          local.get $1
-          i32.const 32
-          i32.or
-          i32.store
-          i32.const -1
-        end
-      else
-        block (result i32) ;; label = @3
-          local.get $0
-          i32.const 0
-          i32.store offset=8
-          local.get $0
-          i32.const 0
-          i32.store offset=4
-          local.get $0
-          local.get $0
-          i32.load offset=44
-          local.tee $1
-          i32.store offset=28
-          local.get $0
-          local.get $1
-          i32.store offset=20
-          local.get $0
-          local.get $1
-          local.get $0
-          i32.load offset=48
-          i32.add
-          i32.store offset=16
-          i32.const 0
-        end
-      end
-      local.tee $0
-    end
+ )
+ (func $35 (; 48 ;) (type $2) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (local $3 i32)
+  (block $label$1 (result i32)
+   (local.set $2
+    (if (result i32)
+     (i32.gt_s
+      (i32.load offset=76
+       (local.tee $1
+        (i32.load
+         (i32.const 1280)
+        )
+       )
+      )
+      (i32.const -1)
+     )
+     (call $20
+      (local.get $1)
+     )
+     (i32.const 0)
+    )
+   )
+   (local.set $0
+    (block $label$4 (result i32)
+     (if (result i32)
+      (i32.lt_s
+       (call $36
+        (local.get $0)
+        (local.get $1)
+       )
+       (i32.const 0)
+      )
+      (i32.const 1)
+      (block (result i32)
+       (if
+        (i32.ne
+         (i32.load8_s offset=75
+          (local.get $1)
+         )
+         (i32.const 10)
+        )
+        (if
+         (i32.lt_u
+          (local.tee $0
+           (i32.load
+            (local.tee $3
+             (i32.add
+              (local.get $1)
+              (i32.const 20)
+             )
+            )
+           )
+          )
+          (i32.load offset=16
+           (local.get $1)
+          )
+         )
+         (block
+          (i32.store
+           (local.get $3)
+           (i32.add
+            (local.get $0)
+            (i32.const 1)
+           )
+          )
+          (i32.store8
+           (local.get $0)
+           (i32.const 10)
+          )
+          (br $label$4
+           (i32.const 0)
+          )
+         )
+        )
+       )
+       (i32.lt_s
+        (call $32
+         (local.get $1)
+         (i32.const 10)
+        )
+        (i32.const 0)
+       )
+      )
+     )
+    )
+   )
+   (if
+    (local.get $2)
+    (call $13
+     (local.get $1)
+    )
+   )
+   (i32.shr_s
+    (i32.shl
+     (local.get $0)
+     (i32.const 31)
+    )
+    (i32.const 31)
+   )
   )
-  (func $31 (;44;) (type $2) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32) (local $3 i32)
-    block $label$1 (result i32) ;; label = @1
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          local.get $0
-          local.tee $2
-          i32.const 3
-          i32.and
-          i32.eqz
-          br_if 0 (;@3;)
-          local.get $2
-          local.set $1
-          loop $label$4 ;; label = @4
-            local.get $0
-            i32.load8_s
-            i32.eqz
-            if ;; label = @5
-              block ;; label = @6
-                local.get $1
-                local.set $0
-                br 4 (;@2;)
-              end
-            end
-            local.get $0
-            i32.const 1
-            i32.add
-            local.tee $0
-            local.tee $1
-            i32.const 3
-            i32.and
-            br_if 0 (;@4;)
-            br 1 (;@3;)
-          end
-        end
-        loop $label$6 ;; label = @3
-          local.get $0
-          i32.const 4
-          i32.add
-          local.set $1
-          local.get $0
-          i32.load
-          local.tee $3
-          i32.const -2139062144
-          i32.and
-          i32.const -2139062144
-          i32.xor
-          local.get $3
-          i32.const -16843009
-          i32.add
-          i32.and
-          i32.eqz
-          if ;; label = @4
-            block ;; label = @5
-              local.get $1
-              local.set $0
-              br 2 (;@3;)
-            end
-          end
-        end
-        local.get $3
-        i32.const 255
-        i32.and
-        i32.const 24
-        i32.shl
-        i32.const 24
-        i32.shr_s
-        if ;; label = @3
-          loop $label$9 ;; label = @4
-            local.get $0
-            i32.const 1
-            i32.add
-            local.tee $0
-            i32.load8_s
-            br_if 0 (;@4;)
-          end
-        end
-      end
-      local.get $0
-      local.get $2
-      i32.sub
-    end
+ )
+ (func $36 (; 49 ;) (type $6) (param $0 i32) (param $1 i32) (result i32)
+  (i32.add
+   (call $33
+    (local.get $0)
+    (call $31
+     (local.get $0)
+    )
+    (i32.const 1)
+    (local.get $1)
+   )
+   (i32.const -1)
   )
-  (func $32 (;45;) (type $6) (param $0 i32) (param $1 i32) (result i32)
-    (local $2 i32) (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $3
-      global.get $global$1
-      i32.const 16
-      i32.add
-      global.set $global$1
-      local.get $3
-      local.tee $4
-      local.get $1
-      i32.const 255
-      i32.and
-      local.tee $7
-      i32.store8
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          local.get $0
-          i32.const 16
-          i32.add
-          local.tee $2
-          i32.load
-          local.tee $5
-          br_if 0 (;@3;)
-          local.get $0
-          call $30
-          if ;; label = @4
-            i32.const -1
-            local.set $1
-          else
-            block ;; label = @5
-              local.get $2
-              i32.load
-              local.set $5
-              br 2 (;@3;)
-            end
-          end
-          br 1 (;@2;)
-        end
-        local.get $0
-        i32.const 20
-        i32.add
-        local.tee $2
-        i32.load
-        local.tee $6
-        local.get $5
-        i32.lt_u
-        if ;; label = @3
-          local.get $1
-          i32.const 255
-          i32.and
-          local.tee $1
-          local.get $0
-          i32.load8_s offset=75
-          i32.ne
-          if ;; label = @4
-            block ;; label = @5
-              local.get $2
-              local.get $6
-              i32.const 1
-              i32.add
-              i32.store
-              local.get $6
-              local.get $7
-              i32.store8
-              br 3 (;@2;)
-            end
-          end
-        end
-        local.get $0
-        local.get $4
-        i32.const 1
-        local.get $0
-        i32.load offset=36
-        i32.const 3
-        i32.and
-        i32.const 2
-        i32.add
-        call_indirect (type $0)
-        i32.const 1
-        i32.eq
-        if (result i32) ;; label = @3
-          local.get $4
-          i32.load8_u
-        else
-          i32.const -1
-        end
-        local.set $1
-      end
-      local.get $3
-      global.set $global$1
-      local.get $1
-    end
+ )
+ (func $37 (; 50 ;) (type $2) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (local $15 i32)
+  (local $16 i32)
+  (local $17 i32)
+  (local $18 i32)
+  (local $19 i32)
+  (local $20 i32)
+  (local $21 i32)
+  (block $label$1 (result i32)
+   (local.set $14
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 16)
+    )
+   )
+   (local.set $18
+    (local.get $14)
+   )
+   (block $label$2
+    (if
+     (i32.lt_u
+      (local.get $0)
+      (i32.const 245)
+     )
+     (block
+      (local.set $3
+       (i32.and
+        (i32.add
+         (local.get $0)
+         (i32.const 11)
+        )
+        (i32.const -8)
+       )
+      )
+      (if
+       (i32.and
+        (local.tee $0
+         (i32.shr_u
+          (local.tee $8
+           (i32.load
+            (i32.const 4176)
+           )
+          )
+          (local.tee $2
+           (i32.shr_u
+            (if (result i32)
+             (i32.lt_u
+              (local.get $0)
+              (i32.const 11)
+             )
+             (local.tee $3
+              (i32.const 16)
+             )
+             (local.get $3)
+            )
+            (i32.const 3)
+           )
+          )
+         )
+        )
+        (i32.const 3)
+       )
+       (block
+        (local.set $4
+         (i32.load
+          (local.tee $1
+           (i32.add
+            (local.tee $7
+             (i32.load
+              (local.tee $3
+               (i32.add
+                (local.tee $2
+                 (i32.add
+                  (i32.shl
+                   (i32.shl
+                    (local.tee $5
+                     (i32.add
+                      (i32.xor
+                       (i32.and
+                        (local.get $0)
+                        (i32.const 1)
+                       )
+                       (i32.const 1)
+                      )
+                      (local.get $2)
+                     )
+                    )
+                    (i32.const 1)
+                   )
+                   (i32.const 2)
+                  )
+                  (i32.const 4216)
+                 )
+                )
+                (i32.const 8)
+               )
+              )
+             )
+            )
+            (i32.const 8)
+           )
+          )
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $2)
+          (local.get $4)
+         )
+         (i32.store
+          (i32.const 4176)
+          (i32.and
+           (local.get $8)
+           (i32.xor
+            (i32.shl
+             (i32.const 1)
+             (local.get $5)
+            )
+            (i32.const -1)
+           )
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $4)
+            (i32.load
+             (i32.const 4192)
+            )
+           )
+           (call $fimport$8)
+          )
+          (if
+           (i32.eq
+            (i32.load
+             (local.tee $0
+              (i32.add
+               (local.get $4)
+               (i32.const 12)
+              )
+             )
+            )
+            (local.get $7)
+           )
+           (block
+            (i32.store
+             (local.get $0)
+             (local.get $2)
+            )
+            (i32.store
+             (local.get $3)
+             (local.get $4)
+            )
+           )
+           (call $fimport$8)
+          )
+         )
+        )
+        (i32.store offset=4
+         (local.get $7)
+         (i32.or
+          (local.tee $0
+           (i32.shl
+            (local.get $5)
+            (i32.const 3)
+           )
+          )
+          (i32.const 3)
+         )
+        )
+        (i32.store
+         (local.tee $0
+          (i32.add
+           (i32.add
+            (local.get $7)
+            (local.get $0)
+           )
+           (i32.const 4)
+          )
+         )
+         (i32.or
+          (i32.load
+           (local.get $0)
+          )
+          (i32.const 1)
+         )
+        )
+        (global.set $global$1
+         (local.get $14)
+        )
+        (return
+         (local.get $1)
+        )
+       )
+      )
+      (if
+       (i32.gt_u
+        (local.get $3)
+        (local.tee $16
+         (i32.load
+          (i32.const 4184)
+         )
+        )
+       )
+       (block
+        (if
+         (local.get $0)
+         (block
+          (local.set $5
+           (i32.and
+            (i32.shr_u
+             (local.tee $0
+              (i32.add
+               (i32.and
+                (local.tee $0
+                 (i32.and
+                  (i32.shl
+                   (local.get $0)
+                   (local.get $2)
+                  )
+                  (i32.or
+                   (local.tee $0
+                    (i32.shl
+                     (i32.const 2)
+                     (local.get $2)
+                    )
+                   )
+                   (i32.sub
+                    (i32.const 0)
+                    (local.get $0)
+                   )
+                  )
+                 )
+                )
+                (i32.sub
+                 (i32.const 0)
+                 (local.get $0)
+                )
+               )
+               (i32.const -1)
+              )
+             )
+             (i32.const 12)
+            )
+            (i32.const 16)
+           )
+          )
+          (local.set $12
+           (i32.load
+            (local.tee $5
+             (i32.add
+              (local.tee $9
+               (i32.load
+                (local.tee $2
+                 (i32.add
+                  (local.tee $4
+                   (i32.add
+                    (i32.shl
+                     (i32.shl
+                      (local.tee $11
+                       (i32.add
+                        (i32.or
+                         (i32.or
+                          (i32.or
+                           (i32.or
+                            (local.tee $0
+                             (i32.and
+                              (i32.shr_u
+                               (local.tee $2
+                                (i32.shr_u
+                                 (local.get $0)
+                                 (local.get $5)
+                                )
+                               )
+                               (i32.const 5)
+                              )
+                              (i32.const 8)
+                             )
+                            )
+                            (local.get $5)
+                           )
+                           (local.tee $0
+                            (i32.and
+                             (i32.shr_u
+                              (local.tee $2
+                               (i32.shr_u
+                                (local.get $2)
+                                (local.get $0)
+                               )
+                              )
+                              (i32.const 2)
+                             )
+                             (i32.const 4)
+                            )
+                           )
+                          )
+                          (local.tee $0
+                           (i32.and
+                            (i32.shr_u
+                             (local.tee $2
+                              (i32.shr_u
+                               (local.get $2)
+                               (local.get $0)
+                              )
+                             )
+                             (i32.const 1)
+                            )
+                            (i32.const 2)
+                           )
+                          )
+                         )
+                         (local.tee $0
+                          (i32.and
+                           (i32.shr_u
+                            (local.tee $2
+                             (i32.shr_u
+                              (local.get $2)
+                              (local.get $0)
+                             )
+                            )
+                            (i32.const 1)
+                           )
+                           (i32.const 1)
+                          )
+                         )
+                        )
+                        (i32.shr_u
+                         (local.get $2)
+                         (local.get $0)
+                        )
+                       )
+                      )
+                      (i32.const 1)
+                     )
+                     (i32.const 2)
+                    )
+                    (i32.const 4216)
+                   )
+                  )
+                  (i32.const 8)
+                 )
+                )
+               )
+              )
+              (i32.const 8)
+             )
+            )
+           )
+          )
+          (if
+           (i32.eq
+            (local.get $4)
+            (local.get $12)
+           )
+           (i32.store
+            (i32.const 4176)
+            (local.tee $7
+             (i32.and
+              (local.get $8)
+              (i32.xor
+               (i32.shl
+                (i32.const 1)
+                (local.get $11)
+               )
+               (i32.const -1)
+              )
+             )
+            )
+           )
+           (block
+            (if
+             (i32.lt_u
+              (local.get $12)
+              (i32.load
+               (i32.const 4192)
+              )
+             )
+             (call $fimport$8)
+            )
+            (if
+             (i32.eq
+              (i32.load
+               (local.tee $0
+                (i32.add
+                 (local.get $12)
+                 (i32.const 12)
+                )
+               )
+              )
+              (local.get $9)
+             )
+             (block
+              (i32.store
+               (local.get $0)
+               (local.get $4)
+              )
+              (i32.store
+               (local.get $2)
+               (local.get $12)
+              )
+              (local.set $7
+               (local.get $8)
+              )
+             )
+             (call $fimport$8)
+            )
+           )
+          )
+          (i32.store offset=4
+           (local.get $9)
+           (i32.or
+            (local.get $3)
+            (i32.const 3)
+           )
+          )
+          (i32.store offset=4
+           (local.tee $4
+            (i32.add
+             (local.get $9)
+             (local.get $3)
+            )
+           )
+           (i32.or
+            (local.tee $11
+             (i32.sub
+              (i32.shl
+               (local.get $11)
+               (i32.const 3)
+              )
+              (local.get $3)
+             )
+            )
+            (i32.const 1)
+           )
+          )
+          (i32.store
+           (i32.add
+            (local.get $4)
+            (local.get $11)
+           )
+           (local.get $11)
+          )
+          (if
+           (local.get $16)
+           (block
+            (local.set $9
+             (i32.load
+              (i32.const 4196)
+             )
+            )
+            (local.set $2
+             (i32.add
+              (i32.shl
+               (i32.shl
+                (local.tee $0
+                 (i32.shr_u
+                  (local.get $16)
+                  (i32.const 3)
+                 )
+                )
+                (i32.const 1)
+               )
+               (i32.const 2)
+              )
+              (i32.const 4216)
+             )
+            )
+            (if
+             (i32.and
+              (local.get $7)
+              (local.tee $0
+               (i32.shl
+                (i32.const 1)
+                (local.get $0)
+               )
+              )
+             )
+             (if
+              (i32.lt_u
+               (local.tee $0
+                (i32.load
+                 (local.tee $3
+                  (i32.add
+                   (local.get $2)
+                   (i32.const 8)
+                  )
+                 )
+                )
+               )
+               (i32.load
+                (i32.const 4192)
+               )
+              )
+              (call $fimport$8)
+              (block
+               (local.set $6
+                (local.get $3)
+               )
+               (local.set $1
+                (local.get $0)
+               )
+              )
+             )
+             (block
+              (i32.store
+               (i32.const 4176)
+               (i32.or
+                (local.get $7)
+                (local.get $0)
+               )
+              )
+              (local.set $6
+               (i32.add
+                (local.get $2)
+                (i32.const 8)
+               )
+              )
+              (local.set $1
+               (local.get $2)
+              )
+             )
+            )
+            (i32.store
+             (local.get $6)
+             (local.get $9)
+            )
+            (i32.store offset=12
+             (local.get $1)
+             (local.get $9)
+            )
+            (i32.store offset=8
+             (local.get $9)
+             (local.get $1)
+            )
+            (i32.store offset=12
+             (local.get $9)
+             (local.get $2)
+            )
+           )
+          )
+          (i32.store
+           (i32.const 4184)
+           (local.get $11)
+          )
+          (i32.store
+           (i32.const 4196)
+           (local.get $4)
+          )
+          (global.set $global$1
+           (local.get $14)
+          )
+          (return
+           (local.get $5)
+          )
+         )
+        )
+        (if
+         (local.tee $6
+          (i32.load
+           (i32.const 4180)
+          )
+         )
+         (block
+          (local.set $2
+           (i32.and
+            (i32.shr_u
+             (local.tee $0
+              (i32.add
+               (i32.and
+                (local.get $6)
+                (i32.sub
+                 (i32.const 0)
+                 (local.get $6)
+                )
+               )
+               (i32.const -1)
+              )
+             )
+             (i32.const 12)
+            )
+            (i32.const 16)
+           )
+          )
+          (local.set $9
+           (i32.sub
+            (i32.and
+             (i32.load offset=4
+              (local.tee $2
+               (i32.load
+                (i32.add
+                 (i32.shl
+                  (i32.add
+                   (i32.or
+                    (i32.or
+                     (i32.or
+                      (i32.or
+                       (local.tee $0
+                        (i32.and
+                         (i32.shr_u
+                          (local.tee $1
+                           (i32.shr_u
+                            (local.get $0)
+                            (local.get $2)
+                           )
+                          )
+                          (i32.const 5)
+                         )
+                         (i32.const 8)
+                        )
+                       )
+                       (local.get $2)
+                      )
+                      (local.tee $0
+                       (i32.and
+                        (i32.shr_u
+                         (local.tee $1
+                          (i32.shr_u
+                           (local.get $1)
+                           (local.get $0)
+                          )
+                         )
+                         (i32.const 2)
+                        )
+                        (i32.const 4)
+                       )
+                      )
+                     )
+                     (local.tee $0
+                      (i32.and
+                       (i32.shr_u
+                        (local.tee $1
+                         (i32.shr_u
+                          (local.get $1)
+                          (local.get $0)
+                         )
+                        )
+                        (i32.const 1)
+                       )
+                       (i32.const 2)
+                      )
+                     )
+                    )
+                    (local.tee $0
+                     (i32.and
+                      (i32.shr_u
+                       (local.tee $1
+                        (i32.shr_u
+                         (local.get $1)
+                         (local.get $0)
+                        )
+                       )
+                       (i32.const 1)
+                      )
+                      (i32.const 1)
+                     )
+                    )
+                   )
+                   (i32.shr_u
+                    (local.get $1)
+                    (local.get $0)
+                   )
+                  )
+                  (i32.const 2)
+                 )
+                 (i32.const 4480)
+                )
+               )
+              )
+             )
+             (i32.const -8)
+            )
+            (local.get $3)
+           )
+          )
+          (local.set $1
+           (local.get $2)
+          )
+          (loop $label$25
+           (block $label$26
+            (if
+             (i32.eqz
+              (local.tee $0
+               (i32.load offset=16
+                (local.get $1)
+               )
+              )
+             )
+             (br_if $label$26
+              (i32.eqz
+               (local.tee $0
+                (i32.load offset=20
+                 (local.get $1)
+                )
+               )
+              )
+             )
+            )
+            (if
+             (local.tee $7
+              (i32.lt_u
+               (local.tee $1
+                (i32.sub
+                 (i32.and
+                  (i32.load offset=4
+                   (local.get $0)
+                  )
+                  (i32.const -8)
+                 )
+                 (local.get $3)
+                )
+               )
+               (local.get $9)
+              )
+             )
+             (local.set $9
+              (local.get $1)
+             )
+            )
+            (local.set $1
+             (local.get $0)
+            )
+            (if
+             (local.get $7)
+             (local.set $2
+              (local.get $0)
+             )
+            )
+            (br $label$25)
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.get $2)
+            (local.tee $12
+             (i32.load
+              (i32.const 4192)
+             )
+            )
+           )
+           (call $fimport$8)
+          )
+          (if
+           (i32.ge_u
+            (local.get $2)
+            (local.tee $13
+             (i32.add
+              (local.get $2)
+              (local.get $3)
+             )
+            )
+           )
+           (call $fimport$8)
+          )
+          (local.set $15
+           (i32.load offset=24
+            (local.get $2)
+           )
+          )
+          (block $label$32
+           (if
+            (i32.eq
+             (local.tee $0
+              (i32.load offset=12
+               (local.get $2)
+              )
+             )
+             (local.get $2)
+            )
+            (block
+             (if
+              (i32.eqz
+               (local.tee $0
+                (i32.load
+                 (local.tee $1
+                  (i32.add
+                   (local.get $2)
+                   (i32.const 20)
+                  )
+                 )
+                )
+               )
+              )
+              (if
+               (i32.eqz
+                (local.tee $0
+                 (i32.load
+                  (local.tee $1
+                   (i32.add
+                    (local.get $2)
+                    (i32.const 16)
+                   )
+                  )
+                 )
+                )
+               )
+               (block
+                (local.set $4
+                 (i32.const 0)
+                )
+                (br $label$32)
+               )
+              )
+             )
+             (loop $label$36
+              (if
+               (local.tee $7
+                (i32.load
+                 (local.tee $11
+                  (i32.add
+                   (local.get $0)
+                   (i32.const 20)
+                  )
+                 )
+                )
+               )
+               (block
+                (local.set $0
+                 (local.get $7)
+                )
+                (local.set $1
+                 (local.get $11)
+                )
+                (br $label$36)
+               )
+              )
+              (if
+               (local.tee $7
+                (i32.load
+                 (local.tee $11
+                  (i32.add
+                   (local.get $0)
+                   (i32.const 16)
+                  )
+                 )
+                )
+               )
+               (block
+                (local.set $0
+                 (local.get $7)
+                )
+                (local.set $1
+                 (local.get $11)
+                )
+                (br $label$36)
+               )
+              )
+             )
+             (if
+              (i32.lt_u
+               (local.get $1)
+               (local.get $12)
+              )
+              (call $fimport$8)
+              (block
+               (i32.store
+                (local.get $1)
+                (i32.const 0)
+               )
+               (local.set $4
+                (local.get $0)
+               )
+              )
+             )
+            )
+            (block
+             (if
+              (i32.lt_u
+               (local.tee $11
+                (i32.load offset=8
+                 (local.get $2)
+                )
+               )
+               (local.get $12)
+              )
+              (call $fimport$8)
+             )
+             (if
+              (i32.ne
+               (i32.load
+                (local.tee $7
+                 (i32.add
+                  (local.get $11)
+                  (i32.const 12)
+                 )
+                )
+               )
+               (local.get $2)
+              )
+              (call $fimport$8)
+             )
+             (if
+              (i32.eq
+               (i32.load
+                (local.tee $1
+                 (i32.add
+                  (local.get $0)
+                  (i32.const 8)
+                 )
+                )
+               )
+               (local.get $2)
+              )
+              (block
+               (i32.store
+                (local.get $7)
+                (local.get $0)
+               )
+               (i32.store
+                (local.get $1)
+                (local.get $11)
+               )
+               (local.set $4
+                (local.get $0)
+               )
+              )
+              (call $fimport$8)
+             )
+            )
+           )
+          )
+          (block $label$46
+           (if
+            (local.get $15)
+            (block
+             (if
+              (i32.eq
+               (local.get $2)
+               (i32.load
+                (local.tee $0
+                 (i32.add
+                  (i32.shl
+                   (local.tee $1
+                    (i32.load offset=28
+                     (local.get $2)
+                    )
+                   )
+                   (i32.const 2)
+                  )
+                  (i32.const 4480)
+                 )
+                )
+               )
+              )
+              (block
+               (i32.store
+                (local.get $0)
+                (local.get $4)
+               )
+               (if
+                (i32.eqz
+                 (local.get $4)
+                )
+                (block
+                 (i32.store
+                  (i32.const 4180)
+                  (i32.and
+                   (local.get $6)
+                   (i32.xor
+                    (i32.shl
+                     (i32.const 1)
+                     (local.get $1)
+                    )
+                    (i32.const -1)
+                   )
+                  )
+                 )
+                 (br $label$46)
+                )
+               )
+              )
+              (block
+               (if
+                (i32.lt_u
+                 (local.get $15)
+                 (i32.load
+                  (i32.const 4192)
+                 )
+                )
+                (call $fimport$8)
+               )
+               (if
+                (i32.eq
+                 (i32.load
+                  (local.tee $0
+                   (i32.add
+                    (local.get $15)
+                    (i32.const 16)
+                   )
+                  )
+                 )
+                 (local.get $2)
+                )
+                (i32.store
+                 (local.get $0)
+                 (local.get $4)
+                )
+                (i32.store offset=20
+                 (local.get $15)
+                 (local.get $4)
+                )
+               )
+               (br_if $label$46
+                (i32.eqz
+                 (local.get $4)
+                )
+               )
+              )
+             )
+             (if
+              (i32.lt_u
+               (local.get $4)
+               (local.tee $0
+                (i32.load
+                 (i32.const 4192)
+                )
+               )
+              )
+              (call $fimport$8)
+             )
+             (i32.store offset=24
+              (local.get $4)
+              (local.get $15)
+             )
+             (if
+              (local.tee $1
+               (i32.load offset=16
+                (local.get $2)
+               )
+              )
+              (if
+               (i32.lt_u
+                (local.get $1)
+                (local.get $0)
+               )
+               (call $fimport$8)
+               (block
+                (i32.store offset=16
+                 (local.get $4)
+                 (local.get $1)
+                )
+                (i32.store offset=24
+                 (local.get $1)
+                 (local.get $4)
+                )
+               )
+              )
+             )
+             (if
+              (local.tee $0
+               (i32.load offset=20
+                (local.get $2)
+               )
+              )
+              (if
+               (i32.lt_u
+                (local.get $0)
+                (i32.load
+                 (i32.const 4192)
+                )
+               )
+               (call $fimport$8)
+               (block
+                (i32.store offset=20
+                 (local.get $4)
+                 (local.get $0)
+                )
+                (i32.store offset=24
+                 (local.get $0)
+                 (local.get $4)
+                )
+               )
+              )
+             )
+            )
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.get $9)
+            (i32.const 16)
+           )
+           (block
+            (i32.store offset=4
+             (local.get $2)
+             (i32.or
+              (local.tee $0
+               (i32.add
+                (local.get $9)
+                (local.get $3)
+               )
+              )
+              (i32.const 3)
+             )
+            )
+            (i32.store
+             (local.tee $0
+              (i32.add
+               (i32.add
+                (local.get $2)
+                (local.get $0)
+               )
+               (i32.const 4)
+              )
+             )
+             (i32.or
+              (i32.load
+               (local.get $0)
+              )
+              (i32.const 1)
+             )
+            )
+           )
+           (block
+            (i32.store offset=4
+             (local.get $2)
+             (i32.or
+              (local.get $3)
+              (i32.const 3)
+             )
+            )
+            (i32.store offset=4
+             (local.get $13)
+             (i32.or
+              (local.get $9)
+              (i32.const 1)
+             )
+            )
+            (i32.store
+             (i32.add
+              (local.get $13)
+              (local.get $9)
+             )
+             (local.get $9)
+            )
+            (if
+             (local.get $16)
+             (block
+              (local.set $7
+               (i32.load
+                (i32.const 4196)
+               )
+              )
+              (local.set $3
+               (i32.add
+                (i32.shl
+                 (i32.shl
+                  (local.tee $0
+                   (i32.shr_u
+                    (local.get $16)
+                    (i32.const 3)
+                   )
+                  )
+                  (i32.const 1)
+                 )
+                 (i32.const 2)
+                )
+                (i32.const 4216)
+               )
+              )
+              (if
+               (i32.and
+                (local.get $8)
+                (local.tee $0
+                 (i32.shl
+                  (i32.const 1)
+                  (local.get $0)
+                 )
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.tee $0
+                  (i32.load
+                   (local.tee $1
+                    (i32.add
+                     (local.get $3)
+                     (i32.const 8)
+                    )
+                   )
+                  )
+                 )
+                 (i32.load
+                  (i32.const 4192)
+                 )
+                )
+                (call $fimport$8)
+                (block
+                 (local.set $10
+                  (local.get $1)
+                 )
+                 (local.set $5
+                  (local.get $0)
+                 )
+                )
+               )
+               (block
+                (i32.store
+                 (i32.const 4176)
+                 (i32.or
+                  (local.get $8)
+                  (local.get $0)
+                 )
+                )
+                (local.set $10
+                 (i32.add
+                  (local.get $3)
+                  (i32.const 8)
+                 )
+                )
+                (local.set $5
+                 (local.get $3)
+                )
+               )
+              )
+              (i32.store
+               (local.get $10)
+               (local.get $7)
+              )
+              (i32.store offset=12
+               (local.get $5)
+               (local.get $7)
+              )
+              (i32.store offset=8
+               (local.get $7)
+               (local.get $5)
+              )
+              (i32.store offset=12
+               (local.get $7)
+               (local.get $3)
+              )
+             )
+            )
+            (i32.store
+             (i32.const 4184)
+             (local.get $9)
+            )
+            (i32.store
+             (i32.const 4196)
+             (local.get $13)
+            )
+           )
+          )
+          (global.set $global$1
+           (local.get $14)
+          )
+          (return
+           (i32.add
+            (local.get $2)
+            (i32.const 8)
+           )
+          )
+         )
+         (local.set $0
+          (local.get $3)
+         )
+        )
+       )
+       (local.set $0
+        (local.get $3)
+       )
+      )
+     )
+     (if
+      (i32.gt_u
+       (local.get $0)
+       (i32.const -65)
+      )
+      (local.set $0
+       (i32.const -1)
+      )
+      (block
+       (local.set $7
+        (i32.and
+         (local.tee $0
+          (i32.add
+           (local.get $0)
+           (i32.const 11)
+          )
+         )
+         (i32.const -8)
+        )
+       )
+       (if
+        (local.tee $5
+         (i32.load
+          (i32.const 4180)
+         )
+        )
+        (block
+         (local.set $17
+          (if (result i32)
+           (local.tee $0
+            (i32.shr_u
+             (local.get $0)
+             (i32.const 8)
+            )
+           )
+           (if (result i32)
+            (i32.gt_u
+             (local.get $7)
+             (i32.const 16777215)
+            )
+            (i32.const 31)
+            (i32.or
+             (i32.and
+              (i32.shr_u
+               (local.get $7)
+               (i32.add
+                (local.tee $0
+                 (i32.add
+                  (i32.sub
+                   (i32.const 14)
+                   (i32.or
+                    (i32.or
+                     (local.tee $0
+                      (i32.and
+                       (i32.shr_u
+                        (i32.add
+                         (local.tee $1
+                          (i32.shl
+                           (local.get $0)
+                           (local.tee $3
+                            (i32.and
+                             (i32.shr_u
+                              (i32.add
+                               (local.get $0)
+                               (i32.const 1048320)
+                              )
+                              (i32.const 16)
+                             )
+                             (i32.const 8)
+                            )
+                           )
+                          )
+                         )
+                         (i32.const 520192)
+                        )
+                        (i32.const 16)
+                       )
+                       (i32.const 4)
+                      )
+                     )
+                     (local.get $3)
+                    )
+                    (local.tee $0
+                     (i32.and
+                      (i32.shr_u
+                       (i32.add
+                        (local.tee $1
+                         (i32.shl
+                          (local.get $1)
+                          (local.get $0)
+                         )
+                        )
+                        (i32.const 245760)
+                       )
+                       (i32.const 16)
+                      )
+                      (i32.const 2)
+                     )
+                    )
+                   )
+                  )
+                  (i32.shr_u
+                   (i32.shl
+                    (local.get $1)
+                    (local.get $0)
+                   )
+                   (i32.const 15)
+                  )
+                 )
+                )
+                (i32.const 7)
+               )
+              )
+              (i32.const 1)
+             )
+             (i32.shl
+              (local.get $0)
+              (i32.const 1)
+             )
+            )
+           )
+           (i32.const 0)
+          )
+         )
+         (local.set $3
+          (i32.sub
+           (i32.const 0)
+           (local.get $7)
+          )
+         )
+         (block $label$78
+          (block $label$79
+           (block $label$80
+            (if
+             (local.tee $1
+              (i32.load
+               (i32.add
+                (i32.shl
+                 (local.get $17)
+                 (i32.const 2)
+                )
+                (i32.const 4480)
+               )
+              )
+             )
+             (block
+              (local.set $0
+               (i32.sub
+                (i32.const 25)
+                (i32.shr_u
+                 (local.get $17)
+                 (i32.const 1)
+                )
+               )
+              )
+              (local.set $4
+               (i32.const 0)
+              )
+              (local.set $10
+               (i32.shl
+                (local.get $7)
+                (if (result i32)
+                 (i32.eq
+                  (local.get $17)
+                  (i32.const 31)
+                 )
+                 (i32.const 0)
+                 (local.get $0)
+                )
+               )
+              )
+              (local.set $0
+               (i32.const 0)
+              )
+              (loop $label$84
+               (if
+                (i32.lt_u
+                 (local.tee $6
+                  (i32.sub
+                   (i32.and
+                    (i32.load offset=4
+                     (local.get $1)
+                    )
+                    (i32.const -8)
+                   )
+                   (local.get $7)
+                  )
+                 )
+                 (local.get $3)
+                )
+                (if
+                 (local.get $6)
+                 (block
+                  (local.set $3
+                   (local.get $6)
+                  )
+                  (local.set $0
+                   (local.get $1)
+                  )
+                 )
+                 (block
+                  (local.set $3
+                   (i32.const 0)
+                  )
+                  (local.set $0
+                   (local.get $1)
+                  )
+                  (br $label$79)
+                 )
+                )
+               )
+               (local.set $1
+                (if (result i32)
+                 (i32.or
+                  (i32.eqz
+                   (local.tee $19
+                    (i32.load offset=20
+                     (local.get $1)
+                    )
+                   )
+                  )
+                  (i32.eq
+                   (local.get $19)
+                   (local.tee $6
+                    (i32.load
+                     (i32.add
+                      (i32.add
+                       (local.get $1)
+                       (i32.const 16)
+                      )
+                      (i32.shl
+                       (i32.shr_u
+                        (local.get $10)
+                        (i32.const 31)
+                       )
+                       (i32.const 2)
+                      )
+                     )
+                    )
+                   )
+                  )
+                 )
+                 (local.get $4)
+                 (local.get $19)
+                )
+               )
+               (local.set $10
+                (i32.shl
+                 (local.get $10)
+                 (i32.xor
+                  (i32.and
+                   (local.tee $4
+                    (i32.eqz
+                     (local.get $6)
+                    )
+                   )
+                   (i32.const 1)
+                  )
+                  (i32.const 1)
+                 )
+                )
+               )
+               (if
+                (local.get $4)
+                (block
+                 (local.set $4
+                  (local.get $1)
+                 )
+                 (local.set $1
+                  (local.get $0)
+                 )
+                 (br $label$80)
+                )
+                (block
+                 (local.set $4
+                  (local.get $1)
+                 )
+                 (local.set $1
+                  (local.get $6)
+                 )
+                 (br $label$84)
+                )
+               )
+              )
+             )
+             (block
+              (local.set $4
+               (i32.const 0)
+              )
+              (local.set $1
+               (i32.const 0)
+              )
+             )
+            )
+           )
+           (br_if $label$79
+            (local.tee $0
+             (if (result i32)
+              (i32.and
+               (i32.eqz
+                (local.get $4)
+               )
+               (i32.eqz
+                (local.get $1)
+               )
+              )
+              (block (result i32)
+               (if
+                (i32.eqz
+                 (local.tee $0
+                  (i32.and
+                   (local.get $5)
+                   (i32.or
+                    (local.tee $0
+                     (i32.shl
+                      (i32.const 2)
+                      (local.get $17)
+                     )
+                    )
+                    (i32.sub
+                     (i32.const 0)
+                     (local.get $0)
+                    )
+                   )
+                  )
+                 )
+                )
+                (block
+                 (local.set $0
+                  (local.get $7)
+                 )
+                 (br $label$2)
+                )
+               )
+               (local.set $10
+                (i32.and
+                 (i32.shr_u
+                  (local.tee $0
+                   (i32.add
+                    (i32.and
+                     (local.get $0)
+                     (i32.sub
+                      (i32.const 0)
+                      (local.get $0)
+                     )
+                    )
+                    (i32.const -1)
+                   )
+                  )
+                  (i32.const 12)
+                 )
+                 (i32.const 16)
+                )
+               )
+               (i32.load
+                (i32.add
+                 (i32.shl
+                  (i32.add
+                   (i32.or
+                    (i32.or
+                     (i32.or
+                      (i32.or
+                       (local.tee $0
+                        (i32.and
+                         (i32.shr_u
+                          (local.tee $4
+                           (i32.shr_u
+                            (local.get $0)
+                            (local.get $10)
+                           )
+                          )
+                          (i32.const 5)
+                         )
+                         (i32.const 8)
+                        )
+                       )
+                       (local.get $10)
+                      )
+                      (local.tee $0
+                       (i32.and
+                        (i32.shr_u
+                         (local.tee $4
+                          (i32.shr_u
+                           (local.get $4)
+                           (local.get $0)
+                          )
+                         )
+                         (i32.const 2)
+                        )
+                        (i32.const 4)
+                       )
+                      )
+                     )
+                     (local.tee $0
+                      (i32.and
+                       (i32.shr_u
+                        (local.tee $4
+                         (i32.shr_u
+                          (local.get $4)
+                          (local.get $0)
+                         )
+                        )
+                        (i32.const 1)
+                       )
+                       (i32.const 2)
+                      )
+                     )
+                    )
+                    (local.tee $0
+                     (i32.and
+                      (i32.shr_u
+                       (local.tee $4
+                        (i32.shr_u
+                         (local.get $4)
+                         (local.get $0)
+                        )
+                       )
+                       (i32.const 1)
+                      )
+                      (i32.const 1)
+                     )
+                    )
+                   )
+                   (i32.shr_u
+                    (local.get $4)
+                    (local.get $0)
+                   )
+                  )
+                  (i32.const 2)
+                 )
+                 (i32.const 4480)
+                )
+               )
+              )
+              (local.get $4)
+             )
+            )
+           )
+           (local.set $4
+            (local.get $1)
+           )
+           (br $label$78)
+          )
+          (loop $label$96
+           (if
+            (local.tee $10
+             (i32.lt_u
+              (local.tee $4
+               (i32.sub
+                (i32.and
+                 (i32.load offset=4
+                  (local.get $0)
+                 )
+                 (i32.const -8)
+                )
+                (local.get $7)
+               )
+              )
+              (local.get $3)
+             )
+            )
+            (local.set $3
+             (local.get $4)
+            )
+           )
+           (if
+            (local.get $10)
+            (local.set $1
+             (local.get $0)
+            )
+           )
+           (if
+            (local.tee $4
+             (i32.load offset=16
+              (local.get $0)
+             )
+            )
+            (block
+             (local.set $0
+              (local.get $4)
+             )
+             (br $label$96)
+            )
+           )
+           (br_if $label$96
+            (local.tee $0
+             (i32.load offset=20
+              (local.get $0)
+             )
+            )
+           )
+           (local.set $4
+            (local.get $1)
+           )
+          )
+         )
+         (if
+          (local.get $4)
+          (if
+           (i32.lt_u
+            (local.get $3)
+            (i32.sub
+             (i32.load
+              (i32.const 4184)
+             )
+             (local.get $7)
+            )
+           )
+           (block
+            (if
+             (i32.lt_u
+              (local.get $4)
+              (local.tee $12
+               (i32.load
+                (i32.const 4192)
+               )
+              )
+             )
+             (call $fimport$8)
+            )
+            (if
+             (i32.ge_u
+              (local.get $4)
+              (local.tee $6
+               (i32.add
+                (local.get $4)
+                (local.get $7)
+               )
+              )
+             )
+             (call $fimport$8)
+            )
+            (local.set $10
+             (i32.load offset=24
+              (local.get $4)
+             )
+            )
+            (block $label$104
+             (if
+              (i32.eq
+               (local.tee $0
+                (i32.load offset=12
+                 (local.get $4)
+                )
+               )
+               (local.get $4)
+              )
+              (block
+               (if
+                (i32.eqz
+                 (local.tee $0
+                  (i32.load
+                   (local.tee $1
+                    (i32.add
+                     (local.get $4)
+                     (i32.const 20)
+                    )
+                   )
+                  )
+                 )
+                )
+                (if
+                 (i32.eqz
+                  (local.tee $0
+                   (i32.load
+                    (local.tee $1
+                     (i32.add
+                      (local.get $4)
+                      (i32.const 16)
+                     )
+                    )
+                   )
+                  )
+                 )
+                 (block
+                  (local.set $13
+                   (i32.const 0)
+                  )
+                  (br $label$104)
+                 )
+                )
+               )
+               (loop $label$108
+                (if
+                 (local.tee $11
+                  (i32.load
+                   (local.tee $9
+                    (i32.add
+                     (local.get $0)
+                     (i32.const 20)
+                    )
+                   )
+                  )
+                 )
+                 (block
+                  (local.set $0
+                   (local.get $11)
+                  )
+                  (local.set $1
+                   (local.get $9)
+                  )
+                  (br $label$108)
+                 )
+                )
+                (if
+                 (local.tee $11
+                  (i32.load
+                   (local.tee $9
+                    (i32.add
+                     (local.get $0)
+                     (i32.const 16)
+                    )
+                   )
+                  )
+                 )
+                 (block
+                  (local.set $0
+                   (local.get $11)
+                  )
+                  (local.set $1
+                   (local.get $9)
+                  )
+                  (br $label$108)
+                 )
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.get $1)
+                 (local.get $12)
+                )
+                (call $fimport$8)
+                (block
+                 (i32.store
+                  (local.get $1)
+                  (i32.const 0)
+                 )
+                 (local.set $13
+                  (local.get $0)
+                 )
+                )
+               )
+              )
+              (block
+               (if
+                (i32.lt_u
+                 (local.tee $9
+                  (i32.load offset=8
+                   (local.get $4)
+                  )
+                 )
+                 (local.get $12)
+                )
+                (call $fimport$8)
+               )
+               (if
+                (i32.ne
+                 (i32.load
+                  (local.tee $11
+                   (i32.add
+                    (local.get $9)
+                    (i32.const 12)
+                   )
+                  )
+                 )
+                 (local.get $4)
+                )
+                (call $fimport$8)
+               )
+               (if
+                (i32.eq
+                 (i32.load
+                  (local.tee $1
+                   (i32.add
+                    (local.get $0)
+                    (i32.const 8)
+                   )
+                  )
+                 )
+                 (local.get $4)
+                )
+                (block
+                 (i32.store
+                  (local.get $11)
+                  (local.get $0)
+                 )
+                 (i32.store
+                  (local.get $1)
+                  (local.get $9)
+                 )
+                 (local.set $13
+                  (local.get $0)
+                 )
+                )
+                (call $fimport$8)
+               )
+              )
+             )
+            )
+            (block $label$118
+             (if
+              (local.get $10)
+              (block
+               (if
+                (i32.eq
+                 (local.get $4)
+                 (i32.load
+                  (local.tee $0
+                   (i32.add
+                    (i32.shl
+                     (local.tee $1
+                      (i32.load offset=28
+                       (local.get $4)
+                      )
+                     )
+                     (i32.const 2)
+                    )
+                    (i32.const 4480)
+                   )
+                  )
+                 )
+                )
+                (block
+                 (i32.store
+                  (local.get $0)
+                  (local.get $13)
+                 )
+                 (if
+                  (i32.eqz
+                   (local.get $13)
+                  )
+                  (block
+                   (i32.store
+                    (i32.const 4180)
+                    (local.tee $2
+                     (i32.and
+                      (local.get $5)
+                      (i32.xor
+                       (i32.shl
+                        (i32.const 1)
+                        (local.get $1)
+                       )
+                       (i32.const -1)
+                      )
+                     )
+                    )
+                   )
+                   (br $label$118)
+                  )
+                 )
+                )
+                (block
+                 (if
+                  (i32.lt_u
+                   (local.get $10)
+                   (i32.load
+                    (i32.const 4192)
+                   )
+                  )
+                  (call $fimport$8)
+                 )
+                 (if
+                  (i32.eq
+                   (i32.load
+                    (local.tee $0
+                     (i32.add
+                      (local.get $10)
+                      (i32.const 16)
+                     )
+                    )
+                   )
+                   (local.get $4)
+                  )
+                  (i32.store
+                   (local.get $0)
+                   (local.get $13)
+                  )
+                  (i32.store offset=20
+                   (local.get $10)
+                   (local.get $13)
+                  )
+                 )
+                 (if
+                  (i32.eqz
+                   (local.get $13)
+                  )
+                  (block
+                   (local.set $2
+                    (local.get $5)
+                   )
+                   (br $label$118)
+                  )
+                 )
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.get $13)
+                 (local.tee $0
+                  (i32.load
+                   (i32.const 4192)
+                  )
+                 )
+                )
+                (call $fimport$8)
+               )
+               (i32.store offset=24
+                (local.get $13)
+                (local.get $10)
+               )
+               (if
+                (local.tee $1
+                 (i32.load offset=16
+                  (local.get $4)
+                 )
+                )
+                (if
+                 (i32.lt_u
+                  (local.get $1)
+                  (local.get $0)
+                 )
+                 (call $fimport$8)
+                 (block
+                  (i32.store offset=16
+                   (local.get $13)
+                   (local.get $1)
+                  )
+                  (i32.store offset=24
+                   (local.get $1)
+                   (local.get $13)
+                  )
+                 )
+                )
+               )
+               (if
+                (local.tee $0
+                 (i32.load offset=20
+                  (local.get $4)
+                 )
+                )
+                (if
+                 (i32.lt_u
+                  (local.get $0)
+                  (i32.load
+                   (i32.const 4192)
+                  )
+                 )
+                 (call $fimport$8)
+                 (block
+                  (i32.store offset=20
+                   (local.get $13)
+                   (local.get $0)
+                  )
+                  (i32.store offset=24
+                   (local.get $0)
+                   (local.get $13)
+                  )
+                  (local.set $2
+                   (local.get $5)
+                  )
+                 )
+                )
+                (local.set $2
+                 (local.get $5)
+                )
+               )
+              )
+              (local.set $2
+               (local.get $5)
+              )
+             )
+            )
+            (block $label$136
+             (if
+              (i32.lt_u
+               (local.get $3)
+               (i32.const 16)
+              )
+              (block
+               (i32.store offset=4
+                (local.get $4)
+                (i32.or
+                 (local.tee $0
+                  (i32.add
+                   (local.get $3)
+                   (local.get $7)
+                  )
+                 )
+                 (i32.const 3)
+                )
+               )
+               (i32.store
+                (local.tee $0
+                 (i32.add
+                  (i32.add
+                   (local.get $4)
+                   (local.get $0)
+                  )
+                  (i32.const 4)
+                 )
+                )
+                (i32.or
+                 (i32.load
+                  (local.get $0)
+                 )
+                 (i32.const 1)
+                )
+               )
+              )
+              (block
+               (i32.store offset=4
+                (local.get $4)
+                (i32.or
+                 (local.get $7)
+                 (i32.const 3)
+                )
+               )
+               (i32.store offset=4
+                (local.get $6)
+                (i32.or
+                 (local.get $3)
+                 (i32.const 1)
+                )
+               )
+               (i32.store
+                (i32.add
+                 (local.get $6)
+                 (local.get $3)
+                )
+                (local.get $3)
+               )
+               (local.set $0
+                (i32.shr_u
+                 (local.get $3)
+                 (i32.const 3)
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.get $3)
+                 (i32.const 256)
+                )
+                (block
+                 (local.set $3
+                  (i32.add
+                   (i32.shl
+                    (i32.shl
+                     (local.get $0)
+                     (i32.const 1)
+                    )
+                    (i32.const 2)
+                   )
+                   (i32.const 4216)
+                  )
+                 )
+                 (if
+                  (i32.and
+                   (local.tee $1
+                    (i32.load
+                     (i32.const 4176)
+                    )
+                   )
+                   (local.tee $0
+                    (i32.shl
+                     (i32.const 1)
+                     (local.get $0)
+                    )
+                   )
+                  )
+                  (if
+                   (i32.lt_u
+                    (local.tee $0
+                     (i32.load
+                      (local.tee $1
+                       (i32.add
+                        (local.get $3)
+                        (i32.const 8)
+                       )
+                      )
+                     )
+                    )
+                    (i32.load
+                     (i32.const 4192)
+                    )
+                   )
+                   (call $fimport$8)
+                   (block
+                    (local.set $16
+                     (local.get $1)
+                    )
+                    (local.set $8
+                     (local.get $0)
+                    )
+                   )
+                  )
+                  (block
+                   (i32.store
+                    (i32.const 4176)
+                    (i32.or
+                     (local.get $1)
+                     (local.get $0)
+                    )
+                   )
+                   (local.set $16
+                    (i32.add
+                     (local.get $3)
+                     (i32.const 8)
+                    )
+                   )
+                   (local.set $8
+                    (local.get $3)
+                   )
+                  )
+                 )
+                 (i32.store
+                  (local.get $16)
+                  (local.get $6)
+                 )
+                 (i32.store offset=12
+                  (local.get $8)
+                  (local.get $6)
+                 )
+                 (i32.store offset=8
+                  (local.get $6)
+                  (local.get $8)
+                 )
+                 (i32.store offset=12
+                  (local.get $6)
+                  (local.get $3)
+                 )
+                 (br $label$136)
+                )
+               )
+               (local.set $1
+                (i32.add
+                 (i32.shl
+                  (local.tee $5
+                   (if (result i32)
+                    (local.tee $0
+                     (i32.shr_u
+                      (local.get $3)
+                      (i32.const 8)
+                     )
+                    )
+                    (if (result i32)
+                     (i32.gt_u
+                      (local.get $3)
+                      (i32.const 16777215)
+                     )
+                     (i32.const 31)
+                     (i32.or
+                      (i32.and
+                       (i32.shr_u
+                        (local.get $3)
+                        (i32.add
+                         (local.tee $0
+                          (i32.add
+                           (i32.sub
+                            (i32.const 14)
+                            (i32.or
+                             (i32.or
+                              (local.tee $0
+                               (i32.and
+                                (i32.shr_u
+                                 (i32.add
+                                  (local.tee $1
+                                   (i32.shl
+                                    (local.get $0)
+                                    (local.tee $5
+                                     (i32.and
+                                      (i32.shr_u
+                                       (i32.add
+                                        (local.get $0)
+                                        (i32.const 1048320)
+                                       )
+                                       (i32.const 16)
+                                      )
+                                      (i32.const 8)
+                                     )
+                                    )
+                                   )
+                                  )
+                                  (i32.const 520192)
+                                 )
+                                 (i32.const 16)
+                                )
+                                (i32.const 4)
+                               )
+                              )
+                              (local.get $5)
+                             )
+                             (local.tee $0
+                              (i32.and
+                               (i32.shr_u
+                                (i32.add
+                                 (local.tee $1
+                                  (i32.shl
+                                   (local.get $1)
+                                   (local.get $0)
+                                  )
+                                 )
+                                 (i32.const 245760)
+                                )
+                                (i32.const 16)
+                               )
+                               (i32.const 2)
+                              )
+                             )
+                            )
+                           )
+                           (i32.shr_u
+                            (i32.shl
+                             (local.get $1)
+                             (local.get $0)
+                            )
+                            (i32.const 15)
+                           )
+                          )
+                         )
+                         (i32.const 7)
+                        )
+                       )
+                       (i32.const 1)
+                      )
+                      (i32.shl
+                       (local.get $0)
+                       (i32.const 1)
+                      )
+                     )
+                    )
+                    (i32.const 0)
+                   )
+                  )
+                  (i32.const 2)
+                 )
+                 (i32.const 4480)
+                )
+               )
+               (i32.store offset=28
+                (local.get $6)
+                (local.get $5)
+               )
+               (i32.store offset=4
+                (local.tee $0
+                 (i32.add
+                  (local.get $6)
+                  (i32.const 16)
+                 )
+                )
+                (i32.const 0)
+               )
+               (i32.store
+                (local.get $0)
+                (i32.const 0)
+               )
+               (if
+                (i32.eqz
+                 (i32.and
+                  (local.get $2)
+                  (local.tee $0
+                   (i32.shl
+                    (i32.const 1)
+                    (local.get $5)
+                   )
+                  )
+                 )
+                )
+                (block
+                 (i32.store
+                  (i32.const 4180)
+                  (i32.or
+                   (local.get $2)
+                   (local.get $0)
+                  )
+                 )
+                 (i32.store
+                  (local.get $1)
+                  (local.get $6)
+                 )
+                 (i32.store offset=24
+                  (local.get $6)
+                  (local.get $1)
+                 )
+                 (i32.store offset=12
+                  (local.get $6)
+                  (local.get $6)
+                 )
+                 (i32.store offset=8
+                  (local.get $6)
+                  (local.get $6)
+                 )
+                 (br $label$136)
+                )
+               )
+               (local.set $0
+                (i32.load
+                 (local.get $1)
+                )
+               )
+               (local.set $1
+                (i32.sub
+                 (i32.const 25)
+                 (i32.shr_u
+                  (local.get $5)
+                  (i32.const 1)
+                 )
+                )
+               )
+               (local.set $5
+                (i32.shl
+                 (local.get $3)
+                 (if (result i32)
+                  (i32.eq
+                   (local.get $5)
+                   (i32.const 31)
+                  )
+                  (i32.const 0)
+                  (local.get $1)
+                 )
+                )
+               )
+               (block $label$151
+                (block $label$152
+                 (block $label$153
+                  (loop $label$154
+                   (br_if $label$152
+                    (i32.eq
+                     (i32.and
+                      (i32.load offset=4
+                       (local.get $0)
+                      )
+                      (i32.const -8)
+                     )
+                     (local.get $3)
+                    )
+                   )
+                   (local.set $2
+                    (i32.shl
+                     (local.get $5)
+                     (i32.const 1)
+                    )
+                   )
+                   (br_if $label$153
+                    (i32.eqz
+                     (local.tee $1
+                      (i32.load
+                       (local.tee $5
+                        (i32.add
+                         (i32.add
+                          (local.get $0)
+                          (i32.const 16)
+                         )
+                         (i32.shl
+                          (i32.shr_u
+                           (local.get $5)
+                           (i32.const 31)
+                          )
+                          (i32.const 2)
+                         )
+                        )
+                       )
+                      )
+                     )
+                    )
+                   )
+                   (local.set $5
+                    (local.get $2)
+                   )
+                   (local.set $0
+                    (local.get $1)
+                   )
+                   (br $label$154)
+                  )
+                 )
+                 (if
+                  (i32.lt_u
+                   (local.get $5)
+                   (i32.load
+                    (i32.const 4192)
+                   )
+                  )
+                  (call $fimport$8)
+                  (block
+                   (i32.store
+                    (local.get $5)
+                    (local.get $6)
+                   )
+                   (i32.store offset=24
+                    (local.get $6)
+                    (local.get $0)
+                   )
+                   (i32.store offset=12
+                    (local.get $6)
+                    (local.get $6)
+                   )
+                   (i32.store offset=8
+                    (local.get $6)
+                    (local.get $6)
+                   )
+                   (br $label$136)
+                  )
+                 )
+                 (br $label$151)
+                )
+                (if
+                 (i32.and
+                  (i32.ge_u
+                   (local.tee $2
+                    (i32.load
+                     (local.tee $3
+                      (i32.add
+                       (local.get $0)
+                       (i32.const 8)
+                      )
+                     )
+                    )
+                   )
+                   (local.tee $1
+                    (i32.load
+                     (i32.const 4192)
+                    )
+                   )
+                  )
+                  (i32.ge_u
+                   (local.get $0)
+                   (local.get $1)
+                  )
+                 )
+                 (block
+                  (i32.store offset=12
+                   (local.get $2)
+                   (local.get $6)
+                  )
+                  (i32.store
+                   (local.get $3)
+                   (local.get $6)
+                  )
+                  (i32.store offset=8
+                   (local.get $6)
+                   (local.get $2)
+                  )
+                  (i32.store offset=12
+                   (local.get $6)
+                   (local.get $0)
+                  )
+                  (i32.store offset=24
+                   (local.get $6)
+                   (i32.const 0)
+                  )
+                 )
+                 (call $fimport$8)
+                )
+               )
+              )
+             )
+            )
+            (global.set $global$1
+             (local.get $14)
+            )
+            (return
+             (i32.add
+              (local.get $4)
+              (i32.const 8)
+             )
+            )
+           )
+           (local.set $0
+            (local.get $7)
+           )
+          )
+          (local.set $0
+           (local.get $7)
+          )
+         )
+        )
+        (local.set $0
+         (local.get $7)
+        )
+       )
+      )
+     )
+    )
+   )
+   (if
+    (i32.ge_u
+     (local.tee $1
+      (i32.load
+       (i32.const 4184)
+      )
+     )
+     (local.get $0)
+    )
+    (block
+     (local.set $2
+      (i32.load
+       (i32.const 4196)
+      )
+     )
+     (if
+      (i32.gt_u
+       (local.tee $3
+        (i32.sub
+         (local.get $1)
+         (local.get $0)
+        )
+       )
+       (i32.const 15)
+      )
+      (block
+       (i32.store
+        (i32.const 4196)
+        (local.tee $1
+         (i32.add
+          (local.get $2)
+          (local.get $0)
+         )
+        )
+       )
+       (i32.store
+        (i32.const 4184)
+        (local.get $3)
+       )
+       (i32.store offset=4
+        (local.get $1)
+        (i32.or
+         (local.get $3)
+         (i32.const 1)
+        )
+       )
+       (i32.store
+        (i32.add
+         (local.get $1)
+         (local.get $3)
+        )
+        (local.get $3)
+       )
+       (i32.store offset=4
+        (local.get $2)
+        (i32.or
+         (local.get $0)
+         (i32.const 3)
+        )
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 4184)
+        (i32.const 0)
+       )
+       (i32.store
+        (i32.const 4196)
+        (i32.const 0)
+       )
+       (i32.store offset=4
+        (local.get $2)
+        (i32.or
+         (local.get $1)
+         (i32.const 3)
+        )
+       )
+       (i32.store
+        (local.tee $0
+         (i32.add
+          (i32.add
+           (local.get $2)
+           (local.get $1)
+          )
+          (i32.const 4)
+         )
+        )
+        (i32.or
+         (i32.load
+          (local.get $0)
+         )
+         (i32.const 1)
+        )
+       )
+      )
+     )
+     (global.set $global$1
+      (local.get $14)
+     )
+     (return
+      (i32.add
+       (local.get $2)
+       (i32.const 8)
+      )
+     )
+    )
+   )
+   (if
+    (i32.gt_u
+     (local.tee $10
+      (i32.load
+       (i32.const 4188)
+      )
+     )
+     (local.get $0)
+    )
+    (block
+     (i32.store
+      (i32.const 4188)
+      (local.tee $3
+       (i32.sub
+        (local.get $10)
+        (local.get $0)
+       )
+      )
+     )
+     (i32.store
+      (i32.const 4200)
+      (local.tee $1
+       (i32.add
+        (local.tee $2
+         (i32.load
+          (i32.const 4200)
+         )
+        )
+        (local.get $0)
+       )
+      )
+     )
+     (i32.store offset=4
+      (local.get $1)
+      (i32.or
+       (local.get $3)
+       (i32.const 1)
+      )
+     )
+     (i32.store offset=4
+      (local.get $2)
+      (i32.or
+       (local.get $0)
+       (i32.const 3)
+      )
+     )
+     (global.set $global$1
+      (local.get $14)
+     )
+     (return
+      (i32.add
+       (local.get $2)
+       (i32.const 8)
+      )
+     )
+    )
+   )
+   (if
+    (i32.le_u
+     (local.tee $6
+      (i32.and
+       (local.tee $8
+        (i32.add
+         (local.tee $1
+          (if (result i32)
+           (i32.load
+            (i32.const 4648)
+           )
+           (i32.load
+            (i32.const 4656)
+           )
+           (block (result i32)
+            (i32.store
+             (i32.const 4656)
+             (i32.const 4096)
+            )
+            (i32.store
+             (i32.const 4652)
+             (i32.const 4096)
+            )
+            (i32.store
+             (i32.const 4660)
+             (i32.const -1)
+            )
+            (i32.store
+             (i32.const 4664)
+             (i32.const -1)
+            )
+            (i32.store
+             (i32.const 4668)
+             (i32.const 0)
+            )
+            (i32.store
+             (i32.const 4620)
+             (i32.const 0)
+            )
+            (i32.store
+             (local.get $18)
+             (local.tee $1
+              (i32.xor
+               (i32.and
+                (local.get $18)
+                (i32.const -16)
+               )
+               (i32.const 1431655768)
+              )
+             )
+            )
+            (i32.store
+             (i32.const 4648)
+             (local.get $1)
+            )
+            (i32.const 4096)
+           )
+          )
+         )
+         (local.tee $13
+          (i32.add
+           (local.get $0)
+           (i32.const 47)
+          )
+         )
+        )
+       )
+       (local.tee $4
+        (i32.sub
+         (i32.const 0)
+         (local.get $1)
+        )
+       )
+      )
+     )
+     (local.get $0)
+    )
+    (block
+     (global.set $global$1
+      (local.get $14)
+     )
+     (return
+      (i32.const 0)
+     )
+    )
+   )
+   (if
+    (local.tee $2
+     (i32.load
+      (i32.const 4616)
+     )
+    )
+    (if
+     (i32.or
+      (i32.le_u
+       (local.tee $1
+        (i32.add
+         (local.tee $3
+          (i32.load
+           (i32.const 4608)
+          )
+         )
+         (local.get $6)
+        )
+       )
+       (local.get $3)
+      )
+      (i32.gt_u
+       (local.get $1)
+       (local.get $2)
+      )
+     )
+     (block
+      (global.set $global$1
+       (local.get $14)
+      )
+      (return
+       (i32.const 0)
+      )
+     )
+    )
+   )
+   (local.set $7
+    (i32.add
+     (local.get $0)
+     (i32.const 48)
+    )
+   )
+   (block $label$171
+    (block $label$172
+     (if
+      (i32.eqz
+       (i32.and
+        (i32.load
+         (i32.const 4620)
+        )
+        (i32.const 4)
+       )
+      )
+      (block
+       (block $label$174
+        (block $label$175
+         (block $label$176
+          (br_if $label$176
+           (i32.eqz
+            (local.tee $3
+             (i32.load
+              (i32.const 4200)
+             )
+            )
+           )
+          )
+          (local.set $2
+           (i32.const 4624)
+          )
+          (loop $label$177
+           (block $label$178
+            (if
+             (i32.le_u
+              (local.tee $1
+               (i32.load
+                (local.get $2)
+               )
+              )
+              (local.get $3)
+             )
+             (br_if $label$178
+              (i32.gt_u
+               (i32.add
+                (local.get $1)
+                (i32.load
+                 (local.tee $5
+                  (i32.add
+                   (local.get $2)
+                   (i32.const 4)
+                  )
+                 )
+                )
+               )
+               (local.get $3)
+              )
+             )
+            )
+            (br_if $label$176
+             (i32.eqz
+              (local.tee $1
+               (i32.load offset=8
+                (local.get $2)
+               )
+              )
+             )
+            )
+            (local.set $2
+             (local.get $1)
+            )
+            (br $label$177)
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.tee $3
+             (i32.and
+              (i32.sub
+               (local.get $8)
+               (local.get $10)
+              )
+              (local.get $4)
+             )
+            )
+            (i32.const 2147483647)
+           )
+           (if
+            (i32.eq
+             (local.tee $1
+              (call $45
+               (local.get $3)
+              )
+             )
+             (i32.add
+              (i32.load
+               (local.get $2)
+              )
+              (i32.load
+               (local.get $5)
+              )
+             )
+            )
+            (br_if $label$172
+             (i32.ne
+              (local.get $1)
+              (i32.const -1)
+             )
+            )
+            (block
+             (local.set $2
+              (local.get $1)
+             )
+             (local.set $1
+              (local.get $3)
+             )
+             (br $label$175)
+            )
+           )
+          )
+          (br $label$174)
+         )
+         (if
+          (i32.ne
+           (local.tee $1
+            (call $45
+             (i32.const 0)
+            )
+           )
+           (i32.const -1)
+          )
+          (block
+           (local.set $2
+            (i32.sub
+             (i32.and
+              (i32.add
+               (local.tee $5
+                (i32.add
+                 (local.tee $2
+                  (i32.load
+                   (i32.const 4652)
+                  )
+                 )
+                 (i32.const -1)
+                )
+               )
+               (local.tee $3
+                (local.get $1)
+               )
+              )
+              (i32.sub
+               (i32.const 0)
+               (local.get $2)
+              )
+             )
+             (local.get $3)
+            )
+           )
+           (local.set $4
+            (i32.add
+             (local.tee $3
+              (i32.add
+               (if (result i32)
+                (i32.and
+                 (local.get $5)
+                 (local.get $3)
+                )
+                (local.get $2)
+                (i32.const 0)
+               )
+               (local.get $6)
+              )
+             )
+             (local.tee $5
+              (i32.load
+               (i32.const 4608)
+              )
+             )
+            )
+           )
+           (if
+            (i32.and
+             (i32.gt_u
+              (local.get $3)
+              (local.get $0)
+             )
+             (i32.lt_u
+              (local.get $3)
+              (i32.const 2147483647)
+             )
+            )
+            (block
+             (if
+              (local.tee $2
+               (i32.load
+                (i32.const 4616)
+               )
+              )
+              (br_if $label$174
+               (i32.or
+                (i32.le_u
+                 (local.get $4)
+                 (local.get $5)
+                )
+                (i32.gt_u
+                 (local.get $4)
+                 (local.get $2)
+                )
+               )
+              )
+             )
+             (br_if $label$172
+              (i32.eq
+               (local.tee $2
+                (call $45
+                 (local.get $3)
+                )
+               )
+               (local.get $1)
+              )
+             )
+             (local.set $1
+              (local.get $3)
+             )
+             (br $label$175)
+            )
+           )
+          )
+         )
+         (br $label$174)
+        )
+        (local.set $5
+         (i32.sub
+          (i32.const 0)
+          (local.get $1)
+         )
+        )
+        (if
+         (i32.and
+          (i32.gt_u
+           (local.get $7)
+           (local.get $1)
+          )
+          (i32.and
+           (i32.lt_u
+            (local.get $1)
+            (i32.const 2147483647)
+           )
+           (i32.ne
+            (local.get $2)
+            (i32.const -1)
+           )
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.tee $3
+            (i32.and
+             (i32.add
+              (i32.sub
+               (local.get $13)
+               (local.get $1)
+              )
+              (local.tee $3
+               (i32.load
+                (i32.const 4656)
+               )
+              )
+             )
+             (i32.sub
+              (i32.const 0)
+              (local.get $3)
+             )
+            )
+           )
+           (i32.const 2147483647)
+          )
+          (if
+           (i32.eq
+            (call $45
+             (local.get $3)
+            )
+            (i32.const -1)
+           )
+           (block
+            (drop
+             (call $45
+              (local.get $5)
+             )
+            )
+            (br $label$174)
+           )
+           (local.set $3
+            (i32.add
+             (local.get $3)
+             (local.get $1)
+            )
+           )
+          )
+          (local.set $3
+           (local.get $1)
+          )
+         )
+         (local.set $3
+          (local.get $1)
+         )
+        )
+        (if
+         (i32.ne
+          (local.get $2)
+          (i32.const -1)
+         )
+         (block
+          (local.set $1
+           (local.get $2)
+          )
+          (br $label$172)
+         )
+        )
+       )
+       (i32.store
+        (i32.const 4620)
+        (i32.or
+         (i32.load
+          (i32.const 4620)
+         )
+         (i32.const 4)
+        )
+       )
+      )
+     )
+     (if
+      (i32.lt_u
+       (local.get $6)
+       (i32.const 2147483647)
+      )
+      (if
+       (i32.and
+        (i32.lt_u
+         (local.tee $1
+          (call $45
+           (local.get $6)
+          )
+         )
+         (local.tee $3
+          (call $45
+           (i32.const 0)
+          )
+         )
+        )
+        (i32.and
+         (i32.ne
+          (local.get $1)
+          (i32.const -1)
+         )
+         (i32.ne
+          (local.get $3)
+          (i32.const -1)
+         )
+        )
+       )
+       (br_if $label$172
+        (i32.gt_u
+         (local.tee $3
+          (i32.sub
+           (local.get $3)
+           (local.get $1)
+          )
+         )
+         (i32.add
+          (local.get $0)
+          (i32.const 40)
+         )
+        )
+       )
+      )
+     )
+     (br $label$171)
+    )
+    (i32.store
+     (i32.const 4608)
+     (local.tee $2
+      (i32.add
+       (i32.load
+        (i32.const 4608)
+       )
+       (local.get $3)
+      )
+     )
+    )
+    (if
+     (i32.gt_u
+      (local.get $2)
+      (i32.load
+       (i32.const 4612)
+      )
+     )
+     (i32.store
+      (i32.const 4612)
+      (local.get $2)
+     )
+    )
+    (block $label$198
+     (if
+      (local.tee $8
+       (i32.load
+        (i32.const 4200)
+       )
+      )
+      (block
+       (local.set $2
+        (i32.const 4624)
+       )
+       (block $label$200
+        (block $label$201
+         (loop $label$202
+          (br_if $label$201
+           (i32.eq
+            (local.get $1)
+            (i32.add
+             (local.tee $4
+              (i32.load
+               (local.get $2)
+              )
+             )
+             (local.tee $5
+              (i32.load
+               (local.tee $7
+                (i32.add
+                 (local.get $2)
+                 (i32.const 4)
+                )
+               )
+              )
+             )
+            )
+           )
+          )
+          (br_if $label$202
+           (local.tee $2
+            (i32.load offset=8
+             (local.get $2)
+            )
+           )
+          )
+         )
+         (br $label$200)
+        )
+        (if
+         (i32.eqz
+          (i32.and
+           (i32.load offset=12
+            (local.get $2)
+           )
+           (i32.const 8)
+          )
+         )
+         (if
+          (i32.and
+           (i32.lt_u
+            (local.get $8)
+            (local.get $1)
+           )
+           (i32.ge_u
+            (local.get $8)
+            (local.get $4)
+           )
+          )
+          (block
+           (i32.store
+            (local.get $7)
+            (i32.add
+             (local.get $5)
+             (local.get $3)
+            )
+           )
+           (local.set $5
+            (i32.load
+             (i32.const 4188)
+            )
+           )
+           (local.set $1
+            (i32.and
+             (i32.sub
+              (i32.const 0)
+              (local.tee $2
+               (i32.add
+                (local.get $8)
+                (i32.const 8)
+               )
+              )
+             )
+             (i32.const 7)
+            )
+           )
+           (i32.store
+            (i32.const 4200)
+            (local.tee $2
+             (i32.add
+              (local.get $8)
+              (if (result i32)
+               (i32.and
+                (local.get $2)
+                (i32.const 7)
+               )
+               (local.get $1)
+               (local.tee $1
+                (i32.const 0)
+               )
+              )
+             )
+            )
+           )
+           (i32.store
+            (i32.const 4188)
+            (local.tee $1
+             (i32.add
+              (i32.sub
+               (local.get $3)
+               (local.get $1)
+              )
+              (local.get $5)
+             )
+            )
+           )
+           (i32.store offset=4
+            (local.get $2)
+            (i32.or
+             (local.get $1)
+             (i32.const 1)
+            )
+           )
+           (i32.store offset=4
+            (i32.add
+             (local.get $2)
+             (local.get $1)
+            )
+            (i32.const 40)
+           )
+           (i32.store
+            (i32.const 4204)
+            (i32.load
+             (i32.const 4664)
+            )
+           )
+           (br $label$198)
+          )
+         )
+        )
+       )
+       (if
+        (i32.lt_u
+         (local.get $1)
+         (local.tee $2
+          (i32.load
+           (i32.const 4192)
+          )
+         )
+        )
+        (block
+         (i32.store
+          (i32.const 4192)
+          (local.get $1)
+         )
+         (local.set $2
+          (local.get $1)
+         )
+        )
+       )
+       (local.set $10
+        (i32.add
+         (local.get $1)
+         (local.get $3)
+        )
+       )
+       (local.set $5
+        (i32.const 4624)
+       )
+       (block $label$208
+        (block $label$209
+         (loop $label$210
+          (br_if $label$209
+           (i32.eq
+            (i32.load
+             (local.get $5)
+            )
+            (local.get $10)
+           )
+          )
+          (br_if $label$210
+           (local.tee $5
+            (i32.load offset=8
+             (local.get $5)
+            )
+           )
+          )
+          (local.set $5
+           (i32.const 4624)
+          )
+         )
+         (br $label$208)
+        )
+        (if
+         (i32.and
+          (i32.load offset=12
+           (local.get $5)
+          )
+          (i32.const 8)
+         )
+         (local.set $5
+          (i32.const 4624)
+         )
+         (block
+          (i32.store
+           (local.get $5)
+           (local.get $1)
+          )
+          (i32.store
+           (local.tee $5
+            (i32.add
+             (local.get $5)
+             (i32.const 4)
+            )
+           )
+           (i32.add
+            (i32.load
+             (local.get $5)
+            )
+            (local.get $3)
+           )
+          )
+          (local.set $7
+           (i32.and
+            (i32.sub
+             (i32.const 0)
+             (local.tee $4
+              (i32.add
+               (local.get $1)
+               (i32.const 8)
+              )
+             )
+            )
+            (i32.const 7)
+           )
+          )
+          (local.set $3
+           (i32.and
+            (i32.sub
+             (i32.const 0)
+             (local.tee $5
+              (i32.add
+               (local.get $10)
+               (i32.const 8)
+              )
+             )
+            )
+            (i32.const 7)
+           )
+          )
+          (local.set $6
+           (i32.add
+            (local.tee $13
+             (i32.add
+              (local.get $1)
+              (if (result i32)
+               (i32.and
+                (local.get $4)
+                (i32.const 7)
+               )
+               (local.get $7)
+               (i32.const 0)
+              )
+             )
+            )
+            (local.get $0)
+           )
+          )
+          (local.set $7
+           (i32.sub
+            (i32.sub
+             (local.tee $4
+              (i32.add
+               (local.get $10)
+               (if (result i32)
+                (i32.and
+                 (local.get $5)
+                 (i32.const 7)
+                )
+                (local.get $3)
+                (i32.const 0)
+               )
+              )
+             )
+             (local.get $13)
+            )
+            (local.get $0)
+           )
+          )
+          (i32.store offset=4
+           (local.get $13)
+           (i32.or
+            (local.get $0)
+            (i32.const 3)
+           )
+          )
+          (block $label$217
+           (if
+            (i32.eq
+             (local.get $4)
+             (local.get $8)
+            )
+            (block
+             (i32.store
+              (i32.const 4188)
+              (local.tee $0
+               (i32.add
+                (i32.load
+                 (i32.const 4188)
+                )
+                (local.get $7)
+               )
+              )
+             )
+             (i32.store
+              (i32.const 4200)
+              (local.get $6)
+             )
+             (i32.store offset=4
+              (local.get $6)
+              (i32.or
+               (local.get $0)
+               (i32.const 1)
+              )
+             )
+            )
+            (block
+             (if
+              (i32.eq
+               (local.get $4)
+               (i32.load
+                (i32.const 4196)
+               )
+              )
+              (block
+               (i32.store
+                (i32.const 4184)
+                (local.tee $0
+                 (i32.add
+                  (i32.load
+                   (i32.const 4184)
+                  )
+                  (local.get $7)
+                 )
+                )
+               )
+               (i32.store
+                (i32.const 4196)
+                (local.get $6)
+               )
+               (i32.store offset=4
+                (local.get $6)
+                (i32.or
+                 (local.get $0)
+                 (i32.const 1)
+                )
+               )
+               (i32.store
+                (i32.add
+                 (local.get $6)
+                 (local.get $0)
+                )
+                (local.get $0)
+               )
+               (br $label$217)
+              )
+             )
+             (i32.store
+              (local.tee $0
+               (i32.add
+                (local.tee $0
+                 (if (result i32)
+                  (i32.eq
+                   (i32.and
+                    (local.tee $0
+                     (i32.load offset=4
+                      (local.get $4)
+                     )
+                    )
+                    (i32.const 3)
+                   )
+                   (i32.const 1)
+                  )
+                  (block (result i32)
+                   (local.set $11
+                    (i32.and
+                     (local.get $0)
+                     (i32.const -8)
+                    )
+                   )
+                   (local.set $1
+                    (i32.shr_u
+                     (local.get $0)
+                     (i32.const 3)
+                    )
+                   )
+                   (block $label$222
+                    (if
+                     (i32.lt_u
+                      (local.get $0)
+                      (i32.const 256)
+                     )
+                     (block
+                      (local.set $5
+                       (i32.load offset=12
+                        (local.get $4)
+                       )
+                      )
+                      (block $label$224
+                       (if
+                        (i32.ne
+                         (local.tee $3
+                          (i32.load offset=8
+                           (local.get $4)
+                          )
+                         )
+                         (local.tee $0
+                          (i32.add
+                           (i32.shl
+                            (i32.shl
+                             (local.get $1)
+                             (i32.const 1)
+                            )
+                            (i32.const 2)
+                           )
+                           (i32.const 4216)
+                          )
+                         )
+                        )
+                        (block
+                         (if
+                          (i32.lt_u
+                           (local.get $3)
+                           (local.get $2)
+                          )
+                          (call $fimport$8)
+                         )
+                         (br_if $label$224
+                          (i32.eq
+                           (i32.load offset=12
+                            (local.get $3)
+                           )
+                           (local.get $4)
+                          )
+                         )
+                         (call $fimport$8)
+                        )
+                       )
+                      )
+                      (if
+                       (i32.eq
+                        (local.get $5)
+                        (local.get $3)
+                       )
+                       (block
+                        (i32.store
+                         (i32.const 4176)
+                         (i32.and
+                          (i32.load
+                           (i32.const 4176)
+                          )
+                          (i32.xor
+                           (i32.shl
+                            (i32.const 1)
+                            (local.get $1)
+                           )
+                           (i32.const -1)
+                          )
+                         )
+                        )
+                        (br $label$222)
+                       )
+                      )
+                      (block $label$228
+                       (if
+                        (i32.eq
+                         (local.get $5)
+                         (local.get $0)
+                        )
+                        (local.set $20
+                         (i32.add
+                          (local.get $5)
+                          (i32.const 8)
+                         )
+                        )
+                        (block
+                         (if
+                          (i32.lt_u
+                           (local.get $5)
+                           (local.get $2)
+                          )
+                          (call $fimport$8)
+                         )
+                         (if
+                          (i32.eq
+                           (i32.load
+                            (local.tee $0
+                             (i32.add
+                              (local.get $5)
+                              (i32.const 8)
+                             )
+                            )
+                           )
+                           (local.get $4)
+                          )
+                          (block
+                           (local.set $20
+                            (local.get $0)
+                           )
+                           (br $label$228)
+                          )
+                         )
+                         (call $fimport$8)
+                        )
+                       )
+                      )
+                      (i32.store offset=12
+                       (local.get $3)
+                       (local.get $5)
+                      )
+                      (i32.store
+                       (local.get $20)
+                       (local.get $3)
+                      )
+                     )
+                     (block
+                      (local.set $8
+                       (i32.load offset=24
+                        (local.get $4)
+                       )
+                      )
+                      (block $label$234
+                       (if
+                        (i32.eq
+                         (local.tee $0
+                          (i32.load offset=12
+                           (local.get $4)
+                          )
+                         )
+                         (local.get $4)
+                        )
+                        (block
+                         (if
+                          (i32.eqz
+                           (local.tee $0
+                            (i32.load
+                             (local.tee $1
+                              (i32.add
+                               (local.tee $3
+                                (i32.add
+                                 (local.get $4)
+                                 (i32.const 16)
+                                )
+                               )
+                               (i32.const 4)
+                              )
+                             )
+                            )
+                           )
+                          )
+                          (if
+                           (local.tee $0
+                            (i32.load
+                             (local.get $3)
+                            )
+                           )
+                           (local.set $1
+                            (local.get $3)
+                           )
+                           (block
+                            (local.set $12
+                             (i32.const 0)
+                            )
+                            (br $label$234)
+                           )
+                          )
+                         )
+                         (loop $label$239
+                          (if
+                           (local.tee $3
+                            (i32.load
+                             (local.tee $5
+                              (i32.add
+                               (local.get $0)
+                               (i32.const 20)
+                              )
+                             )
+                            )
+                           )
+                           (block
+                            (local.set $0
+                             (local.get $3)
+                            )
+                            (local.set $1
+                             (local.get $5)
+                            )
+                            (br $label$239)
+                           )
+                          )
+                          (if
+                           (local.tee $3
+                            (i32.load
+                             (local.tee $5
+                              (i32.add
+                               (local.get $0)
+                               (i32.const 16)
+                              )
+                             )
+                            )
+                           )
+                           (block
+                            (local.set $0
+                             (local.get $3)
+                            )
+                            (local.set $1
+                             (local.get $5)
+                            )
+                            (br $label$239)
+                           )
+                          )
+                         )
+                         (if
+                          (i32.lt_u
+                           (local.get $1)
+                           (local.get $2)
+                          )
+                          (call $fimport$8)
+                          (block
+                           (i32.store
+                            (local.get $1)
+                            (i32.const 0)
+                           )
+                           (local.set $12
+                            (local.get $0)
+                           )
+                          )
+                         )
+                        )
+                        (block
+                         (if
+                          (i32.lt_u
+                           (local.tee $5
+                            (i32.load offset=8
+                             (local.get $4)
+                            )
+                           )
+                           (local.get $2)
+                          )
+                          (call $fimport$8)
+                         )
+                         (if
+                          (i32.ne
+                           (i32.load
+                            (local.tee $3
+                             (i32.add
+                              (local.get $5)
+                              (i32.const 12)
+                             )
+                            )
+                           )
+                           (local.get $4)
+                          )
+                          (call $fimport$8)
+                         )
+                         (if
+                          (i32.eq
+                           (i32.load
+                            (local.tee $1
+                             (i32.add
+                              (local.get $0)
+                              (i32.const 8)
+                             )
+                            )
+                           )
+                           (local.get $4)
+                          )
+                          (block
+                           (i32.store
+                            (local.get $3)
+                            (local.get $0)
+                           )
+                           (i32.store
+                            (local.get $1)
+                            (local.get $5)
+                           )
+                           (local.set $12
+                            (local.get $0)
+                           )
+                          )
+                          (call $fimport$8)
+                         )
+                        )
+                       )
+                      )
+                      (br_if $label$222
+                       (i32.eqz
+                        (local.get $8)
+                       )
+                      )
+                      (block $label$249
+                       (if
+                        (i32.eq
+                         (local.get $4)
+                         (i32.load
+                          (local.tee $0
+                           (i32.add
+                            (i32.shl
+                             (local.tee $1
+                              (i32.load offset=28
+                               (local.get $4)
+                              )
+                             )
+                             (i32.const 2)
+                            )
+                            (i32.const 4480)
+                           )
+                          )
+                         )
+                        )
+                        (block
+                         (i32.store
+                          (local.get $0)
+                          (local.get $12)
+                         )
+                         (br_if $label$249
+                          (local.get $12)
+                         )
+                         (i32.store
+                          (i32.const 4180)
+                          (i32.and
+                           (i32.load
+                            (i32.const 4180)
+                           )
+                           (i32.xor
+                            (i32.shl
+                             (i32.const 1)
+                             (local.get $1)
+                            )
+                            (i32.const -1)
+                           )
+                          )
+                         )
+                         (br $label$222)
+                        )
+                        (block
+                         (if
+                          (i32.lt_u
+                           (local.get $8)
+                           (i32.load
+                            (i32.const 4192)
+                           )
+                          )
+                          (call $fimport$8)
+                         )
+                         (if
+                          (i32.eq
+                           (i32.load
+                            (local.tee $0
+                             (i32.add
+                              (local.get $8)
+                              (i32.const 16)
+                             )
+                            )
+                           )
+                           (local.get $4)
+                          )
+                          (i32.store
+                           (local.get $0)
+                           (local.get $12)
+                          )
+                          (i32.store offset=20
+                           (local.get $8)
+                           (local.get $12)
+                          )
+                         )
+                         (br_if $label$222
+                          (i32.eqz
+                           (local.get $12)
+                          )
+                         )
+                        )
+                       )
+                      )
+                      (if
+                       (i32.lt_u
+                        (local.get $12)
+                        (local.tee $1
+                         (i32.load
+                          (i32.const 4192)
+                         )
+                        )
+                       )
+                       (call $fimport$8)
+                      )
+                      (i32.store offset=24
+                       (local.get $12)
+                       (local.get $8)
+                      )
+                      (if
+                       (local.tee $3
+                        (i32.load
+                         (local.tee $0
+                          (i32.add
+                           (local.get $4)
+                           (i32.const 16)
+                          )
+                         )
+                        )
+                       )
+                       (if
+                        (i32.lt_u
+                         (local.get $3)
+                         (local.get $1)
+                        )
+                        (call $fimport$8)
+                        (block
+                         (i32.store offset=16
+                          (local.get $12)
+                          (local.get $3)
+                         )
+                         (i32.store offset=24
+                          (local.get $3)
+                          (local.get $12)
+                         )
+                        )
+                       )
+                      )
+                      (br_if $label$222
+                       (i32.eqz
+                        (local.tee $0
+                         (i32.load offset=4
+                          (local.get $0)
+                         )
+                        )
+                       )
+                      )
+                      (if
+                       (i32.lt_u
+                        (local.get $0)
+                        (i32.load
+                         (i32.const 4192)
+                        )
+                       )
+                       (call $fimport$8)
+                       (block
+                        (i32.store offset=20
+                         (local.get $12)
+                         (local.get $0)
+                        )
+                        (i32.store offset=24
+                         (local.get $0)
+                         (local.get $12)
+                        )
+                       )
+                      )
+                     )
+                    )
+                   )
+                   (local.set $7
+                    (i32.add
+                     (local.get $11)
+                     (local.get $7)
+                    )
+                   )
+                   (i32.add
+                    (local.get $4)
+                    (local.get $11)
+                   )
+                  )
+                  (local.get $4)
+                 )
+                )
+                (i32.const 4)
+               )
+              )
+              (i32.and
+               (i32.load
+                (local.get $0)
+               )
+               (i32.const -2)
+              )
+             )
+             (i32.store offset=4
+              (local.get $6)
+              (i32.or
+               (local.get $7)
+               (i32.const 1)
+              )
+             )
+             (i32.store
+              (i32.add
+               (local.get $6)
+               (local.get $7)
+              )
+              (local.get $7)
+             )
+             (local.set $0
+              (i32.shr_u
+               (local.get $7)
+               (i32.const 3)
+              )
+             )
+             (if
+              (i32.lt_u
+               (local.get $7)
+               (i32.const 256)
+              )
+              (block
+               (local.set $3
+                (i32.add
+                 (i32.shl
+                  (i32.shl
+                   (local.get $0)
+                   (i32.const 1)
+                  )
+                  (i32.const 2)
+                 )
+                 (i32.const 4216)
+                )
+               )
+               (block $label$263
+                (if
+                 (i32.and
+                  (local.tee $1
+                   (i32.load
+                    (i32.const 4176)
+                   )
+                  )
+                  (local.tee $0
+                   (i32.shl
+                    (i32.const 1)
+                    (local.get $0)
+                   )
+                  )
+                 )
+                 (block
+                  (if
+                   (i32.ge_u
+                    (local.tee $0
+                     (i32.load
+                      (local.tee $1
+                       (i32.add
+                        (local.get $3)
+                        (i32.const 8)
+                       )
+                      )
+                     )
+                    )
+                    (i32.load
+                     (i32.const 4192)
+                    )
+                   )
+                   (block
+                    (local.set $21
+                     (local.get $1)
+                    )
+                    (local.set $9
+                     (local.get $0)
+                    )
+                    (br $label$263)
+                   )
+                  )
+                  (call $fimport$8)
+                 )
+                 (block
+                  (i32.store
+                   (i32.const 4176)
+                   (i32.or
+                    (local.get $1)
+                    (local.get $0)
+                   )
+                  )
+                  (local.set $21
+                   (i32.add
+                    (local.get $3)
+                    (i32.const 8)
+                   )
+                  )
+                  (local.set $9
+                   (local.get $3)
+                  )
+                 )
+                )
+               )
+               (i32.store
+                (local.get $21)
+                (local.get $6)
+               )
+               (i32.store offset=12
+                (local.get $9)
+                (local.get $6)
+               )
+               (i32.store offset=8
+                (local.get $6)
+                (local.get $9)
+               )
+               (i32.store offset=12
+                (local.get $6)
+                (local.get $3)
+               )
+               (br $label$217)
+              )
+             )
+             (local.set $3
+              (i32.add
+               (i32.shl
+                (local.tee $2
+                 (block $label$267 (result i32)
+                  (if (result i32)
+                   (local.tee $0
+                    (i32.shr_u
+                     (local.get $7)
+                     (i32.const 8)
+                    )
+                   )
+                   (block (result i32)
+                    (drop
+                     (br_if $label$267
+                      (i32.const 31)
+                      (i32.gt_u
+                       (local.get $7)
+                       (i32.const 16777215)
+                      )
+                     )
+                    )
+                    (i32.or
+                     (i32.and
+                      (i32.shr_u
+                       (local.get $7)
+                       (i32.add
+                        (local.tee $0
+                         (i32.add
+                          (i32.sub
+                           (i32.const 14)
+                           (i32.or
+                            (i32.or
+                             (local.tee $0
+                              (i32.and
+                               (i32.shr_u
+                                (i32.add
+                                 (local.tee $1
+                                  (i32.shl
+                                   (local.get $0)
+                                   (local.tee $3
+                                    (i32.and
+                                     (i32.shr_u
+                                      (i32.add
+                                       (local.get $0)
+                                       (i32.const 1048320)
+                                      )
+                                      (i32.const 16)
+                                     )
+                                     (i32.const 8)
+                                    )
+                                   )
+                                  )
+                                 )
+                                 (i32.const 520192)
+                                )
+                                (i32.const 16)
+                               )
+                               (i32.const 4)
+                              )
+                             )
+                             (local.get $3)
+                            )
+                            (local.tee $0
+                             (i32.and
+                              (i32.shr_u
+                               (i32.add
+                                (local.tee $1
+                                 (i32.shl
+                                  (local.get $1)
+                                  (local.get $0)
+                                 )
+                                )
+                                (i32.const 245760)
+                               )
+                               (i32.const 16)
+                              )
+                              (i32.const 2)
+                             )
+                            )
+                           )
+                          )
+                          (i32.shr_u
+                           (i32.shl
+                            (local.get $1)
+                            (local.get $0)
+                           )
+                           (i32.const 15)
+                          )
+                         )
+                        )
+                        (i32.const 7)
+                       )
+                      )
+                      (i32.const 1)
+                     )
+                     (i32.shl
+                      (local.get $0)
+                      (i32.const 1)
+                     )
+                    )
+                   )
+                   (i32.const 0)
+                  )
+                 )
+                )
+                (i32.const 2)
+               )
+               (i32.const 4480)
+              )
+             )
+             (i32.store offset=28
+              (local.get $6)
+              (local.get $2)
+             )
+             (i32.store offset=4
+              (local.tee $0
+               (i32.add
+                (local.get $6)
+                (i32.const 16)
+               )
+              )
+              (i32.const 0)
+             )
+             (i32.store
+              (local.get $0)
+              (i32.const 0)
+             )
+             (if
+              (i32.eqz
+               (i32.and
+                (local.tee $1
+                 (i32.load
+                  (i32.const 4180)
+                 )
+                )
+                (local.tee $0
+                 (i32.shl
+                  (i32.const 1)
+                  (local.get $2)
+                 )
+                )
+               )
+              )
+              (block
+               (i32.store
+                (i32.const 4180)
+                (i32.or
+                 (local.get $1)
+                 (local.get $0)
+                )
+               )
+               (i32.store
+                (local.get $3)
+                (local.get $6)
+               )
+               (i32.store offset=24
+                (local.get $6)
+                (local.get $3)
+               )
+               (i32.store offset=12
+                (local.get $6)
+                (local.get $6)
+               )
+               (i32.store offset=8
+                (local.get $6)
+                (local.get $6)
+               )
+               (br $label$217)
+              )
+             )
+             (local.set $0
+              (i32.load
+               (local.get $3)
+              )
+             )
+             (local.set $1
+              (i32.sub
+               (i32.const 25)
+               (i32.shr_u
+                (local.get $2)
+                (i32.const 1)
+               )
+              )
+             )
+             (local.set $2
+              (i32.shl
+               (local.get $7)
+               (if (result i32)
+                (i32.eq
+                 (local.get $2)
+                 (i32.const 31)
+                )
+                (i32.const 0)
+                (local.get $1)
+               )
+              )
+             )
+             (block $label$273
+              (block $label$274
+               (block $label$275
+                (loop $label$276
+                 (br_if $label$274
+                  (i32.eq
+                   (i32.and
+                    (i32.load offset=4
+                     (local.get $0)
+                    )
+                    (i32.const -8)
+                   )
+                   (local.get $7)
+                  )
+                 )
+                 (local.set $3
+                  (i32.shl
+                   (local.get $2)
+                   (i32.const 1)
+                  )
+                 )
+                 (br_if $label$275
+                  (i32.eqz
+                   (local.tee $1
+                    (i32.load
+                     (local.tee $2
+                      (i32.add
+                       (i32.add
+                        (local.get $0)
+                        (i32.const 16)
+                       )
+                       (i32.shl
+                        (i32.shr_u
+                         (local.get $2)
+                         (i32.const 31)
+                        )
+                        (i32.const 2)
+                       )
+                      )
+                     )
+                    )
+                   )
+                  )
+                 )
+                 (local.set $2
+                  (local.get $3)
+                 )
+                 (local.set $0
+                  (local.get $1)
+                 )
+                 (br $label$276)
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.get $2)
+                 (i32.load
+                  (i32.const 4192)
+                 )
+                )
+                (call $fimport$8)
+                (block
+                 (i32.store
+                  (local.get $2)
+                  (local.get $6)
+                 )
+                 (i32.store offset=24
+                  (local.get $6)
+                  (local.get $0)
+                 )
+                 (i32.store offset=12
+                  (local.get $6)
+                  (local.get $6)
+                 )
+                 (i32.store offset=8
+                  (local.get $6)
+                  (local.get $6)
+                 )
+                 (br $label$217)
+                )
+               )
+               (br $label$273)
+              )
+              (if
+               (i32.and
+                (i32.ge_u
+                 (local.tee $2
+                  (i32.load
+                   (local.tee $3
+                    (i32.add
+                     (local.get $0)
+                     (i32.const 8)
+                    )
+                   )
+                  )
+                 )
+                 (local.tee $1
+                  (i32.load
+                   (i32.const 4192)
+                  )
+                 )
+                )
+                (i32.ge_u
+                 (local.get $0)
+                 (local.get $1)
+                )
+               )
+               (block
+                (i32.store offset=12
+                 (local.get $2)
+                 (local.get $6)
+                )
+                (i32.store
+                 (local.get $3)
+                 (local.get $6)
+                )
+                (i32.store offset=8
+                 (local.get $6)
+                 (local.get $2)
+                )
+                (i32.store offset=12
+                 (local.get $6)
+                 (local.get $0)
+                )
+                (i32.store offset=24
+                 (local.get $6)
+                 (i32.const 0)
+                )
+               )
+               (call $fimport$8)
+              )
+             )
+            )
+           )
+          )
+          (global.set $global$1
+           (local.get $14)
+          )
+          (return
+           (i32.add
+            (local.get $13)
+            (i32.const 8)
+           )
+          )
+         )
+        )
+       )
+       (loop $label$281
+        (block $label$282
+         (if
+          (i32.le_u
+           (local.tee $2
+            (i32.load
+             (local.get $5)
+            )
+           )
+           (local.get $8)
+          )
+          (br_if $label$282
+           (i32.gt_u
+            (local.tee $13
+             (i32.add
+              (local.get $2)
+              (i32.load offset=4
+               (local.get $5)
+              )
+             )
+            )
+            (local.get $8)
+           )
+          )
+         )
+         (local.set $5
+          (i32.load offset=8
+           (local.get $5)
+          )
+         )
+         (br $label$281)
+        )
+       )
+       (local.set $2
+        (i32.and
+         (i32.sub
+          (i32.const 0)
+          (local.tee $5
+           (i32.add
+            (local.tee $7
+             (i32.add
+              (local.get $13)
+              (i32.const -47)
+             )
+            )
+            (i32.const 8)
+           )
+          )
+         )
+         (i32.const 7)
+        )
+       )
+       (local.set $10
+        (i32.add
+         (local.tee $7
+          (if (result i32)
+           (i32.lt_u
+            (local.tee $2
+             (i32.add
+              (local.get $7)
+              (if (result i32)
+               (i32.and
+                (local.get $5)
+                (i32.const 7)
+               )
+               (local.get $2)
+               (i32.const 0)
+              )
+             )
+            )
+            (local.tee $12
+             (i32.add
+              (local.get $8)
+              (i32.const 16)
+             )
+            )
+           )
+           (local.get $8)
+           (local.get $2)
+          )
+         )
+         (i32.const 8)
+        )
+       )
+       (local.set $5
+        (i32.add
+         (local.get $7)
+         (i32.const 24)
+        )
+       )
+       (local.set $9
+        (i32.add
+         (local.get $3)
+         (i32.const -40)
+        )
+       )
+       (local.set $2
+        (i32.and
+         (i32.sub
+          (i32.const 0)
+          (local.tee $4
+           (i32.add
+            (local.get $1)
+            (i32.const 8)
+           )
+          )
+         )
+         (i32.const 7)
+        )
+       )
+       (i32.store
+        (i32.const 4200)
+        (local.tee $4
+         (i32.add
+          (local.get $1)
+          (if (result i32)
+           (i32.and
+            (local.get $4)
+            (i32.const 7)
+           )
+           (local.get $2)
+           (local.tee $2
+            (i32.const 0)
+           )
+          )
+         )
+        )
+       )
+       (i32.store
+        (i32.const 4188)
+        (local.tee $2
+         (i32.sub
+          (local.get $9)
+          (local.get $2)
+         )
+        )
+       )
+       (i32.store offset=4
+        (local.get $4)
+        (i32.or
+         (local.get $2)
+         (i32.const 1)
+        )
+       )
+       (i32.store offset=4
+        (i32.add
+         (local.get $4)
+         (local.get $2)
+        )
+        (i32.const 40)
+       )
+       (i32.store
+        (i32.const 4204)
+        (i32.load
+         (i32.const 4664)
+        )
+       )
+       (i32.store
+        (local.tee $2
+         (i32.add
+          (local.get $7)
+          (i32.const 4)
+         )
+        )
+        (i32.const 27)
+       )
+       (i64.store align=4
+        (local.get $10)
+        (i64.load align=4
+         (i32.const 4624)
+        )
+       )
+       (i64.store offset=8 align=4
+        (local.get $10)
+        (i64.load align=4
+         (i32.const 4632)
+        )
+       )
+       (i32.store
+        (i32.const 4624)
+        (local.get $1)
+       )
+       (i32.store
+        (i32.const 4628)
+        (local.get $3)
+       )
+       (i32.store
+        (i32.const 4636)
+        (i32.const 0)
+       )
+       (i32.store
+        (i32.const 4632)
+        (local.get $10)
+       )
+       (local.set $1
+        (local.get $5)
+       )
+       (loop $label$290
+        (i32.store
+         (local.tee $1
+          (i32.add
+           (local.get $1)
+           (i32.const 4)
+          )
+         )
+         (i32.const 7)
+        )
+        (br_if $label$290
+         (i32.lt_u
+          (i32.add
+           (local.get $1)
+           (i32.const 4)
+          )
+          (local.get $13)
+         )
+        )
+       )
+       (if
+        (i32.ne
+         (local.get $7)
+         (local.get $8)
+        )
+        (block
+         (i32.store
+          (local.get $2)
+          (i32.and
+           (i32.load
+            (local.get $2)
+           )
+           (i32.const -2)
+          )
+         )
+         (i32.store offset=4
+          (local.get $8)
+          (i32.or
+           (local.tee $4
+            (i32.sub
+             (local.get $7)
+             (local.get $8)
+            )
+           )
+           (i32.const 1)
+          )
+         )
+         (i32.store
+          (local.get $7)
+          (local.get $4)
+         )
+         (local.set $1
+          (i32.shr_u
+           (local.get $4)
+           (i32.const 3)
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.get $4)
+           (i32.const 256)
+          )
+          (block
+           (local.set $2
+            (i32.add
+             (i32.shl
+              (i32.shl
+               (local.get $1)
+               (i32.const 1)
+              )
+              (i32.const 2)
+             )
+             (i32.const 4216)
+            )
+           )
+           (if
+            (i32.and
+             (local.tee $3
+              (i32.load
+               (i32.const 4176)
+              )
+             )
+             (local.tee $1
+              (i32.shl
+               (i32.const 1)
+               (local.get $1)
+              )
+             )
+            )
+            (if
+             (i32.lt_u
+              (local.tee $1
+               (i32.load
+                (local.tee $3
+                 (i32.add
+                  (local.get $2)
+                  (i32.const 8)
+                 )
+                )
+               )
+              )
+              (i32.load
+               (i32.const 4192)
+              )
+             )
+             (call $fimport$8)
+             (block
+              (local.set $15
+               (local.get $3)
+              )
+              (local.set $11
+               (local.get $1)
+              )
+             )
+            )
+            (block
+             (i32.store
+              (i32.const 4176)
+              (i32.or
+               (local.get $3)
+               (local.get $1)
+              )
+             )
+             (local.set $15
+              (i32.add
+               (local.get $2)
+               (i32.const 8)
+              )
+             )
+             (local.set $11
+              (local.get $2)
+             )
+            )
+           )
+           (i32.store
+            (local.get $15)
+            (local.get $8)
+           )
+           (i32.store offset=12
+            (local.get $11)
+            (local.get $8)
+           )
+           (i32.store offset=8
+            (local.get $8)
+            (local.get $11)
+           )
+           (i32.store offset=12
+            (local.get $8)
+            (local.get $2)
+           )
+           (br $label$198)
+          )
+         )
+         (local.set $2
+          (i32.add
+           (i32.shl
+            (local.tee $5
+             (if (result i32)
+              (local.tee $1
+               (i32.shr_u
+                (local.get $4)
+                (i32.const 8)
+               )
+              )
+              (if (result i32)
+               (i32.gt_u
+                (local.get $4)
+                (i32.const 16777215)
+               )
+               (i32.const 31)
+               (i32.or
+                (i32.and
+                 (i32.shr_u
+                  (local.get $4)
+                  (i32.add
+                   (local.tee $1
+                    (i32.add
+                     (i32.sub
+                      (i32.const 14)
+                      (i32.or
+                       (i32.or
+                        (local.tee $1
+                         (i32.and
+                          (i32.shr_u
+                           (i32.add
+                            (local.tee $3
+                             (i32.shl
+                              (local.get $1)
+                              (local.tee $2
+                               (i32.and
+                                (i32.shr_u
+                                 (i32.add
+                                  (local.get $1)
+                                  (i32.const 1048320)
+                                 )
+                                 (i32.const 16)
+                                )
+                                (i32.const 8)
+                               )
+                              )
+                             )
+                            )
+                            (i32.const 520192)
+                           )
+                           (i32.const 16)
+                          )
+                          (i32.const 4)
+                         )
+                        )
+                        (local.get $2)
+                       )
+                       (local.tee $1
+                        (i32.and
+                         (i32.shr_u
+                          (i32.add
+                           (local.tee $3
+                            (i32.shl
+                             (local.get $3)
+                             (local.get $1)
+                            )
+                           )
+                           (i32.const 245760)
+                          )
+                          (i32.const 16)
+                         )
+                         (i32.const 2)
+                        )
+                       )
+                      )
+                     )
+                     (i32.shr_u
+                      (i32.shl
+                       (local.get $3)
+                       (local.get $1)
+                      )
+                      (i32.const 15)
+                     )
+                    )
+                   )
+                   (i32.const 7)
+                  )
+                 )
+                 (i32.const 1)
+                )
+                (i32.shl
+                 (local.get $1)
+                 (i32.const 1)
+                )
+               )
+              )
+              (i32.const 0)
+             )
+            )
+            (i32.const 2)
+           )
+           (i32.const 4480)
+          )
+         )
+         (i32.store offset=28
+          (local.get $8)
+          (local.get $5)
+         )
+         (i32.store offset=20
+          (local.get $8)
+          (i32.const 0)
+         )
+         (i32.store
+          (local.get $12)
+          (i32.const 0)
+         )
+         (if
+          (i32.eqz
+           (i32.and
+            (local.tee $3
+             (i32.load
+              (i32.const 4180)
+             )
+            )
+            (local.tee $1
+             (i32.shl
+              (i32.const 1)
+              (local.get $5)
+             )
+            )
+           )
+          )
+          (block
+           (i32.store
+            (i32.const 4180)
+            (i32.or
+             (local.get $3)
+             (local.get $1)
+            )
+           )
+           (i32.store
+            (local.get $2)
+            (local.get $8)
+           )
+           (i32.store offset=24
+            (local.get $8)
+            (local.get $2)
+           )
+           (i32.store offset=12
+            (local.get $8)
+            (local.get $8)
+           )
+           (i32.store offset=8
+            (local.get $8)
+            (local.get $8)
+           )
+           (br $label$198)
+          )
+         )
+         (local.set $1
+          (i32.load
+           (local.get $2)
+          )
+         )
+         (local.set $3
+          (i32.sub
+           (i32.const 25)
+           (i32.shr_u
+            (local.get $5)
+            (i32.const 1)
+           )
+          )
+         )
+         (local.set $5
+          (i32.shl
+           (local.get $4)
+           (if (result i32)
+            (i32.eq
+             (local.get $5)
+             (i32.const 31)
+            )
+            (i32.const 0)
+            (local.get $3)
+           )
+          )
+         )
+         (block $label$304
+          (block $label$305
+           (block $label$306
+            (loop $label$307
+             (br_if $label$305
+              (i32.eq
+               (i32.and
+                (i32.load offset=4
+                 (local.get $1)
+                )
+                (i32.const -8)
+               )
+               (local.get $4)
+              )
+             )
+             (local.set $2
+              (i32.shl
+               (local.get $5)
+               (i32.const 1)
+              )
+             )
+             (br_if $label$306
+              (i32.eqz
+               (local.tee $3
+                (i32.load
+                 (local.tee $5
+                  (i32.add
+                   (i32.add
+                    (local.get $1)
+                    (i32.const 16)
+                   )
+                   (i32.shl
+                    (i32.shr_u
+                     (local.get $5)
+                     (i32.const 31)
+                    )
+                    (i32.const 2)
+                   )
+                  )
+                 )
+                )
+               )
+              )
+             )
+             (local.set $5
+              (local.get $2)
+             )
+             (local.set $1
+              (local.get $3)
+             )
+             (br $label$307)
+            )
+           )
+           (if
+            (i32.lt_u
+             (local.get $5)
+             (i32.load
+              (i32.const 4192)
+             )
+            )
+            (call $fimport$8)
+            (block
+             (i32.store
+              (local.get $5)
+              (local.get $8)
+             )
+             (i32.store offset=24
+              (local.get $8)
+              (local.get $1)
+             )
+             (i32.store offset=12
+              (local.get $8)
+              (local.get $8)
+             )
+             (i32.store offset=8
+              (local.get $8)
+              (local.get $8)
+             )
+             (br $label$198)
+            )
+           )
+           (br $label$304)
+          )
+          (if
+           (i32.and
+            (i32.ge_u
+             (local.tee $5
+              (i32.load
+               (local.tee $2
+                (i32.add
+                 (local.get $1)
+                 (i32.const 8)
+                )
+               )
+              )
+             )
+             (local.tee $3
+              (i32.load
+               (i32.const 4192)
+              )
+             )
+            )
+            (i32.ge_u
+             (local.get $1)
+             (local.get $3)
+            )
+           )
+           (block
+            (i32.store offset=12
+             (local.get $5)
+             (local.get $8)
+            )
+            (i32.store
+             (local.get $2)
+             (local.get $8)
+            )
+            (i32.store offset=8
+             (local.get $8)
+             (local.get $5)
+            )
+            (i32.store offset=12
+             (local.get $8)
+             (local.get $1)
+            )
+            (i32.store offset=24
+             (local.get $8)
+             (i32.const 0)
+            )
+           )
+           (call $fimport$8)
+          )
+         )
+        )
+       )
+      )
+      (block
+       (if
+        (i32.or
+         (i32.eqz
+          (local.tee $2
+           (i32.load
+            (i32.const 4192)
+           )
+          )
+         )
+         (i32.lt_u
+          (local.get $1)
+          (local.get $2)
+         )
+        )
+        (i32.store
+         (i32.const 4192)
+         (local.get $1)
+        )
+       )
+       (i32.store
+        (i32.const 4624)
+        (local.get $1)
+       )
+       (i32.store
+        (i32.const 4628)
+        (local.get $3)
+       )
+       (i32.store
+        (i32.const 4636)
+        (i32.const 0)
+       )
+       (i32.store
+        (i32.const 4212)
+        (i32.load
+         (i32.const 4648)
+        )
+       )
+       (i32.store
+        (i32.const 4208)
+        (i32.const -1)
+       )
+       (local.set $2
+        (i32.const 0)
+       )
+       (loop $label$314
+        (i32.store offset=12
+         (local.tee $5
+          (i32.add
+           (i32.shl
+            (i32.shl
+             (local.get $2)
+             (i32.const 1)
+            )
+            (i32.const 2)
+           )
+           (i32.const 4216)
+          )
+         )
+         (local.get $5)
+        )
+        (i32.store offset=8
+         (local.get $5)
+         (local.get $5)
+        )
+        (br_if $label$314
+         (i32.ne
+          (local.tee $2
+           (i32.add
+            (local.get $2)
+            (i32.const 1)
+           )
+          )
+          (i32.const 32)
+         )
+        )
+       )
+       (local.set $5
+        (i32.add
+         (local.get $3)
+         (i32.const -40)
+        )
+       )
+       (local.set $3
+        (i32.and
+         (i32.sub
+          (i32.const 0)
+          (local.tee $2
+           (i32.add
+            (local.get $1)
+            (i32.const 8)
+           )
+          )
+         )
+         (i32.const 7)
+        )
+       )
+       (i32.store
+        (i32.const 4200)
+        (local.tee $3
+         (i32.add
+          (local.get $1)
+          (local.tee $1
+           (if (result i32)
+            (i32.and
+             (local.get $2)
+             (i32.const 7)
+            )
+            (local.get $3)
+            (i32.const 0)
+           )
+          )
+         )
+        )
+       )
+       (i32.store
+        (i32.const 4188)
+        (local.tee $1
+         (i32.sub
+          (local.get $5)
+          (local.get $1)
+         )
+        )
+       )
+       (i32.store offset=4
+        (local.get $3)
+        (i32.or
+         (local.get $1)
+         (i32.const 1)
+        )
+       )
+       (i32.store offset=4
+        (i32.add
+         (local.get $3)
+         (local.get $1)
+        )
+        (i32.const 40)
+       )
+       (i32.store
+        (i32.const 4204)
+        (i32.load
+         (i32.const 4664)
+        )
+       )
+      )
+     )
+    )
+    (if
+     (i32.gt_u
+      (local.tee $1
+       (i32.load
+        (i32.const 4188)
+       )
+      )
+      (local.get $0)
+     )
+     (block
+      (i32.store
+       (i32.const 4188)
+       (local.tee $3
+        (i32.sub
+         (local.get $1)
+         (local.get $0)
+        )
+       )
+      )
+      (i32.store
+       (i32.const 4200)
+       (local.tee $1
+        (i32.add
+         (local.tee $2
+          (i32.load
+           (i32.const 4200)
+          )
+         )
+         (local.get $0)
+        )
+       )
+      )
+      (i32.store offset=4
+       (local.get $1)
+       (i32.or
+        (local.get $3)
+        (i32.const 1)
+       )
+      )
+      (i32.store offset=4
+       (local.get $2)
+       (i32.or
+        (local.get $0)
+        (i32.const 3)
+       )
+      )
+      (global.set $global$1
+       (local.get $14)
+      )
+      (return
+       (i32.add
+        (local.get $2)
+        (i32.const 8)
+       )
+      )
+     )
+    )
+   )
+   (i32.store
+    (call $12)
+    (i32.const 12)
+   )
+   (global.set $global$1
+    (local.get $14)
+   )
+   (i32.const 0)
   )
-  (func $33 (;46;) (type $12) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
-    (local $4 i32) (local $5 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $2
-      local.get $1
-      i32.mul
-      local.set $4
-      local.get $3
-      i32.load offset=76
-      i32.const -1
-      i32.gt_s
-      if ;; label = @2
-        block ;; label = @3
-          local.get $3
-          call $20
-          i32.eqz
-          local.set $5
-          local.get $0
-          local.get $4
-          local.get $3
-          call $21
-          local.set $0
-          local.get $5
-          i32.eqz
-          if ;; label = @4
-            local.get $3
-            call $13
-          end
-        end
-      else
-        local.get $0
-        local.get $4
-        local.get $3
-        call $21
-        local.set $0
-      end
-      local.get $0
-      local.get $4
-      i32.ne
-      if ;; label = @2
-        local.get $0
-        local.get $1
-        i32.div_u
-        local.set $2
-      end
-      local.get $2
-    end
+ )
+ (func $38 (; 51 ;) (type $3) (param $0 i32)
+  (local $1 i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (local $15 i32)
+  (block $label$1
+   (if
+    (i32.eqz
+     (local.get $0)
+    )
+    (return)
+   )
+   (if
+    (i32.lt_u
+     (local.tee $1
+      (i32.add
+       (local.get $0)
+       (i32.const -8)
+      )
+     )
+     (local.tee $11
+      (i32.load
+       (i32.const 4192)
+      )
+     )
+    )
+    (call $fimport$8)
+   )
+   (if
+    (i32.eq
+     (local.tee $8
+      (i32.and
+       (local.tee $0
+        (i32.load
+         (i32.add
+          (local.get $0)
+          (i32.const -4)
+         )
+        )
+       )
+       (i32.const 3)
+      )
+     )
+     (i32.const 1)
+    )
+    (call $fimport$8)
+   )
+   (local.set $6
+    (i32.add
+     (local.get $1)
+     (local.tee $4
+      (i32.and
+       (local.get $0)
+       (i32.const -8)
+      )
+     )
+    )
+   )
+   (block $label$5
+    (if
+     (i32.and
+      (local.get $0)
+      (i32.const 1)
+     )
+     (block
+      (local.set $3
+       (local.get $1)
+      )
+      (local.set $2
+       (local.get $4)
+      )
+     )
+     (block
+      (if
+       (i32.eqz
+        (local.get $8)
+       )
+       (return)
+      )
+      (if
+       (i32.lt_u
+        (local.tee $0
+         (i32.add
+          (local.get $1)
+          (i32.sub
+           (i32.const 0)
+           (local.tee $8
+            (i32.load
+             (local.get $1)
+            )
+           )
+          )
+         )
+        )
+        (local.get $11)
+       )
+       (call $fimport$8)
+      )
+      (local.set $1
+       (i32.add
+        (local.get $8)
+        (local.get $4)
+       )
+      )
+      (if
+       (i32.eq
+        (local.get $0)
+        (i32.load
+         (i32.const 4196)
+        )
+       )
+       (block
+        (if
+         (i32.ne
+          (i32.and
+           (local.tee $3
+            (i32.load
+             (local.tee $2
+              (i32.add
+               (local.get $6)
+               (i32.const 4)
+              )
+             )
+            )
+           )
+           (i32.const 3)
+          )
+          (i32.const 3)
+         )
+         (block
+          (local.set $3
+           (local.get $0)
+          )
+          (local.set $2
+           (local.get $1)
+          )
+          (br $label$5)
+         )
+        )
+        (i32.store
+         (i32.const 4184)
+         (local.get $1)
+        )
+        (i32.store
+         (local.get $2)
+         (i32.and
+          (local.get $3)
+          (i32.const -2)
+         )
+        )
+        (i32.store offset=4
+         (local.get $0)
+         (i32.or
+          (local.get $1)
+          (i32.const 1)
+         )
+        )
+        (i32.store
+         (i32.add
+          (local.get $0)
+          (local.get $1)
+         )
+         (local.get $1)
+        )
+        (return)
+       )
+      )
+      (local.set $10
+       (i32.shr_u
+        (local.get $8)
+        (i32.const 3)
+       )
+      )
+      (if
+       (i32.lt_u
+        (local.get $8)
+        (i32.const 256)
+       )
+       (block
+        (local.set $3
+         (i32.load offset=12
+          (local.get $0)
+         )
+        )
+        (if
+         (i32.ne
+          (local.tee $4
+           (i32.load offset=8
+            (local.get $0)
+           )
+          )
+          (local.tee $2
+           (i32.add
+            (i32.shl
+             (i32.shl
+              (local.get $10)
+              (i32.const 1)
+             )
+             (i32.const 2)
+            )
+            (i32.const 4216)
+           )
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $4)
+            (local.get $11)
+           )
+           (call $fimport$8)
+          )
+          (if
+           (i32.ne
+            (i32.load offset=12
+             (local.get $4)
+            )
+            (local.get $0)
+           )
+           (call $fimport$8)
+          )
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $3)
+          (local.get $4)
+         )
+         (block
+          (i32.store
+           (i32.const 4176)
+           (i32.and
+            (i32.load
+             (i32.const 4176)
+            )
+            (i32.xor
+             (i32.shl
+              (i32.const 1)
+              (local.get $10)
+             )
+             (i32.const -1)
+            )
+           )
+          )
+          (local.set $3
+           (local.get $0)
+          )
+          (local.set $2
+           (local.get $1)
+          )
+          (br $label$5)
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $3)
+          (local.get $2)
+         )
+         (local.set $5
+          (i32.add
+           (local.get $3)
+           (i32.const 8)
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $3)
+            (local.get $11)
+           )
+           (call $fimport$8)
+          )
+          (if
+           (i32.eq
+            (i32.load
+             (local.tee $2
+              (i32.add
+               (local.get $3)
+               (i32.const 8)
+              )
+             )
+            )
+            (local.get $0)
+           )
+           (local.set $5
+            (local.get $2)
+           )
+           (call $fimport$8)
+          )
+         )
+        )
+        (i32.store offset=12
+         (local.get $4)
+         (local.get $3)
+        )
+        (i32.store
+         (local.get $5)
+         (local.get $4)
+        )
+        (local.set $3
+         (local.get $0)
+        )
+        (local.set $2
+         (local.get $1)
+        )
+        (br $label$5)
+       )
+      )
+      (local.set $12
+       (i32.load offset=24
+        (local.get $0)
+       )
+      )
+      (block $label$22
+       (if
+        (i32.eq
+         (local.tee $4
+          (i32.load offset=12
+           (local.get $0)
+          )
+         )
+         (local.get $0)
+        )
+        (block
+         (if
+          (local.tee $4
+           (i32.load
+            (local.tee $8
+             (i32.add
+              (local.tee $5
+               (i32.add
+                (local.get $0)
+                (i32.const 16)
+               )
+              )
+              (i32.const 4)
+             )
+            )
+           )
+          )
+          (local.set $5
+           (local.get $8)
+          )
+          (if
+           (i32.eqz
+            (local.tee $4
+             (i32.load
+              (local.get $5)
+             )
+            )
+           )
+           (block
+            (local.set $7
+             (i32.const 0)
+            )
+            (br $label$22)
+           )
+          )
+         )
+         (loop $label$27
+          (if
+           (local.tee $10
+            (i32.load
+             (local.tee $8
+              (i32.add
+               (local.get $4)
+               (i32.const 20)
+              )
+             )
+            )
+           )
+           (block
+            (local.set $4
+             (local.get $10)
+            )
+            (local.set $5
+             (local.get $8)
+            )
+            (br $label$27)
+           )
+          )
+          (if
+           (local.tee $10
+            (i32.load
+             (local.tee $8
+              (i32.add
+               (local.get $4)
+               (i32.const 16)
+              )
+             )
+            )
+           )
+           (block
+            (local.set $4
+             (local.get $10)
+            )
+            (local.set $5
+             (local.get $8)
+            )
+            (br $label$27)
+           )
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.get $5)
+           (local.get $11)
+          )
+          (call $fimport$8)
+          (block
+           (i32.store
+            (local.get $5)
+            (i32.const 0)
+           )
+           (local.set $7
+            (local.get $4)
+           )
+          )
+         )
+        )
+        (block
+         (if
+          (i32.lt_u
+           (local.tee $5
+            (i32.load offset=8
+             (local.get $0)
+            )
+           )
+           (local.get $11)
+          )
+          (call $fimport$8)
+         )
+         (if
+          (i32.ne
+           (i32.load
+            (local.tee $8
+             (i32.add
+              (local.get $5)
+              (i32.const 12)
+             )
+            )
+           )
+           (local.get $0)
+          )
+          (call $fimport$8)
+         )
+         (if
+          (i32.eq
+           (i32.load
+            (local.tee $10
+             (i32.add
+              (local.get $4)
+              (i32.const 8)
+             )
+            )
+           )
+           (local.get $0)
+          )
+          (block
+           (i32.store
+            (local.get $8)
+            (local.get $4)
+           )
+           (i32.store
+            (local.get $10)
+            (local.get $5)
+           )
+           (local.set $7
+            (local.get $4)
+           )
+          )
+          (call $fimport$8)
+         )
+        )
+       )
+      )
+      (if
+       (local.get $12)
+       (block
+        (if
+         (i32.eq
+          (local.get $0)
+          (i32.load
+           (local.tee $5
+            (i32.add
+             (i32.shl
+              (local.tee $4
+               (i32.load offset=28
+                (local.get $0)
+               )
+              )
+              (i32.const 2)
+             )
+             (i32.const 4480)
+            )
+           )
+          )
+         )
+         (block
+          (i32.store
+           (local.get $5)
+           (local.get $7)
+          )
+          (if
+           (i32.eqz
+            (local.get $7)
+           )
+           (block
+            (i32.store
+             (i32.const 4180)
+             (i32.and
+              (i32.load
+               (i32.const 4180)
+              )
+              (i32.xor
+               (i32.shl
+                (i32.const 1)
+                (local.get $4)
+               )
+               (i32.const -1)
+              )
+             )
+            )
+            (local.set $3
+             (local.get $0)
+            )
+            (local.set $2
+             (local.get $1)
+            )
+            (br $label$5)
+           )
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $12)
+            (i32.load
+             (i32.const 4192)
+            )
+           )
+           (call $fimport$8)
+          )
+          (if
+           (i32.eq
+            (i32.load
+             (local.tee $4
+              (i32.add
+               (local.get $12)
+               (i32.const 16)
+              )
+             )
+            )
+            (local.get $0)
+           )
+           (i32.store
+            (local.get $4)
+            (local.get $7)
+           )
+           (i32.store offset=20
+            (local.get $12)
+            (local.get $7)
+           )
+          )
+          (if
+           (i32.eqz
+            (local.get $7)
+           )
+           (block
+            (local.set $3
+             (local.get $0)
+            )
+            (local.set $2
+             (local.get $1)
+            )
+            (br $label$5)
+           )
+          )
+         )
+        )
+        (if
+         (i32.lt_u
+          (local.get $7)
+          (local.tee $5
+           (i32.load
+            (i32.const 4192)
+           )
+          )
+         )
+         (call $fimport$8)
+        )
+        (i32.store offset=24
+         (local.get $7)
+         (local.get $12)
+        )
+        (if
+         (local.tee $4
+          (i32.load
+           (local.tee $8
+            (i32.add
+             (local.get $0)
+             (i32.const 16)
+            )
+           )
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.get $4)
+           (local.get $5)
+          )
+          (call $fimport$8)
+          (block
+           (i32.store offset=16
+            (local.get $7)
+            (local.get $4)
+           )
+           (i32.store offset=24
+            (local.get $4)
+            (local.get $7)
+           )
+          )
+         )
+        )
+        (if
+         (local.tee $4
+          (i32.load offset=4
+           (local.get $8)
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.get $4)
+           (i32.load
+            (i32.const 4192)
+           )
+          )
+          (call $fimport$8)
+          (block
+           (i32.store offset=20
+            (local.get $7)
+            (local.get $4)
+           )
+           (i32.store offset=24
+            (local.get $4)
+            (local.get $7)
+           )
+           (local.set $3
+            (local.get $0)
+           )
+           (local.set $2
+            (local.get $1)
+           )
+          )
+         )
+         (block
+          (local.set $3
+           (local.get $0)
+          )
+          (local.set $2
+           (local.get $1)
+          )
+         )
+        )
+       )
+       (block
+        (local.set $3
+         (local.get $0)
+        )
+        (local.set $2
+         (local.get $1)
+        )
+       )
+      )
+     )
+    )
+   )
+   (if
+    (i32.ge_u
+     (local.get $3)
+     (local.get $6)
+    )
+    (call $fimport$8)
+   )
+   (if
+    (i32.eqz
+     (i32.and
+      (local.tee $0
+       (i32.load
+        (local.tee $1
+         (i32.add
+          (local.get $6)
+          (i32.const 4)
+         )
+        )
+       )
+      )
+      (i32.const 1)
+     )
+    )
+    (call $fimport$8)
+   )
+   (if
+    (i32.and
+     (local.get $0)
+     (i32.const 2)
+    )
+    (block
+     (i32.store
+      (local.get $1)
+      (i32.and
+       (local.get $0)
+       (i32.const -2)
+      )
+     )
+     (i32.store offset=4
+      (local.get $3)
+      (i32.or
+       (local.get $2)
+       (i32.const 1)
+      )
+     )
+     (i32.store
+      (i32.add
+       (local.get $3)
+       (local.get $2)
+      )
+      (local.get $2)
+     )
+    )
+    (block
+     (if
+      (i32.eq
+       (local.get $6)
+       (i32.load
+        (i32.const 4200)
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 4188)
+        (local.tee $0
+         (i32.add
+          (i32.load
+           (i32.const 4188)
+          )
+          (local.get $2)
+         )
+        )
+       )
+       (i32.store
+        (i32.const 4200)
+        (local.get $3)
+       )
+       (i32.store offset=4
+        (local.get $3)
+        (i32.or
+         (local.get $0)
+         (i32.const 1)
+        )
+       )
+       (if
+        (i32.ne
+         (local.get $3)
+         (i32.load
+          (i32.const 4196)
+         )
+        )
+        (return)
+       )
+       (i32.store
+        (i32.const 4196)
+        (i32.const 0)
+       )
+       (i32.store
+        (i32.const 4184)
+        (i32.const 0)
+       )
+       (return)
+      )
+     )
+     (if
+      (i32.eq
+       (local.get $6)
+       (i32.load
+        (i32.const 4196)
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 4184)
+        (local.tee $0
+         (i32.add
+          (i32.load
+           (i32.const 4184)
+          )
+          (local.get $2)
+         )
+        )
+       )
+       (i32.store
+        (i32.const 4196)
+        (local.get $3)
+       )
+       (i32.store offset=4
+        (local.get $3)
+        (i32.or
+         (local.get $0)
+         (i32.const 1)
+        )
+       )
+       (i32.store
+        (i32.add
+         (local.get $3)
+         (local.get $0)
+        )
+        (local.get $0)
+       )
+       (return)
+      )
+     )
+     (local.set $5
+      (i32.add
+       (i32.and
+        (local.get $0)
+        (i32.const -8)
+       )
+       (local.get $2)
+      )
+     )
+     (local.set $4
+      (i32.shr_u
+       (local.get $0)
+       (i32.const 3)
+      )
+     )
+     (block $label$61
+      (if
+       (i32.lt_u
+        (local.get $0)
+        (i32.const 256)
+       )
+       (block
+        (local.set $2
+         (i32.load offset=12
+          (local.get $6)
+         )
+        )
+        (if
+         (i32.ne
+          (local.tee $1
+           (i32.load offset=8
+            (local.get $6)
+           )
+          )
+          (local.tee $0
+           (i32.add
+            (i32.shl
+             (i32.shl
+              (local.get $4)
+              (i32.const 1)
+             )
+             (i32.const 2)
+            )
+            (i32.const 4216)
+           )
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $1)
+            (i32.load
+             (i32.const 4192)
+            )
+           )
+           (call $fimport$8)
+          )
+          (if
+           (i32.ne
+            (i32.load offset=12
+             (local.get $1)
+            )
+            (local.get $6)
+           )
+           (call $fimport$8)
+          )
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $2)
+          (local.get $1)
+         )
+         (block
+          (i32.store
+           (i32.const 4176)
+           (i32.and
+            (i32.load
+             (i32.const 4176)
+            )
+            (i32.xor
+             (i32.shl
+              (i32.const 1)
+              (local.get $4)
+             )
+             (i32.const -1)
+            )
+           )
+          )
+          (br $label$61)
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $2)
+          (local.get $0)
+         )
+         (local.set $14
+          (i32.add
+           (local.get $2)
+           (i32.const 8)
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $2)
+            (i32.load
+             (i32.const 4192)
+            )
+           )
+           (call $fimport$8)
+          )
+          (if
+           (i32.eq
+            (i32.load
+             (local.tee $0
+              (i32.add
+               (local.get $2)
+               (i32.const 8)
+              )
+             )
+            )
+            (local.get $6)
+           )
+           (local.set $14
+            (local.get $0)
+           )
+           (call $fimport$8)
+          )
+         )
+        )
+        (i32.store offset=12
+         (local.get $1)
+         (local.get $2)
+        )
+        (i32.store
+         (local.get $14)
+         (local.get $1)
+        )
+       )
+       (block
+        (local.set $7
+         (i32.load offset=24
+          (local.get $6)
+         )
+        )
+        (block $label$73
+         (if
+          (i32.eq
+           (local.tee $0
+            (i32.load offset=12
+             (local.get $6)
+            )
+           )
+           (local.get $6)
+          )
+          (block
+           (if
+            (local.tee $0
+             (i32.load
+              (local.tee $1
+               (i32.add
+                (local.tee $2
+                 (i32.add
+                  (local.get $6)
+                  (i32.const 16)
+                 )
+                )
+                (i32.const 4)
+               )
+              )
+             )
+            )
+            (local.set $2
+             (local.get $1)
+            )
+            (if
+             (i32.eqz
+              (local.tee $0
+               (i32.load
+                (local.get $2)
+               )
+              )
+             )
+             (block
+              (local.set $9
+               (i32.const 0)
+              )
+              (br $label$73)
+             )
+            )
+           )
+           (loop $label$78
+            (if
+             (local.tee $4
+              (i32.load
+               (local.tee $1
+                (i32.add
+                 (local.get $0)
+                 (i32.const 20)
+                )
+               )
+              )
+             )
+             (block
+              (local.set $0
+               (local.get $4)
+              )
+              (local.set $2
+               (local.get $1)
+              )
+              (br $label$78)
+             )
+            )
+            (if
+             (local.tee $4
+              (i32.load
+               (local.tee $1
+                (i32.add
+                 (local.get $0)
+                 (i32.const 16)
+                )
+               )
+              )
+             )
+             (block
+              (local.set $0
+               (local.get $4)
+              )
+              (local.set $2
+               (local.get $1)
+              )
+              (br $label$78)
+             )
+            )
+           )
+           (if
+            (i32.lt_u
+             (local.get $2)
+             (i32.load
+              (i32.const 4192)
+             )
+            )
+            (call $fimport$8)
+            (block
+             (i32.store
+              (local.get $2)
+              (i32.const 0)
+             )
+             (local.set $9
+              (local.get $0)
+             )
+            )
+           )
+          )
+          (block
+           (if
+            (i32.lt_u
+             (local.tee $2
+              (i32.load offset=8
+               (local.get $6)
+              )
+             )
+             (i32.load
+              (i32.const 4192)
+             )
+            )
+            (call $fimport$8)
+           )
+           (if
+            (i32.ne
+             (i32.load
+              (local.tee $1
+               (i32.add
+                (local.get $2)
+                (i32.const 12)
+               )
+              )
+             )
+             (local.get $6)
+            )
+            (call $fimport$8)
+           )
+           (if
+            (i32.eq
+             (i32.load
+              (local.tee $4
+               (i32.add
+                (local.get $0)
+                (i32.const 8)
+               )
+              )
+             )
+             (local.get $6)
+            )
+            (block
+             (i32.store
+              (local.get $1)
+              (local.get $0)
+             )
+             (i32.store
+              (local.get $4)
+              (local.get $2)
+             )
+             (local.set $9
+              (local.get $0)
+             )
+            )
+            (call $fimport$8)
+           )
+          )
+         )
+        )
+        (if
+         (local.get $7)
+         (block
+          (if
+           (i32.eq
+            (local.get $6)
+            (i32.load
+             (local.tee $2
+              (i32.add
+               (i32.shl
+                (local.tee $0
+                 (i32.load offset=28
+                  (local.get $6)
+                 )
+                )
+                (i32.const 2)
+               )
+               (i32.const 4480)
+              )
+             )
+            )
+           )
+           (block
+            (i32.store
+             (local.get $2)
+             (local.get $9)
+            )
+            (if
+             (i32.eqz
+              (local.get $9)
+             )
+             (block
+              (i32.store
+               (i32.const 4180)
+               (i32.and
+                (i32.load
+                 (i32.const 4180)
+                )
+                (i32.xor
+                 (i32.shl
+                  (i32.const 1)
+                  (local.get $0)
+                 )
+                 (i32.const -1)
+                )
+               )
+              )
+              (br $label$61)
+             )
+            )
+           )
+           (block
+            (if
+             (i32.lt_u
+              (local.get $7)
+              (i32.load
+               (i32.const 4192)
+              )
+             )
+             (call $fimport$8)
+            )
+            (if
+             (i32.eq
+              (i32.load
+               (local.tee $0
+                (i32.add
+                 (local.get $7)
+                 (i32.const 16)
+                )
+               )
+              )
+              (local.get $6)
+             )
+             (i32.store
+              (local.get $0)
+              (local.get $9)
+             )
+             (i32.store offset=20
+              (local.get $7)
+              (local.get $9)
+             )
+            )
+            (br_if $label$61
+             (i32.eqz
+              (local.get $9)
+             )
+            )
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.get $9)
+            (local.tee $2
+             (i32.load
+              (i32.const 4192)
+             )
+            )
+           )
+           (call $fimport$8)
+          )
+          (i32.store offset=24
+           (local.get $9)
+           (local.get $7)
+          )
+          (if
+           (local.tee $0
+            (i32.load
+             (local.tee $1
+              (i32.add
+               (local.get $6)
+               (i32.const 16)
+              )
+             )
+            )
+           )
+           (if
+            (i32.lt_u
+             (local.get $0)
+             (local.get $2)
+            )
+            (call $fimport$8)
+            (block
+             (i32.store offset=16
+              (local.get $9)
+              (local.get $0)
+             )
+             (i32.store offset=24
+              (local.get $0)
+              (local.get $9)
+             )
+            )
+           )
+          )
+          (if
+           (local.tee $0
+            (i32.load offset=4
+             (local.get $1)
+            )
+           )
+           (if
+            (i32.lt_u
+             (local.get $0)
+             (i32.load
+              (i32.const 4192)
+             )
+            )
+            (call $fimport$8)
+            (block
+             (i32.store offset=20
+              (local.get $9)
+              (local.get $0)
+             )
+             (i32.store offset=24
+              (local.get $0)
+              (local.get $9)
+             )
+            )
+           )
+          )
+         )
+        )
+       )
+      )
+     )
+     (i32.store offset=4
+      (local.get $3)
+      (i32.or
+       (local.get $5)
+       (i32.const 1)
+      )
+     )
+     (i32.store
+      (i32.add
+       (local.get $3)
+       (local.get $5)
+      )
+      (local.get $5)
+     )
+     (if
+      (i32.eq
+       (local.get $3)
+       (i32.load
+        (i32.const 4196)
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 4184)
+        (local.get $5)
+       )
+       (return)
+      )
+      (local.set $2
+       (local.get $5)
+      )
+     )
+    )
+   )
+   (local.set $1
+    (i32.shr_u
+     (local.get $2)
+     (i32.const 3)
+    )
+   )
+   (if
+    (i32.lt_u
+     (local.get $2)
+     (i32.const 256)
+    )
+    (block
+     (local.set $0
+      (i32.add
+       (i32.shl
+        (i32.shl
+         (local.get $1)
+         (i32.const 1)
+        )
+        (i32.const 2)
+       )
+       (i32.const 4216)
+      )
+     )
+     (if
+      (i32.and
+       (local.tee $2
+        (i32.load
+         (i32.const 4176)
+        )
+       )
+       (local.tee $1
+        (i32.shl
+         (i32.const 1)
+         (local.get $1)
+        )
+       )
+      )
+      (if
+       (i32.lt_u
+        (local.tee $1
+         (i32.load
+          (local.tee $2
+           (i32.add
+            (local.get $0)
+            (i32.const 8)
+           )
+          )
+         )
+        )
+        (i32.load
+         (i32.const 4192)
+        )
+       )
+       (call $fimport$8)
+       (block
+        (local.set $15
+         (local.get $2)
+        )
+        (local.set $13
+         (local.get $1)
+        )
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 4176)
+        (i32.or
+         (local.get $2)
+         (local.get $1)
+        )
+       )
+       (local.set $15
+        (i32.add
+         (local.get $0)
+         (i32.const 8)
+        )
+       )
+       (local.set $13
+        (local.get $0)
+       )
+      )
+     )
+     (i32.store
+      (local.get $15)
+      (local.get $3)
+     )
+     (i32.store offset=12
+      (local.get $13)
+      (local.get $3)
+     )
+     (i32.store offset=8
+      (local.get $3)
+      (local.get $13)
+     )
+     (i32.store offset=12
+      (local.get $3)
+      (local.get $0)
+     )
+     (return)
+    )
+   )
+   (local.set $0
+    (i32.add
+     (i32.shl
+      (local.tee $1
+       (if (result i32)
+        (local.tee $0
+         (i32.shr_u
+          (local.get $2)
+          (i32.const 8)
+         )
+        )
+        (if (result i32)
+         (i32.gt_u
+          (local.get $2)
+          (i32.const 16777215)
+         )
+         (i32.const 31)
+         (i32.or
+          (i32.and
+           (i32.shr_u
+            (local.get $2)
+            (i32.add
+             (local.tee $0
+              (i32.add
+               (i32.sub
+                (i32.const 14)
+                (i32.or
+                 (i32.or
+                  (local.tee $4
+                   (i32.and
+                    (i32.shr_u
+                     (i32.add
+                      (local.tee $1
+                       (i32.shl
+                        (local.get $0)
+                        (local.tee $0
+                         (i32.and
+                          (i32.shr_u
+                           (i32.add
+                            (local.get $0)
+                            (i32.const 1048320)
+                           )
+                           (i32.const 16)
+                          )
+                          (i32.const 8)
+                         )
+                        )
+                       )
+                      )
+                      (i32.const 520192)
+                     )
+                     (i32.const 16)
+                    )
+                    (i32.const 4)
+                   )
+                  )
+                  (local.get $0)
+                 )
+                 (local.tee $1
+                  (i32.and
+                   (i32.shr_u
+                    (i32.add
+                     (local.tee $0
+                      (i32.shl
+                       (local.get $1)
+                       (local.get $4)
+                      )
+                     )
+                     (i32.const 245760)
+                    )
+                    (i32.const 16)
+                   )
+                   (i32.const 2)
+                  )
+                 )
+                )
+               )
+               (i32.shr_u
+                (i32.shl
+                 (local.get $0)
+                 (local.get $1)
+                )
+                (i32.const 15)
+               )
+              )
+             )
+             (i32.const 7)
+            )
+           )
+           (i32.const 1)
+          )
+          (i32.shl
+           (local.get $0)
+           (i32.const 1)
+          )
+         )
+        )
+        (i32.const 0)
+       )
+      )
+      (i32.const 2)
+     )
+     (i32.const 4480)
+    )
+   )
+   (i32.store offset=28
+    (local.get $3)
+    (local.get $1)
+   )
+   (i32.store offset=20
+    (local.get $3)
+    (i32.const 0)
+   )
+   (i32.store offset=16
+    (local.get $3)
+    (i32.const 0)
+   )
+   (block $label$113
+    (if
+     (i32.and
+      (local.tee $4
+       (i32.load
+        (i32.const 4180)
+       )
+      )
+      (local.tee $5
+       (i32.shl
+        (i32.const 1)
+        (local.get $1)
+       )
+      )
+     )
+     (block
+      (local.set $0
+       (i32.load
+        (local.get $0)
+       )
+      )
+      (local.set $4
+       (i32.sub
+        (i32.const 25)
+        (i32.shr_u
+         (local.get $1)
+         (i32.const 1)
+        )
+       )
+      )
+      (local.set $1
+       (i32.shl
+        (local.get $2)
+        (if (result i32)
+         (i32.eq
+          (local.get $1)
+          (i32.const 31)
+         )
+         (i32.const 0)
+         (local.get $4)
+        )
+       )
+      )
+      (block $label$117
+       (block $label$118
+        (block $label$119
+         (loop $label$120
+          (br_if $label$118
+           (i32.eq
+            (i32.and
+             (i32.load offset=4
+              (local.get $0)
+             )
+             (i32.const -8)
+            )
+            (local.get $2)
+           )
+          )
+          (local.set $4
+           (i32.shl
+            (local.get $1)
+            (i32.const 1)
+           )
+          )
+          (br_if $label$119
+           (i32.eqz
+            (local.tee $5
+             (i32.load
+              (local.tee $1
+               (i32.add
+                (i32.add
+                 (local.get $0)
+                 (i32.const 16)
+                )
+                (i32.shl
+                 (i32.shr_u
+                  (local.get $1)
+                  (i32.const 31)
+                 )
+                 (i32.const 2)
+                )
+               )
+              )
+             )
+            )
+           )
+          )
+          (local.set $1
+           (local.get $4)
+          )
+          (local.set $0
+           (local.get $5)
+          )
+          (br $label$120)
+         )
+        )
+        (if
+         (i32.lt_u
+          (local.get $1)
+          (i32.load
+           (i32.const 4192)
+          )
+         )
+         (call $fimport$8)
+         (block
+          (i32.store
+           (local.get $1)
+           (local.get $3)
+          )
+          (i32.store offset=24
+           (local.get $3)
+           (local.get $0)
+          )
+          (i32.store offset=12
+           (local.get $3)
+           (local.get $3)
+          )
+          (i32.store offset=8
+           (local.get $3)
+           (local.get $3)
+          )
+          (br $label$113)
+         )
+        )
+        (br $label$117)
+       )
+       (if
+        (i32.and
+         (i32.ge_u
+          (local.tee $2
+           (i32.load
+            (local.tee $1
+             (i32.add
+              (local.get $0)
+              (i32.const 8)
+             )
+            )
+           )
+          )
+          (local.tee $4
+           (i32.load
+            (i32.const 4192)
+           )
+          )
+         )
+         (i32.ge_u
+          (local.get $0)
+          (local.get $4)
+         )
+        )
+        (block
+         (i32.store offset=12
+          (local.get $2)
+          (local.get $3)
+         )
+         (i32.store
+          (local.get $1)
+          (local.get $3)
+         )
+         (i32.store offset=8
+          (local.get $3)
+          (local.get $2)
+         )
+         (i32.store offset=12
+          (local.get $3)
+          (local.get $0)
+         )
+         (i32.store offset=24
+          (local.get $3)
+          (i32.const 0)
+         )
+        )
+        (call $fimport$8)
+       )
+      )
+     )
+     (block
+      (i32.store
+       (i32.const 4180)
+       (i32.or
+        (local.get $4)
+        (local.get $5)
+       )
+      )
+      (i32.store
+       (local.get $0)
+       (local.get $3)
+      )
+      (i32.store offset=24
+       (local.get $3)
+       (local.get $0)
+      )
+      (i32.store offset=12
+       (local.get $3)
+       (local.get $3)
+      )
+      (i32.store offset=8
+       (local.get $3)
+       (local.get $3)
+      )
+     )
+    )
+   )
+   (i32.store
+    (i32.const 4208)
+    (local.tee $0
+     (i32.add
+      (i32.load
+       (i32.const 4208)
+      )
+      (i32.const -1)
+     )
+    )
+   )
+   (if
+    (local.get $0)
+    (return)
+    (local.set $0
+     (i32.const 4632)
+    )
+   )
+   (loop $label$128
+    (local.set $0
+     (i32.add
+      (local.tee $2
+       (i32.load
+        (local.get $0)
+       )
+      )
+      (i32.const 8)
+     )
+    )
+    (br_if $label$128
+     (local.get $2)
+    )
+   )
+   (i32.store
+    (i32.const 4208)
+    (i32.const -1)
+   )
   )
-  (func $34 (;47;) (type $6) (param $0 i32) (param $1 i32) (result i32)
-    (local $2 i32) (local $3 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $2
-      global.get $global$1
-      i32.const 16
-      i32.add
-      global.set $global$1
-      local.get $2
-      local.tee $3
-      local.get $1
-      i32.store
-      i32.const 1280
-      i32.load
-      local.get $0
-      local.get $3
-      call $18
-      local.set $0
-      local.get $2
-      global.set $global$1
-      local.get $0
-    end
+ )
+ (func $39 (; 52 ;) (type $2) (param $0 i32) (result i32)
+  (local $1 i32)
+  (block $label$1 (result i32)
+   (if
+    (i32.eqz
+     (local.get $0)
+    )
+    (local.set $0
+     (i32.const 1)
+    )
+   )
+   (loop $label$3
+    (block $label$4
+     (if
+      (local.tee $1
+       (call $37
+        (local.get $0)
+       )
+      )
+      (block
+       (local.set $0
+        (local.get $1)
+       )
+       (br $label$4)
+      )
+     )
+     (if
+      (local.tee $1
+       (call $43)
+      )
+      (block
+       (call_indirect (type $1)
+        (i32.add
+         (i32.and
+          (local.get $1)
+          (i32.const 0)
+         )
+         (i32.const 8)
+        )
+       )
+       (br $label$3)
+      )
+      (local.set $0
+       (i32.const 0)
+      )
+     )
+    )
+   )
+   (local.get $0)
   )
-  (func $35 (;48;) (type $2) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32) (local $3 i32)
-    block $label$1 (result i32) ;; label = @1
-      i32.const 1280
-      i32.load
-      local.tee $1
-      i32.load offset=76
-      i32.const -1
-      i32.gt_s
-      if (result i32) ;; label = @2
-        local.get $1
-        call $20
-      else
-        i32.const 0
-      end
-      local.set $2
-      block $label$4 (result i32) ;; label = @2
-        local.get $0
-        local.get $1
-        call $36
-        i32.const 0
-        i32.lt_s
-        if (result i32) ;; label = @3
-          i32.const 1
-        else
-          block (result i32) ;; label = @4
-            local.get $1
-            i32.load8_s offset=75
-            i32.const 10
-            i32.ne
-            if ;; label = @5
-              local.get $1
-              i32.const 20
-              i32.add
-              local.tee $3
-              i32.load
-              local.tee $0
-              local.get $1
-              i32.load offset=16
-              i32.lt_u
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $3
-                  local.get $0
-                  i32.const 1
-                  i32.add
-                  i32.store
-                  local.get $0
-                  i32.const 10
-                  i32.store8
-                  i32.const 0
-                  br 5 (;@2;)
-                end
-              end
-            end
-            local.get $1
-            i32.const 10
-            call $32
-            i32.const 0
-            i32.lt_s
-          end
-        end
-      end
-      local.set $0
-      local.get $2
-      if ;; label = @2
-        local.get $1
-        call $13
-      end
-      local.get $0
-      i32.const 31
-      i32.shl
-      i32.const 31
-      i32.shr_s
-    end
+ )
+ (func $40 (; 53 ;) (type $2) (param $0 i32) (result i32)
+  (call $39
+   (local.get $0)
   )
-  (func $36 (;49;) (type $6) (param $0 i32) (param $1 i32) (result i32)
-    local.get $0
-    local.get $0
-    call $31
-    i32.const 1
-    local.get $1
-    call $33
-    i32.const -1
-    i32.add
+ )
+ (func $41 (; 54 ;) (type $3) (param $0 i32)
+  (call $38
+   (local.get $0)
   )
-  (func $37 (;50;) (type $2) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32) (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32) (local $15 i32) (local $16 i32) (local $17 i32) (local $18 i32) (local $19 i32) (local $20 i32) (local $21 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $14
-      global.get $global$1
-      i32.const 16
-      i32.add
-      global.set $global$1
-      local.get $14
-      local.set $18
-      block $label$2 ;; label = @2
-        local.get $0
-        i32.const 245
-        i32.lt_u
-        if ;; label = @3
-          block ;; label = @4
-            local.get $0
-            i32.const 11
-            i32.add
-            i32.const -8
-            i32.and
-            local.set $3
-            i32.const 4176
-            i32.load
-            local.tee $8
-            local.get $0
-            i32.const 11
-            i32.lt_u
-            if (result i32) ;; label = @5
-              i32.const 16
-              local.tee $3
-            else
-              local.get $3
-            end
-            i32.const 3
-            i32.shr_u
-            local.tee $2
-            i32.shr_u
-            local.tee $0
-            i32.const 3
-            i32.and
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                i32.const 1
-                i32.and
-                i32.const 1
-                i32.xor
-                local.get $2
-                i32.add
-                local.tee $5
-                i32.const 1
-                i32.shl
-                i32.const 2
-                i32.shl
-                i32.const 4216
-                i32.add
-                local.tee $2
-                i32.const 8
-                i32.add
-                local.tee $3
-                i32.load
-                local.tee $7
-                i32.const 8
-                i32.add
-                local.tee $1
-                i32.load
-                local.set $4
-                local.get $2
-                local.get $4
-                i32.eq
-                if ;; label = @7
-                  i32.const 4176
-                  local.get $8
-                  i32.const 1
-                  local.get $5
-                  i32.shl
-                  i32.const -1
-                  i32.xor
-                  i32.and
-                  i32.store
-                else
-                  block ;; label = @8
-                    local.get $4
-                    i32.const 4192
-                    i32.load
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$8
-                    end
-                    local.get $4
-                    i32.const 12
-                    i32.add
-                    local.tee $0
-                    i32.load
-                    local.get $7
-                    i32.eq
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $0
-                        local.get $2
-                        i32.store
-                        local.get $3
-                        local.get $4
-                        i32.store
-                      end
-                    else
-                      call $fimport$8
-                    end
-                  end
-                end
-                local.get $7
-                local.get $5
-                i32.const 3
-                i32.shl
-                local.tee $0
-                i32.const 3
-                i32.or
-                i32.store offset=4
-                local.get $7
-                local.get $0
-                i32.add
-                i32.const 4
-                i32.add
-                local.tee $0
-                local.get $0
-                i32.load
-                i32.const 1
-                i32.or
-                i32.store
-                local.get $14
-                global.set $global$1
-                local.get $1
-                return
-              end
-            end
-            local.get $3
-            i32.const 4184
-            i32.load
-            local.tee $16
-            i32.gt_u
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $0
-                    local.get $2
-                    i32.shl
-                    i32.const 2
-                    local.get $2
-                    i32.shl
-                    local.tee $0
-                    i32.const 0
-                    local.get $0
-                    i32.sub
-                    i32.or
-                    i32.and
-                    local.tee $0
-                    i32.const 0
-                    local.get $0
-                    i32.sub
-                    i32.and
-                    i32.const -1
-                    i32.add
-                    local.tee $0
-                    i32.const 12
-                    i32.shr_u
-                    i32.const 16
-                    i32.and
-                    local.set $5
-                    local.get $0
-                    local.get $5
-                    i32.shr_u
-                    local.tee $2
-                    i32.const 5
-                    i32.shr_u
-                    i32.const 8
-                    i32.and
-                    local.tee $0
-                    local.get $5
-                    i32.or
-                    local.get $2
-                    local.get $0
-                    i32.shr_u
-                    local.tee $2
-                    i32.const 2
-                    i32.shr_u
-                    i32.const 4
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $2
-                    local.get $0
-                    i32.shr_u
-                    local.tee $2
-                    i32.const 1
-                    i32.shr_u
-                    i32.const 2
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $2
-                    local.get $0
-                    i32.shr_u
-                    local.tee $2
-                    i32.const 1
-                    i32.shr_u
-                    i32.const 1
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $2
-                    local.get $0
-                    i32.shr_u
-                    i32.add
-                    local.tee $11
-                    i32.const 1
-                    i32.shl
-                    i32.const 2
-                    i32.shl
-                    i32.const 4216
-                    i32.add
-                    local.tee $4
-                    i32.const 8
-                    i32.add
-                    local.tee $2
-                    i32.load
-                    local.tee $9
-                    i32.const 8
-                    i32.add
-                    local.tee $5
-                    i32.load
-                    local.set $12
-                    local.get $4
-                    local.get $12
-                    i32.eq
-                    if ;; label = @9
-                      i32.const 4176
-                      local.get $8
-                      i32.const 1
-                      local.get $11
-                      i32.shl
-                      i32.const -1
-                      i32.xor
-                      i32.and
-                      local.tee $7
-                      i32.store
-                    else
-                      block ;; label = @10
-                        local.get $12
-                        i32.const 4192
-                        i32.load
-                        i32.lt_u
-                        if ;; label = @11
-                          call $fimport$8
-                        end
-                        local.get $12
-                        i32.const 12
-                        i32.add
-                        local.tee $0
-                        i32.load
-                        local.get $9
-                        i32.eq
-                        if ;; label = @11
-                          block ;; label = @12
-                            local.get $0
-                            local.get $4
-                            i32.store
-                            local.get $2
-                            local.get $12
-                            i32.store
-                            local.get $8
-                            local.set $7
-                          end
-                        else
-                          call $fimport$8
-                        end
-                      end
-                    end
-                    local.get $9
-                    local.get $3
-                    i32.const 3
-                    i32.or
-                    i32.store offset=4
-                    local.get $9
-                    local.get $3
-                    i32.add
-                    local.tee $4
-                    local.get $11
-                    i32.const 3
-                    i32.shl
-                    local.get $3
-                    i32.sub
-                    local.tee $11
-                    i32.const 1
-                    i32.or
-                    i32.store offset=4
-                    local.get $4
-                    local.get $11
-                    i32.add
-                    local.get $11
-                    i32.store
-                    local.get $16
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const 4196
-                        i32.load
-                        local.set $9
-                        local.get $16
-                        i32.const 3
-                        i32.shr_u
-                        local.tee $0
-                        i32.const 1
-                        i32.shl
-                        i32.const 2
-                        i32.shl
-                        i32.const 4216
-                        i32.add
-                        local.set $2
-                        local.get $7
-                        i32.const 1
-                        local.get $0
-                        i32.shl
-                        local.tee $0
-                        i32.and
-                        if ;; label = @11
-                          local.get $2
-                          i32.const 8
-                          i32.add
-                          local.tee $3
-                          i32.load
-                          local.tee $0
-                          i32.const 4192
-                          i32.load
-                          i32.lt_u
-                          if ;; label = @12
-                            call $fimport$8
-                          else
-                            block ;; label = @13
-                              local.get $3
-                              local.set $6
-                              local.get $0
-                              local.set $1
-                            end
-                          end
-                        else
-                          block ;; label = @12
-                            i32.const 4176
-                            local.get $7
-                            local.get $0
-                            i32.or
-                            i32.store
-                            local.get $2
-                            i32.const 8
-                            i32.add
-                            local.set $6
-                            local.get $2
-                            local.set $1
-                          end
-                        end
-                        local.get $6
-                        local.get $9
-                        i32.store
-                        local.get $1
-                        local.get $9
-                        i32.store offset=12
-                        local.get $9
-                        local.get $1
-                        i32.store offset=8
-                        local.get $9
-                        local.get $2
-                        i32.store offset=12
-                      end
-                    end
-                    i32.const 4184
-                    local.get $11
-                    i32.store
-                    i32.const 4196
-                    local.get $4
-                    i32.store
-                    local.get $14
-                    global.set $global$1
-                    local.get $5
-                    return
-                  end
-                end
-                i32.const 4180
-                i32.load
-                local.tee $6
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $6
-                    i32.const 0
-                    local.get $6
-                    i32.sub
-                    i32.and
-                    i32.const -1
-                    i32.add
-                    local.tee $0
-                    i32.const 12
-                    i32.shr_u
-                    i32.const 16
-                    i32.and
-                    local.set $2
-                    local.get $0
-                    local.get $2
-                    i32.shr_u
-                    local.tee $1
-                    i32.const 5
-                    i32.shr_u
-                    i32.const 8
-                    i32.and
-                    local.tee $0
-                    local.get $2
-                    i32.or
-                    local.get $1
-                    local.get $0
-                    i32.shr_u
-                    local.tee $1
-                    i32.const 2
-                    i32.shr_u
-                    i32.const 4
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $1
-                    local.get $0
-                    i32.shr_u
-                    local.tee $1
-                    i32.const 1
-                    i32.shr_u
-                    i32.const 2
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $1
-                    local.get $0
-                    i32.shr_u
-                    local.tee $1
-                    i32.const 1
-                    i32.shr_u
-                    i32.const 1
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $1
-                    local.get $0
-                    i32.shr_u
-                    i32.add
-                    i32.const 2
-                    i32.shl
-                    i32.const 4480
-                    i32.add
-                    i32.load
-                    local.tee $2
-                    i32.load offset=4
-                    i32.const -8
-                    i32.and
-                    local.get $3
-                    i32.sub
-                    local.set $9
-                    local.get $2
-                    local.set $1
-                    loop $label$25 ;; label = @9
-                      block $label$26 ;; label = @10
-                        local.get $1
-                        i32.load offset=16
-                        local.tee $0
-                        i32.eqz
-                        if ;; label = @11
-                          local.get $1
-                          i32.load offset=20
-                          local.tee $0
-                          i32.eqz
-                          br_if 1 (;@10;)
-                        end
-                        local.get $0
-                        i32.load offset=4
-                        i32.const -8
-                        i32.and
-                        local.get $3
-                        i32.sub
-                        local.tee $1
-                        local.get $9
-                        i32.lt_u
-                        local.tee $7
-                        if ;; label = @11
-                          local.get $1
-                          local.set $9
-                        end
-                        local.get $0
-                        local.set $1
-                        local.get $7
-                        if ;; label = @11
-                          local.get $0
-                          local.set $2
-                        end
-                        br 1 (;@9;)
-                      end
-                    end
-                    local.get $2
-                    i32.const 4192
-                    i32.load
-                    local.tee $12
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$8
-                    end
-                    local.get $2
-                    local.get $2
-                    local.get $3
-                    i32.add
-                    local.tee $13
-                    i32.ge_u
-                    if ;; label = @9
-                      call $fimport$8
-                    end
-                    local.get $2
-                    i32.load offset=24
-                    local.set $15
-                    block $label$32 ;; label = @9
-                      local.get $2
-                      i32.load offset=12
-                      local.tee $0
-                      local.get $2
-                      i32.eq
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $2
-                          i32.const 20
-                          i32.add
-                          local.tee $1
-                          i32.load
-                          local.tee $0
-                          i32.eqz
-                          if ;; label = @12
-                            local.get $2
-                            i32.const 16
-                            i32.add
-                            local.tee $1
-                            i32.load
-                            local.tee $0
-                            i32.eqz
-                            if ;; label = @13
-                              block ;; label = @14
-                                i32.const 0
-                                local.set $4
-                                br 5 (;@9;)
-                              end
-                            end
-                          end
-                          loop $label$36 ;; label = @12
-                            local.get $0
-                            i32.const 20
-                            i32.add
-                            local.tee $11
-                            i32.load
-                            local.tee $7
-                            if ;; label = @13
-                              block ;; label = @14
-                                local.get $7
-                                local.set $0
-                                local.get $11
-                                local.set $1
-                                br 2 (;@12;)
-                              end
-                            end
-                            local.get $0
-                            i32.const 16
-                            i32.add
-                            local.tee $11
-                            i32.load
-                            local.tee $7
-                            if ;; label = @13
-                              block ;; label = @14
-                                local.get $7
-                                local.set $0
-                                local.get $11
-                                local.set $1
-                                br 2 (;@12;)
-                              end
-                            end
-                          end
-                          local.get $1
-                          local.get $12
-                          i32.lt_u
-                          if ;; label = @12
-                            call $fimport$8
-                          else
-                            block ;; label = @13
-                              local.get $1
-                              i32.const 0
-                              i32.store
-                              local.get $0
-                              local.set $4
-                            end
-                          end
-                        end
-                      else
-                        block ;; label = @11
-                          local.get $2
-                          i32.load offset=8
-                          local.tee $11
-                          local.get $12
-                          i32.lt_u
-                          if ;; label = @12
-                            call $fimport$8
-                          end
-                          local.get $11
-                          i32.const 12
-                          i32.add
-                          local.tee $7
-                          i32.load
-                          local.get $2
-                          i32.ne
-                          if ;; label = @12
-                            call $fimport$8
-                          end
-                          local.get $0
-                          i32.const 8
-                          i32.add
-                          local.tee $1
-                          i32.load
-                          local.get $2
-                          i32.eq
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $7
-                              local.get $0
-                              i32.store
-                              local.get $1
-                              local.get $11
-                              i32.store
-                              local.get $0
-                              local.set $4
-                            end
-                          else
-                            call $fimport$8
-                          end
-                        end
-                      end
-                    end
-                    block $label$46 ;; label = @9
-                      local.get $15
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $2
-                          local.get $2
-                          i32.load offset=28
-                          local.tee $1
-                          i32.const 2
-                          i32.shl
-                          i32.const 4480
-                          i32.add
-                          local.tee $0
-                          i32.load
-                          i32.eq
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $0
-                              local.get $4
-                              i32.store
-                              local.get $4
-                              i32.eqz
-                              if ;; label = @14
-                                block ;; label = @15
-                                  i32.const 4180
-                                  local.get $6
-                                  i32.const 1
-                                  local.get $1
-                                  i32.shl
-                                  i32.const -1
-                                  i32.xor
-                                  i32.and
-                                  i32.store
-                                  br 6 (;@9;)
-                                end
-                              end
-                            end
-                          else
-                            block ;; label = @13
-                              local.get $15
-                              i32.const 4192
-                              i32.load
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$8
-                              end
-                              local.get $15
-                              i32.const 16
-                              i32.add
-                              local.tee $0
-                              i32.load
-                              local.get $2
-                              i32.eq
-                              if ;; label = @14
-                                local.get $0
-                                local.get $4
-                                i32.store
-                              else
-                                local.get $15
-                                local.get $4
-                                i32.store offset=20
-                              end
-                              local.get $4
-                              i32.eqz
-                              br_if 4 (;@9;)
-                            end
-                          end
-                          local.get $4
-                          i32.const 4192
-                          i32.load
-                          local.tee $0
-                          i32.lt_u
-                          if ;; label = @12
-                            call $fimport$8
-                          end
-                          local.get $4
-                          local.get $15
-                          i32.store offset=24
-                          local.get $2
-                          i32.load offset=16
-                          local.tee $1
-                          if ;; label = @12
-                            local.get $1
-                            local.get $0
-                            i32.lt_u
-                            if ;; label = @13
-                              call $fimport$8
-                            else
-                              block ;; label = @14
-                                local.get $4
-                                local.get $1
-                                i32.store offset=16
-                                local.get $1
-                                local.get $4
-                                i32.store offset=24
-                              end
-                            end
-                          end
-                          local.get $2
-                          i32.load offset=20
-                          local.tee $0
-                          if ;; label = @12
-                            local.get $0
-                            i32.const 4192
-                            i32.load
-                            i32.lt_u
-                            if ;; label = @13
-                              call $fimport$8
-                            else
-                              block ;; label = @14
-                                local.get $4
-                                local.get $0
-                                i32.store offset=20
-                                local.get $0
-                                local.get $4
-                                i32.store offset=24
-                              end
-                            end
-                          end
-                        end
-                      end
-                    end
-                    local.get $9
-                    i32.const 16
-                    i32.lt_u
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $2
-                        local.get $9
-                        local.get $3
-                        i32.add
-                        local.tee $0
-                        i32.const 3
-                        i32.or
-                        i32.store offset=4
-                        local.get $2
-                        local.get $0
-                        i32.add
-                        i32.const 4
-                        i32.add
-                        local.tee $0
-                        local.get $0
-                        i32.load
-                        i32.const 1
-                        i32.or
-                        i32.store
-                      end
-                    else
-                      block ;; label = @10
-                        local.get $2
-                        local.get $3
-                        i32.const 3
-                        i32.or
-                        i32.store offset=4
-                        local.get $13
-                        local.get $9
-                        i32.const 1
-                        i32.or
-                        i32.store offset=4
-                        local.get $13
-                        local.get $9
-                        i32.add
-                        local.get $9
-                        i32.store
-                        local.get $16
-                        if ;; label = @11
-                          block ;; label = @12
-                            i32.const 4196
-                            i32.load
-                            local.set $7
-                            local.get $16
-                            i32.const 3
-                            i32.shr_u
-                            local.tee $0
-                            i32.const 1
-                            i32.shl
-                            i32.const 2
-                            i32.shl
-                            i32.const 4216
-                            i32.add
-                            local.set $3
-                            local.get $8
-                            i32.const 1
-                            local.get $0
-                            i32.shl
-                            local.tee $0
-                            i32.and
-                            if ;; label = @13
-                              local.get $3
-                              i32.const 8
-                              i32.add
-                              local.tee $1
-                              i32.load
-                              local.tee $0
-                              i32.const 4192
-                              i32.load
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$8
-                              else
-                                block ;; label = @15
-                                  local.get $1
-                                  local.set $10
-                                  local.get $0
-                                  local.set $5
-                                end
-                              end
-                            else
-                              block ;; label = @14
-                                i32.const 4176
-                                local.get $8
-                                local.get $0
-                                i32.or
-                                i32.store
-                                local.get $3
-                                i32.const 8
-                                i32.add
-                                local.set $10
-                                local.get $3
-                                local.set $5
-                              end
-                            end
-                            local.get $10
-                            local.get $7
-                            i32.store
-                            local.get $5
-                            local.get $7
-                            i32.store offset=12
-                            local.get $7
-                            local.get $5
-                            i32.store offset=8
-                            local.get $7
-                            local.get $3
-                            i32.store offset=12
-                          end
-                        end
-                        i32.const 4184
-                        local.get $9
-                        i32.store
-                        i32.const 4196
-                        local.get $13
-                        i32.store
-                      end
-                    end
-                    local.get $14
-                    global.set $global$1
-                    local.get $2
-                    i32.const 8
-                    i32.add
-                    return
-                  end
-                else
-                  local.get $3
-                  local.set $0
-                end
-              end
-            else
-              local.get $3
-              local.set $0
-            end
-          end
-        else
-          local.get $0
-          i32.const -65
-          i32.gt_u
-          if ;; label = @4
-            i32.const -1
-            local.set $0
-          else
-            block ;; label = @5
-              local.get $0
-              i32.const 11
-              i32.add
-              local.tee $0
-              i32.const -8
-              i32.and
-              local.set $7
-              i32.const 4180
-              i32.load
-              local.tee $5
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $0
-                  i32.const 8
-                  i32.shr_u
-                  local.tee $0
-                  if (result i32) ;; label = @8
-                    local.get $7
-                    i32.const 16777215
-                    i32.gt_u
-                    if (result i32) ;; label = @9
-                      i32.const 31
-                    else
-                      local.get $7
-                      i32.const 14
-                      local.get $0
-                      local.get $0
-                      i32.const 1048320
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 8
-                      i32.and
-                      local.tee $3
-                      i32.shl
-                      local.tee $1
-                      i32.const 520192
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 4
-                      i32.and
-                      local.tee $0
-                      local.get $3
-                      i32.or
-                      local.get $1
-                      local.get $0
-                      i32.shl
-                      local.tee $1
-                      i32.const 245760
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 2
-                      i32.and
-                      local.tee $0
-                      i32.or
-                      i32.sub
-                      local.get $1
-                      local.get $0
-                      i32.shl
-                      i32.const 15
-                      i32.shr_u
-                      i32.add
-                      local.tee $0
-                      i32.const 7
-                      i32.add
-                      i32.shr_u
-                      i32.const 1
-                      i32.and
-                      local.get $0
-                      i32.const 1
-                      i32.shl
-                      i32.or
-                    end
-                  else
-                    i32.const 0
-                  end
-                  local.set $17
-                  i32.const 0
-                  local.get $7
-                  i32.sub
-                  local.set $3
-                  block $label$78 ;; label = @8
-                    block $label$79 ;; label = @9
-                      block $label$80 ;; label = @10
-                        local.get $17
-                        i32.const 2
-                        i32.shl
-                        i32.const 4480
-                        i32.add
-                        i32.load
-                        local.tee $1
-                        if ;; label = @11
-                          block ;; label = @12
-                            i32.const 25
-                            local.get $17
-                            i32.const 1
-                            i32.shr_u
-                            i32.sub
-                            local.set $0
-                            i32.const 0
-                            local.set $4
-                            local.get $7
-                            local.get $17
-                            i32.const 31
-                            i32.eq
-                            if (result i32) ;; label = @13
-                              i32.const 0
-                            else
-                              local.get $0
-                            end
-                            i32.shl
-                            local.set $10
-                            i32.const 0
-                            local.set $0
-                            loop $label$84 ;; label = @13
-                              local.get $1
-                              i32.load offset=4
-                              i32.const -8
-                              i32.and
-                              local.get $7
-                              i32.sub
-                              local.tee $6
-                              local.get $3
-                              i32.lt_u
-                              if ;; label = @14
-                                local.get $6
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $6
-                                    local.set $3
-                                    local.get $1
-                                    local.set $0
-                                  end
-                                else
-                                  block ;; label = @16
-                                    i32.const 0
-                                    local.set $3
-                                    local.get $1
-                                    local.set $0
-                                    br 7 (;@9;)
-                                  end
-                                end
-                              end
-                              local.get $1
-                              i32.load offset=20
-                              local.tee $19
-                              i32.eqz
-                              local.get $19
-                              local.get $1
-                              i32.const 16
-                              i32.add
-                              local.get $10
-                              i32.const 31
-                              i32.shr_u
-                              i32.const 2
-                              i32.shl
-                              i32.add
-                              i32.load
-                              local.tee $6
-                              i32.eq
-                              i32.or
-                              if (result i32) ;; label = @14
-                                local.get $4
-                              else
-                                local.get $19
-                              end
-                              local.set $1
-                              local.get $10
-                              local.get $6
-                              i32.eqz
-                              local.tee $4
-                              i32.const 1
-                              i32.and
-                              i32.const 1
-                              i32.xor
-                              i32.shl
-                              local.set $10
-                              local.get $4
-                              if ;; label = @14
-                                block ;; label = @15
-                                  local.get $1
-                                  local.set $4
-                                  local.get $0
-                                  local.set $1
-                                  br 5 (;@10;)
-                                end
-                              else
-                                block ;; label = @15
-                                  local.get $1
-                                  local.set $4
-                                  local.get $6
-                                  local.set $1
-                                  br 2 (;@13;)
-                                end
-                              end
-                            end
-                          end
-                        else
-                          block ;; label = @12
-                            i32.const 0
-                            local.set $4
-                            i32.const 0
-                            local.set $1
-                          end
-                        end
-                      end
-                      local.get $4
-                      i32.eqz
-                      local.get $1
-                      i32.eqz
-                      i32.and
-                      if (result i32) ;; label = @10
-                        block (result i32) ;; label = @11
-                          local.get $5
-                          i32.const 2
-                          local.get $17
-                          i32.shl
-                          local.tee $0
-                          i32.const 0
-                          local.get $0
-                          i32.sub
-                          i32.or
-                          i32.and
-                          local.tee $0
-                          i32.eqz
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $7
-                              local.set $0
-                              br 11 (;@2;)
-                            end
-                          end
-                          local.get $0
-                          i32.const 0
-                          local.get $0
-                          i32.sub
-                          i32.and
-                          i32.const -1
-                          i32.add
-                          local.tee $0
-                          i32.const 12
-                          i32.shr_u
-                          i32.const 16
-                          i32.and
-                          local.set $10
-                          local.get $0
-                          local.get $10
-                          i32.shr_u
-                          local.tee $4
-                          i32.const 5
-                          i32.shr_u
-                          i32.const 8
-                          i32.and
-                          local.tee $0
-                          local.get $10
-                          i32.or
-                          local.get $4
-                          local.get $0
-                          i32.shr_u
-                          local.tee $4
-                          i32.const 2
-                          i32.shr_u
-                          i32.const 4
-                          i32.and
-                          local.tee $0
-                          i32.or
-                          local.get $4
-                          local.get $0
-                          i32.shr_u
-                          local.tee $4
-                          i32.const 1
-                          i32.shr_u
-                          i32.const 2
-                          i32.and
-                          local.tee $0
-                          i32.or
-                          local.get $4
-                          local.get $0
-                          i32.shr_u
-                          local.tee $4
-                          i32.const 1
-                          i32.shr_u
-                          i32.const 1
-                          i32.and
-                          local.tee $0
-                          i32.or
-                          local.get $4
-                          local.get $0
-                          i32.shr_u
-                          i32.add
-                          i32.const 2
-                          i32.shl
-                          i32.const 4480
-                          i32.add
-                          i32.load
-                        end
-                      else
-                        local.get $4
-                      end
-                      local.tee $0
-                      br_if 0 (;@9;)
-                      local.get $1
-                      local.set $4
-                      br 1 (;@8;)
-                    end
-                    loop $label$96 ;; label = @9
-                      local.get $0
-                      i32.load offset=4
-                      i32.const -8
-                      i32.and
-                      local.get $7
-                      i32.sub
-                      local.tee $4
-                      local.get $3
-                      i32.lt_u
-                      local.tee $10
-                      if ;; label = @10
-                        local.get $4
-                        local.set $3
-                      end
-                      local.get $10
-                      if ;; label = @10
-                        local.get $0
-                        local.set $1
-                      end
-                      local.get $0
-                      i32.load offset=16
-                      local.tee $4
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $4
-                          local.set $0
-                          br 2 (;@9;)
-                        end
-                      end
-                      local.get $0
-                      i32.load offset=20
-                      local.tee $0
-                      br_if 0 (;@9;)
-                      local.get $1
-                      local.set $4
-                    end
-                  end
-                  local.get $4
-                  if ;; label = @8
-                    local.get $3
-                    i32.const 4184
-                    i32.load
-                    local.get $7
-                    i32.sub
-                    i32.lt_u
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $4
-                        i32.const 4192
-                        i32.load
-                        local.tee $12
-                        i32.lt_u
-                        if ;; label = @11
-                          call $fimport$8
-                        end
-                        local.get $4
-                        local.get $4
-                        local.get $7
-                        i32.add
-                        local.tee $6
-                        i32.ge_u
-                        if ;; label = @11
-                          call $fimport$8
-                        end
-                        local.get $4
-                        i32.load offset=24
-                        local.set $10
-                        block $label$104 ;; label = @11
-                          local.get $4
-                          i32.load offset=12
-                          local.tee $0
-                          local.get $4
-                          i32.eq
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $4
-                              i32.const 20
-                              i32.add
-                              local.tee $1
-                              i32.load
-                              local.tee $0
-                              i32.eqz
-                              if ;; label = @14
-                                local.get $4
-                                i32.const 16
-                                i32.add
-                                local.tee $1
-                                i32.load
-                                local.tee $0
-                                i32.eqz
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    i32.const 0
-                                    local.set $13
-                                    br 5 (;@11;)
-                                  end
-                                end
-                              end
-                              loop $label$108 ;; label = @14
-                                local.get $0
-                                i32.const 20
-                                i32.add
-                                local.tee $9
-                                i32.load
-                                local.tee $11
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $11
-                                    local.set $0
-                                    local.get $9
-                                    local.set $1
-                                    br 2 (;@14;)
-                                  end
-                                end
-                                local.get $0
-                                i32.const 16
-                                i32.add
-                                local.tee $9
-                                i32.load
-                                local.tee $11
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $11
-                                    local.set $0
-                                    local.get $9
-                                    local.set $1
-                                    br 2 (;@14;)
-                                  end
-                                end
-                              end
-                              local.get $1
-                              local.get $12
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$8
-                              else
-                                block ;; label = @15
-                                  local.get $1
-                                  i32.const 0
-                                  i32.store
-                                  local.get $0
-                                  local.set $13
-                                end
-                              end
-                            end
-                          else
-                            block ;; label = @13
-                              local.get $4
-                              i32.load offset=8
-                              local.tee $9
-                              local.get $12
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$8
-                              end
-                              local.get $9
-                              i32.const 12
-                              i32.add
-                              local.tee $11
-                              i32.load
-                              local.get $4
-                              i32.ne
-                              if ;; label = @14
-                                call $fimport$8
-                              end
-                              local.get $0
-                              i32.const 8
-                              i32.add
-                              local.tee $1
-                              i32.load
-                              local.get $4
-                              i32.eq
-                              if ;; label = @14
-                                block ;; label = @15
-                                  local.get $11
-                                  local.get $0
-                                  i32.store
-                                  local.get $1
-                                  local.get $9
-                                  i32.store
-                                  local.get $0
-                                  local.set $13
-                                end
-                              else
-                                call $fimport$8
-                              end
-                            end
-                          end
-                        end
-                        block $label$118 ;; label = @11
-                          local.get $10
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $4
-                              local.get $4
-                              i32.load offset=28
-                              local.tee $1
-                              i32.const 2
-                              i32.shl
-                              i32.const 4480
-                              i32.add
-                              local.tee $0
-                              i32.load
-                              i32.eq
-                              if ;; label = @14
-                                block ;; label = @15
-                                  local.get $0
-                                  local.get $13
-                                  i32.store
-                                  local.get $13
-                                  i32.eqz
-                                  if ;; label = @16
-                                    block ;; label = @17
-                                      i32.const 4180
-                                      local.get $5
-                                      i32.const 1
-                                      local.get $1
-                                      i32.shl
-                                      i32.const -1
-                                      i32.xor
-                                      i32.and
-                                      local.tee $2
-                                      i32.store
-                                      br 6 (;@11;)
-                                    end
-                                  end
-                                end
-                              else
-                                block ;; label = @15
-                                  local.get $10
-                                  i32.const 4192
-                                  i32.load
-                                  i32.lt_u
-                                  if ;; label = @16
-                                    call $fimport$8
-                                  end
-                                  local.get $10
-                                  i32.const 16
-                                  i32.add
-                                  local.tee $0
-                                  i32.load
-                                  local.get $4
-                                  i32.eq
-                                  if ;; label = @16
-                                    local.get $0
-                                    local.get $13
-                                    i32.store
-                                  else
-                                    local.get $10
-                                    local.get $13
-                                    i32.store offset=20
-                                  end
-                                  local.get $13
-                                  i32.eqz
-                                  if ;; label = @16
-                                    block ;; label = @17
-                                      local.get $5
-                                      local.set $2
-                                      br 6 (;@11;)
-                                    end
-                                  end
-                                end
-                              end
-                              local.get $13
-                              i32.const 4192
-                              i32.load
-                              local.tee $0
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$8
-                              end
-                              local.get $13
-                              local.get $10
-                              i32.store offset=24
-                              local.get $4
-                              i32.load offset=16
-                              local.tee $1
-                              if ;; label = @14
-                                local.get $1
-                                local.get $0
-                                i32.lt_u
-                                if ;; label = @15
-                                  call $fimport$8
-                                else
-                                  block ;; label = @16
-                                    local.get $13
-                                    local.get $1
-                                    i32.store offset=16
-                                    local.get $1
-                                    local.get $13
-                                    i32.store offset=24
-                                  end
-                                end
-                              end
-                              local.get $4
-                              i32.load offset=20
-                              local.tee $0
-                              if ;; label = @14
-                                local.get $0
-                                i32.const 4192
-                                i32.load
-                                i32.lt_u
-                                if ;; label = @15
-                                  call $fimport$8
-                                else
-                                  block ;; label = @16
-                                    local.get $13
-                                    local.get $0
-                                    i32.store offset=20
-                                    local.get $0
-                                    local.get $13
-                                    i32.store offset=24
-                                    local.get $5
-                                    local.set $2
-                                  end
-                                end
-                              else
-                                local.get $5
-                                local.set $2
-                              end
-                            end
-                          else
-                            local.get $5
-                            local.set $2
-                          end
-                        end
-                        block $label$136 ;; label = @11
-                          local.get $3
-                          i32.const 16
-                          i32.lt_u
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $4
-                              local.get $3
-                              local.get $7
-                              i32.add
-                              local.tee $0
-                              i32.const 3
-                              i32.or
-                              i32.store offset=4
-                              local.get $4
-                              local.get $0
-                              i32.add
-                              i32.const 4
-                              i32.add
-                              local.tee $0
-                              local.get $0
-                              i32.load
-                              i32.const 1
-                              i32.or
-                              i32.store
-                            end
-                          else
-                            block ;; label = @13
-                              local.get $4
-                              local.get $7
-                              i32.const 3
-                              i32.or
-                              i32.store offset=4
-                              local.get $6
-                              local.get $3
-                              i32.const 1
-                              i32.or
-                              i32.store offset=4
-                              local.get $6
-                              local.get $3
-                              i32.add
-                              local.get $3
-                              i32.store
-                              local.get $3
-                              i32.const 3
-                              i32.shr_u
-                              local.set $0
-                              local.get $3
-                              i32.const 256
-                              i32.lt_u
-                              if ;; label = @14
-                                block ;; label = @15
-                                  local.get $0
-                                  i32.const 1
-                                  i32.shl
-                                  i32.const 2
-                                  i32.shl
-                                  i32.const 4216
-                                  i32.add
-                                  local.set $3
-                                  i32.const 4176
-                                  i32.load
-                                  local.tee $1
-                                  i32.const 1
-                                  local.get $0
-                                  i32.shl
-                                  local.tee $0
-                                  i32.and
-                                  if ;; label = @16
-                                    local.get $3
-                                    i32.const 8
-                                    i32.add
-                                    local.tee $1
-                                    i32.load
-                                    local.tee $0
-                                    i32.const 4192
-                                    i32.load
-                                    i32.lt_u
-                                    if ;; label = @17
-                                      call $fimport$8
-                                    else
-                                      block ;; label = @18
-                                        local.get $1
-                                        local.set $16
-                                        local.get $0
-                                        local.set $8
-                                      end
-                                    end
-                                  else
-                                    block ;; label = @17
-                                      i32.const 4176
-                                      local.get $1
-                                      local.get $0
-                                      i32.or
-                                      i32.store
-                                      local.get $3
-                                      i32.const 8
-                                      i32.add
-                                      local.set $16
-                                      local.get $3
-                                      local.set $8
-                                    end
-                                  end
-                                  local.get $16
-                                  local.get $6
-                                  i32.store
-                                  local.get $8
-                                  local.get $6
-                                  i32.store offset=12
-                                  local.get $6
-                                  local.get $8
-                                  i32.store offset=8
-                                  local.get $6
-                                  local.get $3
-                                  i32.store offset=12
-                                  br 4 (;@11;)
-                                end
-                              end
-                              local.get $3
-                              i32.const 8
-                              i32.shr_u
-                              local.tee $0
-                              if (result i32) ;; label = @14
-                                local.get $3
-                                i32.const 16777215
-                                i32.gt_u
-                                if (result i32) ;; label = @15
-                                  i32.const 31
-                                else
-                                  local.get $3
-                                  i32.const 14
-                                  local.get $0
-                                  local.get $0
-                                  i32.const 1048320
-                                  i32.add
-                                  i32.const 16
-                                  i32.shr_u
-                                  i32.const 8
-                                  i32.and
-                                  local.tee $5
-                                  i32.shl
-                                  local.tee $1
-                                  i32.const 520192
-                                  i32.add
-                                  i32.const 16
-                                  i32.shr_u
-                                  i32.const 4
-                                  i32.and
-                                  local.tee $0
-                                  local.get $5
-                                  i32.or
-                                  local.get $1
-                                  local.get $0
-                                  i32.shl
-                                  local.tee $1
-                                  i32.const 245760
-                                  i32.add
-                                  i32.const 16
-                                  i32.shr_u
-                                  i32.const 2
-                                  i32.and
-                                  local.tee $0
-                                  i32.or
-                                  i32.sub
-                                  local.get $1
-                                  local.get $0
-                                  i32.shl
-                                  i32.const 15
-                                  i32.shr_u
-                                  i32.add
-                                  local.tee $0
-                                  i32.const 7
-                                  i32.add
-                                  i32.shr_u
-                                  i32.const 1
-                                  i32.and
-                                  local.get $0
-                                  i32.const 1
-                                  i32.shl
-                                  i32.or
-                                end
-                              else
-                                i32.const 0
-                              end
-                              local.tee $5
-                              i32.const 2
-                              i32.shl
-                              i32.const 4480
-                              i32.add
-                              local.set $1
-                              local.get $6
-                              local.get $5
-                              i32.store offset=28
-                              local.get $6
-                              i32.const 16
-                              i32.add
-                              local.tee $0
-                              i32.const 0
-                              i32.store offset=4
-                              local.get $0
-                              i32.const 0
-                              i32.store
-                              local.get $2
-                              i32.const 1
-                              local.get $5
-                              i32.shl
-                              local.tee $0
-                              i32.and
-                              i32.eqz
-                              if ;; label = @14
-                                block ;; label = @15
-                                  i32.const 4180
-                                  local.get $2
-                                  local.get $0
-                                  i32.or
-                                  i32.store
-                                  local.get $1
-                                  local.get $6
-                                  i32.store
-                                  local.get $6
-                                  local.get $1
-                                  i32.store offset=24
-                                  local.get $6
-                                  local.get $6
-                                  i32.store offset=12
-                                  local.get $6
-                                  local.get $6
-                                  i32.store offset=8
-                                  br 4 (;@11;)
-                                end
-                              end
-                              local.get $1
-                              i32.load
-                              local.set $0
-                              i32.const 25
-                              local.get $5
-                              i32.const 1
-                              i32.shr_u
-                              i32.sub
-                              local.set $1
-                              local.get $3
-                              local.get $5
-                              i32.const 31
-                              i32.eq
-                              if (result i32) ;; label = @14
-                                i32.const 0
-                              else
-                                local.get $1
-                              end
-                              i32.shl
-                              local.set $5
-                              block $label$151 ;; label = @14
-                                block $label$152 ;; label = @15
-                                  block $label$153 ;; label = @16
-                                    loop $label$154 ;; label = @17
-                                      local.get $0
-                                      i32.load offset=4
-                                      i32.const -8
-                                      i32.and
-                                      local.get $3
-                                      i32.eq
-                                      br_if 2 (;@15;)
-                                      local.get $5
-                                      i32.const 1
-                                      i32.shl
-                                      local.set $2
-                                      local.get $0
-                                      i32.const 16
-                                      i32.add
-                                      local.get $5
-                                      i32.const 31
-                                      i32.shr_u
-                                      i32.const 2
-                                      i32.shl
-                                      i32.add
-                                      local.tee $5
-                                      i32.load
-                                      local.tee $1
-                                      i32.eqz
-                                      br_if 1 (;@16;)
-                                      local.get $2
-                                      local.set $5
-                                      local.get $1
-                                      local.set $0
-                                      br 0 (;@17;)
-                                    end
-                                  end
-                                  local.get $5
-                                  i32.const 4192
-                                  i32.load
-                                  i32.lt_u
-                                  if ;; label = @16
-                                    call $fimport$8
-                                  else
-                                    block ;; label = @17
-                                      local.get $5
-                                      local.get $6
-                                      i32.store
-                                      local.get $6
-                                      local.get $0
-                                      i32.store offset=24
-                                      local.get $6
-                                      local.get $6
-                                      i32.store offset=12
-                                      local.get $6
-                                      local.get $6
-                                      i32.store offset=8
-                                      br 6 (;@11;)
-                                    end
-                                  end
-                                  br 1 (;@14;)
-                                end
-                                local.get $0
-                                i32.const 8
-                                i32.add
-                                local.tee $3
-                                i32.load
-                                local.tee $2
-                                i32.const 4192
-                                i32.load
-                                local.tee $1
-                                i32.ge_u
-                                local.get $0
-                                local.get $1
-                                i32.ge_u
-                                i32.and
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $2
-                                    local.get $6
-                                    i32.store offset=12
-                                    local.get $3
-                                    local.get $6
-                                    i32.store
-                                    local.get $6
-                                    local.get $2
-                                    i32.store offset=8
-                                    local.get $6
-                                    local.get $0
-                                    i32.store offset=12
-                                    local.get $6
-                                    i32.const 0
-                                    i32.store offset=24
-                                  end
-                                else
-                                  call $fimport$8
-                                end
-                              end
-                            end
-                          end
-                        end
-                        local.get $14
-                        global.set $global$1
-                        local.get $4
-                        i32.const 8
-                        i32.add
-                        return
-                      end
-                    else
-                      local.get $7
-                      local.set $0
-                    end
-                  else
-                    local.get $7
-                    local.set $0
-                  end
-                end
-              else
-                local.get $7
-                local.set $0
-              end
-            end
-          end
-        end
-      end
-      i32.const 4184
-      i32.load
-      local.tee $1
-      local.get $0
-      i32.ge_u
-      if ;; label = @2
-        block ;; label = @3
-          i32.const 4196
-          i32.load
-          local.set $2
-          local.get $1
-          local.get $0
-          i32.sub
-          local.tee $3
-          i32.const 15
-          i32.gt_u
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 4196
-              local.get $2
-              local.get $0
-              i32.add
-              local.tee $1
-              i32.store
-              i32.const 4184
-              local.get $3
-              i32.store
-              local.get $1
-              local.get $3
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $1
-              local.get $3
-              i32.add
-              local.get $3
-              i32.store
-              local.get $2
-              local.get $0
-              i32.const 3
-              i32.or
-              i32.store offset=4
-            end
-          else
-            block ;; label = @5
-              i32.const 4184
-              i32.const 0
-              i32.store
-              i32.const 4196
-              i32.const 0
-              i32.store
-              local.get $2
-              local.get $1
-              i32.const 3
-              i32.or
-              i32.store offset=4
-              local.get $2
-              local.get $1
-              i32.add
-              i32.const 4
-              i32.add
-              local.tee $0
-              local.get $0
-              i32.load
-              i32.const 1
-              i32.or
-              i32.store
-            end
-          end
-          local.get $14
-          global.set $global$1
-          local.get $2
-          i32.const 8
-          i32.add
-          return
-        end
-      end
-      i32.const 4188
-      i32.load
-      local.tee $10
-      local.get $0
-      i32.gt_u
-      if ;; label = @2
-        block ;; label = @3
-          i32.const 4188
-          local.get $10
-          local.get $0
-          i32.sub
-          local.tee $3
-          i32.store
-          i32.const 4200
-          i32.const 4200
-          i32.load
-          local.tee $2
-          local.get $0
-          i32.add
-          local.tee $1
-          i32.store
-          local.get $1
-          local.get $3
-          i32.const 1
-          i32.or
-          i32.store offset=4
-          local.get $2
-          local.get $0
-          i32.const 3
-          i32.or
-          i32.store offset=4
-          local.get $14
-          global.set $global$1
-          local.get $2
-          i32.const 8
-          i32.add
-          return
-        end
-      end
-      i32.const 4648
-      i32.load
-      if (result i32) ;; label = @2
-        i32.const 4656
-        i32.load
-      else
-        block (result i32) ;; label = @3
-          i32.const 4656
-          i32.const 4096
-          i32.store
-          i32.const 4652
-          i32.const 4096
-          i32.store
-          i32.const 4660
-          i32.const -1
-          i32.store
-          i32.const 4664
-          i32.const -1
-          i32.store
-          i32.const 4668
-          i32.const 0
-          i32.store
-          i32.const 4620
-          i32.const 0
-          i32.store
-          local.get $18
-          local.get $18
-          i32.const -16
-          i32.and
-          i32.const 1431655768
-          i32.xor
-          local.tee $1
-          i32.store
-          i32.const 4648
-          local.get $1
-          i32.store
-          i32.const 4096
-        end
-      end
-      local.tee $1
-      local.get $0
-      i32.const 47
-      i32.add
-      local.tee $13
-      i32.add
-      local.tee $8
-      i32.const 0
-      local.get $1
-      i32.sub
-      local.tee $4
-      i32.and
-      local.tee $6
-      local.get $0
-      i32.le_u
-      if ;; label = @2
-        block ;; label = @3
-          local.get $14
-          global.set $global$1
-          i32.const 0
-          return
-        end
-      end
-      i32.const 4616
-      i32.load
-      local.tee $2
-      if ;; label = @2
-        i32.const 4608
-        i32.load
-        local.tee $3
-        local.get $6
-        i32.add
-        local.tee $1
-        local.get $3
-        i32.le_u
-        local.get $1
-        local.get $2
-        i32.gt_u
-        i32.or
-        if ;; label = @3
-          block ;; label = @4
-            local.get $14
-            global.set $global$1
-            i32.const 0
-            return
-          end
-        end
-      end
-      local.get $0
-      i32.const 48
-      i32.add
-      local.set $7
-      block $label$171 ;; label = @2
-        block $label$172 ;; label = @3
-          i32.const 4620
-          i32.load
-          i32.const 4
-          i32.and
-          i32.eqz
-          if ;; label = @4
-            block ;; label = @5
-              block $label$174 ;; label = @6
-                block $label$175 ;; label = @7
-                  block $label$176 ;; label = @8
-                    i32.const 4200
-                    i32.load
-                    local.tee $3
-                    i32.eqz
-                    br_if 0 (;@8;)
-                    i32.const 4624
-                    local.set $2
-                    loop $label$177 ;; label = @9
-                      block $label$178 ;; label = @10
-                        local.get $2
-                        i32.load
-                        local.tee $1
-                        local.get $3
-                        i32.le_u
-                        if ;; label = @11
-                          local.get $1
-                          local.get $2
-                          i32.const 4
-                          i32.add
-                          local.tee $5
-                          i32.load
-                          i32.add
-                          local.get $3
-                          i32.gt_u
-                          br_if 1 (;@10;)
-                        end
-                        local.get $2
-                        i32.load offset=8
-                        local.tee $1
-                        i32.eqz
-                        br_if 2 (;@8;)
-                        local.get $1
-                        local.set $2
-                        br 1 (;@9;)
-                      end
-                    end
-                    local.get $8
-                    local.get $10
-                    i32.sub
-                    local.get $4
-                    i32.and
-                    local.tee $3
-                    i32.const 2147483647
-                    i32.lt_u
-                    if ;; label = @9
-                      local.get $3
-                      call $45
-                      local.tee $1
-                      local.get $2
-                      i32.load
-                      local.get $5
-                      i32.load
-                      i32.add
-                      i32.eq
-                      if ;; label = @10
-                        local.get $1
-                        i32.const -1
-                        i32.ne
-                        br_if 7 (;@3;)
-                      else
-                        block ;; label = @11
-                          local.get $1
-                          local.set $2
-                          local.get $3
-                          local.set $1
-                          br 4 (;@7;)
-                        end
-                      end
-                    end
-                    br 2 (;@6;)
-                  end
-                  i32.const 0
-                  call $45
-                  local.tee $1
-                  i32.const -1
-                  i32.ne
-                  if ;; label = @8
-                    block ;; label = @9
-                      i32.const 4652
-                      i32.load
-                      local.tee $2
-                      i32.const -1
-                      i32.add
-                      local.tee $5
-                      local.get $1
-                      local.tee $3
-                      i32.add
-                      i32.const 0
-                      local.get $2
-                      i32.sub
-                      i32.and
-                      local.get $3
-                      i32.sub
-                      local.set $2
-                      local.get $5
-                      local.get $3
-                      i32.and
-                      if (result i32) ;; label = @10
-                        local.get $2
-                      else
-                        i32.const 0
-                      end
-                      local.get $6
-                      i32.add
-                      local.tee $3
-                      i32.const 4608
-                      i32.load
-                      local.tee $5
-                      i32.add
-                      local.set $4
-                      local.get $3
-                      local.get $0
-                      i32.gt_u
-                      local.get $3
-                      i32.const 2147483647
-                      i32.lt_u
-                      i32.and
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const 4616
-                          i32.load
-                          local.tee $2
-                          if ;; label = @12
-                            local.get $4
-                            local.get $5
-                            i32.le_u
-                            local.get $4
-                            local.get $2
-                            i32.gt_u
-                            i32.or
-                            br_if 6 (;@6;)
-                          end
-                          local.get $3
-                          call $45
-                          local.tee $2
-                          local.get $1
-                          i32.eq
-                          br_if 8 (;@3;)
-                          local.get $3
-                          local.set $1
-                          br 4 (;@7;)
-                        end
-                      end
-                    end
-                  end
-                  br 1 (;@6;)
-                end
-                i32.const 0
-                local.get $1
-                i32.sub
-                local.set $5
-                local.get $7
-                local.get $1
-                i32.gt_u
-                local.get $1
-                i32.const 2147483647
-                i32.lt_u
-                local.get $2
-                i32.const -1
-                i32.ne
-                i32.and
-                i32.and
-                if ;; label = @7
-                  local.get $13
-                  local.get $1
-                  i32.sub
-                  i32.const 4656
-                  i32.load
-                  local.tee $3
-                  i32.add
-                  i32.const 0
-                  local.get $3
-                  i32.sub
-                  i32.and
-                  local.tee $3
-                  i32.const 2147483647
-                  i32.lt_u
-                  if ;; label = @8
-                    local.get $3
-                    call $45
-                    i32.const -1
-                    i32.eq
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $5
-                        call $45
-                        drop
-                        br 4 (;@6;)
-                      end
-                    else
-                      local.get $3
-                      local.get $1
-                      i32.add
-                      local.set $3
-                    end
-                  else
-                    local.get $1
-                    local.set $3
-                  end
-                else
-                  local.get $1
-                  local.set $3
-                end
-                local.get $2
-                i32.const -1
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $2
-                    local.set $1
-                    br 5 (;@3;)
-                  end
-                end
-              end
-              i32.const 4620
-              i32.const 4620
-              i32.load
-              i32.const 4
-              i32.or
-              i32.store
-            end
-          end
-          local.get $6
-          i32.const 2147483647
-          i32.lt_u
-          if ;; label = @4
-            local.get $6
-            call $45
-            local.tee $1
-            i32.const 0
-            call $45
-            local.tee $3
-            i32.lt_u
-            local.get $1
-            i32.const -1
-            i32.ne
-            local.get $3
-            i32.const -1
-            i32.ne
-            i32.and
-            i32.and
-            if ;; label = @5
-              local.get $3
-              local.get $1
-              i32.sub
-              local.tee $3
-              local.get $0
-              i32.const 40
-              i32.add
-              i32.gt_u
-              br_if 2 (;@3;)
-            end
-          end
-          br 1 (;@2;)
-        end
-        i32.const 4608
-        i32.const 4608
-        i32.load
-        local.get $3
-        i32.add
-        local.tee $2
-        i32.store
-        local.get $2
-        i32.const 4612
-        i32.load
-        i32.gt_u
-        if ;; label = @3
-          i32.const 4612
-          local.get $2
-          i32.store
-        end
-        block $label$198 ;; label = @3
-          i32.const 4200
-          i32.load
-          local.tee $8
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 4624
-              local.set $2
-              block $label$200 ;; label = @6
-                block $label$201 ;; label = @7
-                  loop $label$202 ;; label = @8
-                    local.get $1
-                    local.get $2
-                    i32.load
-                    local.tee $4
-                    local.get $2
-                    i32.const 4
-                    i32.add
-                    local.tee $7
-                    i32.load
-                    local.tee $5
-                    i32.add
-                    i32.eq
-                    br_if 1 (;@7;)
-                    local.get $2
-                    i32.load offset=8
-                    local.tee $2
-                    br_if 0 (;@8;)
-                  end
-                  br 1 (;@6;)
-                end
-                local.get $2
-                i32.load offset=12
-                i32.const 8
-                i32.and
-                i32.eqz
-                if ;; label = @7
-                  local.get $8
-                  local.get $1
-                  i32.lt_u
-                  local.get $8
-                  local.get $4
-                  i32.ge_u
-                  i32.and
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $7
-                      local.get $5
-                      local.get $3
-                      i32.add
-                      i32.store
-                      i32.const 4188
-                      i32.load
-                      local.set $5
-                      i32.const 0
-                      local.get $8
-                      i32.const 8
-                      i32.add
-                      local.tee $2
-                      i32.sub
-                      i32.const 7
-                      i32.and
-                      local.set $1
-                      i32.const 4200
-                      local.get $8
-                      local.get $2
-                      i32.const 7
-                      i32.and
-                      if (result i32) ;; label = @10
-                        local.get $1
-                      else
-                        i32.const 0
-                        local.tee $1
-                      end
-                      i32.add
-                      local.tee $2
-                      i32.store
-                      i32.const 4188
-                      local.get $3
-                      local.get $1
-                      i32.sub
-                      local.get $5
-                      i32.add
-                      local.tee $1
-                      i32.store
-                      local.get $2
-                      local.get $1
-                      i32.const 1
-                      i32.or
-                      i32.store offset=4
-                      local.get $2
-                      local.get $1
-                      i32.add
-                      i32.const 40
-                      i32.store offset=4
-                      i32.const 4204
-                      i32.const 4664
-                      i32.load
-                      i32.store
-                      br 6 (;@3;)
-                    end
-                  end
-                end
-              end
-              local.get $1
-              i32.const 4192
-              i32.load
-              local.tee $2
-              i32.lt_u
-              if ;; label = @6
-                block ;; label = @7
-                  i32.const 4192
-                  local.get $1
-                  i32.store
-                  local.get $1
-                  local.set $2
-                end
-              end
-              local.get $1
-              local.get $3
-              i32.add
-              local.set $10
-              i32.const 4624
-              local.set $5
-              block $label$208 ;; label = @6
-                block $label$209 ;; label = @7
-                  loop $label$210 ;; label = @8
-                    local.get $5
-                    i32.load
-                    local.get $10
-                    i32.eq
-                    br_if 1 (;@7;)
-                    local.get $5
-                    i32.load offset=8
-                    local.tee $5
-                    br_if 0 (;@8;)
-                    i32.const 4624
-                    local.set $5
-                  end
-                  br 1 (;@6;)
-                end
-                local.get $5
-                i32.load offset=12
-                i32.const 8
-                i32.and
-                if ;; label = @7
-                  i32.const 4624
-                  local.set $5
-                else
-                  block ;; label = @8
-                    local.get $5
-                    local.get $1
-                    i32.store
-                    local.get $5
-                    i32.const 4
-                    i32.add
-                    local.tee $5
-                    local.get $5
-                    i32.load
-                    local.get $3
-                    i32.add
-                    i32.store
-                    i32.const 0
-                    local.get $1
-                    i32.const 8
-                    i32.add
-                    local.tee $4
-                    i32.sub
-                    i32.const 7
-                    i32.and
-                    local.set $7
-                    i32.const 0
-                    local.get $10
-                    i32.const 8
-                    i32.add
-                    local.tee $5
-                    i32.sub
-                    i32.const 7
-                    i32.and
-                    local.set $3
-                    local.get $1
-                    local.get $4
-                    i32.const 7
-                    i32.and
-                    if (result i32) ;; label = @9
-                      local.get $7
-                    else
-                      i32.const 0
-                    end
-                    i32.add
-                    local.tee $13
-                    local.get $0
-                    i32.add
-                    local.set $6
-                    local.get $10
-                    local.get $5
-                    i32.const 7
-                    i32.and
-                    if (result i32) ;; label = @9
-                      local.get $3
-                    else
-                      i32.const 0
-                    end
-                    i32.add
-                    local.tee $4
-                    local.get $13
-                    i32.sub
-                    local.get $0
-                    i32.sub
-                    local.set $7
-                    local.get $13
-                    local.get $0
-                    i32.const 3
-                    i32.or
-                    i32.store offset=4
-                    block $label$217 ;; label = @9
-                      local.get $4
-                      local.get $8
-                      i32.eq
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const 4188
-                          i32.const 4188
-                          i32.load
-                          local.get $7
-                          i32.add
-                          local.tee $0
-                          i32.store
-                          i32.const 4200
-                          local.get $6
-                          i32.store
-                          local.get $6
-                          local.get $0
-                          i32.const 1
-                          i32.or
-                          i32.store offset=4
-                        end
-                      else
-                        block ;; label = @11
-                          local.get $4
-                          i32.const 4196
-                          i32.load
-                          i32.eq
-                          if ;; label = @12
-                            block ;; label = @13
-                              i32.const 4184
-                              i32.const 4184
-                              i32.load
-                              local.get $7
-                              i32.add
-                              local.tee $0
-                              i32.store
-                              i32.const 4196
-                              local.get $6
-                              i32.store
-                              local.get $6
-                              local.get $0
-                              i32.const 1
-                              i32.or
-                              i32.store offset=4
-                              local.get $6
-                              local.get $0
-                              i32.add
-                              local.get $0
-                              i32.store
-                              br 4 (;@9;)
-                            end
-                          end
-                          local.get $4
-                          i32.load offset=4
-                          local.tee $0
-                          i32.const 3
-                          i32.and
-                          i32.const 1
-                          i32.eq
-                          if (result i32) ;; label = @12
-                            block (result i32) ;; label = @13
-                              local.get $0
-                              i32.const -8
-                              i32.and
-                              local.set $11
-                              local.get $0
-                              i32.const 3
-                              i32.shr_u
-                              local.set $1
-                              block $label$222 ;; label = @14
-                                local.get $0
-                                i32.const 256
-                                i32.lt_u
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $4
-                                    i32.load offset=12
-                                    local.set $5
-                                    block $label$224 ;; label = @17
-                                      local.get $4
-                                      i32.load offset=8
-                                      local.tee $3
-                                      local.get $1
-                                      i32.const 1
-                                      i32.shl
-                                      i32.const 2
-                                      i32.shl
-                                      i32.const 4216
-                                      i32.add
-                                      local.tee $0
-                                      i32.ne
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $3
-                                          local.get $2
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$8
-                                          end
-                                          local.get $3
-                                          i32.load offset=12
-                                          local.get $4
-                                          i32.eq
-                                          br_if 2 (;@17;)
-                                          call $fimport$8
-                                        end
-                                      end
-                                    end
-                                    local.get $5
-                                    local.get $3
-                                    i32.eq
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        i32.const 4176
-                                        i32.const 4176
-                                        i32.load
-                                        i32.const 1
-                                        local.get $1
-                                        i32.shl
-                                        i32.const -1
-                                        i32.xor
-                                        i32.and
-                                        i32.store
-                                        br 4 (;@14;)
-                                      end
-                                    end
-                                    block $label$228 ;; label = @17
-                                      local.get $5
-                                      local.get $0
-                                      i32.eq
-                                      if ;; label = @18
-                                        local.get $5
-                                        i32.const 8
-                                        i32.add
-                                        local.set $20
-                                      else
-                                        block ;; label = @19
-                                          local.get $5
-                                          local.get $2
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$8
-                                          end
-                                          local.get $5
-                                          i32.const 8
-                                          i32.add
-                                          local.tee $0
-                                          i32.load
-                                          local.get $4
-                                          i32.eq
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              local.get $0
-                                              local.set $20
-                                              br 4 (;@17;)
-                                            end
-                                          end
-                                          call $fimport$8
-                                        end
-                                      end
-                                    end
-                                    local.get $3
-                                    local.get $5
-                                    i32.store offset=12
-                                    local.get $20
-                                    local.get $3
-                                    i32.store
-                                  end
-                                else
-                                  block ;; label = @16
-                                    local.get $4
-                                    i32.load offset=24
-                                    local.set $8
-                                    block $label$234 ;; label = @17
-                                      local.get $4
-                                      i32.load offset=12
-                                      local.tee $0
-                                      local.get $4
-                                      i32.eq
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $4
-                                          i32.const 16
-                                          i32.add
-                                          local.tee $3
-                                          i32.const 4
-                                          i32.add
-                                          local.tee $1
-                                          i32.load
-                                          local.tee $0
-                                          i32.eqz
-                                          if ;; label = @20
-                                            local.get $3
-                                            i32.load
-                                            local.tee $0
-                                            if ;; label = @21
-                                              local.get $3
-                                              local.set $1
-                                            else
-                                              block ;; label = @22
-                                                i32.const 0
-                                                local.set $12
-                                                br 5 (;@17;)
-                                              end
-                                            end
-                                          end
-                                          loop $label$239 ;; label = @20
-                                            local.get $0
-                                            i32.const 20
-                                            i32.add
-                                            local.tee $5
-                                            i32.load
-                                            local.tee $3
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $3
-                                                local.set $0
-                                                local.get $5
-                                                local.set $1
-                                                br 2 (;@20;)
-                                              end
-                                            end
-                                            local.get $0
-                                            i32.const 16
-                                            i32.add
-                                            local.tee $5
-                                            i32.load
-                                            local.tee $3
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $3
-                                                local.set $0
-                                                local.get $5
-                                                local.set $1
-                                                br 2 (;@20;)
-                                              end
-                                            end
-                                          end
-                                          local.get $1
-                                          local.get $2
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$8
-                                          else
-                                            block ;; label = @21
-                                              local.get $1
-                                              i32.const 0
-                                              i32.store
-                                              local.get $0
-                                              local.set $12
-                                            end
-                                          end
-                                        end
-                                      else
-                                        block ;; label = @19
-                                          local.get $4
-                                          i32.load offset=8
-                                          local.tee $5
-                                          local.get $2
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$8
-                                          end
-                                          local.get $5
-                                          i32.const 12
-                                          i32.add
-                                          local.tee $3
-                                          i32.load
-                                          local.get $4
-                                          i32.ne
-                                          if ;; label = @20
-                                            call $fimport$8
-                                          end
-                                          local.get $0
-                                          i32.const 8
-                                          i32.add
-                                          local.tee $1
-                                          i32.load
-                                          local.get $4
-                                          i32.eq
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              local.get $3
-                                              local.get $0
-                                              i32.store
-                                              local.get $1
-                                              local.get $5
-                                              i32.store
-                                              local.get $0
-                                              local.set $12
-                                            end
-                                          else
-                                            call $fimport$8
-                                          end
-                                        end
-                                      end
-                                    end
-                                    local.get $8
-                                    i32.eqz
-                                    br_if 2 (;@14;)
-                                    block $label$249 ;; label = @17
-                                      local.get $4
-                                      local.get $4
-                                      i32.load offset=28
-                                      local.tee $1
-                                      i32.const 2
-                                      i32.shl
-                                      i32.const 4480
-                                      i32.add
-                                      local.tee $0
-                                      i32.load
-                                      i32.eq
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $0
-                                          local.get $12
-                                          i32.store
-                                          local.get $12
-                                          br_if 2 (;@17;)
-                                          i32.const 4180
-                                          i32.const 4180
-                                          i32.load
-                                          i32.const 1
-                                          local.get $1
-                                          i32.shl
-                                          i32.const -1
-                                          i32.xor
-                                          i32.and
-                                          i32.store
-                                          br 5 (;@14;)
-                                        end
-                                      else
-                                        block ;; label = @19
-                                          local.get $8
-                                          i32.const 4192
-                                          i32.load
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$8
-                                          end
-                                          local.get $8
-                                          i32.const 16
-                                          i32.add
-                                          local.tee $0
-                                          i32.load
-                                          local.get $4
-                                          i32.eq
-                                          if ;; label = @20
-                                            local.get $0
-                                            local.get $12
-                                            i32.store
-                                          else
-                                            local.get $8
-                                            local.get $12
-                                            i32.store offset=20
-                                          end
-                                          local.get $12
-                                          i32.eqz
-                                          br_if 5 (;@14;)
-                                        end
-                                      end
-                                    end
-                                    local.get $12
-                                    i32.const 4192
-                                    i32.load
-                                    local.tee $1
-                                    i32.lt_u
-                                    if ;; label = @17
-                                      call $fimport$8
-                                    end
-                                    local.get $12
-                                    local.get $8
-                                    i32.store offset=24
-                                    local.get $4
-                                    i32.const 16
-                                    i32.add
-                                    local.tee $0
-                                    i32.load
-                                    local.tee $3
-                                    if ;; label = @17
-                                      local.get $3
-                                      local.get $1
-                                      i32.lt_u
-                                      if ;; label = @18
-                                        call $fimport$8
-                                      else
-                                        block ;; label = @19
-                                          local.get $12
-                                          local.get $3
-                                          i32.store offset=16
-                                          local.get $3
-                                          local.get $12
-                                          i32.store offset=24
-                                        end
-                                      end
-                                    end
-                                    local.get $0
-                                    i32.load offset=4
-                                    local.tee $0
-                                    i32.eqz
-                                    br_if 2 (;@14;)
-                                    local.get $0
-                                    i32.const 4192
-                                    i32.load
-                                    i32.lt_u
-                                    if ;; label = @17
-                                      call $fimport$8
-                                    else
-                                      block ;; label = @18
-                                        local.get $12
-                                        local.get $0
-                                        i32.store offset=20
-                                        local.get $0
-                                        local.get $12
-                                        i32.store offset=24
-                                      end
-                                    end
-                                  end
-                                end
-                              end
-                              local.get $11
-                              local.get $7
-                              i32.add
-                              local.set $7
-                              local.get $4
-                              local.get $11
-                              i32.add
-                            end
-                          else
-                            local.get $4
-                          end
-                          local.tee $0
-                          i32.const 4
-                          i32.add
-                          local.tee $0
-                          local.get $0
-                          i32.load
-                          i32.const -2
-                          i32.and
-                          i32.store
-                          local.get $6
-                          local.get $7
-                          i32.const 1
-                          i32.or
-                          i32.store offset=4
-                          local.get $6
-                          local.get $7
-                          i32.add
-                          local.get $7
-                          i32.store
-                          local.get $7
-                          i32.const 3
-                          i32.shr_u
-                          local.set $0
-                          local.get $7
-                          i32.const 256
-                          i32.lt_u
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $0
-                              i32.const 1
-                              i32.shl
-                              i32.const 2
-                              i32.shl
-                              i32.const 4216
-                              i32.add
-                              local.set $3
-                              block $label$263 ;; label = @14
-                                i32.const 4176
-                                i32.load
-                                local.tee $1
-                                i32.const 1
-                                local.get $0
-                                i32.shl
-                                local.tee $0
-                                i32.and
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $3
-                                    i32.const 8
-                                    i32.add
-                                    local.tee $1
-                                    i32.load
-                                    local.tee $0
-                                    i32.const 4192
-                                    i32.load
-                                    i32.ge_u
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $1
-                                        local.set $21
-                                        local.get $0
-                                        local.set $9
-                                        br 4 (;@14;)
-                                      end
-                                    end
-                                    call $fimport$8
-                                  end
-                                else
-                                  block ;; label = @16
-                                    i32.const 4176
-                                    local.get $1
-                                    local.get $0
-                                    i32.or
-                                    i32.store
-                                    local.get $3
-                                    i32.const 8
-                                    i32.add
-                                    local.set $21
-                                    local.get $3
-                                    local.set $9
-                                  end
-                                end
-                              end
-                              local.get $21
-                              local.get $6
-                              i32.store
-                              local.get $9
-                              local.get $6
-                              i32.store offset=12
-                              local.get $6
-                              local.get $9
-                              i32.store offset=8
-                              local.get $6
-                              local.get $3
-                              i32.store offset=12
-                              br 4 (;@9;)
-                            end
-                          end
-                          block $label$267 (result i32) ;; label = @12
-                            local.get $7
-                            i32.const 8
-                            i32.shr_u
-                            local.tee $0
-                            if (result i32) ;; label = @13
-                              block (result i32) ;; label = @14
-                                i32.const 31
-                                local.get $7
-                                i32.const 16777215
-                                i32.gt_u
-                                br_if 2 (;@12;)
-                                drop
-                                local.get $7
-                                i32.const 14
-                                local.get $0
-                                local.get $0
-                                i32.const 1048320
-                                i32.add
-                                i32.const 16
-                                i32.shr_u
-                                i32.const 8
-                                i32.and
-                                local.tee $3
-                                i32.shl
-                                local.tee $1
-                                i32.const 520192
-                                i32.add
-                                i32.const 16
-                                i32.shr_u
-                                i32.const 4
-                                i32.and
-                                local.tee $0
-                                local.get $3
-                                i32.or
-                                local.get $1
-                                local.get $0
-                                i32.shl
-                                local.tee $1
-                                i32.const 245760
-                                i32.add
-                                i32.const 16
-                                i32.shr_u
-                                i32.const 2
-                                i32.and
-                                local.tee $0
-                                i32.or
-                                i32.sub
-                                local.get $1
-                                local.get $0
-                                i32.shl
-                                i32.const 15
-                                i32.shr_u
-                                i32.add
-                                local.tee $0
-                                i32.const 7
-                                i32.add
-                                i32.shr_u
-                                i32.const 1
-                                i32.and
-                                local.get $0
-                                i32.const 1
-                                i32.shl
-                                i32.or
-                              end
-                            else
-                              i32.const 0
-                            end
-                          end
-                          local.tee $2
-                          i32.const 2
-                          i32.shl
-                          i32.const 4480
-                          i32.add
-                          local.set $3
-                          local.get $6
-                          local.get $2
-                          i32.store offset=28
-                          local.get $6
-                          i32.const 16
-                          i32.add
-                          local.tee $0
-                          i32.const 0
-                          i32.store offset=4
-                          local.get $0
-                          i32.const 0
-                          i32.store
-                          i32.const 4180
-                          i32.load
-                          local.tee $1
-                          i32.const 1
-                          local.get $2
-                          i32.shl
-                          local.tee $0
-                          i32.and
-                          i32.eqz
-                          if ;; label = @12
-                            block ;; label = @13
-                              i32.const 4180
-                              local.get $1
-                              local.get $0
-                              i32.or
-                              i32.store
-                              local.get $3
-                              local.get $6
-                              i32.store
-                              local.get $6
-                              local.get $3
-                              i32.store offset=24
-                              local.get $6
-                              local.get $6
-                              i32.store offset=12
-                              local.get $6
-                              local.get $6
-                              i32.store offset=8
-                              br 4 (;@9;)
-                            end
-                          end
-                          local.get $3
-                          i32.load
-                          local.set $0
-                          i32.const 25
-                          local.get $2
-                          i32.const 1
-                          i32.shr_u
-                          i32.sub
-                          local.set $1
-                          local.get $7
-                          local.get $2
-                          i32.const 31
-                          i32.eq
-                          if (result i32) ;; label = @12
-                            i32.const 0
-                          else
-                            local.get $1
-                          end
-                          i32.shl
-                          local.set $2
-                          block $label$273 ;; label = @12
-                            block $label$274 ;; label = @13
-                              block $label$275 ;; label = @14
-                                loop $label$276 ;; label = @15
-                                  local.get $0
-                                  i32.load offset=4
-                                  i32.const -8
-                                  i32.and
-                                  local.get $7
-                                  i32.eq
-                                  br_if 2 (;@13;)
-                                  local.get $2
-                                  i32.const 1
-                                  i32.shl
-                                  local.set $3
-                                  local.get $0
-                                  i32.const 16
-                                  i32.add
-                                  local.get $2
-                                  i32.const 31
-                                  i32.shr_u
-                                  i32.const 2
-                                  i32.shl
-                                  i32.add
-                                  local.tee $2
-                                  i32.load
-                                  local.tee $1
-                                  i32.eqz
-                                  br_if 1 (;@14;)
-                                  local.get $3
-                                  local.set $2
-                                  local.get $1
-                                  local.set $0
-                                  br 0 (;@15;)
-                                end
-                              end
-                              local.get $2
-                              i32.const 4192
-                              i32.load
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$8
-                              else
-                                block ;; label = @15
-                                  local.get $2
-                                  local.get $6
-                                  i32.store
-                                  local.get $6
-                                  local.get $0
-                                  i32.store offset=24
-                                  local.get $6
-                                  local.get $6
-                                  i32.store offset=12
-                                  local.get $6
-                                  local.get $6
-                                  i32.store offset=8
-                                  br 6 (;@9;)
-                                end
-                              end
-                              br 1 (;@12;)
-                            end
-                            local.get $0
-                            i32.const 8
-                            i32.add
-                            local.tee $3
-                            i32.load
-                            local.tee $2
-                            i32.const 4192
-                            i32.load
-                            local.tee $1
-                            i32.ge_u
-                            local.get $0
-                            local.get $1
-                            i32.ge_u
-                            i32.and
-                            if ;; label = @13
-                              block ;; label = @14
-                                local.get $2
-                                local.get $6
-                                i32.store offset=12
-                                local.get $3
-                                local.get $6
-                                i32.store
-                                local.get $6
-                                local.get $2
-                                i32.store offset=8
-                                local.get $6
-                                local.get $0
-                                i32.store offset=12
-                                local.get $6
-                                i32.const 0
-                                i32.store offset=24
-                              end
-                            else
-                              call $fimport$8
-                            end
-                          end
-                        end
-                      end
-                    end
-                    local.get $14
-                    global.set $global$1
-                    local.get $13
-                    i32.const 8
-                    i32.add
-                    return
-                  end
-                end
-              end
-              loop $label$281 ;; label = @6
-                block $label$282 ;; label = @7
-                  local.get $5
-                  i32.load
-                  local.tee $2
-                  local.get $8
-                  i32.le_u
-                  if ;; label = @8
-                    local.get $2
-                    local.get $5
-                    i32.load offset=4
-                    i32.add
-                    local.tee $13
-                    local.get $8
-                    i32.gt_u
-                    br_if 1 (;@7;)
-                  end
-                  local.get $5
-                  i32.load offset=8
-                  local.set $5
-                  br 1 (;@6;)
-                end
-              end
-              i32.const 0
-              local.get $13
-              i32.const -47
-              i32.add
-              local.tee $7
-              i32.const 8
-              i32.add
-              local.tee $5
-              i32.sub
-              i32.const 7
-              i32.and
-              local.set $2
-              local.get $7
-              local.get $5
-              i32.const 7
-              i32.and
-              if (result i32) ;; label = @6
-                local.get $2
-              else
-                i32.const 0
-              end
-              i32.add
-              local.tee $2
-              local.get $8
-              i32.const 16
-              i32.add
-              local.tee $12
-              i32.lt_u
-              if (result i32) ;; label = @6
-                local.get $8
-              else
-                local.get $2
-              end
-              local.tee $7
-              i32.const 8
-              i32.add
-              local.set $10
-              local.get $7
-              i32.const 24
-              i32.add
-              local.set $5
-              local.get $3
-              i32.const -40
-              i32.add
-              local.set $9
-              i32.const 0
-              local.get $1
-              i32.const 8
-              i32.add
-              local.tee $4
-              i32.sub
-              i32.const 7
-              i32.and
-              local.set $2
-              i32.const 4200
-              local.get $1
-              local.get $4
-              i32.const 7
-              i32.and
-              if (result i32) ;; label = @6
-                local.get $2
-              else
-                i32.const 0
-                local.tee $2
-              end
-              i32.add
-              local.tee $4
-              i32.store
-              i32.const 4188
-              local.get $9
-              local.get $2
-              i32.sub
-              local.tee $2
-              i32.store
-              local.get $4
-              local.get $2
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $4
-              local.get $2
-              i32.add
-              i32.const 40
-              i32.store offset=4
-              i32.const 4204
-              i32.const 4664
-              i32.load
-              i32.store
-              local.get $7
-              i32.const 4
-              i32.add
-              local.tee $2
-              i32.const 27
-              i32.store
-              local.get $10
-              i32.const 4624
-              i64.load align=4
-              i64.store align=4
-              local.get $10
-              i32.const 4632
-              i64.load align=4
-              i64.store offset=8 align=4
-              i32.const 4624
-              local.get $1
-              i32.store
-              i32.const 4628
-              local.get $3
-              i32.store
-              i32.const 4636
-              i32.const 0
-              i32.store
-              i32.const 4632
-              local.get $10
-              i32.store
-              local.get $5
-              local.set $1
-              loop $label$290 ;; label = @6
-                local.get $1
-                i32.const 4
-                i32.add
-                local.tee $1
-                i32.const 7
-                i32.store
-                local.get $1
-                i32.const 4
-                i32.add
-                local.get $13
-                i32.lt_u
-                br_if 0 (;@6;)
-              end
-              local.get $7
-              local.get $8
-              i32.ne
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $2
-                  local.get $2
-                  i32.load
-                  i32.const -2
-                  i32.and
-                  i32.store
-                  local.get $8
-                  local.get $7
-                  local.get $8
-                  i32.sub
-                  local.tee $4
-                  i32.const 1
-                  i32.or
-                  i32.store offset=4
-                  local.get $7
-                  local.get $4
-                  i32.store
-                  local.get $4
-                  i32.const 3
-                  i32.shr_u
-                  local.set $1
-                  local.get $4
-                  i32.const 256
-                  i32.lt_u
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $1
-                      i32.const 1
-                      i32.shl
-                      i32.const 2
-                      i32.shl
-                      i32.const 4216
-                      i32.add
-                      local.set $2
-                      i32.const 4176
-                      i32.load
-                      local.tee $3
-                      i32.const 1
-                      local.get $1
-                      i32.shl
-                      local.tee $1
-                      i32.and
-                      if ;; label = @10
-                        local.get $2
-                        i32.const 8
-                        i32.add
-                        local.tee $3
-                        i32.load
-                        local.tee $1
-                        i32.const 4192
-                        i32.load
-                        i32.lt_u
-                        if ;; label = @11
-                          call $fimport$8
-                        else
-                          block ;; label = @12
-                            local.get $3
-                            local.set $15
-                            local.get $1
-                            local.set $11
-                          end
-                        end
-                      else
-                        block ;; label = @11
-                          i32.const 4176
-                          local.get $3
-                          local.get $1
-                          i32.or
-                          i32.store
-                          local.get $2
-                          i32.const 8
-                          i32.add
-                          local.set $15
-                          local.get $2
-                          local.set $11
-                        end
-                      end
-                      local.get $15
-                      local.get $8
-                      i32.store
-                      local.get $11
-                      local.get $8
-                      i32.store offset=12
-                      local.get $8
-                      local.get $11
-                      i32.store offset=8
-                      local.get $8
-                      local.get $2
-                      i32.store offset=12
-                      br 6 (;@3;)
-                    end
-                  end
-                  local.get $4
-                  i32.const 8
-                  i32.shr_u
-                  local.tee $1
-                  if (result i32) ;; label = @8
-                    local.get $4
-                    i32.const 16777215
-                    i32.gt_u
-                    if (result i32) ;; label = @9
-                      i32.const 31
-                    else
-                      local.get $4
-                      i32.const 14
-                      local.get $1
-                      local.get $1
-                      i32.const 1048320
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 8
-                      i32.and
-                      local.tee $2
-                      i32.shl
-                      local.tee $3
-                      i32.const 520192
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 4
-                      i32.and
-                      local.tee $1
-                      local.get $2
-                      i32.or
-                      local.get $3
-                      local.get $1
-                      i32.shl
-                      local.tee $3
-                      i32.const 245760
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 2
-                      i32.and
-                      local.tee $1
-                      i32.or
-                      i32.sub
-                      local.get $3
-                      local.get $1
-                      i32.shl
-                      i32.const 15
-                      i32.shr_u
-                      i32.add
-                      local.tee $1
-                      i32.const 7
-                      i32.add
-                      i32.shr_u
-                      i32.const 1
-                      i32.and
-                      local.get $1
-                      i32.const 1
-                      i32.shl
-                      i32.or
-                    end
-                  else
-                    i32.const 0
-                  end
-                  local.tee $5
-                  i32.const 2
-                  i32.shl
-                  i32.const 4480
-                  i32.add
-                  local.set $2
-                  local.get $8
-                  local.get $5
-                  i32.store offset=28
-                  local.get $8
-                  i32.const 0
-                  i32.store offset=20
-                  local.get $12
-                  i32.const 0
-                  i32.store
-                  i32.const 4180
-                  i32.load
-                  local.tee $3
-                  i32.const 1
-                  local.get $5
-                  i32.shl
-                  local.tee $1
-                  i32.and
-                  i32.eqz
-                  if ;; label = @8
-                    block ;; label = @9
-                      i32.const 4180
-                      local.get $3
-                      local.get $1
-                      i32.or
-                      i32.store
-                      local.get $2
-                      local.get $8
-                      i32.store
-                      local.get $8
-                      local.get $2
-                      i32.store offset=24
-                      local.get $8
-                      local.get $8
-                      i32.store offset=12
-                      local.get $8
-                      local.get $8
-                      i32.store offset=8
-                      br 6 (;@3;)
-                    end
-                  end
-                  local.get $2
-                  i32.load
-                  local.set $1
-                  i32.const 25
-                  local.get $5
-                  i32.const 1
-                  i32.shr_u
-                  i32.sub
-                  local.set $3
-                  local.get $4
-                  local.get $5
-                  i32.const 31
-                  i32.eq
-                  if (result i32) ;; label = @8
-                    i32.const 0
-                  else
-                    local.get $3
-                  end
-                  i32.shl
-                  local.set $5
-                  block $label$304 ;; label = @8
-                    block $label$305 ;; label = @9
-                      block $label$306 ;; label = @10
-                        loop $label$307 ;; label = @11
-                          local.get $1
-                          i32.load offset=4
-                          i32.const -8
-                          i32.and
-                          local.get $4
-                          i32.eq
-                          br_if 2 (;@9;)
-                          local.get $5
-                          i32.const 1
-                          i32.shl
-                          local.set $2
-                          local.get $1
-                          i32.const 16
-                          i32.add
-                          local.get $5
-                          i32.const 31
-                          i32.shr_u
-                          i32.const 2
-                          i32.shl
-                          i32.add
-                          local.tee $5
-                          i32.load
-                          local.tee $3
-                          i32.eqz
-                          br_if 1 (;@10;)
-                          local.get $2
-                          local.set $5
-                          local.get $3
-                          local.set $1
-                          br 0 (;@11;)
-                        end
-                      end
-                      local.get $5
-                      i32.const 4192
-                      i32.load
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$8
-                      else
-                        block ;; label = @11
-                          local.get $5
-                          local.get $8
-                          i32.store
-                          local.get $8
-                          local.get $1
-                          i32.store offset=24
-                          local.get $8
-                          local.get $8
-                          i32.store offset=12
-                          local.get $8
-                          local.get $8
-                          i32.store offset=8
-                          br 8 (;@3;)
-                        end
-                      end
-                      br 1 (;@8;)
-                    end
-                    local.get $1
-                    i32.const 8
-                    i32.add
-                    local.tee $2
-                    i32.load
-                    local.tee $5
-                    i32.const 4192
-                    i32.load
-                    local.tee $3
-                    i32.ge_u
-                    local.get $1
-                    local.get $3
-                    i32.ge_u
-                    i32.and
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $5
-                        local.get $8
-                        i32.store offset=12
-                        local.get $2
-                        local.get $8
-                        i32.store
-                        local.get $8
-                        local.get $5
-                        i32.store offset=8
-                        local.get $8
-                        local.get $1
-                        i32.store offset=12
-                        local.get $8
-                        i32.const 0
-                        i32.store offset=24
-                      end
-                    else
-                      call $fimport$8
-                    end
-                  end
-                end
-              end
-            end
-          else
-            block ;; label = @5
-              i32.const 4192
-              i32.load
-              local.tee $2
-              i32.eqz
-              local.get $1
-              local.get $2
-              i32.lt_u
-              i32.or
-              if ;; label = @6
-                i32.const 4192
-                local.get $1
-                i32.store
-              end
-              i32.const 4624
-              local.get $1
-              i32.store
-              i32.const 4628
-              local.get $3
-              i32.store
-              i32.const 4636
-              i32.const 0
-              i32.store
-              i32.const 4212
-              i32.const 4648
-              i32.load
-              i32.store
-              i32.const 4208
-              i32.const -1
-              i32.store
-              i32.const 0
-              local.set $2
-              loop $label$314 ;; label = @6
-                local.get $2
-                i32.const 1
-                i32.shl
-                i32.const 2
-                i32.shl
-                i32.const 4216
-                i32.add
-                local.tee $5
-                local.get $5
-                i32.store offset=12
-                local.get $5
-                local.get $5
-                i32.store offset=8
-                local.get $2
-                i32.const 1
-                i32.add
-                local.tee $2
-                i32.const 32
-                i32.ne
-                br_if 0 (;@6;)
-              end
-              local.get $3
-              i32.const -40
-              i32.add
-              local.set $5
-              i32.const 0
-              local.get $1
-              i32.const 8
-              i32.add
-              local.tee $2
-              i32.sub
-              i32.const 7
-              i32.and
-              local.set $3
-              i32.const 4200
-              local.get $1
-              local.get $2
-              i32.const 7
-              i32.and
-              if (result i32) ;; label = @6
-                local.get $3
-              else
-                i32.const 0
-              end
-              local.tee $1
-              i32.add
-              local.tee $3
-              i32.store
-              i32.const 4188
-              local.get $5
-              local.get $1
-              i32.sub
-              local.tee $1
-              i32.store
-              local.get $3
-              local.get $1
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $3
-              local.get $1
-              i32.add
-              i32.const 40
-              i32.store offset=4
-              i32.const 4204
-              i32.const 4664
-              i32.load
-              i32.store
-            end
-          end
-        end
-        i32.const 4188
-        i32.load
-        local.tee $1
-        local.get $0
-        i32.gt_u
-        if ;; label = @3
-          block ;; label = @4
-            i32.const 4188
-            local.get $1
-            local.get $0
-            i32.sub
-            local.tee $3
-            i32.store
-            i32.const 4200
-            i32.const 4200
-            i32.load
-            local.tee $2
-            local.get $0
-            i32.add
-            local.tee $1
-            i32.store
-            local.get $1
-            local.get $3
-            i32.const 1
-            i32.or
-            i32.store offset=4
-            local.get $2
-            local.get $0
-            i32.const 3
-            i32.or
-            i32.store offset=4
-            local.get $14
-            global.set $global$1
-            local.get $2
-            i32.const 8
-            i32.add
-            return
-          end
-        end
-      end
-      call $12
-      i32.const 12
-      i32.store
-      local.get $14
-      global.set $global$1
-      i32.const 0
-    end
+ )
+ (func $42 (; 55 ;) (type $3) (param $0 i32)
+  (call $41
+   (local.get $0)
   )
-  (func $38 (;51;) (type $3) (param $0 i32)
-    (local $1 i32) (local $2 i32) (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32) (local $15 i32)
-    block $label$1 ;; label = @1
-      local.get $0
-      i32.eqz
-      if ;; label = @2
-        return
-      end
-      local.get $0
-      i32.const -8
-      i32.add
-      local.tee $1
-      i32.const 4192
-      i32.load
-      local.tee $11
-      i32.lt_u
-      if ;; label = @2
-        call $fimport$8
-      end
-      local.get $0
-      i32.const -4
-      i32.add
-      i32.load
-      local.tee $0
-      i32.const 3
-      i32.and
-      local.tee $8
-      i32.const 1
-      i32.eq
-      if ;; label = @2
-        call $fimport$8
-      end
-      local.get $1
-      local.get $0
-      i32.const -8
-      i32.and
-      local.tee $4
-      i32.add
-      local.set $6
-      block $label$5 ;; label = @2
-        local.get $0
-        i32.const 1
-        i32.and
-        if ;; label = @3
-          block ;; label = @4
-            local.get $1
-            local.set $3
-            local.get $4
-            local.set $2
-          end
-        else
-          block ;; label = @4
-            local.get $8
-            i32.eqz
-            if ;; label = @5
-              return
-            end
-            local.get $1
-            i32.const 0
-            local.get $1
-            i32.load
-            local.tee $8
-            i32.sub
-            i32.add
-            local.tee $0
-            local.get $11
-            i32.lt_u
-            if ;; label = @5
-              call $fimport$8
-            end
-            local.get $8
-            local.get $4
-            i32.add
-            local.set $1
-            local.get $0
-            i32.const 4196
-            i32.load
-            i32.eq
-            if ;; label = @5
-              block ;; label = @6
-                local.get $6
-                i32.const 4
-                i32.add
-                local.tee $2
-                i32.load
-                local.tee $3
-                i32.const 3
-                i32.and
-                i32.const 3
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $0
-                    local.set $3
-                    local.get $1
-                    local.set $2
-                    br 6 (;@2;)
-                  end
-                end
-                i32.const 4184
-                local.get $1
-                i32.store
-                local.get $2
-                local.get $3
-                i32.const -2
-                i32.and
-                i32.store
-                local.get $0
-                local.get $1
-                i32.const 1
-                i32.or
-                i32.store offset=4
-                local.get $0
-                local.get $1
-                i32.add
-                local.get $1
-                i32.store
-                return
-              end
-            end
-            local.get $8
-            i32.const 3
-            i32.shr_u
-            local.set $10
-            local.get $8
-            i32.const 256
-            i32.lt_u
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                i32.load offset=12
-                local.set $3
-                local.get $0
-                i32.load offset=8
-                local.tee $4
-                local.get $10
-                i32.const 1
-                i32.shl
-                i32.const 2
-                i32.shl
-                i32.const 4216
-                i32.add
-                local.tee $2
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $4
-                    local.get $11
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$8
-                    end
-                    local.get $4
-                    i32.load offset=12
-                    local.get $0
-                    i32.ne
-                    if ;; label = @9
-                      call $fimport$8
-                    end
-                  end
-                end
-                local.get $3
-                local.get $4
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const 4176
-                    i32.const 4176
-                    i32.load
-                    i32.const 1
-                    local.get $10
-                    i32.shl
-                    i32.const -1
-                    i32.xor
-                    i32.and
-                    i32.store
-                    local.get $0
-                    local.set $3
-                    local.get $1
-                    local.set $2
-                    br 6 (;@2;)
-                  end
-                end
-                local.get $3
-                local.get $2
-                i32.eq
-                if ;; label = @7
-                  local.get $3
-                  i32.const 8
-                  i32.add
-                  local.set $5
-                else
-                  block ;; label = @8
-                    local.get $3
-                    local.get $11
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$8
-                    end
-                    local.get $3
-                    i32.const 8
-                    i32.add
-                    local.tee $2
-                    i32.load
-                    local.get $0
-                    i32.eq
-                    if ;; label = @9
-                      local.get $2
-                      local.set $5
-                    else
-                      call $fimport$8
-                    end
-                  end
-                end
-                local.get $4
-                local.get $3
-                i32.store offset=12
-                local.get $5
-                local.get $4
-                i32.store
-                local.get $0
-                local.set $3
-                local.get $1
-                local.set $2
-                br 4 (;@2;)
-              end
-            end
-            local.get $0
-            i32.load offset=24
-            local.set $12
-            block $label$22 ;; label = @5
-              local.get $0
-              i32.load offset=12
-              local.tee $4
-              local.get $0
-              i32.eq
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $0
-                  i32.const 16
-                  i32.add
-                  local.tee $5
-                  i32.const 4
-                  i32.add
-                  local.tee $8
-                  i32.load
-                  local.tee $4
-                  if ;; label = @8
-                    local.get $8
-                    local.set $5
-                  else
-                    local.get $5
-                    i32.load
-                    local.tee $4
-                    i32.eqz
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const 0
-                        local.set $7
-                        br 5 (;@5;)
-                      end
-                    end
-                  end
-                  loop $label$27 ;; label = @8
-                    local.get $4
-                    i32.const 20
-                    i32.add
-                    local.tee $8
-                    i32.load
-                    local.tee $10
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $10
-                        local.set $4
-                        local.get $8
-                        local.set $5
-                        br 2 (;@8;)
-                      end
-                    end
-                    local.get $4
-                    i32.const 16
-                    i32.add
-                    local.tee $8
-                    i32.load
-                    local.tee $10
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $10
-                        local.set $4
-                        local.get $8
-                        local.set $5
-                        br 2 (;@8;)
-                      end
-                    end
-                  end
-                  local.get $5
-                  local.get $11
-                  i32.lt_u
-                  if ;; label = @8
-                    call $fimport$8
-                  else
-                    block ;; label = @9
-                      local.get $5
-                      i32.const 0
-                      i32.store
-                      local.get $4
-                      local.set $7
-                    end
-                  end
-                end
-              else
-                block ;; label = @7
-                  local.get $0
-                  i32.load offset=8
-                  local.tee $5
-                  local.get $11
-                  i32.lt_u
-                  if ;; label = @8
-                    call $fimport$8
-                  end
-                  local.get $5
-                  i32.const 12
-                  i32.add
-                  local.tee $8
-                  i32.load
-                  local.get $0
-                  i32.ne
-                  if ;; label = @8
-                    call $fimport$8
-                  end
-                  local.get $4
-                  i32.const 8
-                  i32.add
-                  local.tee $10
-                  i32.load
-                  local.get $0
-                  i32.eq
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $8
-                      local.get $4
-                      i32.store
-                      local.get $10
-                      local.get $5
-                      i32.store
-                      local.get $4
-                      local.set $7
-                    end
-                  else
-                    call $fimport$8
-                  end
-                end
-              end
-            end
-            local.get $12
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                local.get $0
-                i32.load offset=28
-                local.tee $4
-                i32.const 2
-                i32.shl
-                i32.const 4480
-                i32.add
-                local.tee $5
-                i32.load
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $5
-                    local.get $7
-                    i32.store
-                    local.get $7
-                    i32.eqz
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const 4180
-                        i32.const 4180
-                        i32.load
-                        i32.const 1
-                        local.get $4
-                        i32.shl
-                        i32.const -1
-                        i32.xor
-                        i32.and
-                        i32.store
-                        local.get $0
-                        local.set $3
-                        local.get $1
-                        local.set $2
-                        br 8 (;@2;)
-                      end
-                    end
-                  end
-                else
-                  block ;; label = @8
-                    local.get $12
-                    i32.const 4192
-                    i32.load
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$8
-                    end
-                    local.get $12
-                    i32.const 16
-                    i32.add
-                    local.tee $4
-                    i32.load
-                    local.get $0
-                    i32.eq
-                    if ;; label = @9
-                      local.get $4
-                      local.get $7
-                      i32.store
-                    else
-                      local.get $12
-                      local.get $7
-                      i32.store offset=20
-                    end
-                    local.get $7
-                    i32.eqz
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $0
-                        local.set $3
-                        local.get $1
-                        local.set $2
-                        br 8 (;@2;)
-                      end
-                    end
-                  end
-                end
-                local.get $7
-                i32.const 4192
-                i32.load
-                local.tee $5
-                i32.lt_u
-                if ;; label = @7
-                  call $fimport$8
-                end
-                local.get $7
-                local.get $12
-                i32.store offset=24
-                local.get $0
-                i32.const 16
-                i32.add
-                local.tee $8
-                i32.load
-                local.tee $4
-                if ;; label = @7
-                  local.get $4
-                  local.get $5
-                  i32.lt_u
-                  if ;; label = @8
-                    call $fimport$8
-                  else
-                    block ;; label = @9
-                      local.get $7
-                      local.get $4
-                      i32.store offset=16
-                      local.get $4
-                      local.get $7
-                      i32.store offset=24
-                    end
-                  end
-                end
-                local.get $8
-                i32.load offset=4
-                local.tee $4
-                if ;; label = @7
-                  local.get $4
-                  i32.const 4192
-                  i32.load
-                  i32.lt_u
-                  if ;; label = @8
-                    call $fimport$8
-                  else
-                    block ;; label = @9
-                      local.get $7
-                      local.get $4
-                      i32.store offset=20
-                      local.get $4
-                      local.get $7
-                      i32.store offset=24
-                      local.get $0
-                      local.set $3
-                      local.get $1
-                      local.set $2
-                    end
-                  end
-                else
-                  block ;; label = @8
-                    local.get $0
-                    local.set $3
-                    local.get $1
-                    local.set $2
-                  end
-                end
-              end
-            else
-              block ;; label = @6
-                local.get $0
-                local.set $3
-                local.get $1
-                local.set $2
-              end
-            end
-          end
-        end
-      end
-      local.get $3
-      local.get $6
-      i32.ge_u
-      if ;; label = @2
-        call $fimport$8
-      end
-      local.get $6
-      i32.const 4
-      i32.add
-      local.tee $1
-      i32.load
-      local.tee $0
-      i32.const 1
-      i32.and
-      i32.eqz
-      if ;; label = @2
-        call $fimport$8
-      end
-      local.get $0
-      i32.const 2
-      i32.and
-      if ;; label = @2
-        block ;; label = @3
-          local.get $1
-          local.get $0
-          i32.const -2
-          i32.and
-          i32.store
-          local.get $3
-          local.get $2
-          i32.const 1
-          i32.or
-          i32.store offset=4
-          local.get $3
-          local.get $2
-          i32.add
-          local.get $2
-          i32.store
-        end
-      else
-        block ;; label = @3
-          local.get $6
-          i32.const 4200
-          i32.load
-          i32.eq
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 4188
-              i32.const 4188
-              i32.load
-              local.get $2
-              i32.add
-              local.tee $0
-              i32.store
-              i32.const 4200
-              local.get $3
-              i32.store
-              local.get $3
-              local.get $0
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $3
-              i32.const 4196
-              i32.load
-              i32.ne
-              if ;; label = @6
-                return
-              end
-              i32.const 4196
-              i32.const 0
-              i32.store
-              i32.const 4184
-              i32.const 0
-              i32.store
-              return
-            end
-          end
-          local.get $6
-          i32.const 4196
-          i32.load
-          i32.eq
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 4184
-              i32.const 4184
-              i32.load
-              local.get $2
-              i32.add
-              local.tee $0
-              i32.store
-              i32.const 4196
-              local.get $3
-              i32.store
-              local.get $3
-              local.get $0
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $3
-              local.get $0
-              i32.add
-              local.get $0
-              i32.store
-              return
-            end
-          end
-          local.get $0
-          i32.const -8
-          i32.and
-          local.get $2
-          i32.add
-          local.set $5
-          local.get $0
-          i32.const 3
-          i32.shr_u
-          local.set $4
-          block $label$61 ;; label = @4
-            local.get $0
-            i32.const 256
-            i32.lt_u
-            if ;; label = @5
-              block ;; label = @6
-                local.get $6
-                i32.load offset=12
-                local.set $2
-                local.get $6
-                i32.load offset=8
-                local.tee $1
-                local.get $4
-                i32.const 1
-                i32.shl
-                i32.const 2
-                i32.shl
-                i32.const 4216
-                i32.add
-                local.tee $0
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $1
-                    i32.const 4192
-                    i32.load
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$8
-                    end
-                    local.get $1
-                    i32.load offset=12
-                    local.get $6
-                    i32.ne
-                    if ;; label = @9
-                      call $fimport$8
-                    end
-                  end
-                end
-                local.get $2
-                local.get $1
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const 4176
-                    i32.const 4176
-                    i32.load
-                    i32.const 1
-                    local.get $4
-                    i32.shl
-                    i32.const -1
-                    i32.xor
-                    i32.and
-                    i32.store
-                    br 4 (;@4;)
-                  end
-                end
-                local.get $2
-                local.get $0
-                i32.eq
-                if ;; label = @7
-                  local.get $2
-                  i32.const 8
-                  i32.add
-                  local.set $14
-                else
-                  block ;; label = @8
-                    local.get $2
-                    i32.const 4192
-                    i32.load
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$8
-                    end
-                    local.get $2
-                    i32.const 8
-                    i32.add
-                    local.tee $0
-                    i32.load
-                    local.get $6
-                    i32.eq
-                    if ;; label = @9
-                      local.get $0
-                      local.set $14
-                    else
-                      call $fimport$8
-                    end
-                  end
-                end
-                local.get $1
-                local.get $2
-                i32.store offset=12
-                local.get $14
-                local.get $1
-                i32.store
-              end
-            else
-              block ;; label = @6
-                local.get $6
-                i32.load offset=24
-                local.set $7
-                block $label$73 ;; label = @7
-                  local.get $6
-                  i32.load offset=12
-                  local.tee $0
-                  local.get $6
-                  i32.eq
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $6
-                      i32.const 16
-                      i32.add
-                      local.tee $2
-                      i32.const 4
-                      i32.add
-                      local.tee $1
-                      i32.load
-                      local.tee $0
-                      if ;; label = @10
-                        local.get $1
-                        local.set $2
-                      else
-                        local.get $2
-                        i32.load
-                        local.tee $0
-                        i32.eqz
-                        if ;; label = @11
-                          block ;; label = @12
-                            i32.const 0
-                            local.set $9
-                            br 5 (;@7;)
-                          end
-                        end
-                      end
-                      loop $label$78 ;; label = @10
-                        local.get $0
-                        i32.const 20
-                        i32.add
-                        local.tee $1
-                        i32.load
-                        local.tee $4
-                        if ;; label = @11
-                          block ;; label = @12
-                            local.get $4
-                            local.set $0
-                            local.get $1
-                            local.set $2
-                            br 2 (;@10;)
-                          end
-                        end
-                        local.get $0
-                        i32.const 16
-                        i32.add
-                        local.tee $1
-                        i32.load
-                        local.tee $4
-                        if ;; label = @11
-                          block ;; label = @12
-                            local.get $4
-                            local.set $0
-                            local.get $1
-                            local.set $2
-                            br 2 (;@10;)
-                          end
-                        end
-                      end
-                      local.get $2
-                      i32.const 4192
-                      i32.load
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$8
-                      else
-                        block ;; label = @11
-                          local.get $2
-                          i32.const 0
-                          i32.store
-                          local.get $0
-                          local.set $9
-                        end
-                      end
-                    end
-                  else
-                    block ;; label = @9
-                      local.get $6
-                      i32.load offset=8
-                      local.tee $2
-                      i32.const 4192
-                      i32.load
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$8
-                      end
-                      local.get $2
-                      i32.const 12
-                      i32.add
-                      local.tee $1
-                      i32.load
-                      local.get $6
-                      i32.ne
-                      if ;; label = @10
-                        call $fimport$8
-                      end
-                      local.get $0
-                      i32.const 8
-                      i32.add
-                      local.tee $4
-                      i32.load
-                      local.get $6
-                      i32.eq
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $1
-                          local.get $0
-                          i32.store
-                          local.get $4
-                          local.get $2
-                          i32.store
-                          local.get $0
-                          local.set $9
-                        end
-                      else
-                        call $fimport$8
-                      end
-                    end
-                  end
-                end
-                local.get $7
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $6
-                    local.get $6
-                    i32.load offset=28
-                    local.tee $0
-                    i32.const 2
-                    i32.shl
-                    i32.const 4480
-                    i32.add
-                    local.tee $2
-                    i32.load
-                    i32.eq
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $2
-                        local.get $9
-                        i32.store
-                        local.get $9
-                        i32.eqz
-                        if ;; label = @11
-                          block ;; label = @12
-                            i32.const 4180
-                            i32.const 4180
-                            i32.load
-                            i32.const 1
-                            local.get $0
-                            i32.shl
-                            i32.const -1
-                            i32.xor
-                            i32.and
-                            i32.store
-                            br 8 (;@4;)
-                          end
-                        end
-                      end
-                    else
-                      block ;; label = @10
-                        local.get $7
-                        i32.const 4192
-                        i32.load
-                        i32.lt_u
-                        if ;; label = @11
-                          call $fimport$8
-                        end
-                        local.get $7
-                        i32.const 16
-                        i32.add
-                        local.tee $0
-                        i32.load
-                        local.get $6
-                        i32.eq
-                        if ;; label = @11
-                          local.get $0
-                          local.get $9
-                          i32.store
-                        else
-                          local.get $7
-                          local.get $9
-                          i32.store offset=20
-                        end
-                        local.get $9
-                        i32.eqz
-                        br_if 6 (;@4;)
-                      end
-                    end
-                    local.get $9
-                    i32.const 4192
-                    i32.load
-                    local.tee $2
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$8
-                    end
-                    local.get $9
-                    local.get $7
-                    i32.store offset=24
-                    local.get $6
-                    i32.const 16
-                    i32.add
-                    local.tee $1
-                    i32.load
-                    local.tee $0
-                    if ;; label = @9
-                      local.get $0
-                      local.get $2
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$8
-                      else
-                        block ;; label = @11
-                          local.get $9
-                          local.get $0
-                          i32.store offset=16
-                          local.get $0
-                          local.get $9
-                          i32.store offset=24
-                        end
-                      end
-                    end
-                    local.get $1
-                    i32.load offset=4
-                    local.tee $0
-                    if ;; label = @9
-                      local.get $0
-                      i32.const 4192
-                      i32.load
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$8
-                      else
-                        block ;; label = @11
-                          local.get $9
-                          local.get $0
-                          i32.store offset=20
-                          local.get $0
-                          local.get $9
-                          i32.store offset=24
-                        end
-                      end
-                    end
-                  end
-                end
-              end
-            end
-          end
-          local.get $3
-          local.get $5
-          i32.const 1
-          i32.or
-          i32.store offset=4
-          local.get $3
-          local.get $5
-          i32.add
-          local.get $5
-          i32.store
-          local.get $3
-          i32.const 4196
-          i32.load
-          i32.eq
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 4184
-              local.get $5
-              i32.store
-              return
-            end
-          else
-            local.get $5
-            local.set $2
-          end
-        end
-      end
-      local.get $2
-      i32.const 3
-      i32.shr_u
-      local.set $1
-      local.get $2
-      i32.const 256
-      i32.lt_u
-      if ;; label = @2
-        block ;; label = @3
-          local.get $1
-          i32.const 1
-          i32.shl
-          i32.const 2
-          i32.shl
-          i32.const 4216
-          i32.add
-          local.set $0
-          i32.const 4176
-          i32.load
-          local.tee $2
-          i32.const 1
-          local.get $1
-          i32.shl
-          local.tee $1
-          i32.and
-          if ;; label = @4
-            local.get $0
-            i32.const 8
-            i32.add
-            local.tee $2
-            i32.load
-            local.tee $1
-            i32.const 4192
-            i32.load
-            i32.lt_u
-            if ;; label = @5
-              call $fimport$8
-            else
-              block ;; label = @6
-                local.get $2
-                local.set $15
-                local.get $1
-                local.set $13
-              end
-            end
-          else
-            block ;; label = @5
-              i32.const 4176
-              local.get $2
-              local.get $1
-              i32.or
-              i32.store
-              local.get $0
-              i32.const 8
-              i32.add
-              local.set $15
-              local.get $0
-              local.set $13
-            end
-          end
-          local.get $15
-          local.get $3
-          i32.store
-          local.get $13
-          local.get $3
-          i32.store offset=12
-          local.get $3
-          local.get $13
-          i32.store offset=8
-          local.get $3
-          local.get $0
-          i32.store offset=12
-          return
-        end
-      end
-      local.get $2
-      i32.const 8
-      i32.shr_u
-      local.tee $0
-      if (result i32) ;; label = @2
-        local.get $2
-        i32.const 16777215
-        i32.gt_u
-        if (result i32) ;; label = @3
-          i32.const 31
-        else
-          local.get $2
-          i32.const 14
-          local.get $0
-          local.get $0
-          i32.const 1048320
-          i32.add
-          i32.const 16
-          i32.shr_u
-          i32.const 8
-          i32.and
-          local.tee $0
-          i32.shl
-          local.tee $1
-          i32.const 520192
-          i32.add
-          i32.const 16
-          i32.shr_u
-          i32.const 4
-          i32.and
-          local.tee $4
-          local.get $0
-          i32.or
-          local.get $1
-          local.get $4
-          i32.shl
-          local.tee $0
-          i32.const 245760
-          i32.add
-          i32.const 16
-          i32.shr_u
-          i32.const 2
-          i32.and
-          local.tee $1
-          i32.or
-          i32.sub
-          local.get $0
-          local.get $1
-          i32.shl
-          i32.const 15
-          i32.shr_u
-          i32.add
-          local.tee $0
-          i32.const 7
-          i32.add
-          i32.shr_u
-          i32.const 1
-          i32.and
-          local.get $0
-          i32.const 1
-          i32.shl
-          i32.or
-        end
-      else
-        i32.const 0
-      end
-      local.tee $1
-      i32.const 2
-      i32.shl
-      i32.const 4480
-      i32.add
-      local.set $0
-      local.get $3
-      local.get $1
-      i32.store offset=28
-      local.get $3
-      i32.const 0
-      i32.store offset=20
-      local.get $3
-      i32.const 0
-      i32.store offset=16
-      block $label$113 ;; label = @2
-        i32.const 4180
-        i32.load
-        local.tee $4
-        i32.const 1
-        local.get $1
-        i32.shl
-        local.tee $5
-        i32.and
-        if ;; label = @3
-          block ;; label = @4
-            local.get $0
-            i32.load
-            local.set $0
-            i32.const 25
-            local.get $1
-            i32.const 1
-            i32.shr_u
-            i32.sub
-            local.set $4
-            local.get $2
-            local.get $1
-            i32.const 31
-            i32.eq
-            if (result i32) ;; label = @5
-              i32.const 0
-            else
-              local.get $4
-            end
-            i32.shl
-            local.set $1
-            block $label$117 ;; label = @5
-              block $label$118 ;; label = @6
-                block $label$119 ;; label = @7
-                  loop $label$120 ;; label = @8
-                    local.get $0
-                    i32.load offset=4
-                    i32.const -8
-                    i32.and
-                    local.get $2
-                    i32.eq
-                    br_if 2 (;@6;)
-                    local.get $1
-                    i32.const 1
-                    i32.shl
-                    local.set $4
-                    local.get $0
-                    i32.const 16
-                    i32.add
-                    local.get $1
-                    i32.const 31
-                    i32.shr_u
-                    i32.const 2
-                    i32.shl
-                    i32.add
-                    local.tee $1
-                    i32.load
-                    local.tee $5
-                    i32.eqz
-                    br_if 1 (;@7;)
-                    local.get $4
-                    local.set $1
-                    local.get $5
-                    local.set $0
-                    br 0 (;@8;)
-                  end
-                end
-                local.get $1
-                i32.const 4192
-                i32.load
-                i32.lt_u
-                if ;; label = @7
-                  call $fimport$8
-                else
-                  block ;; label = @8
-                    local.get $1
-                    local.get $3
-                    i32.store
-                    local.get $3
-                    local.get $0
-                    i32.store offset=24
-                    local.get $3
-                    local.get $3
-                    i32.store offset=12
-                    local.get $3
-                    local.get $3
-                    i32.store offset=8
-                    br 6 (;@2;)
-                  end
-                end
-                br 1 (;@5;)
-              end
-              local.get $0
-              i32.const 8
-              i32.add
-              local.tee $1
-              i32.load
-              local.tee $2
-              i32.const 4192
-              i32.load
-              local.tee $4
-              i32.ge_u
-              local.get $0
-              local.get $4
-              i32.ge_u
-              i32.and
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $2
-                  local.get $3
-                  i32.store offset=12
-                  local.get $1
-                  local.get $3
-                  i32.store
-                  local.get $3
-                  local.get $2
-                  i32.store offset=8
-                  local.get $3
-                  local.get $0
-                  i32.store offset=12
-                  local.get $3
-                  i32.const 0
-                  i32.store offset=24
-                end
-              else
-                call $fimport$8
-              end
-            end
-          end
-        else
-          block ;; label = @4
-            i32.const 4180
-            local.get $4
-            local.get $5
-            i32.or
-            i32.store
-            local.get $0
-            local.get $3
-            i32.store
-            local.get $3
-            local.get $0
-            i32.store offset=24
-            local.get $3
-            local.get $3
-            i32.store offset=12
-            local.get $3
-            local.get $3
-            i32.store offset=8
-          end
-        end
-      end
-      i32.const 4208
-      i32.const 4208
-      i32.load
-      i32.const -1
-      i32.add
-      local.tee $0
-      i32.store
-      local.get $0
-      if ;; label = @2
-        return
-      else
-        i32.const 4632
-        local.set $0
-      end
-      loop $label$128 ;; label = @2
-        local.get $0
-        i32.load
-        local.tee $2
-        i32.const 8
-        i32.add
-        local.set $0
-        local.get $2
-        br_if 0 (;@2;)
-      end
-      i32.const 4208
-      i32.const -1
-      i32.store
-    end
+ )
+ (func $43 (; 56 ;) (type $4) (result i32)
+  (local $0 i32)
+  (block $label$1 (result i32)
+   (i32.store
+    (i32.const 4672)
+    (i32.add
+     (local.tee $0
+      (i32.load
+       (i32.const 4672)
+      )
+     )
+     (i32.const 0)
+    )
+   )
+   (local.get $0)
   )
-  (func $39 (;52;) (type $2) (param $0 i32) (result i32)
-    (local $1 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $0
-      i32.eqz
-      if ;; label = @2
-        i32.const 1
-        local.set $0
-      end
-      loop $label$3 ;; label = @2
-        block $label$4 ;; label = @3
-          local.get $0
-          call $37
-          local.tee $1
-          if ;; label = @4
-            block ;; label = @5
-              local.get $1
-              local.set $0
-              br 2 (;@3;)
-            end
-          end
-          call $43
-          local.tee $1
-          if ;; label = @4
-            block ;; label = @5
-              local.get $1
-              i32.const 0
-              i32.and
-              i32.const 8
-              i32.add
-              call_indirect (type $1)
-              br 3 (;@2;)
-            end
-          else
-            i32.const 0
-            local.set $0
-          end
-        end
-      end
-      local.get $0
-    end
+ )
+ (func $44 (; 57 ;) (type $1)
+  (nop)
+ )
+ (func $45 (; 58 ;) (type $2) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (i32.add
+     (local.tee $2
+      (i32.load
+       (global.get $global$0)
+      )
+     )
+     (local.tee $0
+      (i32.and
+       (i32.add
+        (local.get $0)
+        (i32.const 15)
+       )
+       (i32.const -16)
+      )
+     )
+    )
+   )
+   (if
+    (i32.or
+     (i32.and
+      (i32.gt_s
+       (local.get $0)
+       (i32.const 0)
+      )
+      (i32.lt_s
+       (local.get $1)
+       (local.get $2)
+      )
+     )
+     (i32.lt_s
+      (local.get $1)
+      (i32.const 0)
+     )
+    )
+    (block
+     (drop
+      (call $fimport$6)
+     )
+     (call $fimport$11
+      (i32.const 12)
+     )
+     (return
+      (i32.const -1)
+     )
+    )
+   )
+   (i32.store
+    (global.get $global$0)
+    (local.get $1)
+   )
+   (if
+    (i32.gt_s
+     (local.get $1)
+     (call $fimport$5)
+    )
+    (if
+     (i32.eqz
+      (call $fimport$4)
+     )
+     (block
+      (call $fimport$11
+       (i32.const 12)
+      )
+      (i32.store
+       (global.get $global$0)
+       (local.get $2)
+      )
+      (return
+       (i32.const -1)
+      )
+     )
+    )
+   )
+   (local.get $2)
   )
-  (func $40 (;53;) (type $2) (param $0 i32) (result i32)
-    local.get $0
-    call $39
+ )
+ (func $46 (; 59 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (i32.add
+     (local.get $0)
+     (local.get $2)
+    )
+   )
+   (if
+    (i32.ge_s
+     (local.get $2)
+     (i32.const 20)
+    )
+    (block
+     (local.set $1
+      (i32.and
+       (local.get $1)
+       (i32.const 255)
+      )
+     )
+     (if
+      (local.tee $3
+       (i32.and
+        (local.get $0)
+        (i32.const 3)
+       )
+      )
+      (block
+       (local.set $3
+        (i32.sub
+         (i32.add
+          (local.get $0)
+          (i32.const 4)
+         )
+         (local.get $3)
+        )
+       )
+       (loop $label$4
+        (if
+         (i32.lt_s
+          (local.get $0)
+          (local.get $3)
+         )
+         (block
+          (i32.store8
+           (local.get $0)
+           (local.get $1)
+          )
+          (local.set $0
+           (i32.add
+            (local.get $0)
+            (i32.const 1)
+           )
+          )
+          (br $label$4)
+         )
+        )
+       )
+      )
+     )
+     (local.set $3
+      (i32.or
+       (i32.or
+        (i32.or
+         (local.get $1)
+         (i32.shl
+          (local.get $1)
+          (i32.const 8)
+         )
+        )
+        (i32.shl
+         (local.get $1)
+         (i32.const 16)
+        )
+       )
+       (i32.shl
+        (local.get $1)
+        (i32.const 24)
+       )
+      )
+     )
+     (local.set $5
+      (i32.and
+       (local.get $4)
+       (i32.const -4)
+      )
+     )
+     (loop $label$6
+      (if
+       (i32.lt_s
+        (local.get $0)
+        (local.get $5)
+       )
+       (block
+        (i32.store
+         (local.get $0)
+         (local.get $3)
+        )
+        (local.set $0
+         (i32.add
+          (local.get $0)
+          (i32.const 4)
+         )
+        )
+        (br $label$6)
+       )
+      )
+     )
+    )
+   )
+   (loop $label$8
+    (if
+     (i32.lt_s
+      (local.get $0)
+      (local.get $4)
+     )
+     (block
+      (i32.store8
+       (local.get $0)
+       (local.get $1)
+      )
+      (local.set $0
+       (i32.add
+        (local.get $0)
+        (i32.const 1)
+       )
+      )
+      (br $label$8)
+     )
+    )
+   )
+   (i32.sub
+    (local.get $0)
+    (local.get $2)
+   )
   )
-  (func $41 (;54;) (type $3) (param $0 i32)
-    local.get $0
-    call $38
+ )
+ (func $47 (; 60 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (block $label$1 (result i32)
+   (if
+    (i32.ge_s
+     (local.get $2)
+     (i32.const 4096)
+    )
+    (return
+     (call $fimport$12
+      (local.get $0)
+      (local.get $1)
+      (local.get $2)
+     )
+    )
+   )
+   (local.set $3
+    (local.get $0)
+   )
+   (if
+    (i32.eq
+     (i32.and
+      (local.get $0)
+      (i32.const 3)
+     )
+     (i32.and
+      (local.get $1)
+      (i32.const 3)
+     )
+    )
+    (block
+     (loop $label$4
+      (if
+       (i32.and
+        (local.get $0)
+        (i32.const 3)
+       )
+       (block
+        (if
+         (i32.eqz
+          (local.get $2)
+         )
+         (return
+          (local.get $3)
+         )
+        )
+        (i32.store8
+         (local.get $0)
+         (i32.load8_s
+          (local.get $1)
+         )
+        )
+        (local.set $0
+         (i32.add
+          (local.get $0)
+          (i32.const 1)
+         )
+        )
+        (local.set $1
+         (i32.add
+          (local.get $1)
+          (i32.const 1)
+         )
+        )
+        (local.set $2
+         (i32.sub
+          (local.get $2)
+          (i32.const 1)
+         )
+        )
+        (br $label$4)
+       )
+      )
+     )
+     (loop $label$7
+      (if
+       (i32.ge_s
+        (local.get $2)
+        (i32.const 4)
+       )
+       (block
+        (i32.store
+         (local.get $0)
+         (i32.load
+          (local.get $1)
+         )
+        )
+        (local.set $0
+         (i32.add
+          (local.get $0)
+          (i32.const 4)
+         )
+        )
+        (local.set $1
+         (i32.add
+          (local.get $1)
+          (i32.const 4)
+         )
+        )
+        (local.set $2
+         (i32.sub
+          (local.get $2)
+          (i32.const 4)
+         )
+        )
+        (br $label$7)
+       )
+      )
+     )
+    )
+   )
+   (loop $label$9
+    (if
+     (i32.gt_s
+      (local.get $2)
+      (i32.const 0)
+     )
+     (block
+      (i32.store8
+       (local.get $0)
+       (i32.load8_s
+        (local.get $1)
+       )
+      )
+      (local.set $0
+       (i32.add
+        (local.get $0)
+        (i32.const 1)
+       )
+      )
+      (local.set $1
+       (i32.add
+        (local.get $1)
+        (i32.const 1)
+       )
+      )
+      (local.set $2
+       (i32.sub
+        (local.get $2)
+        (i32.const 1)
+       )
+      )
+      (br $label$9)
+     )
+    )
+   )
+   (local.get $3)
   )
-  (func $42 (;55;) (type $3) (param $0 i32)
-    local.get $0
-    call $41
+ )
+ (func $48 (; 61 ;) (type $4) (result i32)
+  (i32.const 0)
+ )
+ (func $49 (; 62 ;) (type $6) (param $0 i32) (param $1 i32) (result i32)
+  (call_indirect (type $2)
+   (local.get $1)
+   (i32.add
+    (i32.and
+     (local.get $0)
+     (i32.const 1)
+    )
+    (i32.const 0)
+   )
   )
-  (func $43 (;56;) (type $4) (result i32)
-    (local $0 i32)
-    block $label$1 (result i32) ;; label = @1
-      i32.const 4672
-      i32.const 4672
-      i32.load
-      local.tee $0
-      i32.const 0
-      i32.add
-      i32.store
-      local.get $0
-    end
+ )
+ (func $50 (; 63 ;) (type $12) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+  (call_indirect (type $0)
+   (local.get $1)
+   (local.get $2)
+   (local.get $3)
+   (i32.add
+    (i32.and
+     (local.get $0)
+     (i32.const 3)
+    )
+    (i32.const 2)
+   )
   )
-  (func $44 (;57;) (type $1)
-    nop
+ )
+ (func $51 (; 64 ;) (type $5) (param $0 i32) (param $1 i32)
+  (call_indirect (type $3)
+   (local.get $1)
+   (i32.add
+    (i32.and
+     (local.get $0)
+     (i32.const 1)
+    )
+    (i32.const 6)
+   )
   )
-  (func $45 (;58;) (type $2) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$0
-      i32.load
-      local.tee $2
-      local.get $0
-      i32.const 15
-      i32.add
-      i32.const -16
-      i32.and
-      local.tee $0
-      i32.add
-      local.set $1
-      local.get $0
-      i32.const 0
-      i32.gt_s
-      local.get $1
-      local.get $2
-      i32.lt_s
-      i32.and
-      local.get $1
-      i32.const 0
-      i32.lt_s
-      i32.or
-      if ;; label = @2
-        block ;; label = @3
-          call $fimport$6
-          drop
-          i32.const 12
-          call $fimport$11
-          i32.const -1
-          return
-        end
-      end
-      global.get $global$0
-      local.get $1
-      i32.store
-      local.get $1
-      call $fimport$5
-      i32.gt_s
-      if ;; label = @2
-        call $fimport$4
-        i32.eqz
-        if ;; label = @3
-          block ;; label = @4
-            i32.const 12
-            call $fimport$11
-            global.get $global$0
-            local.get $2
-            i32.store
-            i32.const -1
-            return
-          end
-        end
-      end
-      local.get $2
-    end
+ )
+ (func $52 (; 65 ;) (type $3) (param $0 i32)
+  (call_indirect (type $1)
+   (i32.add
+    (i32.and
+     (local.get $0)
+     (i32.const 0)
+    )
+    (i32.const 8)
+   )
   )
-  (func $46 (;59;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $0
-      local.get $2
-      i32.add
-      local.set $4
-      local.get $2
-      i32.const 20
-      i32.ge_s
-      if ;; label = @2
-        block ;; label = @3
-          local.get $1
-          i32.const 255
-          i32.and
-          local.set $1
-          local.get $0
-          i32.const 3
-          i32.and
-          local.tee $3
-          if ;; label = @4
-            block ;; label = @5
-              local.get $0
-              i32.const 4
-              i32.add
-              local.get $3
-              i32.sub
-              local.set $3
-              loop $label$4 ;; label = @6
-                local.get $0
-                local.get $3
-                i32.lt_s
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $0
-                    local.get $1
-                    i32.store8
-                    local.get $0
-                    i32.const 1
-                    i32.add
-                    local.set $0
-                    br 2 (;@6;)
-                  end
-                end
-              end
-            end
-          end
-          local.get $1
-          local.get $1
-          i32.const 8
-          i32.shl
-          i32.or
-          local.get $1
-          i32.const 16
-          i32.shl
-          i32.or
-          local.get $1
-          i32.const 24
-          i32.shl
-          i32.or
-          local.set $3
-          local.get $4
-          i32.const -4
-          i32.and
-          local.set $5
-          loop $label$6 ;; label = @4
-            local.get $0
-            local.get $5
-            i32.lt_s
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                local.get $3
-                i32.store
-                local.get $0
-                i32.const 4
-                i32.add
-                local.set $0
-                br 2 (;@4;)
-              end
-            end
-          end
-        end
-      end
-      loop $label$8 ;; label = @2
-        local.get $0
-        local.get $4
-        i32.lt_s
-        if ;; label = @3
-          block ;; label = @4
-            local.get $0
-            local.get $1
-            i32.store8
-            local.get $0
-            i32.const 1
-            i32.add
-            local.set $0
-            br 2 (;@2;)
-          end
-        end
-      end
-      local.get $0
-      local.get $2
-      i32.sub
-    end
+ )
+ (func $53 (; 66 ;) (type $2) (param $0 i32) (result i32)
+  (block $label$1 (result i32)
+   (call $fimport$3
+    (i32.const 0)
+   )
+   (i32.const 0)
   )
-  (func $47 (;60;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $2
-      i32.const 4096
-      i32.ge_s
-      if ;; label = @2
-        local.get $0
-        local.get $1
-        local.get $2
-        call $fimport$12
-        return
-      end
-      local.get $0
-      local.set $3
-      local.get $0
-      i32.const 3
-      i32.and
-      local.get $1
-      i32.const 3
-      i32.and
-      i32.eq
-      if ;; label = @2
-        block ;; label = @3
-          loop $label$4 ;; label = @4
-            local.get $0
-            i32.const 3
-            i32.and
-            if ;; label = @5
-              block ;; label = @6
-                local.get $2
-                i32.eqz
-                if ;; label = @7
-                  local.get $3
-                  return
-                end
-                local.get $0
-                local.get $1
-                i32.load8_s
-                i32.store8
-                local.get $0
-                i32.const 1
-                i32.add
-                local.set $0
-                local.get $1
-                i32.const 1
-                i32.add
-                local.set $1
-                local.get $2
-                i32.const 1
-                i32.sub
-                local.set $2
-                br 2 (;@4;)
-              end
-            end
-          end
-          loop $label$7 ;; label = @4
-            local.get $2
-            i32.const 4
-            i32.ge_s
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                local.get $1
-                i32.load
-                i32.store
-                local.get $0
-                i32.const 4
-                i32.add
-                local.set $0
-                local.get $1
-                i32.const 4
-                i32.add
-                local.set $1
-                local.get $2
-                i32.const 4
-                i32.sub
-                local.set $2
-                br 2 (;@4;)
-              end
-            end
-          end
-        end
-      end
-      loop $label$9 ;; label = @2
-        local.get $2
-        i32.const 0
-        i32.gt_s
-        if ;; label = @3
-          block ;; label = @4
-            local.get $0
-            local.get $1
-            i32.load8_s
-            i32.store8
-            local.get $0
-            i32.const 1
-            i32.add
-            local.set $0
-            local.get $1
-            i32.const 1
-            i32.add
-            local.set $1
-            local.get $2
-            i32.const 1
-            i32.sub
-            local.set $2
-            br 2 (;@2;)
-          end
-        end
-      end
-      local.get $3
-    end
+ )
+ (func $54 (; 67 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (block $label$1 (result i32)
+   (call $fimport$3
+    (i32.const 1)
+   )
+   (i32.const 0)
   )
-  (func $48 (;61;) (type $4) (result i32)
-    i32.const 0
+ )
+ (func $55 (; 68 ;) (type $3) (param $0 i32)
+  (call $fimport$3
+   (i32.const 2)
   )
-  (func $49 (;62;) (type $6) (param $0 i32) (param $1 i32) (result i32)
-    local.get $1
-    local.get $0
-    i32.const 1
-    i32.and
-    i32.const 0
-    i32.add
-    call_indirect (type $2)
+ )
+ (func $56 (; 69 ;) (type $1)
+  (call $fimport$3
+   (i32.const 3)
   )
-  (func $50 (;63;) (type $12) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
-    local.get $1
-    local.get $2
-    local.get $3
-    local.get $0
-    i32.const 3
-    i32.and
-    i32.const 2
-    i32.add
-    call_indirect (type $0)
-  )
-  (func $51 (;64;) (type $5) (param $0 i32) (param $1 i32)
-    local.get $1
-    local.get $0
-    i32.const 1
-    i32.and
-    i32.const 6
-    i32.add
-    call_indirect (type $3)
-  )
-  (func $52 (;65;) (type $3) (param $0 i32)
-    local.get $0
-    i32.const 0
-    i32.and
-    i32.const 8
-    i32.add
-    call_indirect (type $1)
-  )
-  (func $53 (;66;) (type $2) (param $0 i32) (result i32)
-    block $label$1 (result i32) ;; label = @1
-      i32.const 0
-      call $fimport$3
-      i32.const 0
-    end
-  )
-  (func $54 (;67;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    block $label$1 (result i32) ;; label = @1
-      i32.const 1
-      call $fimport$3
-      i32.const 0
-    end
-  )
-  (func $55 (;68;) (type $3) (param $0 i32)
-    i32.const 2
-    call $fimport$3
-  )
-  (func $56 (;69;) (type $1)
-    i32.const 3
-    call $fimport$3
-  )
-  (global $global$0 (;5;) (mut i32) global.get $gimport$0)
-  (global $global$1 (;6;) (mut i32) global.get $gimport$1)
-  (global $global$2 (;7;) (mut i32) global.get $gimport$2)
-  (global $global$3 (;8;) (mut i32) i32.const 0)
-  (global $global$4 (;9;) (mut i32) i32.const 0)
-  (global $global$5 (;10;) (mut i32) i32.const 0)
-  (export "_sbrk" (func $45))
-  (export "_free" (func $38))
-  (export "_main" (func $7))
-  (export "_pthread_self" (func $48))
-  (export "_memset" (func $46))
-  (export "_malloc" (func $37))
-  (export "_memcpy" (func $47))
-  (export "___errno_location" (func $12))
-  (export "runPostSets" (func $44))
-  (export "stackAlloc" (func $0))
-  (export "stackSave" (func $1))
-  (export "stackRestore" (func $2))
-  (export "establishStackSpace" (func $3))
-  (export "setThrew" (func $4))
-  (export "setTempRet0" (func $5))
-  (export "getTempRet0" (func $6))
-  (export "dynCall_ii" (func $49))
-  (export "dynCall_iiii" (func $50))
-  (export "dynCall_vi" (func $51))
-  (export "dynCall_v" (func $52))
-  (elem (;0;) (global.get $gimport$19) func $53 $9 $54 $14 $10 $15 $55 $16 $56)
-  (data (;0;) (i32.const 1024) "&\02\00\00a\00\00\00q=\8a>\00\00\00\00c\00\00\00\8f\c2\f5=\00\00\00\00g\00\00\00\8f\c2\f5=\00\00\00\00t\00\00\00q=\8a>\00\00\00\00B\00\00\00\0a\d7\a3<\00\00\00\00D\00\00\00\0a\d7\a3<\00\00\00\00H\00\00\00\0a\d7\a3<\00\00\00\00K\00\00\00\0a\d7\a3<\00\00\00\00M\00\00\00\0a\d7\a3<\00\00\00\00N\00\00\00\0a\d7\a3<\00\00\00\00R\00\00\00\0a\d7\a3<\00\00\00\00S\00\00\00\0a\d7\a3<\00\00\00\00V\00\00\00\0a\d7\a3<\00\00\00\00W\00\00\00\0a\d7\a3<\00\00\00\00Y\00\00\00\0a\d7\a3<")
-  (data (;1;) (i32.const 1220) "a\00\00\00\e9\1c\9b>\00\00\00\00c\00\00\00r\bdJ>\00\00\00\00g\00\00\00\d7IJ>\00\00\00\00t\00\00\00r_\9a>")
-  (data (;2;) (i32.const 1280) "\04\05\00\00\05")
-  (data (;3;) (i32.const 1296) "\01")
-  (data (;4;) (i32.const 1320) "\01\00\00\00\02\00\00\00L\12\00\00\00\04")
-  (data (;5;) (i32.const 1344) "\01")
-  (data (;6;) (i32.const 1359) "\0a\ff\ff\ff\ff")
-  (data (;7;) (i32.const 1396) "*\00\00\00error: %d\0a\00GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA\00\11\00\0a\00\11\11\11\00\00\00\00\05\00\00\00\00\00\00\09\00\00\00\00\0b")
-  (data (;8;) (i32.const 1731) "\11\00\0f\0a\11\11\11\03\0a\07\00\01\13\09\0b\0b\00\00\09\06\0b\00\00\0b\00\06\11\00\00\00\11\11\11")
-  (data (;9;) (i32.const 1780) "\0b")
-  (data (;10;) (i32.const 1789) "\11\00\0a\0a\11\11\11\00\0a\00\00\02\00\09\0b\00\00\00\09\00\0b\00\00\0b")
-  (data (;11;) (i32.const 1838) "\0c")
-  (data (;12;) (i32.const 1850) "\0c\00\00\00\00\0c\00\00\00\00\09\0c\00\00\00\00\00\0c\00\00\0c")
-  (data (;13;) (i32.const 1896) "\0e")
-  (data (;14;) (i32.const 1908) "\0d\00\00\00\04\0d\00\00\00\00\09\0e\00\00\00\00\00\0e\00\00\0e")
-  (data (;15;) (i32.const 1954) "\10")
-  (data (;16;) (i32.const 1966) "\0f\00\00\00\00\0f\00\00\00\00\09\10\00\00\00\00\00\10\00\00\10\00\00\12\00\00\00\12\12\12")
-  (data (;17;) (i32.const 2021) "\12\00\00\00\12\12\12\00\00\00\00\00\00\09")
-  (data (;18;) (i32.const 2070) "\0b")
-  (data (;19;) (i32.const 2082) "\0a\00\00\00\00\0a\00\00\00\00\09\0b\00\00\00\00\00\0b\00\00\0b")
-  (data (;20;) (i32.const 2128) "\0c")
-  (data (;21;) (i32.const 2140) "\0c\00\00\00\00\0c\00\00\00\00\09\0c\00\00\00\00\00\0c\00\00\0c\00\000123456789ABCDEF-+   0X0x\00(null)\00-0X+0X 0X-0x+0x 0x\00inf\00INF\00nan\00NAN\00.\00T!\22\19\0d\01\02\03\11K\1c\0c\10\04\0b\1d\12\1e'hnopqb \05\06\0f\13\14\15\1a\08\16\07($\17\18\09\0a\0e\1b\1f%#\83\82}&*+<=>?CGJMXYZ[\5c]^_`acdefgijklrstyz{|\00Illegal byte sequence\00Domain error\00Result not representable\00Not a tty\00Permission denied\00Operation not permitted\00No such file or directory\00No such process\00File exists\00Value too large for data type\00No space left on device\00Out of memory\00Resource busy\00Interrupted system call\00Resource temporarily unavailable\00Invalid seek\00Cross-device link\00Read-only file system\00Directory not empty\00Connection reset by peer\00Operation timed out\00Connection refused\00Host is down\00Host is unreachable\00Address in use\00Broken pipe\00I/O error\00No such device or address\00Block device required\00No such device\00Not a directory\00Is a directory\00Text file busy\00Exec format error\00Invalid argument\00Argument list too long\00Symbolic link loop\00Filename too long\00Too many open files in system\00No file descriptors available\00Bad file descriptor\00No child process\00Bad address\00File too large\00Too many links\00No locks available\00Resource deadlock would occur\00State not recoverable\00Previous owner died\00Operation canceled\00Function not implemented\00No message of desired type\00Identifier removed\00Device not a stream\00No data available\00Device timeout\00Out of streams resources\00Link has been severed\00Protocol error\00Bad message\00File descriptor in bad state\00Not a socket\00Destination address required\00Message too large\00Protocol wrong type for socket\00Protocol not available\00Protocol not supported\00Socket type not supported\00Not supported\00Protocol family not supported\00Address family not supported by protocol\00Address not available\00Network is down\00Network unreachable\00Connection reset by network\00Connection aborted\00No buffer space available\00Socket is connected\00Socket not connected\00Cannot send after socket shutdown\00Operation already in progress\00Operation in progress\00Stale file handle\00Remote I/O error\00Quota exceeded\00No medium found\00Wrong medium type\00No error information")
-)
\ No newline at end of file
+ )
+)
+
diff --git a/cranelift/wasm/wasmtests/embenchen_ifs.wat b/cranelift/wasm/wasmtests/embenchen_ifs.wat
index dc466513c7e6..e5ada5702fef 100644
--- a/cranelift/wasm/wasmtests/embenchen_ifs.wat
+++ b/cranelift/wasm/wasmtests/embenchen_ifs.wat
@@ -1,11505 +1,15771 @@
 (module
-  (type $0 (;0;) (func (param i32 i32 i32) (result i32)))
-  (type $1 (;1;) (func (param i32) (result i32)))
-  (type $2 (;2;) (func (param i32)))
-  (type $3 (;3;) (func (result i32)))
-  (type $4 (;4;) (func (param i32 i32) (result i32)))
-  (type $5 (;5;) (func (param i32 i32)))
-  (type $6 (;6;) (func))
-  (type $7 (;7;) (func (param i32 i32 i32 i32 i32) (result i32)))
-  (type $8 (;8;) (func (param i32 i32 i32)))
-  (type $9 (;9;) (func (param i64 i32) (result i32)))
-  (type $10 (;10;) (func (param i32 i32 i32 i32 i32)))
-  (type $11 (;11;) (func (param f64 i32) (result f64)))
-  (type $12 (;12;) (func (param i32 i32 i32 i32) (result i32)))
-  (import "env" "memory" (memory $16 (;0;) 2048 2048))
-  (import "env" "table" (table $timport$17 (;0;) 8 8 funcref))
-  (import "env" "DYNAMICTOP_PTR" (global $gimport$0 (;0;) i32))
-  (import "env" "STACKTOP" (global $gimport$1 (;1;) i32))
-  (import "env" "STACK_MAX" (global $gimport$2 (;2;) i32))
-  (import "env" "memoryBase" (global $gimport$18 (;3;) i32))
-  (import "env" "tableBase" (global $gimport$19 (;4;) i32))
-  (import "env" "abort" (func $fimport$3 (;0;) (type $2)))
-  (import "env" "enlargeMemory" (func $fimport$4 (;1;) (type $3)))
-  (import "env" "getTotalMemory" (func $fimport$5 (;2;) (type $3)))
-  (import "env" "abortOnCannotGrowMemory" (func $fimport$6 (;3;) (type $3)))
-  (import "env" "_pthread_cleanup_pop" (func $fimport$7 (;4;) (type $2)))
-  (import "env" "___syscall6" (func $fimport$8 (;5;) (type $4)))
-  (import "env" "_pthread_cleanup_push" (func $fimport$9 (;6;) (type $5)))
-  (import "env" "_abort" (func $fimport$10 (;7;) (type $6)))
-  (import "env" "___setErrNo" (func $fimport$11 (;8;) (type $2)))
-  (import "env" "_emscripten_memcpy_big" (func $fimport$12 (;9;) (type $0)))
-  (import "env" "___syscall54" (func $fimport$13 (;10;) (type $4)))
-  (import "env" "___syscall140" (func $fimport$14 (;11;) (type $4)))
-  (import "env" "___syscall146" (func $fimport$15 (;12;) (type $4)))
-  (func $0 (;13;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $1
-      global.get $global$1
-      local.get $0
-      i32.add
-      global.set $global$1
-      global.get $global$1
-      i32.const 15
-      i32.add
-      i32.const -16
-      i32.and
-      global.set $global$1
-      local.get $1
-    end
+ (type $0 (func (param i32 i32 i32) (result i32)))
+ (type $1 (func (param i32) (result i32)))
+ (type $2 (func (param i32)))
+ (type $3 (func (result i32)))
+ (type $4 (func (param i32 i32) (result i32)))
+ (type $5 (func (param i32 i32)))
+ (type $6 (func))
+ (type $7 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $8 (func (param i32 i32 i32)))
+ (type $9 (func (param i64 i32) (result i32)))
+ (type $10 (func (param i32 i32 i32 i32 i32)))
+ (type $11 (func (param f64 i32) (result f64)))
+ (type $12 (func (param i32 i32 i32 i32) (result i32)))
+ (import "env" "memory" (memory $16 2048 2048))
+ (data (i32.const 1024) "\04\04\00\00\05")
+ (data (i32.const 1040) "\01")
+ (data (i32.const 1064) "\01\00\00\00\02\00\00\00,\10\00\00\00\04")
+ (data (i32.const 1088) "\01")
+ (data (i32.const 1103) "\n\ff\ff\ff\ff")
+ (data (i32.const 1140) "error: %d\\n\00ok\00\11\00\n\00\11\11\11\00\00\00\00\05\00\00\00\00\00\00\t\00\00\00\00\0b")
+ (data (i32.const 1187) "\11\00\0f\n\11\11\11\03\n\07\00\01\13\t\0b\0b\00\00\t\06\0b\00\00\0b\00\06\11\00\00\00\11\11\11")
+ (data (i32.const 1236) "\0b")
+ (data (i32.const 1245) "\11\00\n\n\11\11\11\00\n\00\00\02\00\t\0b\00\00\00\t\00\0b\00\00\0b")
+ (data (i32.const 1294) "\0c")
+ (data (i32.const 1306) "\0c\00\00\00\00\0c\00\00\00\00\t\0c\00\00\00\00\00\0c\00\00\0c")
+ (data (i32.const 1352) "\0e")
+ (data (i32.const 1364) "\0d\00\00\00\04\0d\00\00\00\00\t\0e\00\00\00\00\00\0e\00\00\0e")
+ (data (i32.const 1410) "\10")
+ (data (i32.const 1422) "\0f\00\00\00\00\0f\00\00\00\00\t\10\00\00\00\00\00\10\00\00\10\00\00\12\00\00\00\12\12\12")
+ (data (i32.const 1477) "\12\00\00\00\12\12\12\00\00\00\00\00\00\t")
+ (data (i32.const 1526) "\0b")
+ (data (i32.const 1538) "\n\00\00\00\00\n\00\00\00\00\t\0b\00\00\00\00\00\0b\00\00\0b")
+ (data (i32.const 1584) "\0c")
+ (data (i32.const 1596) "\0c\00\00\00\00\0c\00\00\00\00\t\0c\00\00\00\00\00\0c\00\00\0c\00\000123456789ABCDEF-+   0X0x\00(null)\00-0X+0X 0X-0x+0x 0x\00inf\00INF\00nan\00NAN\00.\00T!\"\19\0d\01\02\03\11K\1c\0c\10\04\0b\1d\12\1e\'hnopqb \05\06\0f\13\14\15\1a\08\16\07($\17\18\t\n\0e\1b\1f%#\83\82}&*+<=>?CGJMXYZ[\\]^_`acdefgijklrstyz{|\00Illegal byte sequence\00Domain error\00Result not representable\00Not a tty\00Permission denied\00Operation not permitted\00No such file or directory\00No such process\00File exists\00Value too large for data type\00No space left on device\00Out of memory\00Resource busy\00Interrupted system call\00Resource temporarily unavailable\00Invalid seek\00Cross-device link\00Read-only file system\00Directory not empty\00Connection reset by peer\00Operation timed out\00Connection refused\00Host is down\00Host is unreachable\00Address in use\00Broken pipe\00I/O error\00No such device or address\00Block device required\00No such device\00Not a directory\00Is a directory\00Text file busy\00Exec format error\00Invalid argument\00Argument list too long\00Symbolic link loop\00Filename too long\00Too many open files in system\00No file descriptors available\00Bad file descriptor\00No child process\00Bad address\00File too large\00Too many links\00No locks available\00Resource deadlock would occur\00State not recoverable\00Previous owner died\00Operation canceled\00Function not implemented\00No message of desired type\00Identifier removed\00Device not a stream\00No data available\00Device timeout\00Out of streams resources\00Link has been severed\00Protocol error\00Bad message\00File descriptor in bad state\00Not a socket\00Destination address required\00Message too large\00Protocol wrong type for socket\00Protocol not available\00Protocol not supported\00Socket type not supported\00Not supported\00Protocol family not supported\00Address family not supported by protocol\00Address not available\00Network is down\00Network unreachable\00Connection reset by network\00Connection aborted\00No buffer space available\00Socket is connected\00Socket not connected\00Cannot send after socket shutdown\00Operation already in progress\00Operation in progress\00Stale file handle\00Remote I/O error\00Quota exceeded\00No medium found\00Wrong medium type\00No error information")
+ (import "env" "table" (table $timport$17 8 8 funcref))
+ (elem (global.get $gimport$19) $47 $9 $48 $14 $10 $15 $49 $16)
+ (import "env" "DYNAMICTOP_PTR" (global $gimport$0 i32))
+ (import "env" "STACKTOP" (global $gimport$1 i32))
+ (import "env" "STACK_MAX" (global $gimport$2 i32))
+ (import "env" "memoryBase" (global $gimport$18 i32))
+ (import "env" "tableBase" (global $gimport$19 i32))
+ (import "env" "abort" (func $fimport$3 (param i32)))
+ (import "env" "enlargeMemory" (func $fimport$4 (result i32)))
+ (import "env" "getTotalMemory" (func $fimport$5 (result i32)))
+ (import "env" "abortOnCannotGrowMemory" (func $fimport$6 (result i32)))
+ (import "env" "_pthread_cleanup_pop" (func $fimport$7 (param i32)))
+ (import "env" "___syscall6" (func $fimport$8 (param i32 i32) (result i32)))
+ (import "env" "_pthread_cleanup_push" (func $fimport$9 (param i32 i32)))
+ (import "env" "_abort" (func $fimport$10))
+ (import "env" "___setErrNo" (func $fimport$11 (param i32)))
+ (import "env" "_emscripten_memcpy_big" (func $fimport$12 (param i32 i32 i32) (result i32)))
+ (import "env" "___syscall54" (func $fimport$13 (param i32 i32) (result i32)))
+ (import "env" "___syscall140" (func $fimport$14 (param i32 i32) (result i32)))
+ (import "env" "___syscall146" (func $fimport$15 (param i32 i32) (result i32)))
+ (global $global$0 (mut i32) (global.get $gimport$0))
+ (global $global$1 (mut i32) (global.get $gimport$1))
+ (global $global$2 (mut i32) (global.get $gimport$2))
+ (global $global$3 (mut i32) (i32.const 0))
+ (global $global$4 (mut i32) (i32.const 0))
+ (global $global$5 (mut i32) (i32.const 0))
+ (export "_sbrk" (func $40))
+ (export "_free" (func $38))
+ (export "_main" (func $8))
+ (export "_pthread_self" (func $43))
+ (export "_memset" (func $41))
+ (export "_malloc" (func $37))
+ (export "_memcpy" (func $42))
+ (export "___errno_location" (func $12))
+ (export "runPostSets" (func $39))
+ (export "stackAlloc" (func $0))
+ (export "stackSave" (func $1))
+ (export "stackRestore" (func $2))
+ (export "establishStackSpace" (func $3))
+ (export "setThrew" (func $4))
+ (export "setTempRet0" (func $5))
+ (export "getTempRet0" (func $6))
+ (export "dynCall_ii" (func $44))
+ (export "dynCall_iiii" (func $45))
+ (export "dynCall_vi" (func $46))
+ (func $0 (; 13 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (local.get $0)
+    )
+   )
+   (global.set $global$1
+    (i32.and
+     (i32.add
+      (global.get $global$1)
+      (i32.const 15)
+     )
+     (i32.const -16)
+    )
+   )
+   (local.get $1)
   )
-  (func $1 (;14;) (type $3) (result i32)
-    global.get $global$1
+ )
+ (func $1 (; 14 ;) (type $3) (result i32)
+  (global.get $global$1)
+ )
+ (func $2 (; 15 ;) (type $2) (param $0 i32)
+  (global.set $global$1
+   (local.get $0)
   )
-  (func $2 (;15;) (type $2) (param $0 i32)
-    local.get $0
-    global.set $global$1
+ )
+ (func $3 (; 16 ;) (type $5) (param $0 i32) (param $1 i32)
+  (block $label$1
+   (global.set $global$1
+    (local.get $0)
+   )
+   (global.set $global$2
+    (local.get $1)
+   )
   )
-  (func $3 (;16;) (type $5) (param $0 i32) (param $1 i32)
-    block $label$1 ;; label = @1
-      local.get $0
-      global.set $global$1
-      local.get $1
-      global.set $global$2
-    end
+ )
+ (func $4 (; 17 ;) (type $5) (param $0 i32) (param $1 i32)
+  (if
+   (i32.eqz
+    (global.get $global$3)
+   )
+   (block
+    (global.set $global$3
+     (local.get $0)
+    )
+    (global.set $global$4
+     (local.get $1)
+    )
+   )
   )
-  (func $4 (;17;) (type $5) (param $0 i32) (param $1 i32)
-    global.get $global$3
-    i32.eqz
-    if ;; label = @1
-      block ;; label = @2
-        local.get $0
-        global.set $global$3
-        local.get $1
-        global.set $global$4
-      end
-    end
+ )
+ (func $5 (; 18 ;) (type $2) (param $0 i32)
+  (global.set $global$5
+   (local.get $0)
   )
-  (func $5 (;18;) (type $2) (param $0 i32)
-    local.get $0
-    global.set $global$5
+ )
+ (func $6 (; 19 ;) (type $3) (result i32)
+  (global.get $global$5)
+ )
+ (func $7 (; 20 ;) (type $3) (result i32)
+  (local $0 i32)
+  (block $label$1 (result i32)
+   (i32.store
+    (i32.const 3584)
+    (i32.add
+     (local.tee $0
+      (i32.load
+       (i32.const 3584)
+      )
+     )
+     (i32.const 1)
+    )
+   )
+   (i32.and
+    (local.get $0)
+    (i32.const 16384)
+   )
   )
-  (func $6 (;19;) (type $3) (result i32)
-    global.get $global$5
+ )
+ (func $8 (; 21 ;) (type $4) (param $0 i32) (param $1 i32) (result i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 16)
+    )
+   )
+   (local.set $2
+    (local.get $4)
+   )
+   (block $label$2
+    (block $label$3
+     (br_if $label$3
+      (i32.le_s
+       (local.get $0)
+       (i32.const 1)
+      )
+     )
+     (block $label$4
+      (block $label$5
+       (block $label$6
+        (block $label$7
+         (block $label$8
+          (block $label$9
+           (block $label$10
+            (br_table $label$5 $label$10 $label$8 $label$9 $label$7 $label$6 $label$4
+             (i32.sub
+              (local.tee $0
+               (i32.load8_s
+                (i32.load offset=4
+                 (local.get $1)
+                )
+               )
+              )
+              (i32.const 48)
+             )
+            )
+           )
+           (local.set $3
+            (i32.const 75)
+           )
+           (br $label$2)
+          )
+          (br $label$3)
+         )
+         (local.set $3
+          (i32.const 625)
+         )
+         (br $label$2)
+        )
+        (local.set $3
+         (i32.const 6250)
+        )
+        (br $label$2)
+       )
+       (local.set $3
+        (i32.const 12500)
+       )
+       (br $label$2)
+      )
+      (global.set $global$1
+       (local.get $4)
+      )
+      (return
+       (i32.const 0)
+      )
+     )
+     (i32.store
+      (local.get $2)
+      (i32.add
+       (local.get $0)
+       (i32.const -48)
+      )
+     )
+     (drop
+      (call $34
+       (i32.const 1140)
+       (local.get $2)
+      )
+     )
+     (global.set $global$1
+      (local.get $4)
+     )
+     (return
+      (i32.const -1)
+     )
+    )
+    (local.set $3
+     (i32.const 1250)
+    )
+   )
+   (local.set $1
+    (i32.const 0)
+   )
+   (local.set $0
+    (i32.const 0)
+   )
+   (loop $label$11
+    (local.set $2
+     (i32.const 0)
+    )
+    (loop $label$12
+     (local.set $0
+      (block $label$13 (result i32)
+       (block $label$14
+        (br_if $label$14
+         (i32.eqz
+          (call $7)
+         )
+        )
+        (br_if $label$14
+         (i32.eqz
+          (call $7)
+         )
+        )
+        (br $label$13
+         (i32.add
+          (local.get $0)
+          (i32.const 17)
+         )
+        )
+       )
+       (i32.add
+        (local.get $0)
+        (i32.const 19)
+       )
+      )
+     )
+     (block $label$15
+      (block $label$16
+       (br_if $label$16
+        (call $7)
+       )
+       (br_if $label$16
+        (call $7)
+       )
+       (br $label$15)
+      )
+      (local.set $0
+       (i32.add
+        (local.get $0)
+        (i32.const 23)
+       )
+      )
+     )
+     (br_if $label$12
+      (i32.lt_s
+       (local.tee $2
+        (i32.add
+         (local.get $2)
+         (i32.const 1)
+        )
+       )
+       (local.get $3)
+      )
+     )
+    )
+    (br_if $label$11
+     (i32.ne
+      (local.tee $1
+       (i32.add
+        (local.get $1)
+        (i32.const 1)
+       )
+      )
+      (i32.const 27000)
+     )
+    )
+   )
+   (drop
+    (call $35
+     (i32.const 1152)
+    )
+   )
+   (global.set $global$1
+    (local.get $4)
+   )
+   (local.get $0)
   )
-  (func $7 (;20;) (type $3) (result i32)
-    (local $0 i32)
-    block $label$1 (result i32) ;; label = @1
-      i32.const 3584
-      i32.const 3584
-      i32.load
-      local.tee $0
-      i32.const 1
-      i32.add
-      i32.store
-      local.get $0
-      i32.const 16384
-      i32.and
-    end
+ )
+ (func $9 (; 22 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 16)
+    )
+   )
+   (i32.store
+    (local.tee $2
+     (local.get $1)
+    )
+    (i32.load offset=60
+     (local.get $0)
+    )
+   )
+   (local.set $0
+    (call $11
+     (call $fimport$8
+      (i32.const 6)
+      (local.get $2)
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $1)
+   )
+   (local.get $0)
   )
-  (func $8 (;21;) (type $4) (param $0 i32) (param $1 i32) (result i32)
-    (local $2 i32) (local $3 i32) (local $4 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $4
-      global.get $global$1
-      i32.const 16
-      i32.add
-      global.set $global$1
-      local.get $4
-      local.set $2
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          local.get $0
-          i32.const 1
-          i32.le_s
-          br_if 0 (;@3;)
-          block $label$4 ;; label = @4
-            block $label$5 ;; label = @5
-              block $label$6 ;; label = @6
-                block $label$7 ;; label = @7
-                  block $label$8 ;; label = @8
-                    block $label$9 ;; label = @9
-                      block $label$10 ;; label = @10
-                        local.get $1
-                        i32.load offset=4
-                        i32.load8_s
-                        local.tee $0
-                        i32.const 48
-                        i32.sub
-                        br_table 5 (;@5;) 0 (;@10;) 2 (;@8;) 1 (;@9;) 3 (;@7;) 4 (;@6;) 6 (;@4;)
-                      end
-                      i32.const 75
-                      local.set $3
-                      br 7 (;@2;)
-                    end
-                    br 5 (;@3;)
-                  end
-                  i32.const 625
-                  local.set $3
-                  br 5 (;@2;)
-                end
-                i32.const 6250
-                local.set $3
-                br 4 (;@2;)
-              end
-              i32.const 12500
-              local.set $3
-              br 3 (;@2;)
-            end
-            local.get $4
-            global.set $global$1
-            i32.const 0
-            return
-          end
-          local.get $2
-          local.get $0
-          i32.const -48
-          i32.add
-          i32.store
-          i32.const 1140
-          local.get $2
-          call $34
-          drop
-          local.get $4
-          global.set $global$1
-          i32.const -1
-          return
-        end
-        i32.const 1250
-        local.set $3
-      end
-      i32.const 0
-      local.set $1
-      i32.const 0
-      local.set $0
-      loop $label$11 ;; label = @2
-        i32.const 0
-        local.set $2
-        loop $label$12 ;; label = @3
-          block $label$13 (result i32) ;; label = @4
-            block $label$14 ;; label = @5
-              call $7
-              i32.eqz
-              br_if 0 (;@5;)
-              call $7
-              i32.eqz
-              br_if 0 (;@5;)
-              local.get $0
-              i32.const 17
-              i32.add
-              br 1 (;@4;)
-            end
-            local.get $0
-            i32.const 19
-            i32.add
-          end
-          local.set $0
-          block $label$15 ;; label = @4
-            block $label$16 ;; label = @5
-              call $7
-              br_if 0 (;@5;)
-              call $7
-              br_if 0 (;@5;)
-              br 1 (;@4;)
-            end
-            local.get $0
-            i32.const 23
-            i32.add
-            local.set $0
-          end
-          local.get $2
-          i32.const 1
-          i32.add
-          local.tee $2
-          local.get $3
-          i32.lt_s
-          br_if 0 (;@3;)
-        end
-        local.get $1
-        i32.const 1
-        i32.add
-        local.tee $1
-        i32.const 27000
-        i32.ne
-        br_if 0 (;@2;)
-      end
-      i32.const 1152
-      call $35
-      drop
-      local.get $4
-      global.set $global$1
-      local.get $0
-    end
+ )
+ (func $10 (; 23 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 32)
+    )
+   )
+   (i32.store
+    (local.tee $3
+     (local.get $4)
+    )
+    (i32.load offset=60
+     (local.get $0)
+    )
+   )
+   (i32.store offset=4
+    (local.get $3)
+    (i32.const 0)
+   )
+   (i32.store offset=8
+    (local.get $3)
+    (local.get $1)
+   )
+   (i32.store offset=12
+    (local.get $3)
+    (local.tee $0
+     (i32.add
+      (local.get $4)
+      (i32.const 20)
+     )
+    )
+   )
+   (i32.store offset=16
+    (local.get $3)
+    (local.get $2)
+   )
+   (local.set $0
+    (if (result i32)
+     (i32.lt_s
+      (call $11
+       (call $fimport$14
+        (i32.const 140)
+        (local.get $3)
+       )
+      )
+      (i32.const 0)
+     )
+     (block (result i32)
+      (i32.store
+       (local.get $0)
+       (i32.const -1)
+      )
+      (i32.const -1)
+     )
+     (i32.load
+      (local.get $0)
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $4)
+   )
+   (local.get $0)
   )
-  (func $9 (;22;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $1
-      global.get $global$1
-      i32.const 16
-      i32.add
-      global.set $global$1
-      local.get $1
-      local.tee $2
-      local.get $0
-      i32.load offset=60
-      i32.store
-      i32.const 6
-      local.get $2
-      call $fimport$8
-      call $11
-      local.set $0
-      local.get $1
-      global.set $global$1
-      local.get $0
-    end
+ )
+ (func $11 (; 24 ;) (type $1) (param $0 i32) (result i32)
+  (if (result i32)
+   (i32.gt_u
+    (local.get $0)
+    (i32.const -4096)
+   )
+   (block (result i32)
+    (i32.store
+     (call $12)
+     (i32.sub
+      (i32.const 0)
+      (local.get $0)
+     )
+    )
+    (i32.const -1)
+   )
+   (local.get $0)
   )
-  (func $10 (;23;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $4
-      global.get $global$1
-      i32.const 32
-      i32.add
-      global.set $global$1
-      local.get $4
-      local.tee $3
-      local.get $0
-      i32.load offset=60
-      i32.store
-      local.get $3
-      i32.const 0
-      i32.store offset=4
-      local.get $3
-      local.get $1
-      i32.store offset=8
-      local.get $3
-      local.get $4
-      i32.const 20
-      i32.add
-      local.tee $0
-      i32.store offset=12
-      local.get $3
-      local.get $2
-      i32.store offset=16
-      i32.const 140
-      local.get $3
-      call $fimport$14
-      call $11
-      i32.const 0
-      i32.lt_s
-      if (result i32) ;; label = @2
-        block (result i32) ;; label = @3
-          local.get $0
-          i32.const -1
-          i32.store
-          i32.const -1
-        end
-      else
-        local.get $0
-        i32.load
-      end
-      local.set $0
-      local.get $4
-      global.set $global$1
-      local.get $0
-    end
+ )
+ (func $12 (; 25 ;) (type $3) (result i32)
+  (i32.const 3632)
+ )
+ (func $13 (; 26 ;) (type $2) (param $0 i32)
+  (nop)
+ )
+ (func $14 (; 27 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 80)
+    )
+   )
+   (local.set $3
+    (local.get $4)
+   )
+   (local.set $5
+    (i32.add
+     (local.get $4)
+     (i32.const 12)
+    )
+   )
+   (i32.store offset=36
+    (local.get $0)
+    (i32.const 3)
+   )
+   (if
+    (i32.eqz
+     (i32.and
+      (i32.load
+       (local.get $0)
+      )
+      (i32.const 64)
+     )
+    )
+    (block
+     (i32.store
+      (local.get $3)
+      (i32.load offset=60
+       (local.get $0)
+      )
+     )
+     (i32.store offset=4
+      (local.get $3)
+      (i32.const 21505)
+     )
+     (i32.store offset=8
+      (local.get $3)
+      (local.get $5)
+     )
+     (if
+      (call $fimport$13
+       (i32.const 54)
+       (local.get $3)
+      )
+      (i32.store8 offset=75
+       (local.get $0)
+       (i32.const -1)
+      )
+     )
+    )
+   )
+   (local.set $0
+    (call $15
+     (local.get $0)
+     (local.get $1)
+     (local.get $2)
+    )
+   )
+   (global.set $global$1
+    (local.get $4)
+   )
+   (local.get $0)
   )
-  (func $11 (;24;) (type $1) (param $0 i32) (result i32)
-    local.get $0
-    i32.const -4096
-    i32.gt_u
-    if (result i32) ;; label = @1
-      block (result i32) ;; label = @2
-        call $12
-        i32.const 0
-        local.get $0
-        i32.sub
-        i32.store
-        i32.const -1
-      end
-    else
-      local.get $0
-    end
+ )
+ (func $15 (; 28 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (block $label$1 (result i32)
+   (local.set $8
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 48)
+    )
+   )
+   (local.set $9
+    (i32.add
+     (local.get $8)
+     (i32.const 16)
+    )
+   )
+   (local.set $10
+    (local.get $8)
+   )
+   (i32.store
+    (local.tee $3
+     (i32.add
+      (local.get $8)
+      (i32.const 32)
+     )
+    )
+    (local.tee $4
+     (i32.load
+      (local.tee $6
+       (i32.add
+        (local.get $0)
+        (i32.const 28)
+       )
+      )
+     )
+    )
+   )
+   (i32.store offset=4
+    (local.get $3)
+    (local.tee $5
+     (i32.sub
+      (i32.load
+       (local.tee $11
+        (i32.add
+         (local.get $0)
+         (i32.const 20)
+        )
+       )
+      )
+      (local.get $4)
+     )
+    )
+   )
+   (i32.store offset=8
+    (local.get $3)
+    (local.get $1)
+   )
+   (i32.store offset=12
+    (local.get $3)
+    (local.get $2)
+   )
+   (local.set $13
+    (i32.add
+     (local.get $0)
+     (i32.const 60)
+    )
+   )
+   (local.set $14
+    (i32.add
+     (local.get $0)
+     (i32.const 44)
+    )
+   )
+   (local.set $1
+    (local.get $3)
+   )
+   (local.set $4
+    (i32.const 2)
+   )
+   (local.set $12
+    (i32.add
+     (local.get $5)
+     (local.get $2)
+    )
+   )
+   (block $label$2
+    (block $label$3
+     (block $label$4
+      (loop $label$5
+       (if
+        (i32.load
+         (i32.const 3588)
+        )
+        (block
+         (call $fimport$9
+          (i32.const 1)
+          (local.get $0)
+         )
+         (i32.store
+          (local.get $10)
+          (i32.load
+           (local.get $13)
+          )
+         )
+         (i32.store offset=4
+          (local.get $10)
+          (local.get $1)
+         )
+         (i32.store offset=8
+          (local.get $10)
+          (local.get $4)
+         )
+         (local.set $3
+          (call $11
+           (call $fimport$15
+            (i32.const 146)
+            (local.get $10)
+           )
+          )
+         )
+         (call $fimport$7
+          (i32.const 0)
+         )
+        )
+        (block
+         (i32.store
+          (local.get $9)
+          (i32.load
+           (local.get $13)
+          )
+         )
+         (i32.store offset=4
+          (local.get $9)
+          (local.get $1)
+         )
+         (i32.store offset=8
+          (local.get $9)
+          (local.get $4)
+         )
+         (local.set $3
+          (call $11
+           (call $fimport$15
+            (i32.const 146)
+            (local.get $9)
+           )
+          )
+         )
+        )
+       )
+       (br_if $label$4
+        (i32.eq
+         (local.get $12)
+         (local.get $3)
+        )
+       )
+       (br_if $label$3
+        (i32.lt_s
+         (local.get $3)
+         (i32.const 0)
+        )
+       )
+       (local.set $5
+        (if (result i32)
+         (i32.gt_u
+          (local.get $3)
+          (local.tee $5
+           (i32.load offset=4
+            (local.get $1)
+           )
+          )
+         )
+         (block (result i32)
+          (i32.store
+           (local.get $6)
+           (local.tee $7
+            (i32.load
+             (local.get $14)
+            )
+           )
+          )
+          (i32.store
+           (local.get $11)
+           (local.get $7)
+          )
+          (local.set $7
+           (i32.load offset=12
+            (local.get $1)
+           )
+          )
+          (local.set $1
+           (i32.add
+            (local.get $1)
+            (i32.const 8)
+           )
+          )
+          (local.set $4
+           (i32.add
+            (local.get $4)
+            (i32.const -1)
+           )
+          )
+          (i32.sub
+           (local.get $3)
+           (local.get $5)
+          )
+         )
+         (if (result i32)
+          (i32.eq
+           (local.get $4)
+           (i32.const 2)
+          )
+          (block (result i32)
+           (i32.store
+            (local.get $6)
+            (i32.add
+             (i32.load
+              (local.get $6)
+             )
+             (local.get $3)
+            )
+           )
+           (local.set $7
+            (local.get $5)
+           )
+           (local.set $4
+            (i32.const 2)
+           )
+           (local.get $3)
+          )
+          (block (result i32)
+           (local.set $7
+            (local.get $5)
+           )
+           (local.get $3)
+          )
+         )
+        )
+       )
+       (i32.store
+        (local.get $1)
+        (i32.add
+         (i32.load
+          (local.get $1)
+         )
+         (local.get $5)
+        )
+       )
+       (i32.store offset=4
+        (local.get $1)
+        (i32.sub
+         (local.get $7)
+         (local.get $5)
+        )
+       )
+       (local.set $12
+        (i32.sub
+         (local.get $12)
+         (local.get $3)
+        )
+       )
+       (br $label$5)
+      )
+     )
+     (i32.store offset=16
+      (local.get $0)
+      (i32.add
+       (local.tee $1
+        (i32.load
+         (local.get $14)
+        )
+       )
+       (i32.load offset=48
+        (local.get $0)
+       )
+      )
+     )
+     (i32.store
+      (local.get $6)
+      (local.get $1)
+     )
+     (i32.store
+      (local.get $11)
+      (local.get $1)
+     )
+     (br $label$2)
+    )
+    (i32.store offset=16
+     (local.get $0)
+     (i32.const 0)
+    )
+    (i32.store
+     (local.get $6)
+     (i32.const 0)
+    )
+    (i32.store
+     (local.get $11)
+     (i32.const 0)
+    )
+    (i32.store
+     (local.get $0)
+     (i32.or
+      (i32.load
+       (local.get $0)
+      )
+      (i32.const 32)
+     )
+    )
+    (local.set $2
+     (if (result i32)
+      (i32.eq
+       (local.get $4)
+       (i32.const 2)
+      )
+      (i32.const 0)
+      (i32.sub
+       (local.get $2)
+       (i32.load offset=4
+        (local.get $1)
+       )
+      )
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $8)
+   )
+   (local.get $2)
   )
-  (func $12 (;25;) (type $3) (result i32)
-    i32.const 3632
+ )
+ (func $16 (; 29 ;) (type $2) (param $0 i32)
+  (if
+   (i32.eqz
+    (i32.load offset=68
+     (local.get $0)
+    )
+   )
+   (call $13
+    (local.get $0)
+   )
   )
-  (func $13 (;26;) (type $2) (param $0 i32)
-    nop
+ )
+ (func $17 (; 30 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (block $label$1 (result i32)
+   (local.set $5
+    (i32.and
+     (local.get $1)
+     (i32.const 255)
+    )
+   )
+   (block $label$2
+    (block $label$3
+     (block $label$4
+      (if
+       (i32.and
+        (local.tee $4
+         (i32.ne
+          (local.get $2)
+          (i32.const 0)
+         )
+        )
+        (i32.ne
+         (i32.and
+          (local.get $0)
+          (i32.const 3)
+         )
+         (i32.const 0)
+        )
+       )
+       (block
+        (local.set $4
+         (i32.and
+          (local.get $1)
+          (i32.const 255)
+         )
+        )
+        (local.set $3
+         (local.get $2)
+        )
+        (local.set $2
+         (local.get $0)
+        )
+        (loop $label$6
+         (if
+          (i32.eq
+           (i32.load8_s
+            (local.get $2)
+           )
+           (i32.shr_s
+            (i32.shl
+             (local.get $4)
+             (i32.const 24)
+            )
+            (i32.const 24)
+           )
+          )
+          (block
+           (local.set $0
+            (local.get $3)
+           )
+           (br $label$3)
+          )
+         )
+         (br_if $label$6
+          (i32.and
+           (local.tee $0
+            (i32.ne
+             (local.tee $3
+              (i32.add
+               (local.get $3)
+               (i32.const -1)
+              )
+             )
+             (i32.const 0)
+            )
+           )
+           (i32.ne
+            (i32.and
+             (local.tee $2
+              (i32.add
+               (local.get $2)
+               (i32.const 1)
+              )
+             )
+             (i32.const 3)
+            )
+            (i32.const 0)
+           )
+          )
+         )
+         (br $label$4)
+        )
+       )
+       (block
+        (local.set $3
+         (local.get $2)
+        )
+        (local.set $2
+         (local.get $0)
+        )
+        (local.set $0
+         (local.get $4)
+        )
+       )
+      )
+     )
+     (if
+      (local.get $0)
+      (block
+       (local.set $0
+        (local.get $3)
+       )
+       (br $label$3)
+      )
+      (local.set $0
+       (i32.const 0)
+      )
+     )
+     (br $label$2)
+    )
+    (if
+     (i32.ne
+      (i32.load8_s
+       (local.get $2)
+      )
+      (i32.shr_s
+       (i32.shl
+        (local.tee $1
+         (i32.and
+          (local.get $1)
+          (i32.const 255)
+         )
+        )
+        (i32.const 24)
+       )
+       (i32.const 24)
+      )
+     )
+     (block
+      (local.set $3
+       (i32.mul
+        (local.get $5)
+        (i32.const 16843009)
+       )
+      )
+      (block $label$12
+       (block $label$13
+        (br_if $label$13
+         (i32.le_u
+          (local.get $0)
+          (i32.const 3)
+         )
+        )
+        (loop $label$14
+         (if
+          (i32.eqz
+           (i32.and
+            (i32.xor
+             (i32.and
+              (local.tee $4
+               (i32.xor
+                (i32.load
+                 (local.get $2)
+                )
+                (local.get $3)
+               )
+              )
+              (i32.const -2139062144)
+             )
+             (i32.const -2139062144)
+            )
+            (i32.add
+             (local.get $4)
+             (i32.const -16843009)
+            )
+           )
+          )
+          (block
+           (local.set $2
+            (i32.add
+             (local.get $2)
+             (i32.const 4)
+            )
+           )
+           (br_if $label$14
+            (i32.gt_u
+             (local.tee $0
+              (i32.add
+               (local.get $0)
+               (i32.const -4)
+              )
+             )
+             (i32.const 3)
+            )
+           )
+           (br $label$13)
+          )
+         )
+        )
+        (br $label$12)
+       )
+       (if
+        (i32.eqz
+         (local.get $0)
+        )
+        (block
+         (local.set $0
+          (i32.const 0)
+         )
+         (br $label$2)
+        )
+       )
+      )
+      (loop $label$17
+       (br_if $label$2
+        (i32.eq
+         (i32.load8_s
+          (local.get $2)
+         )
+         (i32.shr_s
+          (i32.shl
+           (local.get $1)
+           (i32.const 24)
+          )
+          (i32.const 24)
+         )
+        )
+       )
+       (local.set $2
+        (i32.add
+         (local.get $2)
+         (i32.const 1)
+        )
+       )
+       (br_if $label$17
+        (local.tee $0
+         (i32.add
+          (local.get $0)
+          (i32.const -1)
+         )
+        )
+       )
+       (local.set $0
+        (i32.const 0)
+       )
+      )
+     )
+    )
+   )
+   (if (result i32)
+    (local.get $0)
+    (local.get $2)
+    (i32.const 0)
+   )
   )
-  (func $14 (;27;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $4
-      global.get $global$1
-      i32.const 80
-      i32.add
-      global.set $global$1
-      local.get $4
-      local.set $3
-      local.get $4
-      i32.const 12
-      i32.add
-      local.set $5
-      local.get $0
-      i32.const 3
-      i32.store offset=36
-      local.get $0
-      i32.load
-      i32.const 64
-      i32.and
-      i32.eqz
-      if ;; label = @2
-        block ;; label = @3
-          local.get $3
-          local.get $0
-          i32.load offset=60
-          i32.store
-          local.get $3
-          i32.const 21505
-          i32.store offset=4
-          local.get $3
-          local.get $5
-          i32.store offset=8
-          i32.const 54
-          local.get $3
-          call $fimport$13
-          if ;; label = @4
-            local.get $0
-            i32.const -1
-            i32.store8 offset=75
-          end
-        end
-      end
-      local.get $0
-      local.get $1
-      local.get $2
-      call $15
-      local.set $0
-      local.get $4
-      global.set $global$1
-      local.get $0
-    end
+ )
+ (func $18 (; 31 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 224)
+    )
+   )
+   (local.set $5
+    (i32.add
+     (local.get $4)
+     (i32.const 136)
+    )
+   )
+   (i64.store align=4
+    (local.tee $3
+     (i32.add
+      (local.get $4)
+      (i32.const 80)
+     )
+    )
+    (i64.const 0)
+   )
+   (i64.store offset=8 align=4
+    (local.get $3)
+    (i64.const 0)
+   )
+   (i64.store offset=16 align=4
+    (local.get $3)
+    (i64.const 0)
+   )
+   (i64.store offset=24 align=4
+    (local.get $3)
+    (i64.const 0)
+   )
+   (i64.store offset=32 align=4
+    (local.get $3)
+    (i64.const 0)
+   )
+   (i32.store
+    (local.tee $6
+     (i32.add
+      (local.get $4)
+      (i32.const 120)
+     )
+    )
+    (i32.load
+     (local.get $2)
+    )
+   )
+   (if
+    (i32.lt_s
+     (call $19
+      (i32.const 0)
+      (local.get $1)
+      (local.get $6)
+      (local.tee $2
+       (local.get $4)
+      )
+      (local.get $3)
+     )
+     (i32.const 0)
+    )
+    (local.set $1
+     (i32.const -1)
+    )
+    (block
+     (local.set $12
+      (if (result i32)
+       (i32.gt_s
+        (i32.load offset=76
+         (local.get $0)
+        )
+        (i32.const -1)
+       )
+       (call $20
+        (local.get $0)
+       )
+       (i32.const 0)
+      )
+     )
+     (local.set $7
+      (i32.load
+       (local.get $0)
+      )
+     )
+     (if
+      (i32.lt_s
+       (i32.load8_s offset=74
+        (local.get $0)
+       )
+       (i32.const 1)
+      )
+      (i32.store
+       (local.get $0)
+       (i32.and
+        (local.get $7)
+        (i32.const -33)
+       )
+      )
+     )
+     (if
+      (i32.load
+       (local.tee $8
+        (i32.add
+         (local.get $0)
+         (i32.const 48)
+        )
+       )
+      )
+      (local.set $1
+       (call $19
+        (local.get $0)
+        (local.get $1)
+        (local.get $6)
+        (local.get $2)
+        (local.get $3)
+       )
+      )
+      (block
+       (local.set $10
+        (i32.load
+         (local.tee $9
+          (i32.add
+           (local.get $0)
+           (i32.const 44)
+          )
+         )
+        )
+       )
+       (i32.store
+        (local.get $9)
+        (local.get $5)
+       )
+       (i32.store
+        (local.tee $13
+         (i32.add
+          (local.get $0)
+          (i32.const 28)
+         )
+        )
+        (local.get $5)
+       )
+       (i32.store
+        (local.tee $11
+         (i32.add
+          (local.get $0)
+          (i32.const 20)
+         )
+        )
+        (local.get $5)
+       )
+       (i32.store
+        (local.get $8)
+        (i32.const 80)
+       )
+       (i32.store
+        (local.tee $14
+         (i32.add
+          (local.get $0)
+          (i32.const 16)
+         )
+        )
+        (i32.add
+         (local.get $5)
+         (i32.const 80)
+        )
+       )
+       (local.set $1
+        (call $19
+         (local.get $0)
+         (local.get $1)
+         (local.get $6)
+         (local.get $2)
+         (local.get $3)
+        )
+       )
+       (if
+        (local.get $10)
+        (block
+         (drop
+          (call_indirect (type $0)
+           (local.get $0)
+           (i32.const 0)
+           (i32.const 0)
+           (i32.add
+            (i32.and
+             (i32.load offset=36
+              (local.get $0)
+             )
+             (i32.const 3)
+            )
+            (i32.const 2)
+           )
+          )
+         )
+         (if
+          (i32.eqz
+           (i32.load
+            (local.get $11)
+           )
+          )
+          (local.set $1
+           (i32.const -1)
+          )
+         )
+         (i32.store
+          (local.get $9)
+          (local.get $10)
+         )
+         (i32.store
+          (local.get $8)
+          (i32.const 0)
+         )
+         (i32.store
+          (local.get $14)
+          (i32.const 0)
+         )
+         (i32.store
+          (local.get $13)
+          (i32.const 0)
+         )
+         (i32.store
+          (local.get $11)
+          (i32.const 0)
+         )
+        )
+       )
+      )
+     )
+     (i32.store
+      (local.get $0)
+      (i32.or
+       (local.tee $2
+        (i32.load
+         (local.get $0)
+        )
+       )
+       (i32.and
+        (local.get $7)
+        (i32.const 32)
+       )
+      )
+     )
+     (if
+      (local.get $12)
+      (call $13
+       (local.get $0)
+      )
+     )
+     (if
+      (i32.and
+       (local.get $2)
+       (i32.const 32)
+      )
+      (local.set $1
+       (i32.const -1)
+      )
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $4)
+   )
+   (local.get $1)
   )
-  (func $15 (;28;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $8
-      global.get $global$1
-      i32.const 48
-      i32.add
-      global.set $global$1
-      local.get $8
-      i32.const 16
-      i32.add
-      local.set $9
-      local.get $8
-      local.set $10
-      local.get $8
-      i32.const 32
-      i32.add
-      local.tee $3
-      local.get $0
-      i32.const 28
-      i32.add
-      local.tee $6
-      i32.load
-      local.tee $4
-      i32.store
-      local.get $3
-      local.get $0
-      i32.const 20
-      i32.add
-      local.tee $11
-      i32.load
-      local.get $4
-      i32.sub
-      local.tee $5
-      i32.store offset=4
-      local.get $3
-      local.get $1
-      i32.store offset=8
-      local.get $3
-      local.get $2
-      i32.store offset=12
-      local.get $0
-      i32.const 60
-      i32.add
-      local.set $13
-      local.get $0
-      i32.const 44
-      i32.add
-      local.set $14
-      local.get $3
-      local.set $1
-      i32.const 2
-      local.set $4
-      local.get $5
-      local.get $2
-      i32.add
-      local.set $12
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            loop $label$5 ;; label = @5
-              i32.const 3588
-              i32.load
-              if ;; label = @6
-                block ;; label = @7
-                  i32.const 1
-                  local.get $0
-                  call $fimport$9
-                  local.get $10
-                  local.get $13
-                  i32.load
-                  i32.store
-                  local.get $10
-                  local.get $1
-                  i32.store offset=4
-                  local.get $10
-                  local.get $4
-                  i32.store offset=8
-                  i32.const 146
-                  local.get $10
-                  call $fimport$15
-                  call $11
-                  local.set $3
-                  i32.const 0
-                  call $fimport$7
-                end
-              else
-                block ;; label = @7
-                  local.get $9
-                  local.get $13
-                  i32.load
-                  i32.store
-                  local.get $9
-                  local.get $1
-                  i32.store offset=4
-                  local.get $9
-                  local.get $4
-                  i32.store offset=8
-                  i32.const 146
-                  local.get $9
-                  call $fimport$15
-                  call $11
-                  local.set $3
-                end
-              end
-              local.get $12
-              local.get $3
-              i32.eq
-              br_if 1 (;@4;)
-              local.get $3
-              i32.const 0
-              i32.lt_s
-              br_if 2 (;@3;)
-              local.get $3
-              local.get $1
-              i32.load offset=4
-              local.tee $5
-              i32.gt_u
-              if (result i32) ;; label = @6
-                block (result i32) ;; label = @7
-                  local.get $6
-                  local.get $14
-                  i32.load
-                  local.tee $7
-                  i32.store
-                  local.get $11
-                  local.get $7
-                  i32.store
-                  local.get $1
-                  i32.load offset=12
-                  local.set $7
-                  local.get $1
-                  i32.const 8
-                  i32.add
-                  local.set $1
-                  local.get $4
-                  i32.const -1
-                  i32.add
-                  local.set $4
-                  local.get $3
-                  local.get $5
-                  i32.sub
-                end
-              else
-                local.get $4
-                i32.const 2
-                i32.eq
-                if (result i32) ;; label = @7
-                  block (result i32) ;; label = @8
-                    local.get $6
-                    local.get $6
-                    i32.load
-                    local.get $3
-                    i32.add
-                    i32.store
-                    local.get $5
-                    local.set $7
-                    i32.const 2
-                    local.set $4
-                    local.get $3
-                  end
-                else
-                  block (result i32) ;; label = @8
-                    local.get $5
-                    local.set $7
-                    local.get $3
-                  end
-                end
-              end
-              local.set $5
-              local.get $1
-              local.get $1
-              i32.load
-              local.get $5
-              i32.add
-              i32.store
-              local.get $1
-              local.get $7
-              local.get $5
-              i32.sub
-              i32.store offset=4
-              local.get $12
-              local.get $3
-              i32.sub
-              local.set $12
-              br 0 (;@5;)
-            end
-          end
-          local.get $0
-          local.get $14
-          i32.load
-          local.tee $1
-          local.get $0
-          i32.load offset=48
-          i32.add
-          i32.store offset=16
-          local.get $6
-          local.get $1
-          i32.store
-          local.get $11
-          local.get $1
-          i32.store
-          br 1 (;@2;)
-        end
-        local.get $0
-        i32.const 0
-        i32.store offset=16
-        local.get $6
-        i32.const 0
-        i32.store
-        local.get $11
-        i32.const 0
-        i32.store
-        local.get $0
-        local.get $0
-        i32.load
-        i32.const 32
-        i32.or
-        i32.store
-        local.get $4
-        i32.const 2
-        i32.eq
-        if (result i32) ;; label = @3
-          i32.const 0
-        else
-          local.get $2
-          local.get $1
-          i32.load offset=4
-          i32.sub
-        end
-        local.set $2
-      end
-      local.get $8
-      global.set $global$1
-      local.get $2
-    end
+ )
+ (func $19 (; 32 ;) (type $7) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (result i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (local $15 i32)
+  (local $16 i32)
+  (local $17 i32)
+  (local $18 i32)
+  (local $19 i32)
+  (local $20 i32)
+  (local $21 i32)
+  (local $22 i32)
+  (local $23 i32)
+  (local $24 i32)
+  (local $25 i32)
+  (local $26 i32)
+  (local $27 i32)
+  (local $28 i32)
+  (local $29 i32)
+  (local $30 i32)
+  (local $31 i32)
+  (local $32 i32)
+  (local $33 i32)
+  (local $34 i32)
+  (local $35 i32)
+  (local $36 i32)
+  (local $37 i32)
+  (local $38 i32)
+  (local $39 i32)
+  (local $40 i32)
+  (local $41 i32)
+  (local $42 i32)
+  (local $43 i32)
+  (local $44 i32)
+  (local $45 i32)
+  (local $46 i32)
+  (local $47 i32)
+  (local $48 i32)
+  (local $49 i32)
+  (local $50 i64)
+  (local $51 i64)
+  (local $52 f64)
+  (local $53 f64)
+  (block $label$1 (result i32)
+   (local.set $23
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 624)
+    )
+   )
+   (local.set $20
+    (i32.add
+     (local.get $23)
+     (i32.const 16)
+    )
+   )
+   (local.set $16
+    (local.get $23)
+   )
+   (local.set $36
+    (i32.add
+     (local.get $23)
+     (i32.const 528)
+    )
+   )
+   (local.set $30
+    (i32.ne
+     (local.get $0)
+     (i32.const 0)
+    )
+   )
+   (local.set $38
+    (local.tee $21
+     (i32.add
+      (local.tee $17
+       (i32.add
+        (local.get $23)
+        (i32.const 536)
+       )
+      )
+      (i32.const 40)
+     )
+    )
+   )
+   (local.set $39
+    (i32.add
+     (local.get $17)
+     (i32.const 39)
+    )
+   )
+   (local.set $42
+    (i32.add
+     (local.tee $37
+      (i32.add
+       (local.get $23)
+       (i32.const 8)
+      )
+     )
+     (i32.const 4)
+    )
+   )
+   (local.set $43
+    (i32.sub
+     (i32.const 0)
+     (local.tee $27
+      (local.tee $19
+       (i32.add
+        (local.get $23)
+        (i32.const 588)
+       )
+      )
+     )
+    )
+   )
+   (local.set $33
+    (i32.add
+     (local.tee $17
+      (i32.add
+       (local.get $23)
+       (i32.const 576)
+      )
+     )
+     (i32.const 12)
+    )
+   )
+   (local.set $40
+    (i32.add
+     (local.get $17)
+     (i32.const 11)
+    )
+   )
+   (local.set $44
+    (i32.sub
+     (local.tee $28
+      (local.get $33)
+     )
+     (local.get $27)
+    )
+   )
+   (local.set $45
+    (i32.sub
+     (i32.const -2)
+     (local.get $27)
+    )
+   )
+   (local.set $46
+    (i32.add
+     (local.get $28)
+     (i32.const 2)
+    )
+   )
+   (local.set $48
+    (i32.add
+     (local.tee $47
+      (i32.add
+       (local.get $23)
+       (i32.const 24)
+      )
+     )
+     (i32.const 288)
+    )
+   )
+   (local.set $41
+    (local.tee $31
+     (i32.add
+      (local.get $19)
+      (i32.const 9)
+     )
+    )
+   )
+   (local.set $34
+    (i32.add
+     (local.get $19)
+     (i32.const 8)
+    )
+   )
+   (local.set $15
+    (i32.const 0)
+   )
+   (local.set $10
+    (i32.const 0)
+   )
+   (local.set $17
+    (i32.const 0)
+   )
+   (block $label$2
+    (block $label$3
+     (loop $label$4
+      (block $label$5
+       (if
+        (i32.gt_s
+         (local.get $15)
+         (i32.const -1)
+        )
+        (local.set $15
+         (if (result i32)
+          (i32.gt_s
+           (local.get $10)
+           (i32.sub
+            (i32.const 2147483647)
+            (local.get $15)
+           )
+          )
+          (block (result i32)
+           (i32.store
+            (call $12)
+            (i32.const 75)
+           )
+           (i32.const -1)
+          )
+          (i32.add
+           (local.get $10)
+           (local.get $15)
+          )
+         )
+        )
+       )
+       (br_if $label$3
+        (i32.eqz
+         (i32.shr_s
+          (i32.shl
+           (local.tee $5
+            (i32.load8_s
+             (local.get $1)
+            )
+           )
+           (i32.const 24)
+          )
+          (i32.const 24)
+         )
+        )
+       )
+       (local.set $11
+        (local.get $1)
+       )
+       (block $label$9
+        (block $label$10
+         (loop $label$11
+          (block $label$12
+           (block $label$13
+            (block $label$14
+             (block $label$15
+              (br_table $label$14 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$15 $label$13
+               (i32.sub
+                (i32.shr_s
+                 (i32.shl
+                  (local.get $5)
+                  (i32.const 24)
+                 )
+                 (i32.const 24)
+                )
+                (i32.const 0)
+               )
+              )
+             )
+             (local.set $5
+              (local.get $11)
+             )
+             (br $label$10)
+            )
+            (local.set $5
+             (local.get $11)
+            )
+            (br $label$12)
+           )
+           (local.set $5
+            (i32.load8_s
+             (local.tee $11
+              (i32.add
+               (local.get $11)
+               (i32.const 1)
+              )
+             )
+            )
+           )
+           (br $label$11)
+          )
+         )
+         (br $label$9)
+        )
+        (loop $label$16
+         (br_if $label$9
+          (i32.ne
+           (i32.load8_s offset=1
+            (local.get $5)
+           )
+           (i32.const 37)
+          )
+         )
+         (local.set $11
+          (i32.add
+           (local.get $11)
+           (i32.const 1)
+          )
+         )
+         (br_if $label$16
+          (i32.eq
+           (i32.load8_s
+            (local.tee $5
+             (i32.add
+              (local.get $5)
+              (i32.const 2)
+             )
+            )
+           )
+           (i32.const 37)
+          )
+         )
+        )
+       )
+       (local.set $10
+        (i32.sub
+         (local.get $11)
+         (local.get $1)
+        )
+       )
+       (if
+        (local.get $30)
+        (if
+         (i32.eqz
+          (i32.and
+           (i32.load
+            (local.get $0)
+           )
+           (i32.const 32)
+          )
+         )
+         (drop
+          (call $21
+           (local.get $1)
+           (local.get $10)
+           (local.get $0)
+          )
+         )
+        )
+       )
+       (if
+        (local.get $10)
+        (block
+         (local.set $1
+          (local.get $5)
+         )
+         (br $label$4)
+        )
+       )
+       (local.set $10
+        (if (result i32)
+         (i32.lt_u
+          (local.tee $9
+           (i32.add
+            (i32.shr_s
+             (i32.shl
+              (local.tee $10
+               (i32.load8_s
+                (local.tee $11
+                 (i32.add
+                  (local.get $5)
+                  (i32.const 1)
+                 )
+                )
+               )
+              )
+              (i32.const 24)
+             )
+             (i32.const 24)
+            )
+            (i32.const -48)
+           )
+          )
+          (i32.const 10)
+         )
+         (block (result i32)
+          (local.set $10
+           (i32.add
+            (local.get $5)
+            (i32.const 3)
+           )
+          )
+          (if
+           (local.tee $12
+            (i32.eq
+             (i32.load8_s offset=2
+              (local.get $5)
+             )
+             (i32.const 36)
+            )
+           )
+           (local.set $11
+            (local.get $10)
+           )
+          )
+          (if
+           (local.get $12)
+           (local.set $17
+            (i32.const 1)
+           )
+          )
+          (local.set $5
+           (i32.load8_s
+            (local.get $11)
+           )
+          )
+          (if
+           (i32.eqz
+            (local.get $12)
+           )
+           (local.set $9
+            (i32.const -1)
+           )
+          )
+          (local.get $17)
+         )
+         (block (result i32)
+          (local.set $5
+           (local.get $10)
+          )
+          (local.set $9
+           (i32.const -1)
+          )
+          (local.get $17)
+         )
+        )
+       )
+       (block $label$25
+        (if
+         (i32.lt_u
+          (local.tee $12
+           (i32.add
+            (i32.shr_s
+             (i32.shl
+              (local.get $5)
+              (i32.const 24)
+             )
+             (i32.const 24)
+            )
+            (i32.const -32)
+           )
+          )
+          (i32.const 32)
+         )
+         (block
+          (local.set $17
+           (i32.const 0)
+          )
+          (loop $label$27
+           (br_if $label$25
+            (i32.eqz
+             (i32.and
+              (i32.shl
+               (i32.const 1)
+               (local.get $12)
+              )
+              (i32.const 75913)
+             )
+            )
+           )
+           (local.set $17
+            (i32.or
+             (i32.shl
+              (i32.const 1)
+              (i32.add
+               (i32.shr_s
+                (i32.shl
+                 (local.get $5)
+                 (i32.const 24)
+                )
+                (i32.const 24)
+               )
+               (i32.const -32)
+              )
+             )
+             (local.get $17)
+            )
+           )
+           (br_if $label$27
+            (i32.lt_u
+             (local.tee $12
+              (i32.add
+               (i32.shr_s
+                (i32.shl
+                 (local.tee $5
+                  (i32.load8_s
+                   (local.tee $11
+                    (i32.add
+                     (local.get $11)
+                     (i32.const 1)
+                    )
+                   )
+                  )
+                 )
+                 (i32.const 24)
+                )
+                (i32.const 24)
+               )
+               (i32.const -32)
+              )
+             )
+             (i32.const 32)
+            )
+           )
+          )
+         )
+         (local.set $17
+          (i32.const 0)
+         )
+        )
+       )
+       (block $label$29
+        (if
+         (i32.eq
+          (i32.shr_s
+           (i32.shl
+            (local.get $5)
+            (i32.const 24)
+           )
+           (i32.const 24)
+          )
+          (i32.const 42)
+         )
+         (block
+          (local.set $11
+           (block $label$31 (result i32)
+            (block $label$32
+             (br_if $label$32
+              (i32.ge_u
+               (local.tee $12
+                (i32.add
+                 (i32.shr_s
+                  (i32.shl
+                   (local.tee $5
+                    (i32.load8_s
+                     (local.tee $7
+                      (i32.add
+                       (local.get $11)
+                       (i32.const 1)
+                      )
+                     )
+                    )
+                   )
+                   (i32.const 24)
+                  )
+                  (i32.const 24)
+                 )
+                 (i32.const -48)
+                )
+               )
+               (i32.const 10)
+              )
+             )
+             (br_if $label$32
+              (i32.ne
+               (i32.load8_s offset=2
+                (local.get $11)
+               )
+               (i32.const 36)
+              )
+             )
+             (i32.store
+              (i32.add
+               (local.get $4)
+               (i32.shl
+                (local.get $12)
+                (i32.const 2)
+               )
+              )
+              (i32.const 10)
+             )
+             (local.set $8
+              (i32.const 1)
+             )
+             (local.set $10
+              (i32.wrap_i64
+               (i64.load
+                (i32.add
+                 (local.get $3)
+                 (i32.shl
+                  (i32.add
+                   (i32.load8_s
+                    (local.get $7)
+                   )
+                   (i32.const -48)
+                  )
+                  (i32.const 3)
+                 )
+                )
+               )
+              )
+             )
+             (br $label$31
+              (i32.add
+               (local.get $11)
+               (i32.const 3)
+              )
+             )
+            )
+            (if
+             (local.get $10)
+             (block
+              (local.set $15
+               (i32.const -1)
+              )
+              (br $label$5)
+             )
+            )
+            (if
+             (i32.eqz
+              (local.get $30)
+             )
+             (block
+              (local.set $12
+               (local.get $17)
+              )
+              (local.set $17
+               (i32.const 0)
+              )
+              (local.set $11
+               (local.get $7)
+              )
+              (local.set $10
+               (i32.const 0)
+              )
+              (br $label$29)
+             )
+            )
+            (local.set $10
+             (i32.load
+              (local.tee $11
+               (i32.and
+                (i32.add
+                 (i32.load
+                  (local.get $2)
+                 )
+                 (i32.const 3)
+                )
+                (i32.const -4)
+               )
+              )
+             )
+            )
+            (i32.store
+             (local.get $2)
+             (i32.add
+              (local.get $11)
+              (i32.const 4)
+             )
+            )
+            (local.set $8
+             (i32.const 0)
+            )
+            (local.get $7)
+           )
+          )
+          (local.set $12
+           (i32.or
+            (local.get $17)
+            (i32.const 8192)
+           )
+          )
+          (local.set $7
+           (i32.sub
+            (i32.const 0)
+            (local.get $10)
+           )
+          )
+          (local.set $5
+           (i32.load8_s
+            (local.get $11)
+           )
+          )
+          (if
+           (i32.eqz
+            (local.tee $6
+             (i32.lt_s
+              (local.get $10)
+              (i32.const 0)
+             )
+            )
+           )
+           (local.set $12
+            (local.get $17)
+           )
+          )
+          (local.set $17
+           (local.get $8)
+          )
+          (if
+           (local.get $6)
+           (local.set $10
+            (local.get $7)
+           )
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.tee $12
+            (i32.add
+             (i32.shr_s
+              (i32.shl
+               (local.get $5)
+               (i32.const 24)
+              )
+              (i32.const 24)
+             )
+             (i32.const -48)
+            )
+           )
+           (i32.const 10)
+          )
+          (block
+           (local.set $7
+            (i32.const 0)
+           )
+           (local.set $5
+            (local.get $12)
+           )
+           (loop $label$39
+            (local.set $7
+             (i32.add
+              (i32.mul
+               (local.get $7)
+               (i32.const 10)
+              )
+              (local.get $5)
+             )
+            )
+            (br_if $label$39
+             (i32.lt_u
+              (local.tee $5
+               (i32.add
+                (i32.shr_s
+                 (i32.shl
+                  (local.tee $12
+                   (i32.load8_s
+                    (local.tee $11
+                     (i32.add
+                      (local.get $11)
+                      (i32.const 1)
+                     )
+                    )
+                   )
+                  )
+                  (i32.const 24)
+                 )
+                 (i32.const 24)
+                )
+                (i32.const -48)
+               )
+              )
+              (i32.const 10)
+             )
+            )
+           )
+           (if
+            (i32.lt_s
+             (local.get $7)
+             (i32.const 0)
+            )
+            (block
+             (local.set $15
+              (i32.const -1)
+             )
+             (br $label$5)
+            )
+            (block
+             (local.set $5
+              (local.get $12)
+             )
+             (local.set $12
+              (local.get $17)
+             )
+             (local.set $17
+              (local.get $10)
+             )
+             (local.set $10
+              (local.get $7)
+             )
+            )
+           )
+          )
+          (block
+           (local.set $12
+            (local.get $17)
+           )
+           (local.set $17
+            (local.get $10)
+           )
+           (local.set $10
+            (i32.const 0)
+           )
+          )
+         )
+        )
+       )
+       (block $label$43
+        (if
+         (i32.eq
+          (i32.shr_s
+           (i32.shl
+            (local.get $5)
+            (i32.const 24)
+           )
+           (i32.const 24)
+          )
+          (i32.const 46)
+         )
+         (block
+          (if
+           (i32.ne
+            (i32.shr_s
+             (i32.shl
+              (local.tee $5
+               (i32.load8_s
+                (local.tee $7
+                 (i32.add
+                  (local.get $11)
+                  (i32.const 1)
+                 )
+                )
+               )
+              )
+              (i32.const 24)
+             )
+             (i32.const 24)
+            )
+            (i32.const 42)
+           )
+           (block
+            (if
+             (i32.lt_u
+              (local.tee $5
+               (i32.add
+                (i32.shr_s
+                 (i32.shl
+                  (local.get $5)
+                  (i32.const 24)
+                 )
+                 (i32.const 24)
+                )
+                (i32.const -48)
+               )
+              )
+              (i32.const 10)
+             )
+             (block
+              (local.set $11
+               (local.get $7)
+              )
+              (local.set $7
+               (i32.const 0)
+              )
+             )
+             (block
+              (local.set $5
+               (i32.const 0)
+              )
+              (local.set $11
+               (local.get $7)
+              )
+              (br $label$43)
+             )
+            )
+            (loop $label$48
+             (local.set $5
+              (i32.add
+               (i32.mul
+                (local.get $7)
+                (i32.const 10)
+               )
+               (local.get $5)
+              )
+             )
+             (br_if $label$43
+              (i32.ge_u
+               (local.tee $8
+                (i32.add
+                 (i32.load8_s
+                  (local.tee $11
+                   (i32.add
+                    (local.get $11)
+                    (i32.const 1)
+                   )
+                  )
+                 )
+                 (i32.const -48)
+                )
+               )
+               (i32.const 10)
+              )
+             )
+             (local.set $7
+              (local.get $5)
+             )
+             (local.set $5
+              (local.get $8)
+             )
+             (br $label$48)
+            )
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.tee $5
+             (i32.add
+              (i32.load8_s
+               (local.tee $7
+                (i32.add
+                 (local.get $11)
+                 (i32.const 2)
+                )
+               )
+              )
+              (i32.const -48)
+             )
+            )
+            (i32.const 10)
+           )
+           (if
+            (i32.eq
+             (i32.load8_s offset=3
+              (local.get $11)
+             )
+             (i32.const 36)
+            )
+            (block
+             (i32.store
+              (i32.add
+               (local.get $4)
+               (i32.shl
+                (local.get $5)
+                (i32.const 2)
+               )
+              )
+              (i32.const 10)
+             )
+             (local.set $5
+              (i32.wrap_i64
+               (i64.load
+                (i32.add
+                 (local.get $3)
+                 (i32.shl
+                  (i32.add
+                   (i32.load8_s
+                    (local.get $7)
+                   )
+                   (i32.const -48)
+                  )
+                  (i32.const 3)
+                 )
+                )
+               )
+              )
+             )
+             (local.set $11
+              (i32.add
+               (local.get $11)
+               (i32.const 4)
+              )
+             )
+             (br $label$43)
+            )
+           )
+          )
+          (if
+           (local.get $17)
+           (block
+            (local.set $15
+             (i32.const -1)
+            )
+            (br $label$5)
+           )
+          )
+          (local.set $11
+           (if (result i32)
+            (local.get $30)
+            (block (result i32)
+             (local.set $5
+              (i32.load
+               (local.tee $11
+                (i32.and
+                 (i32.add
+                  (i32.load
+                   (local.get $2)
+                  )
+                  (i32.const 3)
+                 )
+                 (i32.const -4)
+                )
+               )
+              )
+             )
+             (i32.store
+              (local.get $2)
+              (i32.add
+               (local.get $11)
+               (i32.const 4)
+              )
+             )
+             (local.get $7)
+            )
+            (block (result i32)
+             (local.set $5
+              (i32.const 0)
+             )
+             (local.get $7)
+            )
+           )
+          )
+         )
+         (local.set $5
+          (i32.const -1)
+         )
+        )
+       )
+       (local.set $7
+        (local.get $11)
+       )
+       (local.set $8
+        (i32.const 0)
+       )
+       (loop $label$55
+        (if
+         (i32.gt_u
+          (local.tee $6
+           (i32.add
+            (i32.load8_s
+             (local.get $7)
+            )
+            (i32.const -65)
+           )
+          )
+          (i32.const 57)
+         )
+         (block
+          (local.set $15
+           (i32.const -1)
+          )
+          (br $label$5)
+         )
+        )
+        (local.set $11
+         (i32.add
+          (local.get $7)
+          (i32.const 1)
+         )
+        )
+        (if
+         (i32.lt_u
+          (i32.add
+           (local.tee $6
+            (i32.and
+             (local.tee $13
+              (i32.load8_s
+               (i32.add
+                (i32.add
+                 (i32.mul
+                  (local.get $8)
+                  (i32.const 58)
+                 )
+                 (i32.const 1155)
+                )
+                (local.get $6)
+               )
+              )
+             )
+             (i32.const 255)
+            )
+           )
+           (i32.const -1)
+          )
+          (i32.const 8)
+         )
+         (block
+          (local.set $7
+           (local.get $11)
+          )
+          (local.set $8
+           (local.get $6)
+          )
+          (br $label$55)
+         )
+        )
+       )
+       (if
+        (i32.eqz
+         (i32.shr_s
+          (i32.shl
+           (local.get $13)
+           (i32.const 24)
+          )
+          (i32.const 24)
+         )
+        )
+        (block
+         (local.set $15
+          (i32.const -1)
+         )
+         (br $label$5)
+        )
+       )
+       (local.set $14
+        (i32.gt_s
+         (local.get $9)
+         (i32.const -1)
+        )
+       )
+       (block $label$59
+        (block $label$60
+         (if
+          (i32.eq
+           (i32.shr_s
+            (i32.shl
+             (local.get $13)
+             (i32.const 24)
+            )
+            (i32.const 24)
+           )
+           (i32.const 19)
+          )
+          (if
+           (local.get $14)
+           (block
+            (local.set $15
+             (i32.const -1)
+            )
+            (br $label$5)
+           )
+           (br $label$60)
+          )
+          (block
+           (if
+            (local.get $14)
+            (block
+             (i32.store
+              (i32.add
+               (local.get $4)
+               (i32.shl
+                (local.get $9)
+                (i32.const 2)
+               )
+              )
+              (local.get $6)
+             )
+             (i64.store
+              (local.get $16)
+              (i64.load
+               (i32.add
+                (local.get $3)
+                (i32.shl
+                 (local.get $9)
+                 (i32.const 3)
+                )
+               )
+              )
+             )
+             (br $label$60)
+            )
+           )
+           (if
+            (i32.eqz
+             (local.get $30)
+            )
+            (block
+             (local.set $15
+              (i32.const 0)
+             )
+             (br $label$5)
+            )
+           )
+           (call $22
+            (local.get $16)
+            (local.get $6)
+            (local.get $2)
+           )
+          )
+         )
+         (br $label$59)
+        )
+        (if
+         (i32.eqz
+          (local.get $30)
+         )
+         (block
+          (local.set $10
+           (i32.const 0)
+          )
+          (local.set $1
+           (local.get $11)
+          )
+          (br $label$4)
+         )
+        )
+       )
+       (local.set $9
+        (i32.and
+         (local.tee $7
+          (i32.load8_s
+           (local.get $7)
+          )
+         )
+         (i32.const -33)
+        )
+       )
+       (if
+        (i32.eqz
+         (i32.and
+          (i32.ne
+           (local.get $8)
+           (i32.const 0)
+          )
+          (i32.eq
+           (i32.and
+            (local.get $7)
+            (i32.const 15)
+           )
+           (i32.const 3)
+          )
+         )
+        )
+        (local.set $9
+         (local.get $7)
+        )
+       )
+       (local.set $7
+        (i32.and
+         (local.get $12)
+         (i32.const -65537)
+        )
+       )
+       (if
+        (i32.and
+         (local.get $12)
+         (i32.const 8192)
+        )
+        (local.set $12
+         (local.get $7)
+        )
+       )
+       (block $label$70
+        (block $label$71
+         (block $label$72
+          (block $label$73
+           (block $label$74
+            (block $label$75
+             (block $label$76
+              (block $label$77
+               (block $label$78
+                (block $label$79
+                 (block $label$80
+                  (block $label$81
+                   (block $label$82
+                    (block $label$83
+                     (block $label$84
+                      (block $label$85
+                       (block $label$86
+                        (block $label$87
+                         (block $label$88
+                          (block $label$89
+                           (br_table $label$78 $label$77 $label$80 $label$77 $label$78 $label$78 $label$78 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$79 $label$77 $label$77 $label$77 $label$77 $label$87 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$78 $label$77 $label$83 $label$85 $label$78 $label$78 $label$78 $label$77 $label$85 $label$77 $label$77 $label$77 $label$82 $label$89 $label$86 $label$88 $label$77 $label$77 $label$81 $label$77 $label$84 $label$77 $label$77 $label$87 $label$77
+                            (i32.sub
+                             (local.get $9)
+                             (i32.const 65)
+                            )
+                           )
+                          )
+                          (block $label$90
+                           (block $label$91
+                            (block $label$92
+                             (block $label$93
+                              (block $label$94
+                               (block $label$95
+                                (block $label$96
+                                 (block $label$97
+                                  (br_table $label$97 $label$96 $label$95 $label$94 $label$93 $label$90 $label$92 $label$91 $label$90
+                                   (i32.sub
+                                    (i32.shr_s
+                                     (i32.shl
+                                      (i32.and
+                                       (local.get $8)
+                                       (i32.const 255)
+                                      )
+                                      (i32.const 24)
+                                     )
+                                     (i32.const 24)
+                                    )
+                                    (i32.const 0)
+                                   )
+                                  )
+                                 )
+                                 (i32.store
+                                  (i32.load
+                                   (local.get $16)
+                                  )
+                                  (local.get $15)
+                                 )
+                                 (local.set $10
+                                  (i32.const 0)
+                                 )
+                                 (local.set $1
+                                  (local.get $11)
+                                 )
+                                 (br $label$4)
+                                )
+                                (i32.store
+                                 (i32.load
+                                  (local.get $16)
+                                 )
+                                 (local.get $15)
+                                )
+                                (local.set $10
+                                 (i32.const 0)
+                                )
+                                (local.set $1
+                                 (local.get $11)
+                                )
+                                (br $label$4)
+                               )
+                               (i64.store
+                                (i32.load
+                                 (local.get $16)
+                                )
+                                (i64.extend_i32_s
+                                 (local.get $15)
+                                )
+                               )
+                               (local.set $10
+                                (i32.const 0)
+                               )
+                               (local.set $1
+                                (local.get $11)
+                               )
+                               (br $label$4)
+                              )
+                              (i32.store16
+                               (i32.load
+                                (local.get $16)
+                               )
+                               (local.get $15)
+                              )
+                              (local.set $10
+                               (i32.const 0)
+                              )
+                              (local.set $1
+                               (local.get $11)
+                              )
+                              (br $label$4)
+                             )
+                             (i32.store8
+                              (i32.load
+                               (local.get $16)
+                              )
+                              (local.get $15)
+                             )
+                             (local.set $10
+                              (i32.const 0)
+                             )
+                             (local.set $1
+                              (local.get $11)
+                             )
+                             (br $label$4)
+                            )
+                            (i32.store
+                             (i32.load
+                              (local.get $16)
+                             )
+                             (local.get $15)
+                            )
+                            (local.set $10
+                             (i32.const 0)
+                            )
+                            (local.set $1
+                             (local.get $11)
+                            )
+                            (br $label$4)
+                           )
+                           (i64.store
+                            (i32.load
+                             (local.get $16)
+                            )
+                            (i64.extend_i32_s
+                             (local.get $15)
+                            )
+                           )
+                           (local.set $10
+                            (i32.const 0)
+                           )
+                           (local.set $1
+                            (local.get $11)
+                           )
+                           (br $label$4)
+                          )
+                          (local.set $10
+                           (i32.const 0)
+                          )
+                          (local.set $1
+                           (local.get $11)
+                          )
+                          (br $label$4)
+                         )
+                         (local.set $12
+                          (i32.or
+                           (local.get $12)
+                           (i32.const 8)
+                          )
+                         )
+                         (if
+                          (i32.le_u
+                           (local.get $5)
+                           (i32.const 8)
+                          )
+                          (local.set $5
+                           (i32.const 8)
+                          )
+                         )
+                         (local.set $9
+                          (i32.const 120)
+                         )
+                         (br $label$76)
+                        )
+                        (br $label$76)
+                       )
+                       (if
+                        (i64.eq
+                         (local.tee $50
+                          (i64.load
+                           (local.get $16)
+                          )
+                         )
+                         (i64.const 0)
+                        )
+                        (local.set $7
+                         (local.get $21)
+                        )
+                        (block
+                         (local.set $1
+                          (local.get $21)
+                         )
+                         (loop $label$101
+                          (i64.store8
+                           (local.tee $1
+                            (i32.add
+                             (local.get $1)
+                             (i32.const -1)
+                            )
+                           )
+                           (i64.or
+                            (i64.and
+                             (local.get $50)
+                             (i64.const 7)
+                            )
+                            (i64.const 48)
+                           )
+                          )
+                          (br_if $label$101
+                           (i64.ne
+                            (local.tee $50
+                             (i64.shr_u
+                              (local.get $50)
+                              (i64.const 3)
+                             )
+                            )
+                            (i64.const 0)
+                           )
+                          )
+                          (local.set $7
+                           (local.get $1)
+                          )
+                         )
+                        )
+                       )
+                       (if
+                        (i32.and
+                         (local.get $12)
+                         (i32.const 8)
+                        )
+                        (block
+                         (local.set $8
+                          (i32.add
+                           (local.tee $1
+                            (i32.sub
+                             (local.get $38)
+                             (local.get $7)
+                            )
+                           )
+                           (i32.const 1)
+                          )
+                         )
+                         (if
+                          (i32.le_s
+                           (local.get $5)
+                           (local.get $1)
+                          )
+                          (local.set $5
+                           (local.get $8)
+                          )
+                         )
+                         (local.set $6
+                          (i32.const 0)
+                         )
+                         (local.set $8
+                          (i32.const 1635)
+                         )
+                         (br $label$71)
+                        )
+                        (block
+                         (local.set $6
+                          (i32.const 0)
+                         )
+                         (local.set $8
+                          (i32.const 1635)
+                         )
+                         (br $label$71)
+                        )
+                       )
+                      )
+                      (if
+                       (i64.lt_s
+                        (local.tee $50
+                         (i64.load
+                          (local.get $16)
+                         )
+                        )
+                        (i64.const 0)
+                       )
+                       (block
+                        (i64.store
+                         (local.get $16)
+                         (local.tee $50
+                          (i64.sub
+                           (i64.const 0)
+                           (local.get $50)
+                          )
+                         )
+                        )
+                        (local.set $6
+                         (i32.const 1)
+                        )
+                        (local.set $8
+                         (i32.const 1635)
+                        )
+                        (br $label$75)
+                       )
+                      )
+                      (if
+                       (i32.and
+                        (local.get $12)
+                        (i32.const 2048)
+                       )
+                       (block
+                        (local.set $6
+                         (i32.const 1)
+                        )
+                        (local.set $8
+                         (i32.const 1636)
+                        )
+                        (br $label$75)
+                       )
+                       (block
+                        (local.set $6
+                         (local.tee $1
+                          (i32.and
+                           (local.get $12)
+                           (i32.const 1)
+                          )
+                         )
+                        )
+                        (local.set $8
+                         (if (result i32)
+                          (local.get $1)
+                          (i32.const 1637)
+                          (i32.const 1635)
+                         )
+                        )
+                        (br $label$75)
+                       )
+                      )
+                     )
+                     (local.set $50
+                      (i64.load
+                       (local.get $16)
+                      )
+                     )
+                     (local.set $6
+                      (i32.const 0)
+                     )
+                     (local.set $8
+                      (i32.const 1635)
+                     )
+                     (br $label$75)
+                    )
+                    (i64.store8
+                     (local.get $39)
+                     (i64.load
+                      (local.get $16)
+                     )
+                    )
+                    (local.set $1
+                     (local.get $39)
+                    )
+                    (local.set $12
+                     (local.get $7)
+                    )
+                    (local.set $7
+                     (i32.const 1)
+                    )
+                    (local.set $6
+                     (i32.const 0)
+                    )
+                    (local.set $8
+                     (i32.const 1635)
+                    )
+                    (local.set $5
+                     (local.get $21)
+                    )
+                    (br $label$70)
+                   )
+                   (local.set $1
+                    (call $24
+                     (i32.load
+                      (call $12)
+                     )
+                    )
+                   )
+                   (br $label$74)
+                  )
+                  (if
+                   (i32.eqz
+                    (local.tee $1
+                     (i32.load
+                      (local.get $16)
+                     )
+                    )
+                   )
+                   (local.set $1
+                    (i32.const 1645)
+                   )
+                  )
+                  (br $label$74)
+                 )
+                 (i64.store32
+                  (local.get $37)
+                  (i64.load
+                   (local.get $16)
+                  )
+                 )
+                 (i32.store
+                  (local.get $42)
+                  (i32.const 0)
+                 )
+                 (i32.store
+                  (local.get $16)
+                  (local.get $37)
+                 )
+                 (local.set $7
+                  (local.get $37)
+                 )
+                 (local.set $6
+                  (i32.const -1)
+                 )
+                 (br $label$73)
+                )
+                (local.set $7
+                 (i32.load
+                  (local.get $16)
+                 )
+                )
+                (if
+                 (local.get $5)
+                 (block
+                  (local.set $6
+                   (local.get $5)
+                  )
+                  (br $label$73)
+                 )
+                 (block
+                  (call $25
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (i32.const 0)
+                   (local.get $12)
+                  )
+                  (local.set $1
+                   (i32.const 0)
+                  )
+                  (br $label$72)
+                 )
+                )
+               )
+               (local.set $52
+                (f64.load
+                 (local.get $16)
+                )
+               )
+               (i32.store
+                (local.get $20)
+                (i32.const 0)
+               )
+               (local.set $26
+                (if (result i32)
+                 (i64.lt_s
+                  (i64.reinterpret_f64
+                   (local.get $52)
+                  )
+                  (i64.const 0)
+                 )
+                 (block (result i32)
+                  (local.set $24
+                   (i32.const 1)
+                  )
+                  (local.set $52
+                   (f64.neg
+                    (local.get $52)
+                   )
+                  )
+                  (i32.const 1652)
+                 )
+                 (block (result i32)
+                  (local.set $1
+                   (i32.and
+                    (local.get $12)
+                    (i32.const 1)
+                   )
+                  )
+                  (if (result i32)
+                   (i32.and
+                    (local.get $12)
+                    (i32.const 2048)
+                   )
+                   (block (result i32)
+                    (local.set $24
+                     (i32.const 1)
+                    )
+                    (i32.const 1655)
+                   )
+                   (block (result i32)
+                    (local.set $24
+                     (local.get $1)
+                    )
+                    (if (result i32)
+                     (local.get $1)
+                     (i32.const 1658)
+                     (i32.const 1653)
+                    )
+                   )
+                  )
+                 )
+                )
+               )
+               (block $label$119
+                (if
+                 (i64.lt_u
+                  (i64.and
+                   (i64.reinterpret_f64
+                    (local.get $52)
+                   )
+                   (i64.const 9218868437227405312)
+                  )
+                  (i64.const 9218868437227405312)
+                 )
+                 (block
+                  (if
+                   (local.tee $1
+                    (f64.ne
+                     (local.tee $52
+                      (f64.mul
+                       (call $27
+                        (local.get $52)
+                        (local.get $20)
+                       )
+                       (f64.const 2)
+                      )
+                     )
+                     (f64.const 0)
+                    )
+                   )
+                   (i32.store
+                    (local.get $20)
+                    (i32.add
+                     (i32.load
+                      (local.get $20)
+                     )
+                     (i32.const -1)
+                    )
+                   )
+                  )
+                  (if
+                   (i32.eq
+                    (local.tee $22
+                     (i32.or
+                      (local.get $9)
+                      (i32.const 32)
+                     )
+                    )
+                    (i32.const 97)
+                   )
+                   (block
+                    (local.set $1
+                     (i32.add
+                      (local.get $26)
+                      (i32.const 9)
+                     )
+                    )
+                    (if
+                     (local.tee $6
+                      (i32.and
+                       (local.get $9)
+                       (i32.const 32)
+                      )
+                     )
+                     (local.set $26
+                      (local.get $1)
+                     )
+                    )
+                    (if
+                     (i32.eqz
+                      (i32.or
+                       (i32.gt_u
+                        (local.get $5)
+                        (i32.const 11)
+                       )
+                       (i32.eqz
+                        (local.tee $1
+                         (i32.sub
+                          (i32.const 12)
+                          (local.get $5)
+                         )
+                        )
+                       )
+                      )
+                     )
+                     (block
+                      (local.set $53
+                       (f64.const 8)
+                      )
+                      (loop $label$125
+                       (local.set $53
+                        (f64.mul
+                         (local.get $53)
+                         (f64.const 16)
+                        )
+                       )
+                       (br_if $label$125
+                        (local.tee $1
+                         (i32.add
+                          (local.get $1)
+                          (i32.const -1)
+                         )
+                        )
+                       )
+                      )
+                      (local.set $52
+                       (if (result f64)
+                        (i32.eq
+                         (i32.load8_s
+                          (local.get $26)
+                         )
+                         (i32.const 45)
+                        )
+                        (f64.neg
+                         (f64.add
+                          (local.get $53)
+                          (f64.sub
+                           (f64.neg
+                            (local.get $52)
+                           )
+                           (local.get $53)
+                          )
+                         )
+                        )
+                        (f64.sub
+                         (f64.add
+                          (local.get $52)
+                          (local.get $53)
+                         )
+                         (local.get $53)
+                        )
+                       )
+                      )
+                     )
+                    )
+                    (local.set $1
+                     (i32.sub
+                      (i32.const 0)
+                      (local.tee $7
+                       (i32.load
+                        (local.get $20)
+                       )
+                      )
+                     )
+                    )
+                    (if
+                     (i32.eq
+                      (local.tee $1
+                       (call $23
+                        (i64.extend_i32_s
+                         (if (result i32)
+                          (i32.lt_s
+                           (local.get $7)
+                           (i32.const 0)
+                          )
+                          (local.get $1)
+                          (local.get $7)
+                         )
+                        )
+                        (local.get $33)
+                       )
+                      )
+                      (local.get $33)
+                     )
+                     (block
+                      (i32.store8
+                       (local.get $40)
+                       (i32.const 48)
+                      )
+                      (local.set $1
+                       (local.get $40)
+                      )
+                     )
+                    )
+                    (local.set $13
+                     (i32.or
+                      (local.get $24)
+                      (i32.const 2)
+                     )
+                    )
+                    (i32.store8
+                     (i32.add
+                      (local.get $1)
+                      (i32.const -1)
+                     )
+                     (i32.add
+                      (i32.and
+                       (i32.shr_s
+                        (local.get $7)
+                        (i32.const 31)
+                       )
+                       (i32.const 2)
+                      )
+                      (i32.const 43)
+                     )
+                    )
+                    (i32.store8
+                     (local.tee $8
+                      (i32.add
+                       (local.get $1)
+                       (i32.const -2)
+                      )
+                     )
+                     (i32.add
+                      (local.get $9)
+                      (i32.const 15)
+                     )
+                    )
+                    (local.set $9
+                     (i32.lt_s
+                      (local.get $5)
+                      (i32.const 1)
+                     )
+                    )
+                    (local.set $14
+                     (i32.eqz
+                      (i32.and
+                       (local.get $12)
+                       (i32.const 8)
+                      )
+                     )
+                    )
+                    (local.set $1
+                     (local.get $19)
+                    )
+                    (loop $label$131
+                     (i32.store8
+                      (local.get $1)
+                      (i32.or
+                       (i32.load8_u
+                        (i32.add
+                         (local.tee $7
+                          (i32.trunc_f64_s
+                           (local.get $52)
+                          )
+                         )
+                         (i32.const 1619)
+                        )
+                       )
+                       (local.get $6)
+                      )
+                     )
+                     (local.set $52
+                      (f64.mul
+                       (f64.sub
+                        (local.get $52)
+                        (f64.convert_i32_s
+                         (local.get $7)
+                        )
+                       )
+                       (f64.const 16)
+                      )
+                     )
+                     (local.set $1
+                      (block $label$132 (result i32)
+                       (if (result i32)
+                        (i32.eq
+                         (i32.sub
+                          (local.tee $7
+                           (i32.add
+                            (local.get $1)
+                            (i32.const 1)
+                           )
+                          )
+                          (local.get $27)
+                         )
+                         (i32.const 1)
+                        )
+                        (block (result i32)
+                         (drop
+                          (br_if $label$132
+                           (local.get $7)
+                           (i32.and
+                            (local.get $14)
+                            (i32.and
+                             (local.get $9)
+                             (f64.eq
+                              (local.get $52)
+                              (f64.const 0)
+                             )
+                            )
+                           )
+                          )
+                         )
+                         (i32.store8
+                          (local.get $7)
+                          (i32.const 46)
+                         )
+                         (i32.add
+                          (local.get $1)
+                          (i32.const 2)
+                         )
+                        )
+                        (local.get $7)
+                       )
+                      )
+                     )
+                     (br_if $label$131
+                      (f64.ne
+                       (local.get $52)
+                       (f64.const 0)
+                      )
+                     )
+                    )
+                    (local.set $6
+                     (i32.sub
+                      (i32.add
+                       (local.get $46)
+                       (local.get $5)
+                      )
+                      (local.tee $7
+                       (local.get $8)
+                      )
+                     )
+                    )
+                    (local.set $9
+                     (i32.add
+                      (i32.sub
+                       (local.get $44)
+                       (local.get $7)
+                      )
+                      (local.get $1)
+                     )
+                    )
+                    (call $25
+                     (local.get $0)
+                     (i32.const 32)
+                     (local.get $10)
+                     (local.tee $5
+                      (i32.add
+                       (if (result i32)
+                        (i32.and
+                         (i32.ne
+                          (local.get $5)
+                          (i32.const 0)
+                         )
+                         (i32.lt_s
+                          (i32.add
+                           (local.get $45)
+                           (local.get $1)
+                          )
+                          (local.get $5)
+                         )
+                        )
+                        (local.get $6)
+                        (local.tee $6
+                         (local.get $9)
+                        )
+                       )
+                       (local.get $13)
+                      )
+                     )
+                     (local.get $12)
+                    )
+                    (if
+                     (i32.eqz
+                      (i32.and
+                       (i32.load
+                        (local.get $0)
+                       )
+                       (i32.const 32)
+                      )
+                     )
+                     (drop
+                      (call $21
+                       (local.get $26)
+                       (local.get $13)
+                       (local.get $0)
+                      )
+                     )
+                    )
+                    (call $25
+                     (local.get $0)
+                     (i32.const 48)
+                     (local.get $10)
+                     (local.get $5)
+                     (i32.xor
+                      (local.get $12)
+                      (i32.const 65536)
+                     )
+                    )
+                    (local.set $1
+                     (i32.sub
+                      (local.get $1)
+                      (local.get $27)
+                     )
+                    )
+                    (if
+                     (i32.eqz
+                      (i32.and
+                       (i32.load
+                        (local.get $0)
+                       )
+                       (i32.const 32)
+                      )
+                     )
+                     (drop
+                      (call $21
+                       (local.get $19)
+                       (local.get $1)
+                       (local.get $0)
+                      )
+                     )
+                    )
+                    (call $25
+                     (local.get $0)
+                     (i32.const 48)
+                     (i32.sub
+                      (local.get $6)
+                      (i32.add
+                       (local.get $1)
+                       (local.tee $1
+                        (i32.sub
+                         (local.get $28)
+                         (local.get $7)
+                        )
+                       )
+                      )
+                     )
+                     (i32.const 0)
+                     (i32.const 0)
+                    )
+                    (if
+                     (i32.eqz
+                      (i32.and
+                       (i32.load
+                        (local.get $0)
+                       )
+                       (i32.const 32)
+                      )
+                     )
+                     (drop
+                      (call $21
+                       (local.get $8)
+                       (local.get $1)
+                       (local.get $0)
+                      )
+                     )
+                    )
+                    (call $25
+                     (local.get $0)
+                     (i32.const 32)
+                     (local.get $10)
+                     (local.get $5)
+                     (i32.xor
+                      (local.get $12)
+                      (i32.const 8192)
+                     )
+                    )
+                    (if
+                     (i32.ge_s
+                      (local.get $5)
+                      (local.get $10)
+                     )
+                     (local.set $10
+                      (local.get $5)
+                     )
+                    )
+                    (br $label$119)
+                   )
+                  )
+                  (if
+                   (local.get $1)
+                   (block
+                    (i32.store
+                     (local.get $20)
+                     (local.tee $6
+                      (i32.add
+                       (i32.load
+                        (local.get $20)
+                       )
+                       (i32.const -28)
+                      )
+                     )
+                    )
+                    (local.set $52
+                     (f64.mul
+                      (local.get $52)
+                      (f64.const 268435456)
+                     )
+                    )
+                   )
+                   (local.set $6
+                    (i32.load
+                     (local.get $20)
+                    )
+                   )
+                  )
+                  (local.set $8
+                   (local.tee $7
+                    (if (result i32)
+                     (i32.lt_s
+                      (local.get $6)
+                      (i32.const 0)
+                     )
+                     (local.get $47)
+                     (local.get $48)
+                    )
+                   )
+                  )
+                  (loop $label$145
+                   (i32.store
+                    (local.get $8)
+                    (local.tee $1
+                     (i32.trunc_f64_s
+                      (local.get $52)
+                     )
+                    )
+                   )
+                   (local.set $8
+                    (i32.add
+                     (local.get $8)
+                     (i32.const 4)
+                    )
+                   )
+                   (br_if $label$145
+                    (f64.ne
+                     (local.tee $52
+                      (f64.mul
+                       (f64.sub
+                        (local.get $52)
+                        (f64.convert_i32_u
+                         (local.get $1)
+                        )
+                       )
+                       (f64.const 1e9)
+                      )
+                     )
+                     (f64.const 0)
+                    )
+                   )
+                  )
+                  (if
+                   (i32.gt_s
+                    (local.get $6)
+                    (i32.const 0)
+                   )
+                   (block
+                    (local.set $1
+                     (local.get $7)
+                    )
+                    (loop $label$147
+                     (local.set $14
+                      (if (result i32)
+                       (i32.gt_s
+                        (local.get $6)
+                        (i32.const 29)
+                       )
+                       (i32.const 29)
+                       (local.get $6)
+                      )
+                     )
+                     (block $label$150
+                      (if
+                       (i32.ge_u
+                        (local.tee $6
+                         (i32.add
+                          (local.get $8)
+                          (i32.const -4)
+                         )
+                        )
+                        (local.get $1)
+                       )
+                       (block
+                        (local.set $50
+                         (i64.extend_i32_u
+                          (local.get $14)
+                         )
+                        )
+                        (local.set $13
+                         (i32.const 0)
+                        )
+                        (loop $label$152
+                         (i64.store32
+                          (local.get $6)
+                          (i64.rem_u
+                           (local.tee $51
+                            (i64.add
+                             (i64.shl
+                              (i64.extend_i32_u
+                               (i32.load
+                                (local.get $6)
+                               )
+                              )
+                              (local.get $50)
+                             )
+                             (i64.extend_i32_u
+                              (local.get $13)
+                             )
+                            )
+                           )
+                           (i64.const 1000000000)
+                          )
+                         )
+                         (local.set $13
+                          (i32.wrap_i64
+                           (i64.div_u
+                            (local.get $51)
+                            (i64.const 1000000000)
+                           )
+                          )
+                         )
+                         (br_if $label$152
+                          (i32.ge_u
+                           (local.tee $6
+                            (i32.add
+                             (local.get $6)
+                             (i32.const -4)
+                            )
+                           )
+                           (local.get $1)
+                          )
+                         )
+                        )
+                        (br_if $label$150
+                         (i32.eqz
+                          (local.get $13)
+                         )
+                        )
+                        (i32.store
+                         (local.tee $1
+                          (i32.add
+                           (local.get $1)
+                           (i32.const -4)
+                          )
+                         )
+                         (local.get $13)
+                        )
+                       )
+                      )
+                     )
+                     (loop $label$153
+                      (if
+                       (i32.gt_u
+                        (local.get $8)
+                        (local.get $1)
+                       )
+                       (if
+                        (i32.eqz
+                         (i32.load
+                          (local.tee $6
+                           (i32.add
+                            (local.get $8)
+                            (i32.const -4)
+                           )
+                          )
+                         )
+                        )
+                        (block
+                         (local.set $8
+                          (local.get $6)
+                         )
+                         (br $label$153)
+                        )
+                       )
+                      )
+                     )
+                     (i32.store
+                      (local.get $20)
+                      (local.tee $6
+                       (i32.sub
+                        (i32.load
+                         (local.get $20)
+                        )
+                        (local.get $14)
+                       )
+                      )
+                     )
+                     (br_if $label$147
+                      (i32.gt_s
+                       (local.get $6)
+                       (i32.const 0)
+                      )
+                     )
+                    )
+                   )
+                   (local.set $1
+                    (local.get $7)
+                   )
+                  )
+                  (local.set $18
+                   (if (result i32)
+                    (i32.lt_s
+                     (local.get $5)
+                     (i32.const 0)
+                    )
+                    (i32.const 6)
+                    (local.get $5)
+                   )
+                  )
+                  (if
+                   (i32.lt_s
+                    (local.get $6)
+                    (i32.const 0)
+                   )
+                   (block
+                    (local.set $14
+                     (i32.add
+                      (i32.div_s
+                       (i32.add
+                        (local.get $18)
+                        (i32.const 25)
+                       )
+                       (i32.const 9)
+                      )
+                      (i32.const 1)
+                     )
+                    )
+                    (local.set $25
+                     (i32.eq
+                      (local.get $22)
+                      (i32.const 102)
+                     )
+                    )
+                    (local.set $5
+                     (local.get $8)
+                    )
+                    (loop $label$160
+                     (if
+                      (i32.gt_s
+                       (local.tee $13
+                        (i32.sub
+                         (i32.const 0)
+                         (local.get $6)
+                        )
+                       )
+                       (i32.const 9)
+                      )
+                      (local.set $13
+                       (i32.const 9)
+                      )
+                     )
+                     (block $label$162
+                      (if
+                       (i32.lt_u
+                        (local.get $1)
+                        (local.get $5)
+                       )
+                       (block
+                        (local.set $29
+                         (i32.add
+                          (i32.shl
+                           (i32.const 1)
+                           (local.get $13)
+                          )
+                          (i32.const -1)
+                         )
+                        )
+                        (local.set $35
+                         (i32.shr_u
+                          (i32.const 1000000000)
+                          (local.get $13)
+                         )
+                        )
+                        (local.set $6
+                         (i32.const 0)
+                        )
+                        (local.set $8
+                         (local.get $1)
+                        )
+                        (loop $label$164
+                         (i32.store
+                          (local.get $8)
+                          (i32.add
+                           (i32.shr_u
+                            (local.tee $32
+                             (i32.load
+                              (local.get $8)
+                             )
+                            )
+                            (local.get $13)
+                           )
+                           (local.get $6)
+                          )
+                         )
+                         (local.set $6
+                          (i32.mul
+                           (i32.and
+                            (local.get $32)
+                            (local.get $29)
+                           )
+                           (local.get $35)
+                          )
+                         )
+                         (br_if $label$164
+                          (i32.lt_u
+                           (local.tee $8
+                            (i32.add
+                             (local.get $8)
+                             (i32.const 4)
+                            )
+                           )
+                           (local.get $5)
+                          )
+                         )
+                        )
+                        (local.set $8
+                         (i32.add
+                          (local.get $1)
+                          (i32.const 4)
+                         )
+                        )
+                        (if
+                         (i32.eqz
+                          (i32.load
+                           (local.get $1)
+                          )
+                         )
+                         (local.set $1
+                          (local.get $8)
+                         )
+                        )
+                        (br_if $label$162
+                         (i32.eqz
+                          (local.get $6)
+                         )
+                        )
+                        (i32.store
+                         (local.get $5)
+                         (local.get $6)
+                        )
+                        (local.set $5
+                         (i32.add
+                          (local.get $5)
+                          (i32.const 4)
+                         )
+                        )
+                       )
+                       (block
+                        (local.set $8
+                         (i32.add
+                          (local.get $1)
+                          (i32.const 4)
+                         )
+                        )
+                        (if
+                         (i32.eqz
+                          (i32.load
+                           (local.get $1)
+                          )
+                         )
+                         (local.set $1
+                          (local.get $8)
+                         )
+                        )
+                       )
+                      )
+                     )
+                     (local.set $6
+                      (i32.add
+                       (local.tee $8
+                        (if (result i32)
+                         (local.get $25)
+                         (local.get $7)
+                         (local.get $1)
+                        )
+                       )
+                       (i32.shl
+                        (local.get $14)
+                        (i32.const 2)
+                       )
+                      )
+                     )
+                     (if
+                      (i32.gt_s
+                       (i32.shr_s
+                        (i32.sub
+                         (local.get $5)
+                         (local.get $8)
+                        )
+                        (i32.const 2)
+                       )
+                       (local.get $14)
+                      )
+                      (local.set $5
+                       (local.get $6)
+                      )
+                     )
+                     (i32.store
+                      (local.get $20)
+                      (local.tee $6
+                       (i32.add
+                        (i32.load
+                         (local.get $20)
+                        )
+                        (local.get $13)
+                       )
+                      )
+                     )
+                     (br_if $label$160
+                      (i32.lt_s
+                       (local.get $6)
+                       (i32.const 0)
+                      )
+                     )
+                     (local.set $13
+                      (local.get $5)
+                     )
+                    )
+                   )
+                   (local.set $13
+                    (local.get $8)
+                   )
+                  )
+                  (local.set $25
+                   (local.get $7)
+                  )
+                  (block $label$172
+                   (if
+                    (i32.lt_u
+                     (local.get $1)
+                     (local.get $13)
+                    )
+                    (block
+                     (local.set $5
+                      (i32.mul
+                       (i32.shr_s
+                        (i32.sub
+                         (local.get $25)
+                         (local.get $1)
+                        )
+                        (i32.const 2)
+                       )
+                       (i32.const 9)
+                      )
+                     )
+                     (br_if $label$172
+                      (i32.lt_u
+                       (local.tee $6
+                        (i32.load
+                         (local.get $1)
+                        )
+                       )
+                       (i32.const 10)
+                      )
+                     )
+                     (local.set $8
+                      (i32.const 10)
+                     )
+                     (loop $label$174
+                      (local.set $5
+                       (i32.add
+                        (local.get $5)
+                        (i32.const 1)
+                       )
+                      )
+                      (br_if $label$174
+                       (i32.ge_u
+                        (local.get $6)
+                        (local.tee $8
+                         (i32.mul
+                          (local.get $8)
+                          (i32.const 10)
+                         )
+                        )
+                       )
+                      )
+                     )
+                    )
+                    (local.set $5
+                     (i32.const 0)
+                    )
+                   )
+                  )
+                  (local.set $29
+                   (i32.eq
+                    (local.get $22)
+                    (i32.const 103)
+                   )
+                  )
+                  (local.set $35
+                   (i32.ne
+                    (local.get $18)
+                    (i32.const 0)
+                   )
+                  )
+                  (if
+                   (i32.lt_s
+                    (local.tee $8
+                     (i32.add
+                      (i32.sub
+                       (local.get $18)
+                       (if (result i32)
+                        (i32.ne
+                         (local.get $22)
+                         (i32.const 102)
+                        )
+                        (local.get $5)
+                        (i32.const 0)
+                       )
+                      )
+                      (i32.shr_s
+                       (i32.shl
+                        (i32.and
+                         (local.get $35)
+                         (local.get $29)
+                        )
+                        (i32.const 31)
+                       )
+                       (i32.const 31)
+                      )
+                     )
+                    )
+                    (i32.add
+                     (i32.mul
+                      (i32.shr_s
+                       (i32.sub
+                        (local.get $13)
+                        (local.get $25)
+                       )
+                       (i32.const 2)
+                      )
+                      (i32.const 9)
+                     )
+                     (i32.const -9)
+                    )
+                   )
+                   (block
+                    (if
+                     (i32.lt_s
+                      (local.tee $8
+                       (i32.add
+                        (i32.rem_s
+                         (local.tee $14
+                          (i32.add
+                           (local.get $8)
+                           (i32.const 9216)
+                          )
+                         )
+                         (i32.const 9)
+                        )
+                        (i32.const 1)
+                       )
+                      )
+                      (i32.const 9)
+                     )
+                     (block
+                      (local.set $6
+                       (i32.const 10)
+                      )
+                      (loop $label$180
+                       (local.set $6
+                        (i32.mul
+                         (local.get $6)
+                         (i32.const 10)
+                        )
+                       )
+                       (br_if $label$180
+                        (i32.ne
+                         (local.tee $8
+                          (i32.add
+                           (local.get $8)
+                           (i32.const 1)
+                          )
+                         )
+                         (i32.const 9)
+                        )
+                       )
+                      )
+                     )
+                     (local.set $6
+                      (i32.const 10)
+                     )
+                    )
+                    (local.set $14
+                     (i32.rem_u
+                      (local.tee $22
+                       (i32.load
+                        (local.tee $8
+                         (i32.add
+                          (i32.add
+                           (local.get $7)
+                           (i32.const 4)
+                          )
+                          (i32.shl
+                           (i32.add
+                            (i32.div_s
+                             (local.get $14)
+                             (i32.const 9)
+                            )
+                            (i32.const -1024)
+                           )
+                           (i32.const 2)
+                          )
+                         )
+                        )
+                       )
+                      )
+                      (local.get $6)
+                     )
+                    )
+                    (block $label$182
+                     (if
+                      (i32.eqz
+                       (i32.and
+                        (local.tee $32
+                         (i32.eq
+                          (i32.add
+                           (local.get $8)
+                           (i32.const 4)
+                          )
+                          (local.get $13)
+                         )
+                        )
+                        (i32.eqz
+                         (local.get $14)
+                        )
+                       )
+                      )
+                      (block
+                       (local.set $52
+                        (if (result f64)
+                         (i32.lt_u
+                          (local.get $14)
+                          (local.tee $49
+                           (i32.div_s
+                            (local.get $6)
+                            (i32.const 2)
+                           )
+                          )
+                         )
+                         (f64.const 0.5)
+                         (if (result f64)
+                          (i32.and
+                           (local.get $32)
+                           (i32.eq
+                            (local.get $14)
+                            (local.get $49)
+                           )
+                          )
+                          (f64.const 1)
+                          (f64.const 1.5)
+                         )
+                        )
+                       )
+                       (local.set $53
+                        (if (result f64)
+                         (i32.and
+                          (i32.div_u
+                           (local.get $22)
+                           (local.get $6)
+                          )
+                          (i32.const 1)
+                         )
+                         (f64.const 9007199254740994)
+                         (f64.const 9007199254740992)
+                        )
+                       )
+                       (block $label$190
+                        (if
+                         (local.get $24)
+                         (block
+                          (br_if $label$190
+                           (i32.ne
+                            (i32.load8_s
+                             (local.get $26)
+                            )
+                            (i32.const 45)
+                           )
+                          )
+                          (local.set $53
+                           (f64.neg
+                            (local.get $53)
+                           )
+                          )
+                          (local.set $52
+                           (f64.neg
+                            (local.get $52)
+                           )
+                          )
+                         )
+                        )
+                       )
+                       (i32.store
+                        (local.get $8)
+                        (local.tee $14
+                         (i32.sub
+                          (local.get $22)
+                          (local.get $14)
+                         )
+                        )
+                       )
+                       (br_if $label$182
+                        (f64.eq
+                         (f64.add
+                          (local.get $53)
+                          (local.get $52)
+                         )
+                         (local.get $53)
+                        )
+                       )
+                       (i32.store
+                        (local.get $8)
+                        (local.tee $5
+                         (i32.add
+                          (local.get $14)
+                          (local.get $6)
+                         )
+                        )
+                       )
+                       (if
+                        (i32.gt_u
+                         (local.get $5)
+                         (i32.const 999999999)
+                        )
+                        (loop $label$193
+                         (i32.store
+                          (local.get $8)
+                          (i32.const 0)
+                         )
+                         (if
+                          (i32.lt_u
+                           (local.tee $8
+                            (i32.add
+                             (local.get $8)
+                             (i32.const -4)
+                            )
+                           )
+                           (local.get $1)
+                          )
+                          (i32.store
+                           (local.tee $1
+                            (i32.add
+                             (local.get $1)
+                             (i32.const -4)
+                            )
+                           )
+                           (i32.const 0)
+                          )
+                         )
+                         (i32.store
+                          (local.get $8)
+                          (local.tee $5
+                           (i32.add
+                            (i32.load
+                             (local.get $8)
+                            )
+                            (i32.const 1)
+                           )
+                          )
+                         )
+                         (br_if $label$193
+                          (i32.gt_u
+                           (local.get $5)
+                           (i32.const 999999999)
+                          )
+                         )
+                        )
+                       )
+                       (local.set $5
+                        (i32.mul
+                         (i32.shr_s
+                          (i32.sub
+                           (local.get $25)
+                           (local.get $1)
+                          )
+                          (i32.const 2)
+                         )
+                         (i32.const 9)
+                        )
+                       )
+                       (br_if $label$182
+                        (i32.lt_u
+                         (local.tee $14
+                          (i32.load
+                           (local.get $1)
+                          )
+                         )
+                         (i32.const 10)
+                        )
+                       )
+                       (local.set $6
+                        (i32.const 10)
+                       )
+                       (loop $label$195
+                        (local.set $5
+                         (i32.add
+                          (local.get $5)
+                          (i32.const 1)
+                         )
+                        )
+                        (br_if $label$195
+                         (i32.ge_u
+                          (local.get $14)
+                          (local.tee $6
+                           (i32.mul
+                            (local.get $6)
+                            (i32.const 10)
+                           )
+                          )
+                         )
+                        )
+                       )
+                      )
+                     )
+                    )
+                    (local.set $14
+                     (local.get $1)
+                    )
+                    (local.set $6
+                     (local.get $5)
+                    )
+                    (if
+                     (i32.le_u
+                      (local.get $13)
+                      (local.tee $8
+                       (i32.add
+                        (local.get $8)
+                        (i32.const 4)
+                       )
+                      )
+                     )
+                     (local.set $8
+                      (local.get $13)
+                     )
+                    )
+                   )
+                   (block
+                    (local.set $14
+                     (local.get $1)
+                    )
+                    (local.set $6
+                     (local.get $5)
+                    )
+                    (local.set $8
+                     (local.get $13)
+                    )
+                   )
+                  )
+                  (local.set $32
+                   (i32.sub
+                    (i32.const 0)
+                    (local.get $6)
+                   )
+                  )
+                  (loop $label$198
+                   (block $label$199
+                    (if
+                     (i32.le_u
+                      (local.get $8)
+                      (local.get $14)
+                     )
+                     (block
+                      (local.set $22
+                       (i32.const 0)
+                      )
+                      (br $label$199)
+                     )
+                    )
+                    (if
+                     (i32.load
+                      (local.tee $1
+                       (i32.add
+                        (local.get $8)
+                        (i32.const -4)
+                       )
+                      )
+                     )
+                     (local.set $22
+                      (i32.const 1)
+                     )
+                     (block
+                      (local.set $8
+                       (local.get $1)
+                      )
+                      (br $label$198)
+                     )
+                    )
+                   )
+                  )
+                  (block $label$203
+                   (if
+                    (local.get $29)
+                    (block
+                     (local.set $1
+                      (if (result i32)
+                       (i32.and
+                        (i32.gt_s
+                         (local.tee $1
+                          (i32.add
+                           (i32.xor
+                            (i32.and
+                             (local.get $35)
+                             (i32.const 1)
+                            )
+                            (i32.const 1)
+                           )
+                           (local.get $18)
+                          )
+                         )
+                         (local.get $6)
+                        )
+                        (i32.gt_s
+                         (local.get $6)
+                         (i32.const -5)
+                        )
+                       )
+                       (block (result i32)
+                        (local.set $5
+                         (i32.add
+                          (local.get $9)
+                          (i32.const -1)
+                         )
+                        )
+                        (i32.sub
+                         (i32.add
+                          (local.get $1)
+                          (i32.const -1)
+                         )
+                         (local.get $6)
+                        )
+                       )
+                       (block (result i32)
+                        (local.set $5
+                         (i32.add
+                          (local.get $9)
+                          (i32.const -2)
+                         )
+                        )
+                        (i32.add
+                         (local.get $1)
+                         (i32.const -1)
+                        )
+                       )
+                      )
+                     )
+                     (br_if $label$203
+                      (local.tee $13
+                       (i32.and
+                        (local.get $12)
+                        (i32.const 8)
+                       )
+                      )
+                     )
+                     (block $label$207
+                      (if
+                       (local.get $22)
+                       (block
+                        (if
+                         (i32.eqz
+                          (local.tee $18
+                           (i32.load
+                            (i32.add
+                             (local.get $8)
+                             (i32.const -4)
+                            )
+                           )
+                          )
+                         )
+                         (block
+                          (local.set $9
+                           (i32.const 9)
+                          )
+                          (br $label$207)
+                         )
+                        )
+                        (if
+                         (i32.rem_u
+                          (local.get $18)
+                          (i32.const 10)
+                         )
+                         (block
+                          (local.set $9
+                           (i32.const 0)
+                          )
+                          (br $label$207)
+                         )
+                         (block
+                          (local.set $13
+                           (i32.const 10)
+                          )
+                          (local.set $9
+                           (i32.const 0)
+                          )
+                         )
+                        )
+                        (loop $label$212
+                         (local.set $9
+                          (i32.add
+                           (local.get $9)
+                           (i32.const 1)
+                          )
+                         )
+                         (br_if $label$212
+                          (i32.eqz
+                           (i32.rem_u
+                            (local.get $18)
+                            (local.tee $13
+                             (i32.mul
+                              (local.get $13)
+                              (i32.const 10)
+                             )
+                            )
+                           )
+                          )
+                         )
+                        )
+                       )
+                       (local.set $9
+                        (i32.const 9)
+                       )
+                      )
+                     )
+                     (local.set $18
+                      (i32.add
+                       (i32.mul
+                        (i32.shr_s
+                         (i32.sub
+                          (local.get $8)
+                          (local.get $25)
+                         )
+                         (i32.const 2)
+                        )
+                        (i32.const 9)
+                       )
+                       (i32.const -9)
+                      )
+                     )
+                     (if
+                      (i32.eq
+                       (i32.or
+                        (local.get $5)
+                        (i32.const 32)
+                       )
+                       (i32.const 102)
+                      )
+                      (block
+                       (local.set $13
+                        (i32.const 0)
+                       )
+                       (if
+                        (i32.ge_s
+                         (local.get $1)
+                         (if (result i32)
+                          (i32.lt_s
+                           (local.tee $9
+                            (i32.sub
+                             (local.get $18)
+                             (local.get $9)
+                            )
+                           )
+                           (i32.const 0)
+                          )
+                          (local.tee $9
+                           (i32.const 0)
+                          )
+                          (local.get $9)
+                         )
+                        )
+                        (local.set $1
+                         (local.get $9)
+                        )
+                       )
+                      )
+                      (block
+                       (local.set $13
+                        (i32.const 0)
+                       )
+                       (if
+                        (i32.ge_s
+                         (local.get $1)
+                         (if (result i32)
+                          (i32.lt_s
+                           (local.tee $9
+                            (i32.sub
+                             (i32.add
+                              (local.get $18)
+                              (local.get $6)
+                             )
+                             (local.get $9)
+                            )
+                           )
+                           (i32.const 0)
+                          )
+                          (local.tee $9
+                           (i32.const 0)
+                          )
+                          (local.get $9)
+                         )
+                        )
+                        (local.set $1
+                         (local.get $9)
+                        )
+                       )
+                      )
+                     )
+                    )
+                    (block
+                     (local.set $13
+                      (i32.and
+                       (local.get $12)
+                       (i32.const 8)
+                      )
+                     )
+                     (local.set $1
+                      (local.get $18)
+                     )
+                     (local.set $5
+                      (local.get $9)
+                     )
+                    )
+                   )
+                  )
+                  (if
+                   (local.tee $25
+                    (i32.eq
+                     (i32.or
+                      (local.get $5)
+                      (i32.const 32)
+                     )
+                     (i32.const 102)
+                    )
+                   )
+                   (block
+                    (local.set $9
+                     (i32.const 0)
+                    )
+                    (if
+                     (i32.le_s
+                      (local.get $6)
+                      (i32.const 0)
+                     )
+                     (local.set $6
+                      (i32.const 0)
+                     )
+                    )
+                   )
+                   (block
+                    (if
+                     (i32.lt_s
+                      (i32.sub
+                       (local.get $28)
+                       (local.tee $9
+                        (call $23
+                         (i64.extend_i32_s
+                          (if (result i32)
+                           (i32.lt_s
+                            (local.get $6)
+                            (i32.const 0)
+                           )
+                           (local.get $32)
+                           (local.get $6)
+                          )
+                         )
+                         (local.get $33)
+                        )
+                       )
+                      )
+                      (i32.const 2)
+                     )
+                     (loop $label$229
+                      (i32.store8
+                       (local.tee $9
+                        (i32.add
+                         (local.get $9)
+                         (i32.const -1)
+                        )
+                       )
+                       (i32.const 48)
+                      )
+                      (br_if $label$229
+                       (i32.lt_s
+                        (i32.sub
+                         (local.get $28)
+                         (local.get $9)
+                        )
+                        (i32.const 2)
+                       )
+                      )
+                     )
+                    )
+                    (i32.store8
+                     (i32.add
+                      (local.get $9)
+                      (i32.const -1)
+                     )
+                     (i32.add
+                      (i32.and
+                       (i32.shr_s
+                        (local.get $6)
+                        (i32.const 31)
+                       )
+                       (i32.const 2)
+                      )
+                      (i32.const 43)
+                     )
+                    )
+                    (i32.store8
+                     (local.tee $6
+                      (i32.add
+                       (local.get $9)
+                       (i32.const -2)
+                      )
+                     )
+                     (local.get $5)
+                    )
+                    (local.set $9
+                     (local.get $6)
+                    )
+                    (local.set $6
+                     (i32.sub
+                      (local.get $28)
+                      (local.get $6)
+                     )
+                    )
+                   )
+                  )
+                  (call $25
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (local.tee $18
+                    (i32.add
+                     (i32.add
+                      (i32.add
+                       (i32.add
+                        (local.get $24)
+                        (i32.const 1)
+                       )
+                       (local.get $1)
+                      )
+                      (i32.ne
+                       (local.tee $29
+                        (i32.or
+                         (local.get $1)
+                         (local.get $13)
+                        )
+                       )
+                       (i32.const 0)
+                      )
+                     )
+                     (local.get $6)
+                    )
+                   )
+                   (local.get $12)
+                  )
+                  (if
+                   (i32.eqz
+                    (i32.and
+                     (i32.load
+                      (local.get $0)
+                     )
+                     (i32.const 32)
+                    )
+                   )
+                   (drop
+                    (call $21
+                     (local.get $26)
+                     (local.get $24)
+                     (local.get $0)
+                    )
+                   )
+                  )
+                  (call $25
+                   (local.get $0)
+                   (i32.const 48)
+                   (local.get $10)
+                   (local.get $18)
+                   (i32.xor
+                    (local.get $12)
+                    (i32.const 65536)
+                   )
+                  )
+                  (block $label$231
+                   (if
+                    (local.get $25)
+                    (block
+                     (local.set $6
+                      (local.tee $9
+                       (if (result i32)
+                        (i32.gt_u
+                         (local.get $14)
+                         (local.get $7)
+                        )
+                        (local.get $7)
+                        (local.get $14)
+                       )
+                      )
+                     )
+                     (loop $label$235
+                      (local.set $5
+                       (call $23
+                        (i64.extend_i32_u
+                         (i32.load
+                          (local.get $6)
+                         )
+                        )
+                        (local.get $31)
+                       )
+                      )
+                      (block $label$236
+                       (if
+                        (i32.eq
+                         (local.get $6)
+                         (local.get $9)
+                        )
+                        (block
+                         (br_if $label$236
+                          (i32.ne
+                           (local.get $5)
+                           (local.get $31)
+                          )
+                         )
+                         (i32.store8
+                          (local.get $34)
+                          (i32.const 48)
+                         )
+                         (local.set $5
+                          (local.get $34)
+                         )
+                        )
+                        (block
+                         (br_if $label$236
+                          (i32.le_u
+                           (local.get $5)
+                           (local.get $19)
+                          )
+                         )
+                         (drop
+                          (call $41
+                           (local.get $19)
+                           (i32.const 48)
+                           (i32.sub
+                            (local.get $5)
+                            (local.get $27)
+                           )
+                          )
+                         )
+                         (loop $label$239
+                          (br_if $label$239
+                           (i32.gt_u
+                            (local.tee $5
+                             (i32.add
+                              (local.get $5)
+                              (i32.const -1)
+                             )
+                            )
+                            (local.get $19)
+                           )
+                          )
+                         )
+                        )
+                       )
+                      )
+                      (if
+                       (i32.eqz
+                        (i32.and
+                         (i32.load
+                          (local.get $0)
+                         )
+                         (i32.const 32)
+                        )
+                       )
+                       (drop
+                        (call $21
+                         (local.get $5)
+                         (i32.sub
+                          (local.get $41)
+                          (local.get $5)
+                         )
+                         (local.get $0)
+                        )
+                       )
+                      )
+                      (if
+                       (i32.le_u
+                        (local.tee $5
+                         (i32.add
+                          (local.get $6)
+                          (i32.const 4)
+                         )
+                        )
+                        (local.get $7)
+                       )
+                       (block
+                        (local.set $6
+                         (local.get $5)
+                        )
+                        (br $label$235)
+                       )
+                      )
+                     )
+                     (block $label$242
+                      (if
+                       (local.get $29)
+                       (block
+                        (br_if $label$242
+                         (i32.and
+                          (i32.load
+                           (local.get $0)
+                          )
+                          (i32.const 32)
+                         )
+                        )
+                        (drop
+                         (call $21
+                          (i32.const 1687)
+                          (i32.const 1)
+                          (local.get $0)
+                         )
+                        )
+                       )
+                      )
+                     )
+                     (if
+                      (i32.and
+                       (i32.gt_s
+                        (local.get $1)
+                        (i32.const 0)
+                       )
+                       (i32.lt_u
+                        (local.get $5)
+                        (local.get $8)
+                       )
+                      )
+                      (loop $label$245
+                       (if
+                        (i32.gt_u
+                         (local.tee $7
+                          (call $23
+                           (i64.extend_i32_u
+                            (i32.load
+                             (local.get $5)
+                            )
+                           )
+                           (local.get $31)
+                          )
+                         )
+                         (local.get $19)
+                        )
+                        (block
+                         (drop
+                          (call $41
+                           (local.get $19)
+                           (i32.const 48)
+                           (i32.sub
+                            (local.get $7)
+                            (local.get $27)
+                           )
+                          )
+                         )
+                         (loop $label$247
+                          (br_if $label$247
+                           (i32.gt_u
+                            (local.tee $7
+                             (i32.add
+                              (local.get $7)
+                              (i32.const -1)
+                             )
+                            )
+                            (local.get $19)
+                           )
+                          )
+                         )
+                        )
+                       )
+                       (if
+                        (i32.eqz
+                         (i32.and
+                          (i32.load
+                           (local.get $0)
+                          )
+                          (i32.const 32)
+                         )
+                        )
+                        (drop
+                         (call $21
+                          (local.get $7)
+                          (if (result i32)
+                           (i32.gt_s
+                            (local.get $1)
+                            (i32.const 9)
+                           )
+                           (i32.const 9)
+                           (local.get $1)
+                          )
+                          (local.get $0)
+                         )
+                        )
+                       )
+                       (local.set $7
+                        (i32.add
+                         (local.get $1)
+                         (i32.const -9)
+                        )
+                       )
+                       (if
+                        (i32.and
+                         (i32.gt_s
+                          (local.get $1)
+                          (i32.const 9)
+                         )
+                         (i32.lt_u
+                          (local.tee $5
+                           (i32.add
+                            (local.get $5)
+                            (i32.const 4)
+                           )
+                          )
+                          (local.get $8)
+                         )
+                        )
+                        (block
+                         (local.set $1
+                          (local.get $7)
+                         )
+                         (br $label$245)
+                        )
+                        (local.set $1
+                         (local.get $7)
+                        )
+                       )
+                      )
+                     )
+                     (call $25
+                      (local.get $0)
+                      (i32.const 48)
+                      (i32.add
+                       (local.get $1)
+                       (i32.const 9)
+                      )
+                      (i32.const 9)
+                      (i32.const 0)
+                     )
+                    )
+                    (block
+                     (local.set $5
+                      (i32.add
+                       (local.get $14)
+                       (i32.const 4)
+                      )
+                     )
+                     (if
+                      (i32.eqz
+                       (local.get $22)
+                      )
+                      (local.set $8
+                       (local.get $5)
+                      )
+                     )
+                     (if
+                      (i32.gt_s
+                       (local.get $1)
+                       (i32.const -1)
+                      )
+                      (block
+                       (local.set $13
+                        (i32.eqz
+                         (local.get $13)
+                        )
+                       )
+                       (local.set $7
+                        (local.get $14)
+                       )
+                       (local.set $5
+                        (local.get $1)
+                       )
+                       (loop $label$256
+                        (if
+                         (i32.eq
+                          (local.tee $1
+                           (call $23
+                            (i64.extend_i32_u
+                             (i32.load
+                              (local.get $7)
+                             )
+                            )
+                            (local.get $31)
+                           )
+                          )
+                          (local.get $31)
+                         )
+                         (block
+                          (i32.store8
+                           (local.get $34)
+                           (i32.const 48)
+                          )
+                          (local.set $1
+                           (local.get $34)
+                          )
+                         )
+                        )
+                        (block $label$258
+                         (if
+                          (i32.eq
+                           (local.get $7)
+                           (local.get $14)
+                          )
+                          (block
+                           (if
+                            (i32.eqz
+                             (i32.and
+                              (i32.load
+                               (local.get $0)
+                              )
+                              (i32.const 32)
+                             )
+                            )
+                            (drop
+                             (call $21
+                              (local.get $1)
+                              (i32.const 1)
+                              (local.get $0)
+                             )
+                            )
+                           )
+                           (local.set $1
+                            (i32.add
+                             (local.get $1)
+                             (i32.const 1)
+                            )
+                           )
+                           (br_if $label$258
+                            (i32.and
+                             (local.get $13)
+                             (i32.lt_s
+                              (local.get $5)
+                              (i32.const 1)
+                             )
+                            )
+                           )
+                           (br_if $label$258
+                            (i32.and
+                             (i32.load
+                              (local.get $0)
+                             )
+                             (i32.const 32)
+                            )
+                           )
+                           (drop
+                            (call $21
+                             (i32.const 1687)
+                             (i32.const 1)
+                             (local.get $0)
+                            )
+                           )
+                          )
+                          (block
+                           (br_if $label$258
+                            (i32.le_u
+                             (local.get $1)
+                             (local.get $19)
+                            )
+                           )
+                           (drop
+                            (call $41
+                             (local.get $19)
+                             (i32.const 48)
+                             (i32.add
+                              (local.get $1)
+                              (local.get $43)
+                             )
+                            )
+                           )
+                           (loop $label$262
+                            (br_if $label$262
+                             (i32.gt_u
+                              (local.tee $1
+                               (i32.add
+                                (local.get $1)
+                                (i32.const -1)
+                               )
+                              )
+                              (local.get $19)
+                             )
+                            )
+                           )
+                          )
+                         )
+                        )
+                        (local.set $6
+                         (i32.sub
+                          (local.get $41)
+                          (local.get $1)
+                         )
+                        )
+                        (if
+                         (i32.eqz
+                          (i32.and
+                           (i32.load
+                            (local.get $0)
+                           )
+                           (i32.const 32)
+                          )
+                         )
+                         (drop
+                          (call $21
+                           (local.get $1)
+                           (if (result i32)
+                            (i32.gt_s
+                             (local.get $5)
+                             (local.get $6)
+                            )
+                            (local.get $6)
+                            (local.get $5)
+                           )
+                           (local.get $0)
+                          )
+                         )
+                        )
+                        (br_if $label$256
+                         (i32.and
+                          (i32.lt_u
+                           (local.tee $7
+                            (i32.add
+                             (local.get $7)
+                             (i32.const 4)
+                            )
+                           )
+                           (local.get $8)
+                          )
+                          (i32.gt_s
+                           (local.tee $5
+                            (i32.sub
+                             (local.get $5)
+                             (local.get $6)
+                            )
+                           )
+                           (i32.const -1)
+                          )
+                         )
+                        )
+                        (local.set $1
+                         (local.get $5)
+                        )
+                       )
+                      )
+                     )
+                     (call $25
+                      (local.get $0)
+                      (i32.const 48)
+                      (i32.add
+                       (local.get $1)
+                       (i32.const 18)
+                      )
+                      (i32.const 18)
+                      (i32.const 0)
+                     )
+                     (br_if $label$231
+                      (i32.and
+                       (i32.load
+                        (local.get $0)
+                       )
+                       (i32.const 32)
+                      )
+                     )
+                     (drop
+                      (call $21
+                       (local.get $9)
+                       (i32.sub
+                        (local.get $28)
+                        (local.get $9)
+                       )
+                       (local.get $0)
+                      )
+                     )
+                    )
+                   )
+                  )
+                  (call $25
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (local.get $18)
+                   (i32.xor
+                    (local.get $12)
+                    (i32.const 8192)
+                   )
+                  )
+                  (if
+                   (i32.ge_s
+                    (local.get $18)
+                    (local.get $10)
+                   )
+                   (local.set $10
+                    (local.get $18)
+                   )
+                  )
+                 )
+                 (block
+                  (call $25
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (local.tee $8
+                    (i32.add
+                     (if (result i32)
+                      (local.tee $6
+                       (i32.or
+                        (f64.ne
+                         (local.get $52)
+                         (local.get $52)
+                        )
+                        (i32.const 0)
+                       )
+                      )
+                      (local.tee $24
+                       (i32.const 0)
+                      )
+                      (local.get $24)
+                     )
+                     (i32.const 3)
+                    )
+                   )
+                   (local.get $7)
+                  )
+                  (if
+                   (i32.eqz
+                    (i32.and
+                     (local.tee $1
+                      (i32.load
+                       (local.get $0)
+                      )
+                     )
+                     (i32.const 32)
+                    )
+                   )
+                   (block
+                    (drop
+                     (call $21
+                      (local.get $26)
+                      (local.get $24)
+                      (local.get $0)
+                     )
+                    )
+                    (local.set $1
+                     (i32.load
+                      (local.get $0)
+                     )
+                    )
+                   )
+                  )
+                  (local.set $7
+                   (if (result i32)
+                    (local.tee $5
+                     (i32.ne
+                      (i32.and
+                       (local.get $9)
+                       (i32.const 32)
+                      )
+                      (i32.const 0)
+                     )
+                    )
+                    (i32.const 1671)
+                    (i32.const 1675)
+                   )
+                  )
+                  (local.set $5
+                   (if (result i32)
+                    (local.get $5)
+                    (i32.const 1679)
+                    (i32.const 1683)
+                   )
+                  )
+                  (if
+                   (i32.eqz
+                    (local.get $6)
+                   )
+                   (local.set $5
+                    (local.get $7)
+                   )
+                  )
+                  (if
+                   (i32.eqz
+                    (i32.and
+                     (local.get $1)
+                     (i32.const 32)
+                    )
+                   )
+                   (drop
+                    (call $21
+                     (local.get $5)
+                     (i32.const 3)
+                     (local.get $0)
+                    )
+                   )
+                  )
+                  (call $25
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (local.get $8)
+                   (i32.xor
+                    (local.get $12)
+                    (i32.const 8192)
+                   )
+                  )
+                  (if
+                   (i32.ge_s
+                    (local.get $8)
+                    (local.get $10)
+                   )
+                   (local.set $10
+                    (local.get $8)
+                   )
+                  )
+                 )
+                )
+               )
+               (local.set $1
+                (local.get $11)
+               )
+               (br $label$4)
+              )
+              (local.set $7
+               (local.get $5)
+              )
+              (local.set $6
+               (i32.const 0)
+              )
+              (local.set $8
+               (i32.const 1635)
+              )
+              (local.set $5
+               (local.get $21)
+              )
+              (br $label$70)
+             )
+             (local.set $7
+              (i32.and
+               (local.get $9)
+               (i32.const 32)
+              )
+             )
+             (local.set $7
+              (if (result i32)
+               (i64.eq
+                (local.tee $50
+                 (i64.load
+                  (local.get $16)
+                 )
+                )
+                (i64.const 0)
+               )
+               (block (result i32)
+                (local.set $50
+                 (i64.const 0)
+                )
+                (local.get $21)
+               )
+               (block (result i32)
+                (local.set $1
+                 (local.get $21)
+                )
+                (loop $label$280
+                 (i32.store8
+                  (local.tee $1
+                   (i32.add
+                    (local.get $1)
+                    (i32.const -1)
+                   )
+                  )
+                  (i32.or
+                   (i32.load8_u
+                    (i32.add
+                     (i32.and
+                      (i32.wrap_i64
+                       (local.get $50)
+                      )
+                      (i32.const 15)
+                     )
+                     (i32.const 1619)
+                    )
+                   )
+                   (local.get $7)
+                  )
+                 )
+                 (br_if $label$280
+                  (i64.ne
+                   (local.tee $50
+                    (i64.shr_u
+                     (local.get $50)
+                     (i64.const 4)
+                    )
+                   )
+                   (i64.const 0)
+                  )
+                 )
+                )
+                (local.set $50
+                 (i64.load
+                  (local.get $16)
+                 )
+                )
+                (local.get $1)
+               )
+              )
+             )
+             (local.set $8
+              (i32.add
+               (i32.shr_s
+                (local.get $9)
+                (i32.const 4)
+               )
+               (i32.const 1635)
+              )
+             )
+             (if
+              (local.tee $1
+               (i32.or
+                (i32.eqz
+                 (i32.and
+                  (local.get $12)
+                  (i32.const 8)
+                 )
+                )
+                (i64.eq
+                 (local.get $50)
+                 (i64.const 0)
+                )
+               )
+              )
+              (local.set $8
+               (i32.const 1635)
+              )
+             )
+             (local.set $6
+              (if (result i32)
+               (local.get $1)
+               (i32.const 0)
+               (i32.const 2)
+              )
+             )
+             (br $label$71)
+            )
+            (local.set $7
+             (call $23
+              (local.get $50)
+              (local.get $21)
+             )
+            )
+            (br $label$71)
+           )
+           (local.set $14
+            (i32.eqz
+             (local.tee $13
+              (call $17
+               (local.get $1)
+               (i32.const 0)
+               (local.get $5)
+              )
+             )
+            )
+           )
+           (local.set $8
+            (i32.sub
+             (local.get $13)
+             (local.get $1)
+            )
+           )
+           (local.set $9
+            (i32.add
+             (local.get $1)
+             (local.get $5)
+            )
+           )
+           (local.set $12
+            (local.get $7)
+           )
+           (local.set $7
+            (if (result i32)
+             (local.get $14)
+             (local.get $5)
+             (local.get $8)
+            )
+           )
+           (local.set $6
+            (i32.const 0)
+           )
+           (local.set $8
+            (i32.const 1635)
+           )
+           (local.set $5
+            (if (result i32)
+             (local.get $14)
+             (local.get $9)
+             (local.get $13)
+            )
+           )
+           (br $label$70)
+          )
+          (local.set $1
+           (i32.const 0)
+          )
+          (local.set $5
+           (i32.const 0)
+          )
+          (local.set $8
+           (local.get $7)
+          )
+          (loop $label$288
+           (block $label$289
+            (br_if $label$289
+             (i32.eqz
+              (local.tee $9
+               (i32.load
+                (local.get $8)
+               )
+              )
+             )
+            )
+            (br_if $label$289
+             (i32.or
+              (i32.lt_s
+               (local.tee $5
+                (call $26
+                 (local.get $36)
+                 (local.get $9)
+                )
+               )
+               (i32.const 0)
+              )
+              (i32.gt_u
+               (local.get $5)
+               (i32.sub
+                (local.get $6)
+                (local.get $1)
+               )
+              )
+             )
+            )
+            (local.set $8
+             (i32.add
+              (local.get $8)
+              (i32.const 4)
+             )
+            )
+            (br_if $label$288
+             (i32.gt_u
+              (local.get $6)
+              (local.tee $1
+               (i32.add
+                (local.get $5)
+                (local.get $1)
+               )
+              )
+             )
+            )
+           )
+          )
+          (if
+           (i32.lt_s
+            (local.get $5)
+            (i32.const 0)
+           )
+           (block
+            (local.set $15
+             (i32.const -1)
+            )
+            (br $label$5)
+           )
+          )
+          (call $25
+           (local.get $0)
+           (i32.const 32)
+           (local.get $10)
+           (local.get $1)
+           (local.get $12)
+          )
+          (if
+           (local.get $1)
+           (block
+            (local.set $5
+             (i32.const 0)
+            )
+            (loop $label$292
+             (br_if $label$72
+              (i32.eqz
+               (local.tee $8
+                (i32.load
+                 (local.get $7)
+                )
+               )
+              )
+             )
+             (br_if $label$72
+              (i32.gt_s
+               (local.tee $5
+                (i32.add
+                 (local.tee $8
+                  (call $26
+                   (local.get $36)
+                   (local.get $8)
+                  )
+                 )
+                 (local.get $5)
+                )
+               )
+               (local.get $1)
+              )
+             )
+             (if
+              (i32.eqz
+               (i32.and
+                (i32.load
+                 (local.get $0)
+                )
+                (i32.const 32)
+               )
+              )
+              (drop
+               (call $21
+                (local.get $36)
+                (local.get $8)
+                (local.get $0)
+               )
+              )
+             )
+             (local.set $7
+              (i32.add
+               (local.get $7)
+               (i32.const 4)
+              )
+             )
+             (br_if $label$292
+              (i32.lt_u
+               (local.get $5)
+               (local.get $1)
+              )
+             )
+             (br $label$72)
+            )
+           )
+           (block
+            (local.set $1
+             (i32.const 0)
+            )
+            (br $label$72)
+           )
+          )
+         )
+         (call $25
+          (local.get $0)
+          (i32.const 32)
+          (local.get $10)
+          (local.get $1)
+          (i32.xor
+           (local.get $12)
+           (i32.const 8192)
+          )
+         )
+         (if
+          (i32.le_s
+           (local.get $10)
+           (local.get $1)
+          )
+          (local.set $10
+           (local.get $1)
+          )
+         )
+         (local.set $1
+          (local.get $11)
+         )
+         (br $label$4)
+        )
+        (local.set $1
+         (i32.and
+          (local.get $12)
+          (i32.const -65537)
+         )
+        )
+        (if
+         (i32.gt_s
+          (local.get $5)
+          (i32.const -1)
+         )
+         (local.set $12
+          (local.get $1)
+         )
+        )
+        (local.set $5
+         (if (result i32)
+          (i32.or
+           (local.get $5)
+           (local.tee $9
+            (i64.ne
+             (i64.load
+              (local.get $16)
+             )
+             (i64.const 0)
+            )
+           )
+          )
+          (block (result i32)
+           (local.set $1
+            (local.get $7)
+           )
+           (if
+            (i32.gt_s
+             (local.get $5)
+             (local.tee $7
+              (i32.add
+               (i32.xor
+                (i32.and
+                 (local.get $9)
+                 (i32.const 1)
+                )
+                (i32.const 1)
+               )
+               (i32.sub
+                (local.get $38)
+                (local.get $7)
+               )
+              )
+             )
+            )
+            (local.set $7
+             (local.get $5)
+            )
+           )
+           (local.get $21)
+          )
+          (block (result i32)
+           (local.set $1
+            (local.get $21)
+           )
+           (local.set $7
+            (i32.const 0)
+           )
+           (local.get $21)
+          )
+         )
+        )
+       )
+       (call $25
+        (local.get $0)
+        (i32.const 32)
+        (if (result i32)
+         (i32.lt_s
+          (local.get $10)
+          (local.tee $5
+           (i32.add
+            (if (result i32)
+             (i32.lt_s
+              (local.get $7)
+              (local.tee $9
+               (i32.sub
+                (local.get $5)
+                (local.get $1)
+               )
+              )
+             )
+             (local.tee $7
+              (local.get $9)
+             )
+             (local.get $7)
+            )
+            (local.get $6)
+           )
+          )
+         )
+         (local.tee $10
+          (local.get $5)
+         )
+         (local.get $10)
+        )
+        (local.get $5)
+        (local.get $12)
+       )
+       (if
+        (i32.eqz
+         (i32.and
+          (i32.load
+           (local.get $0)
+          )
+          (i32.const 32)
+         )
+        )
+        (drop
+         (call $21
+          (local.get $8)
+          (local.get $6)
+          (local.get $0)
+         )
+        )
+       )
+       (call $25
+        (local.get $0)
+        (i32.const 48)
+        (local.get $10)
+        (local.get $5)
+        (i32.xor
+         (local.get $12)
+         (i32.const 65536)
+        )
+       )
+       (call $25
+        (local.get $0)
+        (i32.const 48)
+        (local.get $7)
+        (local.get $9)
+        (i32.const 0)
+       )
+       (if
+        (i32.eqz
+         (i32.and
+          (i32.load
+           (local.get $0)
+          )
+          (i32.const 32)
+         )
+        )
+        (drop
+         (call $21
+          (local.get $1)
+          (local.get $9)
+          (local.get $0)
+         )
+        )
+       )
+       (call $25
+        (local.get $0)
+        (i32.const 32)
+        (local.get $10)
+        (local.get $5)
+        (i32.xor
+         (local.get $12)
+         (i32.const 8192)
+        )
+       )
+       (local.set $1
+        (local.get $11)
+       )
+       (br $label$4)
+      )
+     )
+     (br $label$2)
+    )
+    (if
+     (i32.eqz
+      (local.get $0)
+     )
+     (if
+      (local.get $17)
+      (block
+       (local.set $0
+        (i32.const 1)
+       )
+       (loop $label$308
+        (if
+         (local.tee $1
+          (i32.load
+           (i32.add
+            (local.get $4)
+            (i32.shl
+             (local.get $0)
+             (i32.const 2)
+            )
+           )
+          )
+         )
+         (block
+          (call $22
+           (i32.add
+            (local.get $3)
+            (i32.shl
+             (local.get $0)
+             (i32.const 3)
+            )
+           )
+           (local.get $1)
+           (local.get $2)
+          )
+          (br_if $label$308
+           (i32.lt_s
+            (local.tee $0
+             (i32.add
+              (local.get $0)
+              (i32.const 1)
+             )
+            )
+            (i32.const 10)
+           )
+          )
+          (local.set $15
+           (i32.const 1)
+          )
+          (br $label$2)
+         )
+        )
+       )
+       (loop $label$310
+        (if
+         (i32.load
+          (i32.add
+           (local.get $4)
+           (i32.shl
+            (local.get $0)
+            (i32.const 2)
+           )
+          )
+         )
+         (block
+          (local.set $15
+           (i32.const -1)
+          )
+          (br $label$2)
+         )
+        )
+        (br_if $label$310
+         (i32.lt_s
+          (local.tee $0
+           (i32.add
+            (local.get $0)
+            (i32.const 1)
+           )
+          )
+          (i32.const 10)
+         )
+        )
+        (local.set $15
+         (i32.const 1)
+        )
+       )
+      )
+      (local.set $15
+       (i32.const 0)
+      )
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $23)
+   )
+   (local.get $15)
   )
-  (func $16 (;29;) (type $2) (param $0 i32)
-    local.get $0
-    i32.load offset=68
-    i32.eqz
-    if ;; label = @1
-      local.get $0
-      call $13
-    end
+ )
+ (func $20 (; 33 ;) (type $1) (param $0 i32) (result i32)
+  (i32.const 0)
+ )
+ (func $21 (; 34 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (block $label$1 (result i32)
+   (block $label$2
+    (block $label$3
+     (br_if $label$3
+      (local.tee $3
+       (i32.load
+        (local.tee $4
+         (i32.add
+          (local.get $2)
+          (i32.const 16)
+         )
+        )
+       )
+      )
+     )
+     (if
+      (call $30
+       (local.get $2)
+      )
+      (local.set $3
+       (i32.const 0)
+      )
+      (block
+       (local.set $3
+        (i32.load
+         (local.get $4)
+        )
+       )
+       (br $label$3)
+      )
+     )
+     (br $label$2)
+    )
+    (if
+     (i32.lt_u
+      (i32.sub
+       (local.get $3)
+       (local.tee $4
+        (i32.load
+         (local.tee $5
+          (i32.add
+           (local.get $2)
+           (i32.const 20)
+          )
+         )
+        )
+       )
+      )
+      (local.get $1)
+     )
+     (block
+      (local.set $3
+       (call_indirect (type $0)
+        (local.get $2)
+        (local.get $0)
+        (local.get $1)
+        (i32.add
+         (i32.and
+          (i32.load offset=36
+           (local.get $2)
+          )
+          (i32.const 3)
+         )
+         (i32.const 2)
+        )
+       )
+      )
+      (br $label$2)
+     )
+    )
+    (local.set $2
+     (block $label$7 (result i32)
+      (if (result i32)
+       (i32.gt_s
+        (i32.load8_s offset=75
+         (local.get $2)
+        )
+        (i32.const -1)
+       )
+       (block (result i32)
+        (local.set $3
+         (local.get $1)
+        )
+        (loop $label$9
+         (drop
+          (br_if $label$7
+           (i32.const 0)
+           (i32.eqz
+            (local.get $3)
+           )
+          )
+         )
+         (if
+          (i32.ne
+           (i32.load8_s
+            (i32.add
+             (local.get $0)
+             (local.tee $6
+              (i32.add
+               (local.get $3)
+               (i32.const -1)
+              )
+             )
+            )
+           )
+           (i32.const 10)
+          )
+          (block
+           (local.set $3
+            (local.get $6)
+           )
+           (br $label$9)
+          )
+         )
+        )
+        (br_if $label$2
+         (i32.lt_u
+          (call_indirect (type $0)
+           (local.get $2)
+           (local.get $0)
+           (local.get $3)
+           (i32.add
+            (i32.and
+             (i32.load offset=36
+              (local.get $2)
+             )
+             (i32.const 3)
+            )
+            (i32.const 2)
+           )
+          )
+          (local.get $3)
+         )
+        )
+        (local.set $4
+         (i32.load
+          (local.get $5)
+         )
+        )
+        (local.set $1
+         (i32.sub
+          (local.get $1)
+          (local.get $3)
+         )
+        )
+        (local.set $0
+         (i32.add
+          (local.get $0)
+          (local.get $3)
+         )
+        )
+        (local.get $3)
+       )
+       (i32.const 0)
+      )
+     )
+    )
+    (drop
+     (call $42
+      (local.get $4)
+      (local.get $0)
+      (local.get $1)
+     )
+    )
+    (i32.store
+     (local.get $5)
+     (i32.add
+      (i32.load
+       (local.get $5)
+      )
+      (local.get $1)
+     )
+    )
+    (local.set $3
+     (i32.add
+      (local.get $2)
+      (local.get $1)
+     )
+    )
+   )
+   (local.get $3)
   )
-  (func $17 (;30;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $1
-      i32.const 255
-      i32.and
-      local.set $5
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            local.get $2
-            i32.const 0
-            i32.ne
-            local.tee $4
-            local.get $0
-            i32.const 3
-            i32.and
-            i32.const 0
-            i32.ne
-            i32.and
-            if ;; label = @5
-              block ;; label = @6
-                local.get $1
-                i32.const 255
-                i32.and
-                local.set $4
-                local.get $2
-                local.set $3
-                local.get $0
-                local.set $2
-                loop $label$6 ;; label = @7
-                  local.get $2
-                  i32.load8_s
-                  local.get $4
-                  i32.const 24
-                  i32.shl
-                  i32.const 24
-                  i32.shr_s
-                  i32.eq
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $3
-                      local.set $0
-                      br 6 (;@3;)
-                    end
-                  end
-                  local.get $3
-                  i32.const -1
-                  i32.add
-                  local.tee $3
-                  i32.const 0
-                  i32.ne
-                  local.tee $0
-                  local.get $2
-                  i32.const 1
-                  i32.add
-                  local.tee $2
-                  i32.const 3
-                  i32.and
-                  i32.const 0
-                  i32.ne
-                  i32.and
-                  br_if 0 (;@7;)
-                  br 3 (;@4;)
-                end
-              end
-            else
-              block ;; label = @6
-                local.get $2
-                local.set $3
-                local.get $0
-                local.set $2
-                local.get $4
-                local.set $0
-              end
-            end
-          end
-          local.get $0
-          if ;; label = @4
-            block ;; label = @5
-              local.get $3
-              local.set $0
-              br 2 (;@3;)
-            end
-          else
-            i32.const 0
-            local.set $0
-          end
-          br 1 (;@2;)
-        end
-        local.get $2
-        i32.load8_s
-        local.get $1
-        i32.const 255
-        i32.and
-        local.tee $1
-        i32.const 24
-        i32.shl
-        i32.const 24
-        i32.shr_s
-        i32.ne
-        if ;; label = @3
-          block ;; label = @4
-            local.get $5
-            i32.const 16843009
-            i32.mul
-            local.set $3
-            block $label$12 ;; label = @5
-              block $label$13 ;; label = @6
-                local.get $0
-                i32.const 3
-                i32.le_u
-                br_if 0 (;@6;)
-                loop $label$14 ;; label = @7
-                  local.get $2
-                  i32.load
-                  local.get $3
-                  i32.xor
-                  local.tee $4
-                  i32.const -2139062144
-                  i32.and
-                  i32.const -2139062144
-                  i32.xor
-                  local.get $4
-                  i32.const -16843009
-                  i32.add
-                  i32.and
-                  i32.eqz
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $2
-                      i32.const 4
-                      i32.add
-                      local.set $2
-                      local.get $0
-                      i32.const -4
-                      i32.add
-                      local.tee $0
-                      i32.const 3
-                      i32.gt_u
-                      br_if 2 (;@7;)
-                      br 3 (;@6;)
-                    end
-                  end
-                end
-                br 1 (;@5;)
-              end
-              local.get $0
-              i32.eqz
-              if ;; label = @6
-                block ;; label = @7
-                  i32.const 0
-                  local.set $0
-                  br 5 (;@2;)
-                end
-              end
-            end
-            loop $label$17 ;; label = @5
-              local.get $2
-              i32.load8_s
-              local.get $1
-              i32.const 24
-              i32.shl
-              i32.const 24
-              i32.shr_s
-              i32.eq
-              br_if 3 (;@2;)
-              local.get $2
-              i32.const 1
-              i32.add
-              local.set $2
-              local.get $0
-              i32.const -1
-              i32.add
-              local.tee $0
-              br_if 0 (;@5;)
-              i32.const 0
-              local.set $0
-            end
-          end
-        end
-      end
-      local.get $0
-      if (result i32) ;; label = @2
-        local.get $2
-      else
-        i32.const 0
-      end
-    end
+ )
+ (func $22 (; 35 ;) (type $8) (param $0 i32) (param $1 i32) (param $2 i32)
+  (local $3 i32)
+  (local $4 i64)
+  (local $5 f64)
+  (block $label$1
+   (if
+    (i32.le_u
+     (local.get $1)
+     (i32.const 20)
+    )
+    (block $label$3
+     (block $label$4
+      (block $label$5
+       (block $label$6
+        (block $label$7
+         (block $label$8
+          (block $label$9
+           (block $label$10
+            (block $label$11
+             (block $label$12
+              (block $label$13
+               (br_table $label$13 $label$12 $label$11 $label$10 $label$9 $label$8 $label$7 $label$6 $label$5 $label$4 $label$3
+                (i32.sub
+                 (local.get $1)
+                 (i32.const 9)
+                )
+               )
+              )
+              (local.set $3
+               (i32.load
+                (local.tee $1
+                 (i32.and
+                  (i32.add
+                   (i32.load
+                    (local.get $2)
+                   )
+                   (i32.const 3)
+                  )
+                  (i32.const -4)
+                 )
+                )
+               )
+              )
+              (i32.store
+               (local.get $2)
+               (i32.add
+                (local.get $1)
+                (i32.const 4)
+               )
+              )
+              (i32.store
+               (local.get $0)
+               (local.get $3)
+              )
+              (br $label$1)
+             )
+             (local.set $3
+              (i32.load
+               (local.tee $1
+                (i32.and
+                 (i32.add
+                  (i32.load
+                   (local.get $2)
+                  )
+                  (i32.const 3)
+                 )
+                 (i32.const -4)
+                )
+               )
+              )
+             )
+             (i32.store
+              (local.get $2)
+              (i32.add
+               (local.get $1)
+               (i32.const 4)
+              )
+             )
+             (i64.store
+              (local.get $0)
+              (i64.extend_i32_s
+               (local.get $3)
+              )
+             )
+             (br $label$1)
+            )
+            (local.set $3
+             (i32.load
+              (local.tee $1
+               (i32.and
+                (i32.add
+                 (i32.load
+                  (local.get $2)
+                 )
+                 (i32.const 3)
+                )
+                (i32.const -4)
+               )
+              )
+             )
+            )
+            (i32.store
+             (local.get $2)
+             (i32.add
+              (local.get $1)
+              (i32.const 4)
+             )
+            )
+            (i64.store
+             (local.get $0)
+             (i64.extend_i32_u
+              (local.get $3)
+             )
+            )
+            (br $label$1)
+           )
+           (local.set $4
+            (i64.load
+             (local.tee $1
+              (i32.and
+               (i32.add
+                (i32.load
+                 (local.get $2)
+                )
+                (i32.const 7)
+               )
+               (i32.const -8)
+              )
+             )
+            )
+           )
+           (i32.store
+            (local.get $2)
+            (i32.add
+             (local.get $1)
+             (i32.const 8)
+            )
+           )
+           (i64.store
+            (local.get $0)
+            (local.get $4)
+           )
+           (br $label$1)
+          )
+          (local.set $3
+           (i32.load
+            (local.tee $1
+             (i32.and
+              (i32.add
+               (i32.load
+                (local.get $2)
+               )
+               (i32.const 3)
+              )
+              (i32.const -4)
+             )
+            )
+           )
+          )
+          (i32.store
+           (local.get $2)
+           (i32.add
+            (local.get $1)
+            (i32.const 4)
+           )
+          )
+          (i64.store
+           (local.get $0)
+           (i64.extend_i32_s
+            (i32.shr_s
+             (i32.shl
+              (i32.and
+               (local.get $3)
+               (i32.const 65535)
+              )
+              (i32.const 16)
+             )
+             (i32.const 16)
+            )
+           )
+          )
+          (br $label$1)
+         )
+         (local.set $3
+          (i32.load
+           (local.tee $1
+            (i32.and
+             (i32.add
+              (i32.load
+               (local.get $2)
+              )
+              (i32.const 3)
+             )
+             (i32.const -4)
+            )
+           )
+          )
+         )
+         (i32.store
+          (local.get $2)
+          (i32.add
+           (local.get $1)
+           (i32.const 4)
+          )
+         )
+         (i64.store
+          (local.get $0)
+          (i64.extend_i32_u
+           (i32.and
+            (local.get $3)
+            (i32.const 65535)
+           )
+          )
+         )
+         (br $label$1)
+        )
+        (local.set $3
+         (i32.load
+          (local.tee $1
+           (i32.and
+            (i32.add
+             (i32.load
+              (local.get $2)
+             )
+             (i32.const 3)
+            )
+            (i32.const -4)
+           )
+          )
+         )
+        )
+        (i32.store
+         (local.get $2)
+         (i32.add
+          (local.get $1)
+          (i32.const 4)
+         )
+        )
+        (i64.store
+         (local.get $0)
+         (i64.extend_i32_s
+          (i32.shr_s
+           (i32.shl
+            (i32.and
+             (local.get $3)
+             (i32.const 255)
+            )
+            (i32.const 24)
+           )
+           (i32.const 24)
+          )
+         )
+        )
+        (br $label$1)
+       )
+       (local.set $3
+        (i32.load
+         (local.tee $1
+          (i32.and
+           (i32.add
+            (i32.load
+             (local.get $2)
+            )
+            (i32.const 3)
+           )
+           (i32.const -4)
+          )
+         )
+        )
+       )
+       (i32.store
+        (local.get $2)
+        (i32.add
+         (local.get $1)
+         (i32.const 4)
+        )
+       )
+       (i64.store
+        (local.get $0)
+        (i64.extend_i32_u
+         (i32.and
+          (local.get $3)
+          (i32.const 255)
+         )
+        )
+       )
+       (br $label$1)
+      )
+      (local.set $5
+       (f64.load
+        (local.tee $1
+         (i32.and
+          (i32.add
+           (i32.load
+            (local.get $2)
+           )
+           (i32.const 7)
+          )
+          (i32.const -8)
+         )
+        )
+       )
+      )
+      (i32.store
+       (local.get $2)
+       (i32.add
+        (local.get $1)
+        (i32.const 8)
+       )
+      )
+      (f64.store
+       (local.get $0)
+       (local.get $5)
+      )
+      (br $label$1)
+     )
+     (local.set $5
+      (f64.load
+       (local.tee $1
+        (i32.and
+         (i32.add
+          (i32.load
+           (local.get $2)
+          )
+          (i32.const 7)
+         )
+         (i32.const -8)
+        )
+       )
+      )
+     )
+     (i32.store
+      (local.get $2)
+      (i32.add
+       (local.get $1)
+       (i32.const 8)
+      )
+     )
+     (f64.store
+      (local.get $0)
+      (local.get $5)
+     )
+    )
+   )
   )
-  (func $18 (;31;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $4
-      global.get $global$1
-      i32.const 224
-      i32.add
-      global.set $global$1
-      local.get $4
-      i32.const 136
-      i32.add
-      local.set $5
-      local.get $4
-      i32.const 80
-      i32.add
-      local.tee $3
-      i64.const 0
-      i64.store align=4
-      local.get $3
-      i64.const 0
-      i64.store offset=8 align=4
-      local.get $3
-      i64.const 0
-      i64.store offset=16 align=4
-      local.get $3
-      i64.const 0
-      i64.store offset=24 align=4
-      local.get $3
-      i64.const 0
-      i64.store offset=32 align=4
-      local.get $4
-      i32.const 120
-      i32.add
-      local.tee $6
-      local.get $2
-      i32.load
-      i32.store
-      i32.const 0
-      local.get $1
-      local.get $6
-      local.get $4
-      local.tee $2
-      local.get $3
-      call $19
-      i32.const 0
-      i32.lt_s
-      if ;; label = @2
-        i32.const -1
-        local.set $1
-      else
-        block ;; label = @3
-          local.get $0
-          i32.load offset=76
-          i32.const -1
-          i32.gt_s
-          if (result i32) ;; label = @4
-            local.get $0
-            call $20
-          else
-            i32.const 0
-          end
-          local.set $12
-          local.get $0
-          i32.load
-          local.set $7
-          local.get $0
-          i32.load8_s offset=74
-          i32.const 1
-          i32.lt_s
-          if ;; label = @4
-            local.get $0
-            local.get $7
-            i32.const -33
-            i32.and
-            i32.store
-          end
-          local.get $0
-          i32.const 48
-          i32.add
-          local.tee $8
-          i32.load
-          if ;; label = @4
-            local.get $0
-            local.get $1
-            local.get $6
-            local.get $2
-            local.get $3
-            call $19
-            local.set $1
-          else
-            block ;; label = @5
-              local.get $0
-              i32.const 44
-              i32.add
-              local.tee $9
-              i32.load
-              local.set $10
-              local.get $9
-              local.get $5
-              i32.store
-              local.get $0
-              i32.const 28
-              i32.add
-              local.tee $13
-              local.get $5
-              i32.store
-              local.get $0
-              i32.const 20
-              i32.add
-              local.tee $11
-              local.get $5
-              i32.store
-              local.get $8
-              i32.const 80
-              i32.store
-              local.get $0
-              i32.const 16
-              i32.add
-              local.tee $14
-              local.get $5
-              i32.const 80
-              i32.add
-              i32.store
-              local.get $0
-              local.get $1
-              local.get $6
-              local.get $2
-              local.get $3
-              call $19
-              local.set $1
-              local.get $10
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $0
-                  i32.const 0
-                  i32.const 0
-                  local.get $0
-                  i32.load offset=36
-                  i32.const 3
-                  i32.and
-                  i32.const 2
-                  i32.add
-                  call_indirect (type $0)
-                  drop
-                  local.get $11
-                  i32.load
-                  i32.eqz
-                  if ;; label = @8
-                    i32.const -1
-                    local.set $1
-                  end
-                  local.get $9
-                  local.get $10
-                  i32.store
-                  local.get $8
-                  i32.const 0
-                  i32.store
-                  local.get $14
-                  i32.const 0
-                  i32.store
-                  local.get $13
-                  i32.const 0
-                  i32.store
-                  local.get $11
-                  i32.const 0
-                  i32.store
-                end
-              end
-            end
-          end
-          local.get $0
-          local.get $0
-          i32.load
-          local.tee $2
-          local.get $7
-          i32.const 32
-          i32.and
-          i32.or
-          i32.store
-          local.get $12
-          if ;; label = @4
-            local.get $0
-            call $13
-          end
-          local.get $2
-          i32.const 32
-          i32.and
-          if ;; label = @4
-            i32.const -1
-            local.set $1
-          end
-        end
-      end
-      local.get $4
-      global.set $global$1
-      local.get $1
-    end
+ )
+ (func $23 (; 36 ;) (type $9) (param $0 i64) (param $1 i32) (result i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i64)
+  (block $label$1 (result i32)
+   (local.set $2
+    (i32.wrap_i64
+     (local.get $0)
+    )
+   )
+   (if
+    (i64.gt_u
+     (local.get $0)
+     (i64.const 4294967295)
+    )
+    (block
+     (loop $label$3
+      (i64.store8
+       (local.tee $1
+        (i32.add
+         (local.get $1)
+         (i32.const -1)
+        )
+       )
+       (i64.or
+        (i64.rem_u
+         (local.get $0)
+         (i64.const 10)
+        )
+        (i64.const 48)
+       )
+      )
+      (local.set $4
+       (i64.div_u
+        (local.get $0)
+        (i64.const 10)
+       )
+      )
+      (if
+       (i64.gt_u
+        (local.get $0)
+        (i64.const 42949672959)
+       )
+       (block
+        (local.set $0
+         (local.get $4)
+        )
+        (br $label$3)
+       )
+      )
+     )
+     (local.set $2
+      (i32.wrap_i64
+       (local.get $4)
+      )
+     )
+    )
+   )
+   (if
+    (local.get $2)
+    (loop $label$6
+     (i32.store8
+      (local.tee $1
+       (i32.add
+        (local.get $1)
+        (i32.const -1)
+       )
+      )
+      (i32.or
+       (i32.rem_u
+        (local.get $2)
+        (i32.const 10)
+       )
+       (i32.const 48)
+      )
+     )
+     (local.set $3
+      (i32.div_u
+       (local.get $2)
+       (i32.const 10)
+      )
+     )
+     (if
+      (i32.ge_u
+       (local.get $2)
+       (i32.const 10)
+      )
+      (block
+       (local.set $2
+        (local.get $3)
+       )
+       (br $label$6)
+      )
+     )
+    )
+   )
+   (local.get $1)
   )
-  (func $19 (;32;) (type $7) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (result i32)
-    (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32) (local $15 i32) (local $16 i32) (local $17 i32) (local $18 i32) (local $19 i32) (local $20 i32) (local $21 i32) (local $22 i32) (local $23 i32) (local $24 i32) (local $25 i32) (local $26 i32) (local $27 i32) (local $28 i32) (local $29 i32) (local $30 i32) (local $31 i32) (local $32 i32) (local $33 i32) (local $34 i32) (local $35 i32) (local $36 i32) (local $37 i32) (local $38 i32) (local $39 i32) (local $40 i32) (local $41 i32) (local $42 i32) (local $43 i32) (local $44 i32) (local $45 i32) (local $46 i32) (local $47 i32) (local $48 i32) (local $49 i32) (local $50 i64) (local $51 i64) (local $52 f64) (local $53 f64)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $23
-      global.get $global$1
-      i32.const 624
-      i32.add
-      global.set $global$1
-      local.get $23
-      i32.const 16
-      i32.add
-      local.set $20
-      local.get $23
-      local.set $16
-      local.get $23
-      i32.const 528
-      i32.add
-      local.set $36
-      local.get $0
-      i32.const 0
-      i32.ne
-      local.set $30
-      local.get $23
-      i32.const 536
-      i32.add
-      local.tee $17
-      i32.const 40
-      i32.add
-      local.tee $21
-      local.set $38
-      local.get $17
-      i32.const 39
-      i32.add
-      local.set $39
-      local.get $23
-      i32.const 8
-      i32.add
-      local.tee $37
-      i32.const 4
-      i32.add
-      local.set $42
-      i32.const 0
-      local.get $23
-      i32.const 588
-      i32.add
-      local.tee $19
-      local.tee $27
-      i32.sub
-      local.set $43
-      local.get $23
-      i32.const 576
-      i32.add
-      local.tee $17
-      i32.const 12
-      i32.add
-      local.set $33
-      local.get $17
-      i32.const 11
-      i32.add
-      local.set $40
-      local.get $33
-      local.tee $28
-      local.get $27
-      i32.sub
-      local.set $44
-      i32.const -2
-      local.get $27
-      i32.sub
-      local.set $45
-      local.get $28
-      i32.const 2
-      i32.add
-      local.set $46
-      local.get $23
-      i32.const 24
-      i32.add
-      local.tee $47
-      i32.const 288
-      i32.add
-      local.set $48
-      local.get $19
-      i32.const 9
-      i32.add
-      local.tee $31
-      local.set $41
-      local.get $19
-      i32.const 8
-      i32.add
-      local.set $34
-      i32.const 0
-      local.set $15
-      i32.const 0
-      local.set $10
-      i32.const 0
-      local.set $17
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          loop $label$4 ;; label = @4
-            block $label$5 ;; label = @5
-              local.get $15
-              i32.const -1
-              i32.gt_s
-              if ;; label = @6
-                local.get $10
-                i32.const 2147483647
-                local.get $15
-                i32.sub
-                i32.gt_s
-                if (result i32) ;; label = @7
-                  block (result i32) ;; label = @8
-                    call $12
-                    i32.const 75
-                    i32.store
-                    i32.const -1
-                  end
-                else
-                  local.get $10
-                  local.get $15
-                  i32.add
-                end
-                local.set $15
-              end
-              local.get $1
-              i32.load8_s
-              local.tee $5
-              i32.const 24
-              i32.shl
-              i32.const 24
-              i32.shr_s
-              i32.eqz
-              br_if 2 (;@3;)
-              local.get $1
-              local.set $11
-              block $label$9 ;; label = @6
-                block $label$10 ;; label = @7
-                  loop $label$11 ;; label = @8
-                    block $label$12 ;; label = @9
-                      block $label$13 ;; label = @10
-                        block $label$14 ;; label = @11
-                          block $label$15 ;; label = @12
-                            local.get $5
-                            i32.const 24
-                            i32.shl
-                            i32.const 24
-                            i32.shr_s
-                            i32.const 0
-                            i32.sub
-                            br_table 1 (;@11;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 0 (;@12;) 2 (;@10;)
-                          end
-                          local.get $11
-                          local.set $5
-                          br 4 (;@7;)
-                        end
-                        local.get $11
-                        local.set $5
-                        br 1 (;@9;)
-                      end
-                      local.get $11
-                      i32.const 1
-                      i32.add
-                      local.tee $11
-                      i32.load8_s
-                      local.set $5
-                      br 1 (;@8;)
-                    end
-                  end
-                  br 1 (;@6;)
-                end
-                loop $label$16 ;; label = @7
-                  local.get $5
-                  i32.load8_s offset=1
-                  i32.const 37
-                  i32.ne
-                  br_if 1 (;@6;)
-                  local.get $11
-                  i32.const 1
-                  i32.add
-                  local.set $11
-                  local.get $5
-                  i32.const 2
-                  i32.add
-                  local.tee $5
-                  i32.load8_s
-                  i32.const 37
-                  i32.eq
-                  br_if 0 (;@7;)
-                end
-              end
-              local.get $11
-              local.get $1
-              i32.sub
-              local.set $10
-              local.get $30
-              if ;; label = @6
-                local.get $0
-                i32.load
-                i32.const 32
-                i32.and
-                i32.eqz
-                if ;; label = @7
-                  local.get $1
-                  local.get $10
-                  local.get $0
-                  call $21
-                  drop
-                end
-              end
-              local.get $10
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $5
-                  local.set $1
-                  br 3 (;@4;)
-                end
-              end
-              local.get $5
-              i32.const 1
-              i32.add
-              local.tee $11
-              i32.load8_s
-              local.tee $10
-              i32.const 24
-              i32.shl
-              i32.const 24
-              i32.shr_s
-              i32.const -48
-              i32.add
-              local.tee $9
-              i32.const 10
-              i32.lt_u
-              if (result i32) ;; label = @6
-                block (result i32) ;; label = @7
-                  local.get $5
-                  i32.const 3
-                  i32.add
-                  local.set $10
-                  local.get $5
-                  i32.load8_s offset=2
-                  i32.const 36
-                  i32.eq
-                  local.tee $12
-                  if ;; label = @8
-                    local.get $10
-                    local.set $11
-                  end
-                  local.get $12
-                  if ;; label = @8
-                    i32.const 1
-                    local.set $17
-                  end
-                  local.get $11
-                  i32.load8_s
-                  local.set $5
-                  local.get $12
-                  i32.eqz
-                  if ;; label = @8
-                    i32.const -1
-                    local.set $9
-                  end
-                  local.get $17
-                end
-              else
-                block (result i32) ;; label = @7
-                  local.get $10
-                  local.set $5
-                  i32.const -1
-                  local.set $9
-                  local.get $17
-                end
-              end
-              local.set $10
-              block $label$25 ;; label = @6
-                local.get $5
-                i32.const 24
-                i32.shl
-                i32.const 24
-                i32.shr_s
-                i32.const -32
-                i32.add
-                local.tee $12
-                i32.const 32
-                i32.lt_u
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const 0
-                    local.set $17
-                    loop $label$27 ;; label = @9
-                      i32.const 1
-                      local.get $12
-                      i32.shl
-                      i32.const 75913
-                      i32.and
-                      i32.eqz
-                      br_if 3 (;@6;)
-                      i32.const 1
-                      local.get $5
-                      i32.const 24
-                      i32.shl
-                      i32.const 24
-                      i32.shr_s
-                      i32.const -32
-                      i32.add
-                      i32.shl
-                      local.get $17
-                      i32.or
-                      local.set $17
-                      local.get $11
-                      i32.const 1
-                      i32.add
-                      local.tee $11
-                      i32.load8_s
-                      local.tee $5
-                      i32.const 24
-                      i32.shl
-                      i32.const 24
-                      i32.shr_s
-                      i32.const -32
-                      i32.add
-                      local.tee $12
-                      i32.const 32
-                      i32.lt_u
-                      br_if 0 (;@9;)
-                    end
-                  end
-                else
-                  i32.const 0
-                  local.set $17
-                end
-              end
-              block $label$29 ;; label = @6
-                local.get $5
-                i32.const 24
-                i32.shl
-                i32.const 24
-                i32.shr_s
-                i32.const 42
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    block $label$31 (result i32) ;; label = @9
-                      block $label$32 ;; label = @10
-                        local.get $11
-                        i32.const 1
-                        i32.add
-                        local.tee $7
-                        i32.load8_s
-                        local.tee $5
-                        i32.const 24
-                        i32.shl
-                        i32.const 24
-                        i32.shr_s
-                        i32.const -48
-                        i32.add
-                        local.tee $12
-                        i32.const 10
-                        i32.ge_u
-                        br_if 0 (;@10;)
-                        local.get $11
-                        i32.load8_s offset=2
-                        i32.const 36
-                        i32.ne
-                        br_if 0 (;@10;)
-                        local.get $4
-                        local.get $12
-                        i32.const 2
-                        i32.shl
-                        i32.add
-                        i32.const 10
-                        i32.store
-                        i32.const 1
-                        local.set $8
-                        local.get $3
-                        local.get $7
-                        i32.load8_s
-                        i32.const -48
-                        i32.add
-                        i32.const 3
-                        i32.shl
-                        i32.add
-                        i64.load
-                        i32.wrap_i64
-                        local.set $10
-                        local.get $11
-                        i32.const 3
-                        i32.add
-                        br 1 (;@9;)
-                      end
-                      local.get $10
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const -1
-                          local.set $15
-                          br 6 (;@5;)
-                        end
-                      end
-                      local.get $30
-                      i32.eqz
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $17
-                          local.set $12
-                          i32.const 0
-                          local.set $17
-                          local.get $7
-                          local.set $11
-                          i32.const 0
-                          local.set $10
-                          br 5 (;@6;)
-                        end
-                      end
-                      local.get $2
-                      i32.load
-                      i32.const 3
-                      i32.add
-                      i32.const -4
-                      i32.and
-                      local.tee $11
-                      i32.load
-                      local.set $10
-                      local.get $2
-                      local.get $11
-                      i32.const 4
-                      i32.add
-                      i32.store
-                      i32.const 0
-                      local.set $8
-                      local.get $7
-                    end
-                    local.set $11
-                    local.get $17
-                    i32.const 8192
-                    i32.or
-                    local.set $12
-                    i32.const 0
-                    local.get $10
-                    i32.sub
-                    local.set $7
-                    local.get $11
-                    i32.load8_s
-                    local.set $5
-                    local.get $10
-                    i32.const 0
-                    i32.lt_s
-                    local.tee $6
-                    i32.eqz
-                    if ;; label = @9
-                      local.get $17
-                      local.set $12
-                    end
-                    local.get $8
-                    local.set $17
-                    local.get $6
-                    if ;; label = @9
-                      local.get $7
-                      local.set $10
-                    end
-                  end
-                else
-                  local.get $5
-                  i32.const 24
-                  i32.shl
-                  i32.const 24
-                  i32.shr_s
-                  i32.const -48
-                  i32.add
-                  local.tee $12
-                  i32.const 10
-                  i32.lt_u
-                  if ;; label = @8
-                    block ;; label = @9
-                      i32.const 0
-                      local.set $7
-                      local.get $12
-                      local.set $5
-                      loop $label$39 ;; label = @10
-                        local.get $7
-                        i32.const 10
-                        i32.mul
-                        local.get $5
-                        i32.add
-                        local.set $7
-                        local.get $11
-                        i32.const 1
-                        i32.add
-                        local.tee $11
-                        i32.load8_s
-                        local.tee $12
-                        i32.const 24
-                        i32.shl
-                        i32.const 24
-                        i32.shr_s
-                        i32.const -48
-                        i32.add
-                        local.tee $5
-                        i32.const 10
-                        i32.lt_u
-                        br_if 0 (;@10;)
-                      end
-                      local.get $7
-                      i32.const 0
-                      i32.lt_s
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const -1
-                          local.set $15
-                          br 6 (;@5;)
-                        end
-                      else
-                        block ;; label = @11
-                          local.get $12
-                          local.set $5
-                          local.get $17
-                          local.set $12
-                          local.get $10
-                          local.set $17
-                          local.get $7
-                          local.set $10
-                        end
-                      end
-                    end
-                  else
-                    block ;; label = @9
-                      local.get $17
-                      local.set $12
-                      local.get $10
-                      local.set $17
-                      i32.const 0
-                      local.set $10
-                    end
-                  end
-                end
-              end
-              block $label$43 ;; label = @6
-                local.get $5
-                i32.const 24
-                i32.shl
-                i32.const 24
-                i32.shr_s
-                i32.const 46
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $11
-                    i32.const 1
-                    i32.add
-                    local.tee $7
-                    i32.load8_s
-                    local.tee $5
-                    i32.const 24
-                    i32.shl
-                    i32.const 24
-                    i32.shr_s
-                    i32.const 42
-                    i32.ne
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $5
-                        i32.const 24
-                        i32.shl
-                        i32.const 24
-                        i32.shr_s
-                        i32.const -48
-                        i32.add
-                        local.tee $5
-                        i32.const 10
-                        i32.lt_u
-                        if ;; label = @11
-                          block ;; label = @12
-                            local.get $7
-                            local.set $11
-                            i32.const 0
-                            local.set $7
-                          end
-                        else
-                          block ;; label = @12
-                            i32.const 0
-                            local.set $5
-                            local.get $7
-                            local.set $11
-                            br 6 (;@6;)
-                          end
-                        end
-                        loop $label$48 ;; label = @11
-                          local.get $7
-                          i32.const 10
-                          i32.mul
-                          local.get $5
-                          i32.add
-                          local.set $5
-                          local.get $11
-                          i32.const 1
-                          i32.add
-                          local.tee $11
-                          i32.load8_s
-                          i32.const -48
-                          i32.add
-                          local.tee $8
-                          i32.const 10
-                          i32.ge_u
-                          br_if 5 (;@6;)
-                          local.get $5
-                          local.set $7
-                          local.get $8
-                          local.set $5
-                          br 0 (;@11;)
-                        end
-                      end
-                    end
-                    local.get $11
-                    i32.const 2
-                    i32.add
-                    local.tee $7
-                    i32.load8_s
-                    i32.const -48
-                    i32.add
-                    local.tee $5
-                    i32.const 10
-                    i32.lt_u
-                    if ;; label = @9
-                      local.get $11
-                      i32.load8_s offset=3
-                      i32.const 36
-                      i32.eq
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $4
-                          local.get $5
-                          i32.const 2
-                          i32.shl
-                          i32.add
-                          i32.const 10
-                          i32.store
-                          local.get $3
-                          local.get $7
-                          i32.load8_s
-                          i32.const -48
-                          i32.add
-                          i32.const 3
-                          i32.shl
-                          i32.add
-                          i64.load
-                          i32.wrap_i64
-                          local.set $5
-                          local.get $11
-                          i32.const 4
-                          i32.add
-                          local.set $11
-                          br 5 (;@6;)
-                        end
-                      end
-                    end
-                    local.get $17
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const -1
-                        local.set $15
-                        br 5 (;@5;)
-                      end
-                    end
-                    local.get $30
-                    if (result i32) ;; label = @9
-                      block (result i32) ;; label = @10
-                        local.get $2
-                        i32.load
-                        i32.const 3
-                        i32.add
-                        i32.const -4
-                        i32.and
-                        local.tee $11
-                        i32.load
-                        local.set $5
-                        local.get $2
-                        local.get $11
-                        i32.const 4
-                        i32.add
-                        i32.store
-                        local.get $7
-                      end
-                    else
-                      block (result i32) ;; label = @10
-                        i32.const 0
-                        local.set $5
-                        local.get $7
-                      end
-                    end
-                    local.set $11
-                  end
-                else
-                  i32.const -1
-                  local.set $5
-                end
-              end
-              local.get $11
-              local.set $7
-              i32.const 0
-              local.set $8
-              loop $label$55 ;; label = @6
-                local.get $7
-                i32.load8_s
-                i32.const -65
-                i32.add
-                local.tee $6
-                i32.const 57
-                i32.gt_u
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const -1
-                    local.set $15
-                    br 3 (;@5;)
-                  end
-                end
-                local.get $7
-                i32.const 1
-                i32.add
-                local.set $11
-                local.get $8
-                i32.const 58
-                i32.mul
-                i32.const 1155
-                i32.add
-                local.get $6
-                i32.add
-                i32.load8_s
-                local.tee $13
-                i32.const 255
-                i32.and
-                local.tee $6
-                i32.const -1
-                i32.add
-                i32.const 8
-                i32.lt_u
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $11
-                    local.set $7
-                    local.get $6
-                    local.set $8
-                    br 2 (;@6;)
-                  end
-                end
-              end
-              local.get $13
-              i32.const 24
-              i32.shl
-              i32.const 24
-              i32.shr_s
-              i32.eqz
-              if ;; label = @6
-                block ;; label = @7
-                  i32.const -1
-                  local.set $15
-                  br 2 (;@5;)
-                end
-              end
-              local.get $9
-              i32.const -1
-              i32.gt_s
-              local.set $14
-              block $label$59 ;; label = @6
-                block $label$60 ;; label = @7
-                  local.get $13
-                  i32.const 24
-                  i32.shl
-                  i32.const 24
-                  i32.shr_s
-                  i32.const 19
-                  i32.eq
-                  if ;; label = @8
-                    local.get $14
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const -1
-                        local.set $15
-                        br 5 (;@5;)
-                      end
-                    else
-                      br 2 (;@7;)
-                    end
-                  else
-                    block ;; label = @9
-                      local.get $14
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $4
-                          local.get $9
-                          i32.const 2
-                          i32.shl
-                          i32.add
-                          local.get $6
-                          i32.store
-                          local.get $16
-                          local.get $3
-                          local.get $9
-                          i32.const 3
-                          i32.shl
-                          i32.add
-                          i64.load
-                          i64.store
-                          br 4 (;@7;)
-                        end
-                      end
-                      local.get $30
-                      i32.eqz
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const 0
-                          local.set $15
-                          br 6 (;@5;)
-                        end
-                      end
-                      local.get $16
-                      local.get $6
-                      local.get $2
-                      call $22
-                    end
-                  end
-                  br 1 (;@6;)
-                end
-                local.get $30
-                i32.eqz
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const 0
-                    local.set $10
-                    local.get $11
-                    local.set $1
-                    br 4 (;@4;)
-                  end
-                end
-              end
-              local.get $7
-              i32.load8_s
-              local.tee $7
-              i32.const -33
-              i32.and
-              local.set $9
-              local.get $8
-              i32.const 0
-              i32.ne
-              local.get $7
-              i32.const 15
-              i32.and
-              i32.const 3
-              i32.eq
-              i32.and
-              i32.eqz
-              if ;; label = @6
-                local.get $7
-                local.set $9
-              end
-              local.get $12
-              i32.const -65537
-              i32.and
-              local.set $7
-              local.get $12
-              i32.const 8192
-              i32.and
-              if ;; label = @6
-                local.get $7
-                local.set $12
-              end
-              block $label$70 ;; label = @6
-                block $label$71 ;; label = @7
-                  block $label$72 ;; label = @8
-                    block $label$73 ;; label = @9
-                      block $label$74 ;; label = @10
-                        block $label$75 ;; label = @11
-                          block $label$76 ;; label = @12
-                            block $label$77 ;; label = @13
-                              block $label$78 ;; label = @14
-                                block $label$79 ;; label = @15
-                                  block $label$80 ;; label = @16
-                                    block $label$81 ;; label = @17
-                                      block $label$82 ;; label = @18
-                                        block $label$83 ;; label = @19
-                                          block $label$84 ;; label = @20
-                                            block $label$85 ;; label = @21
-                                              block $label$86 ;; label = @22
-                                                block $label$87 ;; label = @23
-                                                  block $label$88 ;; label = @24
-                                                    block $label$89 ;; label = @25
-                                                      local.get $9
-                                                      i32.const 65
-                                                      i32.sub
-                                                      br_table 11 (;@14;) 12 (;@13;) 9 (;@16;) 12 (;@13;) 11 (;@14;) 11 (;@14;) 11 (;@14;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 10 (;@15;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 2 (;@23;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 11 (;@14;) 12 (;@13;) 6 (;@19;) 4 (;@21;) 11 (;@14;) 11 (;@14;) 11 (;@14;) 12 (;@13;) 4 (;@21;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 7 (;@18;) 0 (;@25;) 3 (;@22;) 1 (;@24;) 12 (;@13;) 12 (;@13;) 8 (;@17;) 12 (;@13;) 5 (;@20;) 12 (;@13;) 12 (;@13;) 2 (;@23;) 12 (;@13;)
-                                                    end
-                                                    block $label$90 ;; label = @25
-                                                      block $label$91 ;; label = @26
-                                                        block $label$92 ;; label = @27
-                                                          block $label$93 ;; label = @28
-                                                            block $label$94 ;; label = @29
-                                                              block $label$95 ;; label = @30
-                                                                block $label$96 ;; label = @31
-                                                                  block $label$97 ;; label = @32
-                                                                    local.get $8
-                                                                    i32.const 255
-                                                                    i32.and
-                                                                    i32.const 24
-                                                                    i32.shl
-                                                                    i32.const 24
-                                                                    i32.shr_s
-                                                                    i32.const 0
-                                                                    i32.sub
-                                                                    br_table 0 (;@32;) 1 (;@31;) 2 (;@30;) 3 (;@29;) 4 (;@28;) 7 (;@25;) 5 (;@27;) 6 (;@26;) 7 (;@25;)
-                                                                  end
-                                                                  local.get $16
-                                                                  i32.load
-                                                                  local.get $15
-                                                                  i32.store
-                                                                  i32.const 0
-                                                                  local.set $10
-                                                                  local.get $11
-                                                                  local.set $1
-                                                                  br 27 (;@4;)
-                                                                end
-                                                                local.get $16
-                                                                i32.load
-                                                                local.get $15
-                                                                i32.store
-                                                                i32.const 0
-                                                                local.set $10
-                                                                local.get $11
-                                                                local.set $1
-                                                                br 26 (;@4;)
-                                                              end
-                                                              local.get $16
-                                                              i32.load
-                                                              local.get $15
-                                                              i64.extend_i32_s
-                                                              i64.store
-                                                              i32.const 0
-                                                              local.set $10
-                                                              local.get $11
-                                                              local.set $1
-                                                              br 25 (;@4;)
-                                                            end
-                                                            local.get $16
-                                                            i32.load
-                                                            local.get $15
-                                                            i32.store16
-                                                            i32.const 0
-                                                            local.set $10
-                                                            local.get $11
-                                                            local.set $1
-                                                            br 24 (;@4;)
-                                                          end
-                                                          local.get $16
-                                                          i32.load
-                                                          local.get $15
-                                                          i32.store8
-                                                          i32.const 0
-                                                          local.set $10
-                                                          local.get $11
-                                                          local.set $1
-                                                          br 23 (;@4;)
-                                                        end
-                                                        local.get $16
-                                                        i32.load
-                                                        local.get $15
-                                                        i32.store
-                                                        i32.const 0
-                                                        local.set $10
-                                                        local.get $11
-                                                        local.set $1
-                                                        br 22 (;@4;)
-                                                      end
-                                                      local.get $16
-                                                      i32.load
-                                                      local.get $15
-                                                      i64.extend_i32_s
-                                                      i64.store
-                                                      i32.const 0
-                                                      local.set $10
-                                                      local.get $11
-                                                      local.set $1
-                                                      br 21 (;@4;)
-                                                    end
-                                                    i32.const 0
-                                                    local.set $10
-                                                    local.get $11
-                                                    local.set $1
-                                                    br 20 (;@4;)
-                                                  end
-                                                  local.get $12
-                                                  i32.const 8
-                                                  i32.or
-                                                  local.set $12
-                                                  local.get $5
-                                                  i32.const 8
-                                                  i32.le_u
-                                                  if ;; label = @24
-                                                    i32.const 8
-                                                    local.set $5
-                                                  end
-                                                  i32.const 120
-                                                  local.set $9
-                                                  br 11 (;@12;)
-                                                end
-                                                br 10 (;@12;)
-                                              end
-                                              local.get $16
-                                              i64.load
-                                              local.tee $50
-                                              i64.const 0
-                                              i64.eq
-                                              if ;; label = @22
-                                                local.get $21
-                                                local.set $7
-                                              else
-                                                block ;; label = @23
-                                                  local.get $21
-                                                  local.set $1
-                                                  loop $label$101 ;; label = @24
-                                                    local.get $1
-                                                    i32.const -1
-                                                    i32.add
-                                                    local.tee $1
-                                                    local.get $50
-                                                    i64.const 7
-                                                    i64.and
-                                                    i64.const 48
-                                                    i64.or
-                                                    i64.store8
-                                                    local.get $50
-                                                    i64.const 3
-                                                    i64.shr_u
-                                                    local.tee $50
-                                                    i64.const 0
-                                                    i64.ne
-                                                    br_if 0 (;@24;)
-                                                    local.get $1
-                                                    local.set $7
-                                                  end
-                                                end
-                                              end
-                                              local.get $12
-                                              i32.const 8
-                                              i32.and
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $38
-                                                  local.get $7
-                                                  i32.sub
-                                                  local.tee $1
-                                                  i32.const 1
-                                                  i32.add
-                                                  local.set $8
-                                                  local.get $5
-                                                  local.get $1
-                                                  i32.le_s
-                                                  if ;; label = @24
-                                                    local.get $8
-                                                    local.set $5
-                                                  end
-                                                  i32.const 0
-                                                  local.set $6
-                                                  i32.const 1635
-                                                  local.set $8
-                                                  br 16 (;@7;)
-                                                end
-                                              else
-                                                block ;; label = @23
-                                                  i32.const 0
-                                                  local.set $6
-                                                  i32.const 1635
-                                                  local.set $8
-                                                  br 16 (;@7;)
-                                                end
-                                              end
-                                            end
-                                            local.get $16
-                                            i64.load
-                                            local.tee $50
-                                            i64.const 0
-                                            i64.lt_s
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $16
-                                                i64.const 0
-                                                local.get $50
-                                                i64.sub
-                                                local.tee $50
-                                                i64.store
-                                                i32.const 1
-                                                local.set $6
-                                                i32.const 1635
-                                                local.set $8
-                                                br 11 (;@11;)
-                                              end
-                                            end
-                                            local.get $12
-                                            i32.const 2048
-                                            i32.and
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                i32.const 1
-                                                local.set $6
-                                                i32.const 1636
-                                                local.set $8
-                                                br 11 (;@11;)
-                                              end
-                                            else
-                                              block ;; label = @22
-                                                local.get $12
-                                                i32.const 1
-                                                i32.and
-                                                local.tee $1
-                                                local.set $6
-                                                local.get $1
-                                                if (result i32) ;; label = @23
-                                                  i32.const 1637
-                                                else
-                                                  i32.const 1635
-                                                end
-                                                local.set $8
-                                                br 11 (;@11;)
-                                              end
-                                            end
-                                          end
-                                          local.get $16
-                                          i64.load
-                                          local.set $50
-                                          i32.const 0
-                                          local.set $6
-                                          i32.const 1635
-                                          local.set $8
-                                          br 8 (;@11;)
-                                        end
-                                        local.get $39
-                                        local.get $16
-                                        i64.load
-                                        i64.store8
-                                        local.get $39
-                                        local.set $1
-                                        local.get $7
-                                        local.set $12
-                                        i32.const 1
-                                        local.set $7
-                                        i32.const 0
-                                        local.set $6
-                                        i32.const 1635
-                                        local.set $8
-                                        local.get $21
-                                        local.set $5
-                                        br 12 (;@6;)
-                                      end
-                                      call $12
-                                      i32.load
-                                      call $24
-                                      local.set $1
-                                      br 7 (;@10;)
-                                    end
-                                    local.get $16
-                                    i32.load
-                                    local.tee $1
-                                    i32.eqz
-                                    if ;; label = @17
-                                      i32.const 1645
-                                      local.set $1
-                                    end
-                                    br 6 (;@10;)
-                                  end
-                                  local.get $37
-                                  local.get $16
-                                  i64.load
-                                  i64.store32
-                                  local.get $42
-                                  i32.const 0
-                                  i32.store
-                                  local.get $16
-                                  local.get $37
-                                  i32.store
-                                  local.get $37
-                                  local.set $7
-                                  i32.const -1
-                                  local.set $6
-                                  br 6 (;@9;)
-                                end
-                                local.get $16
-                                i32.load
-                                local.set $7
-                                local.get $5
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $5
-                                    local.set $6
-                                    br 7 (;@9;)
-                                  end
-                                else
-                                  block ;; label = @16
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    i32.const 0
-                                    local.get $12
-                                    call $25
-                                    i32.const 0
-                                    local.set $1
-                                    br 8 (;@8;)
-                                  end
-                                end
-                              end
-                              local.get $16
-                              f64.load
-                              local.set $52
-                              local.get $20
-                              i32.const 0
-                              i32.store
-                              local.get $52
-                              i64.reinterpret_f64
-                              i64.const 0
-                              i64.lt_s
-                              if (result i32) ;; label = @14
-                                block (result i32) ;; label = @15
-                                  i32.const 1
-                                  local.set $24
-                                  local.get $52
-                                  f64.neg
-                                  local.set $52
-                                  i32.const 1652
-                                end
-                              else
-                                block (result i32) ;; label = @15
-                                  local.get $12
-                                  i32.const 1
-                                  i32.and
-                                  local.set $1
-                                  local.get $12
-                                  i32.const 2048
-                                  i32.and
-                                  if (result i32) ;; label = @16
-                                    block (result i32) ;; label = @17
-                                      i32.const 1
-                                      local.set $24
-                                      i32.const 1655
-                                    end
-                                  else
-                                    block (result i32) ;; label = @17
-                                      local.get $1
-                                      local.set $24
-                                      local.get $1
-                                      if (result i32) ;; label = @18
-                                        i32.const 1658
-                                      else
-                                        i32.const 1653
-                                      end
-                                    end
-                                  end
-                                end
-                              end
-                              local.set $26
-                              block $label$119 ;; label = @14
-                                local.get $52
-                                i64.reinterpret_f64
-                                i64.const 9218868437227405312
-                                i64.and
-                                i64.const 9218868437227405312
-                                i64.lt_u
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $52
-                                    local.get $20
-                                    call $27
-                                    f64.const 0x1p+1 (;=2;)
-                                    f64.mul
-                                    local.tee $52
-                                    f64.const 0x0p+0 (;=0;)
-                                    f64.ne
-                                    local.tee $1
-                                    if ;; label = @17
-                                      local.get $20
-                                      local.get $20
-                                      i32.load
-                                      i32.const -1
-                                      i32.add
-                                      i32.store
-                                    end
-                                    local.get $9
-                                    i32.const 32
-                                    i32.or
-                                    local.tee $22
-                                    i32.const 97
-                                    i32.eq
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $26
-                                        i32.const 9
-                                        i32.add
-                                        local.set $1
-                                        local.get $9
-                                        i32.const 32
-                                        i32.and
-                                        local.tee $6
-                                        if ;; label = @19
-                                          local.get $1
-                                          local.set $26
-                                        end
-                                        local.get $5
-                                        i32.const 11
-                                        i32.gt_u
-                                        i32.const 12
-                                        local.get $5
-                                        i32.sub
-                                        local.tee $1
-                                        i32.eqz
-                                        i32.or
-                                        i32.eqz
-                                        if ;; label = @19
-                                          block ;; label = @20
-                                            f64.const 0x1p+3 (;=8;)
-                                            local.set $53
-                                            loop $label$125 ;; label = @21
-                                              local.get $53
-                                              f64.const 0x1p+4 (;=16;)
-                                              f64.mul
-                                              local.set $53
-                                              local.get $1
-                                              i32.const -1
-                                              i32.add
-                                              local.tee $1
-                                              br_if 0 (;@21;)
-                                            end
-                                            local.get $26
-                                            i32.load8_s
-                                            i32.const 45
-                                            i32.eq
-                                            if (result f64) ;; label = @21
-                                              local.get $53
-                                              local.get $52
-                                              f64.neg
-                                              local.get $53
-                                              f64.sub
-                                              f64.add
-                                              f64.neg
-                                            else
-                                              local.get $52
-                                              local.get $53
-                                              f64.add
-                                              local.get $53
-                                              f64.sub
-                                            end
-                                            local.set $52
-                                          end
-                                        end
-                                        i32.const 0
-                                        local.get $20
-                                        i32.load
-                                        local.tee $7
-                                        i32.sub
-                                        local.set $1
-                                        local.get $7
-                                        i32.const 0
-                                        i32.lt_s
-                                        if (result i32) ;; label = @19
-                                          local.get $1
-                                        else
-                                          local.get $7
-                                        end
-                                        i64.extend_i32_s
-                                        local.get $33
-                                        call $23
-                                        local.tee $1
-                                        local.get $33
-                                        i32.eq
-                                        if ;; label = @19
-                                          block ;; label = @20
-                                            local.get $40
-                                            i32.const 48
-                                            i32.store8
-                                            local.get $40
-                                            local.set $1
-                                          end
-                                        end
-                                        local.get $24
-                                        i32.const 2
-                                        i32.or
-                                        local.set $13
-                                        local.get $1
-                                        i32.const -1
-                                        i32.add
-                                        local.get $7
-                                        i32.const 31
-                                        i32.shr_s
-                                        i32.const 2
-                                        i32.and
-                                        i32.const 43
-                                        i32.add
-                                        i32.store8
-                                        local.get $1
-                                        i32.const -2
-                                        i32.add
-                                        local.tee $8
-                                        local.get $9
-                                        i32.const 15
-                                        i32.add
-                                        i32.store8
-                                        local.get $5
-                                        i32.const 1
-                                        i32.lt_s
-                                        local.set $9
-                                        local.get $12
-                                        i32.const 8
-                                        i32.and
-                                        i32.eqz
-                                        local.set $14
-                                        local.get $19
-                                        local.set $1
-                                        loop $label$131 ;; label = @19
-                                          local.get $1
-                                          local.get $52
-                                          i32.trunc_f64_s
-                                          local.tee $7
-                                          i32.const 1619
-                                          i32.add
-                                          i32.load8_u
-                                          local.get $6
-                                          i32.or
-                                          i32.store8
-                                          local.get $52
-                                          local.get $7
-                                          f64.convert_i32_s
-                                          f64.sub
-                                          f64.const 0x1p+4 (;=16;)
-                                          f64.mul
-                                          local.set $52
-                                          block $label$132 (result i32) ;; label = @20
-                                            local.get $1
-                                            i32.const 1
-                                            i32.add
-                                            local.tee $7
-                                            local.get $27
-                                            i32.sub
-                                            i32.const 1
-                                            i32.eq
-                                            if (result i32) ;; label = @21
-                                              block (result i32) ;; label = @22
-                                                local.get $7
-                                                local.get $14
-                                                local.get $9
-                                                local.get $52
-                                                f64.const 0x0p+0 (;=0;)
-                                                f64.eq
-                                                i32.and
-                                                i32.and
-                                                br_if 2 (;@20;)
-                                                drop
-                                                local.get $7
-                                                i32.const 46
-                                                i32.store8
-                                                local.get $1
-                                                i32.const 2
-                                                i32.add
-                                              end
-                                            else
-                                              local.get $7
-                                            end
-                                          end
-                                          local.set $1
-                                          local.get $52
-                                          f64.const 0x0p+0 (;=0;)
-                                          f64.ne
-                                          br_if 0 (;@19;)
-                                        end
-                                        local.get $46
-                                        local.get $5
-                                        i32.add
-                                        local.get $8
-                                        local.tee $7
-                                        i32.sub
-                                        local.set $6
-                                        local.get $44
-                                        local.get $7
-                                        i32.sub
-                                        local.get $1
-                                        i32.add
-                                        local.set $9
-                                        local.get $0
-                                        i32.const 32
-                                        local.get $10
-                                        local.get $5
-                                        i32.const 0
-                                        i32.ne
-                                        local.get $45
-                                        local.get $1
-                                        i32.add
-                                        local.get $5
-                                        i32.lt_s
-                                        i32.and
-                                        if (result i32) ;; label = @19
-                                          local.get $6
-                                        else
-                                          local.get $9
-                                          local.tee $6
-                                        end
-                                        local.get $13
-                                        i32.add
-                                        local.tee $5
-                                        local.get $12
-                                        call $25
-                                        local.get $0
-                                        i32.load
-                                        i32.const 32
-                                        i32.and
-                                        i32.eqz
-                                        if ;; label = @19
-                                          local.get $26
-                                          local.get $13
-                                          local.get $0
-                                          call $21
-                                          drop
-                                        end
-                                        local.get $0
-                                        i32.const 48
-                                        local.get $10
-                                        local.get $5
-                                        local.get $12
-                                        i32.const 65536
-                                        i32.xor
-                                        call $25
-                                        local.get $1
-                                        local.get $27
-                                        i32.sub
-                                        local.set $1
-                                        local.get $0
-                                        i32.load
-                                        i32.const 32
-                                        i32.and
-                                        i32.eqz
-                                        if ;; label = @19
-                                          local.get $19
-                                          local.get $1
-                                          local.get $0
-                                          call $21
-                                          drop
-                                        end
-                                        local.get $0
-                                        i32.const 48
-                                        local.get $6
-                                        local.get $1
-                                        local.get $28
-                                        local.get $7
-                                        i32.sub
-                                        local.tee $1
-                                        i32.add
-                                        i32.sub
-                                        i32.const 0
-                                        i32.const 0
-                                        call $25
-                                        local.get $0
-                                        i32.load
-                                        i32.const 32
-                                        i32.and
-                                        i32.eqz
-                                        if ;; label = @19
-                                          local.get $8
-                                          local.get $1
-                                          local.get $0
-                                          call $21
-                                          drop
-                                        end
-                                        local.get $0
-                                        i32.const 32
-                                        local.get $10
-                                        local.get $5
-                                        local.get $12
-                                        i32.const 8192
-                                        i32.xor
-                                        call $25
-                                        local.get $5
-                                        local.get $10
-                                        i32.ge_s
-                                        if ;; label = @19
-                                          local.get $5
-                                          local.set $10
-                                        end
-                                        br 4 (;@14;)
-                                      end
-                                    end
-                                    local.get $1
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $20
-                                        local.get $20
-                                        i32.load
-                                        i32.const -28
-                                        i32.add
-                                        local.tee $6
-                                        i32.store
-                                        local.get $52
-                                        f64.const 0x1p+28 (;=268435456;)
-                                        f64.mul
-                                        local.set $52
-                                      end
-                                    else
-                                      local.get $20
-                                      i32.load
-                                      local.set $6
-                                    end
-                                    local.get $6
-                                    i32.const 0
-                                    i32.lt_s
-                                    if (result i32) ;; label = @17
-                                      local.get $47
-                                    else
-                                      local.get $48
-                                    end
-                                    local.tee $7
-                                    local.set $8
-                                    loop $label$145 ;; label = @17
-                                      local.get $8
-                                      local.get $52
-                                      i32.trunc_f64_s
-                                      local.tee $1
-                                      i32.store
-                                      local.get $8
-                                      i32.const 4
-                                      i32.add
-                                      local.set $8
-                                      local.get $52
-                                      local.get $1
-                                      f64.convert_i32_u
-                                      f64.sub
-                                      f64.const 0x1.dcd65p+29 (;=1000000000;)
-                                      f64.mul
-                                      local.tee $52
-                                      f64.const 0x0p+0 (;=0;)
-                                      f64.ne
-                                      br_if 0 (;@17;)
-                                    end
-                                    local.get $6
-                                    i32.const 0
-                                    i32.gt_s
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $7
-                                        local.set $1
-                                        loop $label$147 ;; label = @19
-                                          local.get $6
-                                          i32.const 29
-                                          i32.gt_s
-                                          if (result i32) ;; label = @20
-                                            i32.const 29
-                                          else
-                                            local.get $6
-                                          end
-                                          local.set $14
-                                          block $label$150 ;; label = @20
-                                            local.get $8
-                                            i32.const -4
-                                            i32.add
-                                            local.tee $6
-                                            local.get $1
-                                            i32.ge_u
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $14
-                                                i64.extend_i32_u
-                                                local.set $50
-                                                i32.const 0
-                                                local.set $13
-                                                loop $label$152 ;; label = @23
-                                                  local.get $6
-                                                  local.get $6
-                                                  i32.load
-                                                  i64.extend_i32_u
-                                                  local.get $50
-                                                  i64.shl
-                                                  local.get $13
-                                                  i64.extend_i32_u
-                                                  i64.add
-                                                  local.tee $51
-                                                  i64.const 1000000000
-                                                  i64.rem_u
-                                                  i64.store32
-                                                  local.get $51
-                                                  i64.const 1000000000
-                                                  i64.div_u
-                                                  i32.wrap_i64
-                                                  local.set $13
-                                                  local.get $6
-                                                  i32.const -4
-                                                  i32.add
-                                                  local.tee $6
-                                                  local.get $1
-                                                  i32.ge_u
-                                                  br_if 0 (;@23;)
-                                                end
-                                                local.get $13
-                                                i32.eqz
-                                                br_if 2 (;@20;)
-                                                local.get $1
-                                                i32.const -4
-                                                i32.add
-                                                local.tee $1
-                                                local.get $13
-                                                i32.store
-                                              end
-                                            end
-                                          end
-                                          loop $label$153 ;; label = @20
-                                            local.get $8
-                                            local.get $1
-                                            i32.gt_u
-                                            if ;; label = @21
-                                              local.get $8
-                                              i32.const -4
-                                              i32.add
-                                              local.tee $6
-                                              i32.load
-                                              i32.eqz
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $6
-                                                  local.set $8
-                                                  br 3 (;@20;)
-                                                end
-                                              end
-                                            end
-                                          end
-                                          local.get $20
-                                          local.get $20
-                                          i32.load
-                                          local.get $14
-                                          i32.sub
-                                          local.tee $6
-                                          i32.store
-                                          local.get $6
-                                          i32.const 0
-                                          i32.gt_s
-                                          br_if 0 (;@19;)
-                                        end
-                                      end
-                                    else
-                                      local.get $7
-                                      local.set $1
-                                    end
-                                    local.get $5
-                                    i32.const 0
-                                    i32.lt_s
-                                    if (result i32) ;; label = @17
-                                      i32.const 6
-                                    else
-                                      local.get $5
-                                    end
-                                    local.set $18
-                                    local.get $6
-                                    i32.const 0
-                                    i32.lt_s
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $18
-                                        i32.const 25
-                                        i32.add
-                                        i32.const 9
-                                        i32.div_s
-                                        i32.const 1
-                                        i32.add
-                                        local.set $14
-                                        local.get $22
-                                        i32.const 102
-                                        i32.eq
-                                        local.set $25
-                                        local.get $8
-                                        local.set $5
-                                        loop $label$160 ;; label = @19
-                                          i32.const 0
-                                          local.get $6
-                                          i32.sub
-                                          local.tee $13
-                                          i32.const 9
-                                          i32.gt_s
-                                          if ;; label = @20
-                                            i32.const 9
-                                            local.set $13
-                                          end
-                                          block $label$162 ;; label = @20
-                                            local.get $1
-                                            local.get $5
-                                            i32.lt_u
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                i32.const 1
-                                                local.get $13
-                                                i32.shl
-                                                i32.const -1
-                                                i32.add
-                                                local.set $29
-                                                i32.const 1000000000
-                                                local.get $13
-                                                i32.shr_u
-                                                local.set $35
-                                                i32.const 0
-                                                local.set $6
-                                                local.get $1
-                                                local.set $8
-                                                loop $label$164 ;; label = @23
-                                                  local.get $8
-                                                  local.get $8
-                                                  i32.load
-                                                  local.tee $32
-                                                  local.get $13
-                                                  i32.shr_u
-                                                  local.get $6
-                                                  i32.add
-                                                  i32.store
-                                                  local.get $32
-                                                  local.get $29
-                                                  i32.and
-                                                  local.get $35
-                                                  i32.mul
-                                                  local.set $6
-                                                  local.get $8
-                                                  i32.const 4
-                                                  i32.add
-                                                  local.tee $8
-                                                  local.get $5
-                                                  i32.lt_u
-                                                  br_if 0 (;@23;)
-                                                end
-                                                local.get $1
-                                                i32.const 4
-                                                i32.add
-                                                local.set $8
-                                                local.get $1
-                                                i32.load
-                                                i32.eqz
-                                                if ;; label = @23
-                                                  local.get $8
-                                                  local.set $1
-                                                end
-                                                local.get $6
-                                                i32.eqz
-                                                br_if 2 (;@20;)
-                                                local.get $5
-                                                local.get $6
-                                                i32.store
-                                                local.get $5
-                                                i32.const 4
-                                                i32.add
-                                                local.set $5
-                                              end
-                                            else
-                                              block ;; label = @22
-                                                local.get $1
-                                                i32.const 4
-                                                i32.add
-                                                local.set $8
-                                                local.get $1
-                                                i32.load
-                                                i32.eqz
-                                                if ;; label = @23
-                                                  local.get $8
-                                                  local.set $1
-                                                end
-                                              end
-                                            end
-                                          end
-                                          local.get $25
-                                          if (result i32) ;; label = @20
-                                            local.get $7
-                                          else
-                                            local.get $1
-                                          end
-                                          local.tee $8
-                                          local.get $14
-                                          i32.const 2
-                                          i32.shl
-                                          i32.add
-                                          local.set $6
-                                          local.get $5
-                                          local.get $8
-                                          i32.sub
-                                          i32.const 2
-                                          i32.shr_s
-                                          local.get $14
-                                          i32.gt_s
-                                          if ;; label = @20
-                                            local.get $6
-                                            local.set $5
-                                          end
-                                          local.get $20
-                                          local.get $20
-                                          i32.load
-                                          local.get $13
-                                          i32.add
-                                          local.tee $6
-                                          i32.store
-                                          local.get $6
-                                          i32.const 0
-                                          i32.lt_s
-                                          br_if 0 (;@19;)
-                                          local.get $5
-                                          local.set $13
-                                        end
-                                      end
-                                    else
-                                      local.get $8
-                                      local.set $13
-                                    end
-                                    local.get $7
-                                    local.set $25
-                                    block $label$172 ;; label = @17
-                                      local.get $1
-                                      local.get $13
-                                      i32.lt_u
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $25
-                                          local.get $1
-                                          i32.sub
-                                          i32.const 2
-                                          i32.shr_s
-                                          i32.const 9
-                                          i32.mul
-                                          local.set $5
-                                          local.get $1
-                                          i32.load
-                                          local.tee $6
-                                          i32.const 10
-                                          i32.lt_u
-                                          br_if 2 (;@17;)
-                                          i32.const 10
-                                          local.set $8
-                                          loop $label$174 ;; label = @20
-                                            local.get $5
-                                            i32.const 1
-                                            i32.add
-                                            local.set $5
-                                            local.get $6
-                                            local.get $8
-                                            i32.const 10
-                                            i32.mul
-                                            local.tee $8
-                                            i32.ge_u
-                                            br_if 0 (;@20;)
-                                          end
-                                        end
-                                      else
-                                        i32.const 0
-                                        local.set $5
-                                      end
-                                    end
-                                    local.get $22
-                                    i32.const 103
-                                    i32.eq
-                                    local.set $29
-                                    local.get $18
-                                    i32.const 0
-                                    i32.ne
-                                    local.set $35
-                                    local.get $18
-                                    local.get $22
-                                    i32.const 102
-                                    i32.ne
-                                    if (result i32) ;; label = @17
-                                      local.get $5
-                                    else
-                                      i32.const 0
-                                    end
-                                    i32.sub
-                                    local.get $35
-                                    local.get $29
-                                    i32.and
-                                    i32.const 31
-                                    i32.shl
-                                    i32.const 31
-                                    i32.shr_s
-                                    i32.add
-                                    local.tee $8
-                                    local.get $13
-                                    local.get $25
-                                    i32.sub
-                                    i32.const 2
-                                    i32.shr_s
-                                    i32.const 9
-                                    i32.mul
-                                    i32.const -9
-                                    i32.add
-                                    i32.lt_s
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $8
-                                        i32.const 9216
-                                        i32.add
-                                        local.tee $14
-                                        i32.const 9
-                                        i32.rem_s
-                                        i32.const 1
-                                        i32.add
-                                        local.tee $8
-                                        i32.const 9
-                                        i32.lt_s
-                                        if ;; label = @19
-                                          block ;; label = @20
-                                            i32.const 10
-                                            local.set $6
-                                            loop $label$180 ;; label = @21
-                                              local.get $6
-                                              i32.const 10
-                                              i32.mul
-                                              local.set $6
-                                              local.get $8
-                                              i32.const 1
-                                              i32.add
-                                              local.tee $8
-                                              i32.const 9
-                                              i32.ne
-                                              br_if 0 (;@21;)
-                                            end
-                                          end
-                                        else
-                                          i32.const 10
-                                          local.set $6
-                                        end
-                                        local.get $7
-                                        i32.const 4
-                                        i32.add
-                                        local.get $14
-                                        i32.const 9
-                                        i32.div_s
-                                        i32.const -1024
-                                        i32.add
-                                        i32.const 2
-                                        i32.shl
-                                        i32.add
-                                        local.tee $8
-                                        i32.load
-                                        local.tee $22
-                                        local.get $6
-                                        i32.rem_u
-                                        local.set $14
-                                        block $label$182 ;; label = @19
-                                          local.get $8
-                                          i32.const 4
-                                          i32.add
-                                          local.get $13
-                                          i32.eq
-                                          local.tee $32
-                                          local.get $14
-                                          i32.eqz
-                                          i32.and
-                                          i32.eqz
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              local.get $14
-                                              local.get $6
-                                              i32.const 2
-                                              i32.div_s
-                                              local.tee $49
-                                              i32.lt_u
-                                              if (result f64) ;; label = @22
-                                                f64.const 0x1p-1 (;=0.5;)
-                                              else
-                                                local.get $32
-                                                local.get $14
-                                                local.get $49
-                                                i32.eq
-                                                i32.and
-                                                if (result f64) ;; label = @23
-                                                  f64.const 0x1p+0 (;=1;)
-                                                else
-                                                  f64.const 0x1.8p+0 (;=1.5;)
-                                                end
-                                              end
-                                              local.set $52
-                                              local.get $22
-                                              local.get $6
-                                              i32.div_u
-                                              i32.const 1
-                                              i32.and
-                                              if (result f64) ;; label = @22
-                                                f64.const 0x1.0000000000001p+53 (;=9007199254740994;)
-                                              else
-                                                f64.const 0x1p+53 (;=9007199254740992;)
-                                              end
-                                              local.set $53
-                                              block $label$190 ;; label = @22
-                                                local.get $24
-                                                if ;; label = @23
-                                                  block ;; label = @24
-                                                    local.get $26
-                                                    i32.load8_s
-                                                    i32.const 45
-                                                    i32.ne
-                                                    br_if 2 (;@22;)
-                                                    local.get $53
-                                                    f64.neg
-                                                    local.set $53
-                                                    local.get $52
-                                                    f64.neg
-                                                    local.set $52
-                                                  end
-                                                end
-                                              end
-                                              local.get $8
-                                              local.get $22
-                                              local.get $14
-                                              i32.sub
-                                              local.tee $14
-                                              i32.store
-                                              local.get $53
-                                              local.get $52
-                                              f64.add
-                                              local.get $53
-                                              f64.eq
-                                              br_if 2 (;@19;)
-                                              local.get $8
-                                              local.get $14
-                                              local.get $6
-                                              i32.add
-                                              local.tee $5
-                                              i32.store
-                                              local.get $5
-                                              i32.const 999999999
-                                              i32.gt_u
-                                              if ;; label = @22
-                                                loop $label$193 ;; label = @23
-                                                  local.get $8
-                                                  i32.const 0
-                                                  i32.store
-                                                  local.get $8
-                                                  i32.const -4
-                                                  i32.add
-                                                  local.tee $8
-                                                  local.get $1
-                                                  i32.lt_u
-                                                  if ;; label = @24
-                                                    local.get $1
-                                                    i32.const -4
-                                                    i32.add
-                                                    local.tee $1
-                                                    i32.const 0
-                                                    i32.store
-                                                  end
-                                                  local.get $8
-                                                  local.get $8
-                                                  i32.load
-                                                  i32.const 1
-                                                  i32.add
-                                                  local.tee $5
-                                                  i32.store
-                                                  local.get $5
-                                                  i32.const 999999999
-                                                  i32.gt_u
-                                                  br_if 0 (;@23;)
-                                                end
-                                              end
-                                              local.get $25
-                                              local.get $1
-                                              i32.sub
-                                              i32.const 2
-                                              i32.shr_s
-                                              i32.const 9
-                                              i32.mul
-                                              local.set $5
-                                              local.get $1
-                                              i32.load
-                                              local.tee $14
-                                              i32.const 10
-                                              i32.lt_u
-                                              br_if 2 (;@19;)
-                                              i32.const 10
-                                              local.set $6
-                                              loop $label$195 ;; label = @22
-                                                local.get $5
-                                                i32.const 1
-                                                i32.add
-                                                local.set $5
-                                                local.get $14
-                                                local.get $6
-                                                i32.const 10
-                                                i32.mul
-                                                local.tee $6
-                                                i32.ge_u
-                                                br_if 0 (;@22;)
-                                              end
-                                            end
-                                          end
-                                        end
-                                        local.get $1
-                                        local.set $14
-                                        local.get $5
-                                        local.set $6
-                                        local.get $13
-                                        local.get $8
-                                        i32.const 4
-                                        i32.add
-                                        local.tee $8
-                                        i32.le_u
-                                        if ;; label = @19
-                                          local.get $13
-                                          local.set $8
-                                        end
-                                      end
-                                    else
-                                      block ;; label = @18
-                                        local.get $1
-                                        local.set $14
-                                        local.get $5
-                                        local.set $6
-                                        local.get $13
-                                        local.set $8
-                                      end
-                                    end
-                                    i32.const 0
-                                    local.get $6
-                                    i32.sub
-                                    local.set $32
-                                    loop $label$198 ;; label = @17
-                                      block $label$199 ;; label = @18
-                                        local.get $8
-                                        local.get $14
-                                        i32.le_u
-                                        if ;; label = @19
-                                          block ;; label = @20
-                                            i32.const 0
-                                            local.set $22
-                                            br 2 (;@18;)
-                                          end
-                                        end
-                                        local.get $8
-                                        i32.const -4
-                                        i32.add
-                                        local.tee $1
-                                        i32.load
-                                        if ;; label = @19
-                                          i32.const 1
-                                          local.set $22
-                                        else
-                                          block ;; label = @20
-                                            local.get $1
-                                            local.set $8
-                                            br 3 (;@17;)
-                                          end
-                                        end
-                                      end
-                                    end
-                                    block $label$203 ;; label = @17
-                                      local.get $29
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $35
-                                          i32.const 1
-                                          i32.and
-                                          i32.const 1
-                                          i32.xor
-                                          local.get $18
-                                          i32.add
-                                          local.tee $1
-                                          local.get $6
-                                          i32.gt_s
-                                          local.get $6
-                                          i32.const -5
-                                          i32.gt_s
-                                          i32.and
-                                          if (result i32) ;; label = @20
-                                            block (result i32) ;; label = @21
-                                              local.get $9
-                                              i32.const -1
-                                              i32.add
-                                              local.set $5
-                                              local.get $1
-                                              i32.const -1
-                                              i32.add
-                                              local.get $6
-                                              i32.sub
-                                            end
-                                          else
-                                            block (result i32) ;; label = @21
-                                              local.get $9
-                                              i32.const -2
-                                              i32.add
-                                              local.set $5
-                                              local.get $1
-                                              i32.const -1
-                                              i32.add
-                                            end
-                                          end
-                                          local.set $1
-                                          local.get $12
-                                          i32.const 8
-                                          i32.and
-                                          local.tee $13
-                                          br_if 2 (;@17;)
-                                          block $label$207 ;; label = @20
-                                            local.get $22
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $8
-                                                i32.const -4
-                                                i32.add
-                                                i32.load
-                                                local.tee $18
-                                                i32.eqz
-                                                if ;; label = @23
-                                                  block ;; label = @24
-                                                    i32.const 9
-                                                    local.set $9
-                                                    br 4 (;@20;)
-                                                  end
-                                                end
-                                                local.get $18
-                                                i32.const 10
-                                                i32.rem_u
-                                                if ;; label = @23
-                                                  block ;; label = @24
-                                                    i32.const 0
-                                                    local.set $9
-                                                    br 4 (;@20;)
-                                                  end
-                                                else
-                                                  block ;; label = @24
-                                                    i32.const 10
-                                                    local.set $13
-                                                    i32.const 0
-                                                    local.set $9
-                                                  end
-                                                end
-                                                loop $label$212 ;; label = @23
-                                                  local.get $9
-                                                  i32.const 1
-                                                  i32.add
-                                                  local.set $9
-                                                  local.get $18
-                                                  local.get $13
-                                                  i32.const 10
-                                                  i32.mul
-                                                  local.tee $13
-                                                  i32.rem_u
-                                                  i32.eqz
-                                                  br_if 0 (;@23;)
-                                                end
-                                              end
-                                            else
-                                              i32.const 9
-                                              local.set $9
-                                            end
-                                          end
-                                          local.get $8
-                                          local.get $25
-                                          i32.sub
-                                          i32.const 2
-                                          i32.shr_s
-                                          i32.const 9
-                                          i32.mul
-                                          i32.const -9
-                                          i32.add
-                                          local.set $18
-                                          local.get $5
-                                          i32.const 32
-                                          i32.or
-                                          i32.const 102
-                                          i32.eq
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              i32.const 0
-                                              local.set $13
-                                              local.get $1
-                                              local.get $18
-                                              local.get $9
-                                              i32.sub
-                                              local.tee $9
-                                              i32.const 0
-                                              i32.lt_s
-                                              if (result i32) ;; label = @22
-                                                i32.const 0
-                                                local.tee $9
-                                              else
-                                                local.get $9
-                                              end
-                                              i32.ge_s
-                                              if ;; label = @22
-                                                local.get $9
-                                                local.set $1
-                                              end
-                                            end
-                                          else
-                                            block ;; label = @21
-                                              i32.const 0
-                                              local.set $13
-                                              local.get $1
-                                              local.get $18
-                                              local.get $6
-                                              i32.add
-                                              local.get $9
-                                              i32.sub
-                                              local.tee $9
-                                              i32.const 0
-                                              i32.lt_s
-                                              if (result i32) ;; label = @22
-                                                i32.const 0
-                                                local.tee $9
-                                              else
-                                                local.get $9
-                                              end
-                                              i32.ge_s
-                                              if ;; label = @22
-                                                local.get $9
-                                                local.set $1
-                                              end
-                                            end
-                                          end
-                                        end
-                                      else
-                                        block ;; label = @19
-                                          local.get $12
-                                          i32.const 8
-                                          i32.and
-                                          local.set $13
-                                          local.get $18
-                                          local.set $1
-                                          local.get $9
-                                          local.set $5
-                                        end
-                                      end
-                                    end
-                                    local.get $5
-                                    i32.const 32
-                                    i32.or
-                                    i32.const 102
-                                    i32.eq
-                                    local.tee $25
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        i32.const 0
-                                        local.set $9
-                                        local.get $6
-                                        i32.const 0
-                                        i32.le_s
-                                        if ;; label = @19
-                                          i32.const 0
-                                          local.set $6
-                                        end
-                                      end
-                                    else
-                                      block ;; label = @18
-                                        local.get $28
-                                        local.get $6
-                                        i32.const 0
-                                        i32.lt_s
-                                        if (result i32) ;; label = @19
-                                          local.get $32
-                                        else
-                                          local.get $6
-                                        end
-                                        i64.extend_i32_s
-                                        local.get $33
-                                        call $23
-                                        local.tee $9
-                                        i32.sub
-                                        i32.const 2
-                                        i32.lt_s
-                                        if ;; label = @19
-                                          loop $label$229 ;; label = @20
-                                            local.get $9
-                                            i32.const -1
-                                            i32.add
-                                            local.tee $9
-                                            i32.const 48
-                                            i32.store8
-                                            local.get $28
-                                            local.get $9
-                                            i32.sub
-                                            i32.const 2
-                                            i32.lt_s
-                                            br_if 0 (;@20;)
-                                          end
-                                        end
-                                        local.get $9
-                                        i32.const -1
-                                        i32.add
-                                        local.get $6
-                                        i32.const 31
-                                        i32.shr_s
-                                        i32.const 2
-                                        i32.and
-                                        i32.const 43
-                                        i32.add
-                                        i32.store8
-                                        local.get $9
-                                        i32.const -2
-                                        i32.add
-                                        local.tee $6
-                                        local.get $5
-                                        i32.store8
-                                        local.get $6
-                                        local.set $9
-                                        local.get $28
-                                        local.get $6
-                                        i32.sub
-                                        local.set $6
-                                      end
-                                    end
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    local.get $24
-                                    i32.const 1
-                                    i32.add
-                                    local.get $1
-                                    i32.add
-                                    local.get $1
-                                    local.get $13
-                                    i32.or
-                                    local.tee $29
-                                    i32.const 0
-                                    i32.ne
-                                    i32.add
-                                    local.get $6
-                                    i32.add
-                                    local.tee $18
-                                    local.get $12
-                                    call $25
-                                    local.get $0
-                                    i32.load
-                                    i32.const 32
-                                    i32.and
-                                    i32.eqz
-                                    if ;; label = @17
-                                      local.get $26
-                                      local.get $24
-                                      local.get $0
-                                      call $21
-                                      drop
-                                    end
-                                    local.get $0
-                                    i32.const 48
-                                    local.get $10
-                                    local.get $18
-                                    local.get $12
-                                    i32.const 65536
-                                    i32.xor
-                                    call $25
-                                    block $label$231 ;; label = @17
-                                      local.get $25
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $14
-                                          local.get $7
-                                          i32.gt_u
-                                          if (result i32) ;; label = @20
-                                            local.get $7
-                                          else
-                                            local.get $14
-                                          end
-                                          local.tee $9
-                                          local.set $6
-                                          loop $label$235 ;; label = @20
-                                            local.get $6
-                                            i32.load
-                                            i64.extend_i32_u
-                                            local.get $31
-                                            call $23
-                                            local.set $5
-                                            block $label$236 ;; label = @21
-                                              local.get $6
-                                              local.get $9
-                                              i32.eq
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $5
-                                                  local.get $31
-                                                  i32.ne
-                                                  br_if 2 (;@21;)
-                                                  local.get $34
-                                                  i32.const 48
-                                                  i32.store8
-                                                  local.get $34
-                                                  local.set $5
-                                                end
-                                              else
-                                                block ;; label = @23
-                                                  local.get $5
-                                                  local.get $19
-                                                  i32.le_u
-                                                  br_if 2 (;@21;)
-                                                  local.get $19
-                                                  i32.const 48
-                                                  local.get $5
-                                                  local.get $27
-                                                  i32.sub
-                                                  call $41
-                                                  drop
-                                                  loop $label$239 ;; label = @24
-                                                    local.get $5
-                                                    i32.const -1
-                                                    i32.add
-                                                    local.tee $5
-                                                    local.get $19
-                                                    i32.gt_u
-                                                    br_if 0 (;@24;)
-                                                  end
-                                                end
-                                              end
-                                            end
-                                            local.get $0
-                                            i32.load
-                                            i32.const 32
-                                            i32.and
-                                            i32.eqz
-                                            if ;; label = @21
-                                              local.get $5
-                                              local.get $41
-                                              local.get $5
-                                              i32.sub
-                                              local.get $0
-                                              call $21
-                                              drop
-                                            end
-                                            local.get $6
-                                            i32.const 4
-                                            i32.add
-                                            local.tee $5
-                                            local.get $7
-                                            i32.le_u
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $5
-                                                local.set $6
-                                                br 2 (;@20;)
-                                              end
-                                            end
-                                          end
-                                          block $label$242 ;; label = @20
-                                            local.get $29
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $0
-                                                i32.load
-                                                i32.const 32
-                                                i32.and
-                                                br_if 2 (;@20;)
-                                                i32.const 1687
-                                                i32.const 1
-                                                local.get $0
-                                                call $21
-                                                drop
-                                              end
-                                            end
-                                          end
-                                          local.get $1
-                                          i32.const 0
-                                          i32.gt_s
-                                          local.get $5
-                                          local.get $8
-                                          i32.lt_u
-                                          i32.and
-                                          if ;; label = @20
-                                            loop $label$245 ;; label = @21
-                                              local.get $5
-                                              i32.load
-                                              i64.extend_i32_u
-                                              local.get $31
-                                              call $23
-                                              local.tee $7
-                                              local.get $19
-                                              i32.gt_u
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $19
-                                                  i32.const 48
-                                                  local.get $7
-                                                  local.get $27
-                                                  i32.sub
-                                                  call $41
-                                                  drop
-                                                  loop $label$247 ;; label = @24
-                                                    local.get $7
-                                                    i32.const -1
-                                                    i32.add
-                                                    local.tee $7
-                                                    local.get $19
-                                                    i32.gt_u
-                                                    br_if 0 (;@24;)
-                                                  end
-                                                end
-                                              end
-                                              local.get $0
-                                              i32.load
-                                              i32.const 32
-                                              i32.and
-                                              i32.eqz
-                                              if ;; label = @22
-                                                local.get $7
-                                                local.get $1
-                                                i32.const 9
-                                                i32.gt_s
-                                                if (result i32) ;; label = @23
-                                                  i32.const 9
-                                                else
-                                                  local.get $1
-                                                end
-                                                local.get $0
-                                                call $21
-                                                drop
-                                              end
-                                              local.get $1
-                                              i32.const -9
-                                              i32.add
-                                              local.set $7
-                                              local.get $1
-                                              i32.const 9
-                                              i32.gt_s
-                                              local.get $5
-                                              i32.const 4
-                                              i32.add
-                                              local.tee $5
-                                              local.get $8
-                                              i32.lt_u
-                                              i32.and
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $7
-                                                  local.set $1
-                                                  br 2 (;@21;)
-                                                end
-                                              else
-                                                local.get $7
-                                                local.set $1
-                                              end
-                                            end
-                                          end
-                                          local.get $0
-                                          i32.const 48
-                                          local.get $1
-                                          i32.const 9
-                                          i32.add
-                                          i32.const 9
-                                          i32.const 0
-                                          call $25
-                                        end
-                                      else
-                                        block ;; label = @19
-                                          local.get $14
-                                          i32.const 4
-                                          i32.add
-                                          local.set $5
-                                          local.get $22
-                                          i32.eqz
-                                          if ;; label = @20
-                                            local.get $5
-                                            local.set $8
-                                          end
-                                          local.get $1
-                                          i32.const -1
-                                          i32.gt_s
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              local.get $13
-                                              i32.eqz
-                                              local.set $13
-                                              local.get $14
-                                              local.set $7
-                                              local.get $1
-                                              local.set $5
-                                              loop $label$256 ;; label = @22
-                                                local.get $7
-                                                i32.load
-                                                i64.extend_i32_u
-                                                local.get $31
-                                                call $23
-                                                local.tee $1
-                                                local.get $31
-                                                i32.eq
-                                                if ;; label = @23
-                                                  block ;; label = @24
-                                                    local.get $34
-                                                    i32.const 48
-                                                    i32.store8
-                                                    local.get $34
-                                                    local.set $1
-                                                  end
-                                                end
-                                                block $label$258 ;; label = @23
-                                                  local.get $7
-                                                  local.get $14
-                                                  i32.eq
-                                                  if ;; label = @24
-                                                    block ;; label = @25
-                                                      local.get $0
-                                                      i32.load
-                                                      i32.const 32
-                                                      i32.and
-                                                      i32.eqz
-                                                      if ;; label = @26
-                                                        local.get $1
-                                                        i32.const 1
-                                                        local.get $0
-                                                        call $21
-                                                        drop
-                                                      end
-                                                      local.get $1
-                                                      i32.const 1
-                                                      i32.add
-                                                      local.set $1
-                                                      local.get $13
-                                                      local.get $5
-                                                      i32.const 1
-                                                      i32.lt_s
-                                                      i32.and
-                                                      br_if 2 (;@23;)
-                                                      local.get $0
-                                                      i32.load
-                                                      i32.const 32
-                                                      i32.and
-                                                      br_if 2 (;@23;)
-                                                      i32.const 1687
-                                                      i32.const 1
-                                                      local.get $0
-                                                      call $21
-                                                      drop
-                                                    end
-                                                  else
-                                                    block ;; label = @25
-                                                      local.get $1
-                                                      local.get $19
-                                                      i32.le_u
-                                                      br_if 2 (;@23;)
-                                                      local.get $19
-                                                      i32.const 48
-                                                      local.get $1
-                                                      local.get $43
-                                                      i32.add
-                                                      call $41
-                                                      drop
-                                                      loop $label$262 ;; label = @26
-                                                        local.get $1
-                                                        i32.const -1
-                                                        i32.add
-                                                        local.tee $1
-                                                        local.get $19
-                                                        i32.gt_u
-                                                        br_if 0 (;@26;)
-                                                      end
-                                                    end
-                                                  end
-                                                end
-                                                local.get $41
-                                                local.get $1
-                                                i32.sub
-                                                local.set $6
-                                                local.get $0
-                                                i32.load
-                                                i32.const 32
-                                                i32.and
-                                                i32.eqz
-                                                if ;; label = @23
-                                                  local.get $1
-                                                  local.get $5
-                                                  local.get $6
-                                                  i32.gt_s
-                                                  if (result i32) ;; label = @24
-                                                    local.get $6
-                                                  else
-                                                    local.get $5
-                                                  end
-                                                  local.get $0
-                                                  call $21
-                                                  drop
-                                                end
-                                                local.get $7
-                                                i32.const 4
-                                                i32.add
-                                                local.tee $7
-                                                local.get $8
-                                                i32.lt_u
-                                                local.get $5
-                                                local.get $6
-                                                i32.sub
-                                                local.tee $5
-                                                i32.const -1
-                                                i32.gt_s
-                                                i32.and
-                                                br_if 0 (;@22;)
-                                                local.get $5
-                                                local.set $1
-                                              end
-                                            end
-                                          end
-                                          local.get $0
-                                          i32.const 48
-                                          local.get $1
-                                          i32.const 18
-                                          i32.add
-                                          i32.const 18
-                                          i32.const 0
-                                          call $25
-                                          local.get $0
-                                          i32.load
-                                          i32.const 32
-                                          i32.and
-                                          br_if 2 (;@17;)
-                                          local.get $9
-                                          local.get $28
-                                          local.get $9
-                                          i32.sub
-                                          local.get $0
-                                          call $21
-                                          drop
-                                        end
-                                      end
-                                    end
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    local.get $18
-                                    local.get $12
-                                    i32.const 8192
-                                    i32.xor
-                                    call $25
-                                    local.get $18
-                                    local.get $10
-                                    i32.ge_s
-                                    if ;; label = @17
-                                      local.get $18
-                                      local.set $10
-                                    end
-                                  end
-                                else
-                                  block ;; label = @16
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    local.get $52
-                                    local.get $52
-                                    f64.ne
-                                    i32.const 0
-                                    i32.or
-                                    local.tee $6
-                                    if (result i32) ;; label = @17
-                                      i32.const 0
-                                      local.tee $24
-                                    else
-                                      local.get $24
-                                    end
-                                    i32.const 3
-                                    i32.add
-                                    local.tee $8
-                                    local.get $7
-                                    call $25
-                                    local.get $0
-                                    i32.load
-                                    local.tee $1
-                                    i32.const 32
-                                    i32.and
-                                    i32.eqz
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $26
-                                        local.get $24
-                                        local.get $0
-                                        call $21
-                                        drop
-                                        local.get $0
-                                        i32.load
-                                        local.set $1
-                                      end
-                                    end
-                                    local.get $9
-                                    i32.const 32
-                                    i32.and
-                                    i32.const 0
-                                    i32.ne
-                                    local.tee $5
-                                    if (result i32) ;; label = @17
-                                      i32.const 1671
-                                    else
-                                      i32.const 1675
-                                    end
-                                    local.set $7
-                                    local.get $5
-                                    if (result i32) ;; label = @17
-                                      i32.const 1679
-                                    else
-                                      i32.const 1683
-                                    end
-                                    local.set $5
-                                    local.get $6
-                                    i32.eqz
-                                    if ;; label = @17
-                                      local.get $7
-                                      local.set $5
-                                    end
-                                    local.get $1
-                                    i32.const 32
-                                    i32.and
-                                    i32.eqz
-                                    if ;; label = @17
-                                      local.get $5
-                                      i32.const 3
-                                      local.get $0
-                                      call $21
-                                      drop
-                                    end
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    local.get $8
-                                    local.get $12
-                                    i32.const 8192
-                                    i32.xor
-                                    call $25
-                                    local.get $8
-                                    local.get $10
-                                    i32.ge_s
-                                    if ;; label = @17
-                                      local.get $8
-                                      local.set $10
-                                    end
-                                  end
-                                end
-                              end
-                              local.get $11
-                              local.set $1
-                              br 9 (;@4;)
-                            end
-                            local.get $5
-                            local.set $7
-                            i32.const 0
-                            local.set $6
-                            i32.const 1635
-                            local.set $8
-                            local.get $21
-                            local.set $5
-                            br 6 (;@6;)
-                          end
-                          local.get $9
-                          i32.const 32
-                          i32.and
-                          local.set $7
-                          local.get $16
-                          i64.load
-                          local.tee $50
-                          i64.const 0
-                          i64.eq
-                          if (result i32) ;; label = @12
-                            block (result i32) ;; label = @13
-                              i64.const 0
-                              local.set $50
-                              local.get $21
-                            end
-                          else
-                            block (result i32) ;; label = @13
-                              local.get $21
-                              local.set $1
-                              loop $label$280 ;; label = @14
-                                local.get $1
-                                i32.const -1
-                                i32.add
-                                local.tee $1
-                                local.get $50
-                                i32.wrap_i64
-                                i32.const 15
-                                i32.and
-                                i32.const 1619
-                                i32.add
-                                i32.load8_u
-                                local.get $7
-                                i32.or
-                                i32.store8
-                                local.get $50
-                                i64.const 4
-                                i64.shr_u
-                                local.tee $50
-                                i64.const 0
-                                i64.ne
-                                br_if 0 (;@14;)
-                              end
-                              local.get $16
-                              i64.load
-                              local.set $50
-                              local.get $1
-                            end
-                          end
-                          local.set $7
-                          local.get $9
-                          i32.const 4
-                          i32.shr_s
-                          i32.const 1635
-                          i32.add
-                          local.set $8
-                          local.get $12
-                          i32.const 8
-                          i32.and
-                          i32.eqz
-                          local.get $50
-                          i64.const 0
-                          i64.eq
-                          i32.or
-                          local.tee $1
-                          if ;; label = @12
-                            i32.const 1635
-                            local.set $8
-                          end
-                          local.get $1
-                          if (result i32) ;; label = @12
-                            i32.const 0
-                          else
-                            i32.const 2
-                          end
-                          local.set $6
-                          br 4 (;@7;)
-                        end
-                        local.get $50
-                        local.get $21
-                        call $23
-                        local.set $7
-                        br 3 (;@7;)
-                      end
-                      local.get $1
-                      i32.const 0
-                      local.get $5
-                      call $17
-                      local.tee $13
-                      i32.eqz
-                      local.set $14
-                      local.get $13
-                      local.get $1
-                      i32.sub
-                      local.set $8
-                      local.get $1
-                      local.get $5
-                      i32.add
-                      local.set $9
-                      local.get $7
-                      local.set $12
-                      local.get $14
-                      if (result i32) ;; label = @10
-                        local.get $5
-                      else
-                        local.get $8
-                      end
-                      local.set $7
-                      i32.const 0
-                      local.set $6
-                      i32.const 1635
-                      local.set $8
-                      local.get $14
-                      if (result i32) ;; label = @10
-                        local.get $9
-                      else
-                        local.get $13
-                      end
-                      local.set $5
-                      br 3 (;@6;)
-                    end
-                    i32.const 0
-                    local.set $1
-                    i32.const 0
-                    local.set $5
-                    local.get $7
-                    local.set $8
-                    loop $label$288 ;; label = @9
-                      block $label$289 ;; label = @10
-                        local.get $8
-                        i32.load
-                        local.tee $9
-                        i32.eqz
-                        br_if 0 (;@10;)
-                        local.get $36
-                        local.get $9
-                        call $26
-                        local.tee $5
-                        i32.const 0
-                        i32.lt_s
-                        local.get $5
-                        local.get $6
-                        local.get $1
-                        i32.sub
-                        i32.gt_u
-                        i32.or
-                        br_if 0 (;@10;)
-                        local.get $8
-                        i32.const 4
-                        i32.add
-                        local.set $8
-                        local.get $6
-                        local.get $5
-                        local.get $1
-                        i32.add
-                        local.tee $1
-                        i32.gt_u
-                        br_if 1 (;@9;)
-                      end
-                    end
-                    local.get $5
-                    i32.const 0
-                    i32.lt_s
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const -1
-                        local.set $15
-                        br 5 (;@5;)
-                      end
-                    end
-                    local.get $0
-                    i32.const 32
-                    local.get $10
-                    local.get $1
-                    local.get $12
-                    call $25
-                    local.get $1
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const 0
-                        local.set $5
-                        loop $label$292 ;; label = @11
-                          local.get $7
-                          i32.load
-                          local.tee $8
-                          i32.eqz
-                          br_if 3 (;@8;)
-                          local.get $36
-                          local.get $8
-                          call $26
-                          local.tee $8
-                          local.get $5
-                          i32.add
-                          local.tee $5
-                          local.get $1
-                          i32.gt_s
-                          br_if 3 (;@8;)
-                          local.get $0
-                          i32.load
-                          i32.const 32
-                          i32.and
-                          i32.eqz
-                          if ;; label = @12
-                            local.get $36
-                            local.get $8
-                            local.get $0
-                            call $21
-                            drop
-                          end
-                          local.get $7
-                          i32.const 4
-                          i32.add
-                          local.set $7
-                          local.get $5
-                          local.get $1
-                          i32.lt_u
-                          br_if 0 (;@11;)
-                          br 3 (;@8;)
-                        end
-                      end
-                    else
-                      block ;; label = @10
-                        i32.const 0
-                        local.set $1
-                        br 2 (;@8;)
-                      end
-                    end
-                  end
-                  local.get $0
-                  i32.const 32
-                  local.get $10
-                  local.get $1
-                  local.get $12
-                  i32.const 8192
-                  i32.xor
-                  call $25
-                  local.get $10
-                  local.get $1
-                  i32.le_s
-                  if ;; label = @8
-                    local.get $1
-                    local.set $10
-                  end
-                  local.get $11
-                  local.set $1
-                  br 3 (;@4;)
-                end
-                local.get $12
-                i32.const -65537
-                i32.and
-                local.set $1
-                local.get $5
-                i32.const -1
-                i32.gt_s
-                if ;; label = @7
-                  local.get $1
-                  local.set $12
-                end
-                local.get $5
-                local.get $16
-                i64.load
-                i64.const 0
-                i64.ne
-                local.tee $9
-                i32.or
-                if (result i32) ;; label = @7
-                  block (result i32) ;; label = @8
-                    local.get $7
-                    local.set $1
-                    local.get $5
-                    local.get $9
-                    i32.const 1
-                    i32.and
-                    i32.const 1
-                    i32.xor
-                    local.get $38
-                    local.get $7
-                    i32.sub
-                    i32.add
-                    local.tee $7
-                    i32.gt_s
-                    if ;; label = @9
-                      local.get $5
-                      local.set $7
-                    end
-                    local.get $21
-                  end
-                else
-                  block (result i32) ;; label = @8
-                    local.get $21
-                    local.set $1
-                    i32.const 0
-                    local.set $7
-                    local.get $21
-                  end
-                end
-                local.set $5
-              end
-              local.get $0
-              i32.const 32
-              local.get $10
-              local.get $7
-              local.get $5
-              local.get $1
-              i32.sub
-              local.tee $9
-              i32.lt_s
-              if (result i32) ;; label = @6
-                local.get $9
-                local.tee $7
-              else
-                local.get $7
-              end
-              local.get $6
-              i32.add
-              local.tee $5
-              i32.lt_s
-              if (result i32) ;; label = @6
-                local.get $5
-                local.tee $10
-              else
-                local.get $10
-              end
-              local.get $5
-              local.get $12
-              call $25
-              local.get $0
-              i32.load
-              i32.const 32
-              i32.and
-              i32.eqz
-              if ;; label = @6
-                local.get $8
-                local.get $6
-                local.get $0
-                call $21
-                drop
-              end
-              local.get $0
-              i32.const 48
-              local.get $10
-              local.get $5
-              local.get $12
-              i32.const 65536
-              i32.xor
-              call $25
-              local.get $0
-              i32.const 48
-              local.get $7
-              local.get $9
-              i32.const 0
-              call $25
-              local.get $0
-              i32.load
-              i32.const 32
-              i32.and
-              i32.eqz
-              if ;; label = @6
-                local.get $1
-                local.get $9
-                local.get $0
-                call $21
-                drop
-              end
-              local.get $0
-              i32.const 32
-              local.get $10
-              local.get $5
-              local.get $12
-              i32.const 8192
-              i32.xor
-              call $25
-              local.get $11
-              local.set $1
-              br 1 (;@4;)
-            end
-          end
-          br 1 (;@2;)
-        end
-        local.get $0
-        i32.eqz
-        if ;; label = @3
-          local.get $17
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 1
-              local.set $0
-              loop $label$308 ;; label = @6
-                local.get $4
-                local.get $0
-                i32.const 2
-                i32.shl
-                i32.add
-                i32.load
-                local.tee $1
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $3
-                    local.get $0
-                    i32.const 3
-                    i32.shl
-                    i32.add
-                    local.get $1
-                    local.get $2
-                    call $22
-                    local.get $0
-                    i32.const 1
-                    i32.add
-                    local.tee $0
-                    i32.const 10
-                    i32.lt_s
-                    br_if 2 (;@6;)
-                    i32.const 1
-                    local.set $15
-                    br 6 (;@2;)
-                  end
-                end
-              end
-              loop $label$310 ;; label = @6
-                local.get $4
-                local.get $0
-                i32.const 2
-                i32.shl
-                i32.add
-                i32.load
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const -1
-                    local.set $15
-                    br 6 (;@2;)
-                  end
-                end
-                local.get $0
-                i32.const 1
-                i32.add
-                local.tee $0
-                i32.const 10
-                i32.lt_s
-                br_if 0 (;@6;)
-                i32.const 1
-                local.set $15
-              end
-            end
-          else
-            i32.const 0
-            local.set $15
-          end
-        end
-      end
-      local.get $23
-      global.set $global$1
-      local.get $15
-    end
+ )
+ (func $24 (; 37 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (i32.const 0)
+   )
+   (block $label$2
+    (block $label$3
+     (block $label$4
+      (loop $label$5
+       (br_if $label$4
+        (i32.eq
+         (i32.load8_u
+          (i32.add
+           (local.get $1)
+           (i32.const 1689)
+          )
+         )
+         (local.get $0)
+        )
+       )
+       (br_if $label$5
+        (i32.ne
+         (local.tee $1
+          (i32.add
+           (local.get $1)
+           (i32.const 1)
+          )
+         )
+         (i32.const 87)
+        )
+       )
+       (local.set $1
+        (i32.const 87)
+       )
+       (local.set $0
+        (i32.const 1777)
+       )
+       (br $label$3)
+      )
+     )
+     (if
+      (local.get $1)
+      (block
+       (local.set $0
+        (i32.const 1777)
+       )
+       (br $label$3)
+      )
+      (local.set $0
+       (i32.const 1777)
+      )
+     )
+     (br $label$2)
+    )
+    (loop $label$8
+     (local.set $2
+      (local.get $0)
+     )
+     (loop $label$9
+      (local.set $0
+       (i32.add
+        (local.get $2)
+        (i32.const 1)
+       )
+      )
+      (if
+       (i32.load8_s
+        (local.get $2)
+       )
+       (block
+        (local.set $2
+         (local.get $0)
+        )
+        (br $label$9)
+       )
+      )
+     )
+     (br_if $label$8
+      (local.tee $1
+       (i32.add
+        (local.get $1)
+        (i32.const -1)
+       )
+      )
+     )
+    )
+   )
+   (local.get $0)
   )
-  (func $20 (;33;) (type $1) (param $0 i32) (result i32)
-    i32.const 0
+ )
+ (func $25 (; 38 ;) (type $10) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (block $label$1
+   (local.set $7
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 256)
+    )
+   )
+   (local.set $6
+    (local.get $7)
+   )
+   (block $label$2
+    (if
+     (i32.and
+      (i32.gt_s
+       (local.get $2)
+       (local.get $3)
+      )
+      (i32.eqz
+       (i32.and
+        (local.get $4)
+        (i32.const 73728)
+       )
+      )
+     )
+     (block
+      (drop
+       (call $41
+        (local.get $6)
+        (local.get $1)
+        (if (result i32)
+         (i32.gt_u
+          (local.tee $5
+           (i32.sub
+            (local.get $2)
+            (local.get $3)
+           )
+          )
+          (i32.const 256)
+         )
+         (i32.const 256)
+         (local.get $5)
+        )
+       )
+      )
+      (local.set $4
+       (i32.eqz
+        (i32.and
+         (local.tee $1
+          (i32.load
+           (local.get $0)
+          )
+         )
+         (i32.const 32)
+        )
+       )
+      )
+      (if
+       (i32.gt_u
+        (local.get $5)
+        (i32.const 255)
+       )
+       (block
+        (loop $label$7
+         (if
+          (local.get $4)
+          (block
+           (drop
+            (call $21
+             (local.get $6)
+             (i32.const 256)
+             (local.get $0)
+            )
+           )
+           (local.set $1
+            (i32.load
+             (local.get $0)
+            )
+           )
+          )
+         )
+         (local.set $4
+          (i32.eqz
+           (i32.and
+            (local.get $1)
+            (i32.const 32)
+           )
+          )
+         )
+         (br_if $label$7
+          (i32.gt_u
+           (local.tee $5
+            (i32.add
+             (local.get $5)
+             (i32.const -256)
+            )
+           )
+           (i32.const 255)
+          )
+         )
+        )
+        (br_if $label$2
+         (i32.eqz
+          (local.get $4)
+         )
+        )
+        (local.set $5
+         (i32.and
+          (i32.sub
+           (local.get $2)
+           (local.get $3)
+          )
+          (i32.const 255)
+         )
+        )
+       )
+       (br_if $label$2
+        (i32.eqz
+         (local.get $4)
+        )
+       )
+      )
+      (drop
+       (call $21
+        (local.get $6)
+        (local.get $5)
+        (local.get $0)
+       )
+      )
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $7)
+   )
   )
-  (func $21 (;34;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32)
-    block $label$1 (result i32) ;; label = @1
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          local.get $2
-          i32.const 16
-          i32.add
-          local.tee $4
-          i32.load
-          local.tee $3
-          br_if 0 (;@3;)
-          local.get $2
-          call $30
-          if ;; label = @4
-            i32.const 0
-            local.set $3
-          else
-            block ;; label = @5
-              local.get $4
-              i32.load
-              local.set $3
-              br 2 (;@3;)
-            end
-          end
-          br 1 (;@2;)
-        end
-        local.get $3
-        local.get $2
-        i32.const 20
-        i32.add
-        local.tee $5
-        i32.load
-        local.tee $4
-        i32.sub
-        local.get $1
-        i32.lt_u
-        if ;; label = @3
-          block ;; label = @4
-            local.get $2
-            local.get $0
-            local.get $1
-            local.get $2
-            i32.load offset=36
-            i32.const 3
-            i32.and
-            i32.const 2
-            i32.add
-            call_indirect (type $0)
-            local.set $3
-            br 2 (;@2;)
-          end
-        end
-        block $label$7 (result i32) ;; label = @3
-          local.get $2
-          i32.load8_s offset=75
-          i32.const -1
-          i32.gt_s
-          if (result i32) ;; label = @4
-            block (result i32) ;; label = @5
-              local.get $1
-              local.set $3
-              loop $label$9 ;; label = @6
-                i32.const 0
-                local.get $3
-                i32.eqz
-                br_if 3 (;@3;)
-                drop
-                local.get $0
-                local.get $3
-                i32.const -1
-                i32.add
-                local.tee $6
-                i32.add
-                i32.load8_s
-                i32.const 10
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $6
-                    local.set $3
-                    br 2 (;@6;)
-                  end
-                end
-              end
-              local.get $2
-              local.get $0
-              local.get $3
-              local.get $2
-              i32.load offset=36
-              i32.const 3
-              i32.and
-              i32.const 2
-              i32.add
-              call_indirect (type $0)
-              local.get $3
-              i32.lt_u
-              br_if 3 (;@2;)
-              local.get $5
-              i32.load
-              local.set $4
-              local.get $1
-              local.get $3
-              i32.sub
-              local.set $1
-              local.get $0
-              local.get $3
-              i32.add
-              local.set $0
-              local.get $3
-            end
-          else
-            i32.const 0
-          end
-        end
-        local.set $2
-        local.get $4
-        local.get $0
-        local.get $1
-        call $42
-        drop
-        local.get $5
-        local.get $5
-        i32.load
-        local.get $1
-        i32.add
-        i32.store
-        local.get $2
-        local.get $1
-        i32.add
-        local.set $3
-      end
-      local.get $3
-    end
+ )
+ (func $26 (; 39 ;) (type $4) (param $0 i32) (param $1 i32) (result i32)
+  (if (result i32)
+   (local.get $0)
+   (call $29
+    (local.get $0)
+    (local.get $1)
+    (i32.const 0)
+   )
+   (i32.const 0)
   )
-  (func $22 (;35;) (type $8) (param $0 i32) (param $1 i32) (param $2 i32)
-    (local $3 i32) (local $4 i64) (local $5 f64)
-    block $label$1 ;; label = @1
-      local.get $1
-      i32.const 20
-      i32.le_u
-      if ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            block $label$5 ;; label = @5
-              block $label$6 ;; label = @6
-                block $label$7 ;; label = @7
-                  block $label$8 ;; label = @8
-                    block $label$9 ;; label = @9
-                      block $label$10 ;; label = @10
-                        block $label$11 ;; label = @11
-                          block $label$12 ;; label = @12
-                            block $label$13 ;; label = @13
-                              local.get $1
-                              i32.const 9
-                              i32.sub
-                              br_table 0 (;@13;) 1 (;@12;) 2 (;@11;) 3 (;@10;) 4 (;@9;) 5 (;@8;) 6 (;@7;) 7 (;@6;) 8 (;@5;) 9 (;@4;) 10 (;@3;)
-                            end
-                            local.get $2
-                            i32.load
-                            i32.const 3
-                            i32.add
-                            i32.const -4
-                            i32.and
-                            local.tee $1
-                            i32.load
-                            local.set $3
-                            local.get $2
-                            local.get $1
-                            i32.const 4
-                            i32.add
-                            i32.store
-                            local.get $0
-                            local.get $3
-                            i32.store
-                            br 11 (;@1;)
-                          end
-                          local.get $2
-                          i32.load
-                          i32.const 3
-                          i32.add
-                          i32.const -4
-                          i32.and
-                          local.tee $1
-                          i32.load
-                          local.set $3
-                          local.get $2
-                          local.get $1
-                          i32.const 4
-                          i32.add
-                          i32.store
-                          local.get $0
-                          local.get $3
-                          i64.extend_i32_s
-                          i64.store
-                          br 10 (;@1;)
-                        end
-                        local.get $2
-                        i32.load
-                        i32.const 3
-                        i32.add
-                        i32.const -4
-                        i32.and
-                        local.tee $1
-                        i32.load
-                        local.set $3
-                        local.get $2
-                        local.get $1
-                        i32.const 4
-                        i32.add
-                        i32.store
-                        local.get $0
-                        local.get $3
-                        i64.extend_i32_u
-                        i64.store
-                        br 9 (;@1;)
-                      end
-                      local.get $2
-                      i32.load
-                      i32.const 7
-                      i32.add
-                      i32.const -8
-                      i32.and
-                      local.tee $1
-                      i64.load
-                      local.set $4
-                      local.get $2
-                      local.get $1
-                      i32.const 8
-                      i32.add
-                      i32.store
-                      local.get $0
-                      local.get $4
-                      i64.store
-                      br 8 (;@1;)
-                    end
-                    local.get $2
-                    i32.load
-                    i32.const 3
-                    i32.add
-                    i32.const -4
-                    i32.and
-                    local.tee $1
-                    i32.load
-                    local.set $3
-                    local.get $2
-                    local.get $1
-                    i32.const 4
-                    i32.add
-                    i32.store
-                    local.get $0
-                    local.get $3
-                    i32.const 65535
-                    i32.and
-                    i32.const 16
-                    i32.shl
-                    i32.const 16
-                    i32.shr_s
-                    i64.extend_i32_s
-                    i64.store
-                    br 7 (;@1;)
-                  end
-                  local.get $2
-                  i32.load
-                  i32.const 3
-                  i32.add
-                  i32.const -4
-                  i32.and
-                  local.tee $1
-                  i32.load
-                  local.set $3
-                  local.get $2
-                  local.get $1
-                  i32.const 4
-                  i32.add
-                  i32.store
-                  local.get $0
-                  local.get $3
-                  i32.const 65535
-                  i32.and
-                  i64.extend_i32_u
-                  i64.store
-                  br 6 (;@1;)
-                end
-                local.get $2
-                i32.load
-                i32.const 3
-                i32.add
-                i32.const -4
-                i32.and
-                local.tee $1
-                i32.load
-                local.set $3
-                local.get $2
-                local.get $1
-                i32.const 4
-                i32.add
-                i32.store
-                local.get $0
-                local.get $3
-                i32.const 255
-                i32.and
-                i32.const 24
-                i32.shl
-                i32.const 24
-                i32.shr_s
-                i64.extend_i32_s
-                i64.store
-                br 5 (;@1;)
-              end
-              local.get $2
-              i32.load
-              i32.const 3
-              i32.add
-              i32.const -4
-              i32.and
-              local.tee $1
-              i32.load
-              local.set $3
-              local.get $2
-              local.get $1
-              i32.const 4
-              i32.add
-              i32.store
-              local.get $0
-              local.get $3
-              i32.const 255
-              i32.and
-              i64.extend_i32_u
-              i64.store
-              br 4 (;@1;)
-            end
-            local.get $2
-            i32.load
-            i32.const 7
-            i32.add
-            i32.const -8
-            i32.and
-            local.tee $1
-            f64.load
-            local.set $5
-            local.get $2
-            local.get $1
-            i32.const 8
-            i32.add
-            i32.store
-            local.get $0
-            local.get $5
-            f64.store
-            br 3 (;@1;)
-          end
-          local.get $2
-          i32.load
-          i32.const 7
-          i32.add
-          i32.const -8
-          i32.and
-          local.tee $1
-          f64.load
-          local.set $5
-          local.get $2
-          local.get $1
-          i32.const 8
-          i32.add
-          i32.store
-          local.get $0
-          local.get $5
-          f64.store
-        end
-      end
-    end
+ )
+ (func $27 (; 40 ;) (type $11) (param $0 f64) (param $1 i32) (result f64)
+  (call $28
+   (local.get $0)
+   (local.get $1)
   )
-  (func $23 (;36;) (type $9) (param $0 i64) (param $1 i32) (result i32)
-    (local $2 i32) (local $3 i32) (local $4 i64)
-    block $label$1 (result i32) ;; label = @1
-      local.get $0
-      i32.wrap_i64
-      local.set $2
-      local.get $0
-      i64.const 4294967295
-      i64.gt_u
-      if ;; label = @2
-        block ;; label = @3
-          loop $label$3 ;; label = @4
-            local.get $1
-            i32.const -1
-            i32.add
-            local.tee $1
-            local.get $0
-            i64.const 10
-            i64.rem_u
-            i64.const 48
-            i64.or
-            i64.store8
-            local.get $0
-            i64.const 10
-            i64.div_u
-            local.set $4
-            local.get $0
-            i64.const 42949672959
-            i64.gt_u
-            if ;; label = @5
-              block ;; label = @6
-                local.get $4
-                local.set $0
-                br 2 (;@4;)
-              end
-            end
-          end
-          local.get $4
-          i32.wrap_i64
-          local.set $2
-        end
-      end
-      local.get $2
-      if ;; label = @2
-        loop $label$6 ;; label = @3
-          local.get $1
-          i32.const -1
-          i32.add
-          local.tee $1
-          local.get $2
-          i32.const 10
-          i32.rem_u
-          i32.const 48
-          i32.or
-          i32.store8
-          local.get $2
-          i32.const 10
-          i32.div_u
-          local.set $3
-          local.get $2
-          i32.const 10
-          i32.ge_u
-          if ;; label = @4
-            block ;; label = @5
-              local.get $3
-              local.set $2
-              br 2 (;@3;)
-            end
-          end
-        end
-      end
-      local.get $1
-    end
+ )
+ (func $28 (; 41 ;) (type $11) (param $0 f64) (param $1 i32) (result f64)
+  (local $2 i64)
+  (local $3 i64)
+  (block $label$1 (result f64)
+   (block $label$2
+    (block $label$3
+     (block $label$4
+      (block $label$5
+       (br_table $label$5 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$4 $label$3
+        (i32.sub
+         (i32.shr_s
+          (i32.shl
+           (i32.and
+            (i32.and
+             (i32.wrap_i64
+              (local.tee $3
+               (i64.shr_u
+                (local.tee $2
+                 (i64.reinterpret_f64
+                  (local.get $0)
+                 )
+                )
+                (i64.const 52)
+               )
+              )
+             )
+             (i32.const 65535)
+            )
+            (i32.const 2047)
+           )
+           (i32.const 16)
+          )
+          (i32.const 16)
+         )
+         (i32.const 0)
+        )
+       )
+      )
+      (i32.store
+       (local.get $1)
+       (if (result i32)
+        (f64.ne
+         (local.get $0)
+         (f64.const 0)
+        )
+        (block (result i32)
+         (local.set $0
+          (call $28
+           (f64.mul
+            (local.get $0)
+            (f64.const 18446744073709551615)
+           )
+           (local.get $1)
+          )
+         )
+         (i32.add
+          (i32.load
+           (local.get $1)
+          )
+          (i32.const -64)
+         )
+        )
+        (i32.const 0)
+       )
+      )
+      (br $label$2)
+     )
+     (br $label$2)
+    )
+    (i32.store
+     (local.get $1)
+     (i32.add
+      (i32.and
+       (i32.wrap_i64
+        (local.get $3)
+       )
+       (i32.const 2047)
+      )
+      (i32.const -1022)
+     )
+    )
+    (local.set $0
+     (f64.reinterpret_i64
+      (i64.or
+       (i64.and
+        (local.get $2)
+        (i64.const -9218868437227405313)
+       )
+       (i64.const 4602678819172646912)
+      )
+     )
+    )
+   )
+   (local.get $0)
   )
-  (func $24 (;37;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32)
-    block $label$1 (result i32) ;; label = @1
-      i32.const 0
-      local.set $1
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            loop $label$5 ;; label = @5
-              local.get $1
-              i32.const 1689
-              i32.add
-              i32.load8_u
-              local.get $0
-              i32.eq
-              br_if 1 (;@4;)
-              local.get $1
-              i32.const 1
-              i32.add
-              local.tee $1
-              i32.const 87
-              i32.ne
-              br_if 0 (;@5;)
-              i32.const 87
-              local.set $1
-              i32.const 1777
-              local.set $0
-              br 2 (;@3;)
-            end
-          end
-          local.get $1
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 1777
-              local.set $0
-              br 2 (;@3;)
-            end
-          else
-            i32.const 1777
-            local.set $0
-          end
-          br 1 (;@2;)
-        end
-        loop $label$8 ;; label = @3
-          local.get $0
-          local.set $2
-          loop $label$9 ;; label = @4
-            local.get $2
-            i32.const 1
-            i32.add
-            local.set $0
-            local.get $2
-            i32.load8_s
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                local.set $2
-                br 2 (;@4;)
-              end
-            end
-          end
-          local.get $1
-          i32.const -1
-          i32.add
-          local.tee $1
-          br_if 0 (;@3;)
-        end
-      end
-      local.get $0
-    end
+ )
+ (func $29 (; 42 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (block $label$1 (result i32)
+   (if (result i32)
+    (local.get $0)
+    (block (result i32)
+     (if
+      (i32.lt_u
+       (local.get $1)
+       (i32.const 128)
+      )
+      (block
+       (i32.store8
+        (local.get $0)
+        (local.get $1)
+       )
+       (br $label$1
+        (i32.const 1)
+       )
+      )
+     )
+     (if
+      (i32.lt_u
+       (local.get $1)
+       (i32.const 2048)
+      )
+      (block
+       (i32.store8
+        (local.get $0)
+        (i32.or
+         (i32.shr_u
+          (local.get $1)
+          (i32.const 6)
+         )
+         (i32.const 192)
+        )
+       )
+       (i32.store8 offset=1
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (local.get $1)
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (br $label$1
+        (i32.const 2)
+       )
+      )
+     )
+     (if
+      (i32.or
+       (i32.lt_u
+        (local.get $1)
+        (i32.const 55296)
+       )
+       (i32.eq
+        (i32.and
+         (local.get $1)
+         (i32.const -8192)
+        )
+        (i32.const 57344)
+       )
+      )
+      (block
+       (i32.store8
+        (local.get $0)
+        (i32.or
+         (i32.shr_u
+          (local.get $1)
+          (i32.const 12)
+         )
+         (i32.const 224)
+        )
+       )
+       (i32.store8 offset=1
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (i32.shr_u
+           (local.get $1)
+           (i32.const 6)
+          )
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (i32.store8 offset=2
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (local.get $1)
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (br $label$1
+        (i32.const 3)
+       )
+      )
+     )
+     (if (result i32)
+      (i32.lt_u
+       (i32.add
+        (local.get $1)
+        (i32.const -65536)
+       )
+       (i32.const 1048576)
+      )
+      (block (result i32)
+       (i32.store8
+        (local.get $0)
+        (i32.or
+         (i32.shr_u
+          (local.get $1)
+          (i32.const 18)
+         )
+         (i32.const 240)
+        )
+       )
+       (i32.store8 offset=1
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (i32.shr_u
+           (local.get $1)
+           (i32.const 12)
+          )
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (i32.store8 offset=2
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (i32.shr_u
+           (local.get $1)
+           (i32.const 6)
+          )
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (i32.store8 offset=3
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (local.get $1)
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (i32.const 4)
+      )
+      (block (result i32)
+       (i32.store
+        (call $12)
+        (i32.const 84)
+       )
+       (i32.const -1)
+      )
+     )
+    )
+    (i32.const 1)
+   )
   )
-  (func $25 (;38;) (type $10) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
-    (local $5 i32) (local $6 i32) (local $7 i32)
-    block $label$1 ;; label = @1
-      global.get $global$1
-      local.set $7
-      global.get $global$1
-      i32.const 256
-      i32.add
-      global.set $global$1
-      local.get $7
-      local.set $6
-      block $label$2 ;; label = @2
-        local.get $2
-        local.get $3
-        i32.gt_s
-        local.get $4
-        i32.const 73728
-        i32.and
-        i32.eqz
-        i32.and
-        if ;; label = @3
-          block ;; label = @4
-            local.get $6
-            local.get $1
-            local.get $2
-            local.get $3
-            i32.sub
-            local.tee $5
-            i32.const 256
-            i32.gt_u
-            if (result i32) ;; label = @5
-              i32.const 256
-            else
-              local.get $5
-            end
-            call $41
-            drop
-            local.get $0
-            i32.load
-            local.tee $1
-            i32.const 32
-            i32.and
-            i32.eqz
-            local.set $4
-            local.get $5
-            i32.const 255
-            i32.gt_u
-            if ;; label = @5
-              block ;; label = @6
-                loop $label$7 ;; label = @7
-                  local.get $4
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $6
-                      i32.const 256
-                      local.get $0
-                      call $21
-                      drop
-                      local.get $0
-                      i32.load
-                      local.set $1
-                    end
-                  end
-                  local.get $1
-                  i32.const 32
-                  i32.and
-                  i32.eqz
-                  local.set $4
-                  local.get $5
-                  i32.const -256
-                  i32.add
-                  local.tee $5
-                  i32.const 255
-                  i32.gt_u
-                  br_if 0 (;@7;)
-                end
-                local.get $4
-                i32.eqz
-                br_if 4 (;@2;)
-                local.get $2
-                local.get $3
-                i32.sub
-                i32.const 255
-                i32.and
-                local.set $5
-              end
-            else
-              local.get $4
-              i32.eqz
-              br_if 3 (;@2;)
-            end
-            local.get $6
-            local.get $5
-            local.get $0
-            call $21
-            drop
-          end
-        end
-      end
-      local.get $7
-      global.set $global$1
-    end
+ )
+ (func $30 (; 43 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (i32.load8_s
+     (local.tee $2
+      (i32.add
+       (local.get $0)
+       (i32.const 74)
+      )
+     )
+    )
+   )
+   (i32.store8
+    (local.get $2)
+    (i32.or
+     (i32.add
+      (local.get $1)
+      (i32.const 255)
+     )
+     (local.get $1)
+    )
+   )
+   (local.tee $0
+    (if (result i32)
+     (i32.and
+      (local.tee $1
+       (i32.load
+        (local.get $0)
+       )
+      )
+      (i32.const 8)
+     )
+     (block (result i32)
+      (i32.store
+       (local.get $0)
+       (i32.or
+        (local.get $1)
+        (i32.const 32)
+       )
+      )
+      (i32.const -1)
+     )
+     (block (result i32)
+      (i32.store offset=8
+       (local.get $0)
+       (i32.const 0)
+      )
+      (i32.store offset=4
+       (local.get $0)
+       (i32.const 0)
+      )
+      (i32.store offset=28
+       (local.get $0)
+       (local.tee $1
+        (i32.load offset=44
+         (local.get $0)
+        )
+       )
+      )
+      (i32.store offset=20
+       (local.get $0)
+       (local.get $1)
+      )
+      (i32.store offset=16
+       (local.get $0)
+       (i32.add
+        (local.get $1)
+        (i32.load offset=48
+         (local.get $0)
+        )
+       )
+      )
+      (i32.const 0)
+     )
+    )
+   )
   )
-  (func $26 (;39;) (type $4) (param $0 i32) (param $1 i32) (result i32)
-    local.get $0
-    if (result i32) ;; label = @1
-      local.get $0
-      local.get $1
-      i32.const 0
-      call $29
-    else
-      i32.const 0
-    end
+ )
+ (func $31 (; 44 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (local $3 i32)
+  (block $label$1 (result i32)
+   (block $label$2
+    (block $label$3
+     (br_if $label$3
+      (i32.eqz
+       (i32.and
+        (local.tee $2
+         (local.get $0)
+        )
+        (i32.const 3)
+       )
+      )
+     )
+     (local.set $1
+      (local.get $2)
+     )
+     (loop $label$4
+      (if
+       (i32.eqz
+        (i32.load8_s
+         (local.get $0)
+        )
+       )
+       (block
+        (local.set $0
+         (local.get $1)
+        )
+        (br $label$2)
+       )
+      )
+      (br_if $label$4
+       (i32.and
+        (local.tee $1
+         (local.tee $0
+          (i32.add
+           (local.get $0)
+           (i32.const 1)
+          )
+         )
+        )
+        (i32.const 3)
+       )
+      )
+      (br $label$3)
+     )
+    )
+    (loop $label$6
+     (local.set $1
+      (i32.add
+       (local.get $0)
+       (i32.const 4)
+      )
+     )
+     (if
+      (i32.eqz
+       (i32.and
+        (i32.xor
+         (i32.and
+          (local.tee $3
+           (i32.load
+            (local.get $0)
+           )
+          )
+          (i32.const -2139062144)
+         )
+         (i32.const -2139062144)
+        )
+        (i32.add
+         (local.get $3)
+         (i32.const -16843009)
+        )
+       )
+      )
+      (block
+       (local.set $0
+        (local.get $1)
+       )
+       (br $label$6)
+      )
+     )
+    )
+    (if
+     (i32.shr_s
+      (i32.shl
+       (i32.and
+        (local.get $3)
+        (i32.const 255)
+       )
+       (i32.const 24)
+      )
+      (i32.const 24)
+     )
+     (loop $label$9
+      (br_if $label$9
+       (i32.load8_s
+        (local.tee $0
+         (i32.add
+          (local.get $0)
+          (i32.const 1)
+         )
+        )
+       )
+      )
+     )
+    )
+   )
+   (i32.sub
+    (local.get $0)
+    (local.get $2)
+   )
   )
-  (func $27 (;40;) (type $11) (param $0 f64) (param $1 i32) (result f64)
-    local.get $0
-    local.get $1
-    call $28
+ )
+ (func $32 (; 45 ;) (type $4) (param $0 i32) (param $1 i32) (result i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (block $label$1 (result i32)
+   (local.set $3
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 16)
+    )
+   )
+   (i32.store8
+    (local.tee $4
+     (local.get $3)
+    )
+    (local.tee $7
+     (i32.and
+      (local.get $1)
+      (i32.const 255)
+     )
+    )
+   )
+   (block $label$2
+    (block $label$3
+     (br_if $label$3
+      (local.tee $5
+       (i32.load
+        (local.tee $2
+         (i32.add
+          (local.get $0)
+          (i32.const 16)
+         )
+        )
+       )
+      )
+     )
+     (if
+      (call $30
+       (local.get $0)
+      )
+      (local.set $1
+       (i32.const -1)
+      )
+      (block
+       (local.set $5
+        (i32.load
+         (local.get $2)
+        )
+       )
+       (br $label$3)
+      )
+     )
+     (br $label$2)
+    )
+    (if
+     (i32.lt_u
+      (local.tee $6
+       (i32.load
+        (local.tee $2
+         (i32.add
+          (local.get $0)
+          (i32.const 20)
+         )
+        )
+       )
+      )
+      (local.get $5)
+     )
+     (if
+      (i32.ne
+       (local.tee $1
+        (i32.and
+         (local.get $1)
+         (i32.const 255)
+        )
+       )
+       (i32.load8_s offset=75
+        (local.get $0)
+       )
+      )
+      (block
+       (i32.store
+        (local.get $2)
+        (i32.add
+         (local.get $6)
+         (i32.const 1)
+        )
+       )
+       (i32.store8
+        (local.get $6)
+        (local.get $7)
+       )
+       (br $label$2)
+      )
+     )
+    )
+    (local.set $1
+     (if (result i32)
+      (i32.eq
+       (call_indirect (type $0)
+        (local.get $0)
+        (local.get $4)
+        (i32.const 1)
+        (i32.add
+         (i32.and
+          (i32.load offset=36
+           (local.get $0)
+          )
+          (i32.const 3)
+         )
+         (i32.const 2)
+        )
+       )
+       (i32.const 1)
+      )
+      (i32.load8_u
+       (local.get $4)
+      )
+      (i32.const -1)
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $3)
+   )
+   (local.get $1)
   )
-  (func $28 (;41;) (type $11) (param $0 f64) (param $1 i32) (result f64)
-    (local $2 i64) (local $3 i64)
-    block $label$1 (result f64) ;; label = @1
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            block $label$5 ;; label = @5
-              local.get $0
-              i64.reinterpret_f64
-              local.tee $2
-              i64.const 52
-              i64.shr_u
-              local.tee $3
-              i32.wrap_i64
-              i32.const 65535
-              i32.and
-              i32.const 2047
-              i32.and
-              i32.const 16
-              i32.shl
-              i32.const 16
-              i32.shr_s
-              i32.const 0
-              i32.sub
-              br_table 0 (;@5;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 1 (;@4;) 2 (;@3;)
-            end
-            local.get $1
-            local.get $0
-            f64.const 0x0p+0 (;=0;)
-            f64.ne
-            if (result i32) ;; label = @5
-              block (result i32) ;; label = @6
-                local.get $0
-                f64.const 0x1p+64 (;=18446744073709552000;)
-                f64.mul
-                local.get $1
-                call $28
-                local.set $0
-                local.get $1
-                i32.load
-                i32.const -64
-                i32.add
-              end
-            else
-              i32.const 0
-            end
-            i32.store
-            br 2 (;@2;)
-          end
-          br 1 (;@2;)
-        end
-        local.get $1
-        local.get $3
-        i32.wrap_i64
-        i32.const 2047
-        i32.and
-        i32.const -1022
-        i32.add
-        i32.store
-        local.get $2
-        i64.const -9218868437227405313
-        i64.and
-        i64.const 4602678819172646912
-        i64.or
-        f64.reinterpret_i64
-        local.set $0
-      end
-      local.get $0
-    end
+ )
+ (func $33 (; 46 ;) (type $12) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+  (local $4 i32)
+  (local $5 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (i32.mul
+     (local.get $2)
+     (local.get $1)
+    )
+   )
+   (if
+    (i32.gt_s
+     (i32.load offset=76
+      (local.get $3)
+     )
+     (i32.const -1)
+    )
+    (block
+     (local.set $5
+      (i32.eqz
+       (call $20
+        (local.get $3)
+       )
+      )
+     )
+     (local.set $0
+      (call $21
+       (local.get $0)
+       (local.get $4)
+       (local.get $3)
+      )
+     )
+     (if
+      (i32.eqz
+       (local.get $5)
+      )
+      (call $13
+       (local.get $3)
+      )
+     )
+    )
+    (local.set $0
+     (call $21
+      (local.get $0)
+      (local.get $4)
+      (local.get $3)
+     )
+    )
+   )
+   (if
+    (i32.ne
+     (local.get $0)
+     (local.get $4)
+    )
+    (local.set $2
+     (i32.div_u
+      (local.get $0)
+      (local.get $1)
+     )
+    )
+   )
+   (local.get $2)
   )
-  (func $29 (;42;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $0
-      if (result i32) ;; label = @2
-        block (result i32) ;; label = @3
-          local.get $1
-          i32.const 128
-          i32.lt_u
-          if ;; label = @4
-            block ;; label = @5
-              local.get $0
-              local.get $1
-              i32.store8
-              i32.const 1
-              br 4 (;@1;)
-            end
-          end
-          local.get $1
-          i32.const 2048
-          i32.lt_u
-          if ;; label = @4
-            block ;; label = @5
-              local.get $0
-              local.get $1
-              i32.const 6
-              i32.shr_u
-              i32.const 192
-              i32.or
-              i32.store8
-              local.get $0
-              local.get $1
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=1
-              i32.const 2
-              br 4 (;@1;)
-            end
-          end
-          local.get $1
-          i32.const 55296
-          i32.lt_u
-          local.get $1
-          i32.const -8192
-          i32.and
-          i32.const 57344
-          i32.eq
-          i32.or
-          if ;; label = @4
-            block ;; label = @5
-              local.get $0
-              local.get $1
-              i32.const 12
-              i32.shr_u
-              i32.const 224
-              i32.or
-              i32.store8
-              local.get $0
-              local.get $1
-              i32.const 6
-              i32.shr_u
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=1
-              local.get $0
-              local.get $1
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=2
-              i32.const 3
-              br 4 (;@1;)
-            end
-          end
-          local.get $1
-          i32.const -65536
-          i32.add
-          i32.const 1048576
-          i32.lt_u
-          if (result i32) ;; label = @4
-            block (result i32) ;; label = @5
-              local.get $0
-              local.get $1
-              i32.const 18
-              i32.shr_u
-              i32.const 240
-              i32.or
-              i32.store8
-              local.get $0
-              local.get $1
-              i32.const 12
-              i32.shr_u
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=1
-              local.get $0
-              local.get $1
-              i32.const 6
-              i32.shr_u
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=2
-              local.get $0
-              local.get $1
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=3
-              i32.const 4
-            end
-          else
-            block (result i32) ;; label = @5
-              call $12
-              i32.const 84
-              i32.store
-              i32.const -1
-            end
-          end
-        end
-      else
-        i32.const 1
-      end
-    end
+ )
+ (func $34 (; 47 ;) (type $4) (param $0 i32) (param $1 i32) (result i32)
+  (local $2 i32)
+  (local $3 i32)
+  (block $label$1 (result i32)
+   (local.set $2
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 16)
+    )
+   )
+   (i32.store
+    (local.tee $3
+     (local.get $2)
+    )
+    (local.get $1)
+   )
+   (local.set $0
+    (call $18
+     (i32.load
+      (i32.const 1024)
+     )
+     (local.get $0)
+     (local.get $3)
+    )
+   )
+   (global.set $global$1
+    (local.get $2)
+   )
+   (local.get $0)
   )
-  (func $30 (;43;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $0
-      i32.const 74
-      i32.add
-      local.tee $2
-      i32.load8_s
-      local.set $1
-      local.get $2
-      local.get $1
-      i32.const 255
-      i32.add
-      local.get $1
-      i32.or
-      i32.store8
-      local.get $0
-      i32.load
-      local.tee $1
-      i32.const 8
-      i32.and
-      if (result i32) ;; label = @2
-        block (result i32) ;; label = @3
-          local.get $0
-          local.get $1
-          i32.const 32
-          i32.or
-          i32.store
-          i32.const -1
-        end
-      else
-        block (result i32) ;; label = @3
-          local.get $0
-          i32.const 0
-          i32.store offset=8
-          local.get $0
-          i32.const 0
-          i32.store offset=4
-          local.get $0
-          local.get $0
-          i32.load offset=44
-          local.tee $1
-          i32.store offset=28
-          local.get $0
-          local.get $1
-          i32.store offset=20
-          local.get $0
-          local.get $1
-          local.get $0
-          i32.load offset=48
-          i32.add
-          i32.store offset=16
-          i32.const 0
-        end
-      end
-      local.tee $0
-    end
+ )
+ (func $35 (; 48 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (local $3 i32)
+  (block $label$1 (result i32)
+   (local.set $2
+    (if (result i32)
+     (i32.gt_s
+      (i32.load offset=76
+       (local.tee $1
+        (i32.load
+         (i32.const 1024)
+        )
+       )
+      )
+      (i32.const -1)
+     )
+     (call $20
+      (local.get $1)
+     )
+     (i32.const 0)
+    )
+   )
+   (local.set $0
+    (block $label$4 (result i32)
+     (if (result i32)
+      (i32.lt_s
+       (call $36
+        (local.get $0)
+        (local.get $1)
+       )
+       (i32.const 0)
+      )
+      (i32.const 1)
+      (block (result i32)
+       (if
+        (i32.ne
+         (i32.load8_s offset=75
+          (local.get $1)
+         )
+         (i32.const 10)
+        )
+        (if
+         (i32.lt_u
+          (local.tee $0
+           (i32.load
+            (local.tee $3
+             (i32.add
+              (local.get $1)
+              (i32.const 20)
+             )
+            )
+           )
+          )
+          (i32.load offset=16
+           (local.get $1)
+          )
+         )
+         (block
+          (i32.store
+           (local.get $3)
+           (i32.add
+            (local.get $0)
+            (i32.const 1)
+           )
+          )
+          (i32.store8
+           (local.get $0)
+           (i32.const 10)
+          )
+          (br $label$4
+           (i32.const 0)
+          )
+         )
+        )
+       )
+       (i32.lt_s
+        (call $32
+         (local.get $1)
+         (i32.const 10)
+        )
+        (i32.const 0)
+       )
+      )
+     )
+    )
+   )
+   (if
+    (local.get $2)
+    (call $13
+     (local.get $1)
+    )
+   )
+   (i32.shr_s
+    (i32.shl
+     (local.get $0)
+     (i32.const 31)
+    )
+    (i32.const 31)
+   )
   )
-  (func $31 (;44;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32) (local $3 i32)
-    block $label$1 (result i32) ;; label = @1
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          local.get $0
-          local.tee $2
-          i32.const 3
-          i32.and
-          i32.eqz
-          br_if 0 (;@3;)
-          local.get $2
-          local.set $1
-          loop $label$4 ;; label = @4
-            local.get $0
-            i32.load8_s
-            i32.eqz
-            if ;; label = @5
-              block ;; label = @6
-                local.get $1
-                local.set $0
-                br 4 (;@2;)
-              end
-            end
-            local.get $0
-            i32.const 1
-            i32.add
-            local.tee $0
-            local.tee $1
-            i32.const 3
-            i32.and
-            br_if 0 (;@4;)
-            br 1 (;@3;)
-          end
-        end
-        loop $label$6 ;; label = @3
-          local.get $0
-          i32.const 4
-          i32.add
-          local.set $1
-          local.get $0
-          i32.load
-          local.tee $3
-          i32.const -2139062144
-          i32.and
-          i32.const -2139062144
-          i32.xor
-          local.get $3
-          i32.const -16843009
-          i32.add
-          i32.and
-          i32.eqz
-          if ;; label = @4
-            block ;; label = @5
-              local.get $1
-              local.set $0
-              br 2 (;@3;)
-            end
-          end
-        end
-        local.get $3
-        i32.const 255
-        i32.and
-        i32.const 24
-        i32.shl
-        i32.const 24
-        i32.shr_s
-        if ;; label = @3
-          loop $label$9 ;; label = @4
-            local.get $0
-            i32.const 1
-            i32.add
-            local.tee $0
-            i32.load8_s
-            br_if 0 (;@4;)
-          end
-        end
-      end
-      local.get $0
-      local.get $2
-      i32.sub
-    end
+ )
+ (func $36 (; 49 ;) (type $4) (param $0 i32) (param $1 i32) (result i32)
+  (i32.add
+   (call $33
+    (local.get $0)
+    (call $31
+     (local.get $0)
+    )
+    (i32.const 1)
+    (local.get $1)
+   )
+   (i32.const -1)
   )
-  (func $32 (;45;) (type $4) (param $0 i32) (param $1 i32) (result i32)
-    (local $2 i32) (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $3
-      global.get $global$1
-      i32.const 16
-      i32.add
-      global.set $global$1
-      local.get $3
-      local.tee $4
-      local.get $1
-      i32.const 255
-      i32.and
-      local.tee $7
-      i32.store8
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          local.get $0
-          i32.const 16
-          i32.add
-          local.tee $2
-          i32.load
-          local.tee $5
-          br_if 0 (;@3;)
-          local.get $0
-          call $30
-          if ;; label = @4
-            i32.const -1
-            local.set $1
-          else
-            block ;; label = @5
-              local.get $2
-              i32.load
-              local.set $5
-              br 2 (;@3;)
-            end
-          end
-          br 1 (;@2;)
-        end
-        local.get $0
-        i32.const 20
-        i32.add
-        local.tee $2
-        i32.load
-        local.tee $6
-        local.get $5
-        i32.lt_u
-        if ;; label = @3
-          local.get $1
-          i32.const 255
-          i32.and
-          local.tee $1
-          local.get $0
-          i32.load8_s offset=75
-          i32.ne
-          if ;; label = @4
-            block ;; label = @5
-              local.get $2
-              local.get $6
-              i32.const 1
-              i32.add
-              i32.store
-              local.get $6
-              local.get $7
-              i32.store8
-              br 3 (;@2;)
-            end
-          end
-        end
-        local.get $0
-        local.get $4
-        i32.const 1
-        local.get $0
-        i32.load offset=36
-        i32.const 3
-        i32.and
-        i32.const 2
-        i32.add
-        call_indirect (type $0)
-        i32.const 1
-        i32.eq
-        if (result i32) ;; label = @3
-          local.get $4
-          i32.load8_u
-        else
-          i32.const -1
-        end
-        local.set $1
-      end
-      local.get $3
-      global.set $global$1
-      local.get $1
-    end
+ )
+ (func $37 (; 50 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (local $15 i32)
+  (local $16 i32)
+  (local $17 i32)
+  (local $18 i32)
+  (local $19 i32)
+  (local $20 i32)
+  (local $21 i32)
+  (block $label$1 (result i32)
+   (local.set $14
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 16)
+    )
+   )
+   (local.set $18
+    (local.get $14)
+   )
+   (block $label$2
+    (if
+     (i32.lt_u
+      (local.get $0)
+      (i32.const 245)
+     )
+     (block
+      (local.set $3
+       (i32.and
+        (i32.add
+         (local.get $0)
+         (i32.const 11)
+        )
+        (i32.const -8)
+       )
+      )
+      (if
+       (i32.and
+        (local.tee $0
+         (i32.shr_u
+          (local.tee $8
+           (i32.load
+            (i32.const 3636)
+           )
+          )
+          (local.tee $2
+           (i32.shr_u
+            (if (result i32)
+             (i32.lt_u
+              (local.get $0)
+              (i32.const 11)
+             )
+             (local.tee $3
+              (i32.const 16)
+             )
+             (local.get $3)
+            )
+            (i32.const 3)
+           )
+          )
+         )
+        )
+        (i32.const 3)
+       )
+       (block
+        (local.set $4
+         (i32.load
+          (local.tee $1
+           (i32.add
+            (local.tee $7
+             (i32.load
+              (local.tee $3
+               (i32.add
+                (local.tee $2
+                 (i32.add
+                  (i32.shl
+                   (i32.shl
+                    (local.tee $5
+                     (i32.add
+                      (i32.xor
+                       (i32.and
+                        (local.get $0)
+                        (i32.const 1)
+                       )
+                       (i32.const 1)
+                      )
+                      (local.get $2)
+                     )
+                    )
+                    (i32.const 1)
+                   )
+                   (i32.const 2)
+                  )
+                  (i32.const 3676)
+                 )
+                )
+                (i32.const 8)
+               )
+              )
+             )
+            )
+            (i32.const 8)
+           )
+          )
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $2)
+          (local.get $4)
+         )
+         (i32.store
+          (i32.const 3636)
+          (i32.and
+           (local.get $8)
+           (i32.xor
+            (i32.shl
+             (i32.const 1)
+             (local.get $5)
+            )
+            (i32.const -1)
+           )
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $4)
+            (i32.load
+             (i32.const 3652)
+            )
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.eq
+            (i32.load
+             (local.tee $0
+              (i32.add
+               (local.get $4)
+               (i32.const 12)
+              )
+             )
+            )
+            (local.get $7)
+           )
+           (block
+            (i32.store
+             (local.get $0)
+             (local.get $2)
+            )
+            (i32.store
+             (local.get $3)
+             (local.get $4)
+            )
+           )
+           (call $fimport$10)
+          )
+         )
+        )
+        (i32.store offset=4
+         (local.get $7)
+         (i32.or
+          (local.tee $0
+           (i32.shl
+            (local.get $5)
+            (i32.const 3)
+           )
+          )
+          (i32.const 3)
+         )
+        )
+        (i32.store
+         (local.tee $0
+          (i32.add
+           (i32.add
+            (local.get $7)
+            (local.get $0)
+           )
+           (i32.const 4)
+          )
+         )
+         (i32.or
+          (i32.load
+           (local.get $0)
+          )
+          (i32.const 1)
+         )
+        )
+        (global.set $global$1
+         (local.get $14)
+        )
+        (return
+         (local.get $1)
+        )
+       )
+      )
+      (if
+       (i32.gt_u
+        (local.get $3)
+        (local.tee $16
+         (i32.load
+          (i32.const 3644)
+         )
+        )
+       )
+       (block
+        (if
+         (local.get $0)
+         (block
+          (local.set $5
+           (i32.and
+            (i32.shr_u
+             (local.tee $0
+              (i32.add
+               (i32.and
+                (local.tee $0
+                 (i32.and
+                  (i32.shl
+                   (local.get $0)
+                   (local.get $2)
+                  )
+                  (i32.or
+                   (local.tee $0
+                    (i32.shl
+                     (i32.const 2)
+                     (local.get $2)
+                    )
+                   )
+                   (i32.sub
+                    (i32.const 0)
+                    (local.get $0)
+                   )
+                  )
+                 )
+                )
+                (i32.sub
+                 (i32.const 0)
+                 (local.get $0)
+                )
+               )
+               (i32.const -1)
+              )
+             )
+             (i32.const 12)
+            )
+            (i32.const 16)
+           )
+          )
+          (local.set $12
+           (i32.load
+            (local.tee $5
+             (i32.add
+              (local.tee $9
+               (i32.load
+                (local.tee $2
+                 (i32.add
+                  (local.tee $4
+                   (i32.add
+                    (i32.shl
+                     (i32.shl
+                      (local.tee $11
+                       (i32.add
+                        (i32.or
+                         (i32.or
+                          (i32.or
+                           (i32.or
+                            (local.tee $0
+                             (i32.and
+                              (i32.shr_u
+                               (local.tee $2
+                                (i32.shr_u
+                                 (local.get $0)
+                                 (local.get $5)
+                                )
+                               )
+                               (i32.const 5)
+                              )
+                              (i32.const 8)
+                             )
+                            )
+                            (local.get $5)
+                           )
+                           (local.tee $0
+                            (i32.and
+                             (i32.shr_u
+                              (local.tee $2
+                               (i32.shr_u
+                                (local.get $2)
+                                (local.get $0)
+                               )
+                              )
+                              (i32.const 2)
+                             )
+                             (i32.const 4)
+                            )
+                           )
+                          )
+                          (local.tee $0
+                           (i32.and
+                            (i32.shr_u
+                             (local.tee $2
+                              (i32.shr_u
+                               (local.get $2)
+                               (local.get $0)
+                              )
+                             )
+                             (i32.const 1)
+                            )
+                            (i32.const 2)
+                           )
+                          )
+                         )
+                         (local.tee $0
+                          (i32.and
+                           (i32.shr_u
+                            (local.tee $2
+                             (i32.shr_u
+                              (local.get $2)
+                              (local.get $0)
+                             )
+                            )
+                            (i32.const 1)
+                           )
+                           (i32.const 1)
+                          )
+                         )
+                        )
+                        (i32.shr_u
+                         (local.get $2)
+                         (local.get $0)
+                        )
+                       )
+                      )
+                      (i32.const 1)
+                     )
+                     (i32.const 2)
+                    )
+                    (i32.const 3676)
+                   )
+                  )
+                  (i32.const 8)
+                 )
+                )
+               )
+              )
+              (i32.const 8)
+             )
+            )
+           )
+          )
+          (if
+           (i32.eq
+            (local.get $4)
+            (local.get $12)
+           )
+           (i32.store
+            (i32.const 3636)
+            (local.tee $7
+             (i32.and
+              (local.get $8)
+              (i32.xor
+               (i32.shl
+                (i32.const 1)
+                (local.get $11)
+               )
+               (i32.const -1)
+              )
+             )
+            )
+           )
+           (block
+            (if
+             (i32.lt_u
+              (local.get $12)
+              (i32.load
+               (i32.const 3652)
+              )
+             )
+             (call $fimport$10)
+            )
+            (if
+             (i32.eq
+              (i32.load
+               (local.tee $0
+                (i32.add
+                 (local.get $12)
+                 (i32.const 12)
+                )
+               )
+              )
+              (local.get $9)
+             )
+             (block
+              (i32.store
+               (local.get $0)
+               (local.get $4)
+              )
+              (i32.store
+               (local.get $2)
+               (local.get $12)
+              )
+              (local.set $7
+               (local.get $8)
+              )
+             )
+             (call $fimport$10)
+            )
+           )
+          )
+          (i32.store offset=4
+           (local.get $9)
+           (i32.or
+            (local.get $3)
+            (i32.const 3)
+           )
+          )
+          (i32.store offset=4
+           (local.tee $4
+            (i32.add
+             (local.get $9)
+             (local.get $3)
+            )
+           )
+           (i32.or
+            (local.tee $11
+             (i32.sub
+              (i32.shl
+               (local.get $11)
+               (i32.const 3)
+              )
+              (local.get $3)
+             )
+            )
+            (i32.const 1)
+           )
+          )
+          (i32.store
+           (i32.add
+            (local.get $4)
+            (local.get $11)
+           )
+           (local.get $11)
+          )
+          (if
+           (local.get $16)
+           (block
+            (local.set $9
+             (i32.load
+              (i32.const 3656)
+             )
+            )
+            (local.set $2
+             (i32.add
+              (i32.shl
+               (i32.shl
+                (local.tee $0
+                 (i32.shr_u
+                  (local.get $16)
+                  (i32.const 3)
+                 )
+                )
+                (i32.const 1)
+               )
+               (i32.const 2)
+              )
+              (i32.const 3676)
+             )
+            )
+            (if
+             (i32.and
+              (local.get $7)
+              (local.tee $0
+               (i32.shl
+                (i32.const 1)
+                (local.get $0)
+               )
+              )
+             )
+             (if
+              (i32.lt_u
+               (local.tee $0
+                (i32.load
+                 (local.tee $3
+                  (i32.add
+                   (local.get $2)
+                   (i32.const 8)
+                  )
+                 )
+                )
+               )
+               (i32.load
+                (i32.const 3652)
+               )
+              )
+              (call $fimport$10)
+              (block
+               (local.set $6
+                (local.get $3)
+               )
+               (local.set $1
+                (local.get $0)
+               )
+              )
+             )
+             (block
+              (i32.store
+               (i32.const 3636)
+               (i32.or
+                (local.get $7)
+                (local.get $0)
+               )
+              )
+              (local.set $6
+               (i32.add
+                (local.get $2)
+                (i32.const 8)
+               )
+              )
+              (local.set $1
+               (local.get $2)
+              )
+             )
+            )
+            (i32.store
+             (local.get $6)
+             (local.get $9)
+            )
+            (i32.store offset=12
+             (local.get $1)
+             (local.get $9)
+            )
+            (i32.store offset=8
+             (local.get $9)
+             (local.get $1)
+            )
+            (i32.store offset=12
+             (local.get $9)
+             (local.get $2)
+            )
+           )
+          )
+          (i32.store
+           (i32.const 3644)
+           (local.get $11)
+          )
+          (i32.store
+           (i32.const 3656)
+           (local.get $4)
+          )
+          (global.set $global$1
+           (local.get $14)
+          )
+          (return
+           (local.get $5)
+          )
+         )
+        )
+        (if
+         (local.tee $6
+          (i32.load
+           (i32.const 3640)
+          )
+         )
+         (block
+          (local.set $2
+           (i32.and
+            (i32.shr_u
+             (local.tee $0
+              (i32.add
+               (i32.and
+                (local.get $6)
+                (i32.sub
+                 (i32.const 0)
+                 (local.get $6)
+                )
+               )
+               (i32.const -1)
+              )
+             )
+             (i32.const 12)
+            )
+            (i32.const 16)
+           )
+          )
+          (local.set $9
+           (i32.sub
+            (i32.and
+             (i32.load offset=4
+              (local.tee $2
+               (i32.load
+                (i32.add
+                 (i32.shl
+                  (i32.add
+                   (i32.or
+                    (i32.or
+                     (i32.or
+                      (i32.or
+                       (local.tee $0
+                        (i32.and
+                         (i32.shr_u
+                          (local.tee $1
+                           (i32.shr_u
+                            (local.get $0)
+                            (local.get $2)
+                           )
+                          )
+                          (i32.const 5)
+                         )
+                         (i32.const 8)
+                        )
+                       )
+                       (local.get $2)
+                      )
+                      (local.tee $0
+                       (i32.and
+                        (i32.shr_u
+                         (local.tee $1
+                          (i32.shr_u
+                           (local.get $1)
+                           (local.get $0)
+                          )
+                         )
+                         (i32.const 2)
+                        )
+                        (i32.const 4)
+                       )
+                      )
+                     )
+                     (local.tee $0
+                      (i32.and
+                       (i32.shr_u
+                        (local.tee $1
+                         (i32.shr_u
+                          (local.get $1)
+                          (local.get $0)
+                         )
+                        )
+                        (i32.const 1)
+                       )
+                       (i32.const 2)
+                      )
+                     )
+                    )
+                    (local.tee $0
+                     (i32.and
+                      (i32.shr_u
+                       (local.tee $1
+                        (i32.shr_u
+                         (local.get $1)
+                         (local.get $0)
+                        )
+                       )
+                       (i32.const 1)
+                      )
+                      (i32.const 1)
+                     )
+                    )
+                   )
+                   (i32.shr_u
+                    (local.get $1)
+                    (local.get $0)
+                   )
+                  )
+                  (i32.const 2)
+                 )
+                 (i32.const 3940)
+                )
+               )
+              )
+             )
+             (i32.const -8)
+            )
+            (local.get $3)
+           )
+          )
+          (local.set $1
+           (local.get $2)
+          )
+          (loop $label$25
+           (block $label$26
+            (if
+             (i32.eqz
+              (local.tee $0
+               (i32.load offset=16
+                (local.get $1)
+               )
+              )
+             )
+             (br_if $label$26
+              (i32.eqz
+               (local.tee $0
+                (i32.load offset=20
+                 (local.get $1)
+                )
+               )
+              )
+             )
+            )
+            (if
+             (local.tee $7
+              (i32.lt_u
+               (local.tee $1
+                (i32.sub
+                 (i32.and
+                  (i32.load offset=4
+                   (local.get $0)
+                  )
+                  (i32.const -8)
+                 )
+                 (local.get $3)
+                )
+               )
+               (local.get $9)
+              )
+             )
+             (local.set $9
+              (local.get $1)
+             )
+            )
+            (local.set $1
+             (local.get $0)
+            )
+            (if
+             (local.get $7)
+             (local.set $2
+              (local.get $0)
+             )
+            )
+            (br $label$25)
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.get $2)
+            (local.tee $12
+             (i32.load
+              (i32.const 3652)
+             )
+            )
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.ge_u
+            (local.get $2)
+            (local.tee $13
+             (i32.add
+              (local.get $2)
+              (local.get $3)
+             )
+            )
+           )
+           (call $fimport$10)
+          )
+          (local.set $15
+           (i32.load offset=24
+            (local.get $2)
+           )
+          )
+          (block $label$32
+           (if
+            (i32.eq
+             (local.tee $0
+              (i32.load offset=12
+               (local.get $2)
+              )
+             )
+             (local.get $2)
+            )
+            (block
+             (if
+              (i32.eqz
+               (local.tee $0
+                (i32.load
+                 (local.tee $1
+                  (i32.add
+                   (local.get $2)
+                   (i32.const 20)
+                  )
+                 )
+                )
+               )
+              )
+              (if
+               (i32.eqz
+                (local.tee $0
+                 (i32.load
+                  (local.tee $1
+                   (i32.add
+                    (local.get $2)
+                    (i32.const 16)
+                   )
+                  )
+                 )
+                )
+               )
+               (block
+                (local.set $4
+                 (i32.const 0)
+                )
+                (br $label$32)
+               )
+              )
+             )
+             (loop $label$36
+              (if
+               (local.tee $7
+                (i32.load
+                 (local.tee $11
+                  (i32.add
+                   (local.get $0)
+                   (i32.const 20)
+                  )
+                 )
+                )
+               )
+               (block
+                (local.set $0
+                 (local.get $7)
+                )
+                (local.set $1
+                 (local.get $11)
+                )
+                (br $label$36)
+               )
+              )
+              (if
+               (local.tee $7
+                (i32.load
+                 (local.tee $11
+                  (i32.add
+                   (local.get $0)
+                   (i32.const 16)
+                  )
+                 )
+                )
+               )
+               (block
+                (local.set $0
+                 (local.get $7)
+                )
+                (local.set $1
+                 (local.get $11)
+                )
+                (br $label$36)
+               )
+              )
+             )
+             (if
+              (i32.lt_u
+               (local.get $1)
+               (local.get $12)
+              )
+              (call $fimport$10)
+              (block
+               (i32.store
+                (local.get $1)
+                (i32.const 0)
+               )
+               (local.set $4
+                (local.get $0)
+               )
+              )
+             )
+            )
+            (block
+             (if
+              (i32.lt_u
+               (local.tee $11
+                (i32.load offset=8
+                 (local.get $2)
+                )
+               )
+               (local.get $12)
+              )
+              (call $fimport$10)
+             )
+             (if
+              (i32.ne
+               (i32.load
+                (local.tee $7
+                 (i32.add
+                  (local.get $11)
+                  (i32.const 12)
+                 )
+                )
+               )
+               (local.get $2)
+              )
+              (call $fimport$10)
+             )
+             (if
+              (i32.eq
+               (i32.load
+                (local.tee $1
+                 (i32.add
+                  (local.get $0)
+                  (i32.const 8)
+                 )
+                )
+               )
+               (local.get $2)
+              )
+              (block
+               (i32.store
+                (local.get $7)
+                (local.get $0)
+               )
+               (i32.store
+                (local.get $1)
+                (local.get $11)
+               )
+               (local.set $4
+                (local.get $0)
+               )
+              )
+              (call $fimport$10)
+             )
+            )
+           )
+          )
+          (block $label$46
+           (if
+            (local.get $15)
+            (block
+             (if
+              (i32.eq
+               (local.get $2)
+               (i32.load
+                (local.tee $0
+                 (i32.add
+                  (i32.shl
+                   (local.tee $1
+                    (i32.load offset=28
+                     (local.get $2)
+                    )
+                   )
+                   (i32.const 2)
+                  )
+                  (i32.const 3940)
+                 )
+                )
+               )
+              )
+              (block
+               (i32.store
+                (local.get $0)
+                (local.get $4)
+               )
+               (if
+                (i32.eqz
+                 (local.get $4)
+                )
+                (block
+                 (i32.store
+                  (i32.const 3640)
+                  (i32.and
+                   (local.get $6)
+                   (i32.xor
+                    (i32.shl
+                     (i32.const 1)
+                     (local.get $1)
+                    )
+                    (i32.const -1)
+                   )
+                  )
+                 )
+                 (br $label$46)
+                )
+               )
+              )
+              (block
+               (if
+                (i32.lt_u
+                 (local.get $15)
+                 (i32.load
+                  (i32.const 3652)
+                 )
+                )
+                (call $fimport$10)
+               )
+               (if
+                (i32.eq
+                 (i32.load
+                  (local.tee $0
+                   (i32.add
+                    (local.get $15)
+                    (i32.const 16)
+                   )
+                  )
+                 )
+                 (local.get $2)
+                )
+                (i32.store
+                 (local.get $0)
+                 (local.get $4)
+                )
+                (i32.store offset=20
+                 (local.get $15)
+                 (local.get $4)
+                )
+               )
+               (br_if $label$46
+                (i32.eqz
+                 (local.get $4)
+                )
+               )
+              )
+             )
+             (if
+              (i32.lt_u
+               (local.get $4)
+               (local.tee $0
+                (i32.load
+                 (i32.const 3652)
+                )
+               )
+              )
+              (call $fimport$10)
+             )
+             (i32.store offset=24
+              (local.get $4)
+              (local.get $15)
+             )
+             (if
+              (local.tee $1
+               (i32.load offset=16
+                (local.get $2)
+               )
+              )
+              (if
+               (i32.lt_u
+                (local.get $1)
+                (local.get $0)
+               )
+               (call $fimport$10)
+               (block
+                (i32.store offset=16
+                 (local.get $4)
+                 (local.get $1)
+                )
+                (i32.store offset=24
+                 (local.get $1)
+                 (local.get $4)
+                )
+               )
+              )
+             )
+             (if
+              (local.tee $0
+               (i32.load offset=20
+                (local.get $2)
+               )
+              )
+              (if
+               (i32.lt_u
+                (local.get $0)
+                (i32.load
+                 (i32.const 3652)
+                )
+               )
+               (call $fimport$10)
+               (block
+                (i32.store offset=20
+                 (local.get $4)
+                 (local.get $0)
+                )
+                (i32.store offset=24
+                 (local.get $0)
+                 (local.get $4)
+                )
+               )
+              )
+             )
+            )
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.get $9)
+            (i32.const 16)
+           )
+           (block
+            (i32.store offset=4
+             (local.get $2)
+             (i32.or
+              (local.tee $0
+               (i32.add
+                (local.get $9)
+                (local.get $3)
+               )
+              )
+              (i32.const 3)
+             )
+            )
+            (i32.store
+             (local.tee $0
+              (i32.add
+               (i32.add
+                (local.get $2)
+                (local.get $0)
+               )
+               (i32.const 4)
+              )
+             )
+             (i32.or
+              (i32.load
+               (local.get $0)
+              )
+              (i32.const 1)
+             )
+            )
+           )
+           (block
+            (i32.store offset=4
+             (local.get $2)
+             (i32.or
+              (local.get $3)
+              (i32.const 3)
+             )
+            )
+            (i32.store offset=4
+             (local.get $13)
+             (i32.or
+              (local.get $9)
+              (i32.const 1)
+             )
+            )
+            (i32.store
+             (i32.add
+              (local.get $13)
+              (local.get $9)
+             )
+             (local.get $9)
+            )
+            (if
+             (local.get $16)
+             (block
+              (local.set $7
+               (i32.load
+                (i32.const 3656)
+               )
+              )
+              (local.set $3
+               (i32.add
+                (i32.shl
+                 (i32.shl
+                  (local.tee $0
+                   (i32.shr_u
+                    (local.get $16)
+                    (i32.const 3)
+                   )
+                  )
+                  (i32.const 1)
+                 )
+                 (i32.const 2)
+                )
+                (i32.const 3676)
+               )
+              )
+              (if
+               (i32.and
+                (local.get $8)
+                (local.tee $0
+                 (i32.shl
+                  (i32.const 1)
+                  (local.get $0)
+                 )
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.tee $0
+                  (i32.load
+                   (local.tee $1
+                    (i32.add
+                     (local.get $3)
+                     (i32.const 8)
+                    )
+                   )
+                  )
+                 )
+                 (i32.load
+                  (i32.const 3652)
+                 )
+                )
+                (call $fimport$10)
+                (block
+                 (local.set $10
+                  (local.get $1)
+                 )
+                 (local.set $5
+                  (local.get $0)
+                 )
+                )
+               )
+               (block
+                (i32.store
+                 (i32.const 3636)
+                 (i32.or
+                  (local.get $8)
+                  (local.get $0)
+                 )
+                )
+                (local.set $10
+                 (i32.add
+                  (local.get $3)
+                  (i32.const 8)
+                 )
+                )
+                (local.set $5
+                 (local.get $3)
+                )
+               )
+              )
+              (i32.store
+               (local.get $10)
+               (local.get $7)
+              )
+              (i32.store offset=12
+               (local.get $5)
+               (local.get $7)
+              )
+              (i32.store offset=8
+               (local.get $7)
+               (local.get $5)
+              )
+              (i32.store offset=12
+               (local.get $7)
+               (local.get $3)
+              )
+             )
+            )
+            (i32.store
+             (i32.const 3644)
+             (local.get $9)
+            )
+            (i32.store
+             (i32.const 3656)
+             (local.get $13)
+            )
+           )
+          )
+          (global.set $global$1
+           (local.get $14)
+          )
+          (return
+           (i32.add
+            (local.get $2)
+            (i32.const 8)
+           )
+          )
+         )
+         (local.set $0
+          (local.get $3)
+         )
+        )
+       )
+       (local.set $0
+        (local.get $3)
+       )
+      )
+     )
+     (if
+      (i32.gt_u
+       (local.get $0)
+       (i32.const -65)
+      )
+      (local.set $0
+       (i32.const -1)
+      )
+      (block
+       (local.set $7
+        (i32.and
+         (local.tee $0
+          (i32.add
+           (local.get $0)
+           (i32.const 11)
+          )
+         )
+         (i32.const -8)
+        )
+       )
+       (if
+        (local.tee $5
+         (i32.load
+          (i32.const 3640)
+         )
+        )
+        (block
+         (local.set $17
+          (if (result i32)
+           (local.tee $0
+            (i32.shr_u
+             (local.get $0)
+             (i32.const 8)
+            )
+           )
+           (if (result i32)
+            (i32.gt_u
+             (local.get $7)
+             (i32.const 16777215)
+            )
+            (i32.const 31)
+            (i32.or
+             (i32.and
+              (i32.shr_u
+               (local.get $7)
+               (i32.add
+                (local.tee $0
+                 (i32.add
+                  (i32.sub
+                   (i32.const 14)
+                   (i32.or
+                    (i32.or
+                     (local.tee $0
+                      (i32.and
+                       (i32.shr_u
+                        (i32.add
+                         (local.tee $1
+                          (i32.shl
+                           (local.get $0)
+                           (local.tee $3
+                            (i32.and
+                             (i32.shr_u
+                              (i32.add
+                               (local.get $0)
+                               (i32.const 1048320)
+                              )
+                              (i32.const 16)
+                             )
+                             (i32.const 8)
+                            )
+                           )
+                          )
+                         )
+                         (i32.const 520192)
+                        )
+                        (i32.const 16)
+                       )
+                       (i32.const 4)
+                      )
+                     )
+                     (local.get $3)
+                    )
+                    (local.tee $0
+                     (i32.and
+                      (i32.shr_u
+                       (i32.add
+                        (local.tee $1
+                         (i32.shl
+                          (local.get $1)
+                          (local.get $0)
+                         )
+                        )
+                        (i32.const 245760)
+                       )
+                       (i32.const 16)
+                      )
+                      (i32.const 2)
+                     )
+                    )
+                   )
+                  )
+                  (i32.shr_u
+                   (i32.shl
+                    (local.get $1)
+                    (local.get $0)
+                   )
+                   (i32.const 15)
+                  )
+                 )
+                )
+                (i32.const 7)
+               )
+              )
+              (i32.const 1)
+             )
+             (i32.shl
+              (local.get $0)
+              (i32.const 1)
+             )
+            )
+           )
+           (i32.const 0)
+          )
+         )
+         (local.set $3
+          (i32.sub
+           (i32.const 0)
+           (local.get $7)
+          )
+         )
+         (block $label$78
+          (block $label$79
+           (block $label$80
+            (if
+             (local.tee $1
+              (i32.load
+               (i32.add
+                (i32.shl
+                 (local.get $17)
+                 (i32.const 2)
+                )
+                (i32.const 3940)
+               )
+              )
+             )
+             (block
+              (local.set $0
+               (i32.sub
+                (i32.const 25)
+                (i32.shr_u
+                 (local.get $17)
+                 (i32.const 1)
+                )
+               )
+              )
+              (local.set $4
+               (i32.const 0)
+              )
+              (local.set $10
+               (i32.shl
+                (local.get $7)
+                (if (result i32)
+                 (i32.eq
+                  (local.get $17)
+                  (i32.const 31)
+                 )
+                 (i32.const 0)
+                 (local.get $0)
+                )
+               )
+              )
+              (local.set $0
+               (i32.const 0)
+              )
+              (loop $label$84
+               (if
+                (i32.lt_u
+                 (local.tee $6
+                  (i32.sub
+                   (i32.and
+                    (i32.load offset=4
+                     (local.get $1)
+                    )
+                    (i32.const -8)
+                   )
+                   (local.get $7)
+                  )
+                 )
+                 (local.get $3)
+                )
+                (if
+                 (local.get $6)
+                 (block
+                  (local.set $3
+                   (local.get $6)
+                  )
+                  (local.set $0
+                   (local.get $1)
+                  )
+                 )
+                 (block
+                  (local.set $3
+                   (i32.const 0)
+                  )
+                  (local.set $0
+                   (local.get $1)
+                  )
+                  (br $label$79)
+                 )
+                )
+               )
+               (local.set $1
+                (if (result i32)
+                 (i32.or
+                  (i32.eqz
+                   (local.tee $19
+                    (i32.load offset=20
+                     (local.get $1)
+                    )
+                   )
+                  )
+                  (i32.eq
+                   (local.get $19)
+                   (local.tee $6
+                    (i32.load
+                     (i32.add
+                      (i32.add
+                       (local.get $1)
+                       (i32.const 16)
+                      )
+                      (i32.shl
+                       (i32.shr_u
+                        (local.get $10)
+                        (i32.const 31)
+                       )
+                       (i32.const 2)
+                      )
+                     )
+                    )
+                   )
+                  )
+                 )
+                 (local.get $4)
+                 (local.get $19)
+                )
+               )
+               (local.set $10
+                (i32.shl
+                 (local.get $10)
+                 (i32.xor
+                  (i32.and
+                   (local.tee $4
+                    (i32.eqz
+                     (local.get $6)
+                    )
+                   )
+                   (i32.const 1)
+                  )
+                  (i32.const 1)
+                 )
+                )
+               )
+               (if
+                (local.get $4)
+                (block
+                 (local.set $4
+                  (local.get $1)
+                 )
+                 (local.set $1
+                  (local.get $0)
+                 )
+                 (br $label$80)
+                )
+                (block
+                 (local.set $4
+                  (local.get $1)
+                 )
+                 (local.set $1
+                  (local.get $6)
+                 )
+                 (br $label$84)
+                )
+               )
+              )
+             )
+             (block
+              (local.set $4
+               (i32.const 0)
+              )
+              (local.set $1
+               (i32.const 0)
+              )
+             )
+            )
+           )
+           (br_if $label$79
+            (local.tee $0
+             (if (result i32)
+              (i32.and
+               (i32.eqz
+                (local.get $4)
+               )
+               (i32.eqz
+                (local.get $1)
+               )
+              )
+              (block (result i32)
+               (if
+                (i32.eqz
+                 (local.tee $0
+                  (i32.and
+                   (local.get $5)
+                   (i32.or
+                    (local.tee $0
+                     (i32.shl
+                      (i32.const 2)
+                      (local.get $17)
+                     )
+                    )
+                    (i32.sub
+                     (i32.const 0)
+                     (local.get $0)
+                    )
+                   )
+                  )
+                 )
+                )
+                (block
+                 (local.set $0
+                  (local.get $7)
+                 )
+                 (br $label$2)
+                )
+               )
+               (local.set $10
+                (i32.and
+                 (i32.shr_u
+                  (local.tee $0
+                   (i32.add
+                    (i32.and
+                     (local.get $0)
+                     (i32.sub
+                      (i32.const 0)
+                      (local.get $0)
+                     )
+                    )
+                    (i32.const -1)
+                   )
+                  )
+                  (i32.const 12)
+                 )
+                 (i32.const 16)
+                )
+               )
+               (i32.load
+                (i32.add
+                 (i32.shl
+                  (i32.add
+                   (i32.or
+                    (i32.or
+                     (i32.or
+                      (i32.or
+                       (local.tee $0
+                        (i32.and
+                         (i32.shr_u
+                          (local.tee $4
+                           (i32.shr_u
+                            (local.get $0)
+                            (local.get $10)
+                           )
+                          )
+                          (i32.const 5)
+                         )
+                         (i32.const 8)
+                        )
+                       )
+                       (local.get $10)
+                      )
+                      (local.tee $0
+                       (i32.and
+                        (i32.shr_u
+                         (local.tee $4
+                          (i32.shr_u
+                           (local.get $4)
+                           (local.get $0)
+                          )
+                         )
+                         (i32.const 2)
+                        )
+                        (i32.const 4)
+                       )
+                      )
+                     )
+                     (local.tee $0
+                      (i32.and
+                       (i32.shr_u
+                        (local.tee $4
+                         (i32.shr_u
+                          (local.get $4)
+                          (local.get $0)
+                         )
+                        )
+                        (i32.const 1)
+                       )
+                       (i32.const 2)
+                      )
+                     )
+                    )
+                    (local.tee $0
+                     (i32.and
+                      (i32.shr_u
+                       (local.tee $4
+                        (i32.shr_u
+                         (local.get $4)
+                         (local.get $0)
+                        )
+                       )
+                       (i32.const 1)
+                      )
+                      (i32.const 1)
+                     )
+                    )
+                   )
+                   (i32.shr_u
+                    (local.get $4)
+                    (local.get $0)
+                   )
+                  )
+                  (i32.const 2)
+                 )
+                 (i32.const 3940)
+                )
+               )
+              )
+              (local.get $4)
+             )
+            )
+           )
+           (local.set $4
+            (local.get $1)
+           )
+           (br $label$78)
+          )
+          (loop $label$96
+           (if
+            (local.tee $10
+             (i32.lt_u
+              (local.tee $4
+               (i32.sub
+                (i32.and
+                 (i32.load offset=4
+                  (local.get $0)
+                 )
+                 (i32.const -8)
+                )
+                (local.get $7)
+               )
+              )
+              (local.get $3)
+             )
+            )
+            (local.set $3
+             (local.get $4)
+            )
+           )
+           (if
+            (local.get $10)
+            (local.set $1
+             (local.get $0)
+            )
+           )
+           (if
+            (local.tee $4
+             (i32.load offset=16
+              (local.get $0)
+             )
+            )
+            (block
+             (local.set $0
+              (local.get $4)
+             )
+             (br $label$96)
+            )
+           )
+           (br_if $label$96
+            (local.tee $0
+             (i32.load offset=20
+              (local.get $0)
+             )
+            )
+           )
+           (local.set $4
+            (local.get $1)
+           )
+          )
+         )
+         (if
+          (local.get $4)
+          (if
+           (i32.lt_u
+            (local.get $3)
+            (i32.sub
+             (i32.load
+              (i32.const 3644)
+             )
+             (local.get $7)
+            )
+           )
+           (block
+            (if
+             (i32.lt_u
+              (local.get $4)
+              (local.tee $12
+               (i32.load
+                (i32.const 3652)
+               )
+              )
+             )
+             (call $fimport$10)
+            )
+            (if
+             (i32.ge_u
+              (local.get $4)
+              (local.tee $6
+               (i32.add
+                (local.get $4)
+                (local.get $7)
+               )
+              )
+             )
+             (call $fimport$10)
+            )
+            (local.set $10
+             (i32.load offset=24
+              (local.get $4)
+             )
+            )
+            (block $label$104
+             (if
+              (i32.eq
+               (local.tee $0
+                (i32.load offset=12
+                 (local.get $4)
+                )
+               )
+               (local.get $4)
+              )
+              (block
+               (if
+                (i32.eqz
+                 (local.tee $0
+                  (i32.load
+                   (local.tee $1
+                    (i32.add
+                     (local.get $4)
+                     (i32.const 20)
+                    )
+                   )
+                  )
+                 )
+                )
+                (if
+                 (i32.eqz
+                  (local.tee $0
+                   (i32.load
+                    (local.tee $1
+                     (i32.add
+                      (local.get $4)
+                      (i32.const 16)
+                     )
+                    )
+                   )
+                  )
+                 )
+                 (block
+                  (local.set $13
+                   (i32.const 0)
+                  )
+                  (br $label$104)
+                 )
+                )
+               )
+               (loop $label$108
+                (if
+                 (local.tee $11
+                  (i32.load
+                   (local.tee $9
+                    (i32.add
+                     (local.get $0)
+                     (i32.const 20)
+                    )
+                   )
+                  )
+                 )
+                 (block
+                  (local.set $0
+                   (local.get $11)
+                  )
+                  (local.set $1
+                   (local.get $9)
+                  )
+                  (br $label$108)
+                 )
+                )
+                (if
+                 (local.tee $11
+                  (i32.load
+                   (local.tee $9
+                    (i32.add
+                     (local.get $0)
+                     (i32.const 16)
+                    )
+                   )
+                  )
+                 )
+                 (block
+                  (local.set $0
+                   (local.get $11)
+                  )
+                  (local.set $1
+                   (local.get $9)
+                  )
+                  (br $label$108)
+                 )
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.get $1)
+                 (local.get $12)
+                )
+                (call $fimport$10)
+                (block
+                 (i32.store
+                  (local.get $1)
+                  (i32.const 0)
+                 )
+                 (local.set $13
+                  (local.get $0)
+                 )
+                )
+               )
+              )
+              (block
+               (if
+                (i32.lt_u
+                 (local.tee $9
+                  (i32.load offset=8
+                   (local.get $4)
+                  )
+                 )
+                 (local.get $12)
+                )
+                (call $fimport$10)
+               )
+               (if
+                (i32.ne
+                 (i32.load
+                  (local.tee $11
+                   (i32.add
+                    (local.get $9)
+                    (i32.const 12)
+                   )
+                  )
+                 )
+                 (local.get $4)
+                )
+                (call $fimport$10)
+               )
+               (if
+                (i32.eq
+                 (i32.load
+                  (local.tee $1
+                   (i32.add
+                    (local.get $0)
+                    (i32.const 8)
+                   )
+                  )
+                 )
+                 (local.get $4)
+                )
+                (block
+                 (i32.store
+                  (local.get $11)
+                  (local.get $0)
+                 )
+                 (i32.store
+                  (local.get $1)
+                  (local.get $9)
+                 )
+                 (local.set $13
+                  (local.get $0)
+                 )
+                )
+                (call $fimport$10)
+               )
+              )
+             )
+            )
+            (block $label$118
+             (if
+              (local.get $10)
+              (block
+               (if
+                (i32.eq
+                 (local.get $4)
+                 (i32.load
+                  (local.tee $0
+                   (i32.add
+                    (i32.shl
+                     (local.tee $1
+                      (i32.load offset=28
+                       (local.get $4)
+                      )
+                     )
+                     (i32.const 2)
+                    )
+                    (i32.const 3940)
+                   )
+                  )
+                 )
+                )
+                (block
+                 (i32.store
+                  (local.get $0)
+                  (local.get $13)
+                 )
+                 (if
+                  (i32.eqz
+                   (local.get $13)
+                  )
+                  (block
+                   (i32.store
+                    (i32.const 3640)
+                    (local.tee $2
+                     (i32.and
+                      (local.get $5)
+                      (i32.xor
+                       (i32.shl
+                        (i32.const 1)
+                        (local.get $1)
+                       )
+                       (i32.const -1)
+                      )
+                     )
+                    )
+                   )
+                   (br $label$118)
+                  )
+                 )
+                )
+                (block
+                 (if
+                  (i32.lt_u
+                   (local.get $10)
+                   (i32.load
+                    (i32.const 3652)
+                   )
+                  )
+                  (call $fimport$10)
+                 )
+                 (if
+                  (i32.eq
+                   (i32.load
+                    (local.tee $0
+                     (i32.add
+                      (local.get $10)
+                      (i32.const 16)
+                     )
+                    )
+                   )
+                   (local.get $4)
+                  )
+                  (i32.store
+                   (local.get $0)
+                   (local.get $13)
+                  )
+                  (i32.store offset=20
+                   (local.get $10)
+                   (local.get $13)
+                  )
+                 )
+                 (if
+                  (i32.eqz
+                   (local.get $13)
+                  )
+                  (block
+                   (local.set $2
+                    (local.get $5)
+                   )
+                   (br $label$118)
+                  )
+                 )
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.get $13)
+                 (local.tee $0
+                  (i32.load
+                   (i32.const 3652)
+                  )
+                 )
+                )
+                (call $fimport$10)
+               )
+               (i32.store offset=24
+                (local.get $13)
+                (local.get $10)
+               )
+               (if
+                (local.tee $1
+                 (i32.load offset=16
+                  (local.get $4)
+                 )
+                )
+                (if
+                 (i32.lt_u
+                  (local.get $1)
+                  (local.get $0)
+                 )
+                 (call $fimport$10)
+                 (block
+                  (i32.store offset=16
+                   (local.get $13)
+                   (local.get $1)
+                  )
+                  (i32.store offset=24
+                   (local.get $1)
+                   (local.get $13)
+                  )
+                 )
+                )
+               )
+               (if
+                (local.tee $0
+                 (i32.load offset=20
+                  (local.get $4)
+                 )
+                )
+                (if
+                 (i32.lt_u
+                  (local.get $0)
+                  (i32.load
+                   (i32.const 3652)
+                  )
+                 )
+                 (call $fimport$10)
+                 (block
+                  (i32.store offset=20
+                   (local.get $13)
+                   (local.get $0)
+                  )
+                  (i32.store offset=24
+                   (local.get $0)
+                   (local.get $13)
+                  )
+                  (local.set $2
+                   (local.get $5)
+                  )
+                 )
+                )
+                (local.set $2
+                 (local.get $5)
+                )
+               )
+              )
+              (local.set $2
+               (local.get $5)
+              )
+             )
+            )
+            (block $label$136
+             (if
+              (i32.lt_u
+               (local.get $3)
+               (i32.const 16)
+              )
+              (block
+               (i32.store offset=4
+                (local.get $4)
+                (i32.or
+                 (local.tee $0
+                  (i32.add
+                   (local.get $3)
+                   (local.get $7)
+                  )
+                 )
+                 (i32.const 3)
+                )
+               )
+               (i32.store
+                (local.tee $0
+                 (i32.add
+                  (i32.add
+                   (local.get $4)
+                   (local.get $0)
+                  )
+                  (i32.const 4)
+                 )
+                )
+                (i32.or
+                 (i32.load
+                  (local.get $0)
+                 )
+                 (i32.const 1)
+                )
+               )
+              )
+              (block
+               (i32.store offset=4
+                (local.get $4)
+                (i32.or
+                 (local.get $7)
+                 (i32.const 3)
+                )
+               )
+               (i32.store offset=4
+                (local.get $6)
+                (i32.or
+                 (local.get $3)
+                 (i32.const 1)
+                )
+               )
+               (i32.store
+                (i32.add
+                 (local.get $6)
+                 (local.get $3)
+                )
+                (local.get $3)
+               )
+               (local.set $0
+                (i32.shr_u
+                 (local.get $3)
+                 (i32.const 3)
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.get $3)
+                 (i32.const 256)
+                )
+                (block
+                 (local.set $3
+                  (i32.add
+                   (i32.shl
+                    (i32.shl
+                     (local.get $0)
+                     (i32.const 1)
+                    )
+                    (i32.const 2)
+                   )
+                   (i32.const 3676)
+                  )
+                 )
+                 (if
+                  (i32.and
+                   (local.tee $1
+                    (i32.load
+                     (i32.const 3636)
+                    )
+                   )
+                   (local.tee $0
+                    (i32.shl
+                     (i32.const 1)
+                     (local.get $0)
+                    )
+                   )
+                  )
+                  (if
+                   (i32.lt_u
+                    (local.tee $0
+                     (i32.load
+                      (local.tee $1
+                       (i32.add
+                        (local.get $3)
+                        (i32.const 8)
+                       )
+                      )
+                     )
+                    )
+                    (i32.load
+                     (i32.const 3652)
+                    )
+                   )
+                   (call $fimport$10)
+                   (block
+                    (local.set $16
+                     (local.get $1)
+                    )
+                    (local.set $8
+                     (local.get $0)
+                    )
+                   )
+                  )
+                  (block
+                   (i32.store
+                    (i32.const 3636)
+                    (i32.or
+                     (local.get $1)
+                     (local.get $0)
+                    )
+                   )
+                   (local.set $16
+                    (i32.add
+                     (local.get $3)
+                     (i32.const 8)
+                    )
+                   )
+                   (local.set $8
+                    (local.get $3)
+                   )
+                  )
+                 )
+                 (i32.store
+                  (local.get $16)
+                  (local.get $6)
+                 )
+                 (i32.store offset=12
+                  (local.get $8)
+                  (local.get $6)
+                 )
+                 (i32.store offset=8
+                  (local.get $6)
+                  (local.get $8)
+                 )
+                 (i32.store offset=12
+                  (local.get $6)
+                  (local.get $3)
+                 )
+                 (br $label$136)
+                )
+               )
+               (local.set $1
+                (i32.add
+                 (i32.shl
+                  (local.tee $5
+                   (if (result i32)
+                    (local.tee $0
+                     (i32.shr_u
+                      (local.get $3)
+                      (i32.const 8)
+                     )
+                    )
+                    (if (result i32)
+                     (i32.gt_u
+                      (local.get $3)
+                      (i32.const 16777215)
+                     )
+                     (i32.const 31)
+                     (i32.or
+                      (i32.and
+                       (i32.shr_u
+                        (local.get $3)
+                        (i32.add
+                         (local.tee $0
+                          (i32.add
+                           (i32.sub
+                            (i32.const 14)
+                            (i32.or
+                             (i32.or
+                              (local.tee $0
+                               (i32.and
+                                (i32.shr_u
+                                 (i32.add
+                                  (local.tee $1
+                                   (i32.shl
+                                    (local.get $0)
+                                    (local.tee $5
+                                     (i32.and
+                                      (i32.shr_u
+                                       (i32.add
+                                        (local.get $0)
+                                        (i32.const 1048320)
+                                       )
+                                       (i32.const 16)
+                                      )
+                                      (i32.const 8)
+                                     )
+                                    )
+                                   )
+                                  )
+                                  (i32.const 520192)
+                                 )
+                                 (i32.const 16)
+                                )
+                                (i32.const 4)
+                               )
+                              )
+                              (local.get $5)
+                             )
+                             (local.tee $0
+                              (i32.and
+                               (i32.shr_u
+                                (i32.add
+                                 (local.tee $1
+                                  (i32.shl
+                                   (local.get $1)
+                                   (local.get $0)
+                                  )
+                                 )
+                                 (i32.const 245760)
+                                )
+                                (i32.const 16)
+                               )
+                               (i32.const 2)
+                              )
+                             )
+                            )
+                           )
+                           (i32.shr_u
+                            (i32.shl
+                             (local.get $1)
+                             (local.get $0)
+                            )
+                            (i32.const 15)
+                           )
+                          )
+                         )
+                         (i32.const 7)
+                        )
+                       )
+                       (i32.const 1)
+                      )
+                      (i32.shl
+                       (local.get $0)
+                       (i32.const 1)
+                      )
+                     )
+                    )
+                    (i32.const 0)
+                   )
+                  )
+                  (i32.const 2)
+                 )
+                 (i32.const 3940)
+                )
+               )
+               (i32.store offset=28
+                (local.get $6)
+                (local.get $5)
+               )
+               (i32.store offset=4
+                (local.tee $0
+                 (i32.add
+                  (local.get $6)
+                  (i32.const 16)
+                 )
+                )
+                (i32.const 0)
+               )
+               (i32.store
+                (local.get $0)
+                (i32.const 0)
+               )
+               (if
+                (i32.eqz
+                 (i32.and
+                  (local.get $2)
+                  (local.tee $0
+                   (i32.shl
+                    (i32.const 1)
+                    (local.get $5)
+                   )
+                  )
+                 )
+                )
+                (block
+                 (i32.store
+                  (i32.const 3640)
+                  (i32.or
+                   (local.get $2)
+                   (local.get $0)
+                  )
+                 )
+                 (i32.store
+                  (local.get $1)
+                  (local.get $6)
+                 )
+                 (i32.store offset=24
+                  (local.get $6)
+                  (local.get $1)
+                 )
+                 (i32.store offset=12
+                  (local.get $6)
+                  (local.get $6)
+                 )
+                 (i32.store offset=8
+                  (local.get $6)
+                  (local.get $6)
+                 )
+                 (br $label$136)
+                )
+               )
+               (local.set $0
+                (i32.load
+                 (local.get $1)
+                )
+               )
+               (local.set $1
+                (i32.sub
+                 (i32.const 25)
+                 (i32.shr_u
+                  (local.get $5)
+                  (i32.const 1)
+                 )
+                )
+               )
+               (local.set $5
+                (i32.shl
+                 (local.get $3)
+                 (if (result i32)
+                  (i32.eq
+                   (local.get $5)
+                   (i32.const 31)
+                  )
+                  (i32.const 0)
+                  (local.get $1)
+                 )
+                )
+               )
+               (block $label$151
+                (block $label$152
+                 (block $label$153
+                  (loop $label$154
+                   (br_if $label$152
+                    (i32.eq
+                     (i32.and
+                      (i32.load offset=4
+                       (local.get $0)
+                      )
+                      (i32.const -8)
+                     )
+                     (local.get $3)
+                    )
+                   )
+                   (local.set $2
+                    (i32.shl
+                     (local.get $5)
+                     (i32.const 1)
+                    )
+                   )
+                   (br_if $label$153
+                    (i32.eqz
+                     (local.tee $1
+                      (i32.load
+                       (local.tee $5
+                        (i32.add
+                         (i32.add
+                          (local.get $0)
+                          (i32.const 16)
+                         )
+                         (i32.shl
+                          (i32.shr_u
+                           (local.get $5)
+                           (i32.const 31)
+                          )
+                          (i32.const 2)
+                         )
+                        )
+                       )
+                      )
+                     )
+                    )
+                   )
+                   (local.set $5
+                    (local.get $2)
+                   )
+                   (local.set $0
+                    (local.get $1)
+                   )
+                   (br $label$154)
+                  )
+                 )
+                 (if
+                  (i32.lt_u
+                   (local.get $5)
+                   (i32.load
+                    (i32.const 3652)
+                   )
+                  )
+                  (call $fimport$10)
+                  (block
+                   (i32.store
+                    (local.get $5)
+                    (local.get $6)
+                   )
+                   (i32.store offset=24
+                    (local.get $6)
+                    (local.get $0)
+                   )
+                   (i32.store offset=12
+                    (local.get $6)
+                    (local.get $6)
+                   )
+                   (i32.store offset=8
+                    (local.get $6)
+                    (local.get $6)
+                   )
+                   (br $label$136)
+                  )
+                 )
+                 (br $label$151)
+                )
+                (if
+                 (i32.and
+                  (i32.ge_u
+                   (local.tee $2
+                    (i32.load
+                     (local.tee $3
+                      (i32.add
+                       (local.get $0)
+                       (i32.const 8)
+                      )
+                     )
+                    )
+                   )
+                   (local.tee $1
+                    (i32.load
+                     (i32.const 3652)
+                    )
+                   )
+                  )
+                  (i32.ge_u
+                   (local.get $0)
+                   (local.get $1)
+                  )
+                 )
+                 (block
+                  (i32.store offset=12
+                   (local.get $2)
+                   (local.get $6)
+                  )
+                  (i32.store
+                   (local.get $3)
+                   (local.get $6)
+                  )
+                  (i32.store offset=8
+                   (local.get $6)
+                   (local.get $2)
+                  )
+                  (i32.store offset=12
+                   (local.get $6)
+                   (local.get $0)
+                  )
+                  (i32.store offset=24
+                   (local.get $6)
+                   (i32.const 0)
+                  )
+                 )
+                 (call $fimport$10)
+                )
+               )
+              )
+             )
+            )
+            (global.set $global$1
+             (local.get $14)
+            )
+            (return
+             (i32.add
+              (local.get $4)
+              (i32.const 8)
+             )
+            )
+           )
+           (local.set $0
+            (local.get $7)
+           )
+          )
+          (local.set $0
+           (local.get $7)
+          )
+         )
+        )
+        (local.set $0
+         (local.get $7)
+        )
+       )
+      )
+     )
+    )
+   )
+   (if
+    (i32.ge_u
+     (local.tee $1
+      (i32.load
+       (i32.const 3644)
+      )
+     )
+     (local.get $0)
+    )
+    (block
+     (local.set $2
+      (i32.load
+       (i32.const 3656)
+      )
+     )
+     (if
+      (i32.gt_u
+       (local.tee $3
+        (i32.sub
+         (local.get $1)
+         (local.get $0)
+        )
+       )
+       (i32.const 15)
+      )
+      (block
+       (i32.store
+        (i32.const 3656)
+        (local.tee $1
+         (i32.add
+          (local.get $2)
+          (local.get $0)
+         )
+        )
+       )
+       (i32.store
+        (i32.const 3644)
+        (local.get $3)
+       )
+       (i32.store offset=4
+        (local.get $1)
+        (i32.or
+         (local.get $3)
+         (i32.const 1)
+        )
+       )
+       (i32.store
+        (i32.add
+         (local.get $1)
+         (local.get $3)
+        )
+        (local.get $3)
+       )
+       (i32.store offset=4
+        (local.get $2)
+        (i32.or
+         (local.get $0)
+         (i32.const 3)
+        )
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 3644)
+        (i32.const 0)
+       )
+       (i32.store
+        (i32.const 3656)
+        (i32.const 0)
+       )
+       (i32.store offset=4
+        (local.get $2)
+        (i32.or
+         (local.get $1)
+         (i32.const 3)
+        )
+       )
+       (i32.store
+        (local.tee $0
+         (i32.add
+          (i32.add
+           (local.get $2)
+           (local.get $1)
+          )
+          (i32.const 4)
+         )
+        )
+        (i32.or
+         (i32.load
+          (local.get $0)
+         )
+         (i32.const 1)
+        )
+       )
+      )
+     )
+     (global.set $global$1
+      (local.get $14)
+     )
+     (return
+      (i32.add
+       (local.get $2)
+       (i32.const 8)
+      )
+     )
+    )
+   )
+   (if
+    (i32.gt_u
+     (local.tee $10
+      (i32.load
+       (i32.const 3648)
+      )
+     )
+     (local.get $0)
+    )
+    (block
+     (i32.store
+      (i32.const 3648)
+      (local.tee $3
+       (i32.sub
+        (local.get $10)
+        (local.get $0)
+       )
+      )
+     )
+     (i32.store
+      (i32.const 3660)
+      (local.tee $1
+       (i32.add
+        (local.tee $2
+         (i32.load
+          (i32.const 3660)
+         )
+        )
+        (local.get $0)
+       )
+      )
+     )
+     (i32.store offset=4
+      (local.get $1)
+      (i32.or
+       (local.get $3)
+       (i32.const 1)
+      )
+     )
+     (i32.store offset=4
+      (local.get $2)
+      (i32.or
+       (local.get $0)
+       (i32.const 3)
+      )
+     )
+     (global.set $global$1
+      (local.get $14)
+     )
+     (return
+      (i32.add
+       (local.get $2)
+       (i32.const 8)
+      )
+     )
+    )
+   )
+   (if
+    (i32.le_u
+     (local.tee $6
+      (i32.and
+       (local.tee $8
+        (i32.add
+         (local.tee $1
+          (if (result i32)
+           (i32.load
+            (i32.const 4108)
+           )
+           (i32.load
+            (i32.const 4116)
+           )
+           (block (result i32)
+            (i32.store
+             (i32.const 4116)
+             (i32.const 4096)
+            )
+            (i32.store
+             (i32.const 4112)
+             (i32.const 4096)
+            )
+            (i32.store
+             (i32.const 4120)
+             (i32.const -1)
+            )
+            (i32.store
+             (i32.const 4124)
+             (i32.const -1)
+            )
+            (i32.store
+             (i32.const 4128)
+             (i32.const 0)
+            )
+            (i32.store
+             (i32.const 4080)
+             (i32.const 0)
+            )
+            (i32.store
+             (local.get $18)
+             (local.tee $1
+              (i32.xor
+               (i32.and
+                (local.get $18)
+                (i32.const -16)
+               )
+               (i32.const 1431655768)
+              )
+             )
+            )
+            (i32.store
+             (i32.const 4108)
+             (local.get $1)
+            )
+            (i32.const 4096)
+           )
+          )
+         )
+         (local.tee $13
+          (i32.add
+           (local.get $0)
+           (i32.const 47)
+          )
+         )
+        )
+       )
+       (local.tee $4
+        (i32.sub
+         (i32.const 0)
+         (local.get $1)
+        )
+       )
+      )
+     )
+     (local.get $0)
+    )
+    (block
+     (global.set $global$1
+      (local.get $14)
+     )
+     (return
+      (i32.const 0)
+     )
+    )
+   )
+   (if
+    (local.tee $2
+     (i32.load
+      (i32.const 4076)
+     )
+    )
+    (if
+     (i32.or
+      (i32.le_u
+       (local.tee $1
+        (i32.add
+         (local.tee $3
+          (i32.load
+           (i32.const 4068)
+          )
+         )
+         (local.get $6)
+        )
+       )
+       (local.get $3)
+      )
+      (i32.gt_u
+       (local.get $1)
+       (local.get $2)
+      )
+     )
+     (block
+      (global.set $global$1
+       (local.get $14)
+      )
+      (return
+       (i32.const 0)
+      )
+     )
+    )
+   )
+   (local.set $7
+    (i32.add
+     (local.get $0)
+     (i32.const 48)
+    )
+   )
+   (block $label$171
+    (block $label$172
+     (if
+      (i32.eqz
+       (i32.and
+        (i32.load
+         (i32.const 4080)
+        )
+        (i32.const 4)
+       )
+      )
+      (block
+       (block $label$174
+        (block $label$175
+         (block $label$176
+          (br_if $label$176
+           (i32.eqz
+            (local.tee $3
+             (i32.load
+              (i32.const 3660)
+             )
+            )
+           )
+          )
+          (local.set $2
+           (i32.const 4084)
+          )
+          (loop $label$177
+           (block $label$178
+            (if
+             (i32.le_u
+              (local.tee $1
+               (i32.load
+                (local.get $2)
+               )
+              )
+              (local.get $3)
+             )
+             (br_if $label$178
+              (i32.gt_u
+               (i32.add
+                (local.get $1)
+                (i32.load
+                 (local.tee $5
+                  (i32.add
+                   (local.get $2)
+                   (i32.const 4)
+                  )
+                 )
+                )
+               )
+               (local.get $3)
+              )
+             )
+            )
+            (br_if $label$176
+             (i32.eqz
+              (local.tee $1
+               (i32.load offset=8
+                (local.get $2)
+               )
+              )
+             )
+            )
+            (local.set $2
+             (local.get $1)
+            )
+            (br $label$177)
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.tee $3
+             (i32.and
+              (i32.sub
+               (local.get $8)
+               (local.get $10)
+              )
+              (local.get $4)
+             )
+            )
+            (i32.const 2147483647)
+           )
+           (if
+            (i32.eq
+             (local.tee $1
+              (call $40
+               (local.get $3)
+              )
+             )
+             (i32.add
+              (i32.load
+               (local.get $2)
+              )
+              (i32.load
+               (local.get $5)
+              )
+             )
+            )
+            (br_if $label$172
+             (i32.ne
+              (local.get $1)
+              (i32.const -1)
+             )
+            )
+            (block
+             (local.set $2
+              (local.get $1)
+             )
+             (local.set $1
+              (local.get $3)
+             )
+             (br $label$175)
+            )
+           )
+          )
+          (br $label$174)
+         )
+         (if
+          (i32.ne
+           (local.tee $1
+            (call $40
+             (i32.const 0)
+            )
+           )
+           (i32.const -1)
+          )
+          (block
+           (local.set $2
+            (i32.sub
+             (i32.and
+              (i32.add
+               (local.tee $5
+                (i32.add
+                 (local.tee $2
+                  (i32.load
+                   (i32.const 4112)
+                  )
+                 )
+                 (i32.const -1)
+                )
+               )
+               (local.tee $3
+                (local.get $1)
+               )
+              )
+              (i32.sub
+               (i32.const 0)
+               (local.get $2)
+              )
+             )
+             (local.get $3)
+            )
+           )
+           (local.set $4
+            (i32.add
+             (local.tee $3
+              (i32.add
+               (if (result i32)
+                (i32.and
+                 (local.get $5)
+                 (local.get $3)
+                )
+                (local.get $2)
+                (i32.const 0)
+               )
+               (local.get $6)
+              )
+             )
+             (local.tee $5
+              (i32.load
+               (i32.const 4068)
+              )
+             )
+            )
+           )
+           (if
+            (i32.and
+             (i32.gt_u
+              (local.get $3)
+              (local.get $0)
+             )
+             (i32.lt_u
+              (local.get $3)
+              (i32.const 2147483647)
+             )
+            )
+            (block
+             (if
+              (local.tee $2
+               (i32.load
+                (i32.const 4076)
+               )
+              )
+              (br_if $label$174
+               (i32.or
+                (i32.le_u
+                 (local.get $4)
+                 (local.get $5)
+                )
+                (i32.gt_u
+                 (local.get $4)
+                 (local.get $2)
+                )
+               )
+              )
+             )
+             (br_if $label$172
+              (i32.eq
+               (local.tee $2
+                (call $40
+                 (local.get $3)
+                )
+               )
+               (local.get $1)
+              )
+             )
+             (local.set $1
+              (local.get $3)
+             )
+             (br $label$175)
+            )
+           )
+          )
+         )
+         (br $label$174)
+        )
+        (local.set $5
+         (i32.sub
+          (i32.const 0)
+          (local.get $1)
+         )
+        )
+        (if
+         (i32.and
+          (i32.gt_u
+           (local.get $7)
+           (local.get $1)
+          )
+          (i32.and
+           (i32.lt_u
+            (local.get $1)
+            (i32.const 2147483647)
+           )
+           (i32.ne
+            (local.get $2)
+            (i32.const -1)
+           )
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.tee $3
+            (i32.and
+             (i32.add
+              (i32.sub
+               (local.get $13)
+               (local.get $1)
+              )
+              (local.tee $3
+               (i32.load
+                (i32.const 4116)
+               )
+              )
+             )
+             (i32.sub
+              (i32.const 0)
+              (local.get $3)
+             )
+            )
+           )
+           (i32.const 2147483647)
+          )
+          (if
+           (i32.eq
+            (call $40
+             (local.get $3)
+            )
+            (i32.const -1)
+           )
+           (block
+            (drop
+             (call $40
+              (local.get $5)
+             )
+            )
+            (br $label$174)
+           )
+           (local.set $3
+            (i32.add
+             (local.get $3)
+             (local.get $1)
+            )
+           )
+          )
+          (local.set $3
+           (local.get $1)
+          )
+         )
+         (local.set $3
+          (local.get $1)
+         )
+        )
+        (if
+         (i32.ne
+          (local.get $2)
+          (i32.const -1)
+         )
+         (block
+          (local.set $1
+           (local.get $2)
+          )
+          (br $label$172)
+         )
+        )
+       )
+       (i32.store
+        (i32.const 4080)
+        (i32.or
+         (i32.load
+          (i32.const 4080)
+         )
+         (i32.const 4)
+        )
+       )
+      )
+     )
+     (if
+      (i32.lt_u
+       (local.get $6)
+       (i32.const 2147483647)
+      )
+      (if
+       (i32.and
+        (i32.lt_u
+         (local.tee $1
+          (call $40
+           (local.get $6)
+          )
+         )
+         (local.tee $3
+          (call $40
+           (i32.const 0)
+          )
+         )
+        )
+        (i32.and
+         (i32.ne
+          (local.get $1)
+          (i32.const -1)
+         )
+         (i32.ne
+          (local.get $3)
+          (i32.const -1)
+         )
+        )
+       )
+       (br_if $label$172
+        (i32.gt_u
+         (local.tee $3
+          (i32.sub
+           (local.get $3)
+           (local.get $1)
+          )
+         )
+         (i32.add
+          (local.get $0)
+          (i32.const 40)
+         )
+        )
+       )
+      )
+     )
+     (br $label$171)
+    )
+    (i32.store
+     (i32.const 4068)
+     (local.tee $2
+      (i32.add
+       (i32.load
+        (i32.const 4068)
+       )
+       (local.get $3)
+      )
+     )
+    )
+    (if
+     (i32.gt_u
+      (local.get $2)
+      (i32.load
+       (i32.const 4072)
+      )
+     )
+     (i32.store
+      (i32.const 4072)
+      (local.get $2)
+     )
+    )
+    (block $label$198
+     (if
+      (local.tee $8
+       (i32.load
+        (i32.const 3660)
+       )
+      )
+      (block
+       (local.set $2
+        (i32.const 4084)
+       )
+       (block $label$200
+        (block $label$201
+         (loop $label$202
+          (br_if $label$201
+           (i32.eq
+            (local.get $1)
+            (i32.add
+             (local.tee $4
+              (i32.load
+               (local.get $2)
+              )
+             )
+             (local.tee $5
+              (i32.load
+               (local.tee $7
+                (i32.add
+                 (local.get $2)
+                 (i32.const 4)
+                )
+               )
+              )
+             )
+            )
+           )
+          )
+          (br_if $label$202
+           (local.tee $2
+            (i32.load offset=8
+             (local.get $2)
+            )
+           )
+          )
+         )
+         (br $label$200)
+        )
+        (if
+         (i32.eqz
+          (i32.and
+           (i32.load offset=12
+            (local.get $2)
+           )
+           (i32.const 8)
+          )
+         )
+         (if
+          (i32.and
+           (i32.lt_u
+            (local.get $8)
+            (local.get $1)
+           )
+           (i32.ge_u
+            (local.get $8)
+            (local.get $4)
+           )
+          )
+          (block
+           (i32.store
+            (local.get $7)
+            (i32.add
+             (local.get $5)
+             (local.get $3)
+            )
+           )
+           (local.set $5
+            (i32.load
+             (i32.const 3648)
+            )
+           )
+           (local.set $1
+            (i32.and
+             (i32.sub
+              (i32.const 0)
+              (local.tee $2
+               (i32.add
+                (local.get $8)
+                (i32.const 8)
+               )
+              )
+             )
+             (i32.const 7)
+            )
+           )
+           (i32.store
+            (i32.const 3660)
+            (local.tee $2
+             (i32.add
+              (local.get $8)
+              (if (result i32)
+               (i32.and
+                (local.get $2)
+                (i32.const 7)
+               )
+               (local.get $1)
+               (local.tee $1
+                (i32.const 0)
+               )
+              )
+             )
+            )
+           )
+           (i32.store
+            (i32.const 3648)
+            (local.tee $1
+             (i32.add
+              (i32.sub
+               (local.get $3)
+               (local.get $1)
+              )
+              (local.get $5)
+             )
+            )
+           )
+           (i32.store offset=4
+            (local.get $2)
+            (i32.or
+             (local.get $1)
+             (i32.const 1)
+            )
+           )
+           (i32.store offset=4
+            (i32.add
+             (local.get $2)
+             (local.get $1)
+            )
+            (i32.const 40)
+           )
+           (i32.store
+            (i32.const 3664)
+            (i32.load
+             (i32.const 4124)
+            )
+           )
+           (br $label$198)
+          )
+         )
+        )
+       )
+       (if
+        (i32.lt_u
+         (local.get $1)
+         (local.tee $2
+          (i32.load
+           (i32.const 3652)
+          )
+         )
+        )
+        (block
+         (i32.store
+          (i32.const 3652)
+          (local.get $1)
+         )
+         (local.set $2
+          (local.get $1)
+         )
+        )
+       )
+       (local.set $10
+        (i32.add
+         (local.get $1)
+         (local.get $3)
+        )
+       )
+       (local.set $5
+        (i32.const 4084)
+       )
+       (block $label$208
+        (block $label$209
+         (loop $label$210
+          (br_if $label$209
+           (i32.eq
+            (i32.load
+             (local.get $5)
+            )
+            (local.get $10)
+           )
+          )
+          (br_if $label$210
+           (local.tee $5
+            (i32.load offset=8
+             (local.get $5)
+            )
+           )
+          )
+          (local.set $5
+           (i32.const 4084)
+          )
+         )
+         (br $label$208)
+        )
+        (if
+         (i32.and
+          (i32.load offset=12
+           (local.get $5)
+          )
+          (i32.const 8)
+         )
+         (local.set $5
+          (i32.const 4084)
+         )
+         (block
+          (i32.store
+           (local.get $5)
+           (local.get $1)
+          )
+          (i32.store
+           (local.tee $5
+            (i32.add
+             (local.get $5)
+             (i32.const 4)
+            )
+           )
+           (i32.add
+            (i32.load
+             (local.get $5)
+            )
+            (local.get $3)
+           )
+          )
+          (local.set $7
+           (i32.and
+            (i32.sub
+             (i32.const 0)
+             (local.tee $4
+              (i32.add
+               (local.get $1)
+               (i32.const 8)
+              )
+             )
+            )
+            (i32.const 7)
+           )
+          )
+          (local.set $3
+           (i32.and
+            (i32.sub
+             (i32.const 0)
+             (local.tee $5
+              (i32.add
+               (local.get $10)
+               (i32.const 8)
+              )
+             )
+            )
+            (i32.const 7)
+           )
+          )
+          (local.set $6
+           (i32.add
+            (local.tee $13
+             (i32.add
+              (local.get $1)
+              (if (result i32)
+               (i32.and
+                (local.get $4)
+                (i32.const 7)
+               )
+               (local.get $7)
+               (i32.const 0)
+              )
+             )
+            )
+            (local.get $0)
+           )
+          )
+          (local.set $7
+           (i32.sub
+            (i32.sub
+             (local.tee $4
+              (i32.add
+               (local.get $10)
+               (if (result i32)
+                (i32.and
+                 (local.get $5)
+                 (i32.const 7)
+                )
+                (local.get $3)
+                (i32.const 0)
+               )
+              )
+             )
+             (local.get $13)
+            )
+            (local.get $0)
+           )
+          )
+          (i32.store offset=4
+           (local.get $13)
+           (i32.or
+            (local.get $0)
+            (i32.const 3)
+           )
+          )
+          (block $label$217
+           (if
+            (i32.eq
+             (local.get $4)
+             (local.get $8)
+            )
+            (block
+             (i32.store
+              (i32.const 3648)
+              (local.tee $0
+               (i32.add
+                (i32.load
+                 (i32.const 3648)
+                )
+                (local.get $7)
+               )
+              )
+             )
+             (i32.store
+              (i32.const 3660)
+              (local.get $6)
+             )
+             (i32.store offset=4
+              (local.get $6)
+              (i32.or
+               (local.get $0)
+               (i32.const 1)
+              )
+             )
+            )
+            (block
+             (if
+              (i32.eq
+               (local.get $4)
+               (i32.load
+                (i32.const 3656)
+               )
+              )
+              (block
+               (i32.store
+                (i32.const 3644)
+                (local.tee $0
+                 (i32.add
+                  (i32.load
+                   (i32.const 3644)
+                  )
+                  (local.get $7)
+                 )
+                )
+               )
+               (i32.store
+                (i32.const 3656)
+                (local.get $6)
+               )
+               (i32.store offset=4
+                (local.get $6)
+                (i32.or
+                 (local.get $0)
+                 (i32.const 1)
+                )
+               )
+               (i32.store
+                (i32.add
+                 (local.get $6)
+                 (local.get $0)
+                )
+                (local.get $0)
+               )
+               (br $label$217)
+              )
+             )
+             (i32.store
+              (local.tee $0
+               (i32.add
+                (local.tee $0
+                 (if (result i32)
+                  (i32.eq
+                   (i32.and
+                    (local.tee $0
+                     (i32.load offset=4
+                      (local.get $4)
+                     )
+                    )
+                    (i32.const 3)
+                   )
+                   (i32.const 1)
+                  )
+                  (block (result i32)
+                   (local.set $11
+                    (i32.and
+                     (local.get $0)
+                     (i32.const -8)
+                    )
+                   )
+                   (local.set $1
+                    (i32.shr_u
+                     (local.get $0)
+                     (i32.const 3)
+                    )
+                   )
+                   (block $label$222
+                    (if
+                     (i32.lt_u
+                      (local.get $0)
+                      (i32.const 256)
+                     )
+                     (block
+                      (local.set $5
+                       (i32.load offset=12
+                        (local.get $4)
+                       )
+                      )
+                      (block $label$224
+                       (if
+                        (i32.ne
+                         (local.tee $3
+                          (i32.load offset=8
+                           (local.get $4)
+                          )
+                         )
+                         (local.tee $0
+                          (i32.add
+                           (i32.shl
+                            (i32.shl
+                             (local.get $1)
+                             (i32.const 1)
+                            )
+                            (i32.const 2)
+                           )
+                           (i32.const 3676)
+                          )
+                         )
+                        )
+                        (block
+                         (if
+                          (i32.lt_u
+                           (local.get $3)
+                           (local.get $2)
+                          )
+                          (call $fimport$10)
+                         )
+                         (br_if $label$224
+                          (i32.eq
+                           (i32.load offset=12
+                            (local.get $3)
+                           )
+                           (local.get $4)
+                          )
+                         )
+                         (call $fimport$10)
+                        )
+                       )
+                      )
+                      (if
+                       (i32.eq
+                        (local.get $5)
+                        (local.get $3)
+                       )
+                       (block
+                        (i32.store
+                         (i32.const 3636)
+                         (i32.and
+                          (i32.load
+                           (i32.const 3636)
+                          )
+                          (i32.xor
+                           (i32.shl
+                            (i32.const 1)
+                            (local.get $1)
+                           )
+                           (i32.const -1)
+                          )
+                         )
+                        )
+                        (br $label$222)
+                       )
+                      )
+                      (block $label$228
+                       (if
+                        (i32.eq
+                         (local.get $5)
+                         (local.get $0)
+                        )
+                        (local.set $20
+                         (i32.add
+                          (local.get $5)
+                          (i32.const 8)
+                         )
+                        )
+                        (block
+                         (if
+                          (i32.lt_u
+                           (local.get $5)
+                           (local.get $2)
+                          )
+                          (call $fimport$10)
+                         )
+                         (if
+                          (i32.eq
+                           (i32.load
+                            (local.tee $0
+                             (i32.add
+                              (local.get $5)
+                              (i32.const 8)
+                             )
+                            )
+                           )
+                           (local.get $4)
+                          )
+                          (block
+                           (local.set $20
+                            (local.get $0)
+                           )
+                           (br $label$228)
+                          )
+                         )
+                         (call $fimport$10)
+                        )
+                       )
+                      )
+                      (i32.store offset=12
+                       (local.get $3)
+                       (local.get $5)
+                      )
+                      (i32.store
+                       (local.get $20)
+                       (local.get $3)
+                      )
+                     )
+                     (block
+                      (local.set $8
+                       (i32.load offset=24
+                        (local.get $4)
+                       )
+                      )
+                      (block $label$234
+                       (if
+                        (i32.eq
+                         (local.tee $0
+                          (i32.load offset=12
+                           (local.get $4)
+                          )
+                         )
+                         (local.get $4)
+                        )
+                        (block
+                         (if
+                          (i32.eqz
+                           (local.tee $0
+                            (i32.load
+                             (local.tee $1
+                              (i32.add
+                               (local.tee $3
+                                (i32.add
+                                 (local.get $4)
+                                 (i32.const 16)
+                                )
+                               )
+                               (i32.const 4)
+                              )
+                             )
+                            )
+                           )
+                          )
+                          (if
+                           (local.tee $0
+                            (i32.load
+                             (local.get $3)
+                            )
+                           )
+                           (local.set $1
+                            (local.get $3)
+                           )
+                           (block
+                            (local.set $12
+                             (i32.const 0)
+                            )
+                            (br $label$234)
+                           )
+                          )
+                         )
+                         (loop $label$239
+                          (if
+                           (local.tee $3
+                            (i32.load
+                             (local.tee $5
+                              (i32.add
+                               (local.get $0)
+                               (i32.const 20)
+                              )
+                             )
+                            )
+                           )
+                           (block
+                            (local.set $0
+                             (local.get $3)
+                            )
+                            (local.set $1
+                             (local.get $5)
+                            )
+                            (br $label$239)
+                           )
+                          )
+                          (if
+                           (local.tee $3
+                            (i32.load
+                             (local.tee $5
+                              (i32.add
+                               (local.get $0)
+                               (i32.const 16)
+                              )
+                             )
+                            )
+                           )
+                           (block
+                            (local.set $0
+                             (local.get $3)
+                            )
+                            (local.set $1
+                             (local.get $5)
+                            )
+                            (br $label$239)
+                           )
+                          )
+                         )
+                         (if
+                          (i32.lt_u
+                           (local.get $1)
+                           (local.get $2)
+                          )
+                          (call $fimport$10)
+                          (block
+                           (i32.store
+                            (local.get $1)
+                            (i32.const 0)
+                           )
+                           (local.set $12
+                            (local.get $0)
+                           )
+                          )
+                         )
+                        )
+                        (block
+                         (if
+                          (i32.lt_u
+                           (local.tee $5
+                            (i32.load offset=8
+                             (local.get $4)
+                            )
+                           )
+                           (local.get $2)
+                          )
+                          (call $fimport$10)
+                         )
+                         (if
+                          (i32.ne
+                           (i32.load
+                            (local.tee $3
+                             (i32.add
+                              (local.get $5)
+                              (i32.const 12)
+                             )
+                            )
+                           )
+                           (local.get $4)
+                          )
+                          (call $fimport$10)
+                         )
+                         (if
+                          (i32.eq
+                           (i32.load
+                            (local.tee $1
+                             (i32.add
+                              (local.get $0)
+                              (i32.const 8)
+                             )
+                            )
+                           )
+                           (local.get $4)
+                          )
+                          (block
+                           (i32.store
+                            (local.get $3)
+                            (local.get $0)
+                           )
+                           (i32.store
+                            (local.get $1)
+                            (local.get $5)
+                           )
+                           (local.set $12
+                            (local.get $0)
+                           )
+                          )
+                          (call $fimport$10)
+                         )
+                        )
+                       )
+                      )
+                      (br_if $label$222
+                       (i32.eqz
+                        (local.get $8)
+                       )
+                      )
+                      (block $label$249
+                       (if
+                        (i32.eq
+                         (local.get $4)
+                         (i32.load
+                          (local.tee $0
+                           (i32.add
+                            (i32.shl
+                             (local.tee $1
+                              (i32.load offset=28
+                               (local.get $4)
+                              )
+                             )
+                             (i32.const 2)
+                            )
+                            (i32.const 3940)
+                           )
+                          )
+                         )
+                        )
+                        (block
+                         (i32.store
+                          (local.get $0)
+                          (local.get $12)
+                         )
+                         (br_if $label$249
+                          (local.get $12)
+                         )
+                         (i32.store
+                          (i32.const 3640)
+                          (i32.and
+                           (i32.load
+                            (i32.const 3640)
+                           )
+                           (i32.xor
+                            (i32.shl
+                             (i32.const 1)
+                             (local.get $1)
+                            )
+                            (i32.const -1)
+                           )
+                          )
+                         )
+                         (br $label$222)
+                        )
+                        (block
+                         (if
+                          (i32.lt_u
+                           (local.get $8)
+                           (i32.load
+                            (i32.const 3652)
+                           )
+                          )
+                          (call $fimport$10)
+                         )
+                         (if
+                          (i32.eq
+                           (i32.load
+                            (local.tee $0
+                             (i32.add
+                              (local.get $8)
+                              (i32.const 16)
+                             )
+                            )
+                           )
+                           (local.get $4)
+                          )
+                          (i32.store
+                           (local.get $0)
+                           (local.get $12)
+                          )
+                          (i32.store offset=20
+                           (local.get $8)
+                           (local.get $12)
+                          )
+                         )
+                         (br_if $label$222
+                          (i32.eqz
+                           (local.get $12)
+                          )
+                         )
+                        )
+                       )
+                      )
+                      (if
+                       (i32.lt_u
+                        (local.get $12)
+                        (local.tee $1
+                         (i32.load
+                          (i32.const 3652)
+                         )
+                        )
+                       )
+                       (call $fimport$10)
+                      )
+                      (i32.store offset=24
+                       (local.get $12)
+                       (local.get $8)
+                      )
+                      (if
+                       (local.tee $3
+                        (i32.load
+                         (local.tee $0
+                          (i32.add
+                           (local.get $4)
+                           (i32.const 16)
+                          )
+                         )
+                        )
+                       )
+                       (if
+                        (i32.lt_u
+                         (local.get $3)
+                         (local.get $1)
+                        )
+                        (call $fimport$10)
+                        (block
+                         (i32.store offset=16
+                          (local.get $12)
+                          (local.get $3)
+                         )
+                         (i32.store offset=24
+                          (local.get $3)
+                          (local.get $12)
+                         )
+                        )
+                       )
+                      )
+                      (br_if $label$222
+                       (i32.eqz
+                        (local.tee $0
+                         (i32.load offset=4
+                          (local.get $0)
+                         )
+                        )
+                       )
+                      )
+                      (if
+                       (i32.lt_u
+                        (local.get $0)
+                        (i32.load
+                         (i32.const 3652)
+                        )
+                       )
+                       (call $fimport$10)
+                       (block
+                        (i32.store offset=20
+                         (local.get $12)
+                         (local.get $0)
+                        )
+                        (i32.store offset=24
+                         (local.get $0)
+                         (local.get $12)
+                        )
+                       )
+                      )
+                     )
+                    )
+                   )
+                   (local.set $7
+                    (i32.add
+                     (local.get $11)
+                     (local.get $7)
+                    )
+                   )
+                   (i32.add
+                    (local.get $4)
+                    (local.get $11)
+                   )
+                  )
+                  (local.get $4)
+                 )
+                )
+                (i32.const 4)
+               )
+              )
+              (i32.and
+               (i32.load
+                (local.get $0)
+               )
+               (i32.const -2)
+              )
+             )
+             (i32.store offset=4
+              (local.get $6)
+              (i32.or
+               (local.get $7)
+               (i32.const 1)
+              )
+             )
+             (i32.store
+              (i32.add
+               (local.get $6)
+               (local.get $7)
+              )
+              (local.get $7)
+             )
+             (local.set $0
+              (i32.shr_u
+               (local.get $7)
+               (i32.const 3)
+              )
+             )
+             (if
+              (i32.lt_u
+               (local.get $7)
+               (i32.const 256)
+              )
+              (block
+               (local.set $3
+                (i32.add
+                 (i32.shl
+                  (i32.shl
+                   (local.get $0)
+                   (i32.const 1)
+                  )
+                  (i32.const 2)
+                 )
+                 (i32.const 3676)
+                )
+               )
+               (block $label$263
+                (if
+                 (i32.and
+                  (local.tee $1
+                   (i32.load
+                    (i32.const 3636)
+                   )
+                  )
+                  (local.tee $0
+                   (i32.shl
+                    (i32.const 1)
+                    (local.get $0)
+                   )
+                  )
+                 )
+                 (block
+                  (if
+                   (i32.ge_u
+                    (local.tee $0
+                     (i32.load
+                      (local.tee $1
+                       (i32.add
+                        (local.get $3)
+                        (i32.const 8)
+                       )
+                      )
+                     )
+                    )
+                    (i32.load
+                     (i32.const 3652)
+                    )
+                   )
+                   (block
+                    (local.set $21
+                     (local.get $1)
+                    )
+                    (local.set $9
+                     (local.get $0)
+                    )
+                    (br $label$263)
+                   )
+                  )
+                  (call $fimport$10)
+                 )
+                 (block
+                  (i32.store
+                   (i32.const 3636)
+                   (i32.or
+                    (local.get $1)
+                    (local.get $0)
+                   )
+                  )
+                  (local.set $21
+                   (i32.add
+                    (local.get $3)
+                    (i32.const 8)
+                   )
+                  )
+                  (local.set $9
+                   (local.get $3)
+                  )
+                 )
+                )
+               )
+               (i32.store
+                (local.get $21)
+                (local.get $6)
+               )
+               (i32.store offset=12
+                (local.get $9)
+                (local.get $6)
+               )
+               (i32.store offset=8
+                (local.get $6)
+                (local.get $9)
+               )
+               (i32.store offset=12
+                (local.get $6)
+                (local.get $3)
+               )
+               (br $label$217)
+              )
+             )
+             (local.set $3
+              (i32.add
+               (i32.shl
+                (local.tee $2
+                 (block $label$267 (result i32)
+                  (if (result i32)
+                   (local.tee $0
+                    (i32.shr_u
+                     (local.get $7)
+                     (i32.const 8)
+                    )
+                   )
+                   (block (result i32)
+                    (drop
+                     (br_if $label$267
+                      (i32.const 31)
+                      (i32.gt_u
+                       (local.get $7)
+                       (i32.const 16777215)
+                      )
+                     )
+                    )
+                    (i32.or
+                     (i32.and
+                      (i32.shr_u
+                       (local.get $7)
+                       (i32.add
+                        (local.tee $0
+                         (i32.add
+                          (i32.sub
+                           (i32.const 14)
+                           (i32.or
+                            (i32.or
+                             (local.tee $0
+                              (i32.and
+                               (i32.shr_u
+                                (i32.add
+                                 (local.tee $1
+                                  (i32.shl
+                                   (local.get $0)
+                                   (local.tee $3
+                                    (i32.and
+                                     (i32.shr_u
+                                      (i32.add
+                                       (local.get $0)
+                                       (i32.const 1048320)
+                                      )
+                                      (i32.const 16)
+                                     )
+                                     (i32.const 8)
+                                    )
+                                   )
+                                  )
+                                 )
+                                 (i32.const 520192)
+                                )
+                                (i32.const 16)
+                               )
+                               (i32.const 4)
+                              )
+                             )
+                             (local.get $3)
+                            )
+                            (local.tee $0
+                             (i32.and
+                              (i32.shr_u
+                               (i32.add
+                                (local.tee $1
+                                 (i32.shl
+                                  (local.get $1)
+                                  (local.get $0)
+                                 )
+                                )
+                                (i32.const 245760)
+                               )
+                               (i32.const 16)
+                              )
+                              (i32.const 2)
+                             )
+                            )
+                           )
+                          )
+                          (i32.shr_u
+                           (i32.shl
+                            (local.get $1)
+                            (local.get $0)
+                           )
+                           (i32.const 15)
+                          )
+                         )
+                        )
+                        (i32.const 7)
+                       )
+                      )
+                      (i32.const 1)
+                     )
+                     (i32.shl
+                      (local.get $0)
+                      (i32.const 1)
+                     )
+                    )
+                   )
+                   (i32.const 0)
+                  )
+                 )
+                )
+                (i32.const 2)
+               )
+               (i32.const 3940)
+              )
+             )
+             (i32.store offset=28
+              (local.get $6)
+              (local.get $2)
+             )
+             (i32.store offset=4
+              (local.tee $0
+               (i32.add
+                (local.get $6)
+                (i32.const 16)
+               )
+              )
+              (i32.const 0)
+             )
+             (i32.store
+              (local.get $0)
+              (i32.const 0)
+             )
+             (if
+              (i32.eqz
+               (i32.and
+                (local.tee $1
+                 (i32.load
+                  (i32.const 3640)
+                 )
+                )
+                (local.tee $0
+                 (i32.shl
+                  (i32.const 1)
+                  (local.get $2)
+                 )
+                )
+               )
+              )
+              (block
+               (i32.store
+                (i32.const 3640)
+                (i32.or
+                 (local.get $1)
+                 (local.get $0)
+                )
+               )
+               (i32.store
+                (local.get $3)
+                (local.get $6)
+               )
+               (i32.store offset=24
+                (local.get $6)
+                (local.get $3)
+               )
+               (i32.store offset=12
+                (local.get $6)
+                (local.get $6)
+               )
+               (i32.store offset=8
+                (local.get $6)
+                (local.get $6)
+               )
+               (br $label$217)
+              )
+             )
+             (local.set $0
+              (i32.load
+               (local.get $3)
+              )
+             )
+             (local.set $1
+              (i32.sub
+               (i32.const 25)
+               (i32.shr_u
+                (local.get $2)
+                (i32.const 1)
+               )
+              )
+             )
+             (local.set $2
+              (i32.shl
+               (local.get $7)
+               (if (result i32)
+                (i32.eq
+                 (local.get $2)
+                 (i32.const 31)
+                )
+                (i32.const 0)
+                (local.get $1)
+               )
+              )
+             )
+             (block $label$273
+              (block $label$274
+               (block $label$275
+                (loop $label$276
+                 (br_if $label$274
+                  (i32.eq
+                   (i32.and
+                    (i32.load offset=4
+                     (local.get $0)
+                    )
+                    (i32.const -8)
+                   )
+                   (local.get $7)
+                  )
+                 )
+                 (local.set $3
+                  (i32.shl
+                   (local.get $2)
+                   (i32.const 1)
+                  )
+                 )
+                 (br_if $label$275
+                  (i32.eqz
+                   (local.tee $1
+                    (i32.load
+                     (local.tee $2
+                      (i32.add
+                       (i32.add
+                        (local.get $0)
+                        (i32.const 16)
+                       )
+                       (i32.shl
+                        (i32.shr_u
+                         (local.get $2)
+                         (i32.const 31)
+                        )
+                        (i32.const 2)
+                       )
+                      )
+                     )
+                    )
+                   )
+                  )
+                 )
+                 (local.set $2
+                  (local.get $3)
+                 )
+                 (local.set $0
+                  (local.get $1)
+                 )
+                 (br $label$276)
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.get $2)
+                 (i32.load
+                  (i32.const 3652)
+                 )
+                )
+                (call $fimport$10)
+                (block
+                 (i32.store
+                  (local.get $2)
+                  (local.get $6)
+                 )
+                 (i32.store offset=24
+                  (local.get $6)
+                  (local.get $0)
+                 )
+                 (i32.store offset=12
+                  (local.get $6)
+                  (local.get $6)
+                 )
+                 (i32.store offset=8
+                  (local.get $6)
+                  (local.get $6)
+                 )
+                 (br $label$217)
+                )
+               )
+               (br $label$273)
+              )
+              (if
+               (i32.and
+                (i32.ge_u
+                 (local.tee $2
+                  (i32.load
+                   (local.tee $3
+                    (i32.add
+                     (local.get $0)
+                     (i32.const 8)
+                    )
+                   )
+                  )
+                 )
+                 (local.tee $1
+                  (i32.load
+                   (i32.const 3652)
+                  )
+                 )
+                )
+                (i32.ge_u
+                 (local.get $0)
+                 (local.get $1)
+                )
+               )
+               (block
+                (i32.store offset=12
+                 (local.get $2)
+                 (local.get $6)
+                )
+                (i32.store
+                 (local.get $3)
+                 (local.get $6)
+                )
+                (i32.store offset=8
+                 (local.get $6)
+                 (local.get $2)
+                )
+                (i32.store offset=12
+                 (local.get $6)
+                 (local.get $0)
+                )
+                (i32.store offset=24
+                 (local.get $6)
+                 (i32.const 0)
+                )
+               )
+               (call $fimport$10)
+              )
+             )
+            )
+           )
+          )
+          (global.set $global$1
+           (local.get $14)
+          )
+          (return
+           (i32.add
+            (local.get $13)
+            (i32.const 8)
+           )
+          )
+         )
+        )
+       )
+       (loop $label$281
+        (block $label$282
+         (if
+          (i32.le_u
+           (local.tee $2
+            (i32.load
+             (local.get $5)
+            )
+           )
+           (local.get $8)
+          )
+          (br_if $label$282
+           (i32.gt_u
+            (local.tee $13
+             (i32.add
+              (local.get $2)
+              (i32.load offset=4
+               (local.get $5)
+              )
+             )
+            )
+            (local.get $8)
+           )
+          )
+         )
+         (local.set $5
+          (i32.load offset=8
+           (local.get $5)
+          )
+         )
+         (br $label$281)
+        )
+       )
+       (local.set $2
+        (i32.and
+         (i32.sub
+          (i32.const 0)
+          (local.tee $5
+           (i32.add
+            (local.tee $7
+             (i32.add
+              (local.get $13)
+              (i32.const -47)
+             )
+            )
+            (i32.const 8)
+           )
+          )
+         )
+         (i32.const 7)
+        )
+       )
+       (local.set $10
+        (i32.add
+         (local.tee $7
+          (if (result i32)
+           (i32.lt_u
+            (local.tee $2
+             (i32.add
+              (local.get $7)
+              (if (result i32)
+               (i32.and
+                (local.get $5)
+                (i32.const 7)
+               )
+               (local.get $2)
+               (i32.const 0)
+              )
+             )
+            )
+            (local.tee $12
+             (i32.add
+              (local.get $8)
+              (i32.const 16)
+             )
+            )
+           )
+           (local.get $8)
+           (local.get $2)
+          )
+         )
+         (i32.const 8)
+        )
+       )
+       (local.set $5
+        (i32.add
+         (local.get $7)
+         (i32.const 24)
+        )
+       )
+       (local.set $9
+        (i32.add
+         (local.get $3)
+         (i32.const -40)
+        )
+       )
+       (local.set $2
+        (i32.and
+         (i32.sub
+          (i32.const 0)
+          (local.tee $4
+           (i32.add
+            (local.get $1)
+            (i32.const 8)
+           )
+          )
+         )
+         (i32.const 7)
+        )
+       )
+       (i32.store
+        (i32.const 3660)
+        (local.tee $4
+         (i32.add
+          (local.get $1)
+          (if (result i32)
+           (i32.and
+            (local.get $4)
+            (i32.const 7)
+           )
+           (local.get $2)
+           (local.tee $2
+            (i32.const 0)
+           )
+          )
+         )
+        )
+       )
+       (i32.store
+        (i32.const 3648)
+        (local.tee $2
+         (i32.sub
+          (local.get $9)
+          (local.get $2)
+         )
+        )
+       )
+       (i32.store offset=4
+        (local.get $4)
+        (i32.or
+         (local.get $2)
+         (i32.const 1)
+        )
+       )
+       (i32.store offset=4
+        (i32.add
+         (local.get $4)
+         (local.get $2)
+        )
+        (i32.const 40)
+       )
+       (i32.store
+        (i32.const 3664)
+        (i32.load
+         (i32.const 4124)
+        )
+       )
+       (i32.store
+        (local.tee $2
+         (i32.add
+          (local.get $7)
+          (i32.const 4)
+         )
+        )
+        (i32.const 27)
+       )
+       (i64.store align=4
+        (local.get $10)
+        (i64.load align=4
+         (i32.const 4084)
+        )
+       )
+       (i64.store offset=8 align=4
+        (local.get $10)
+        (i64.load align=4
+         (i32.const 4092)
+        )
+       )
+       (i32.store
+        (i32.const 4084)
+        (local.get $1)
+       )
+       (i32.store
+        (i32.const 4088)
+        (local.get $3)
+       )
+       (i32.store
+        (i32.const 4096)
+        (i32.const 0)
+       )
+       (i32.store
+        (i32.const 4092)
+        (local.get $10)
+       )
+       (local.set $1
+        (local.get $5)
+       )
+       (loop $label$290
+        (i32.store
+         (local.tee $1
+          (i32.add
+           (local.get $1)
+           (i32.const 4)
+          )
+         )
+         (i32.const 7)
+        )
+        (br_if $label$290
+         (i32.lt_u
+          (i32.add
+           (local.get $1)
+           (i32.const 4)
+          )
+          (local.get $13)
+         )
+        )
+       )
+       (if
+        (i32.ne
+         (local.get $7)
+         (local.get $8)
+        )
+        (block
+         (i32.store
+          (local.get $2)
+          (i32.and
+           (i32.load
+            (local.get $2)
+           )
+           (i32.const -2)
+          )
+         )
+         (i32.store offset=4
+          (local.get $8)
+          (i32.or
+           (local.tee $4
+            (i32.sub
+             (local.get $7)
+             (local.get $8)
+            )
+           )
+           (i32.const 1)
+          )
+         )
+         (i32.store
+          (local.get $7)
+          (local.get $4)
+         )
+         (local.set $1
+          (i32.shr_u
+           (local.get $4)
+           (i32.const 3)
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.get $4)
+           (i32.const 256)
+          )
+          (block
+           (local.set $2
+            (i32.add
+             (i32.shl
+              (i32.shl
+               (local.get $1)
+               (i32.const 1)
+              )
+              (i32.const 2)
+             )
+             (i32.const 3676)
+            )
+           )
+           (if
+            (i32.and
+             (local.tee $3
+              (i32.load
+               (i32.const 3636)
+              )
+             )
+             (local.tee $1
+              (i32.shl
+               (i32.const 1)
+               (local.get $1)
+              )
+             )
+            )
+            (if
+             (i32.lt_u
+              (local.tee $1
+               (i32.load
+                (local.tee $3
+                 (i32.add
+                  (local.get $2)
+                  (i32.const 8)
+                 )
+                )
+               )
+              )
+              (i32.load
+               (i32.const 3652)
+              )
+             )
+             (call $fimport$10)
+             (block
+              (local.set $15
+               (local.get $3)
+              )
+              (local.set $11
+               (local.get $1)
+              )
+             )
+            )
+            (block
+             (i32.store
+              (i32.const 3636)
+              (i32.or
+               (local.get $3)
+               (local.get $1)
+              )
+             )
+             (local.set $15
+              (i32.add
+               (local.get $2)
+               (i32.const 8)
+              )
+             )
+             (local.set $11
+              (local.get $2)
+             )
+            )
+           )
+           (i32.store
+            (local.get $15)
+            (local.get $8)
+           )
+           (i32.store offset=12
+            (local.get $11)
+            (local.get $8)
+           )
+           (i32.store offset=8
+            (local.get $8)
+            (local.get $11)
+           )
+           (i32.store offset=12
+            (local.get $8)
+            (local.get $2)
+           )
+           (br $label$198)
+          )
+         )
+         (local.set $2
+          (i32.add
+           (i32.shl
+            (local.tee $5
+             (if (result i32)
+              (local.tee $1
+               (i32.shr_u
+                (local.get $4)
+                (i32.const 8)
+               )
+              )
+              (if (result i32)
+               (i32.gt_u
+                (local.get $4)
+                (i32.const 16777215)
+               )
+               (i32.const 31)
+               (i32.or
+                (i32.and
+                 (i32.shr_u
+                  (local.get $4)
+                  (i32.add
+                   (local.tee $1
+                    (i32.add
+                     (i32.sub
+                      (i32.const 14)
+                      (i32.or
+                       (i32.or
+                        (local.tee $1
+                         (i32.and
+                          (i32.shr_u
+                           (i32.add
+                            (local.tee $3
+                             (i32.shl
+                              (local.get $1)
+                              (local.tee $2
+                               (i32.and
+                                (i32.shr_u
+                                 (i32.add
+                                  (local.get $1)
+                                  (i32.const 1048320)
+                                 )
+                                 (i32.const 16)
+                                )
+                                (i32.const 8)
+                               )
+                              )
+                             )
+                            )
+                            (i32.const 520192)
+                           )
+                           (i32.const 16)
+                          )
+                          (i32.const 4)
+                         )
+                        )
+                        (local.get $2)
+                       )
+                       (local.tee $1
+                        (i32.and
+                         (i32.shr_u
+                          (i32.add
+                           (local.tee $3
+                            (i32.shl
+                             (local.get $3)
+                             (local.get $1)
+                            )
+                           )
+                           (i32.const 245760)
+                          )
+                          (i32.const 16)
+                         )
+                         (i32.const 2)
+                        )
+                       )
+                      )
+                     )
+                     (i32.shr_u
+                      (i32.shl
+                       (local.get $3)
+                       (local.get $1)
+                      )
+                      (i32.const 15)
+                     )
+                    )
+                   )
+                   (i32.const 7)
+                  )
+                 )
+                 (i32.const 1)
+                )
+                (i32.shl
+                 (local.get $1)
+                 (i32.const 1)
+                )
+               )
+              )
+              (i32.const 0)
+             )
+            )
+            (i32.const 2)
+           )
+           (i32.const 3940)
+          )
+         )
+         (i32.store offset=28
+          (local.get $8)
+          (local.get $5)
+         )
+         (i32.store offset=20
+          (local.get $8)
+          (i32.const 0)
+         )
+         (i32.store
+          (local.get $12)
+          (i32.const 0)
+         )
+         (if
+          (i32.eqz
+           (i32.and
+            (local.tee $3
+             (i32.load
+              (i32.const 3640)
+             )
+            )
+            (local.tee $1
+             (i32.shl
+              (i32.const 1)
+              (local.get $5)
+             )
+            )
+           )
+          )
+          (block
+           (i32.store
+            (i32.const 3640)
+            (i32.or
+             (local.get $3)
+             (local.get $1)
+            )
+           )
+           (i32.store
+            (local.get $2)
+            (local.get $8)
+           )
+           (i32.store offset=24
+            (local.get $8)
+            (local.get $2)
+           )
+           (i32.store offset=12
+            (local.get $8)
+            (local.get $8)
+           )
+           (i32.store offset=8
+            (local.get $8)
+            (local.get $8)
+           )
+           (br $label$198)
+          )
+         )
+         (local.set $1
+          (i32.load
+           (local.get $2)
+          )
+         )
+         (local.set $3
+          (i32.sub
+           (i32.const 25)
+           (i32.shr_u
+            (local.get $5)
+            (i32.const 1)
+           )
+          )
+         )
+         (local.set $5
+          (i32.shl
+           (local.get $4)
+           (if (result i32)
+            (i32.eq
+             (local.get $5)
+             (i32.const 31)
+            )
+            (i32.const 0)
+            (local.get $3)
+           )
+          )
+         )
+         (block $label$304
+          (block $label$305
+           (block $label$306
+            (loop $label$307
+             (br_if $label$305
+              (i32.eq
+               (i32.and
+                (i32.load offset=4
+                 (local.get $1)
+                )
+                (i32.const -8)
+               )
+               (local.get $4)
+              )
+             )
+             (local.set $2
+              (i32.shl
+               (local.get $5)
+               (i32.const 1)
+              )
+             )
+             (br_if $label$306
+              (i32.eqz
+               (local.tee $3
+                (i32.load
+                 (local.tee $5
+                  (i32.add
+                   (i32.add
+                    (local.get $1)
+                    (i32.const 16)
+                   )
+                   (i32.shl
+                    (i32.shr_u
+                     (local.get $5)
+                     (i32.const 31)
+                    )
+                    (i32.const 2)
+                   )
+                  )
+                 )
+                )
+               )
+              )
+             )
+             (local.set $5
+              (local.get $2)
+             )
+             (local.set $1
+              (local.get $3)
+             )
+             (br $label$307)
+            )
+           )
+           (if
+            (i32.lt_u
+             (local.get $5)
+             (i32.load
+              (i32.const 3652)
+             )
+            )
+            (call $fimport$10)
+            (block
+             (i32.store
+              (local.get $5)
+              (local.get $8)
+             )
+             (i32.store offset=24
+              (local.get $8)
+              (local.get $1)
+             )
+             (i32.store offset=12
+              (local.get $8)
+              (local.get $8)
+             )
+             (i32.store offset=8
+              (local.get $8)
+              (local.get $8)
+             )
+             (br $label$198)
+            )
+           )
+           (br $label$304)
+          )
+          (if
+           (i32.and
+            (i32.ge_u
+             (local.tee $5
+              (i32.load
+               (local.tee $2
+                (i32.add
+                 (local.get $1)
+                 (i32.const 8)
+                )
+               )
+              )
+             )
+             (local.tee $3
+              (i32.load
+               (i32.const 3652)
+              )
+             )
+            )
+            (i32.ge_u
+             (local.get $1)
+             (local.get $3)
+            )
+           )
+           (block
+            (i32.store offset=12
+             (local.get $5)
+             (local.get $8)
+            )
+            (i32.store
+             (local.get $2)
+             (local.get $8)
+            )
+            (i32.store offset=8
+             (local.get $8)
+             (local.get $5)
+            )
+            (i32.store offset=12
+             (local.get $8)
+             (local.get $1)
+            )
+            (i32.store offset=24
+             (local.get $8)
+             (i32.const 0)
+            )
+           )
+           (call $fimport$10)
+          )
+         )
+        )
+       )
+      )
+      (block
+       (if
+        (i32.or
+         (i32.eqz
+          (local.tee $2
+           (i32.load
+            (i32.const 3652)
+           )
+          )
+         )
+         (i32.lt_u
+          (local.get $1)
+          (local.get $2)
+         )
+        )
+        (i32.store
+         (i32.const 3652)
+         (local.get $1)
+        )
+       )
+       (i32.store
+        (i32.const 4084)
+        (local.get $1)
+       )
+       (i32.store
+        (i32.const 4088)
+        (local.get $3)
+       )
+       (i32.store
+        (i32.const 4096)
+        (i32.const 0)
+       )
+       (i32.store
+        (i32.const 3672)
+        (i32.load
+         (i32.const 4108)
+        )
+       )
+       (i32.store
+        (i32.const 3668)
+        (i32.const -1)
+       )
+       (local.set $2
+        (i32.const 0)
+       )
+       (loop $label$314
+        (i32.store offset=12
+         (local.tee $5
+          (i32.add
+           (i32.shl
+            (i32.shl
+             (local.get $2)
+             (i32.const 1)
+            )
+            (i32.const 2)
+           )
+           (i32.const 3676)
+          )
+         )
+         (local.get $5)
+        )
+        (i32.store offset=8
+         (local.get $5)
+         (local.get $5)
+        )
+        (br_if $label$314
+         (i32.ne
+          (local.tee $2
+           (i32.add
+            (local.get $2)
+            (i32.const 1)
+           )
+          )
+          (i32.const 32)
+         )
+        )
+       )
+       (local.set $5
+        (i32.add
+         (local.get $3)
+         (i32.const -40)
+        )
+       )
+       (local.set $3
+        (i32.and
+         (i32.sub
+          (i32.const 0)
+          (local.tee $2
+           (i32.add
+            (local.get $1)
+            (i32.const 8)
+           )
+          )
+         )
+         (i32.const 7)
+        )
+       )
+       (i32.store
+        (i32.const 3660)
+        (local.tee $3
+         (i32.add
+          (local.get $1)
+          (local.tee $1
+           (if (result i32)
+            (i32.and
+             (local.get $2)
+             (i32.const 7)
+            )
+            (local.get $3)
+            (i32.const 0)
+           )
+          )
+         )
+        )
+       )
+       (i32.store
+        (i32.const 3648)
+        (local.tee $1
+         (i32.sub
+          (local.get $5)
+          (local.get $1)
+         )
+        )
+       )
+       (i32.store offset=4
+        (local.get $3)
+        (i32.or
+         (local.get $1)
+         (i32.const 1)
+        )
+       )
+       (i32.store offset=4
+        (i32.add
+         (local.get $3)
+         (local.get $1)
+        )
+        (i32.const 40)
+       )
+       (i32.store
+        (i32.const 3664)
+        (i32.load
+         (i32.const 4124)
+        )
+       )
+      )
+     )
+    )
+    (if
+     (i32.gt_u
+      (local.tee $1
+       (i32.load
+        (i32.const 3648)
+       )
+      )
+      (local.get $0)
+     )
+     (block
+      (i32.store
+       (i32.const 3648)
+       (local.tee $3
+        (i32.sub
+         (local.get $1)
+         (local.get $0)
+        )
+       )
+      )
+      (i32.store
+       (i32.const 3660)
+       (local.tee $1
+        (i32.add
+         (local.tee $2
+          (i32.load
+           (i32.const 3660)
+          )
+         )
+         (local.get $0)
+        )
+       )
+      )
+      (i32.store offset=4
+       (local.get $1)
+       (i32.or
+        (local.get $3)
+        (i32.const 1)
+       )
+      )
+      (i32.store offset=4
+       (local.get $2)
+       (i32.or
+        (local.get $0)
+        (i32.const 3)
+       )
+      )
+      (global.set $global$1
+       (local.get $14)
+      )
+      (return
+       (i32.add
+        (local.get $2)
+        (i32.const 8)
+       )
+      )
+     )
+    )
+   )
+   (i32.store
+    (call $12)
+    (i32.const 12)
+   )
+   (global.set $global$1
+    (local.get $14)
+   )
+   (i32.const 0)
   )
-  (func $33 (;46;) (type $12) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
-    (local $4 i32) (local $5 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $2
-      local.get $1
-      i32.mul
-      local.set $4
-      local.get $3
-      i32.load offset=76
-      i32.const -1
-      i32.gt_s
-      if ;; label = @2
-        block ;; label = @3
-          local.get $3
-          call $20
-          i32.eqz
-          local.set $5
-          local.get $0
-          local.get $4
-          local.get $3
-          call $21
-          local.set $0
-          local.get $5
-          i32.eqz
-          if ;; label = @4
-            local.get $3
-            call $13
-          end
-        end
-      else
-        local.get $0
-        local.get $4
-        local.get $3
-        call $21
-        local.set $0
-      end
-      local.get $0
-      local.get $4
-      i32.ne
-      if ;; label = @2
-        local.get $0
-        local.get $1
-        i32.div_u
-        local.set $2
-      end
-      local.get $2
-    end
+ )
+ (func $38 (; 51 ;) (type $2) (param $0 i32)
+  (local $1 i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (local $15 i32)
+  (block $label$1
+   (if
+    (i32.eqz
+     (local.get $0)
+    )
+    (return)
+   )
+   (if
+    (i32.lt_u
+     (local.tee $1
+      (i32.add
+       (local.get $0)
+       (i32.const -8)
+      )
+     )
+     (local.tee $11
+      (i32.load
+       (i32.const 3652)
+      )
+     )
+    )
+    (call $fimport$10)
+   )
+   (if
+    (i32.eq
+     (local.tee $8
+      (i32.and
+       (local.tee $0
+        (i32.load
+         (i32.add
+          (local.get $0)
+          (i32.const -4)
+         )
+        )
+       )
+       (i32.const 3)
+      )
+     )
+     (i32.const 1)
+    )
+    (call $fimport$10)
+   )
+   (local.set $6
+    (i32.add
+     (local.get $1)
+     (local.tee $4
+      (i32.and
+       (local.get $0)
+       (i32.const -8)
+      )
+     )
+    )
+   )
+   (block $label$5
+    (if
+     (i32.and
+      (local.get $0)
+      (i32.const 1)
+     )
+     (block
+      (local.set $3
+       (local.get $1)
+      )
+      (local.set $2
+       (local.get $4)
+      )
+     )
+     (block
+      (if
+       (i32.eqz
+        (local.get $8)
+       )
+       (return)
+      )
+      (if
+       (i32.lt_u
+        (local.tee $0
+         (i32.add
+          (local.get $1)
+          (i32.sub
+           (i32.const 0)
+           (local.tee $8
+            (i32.load
+             (local.get $1)
+            )
+           )
+          )
+         )
+        )
+        (local.get $11)
+       )
+       (call $fimport$10)
+      )
+      (local.set $1
+       (i32.add
+        (local.get $8)
+        (local.get $4)
+       )
+      )
+      (if
+       (i32.eq
+        (local.get $0)
+        (i32.load
+         (i32.const 3656)
+        )
+       )
+       (block
+        (if
+         (i32.ne
+          (i32.and
+           (local.tee $3
+            (i32.load
+             (local.tee $2
+              (i32.add
+               (local.get $6)
+               (i32.const 4)
+              )
+             )
+            )
+           )
+           (i32.const 3)
+          )
+          (i32.const 3)
+         )
+         (block
+          (local.set $3
+           (local.get $0)
+          )
+          (local.set $2
+           (local.get $1)
+          )
+          (br $label$5)
+         )
+        )
+        (i32.store
+         (i32.const 3644)
+         (local.get $1)
+        )
+        (i32.store
+         (local.get $2)
+         (i32.and
+          (local.get $3)
+          (i32.const -2)
+         )
+        )
+        (i32.store offset=4
+         (local.get $0)
+         (i32.or
+          (local.get $1)
+          (i32.const 1)
+         )
+        )
+        (i32.store
+         (i32.add
+          (local.get $0)
+          (local.get $1)
+         )
+         (local.get $1)
+        )
+        (return)
+       )
+      )
+      (local.set $10
+       (i32.shr_u
+        (local.get $8)
+        (i32.const 3)
+       )
+      )
+      (if
+       (i32.lt_u
+        (local.get $8)
+        (i32.const 256)
+       )
+       (block
+        (local.set $3
+         (i32.load offset=12
+          (local.get $0)
+         )
+        )
+        (if
+         (i32.ne
+          (local.tee $4
+           (i32.load offset=8
+            (local.get $0)
+           )
+          )
+          (local.tee $2
+           (i32.add
+            (i32.shl
+             (i32.shl
+              (local.get $10)
+              (i32.const 1)
+             )
+             (i32.const 2)
+            )
+            (i32.const 3676)
+           )
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $4)
+            (local.get $11)
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.ne
+            (i32.load offset=12
+             (local.get $4)
+            )
+            (local.get $0)
+           )
+           (call $fimport$10)
+          )
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $3)
+          (local.get $4)
+         )
+         (block
+          (i32.store
+           (i32.const 3636)
+           (i32.and
+            (i32.load
+             (i32.const 3636)
+            )
+            (i32.xor
+             (i32.shl
+              (i32.const 1)
+              (local.get $10)
+             )
+             (i32.const -1)
+            )
+           )
+          )
+          (local.set $3
+           (local.get $0)
+          )
+          (local.set $2
+           (local.get $1)
+          )
+          (br $label$5)
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $3)
+          (local.get $2)
+         )
+         (local.set $5
+          (i32.add
+           (local.get $3)
+           (i32.const 8)
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $3)
+            (local.get $11)
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.eq
+            (i32.load
+             (local.tee $2
+              (i32.add
+               (local.get $3)
+               (i32.const 8)
+              )
+             )
+            )
+            (local.get $0)
+           )
+           (local.set $5
+            (local.get $2)
+           )
+           (call $fimport$10)
+          )
+         )
+        )
+        (i32.store offset=12
+         (local.get $4)
+         (local.get $3)
+        )
+        (i32.store
+         (local.get $5)
+         (local.get $4)
+        )
+        (local.set $3
+         (local.get $0)
+        )
+        (local.set $2
+         (local.get $1)
+        )
+        (br $label$5)
+       )
+      )
+      (local.set $12
+       (i32.load offset=24
+        (local.get $0)
+       )
+      )
+      (block $label$22
+       (if
+        (i32.eq
+         (local.tee $4
+          (i32.load offset=12
+           (local.get $0)
+          )
+         )
+         (local.get $0)
+        )
+        (block
+         (if
+          (local.tee $4
+           (i32.load
+            (local.tee $8
+             (i32.add
+              (local.tee $5
+               (i32.add
+                (local.get $0)
+                (i32.const 16)
+               )
+              )
+              (i32.const 4)
+             )
+            )
+           )
+          )
+          (local.set $5
+           (local.get $8)
+          )
+          (if
+           (i32.eqz
+            (local.tee $4
+             (i32.load
+              (local.get $5)
+             )
+            )
+           )
+           (block
+            (local.set $7
+             (i32.const 0)
+            )
+            (br $label$22)
+           )
+          )
+         )
+         (loop $label$27
+          (if
+           (local.tee $10
+            (i32.load
+             (local.tee $8
+              (i32.add
+               (local.get $4)
+               (i32.const 20)
+              )
+             )
+            )
+           )
+           (block
+            (local.set $4
+             (local.get $10)
+            )
+            (local.set $5
+             (local.get $8)
+            )
+            (br $label$27)
+           )
+          )
+          (if
+           (local.tee $10
+            (i32.load
+             (local.tee $8
+              (i32.add
+               (local.get $4)
+               (i32.const 16)
+              )
+             )
+            )
+           )
+           (block
+            (local.set $4
+             (local.get $10)
+            )
+            (local.set $5
+             (local.get $8)
+            )
+            (br $label$27)
+           )
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.get $5)
+           (local.get $11)
+          )
+          (call $fimport$10)
+          (block
+           (i32.store
+            (local.get $5)
+            (i32.const 0)
+           )
+           (local.set $7
+            (local.get $4)
+           )
+          )
+         )
+        )
+        (block
+         (if
+          (i32.lt_u
+           (local.tee $5
+            (i32.load offset=8
+             (local.get $0)
+            )
+           )
+           (local.get $11)
+          )
+          (call $fimport$10)
+         )
+         (if
+          (i32.ne
+           (i32.load
+            (local.tee $8
+             (i32.add
+              (local.get $5)
+              (i32.const 12)
+             )
+            )
+           )
+           (local.get $0)
+          )
+          (call $fimport$10)
+         )
+         (if
+          (i32.eq
+           (i32.load
+            (local.tee $10
+             (i32.add
+              (local.get $4)
+              (i32.const 8)
+             )
+            )
+           )
+           (local.get $0)
+          )
+          (block
+           (i32.store
+            (local.get $8)
+            (local.get $4)
+           )
+           (i32.store
+            (local.get $10)
+            (local.get $5)
+           )
+           (local.set $7
+            (local.get $4)
+           )
+          )
+          (call $fimport$10)
+         )
+        )
+       )
+      )
+      (if
+       (local.get $12)
+       (block
+        (if
+         (i32.eq
+          (local.get $0)
+          (i32.load
+           (local.tee $5
+            (i32.add
+             (i32.shl
+              (local.tee $4
+               (i32.load offset=28
+                (local.get $0)
+               )
+              )
+              (i32.const 2)
+             )
+             (i32.const 3940)
+            )
+           )
+          )
+         )
+         (block
+          (i32.store
+           (local.get $5)
+           (local.get $7)
+          )
+          (if
+           (i32.eqz
+            (local.get $7)
+           )
+           (block
+            (i32.store
+             (i32.const 3640)
+             (i32.and
+              (i32.load
+               (i32.const 3640)
+              )
+              (i32.xor
+               (i32.shl
+                (i32.const 1)
+                (local.get $4)
+               )
+               (i32.const -1)
+              )
+             )
+            )
+            (local.set $3
+             (local.get $0)
+            )
+            (local.set $2
+             (local.get $1)
+            )
+            (br $label$5)
+           )
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $12)
+            (i32.load
+             (i32.const 3652)
+            )
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.eq
+            (i32.load
+             (local.tee $4
+              (i32.add
+               (local.get $12)
+               (i32.const 16)
+              )
+             )
+            )
+            (local.get $0)
+           )
+           (i32.store
+            (local.get $4)
+            (local.get $7)
+           )
+           (i32.store offset=20
+            (local.get $12)
+            (local.get $7)
+           )
+          )
+          (if
+           (i32.eqz
+            (local.get $7)
+           )
+           (block
+            (local.set $3
+             (local.get $0)
+            )
+            (local.set $2
+             (local.get $1)
+            )
+            (br $label$5)
+           )
+          )
+         )
+        )
+        (if
+         (i32.lt_u
+          (local.get $7)
+          (local.tee $5
+           (i32.load
+            (i32.const 3652)
+           )
+          )
+         )
+         (call $fimport$10)
+        )
+        (i32.store offset=24
+         (local.get $7)
+         (local.get $12)
+        )
+        (if
+         (local.tee $4
+          (i32.load
+           (local.tee $8
+            (i32.add
+             (local.get $0)
+             (i32.const 16)
+            )
+           )
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.get $4)
+           (local.get $5)
+          )
+          (call $fimport$10)
+          (block
+           (i32.store offset=16
+            (local.get $7)
+            (local.get $4)
+           )
+           (i32.store offset=24
+            (local.get $4)
+            (local.get $7)
+           )
+          )
+         )
+        )
+        (if
+         (local.tee $4
+          (i32.load offset=4
+           (local.get $8)
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.get $4)
+           (i32.load
+            (i32.const 3652)
+           )
+          )
+          (call $fimport$10)
+          (block
+           (i32.store offset=20
+            (local.get $7)
+            (local.get $4)
+           )
+           (i32.store offset=24
+            (local.get $4)
+            (local.get $7)
+           )
+           (local.set $3
+            (local.get $0)
+           )
+           (local.set $2
+            (local.get $1)
+           )
+          )
+         )
+         (block
+          (local.set $3
+           (local.get $0)
+          )
+          (local.set $2
+           (local.get $1)
+          )
+         )
+        )
+       )
+       (block
+        (local.set $3
+         (local.get $0)
+        )
+        (local.set $2
+         (local.get $1)
+        )
+       )
+      )
+     )
+    )
+   )
+   (if
+    (i32.ge_u
+     (local.get $3)
+     (local.get $6)
+    )
+    (call $fimport$10)
+   )
+   (if
+    (i32.eqz
+     (i32.and
+      (local.tee $0
+       (i32.load
+        (local.tee $1
+         (i32.add
+          (local.get $6)
+          (i32.const 4)
+         )
+        )
+       )
+      )
+      (i32.const 1)
+     )
+    )
+    (call $fimport$10)
+   )
+   (if
+    (i32.and
+     (local.get $0)
+     (i32.const 2)
+    )
+    (block
+     (i32.store
+      (local.get $1)
+      (i32.and
+       (local.get $0)
+       (i32.const -2)
+      )
+     )
+     (i32.store offset=4
+      (local.get $3)
+      (i32.or
+       (local.get $2)
+       (i32.const 1)
+      )
+     )
+     (i32.store
+      (i32.add
+       (local.get $3)
+       (local.get $2)
+      )
+      (local.get $2)
+     )
+    )
+    (block
+     (if
+      (i32.eq
+       (local.get $6)
+       (i32.load
+        (i32.const 3660)
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 3648)
+        (local.tee $0
+         (i32.add
+          (i32.load
+           (i32.const 3648)
+          )
+          (local.get $2)
+         )
+        )
+       )
+       (i32.store
+        (i32.const 3660)
+        (local.get $3)
+       )
+       (i32.store offset=4
+        (local.get $3)
+        (i32.or
+         (local.get $0)
+         (i32.const 1)
+        )
+       )
+       (if
+        (i32.ne
+         (local.get $3)
+         (i32.load
+          (i32.const 3656)
+         )
+        )
+        (return)
+       )
+       (i32.store
+        (i32.const 3656)
+        (i32.const 0)
+       )
+       (i32.store
+        (i32.const 3644)
+        (i32.const 0)
+       )
+       (return)
+      )
+     )
+     (if
+      (i32.eq
+       (local.get $6)
+       (i32.load
+        (i32.const 3656)
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 3644)
+        (local.tee $0
+         (i32.add
+          (i32.load
+           (i32.const 3644)
+          )
+          (local.get $2)
+         )
+        )
+       )
+       (i32.store
+        (i32.const 3656)
+        (local.get $3)
+       )
+       (i32.store offset=4
+        (local.get $3)
+        (i32.or
+         (local.get $0)
+         (i32.const 1)
+        )
+       )
+       (i32.store
+        (i32.add
+         (local.get $3)
+         (local.get $0)
+        )
+        (local.get $0)
+       )
+       (return)
+      )
+     )
+     (local.set $5
+      (i32.add
+       (i32.and
+        (local.get $0)
+        (i32.const -8)
+       )
+       (local.get $2)
+      )
+     )
+     (local.set $4
+      (i32.shr_u
+       (local.get $0)
+       (i32.const 3)
+      )
+     )
+     (block $label$61
+      (if
+       (i32.lt_u
+        (local.get $0)
+        (i32.const 256)
+       )
+       (block
+        (local.set $2
+         (i32.load offset=12
+          (local.get $6)
+         )
+        )
+        (if
+         (i32.ne
+          (local.tee $1
+           (i32.load offset=8
+            (local.get $6)
+           )
+          )
+          (local.tee $0
+           (i32.add
+            (i32.shl
+             (i32.shl
+              (local.get $4)
+              (i32.const 1)
+             )
+             (i32.const 2)
+            )
+            (i32.const 3676)
+           )
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $1)
+            (i32.load
+             (i32.const 3652)
+            )
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.ne
+            (i32.load offset=12
+             (local.get $1)
+            )
+            (local.get $6)
+           )
+           (call $fimport$10)
+          )
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $2)
+          (local.get $1)
+         )
+         (block
+          (i32.store
+           (i32.const 3636)
+           (i32.and
+            (i32.load
+             (i32.const 3636)
+            )
+            (i32.xor
+             (i32.shl
+              (i32.const 1)
+              (local.get $4)
+             )
+             (i32.const -1)
+            )
+           )
+          )
+          (br $label$61)
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $2)
+          (local.get $0)
+         )
+         (local.set $14
+          (i32.add
+           (local.get $2)
+           (i32.const 8)
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $2)
+            (i32.load
+             (i32.const 3652)
+            )
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.eq
+            (i32.load
+             (local.tee $0
+              (i32.add
+               (local.get $2)
+               (i32.const 8)
+              )
+             )
+            )
+            (local.get $6)
+           )
+           (local.set $14
+            (local.get $0)
+           )
+           (call $fimport$10)
+          )
+         )
+        )
+        (i32.store offset=12
+         (local.get $1)
+         (local.get $2)
+        )
+        (i32.store
+         (local.get $14)
+         (local.get $1)
+        )
+       )
+       (block
+        (local.set $7
+         (i32.load offset=24
+          (local.get $6)
+         )
+        )
+        (block $label$73
+         (if
+          (i32.eq
+           (local.tee $0
+            (i32.load offset=12
+             (local.get $6)
+            )
+           )
+           (local.get $6)
+          )
+          (block
+           (if
+            (local.tee $0
+             (i32.load
+              (local.tee $1
+               (i32.add
+                (local.tee $2
+                 (i32.add
+                  (local.get $6)
+                  (i32.const 16)
+                 )
+                )
+                (i32.const 4)
+               )
+              )
+             )
+            )
+            (local.set $2
+             (local.get $1)
+            )
+            (if
+             (i32.eqz
+              (local.tee $0
+               (i32.load
+                (local.get $2)
+               )
+              )
+             )
+             (block
+              (local.set $9
+               (i32.const 0)
+              )
+              (br $label$73)
+             )
+            )
+           )
+           (loop $label$78
+            (if
+             (local.tee $4
+              (i32.load
+               (local.tee $1
+                (i32.add
+                 (local.get $0)
+                 (i32.const 20)
+                )
+               )
+              )
+             )
+             (block
+              (local.set $0
+               (local.get $4)
+              )
+              (local.set $2
+               (local.get $1)
+              )
+              (br $label$78)
+             )
+            )
+            (if
+             (local.tee $4
+              (i32.load
+               (local.tee $1
+                (i32.add
+                 (local.get $0)
+                 (i32.const 16)
+                )
+               )
+              )
+             )
+             (block
+              (local.set $0
+               (local.get $4)
+              )
+              (local.set $2
+               (local.get $1)
+              )
+              (br $label$78)
+             )
+            )
+           )
+           (if
+            (i32.lt_u
+             (local.get $2)
+             (i32.load
+              (i32.const 3652)
+             )
+            )
+            (call $fimport$10)
+            (block
+             (i32.store
+              (local.get $2)
+              (i32.const 0)
+             )
+             (local.set $9
+              (local.get $0)
+             )
+            )
+           )
+          )
+          (block
+           (if
+            (i32.lt_u
+             (local.tee $2
+              (i32.load offset=8
+               (local.get $6)
+              )
+             )
+             (i32.load
+              (i32.const 3652)
+             )
+            )
+            (call $fimport$10)
+           )
+           (if
+            (i32.ne
+             (i32.load
+              (local.tee $1
+               (i32.add
+                (local.get $2)
+                (i32.const 12)
+               )
+              )
+             )
+             (local.get $6)
+            )
+            (call $fimport$10)
+           )
+           (if
+            (i32.eq
+             (i32.load
+              (local.tee $4
+               (i32.add
+                (local.get $0)
+                (i32.const 8)
+               )
+              )
+             )
+             (local.get $6)
+            )
+            (block
+             (i32.store
+              (local.get $1)
+              (local.get $0)
+             )
+             (i32.store
+              (local.get $4)
+              (local.get $2)
+             )
+             (local.set $9
+              (local.get $0)
+             )
+            )
+            (call $fimport$10)
+           )
+          )
+         )
+        )
+        (if
+         (local.get $7)
+         (block
+          (if
+           (i32.eq
+            (local.get $6)
+            (i32.load
+             (local.tee $2
+              (i32.add
+               (i32.shl
+                (local.tee $0
+                 (i32.load offset=28
+                  (local.get $6)
+                 )
+                )
+                (i32.const 2)
+               )
+               (i32.const 3940)
+              )
+             )
+            )
+           )
+           (block
+            (i32.store
+             (local.get $2)
+             (local.get $9)
+            )
+            (if
+             (i32.eqz
+              (local.get $9)
+             )
+             (block
+              (i32.store
+               (i32.const 3640)
+               (i32.and
+                (i32.load
+                 (i32.const 3640)
+                )
+                (i32.xor
+                 (i32.shl
+                  (i32.const 1)
+                  (local.get $0)
+                 )
+                 (i32.const -1)
+                )
+               )
+              )
+              (br $label$61)
+             )
+            )
+           )
+           (block
+            (if
+             (i32.lt_u
+              (local.get $7)
+              (i32.load
+               (i32.const 3652)
+              )
+             )
+             (call $fimport$10)
+            )
+            (if
+             (i32.eq
+              (i32.load
+               (local.tee $0
+                (i32.add
+                 (local.get $7)
+                 (i32.const 16)
+                )
+               )
+              )
+              (local.get $6)
+             )
+             (i32.store
+              (local.get $0)
+              (local.get $9)
+             )
+             (i32.store offset=20
+              (local.get $7)
+              (local.get $9)
+             )
+            )
+            (br_if $label$61
+             (i32.eqz
+              (local.get $9)
+             )
+            )
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.get $9)
+            (local.tee $2
+             (i32.load
+              (i32.const 3652)
+             )
+            )
+           )
+           (call $fimport$10)
+          )
+          (i32.store offset=24
+           (local.get $9)
+           (local.get $7)
+          )
+          (if
+           (local.tee $0
+            (i32.load
+             (local.tee $1
+              (i32.add
+               (local.get $6)
+               (i32.const 16)
+              )
+             )
+            )
+           )
+           (if
+            (i32.lt_u
+             (local.get $0)
+             (local.get $2)
+            )
+            (call $fimport$10)
+            (block
+             (i32.store offset=16
+              (local.get $9)
+              (local.get $0)
+             )
+             (i32.store offset=24
+              (local.get $0)
+              (local.get $9)
+             )
+            )
+           )
+          )
+          (if
+           (local.tee $0
+            (i32.load offset=4
+             (local.get $1)
+            )
+           )
+           (if
+            (i32.lt_u
+             (local.get $0)
+             (i32.load
+              (i32.const 3652)
+             )
+            )
+            (call $fimport$10)
+            (block
+             (i32.store offset=20
+              (local.get $9)
+              (local.get $0)
+             )
+             (i32.store offset=24
+              (local.get $0)
+              (local.get $9)
+             )
+            )
+           )
+          )
+         )
+        )
+       )
+      )
+     )
+     (i32.store offset=4
+      (local.get $3)
+      (i32.or
+       (local.get $5)
+       (i32.const 1)
+      )
+     )
+     (i32.store
+      (i32.add
+       (local.get $3)
+       (local.get $5)
+      )
+      (local.get $5)
+     )
+     (if
+      (i32.eq
+       (local.get $3)
+       (i32.load
+        (i32.const 3656)
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 3644)
+        (local.get $5)
+       )
+       (return)
+      )
+      (local.set $2
+       (local.get $5)
+      )
+     )
+    )
+   )
+   (local.set $1
+    (i32.shr_u
+     (local.get $2)
+     (i32.const 3)
+    )
+   )
+   (if
+    (i32.lt_u
+     (local.get $2)
+     (i32.const 256)
+    )
+    (block
+     (local.set $0
+      (i32.add
+       (i32.shl
+        (i32.shl
+         (local.get $1)
+         (i32.const 1)
+        )
+        (i32.const 2)
+       )
+       (i32.const 3676)
+      )
+     )
+     (if
+      (i32.and
+       (local.tee $2
+        (i32.load
+         (i32.const 3636)
+        )
+       )
+       (local.tee $1
+        (i32.shl
+         (i32.const 1)
+         (local.get $1)
+        )
+       )
+      )
+      (if
+       (i32.lt_u
+        (local.tee $1
+         (i32.load
+          (local.tee $2
+           (i32.add
+            (local.get $0)
+            (i32.const 8)
+           )
+          )
+         )
+        )
+        (i32.load
+         (i32.const 3652)
+        )
+       )
+       (call $fimport$10)
+       (block
+        (local.set $15
+         (local.get $2)
+        )
+        (local.set $13
+         (local.get $1)
+        )
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 3636)
+        (i32.or
+         (local.get $2)
+         (local.get $1)
+        )
+       )
+       (local.set $15
+        (i32.add
+         (local.get $0)
+         (i32.const 8)
+        )
+       )
+       (local.set $13
+        (local.get $0)
+       )
+      )
+     )
+     (i32.store
+      (local.get $15)
+      (local.get $3)
+     )
+     (i32.store offset=12
+      (local.get $13)
+      (local.get $3)
+     )
+     (i32.store offset=8
+      (local.get $3)
+      (local.get $13)
+     )
+     (i32.store offset=12
+      (local.get $3)
+      (local.get $0)
+     )
+     (return)
+    )
+   )
+   (local.set $0
+    (i32.add
+     (i32.shl
+      (local.tee $1
+       (if (result i32)
+        (local.tee $0
+         (i32.shr_u
+          (local.get $2)
+          (i32.const 8)
+         )
+        )
+        (if (result i32)
+         (i32.gt_u
+          (local.get $2)
+          (i32.const 16777215)
+         )
+         (i32.const 31)
+         (i32.or
+          (i32.and
+           (i32.shr_u
+            (local.get $2)
+            (i32.add
+             (local.tee $0
+              (i32.add
+               (i32.sub
+                (i32.const 14)
+                (i32.or
+                 (i32.or
+                  (local.tee $4
+                   (i32.and
+                    (i32.shr_u
+                     (i32.add
+                      (local.tee $1
+                       (i32.shl
+                        (local.get $0)
+                        (local.tee $0
+                         (i32.and
+                          (i32.shr_u
+                           (i32.add
+                            (local.get $0)
+                            (i32.const 1048320)
+                           )
+                           (i32.const 16)
+                          )
+                          (i32.const 8)
+                         )
+                        )
+                       )
+                      )
+                      (i32.const 520192)
+                     )
+                     (i32.const 16)
+                    )
+                    (i32.const 4)
+                   )
+                  )
+                  (local.get $0)
+                 )
+                 (local.tee $1
+                  (i32.and
+                   (i32.shr_u
+                    (i32.add
+                     (local.tee $0
+                      (i32.shl
+                       (local.get $1)
+                       (local.get $4)
+                      )
+                     )
+                     (i32.const 245760)
+                    )
+                    (i32.const 16)
+                   )
+                   (i32.const 2)
+                  )
+                 )
+                )
+               )
+               (i32.shr_u
+                (i32.shl
+                 (local.get $0)
+                 (local.get $1)
+                )
+                (i32.const 15)
+               )
+              )
+             )
+             (i32.const 7)
+            )
+           )
+           (i32.const 1)
+          )
+          (i32.shl
+           (local.get $0)
+           (i32.const 1)
+          )
+         )
+        )
+        (i32.const 0)
+       )
+      )
+      (i32.const 2)
+     )
+     (i32.const 3940)
+    )
+   )
+   (i32.store offset=28
+    (local.get $3)
+    (local.get $1)
+   )
+   (i32.store offset=20
+    (local.get $3)
+    (i32.const 0)
+   )
+   (i32.store offset=16
+    (local.get $3)
+    (i32.const 0)
+   )
+   (block $label$113
+    (if
+     (i32.and
+      (local.tee $4
+       (i32.load
+        (i32.const 3640)
+       )
+      )
+      (local.tee $5
+       (i32.shl
+        (i32.const 1)
+        (local.get $1)
+       )
+      )
+     )
+     (block
+      (local.set $0
+       (i32.load
+        (local.get $0)
+       )
+      )
+      (local.set $4
+       (i32.sub
+        (i32.const 25)
+        (i32.shr_u
+         (local.get $1)
+         (i32.const 1)
+        )
+       )
+      )
+      (local.set $1
+       (i32.shl
+        (local.get $2)
+        (if (result i32)
+         (i32.eq
+          (local.get $1)
+          (i32.const 31)
+         )
+         (i32.const 0)
+         (local.get $4)
+        )
+       )
+      )
+      (block $label$117
+       (block $label$118
+        (block $label$119
+         (loop $label$120
+          (br_if $label$118
+           (i32.eq
+            (i32.and
+             (i32.load offset=4
+              (local.get $0)
+             )
+             (i32.const -8)
+            )
+            (local.get $2)
+           )
+          )
+          (local.set $4
+           (i32.shl
+            (local.get $1)
+            (i32.const 1)
+           )
+          )
+          (br_if $label$119
+           (i32.eqz
+            (local.tee $5
+             (i32.load
+              (local.tee $1
+               (i32.add
+                (i32.add
+                 (local.get $0)
+                 (i32.const 16)
+                )
+                (i32.shl
+                 (i32.shr_u
+                  (local.get $1)
+                  (i32.const 31)
+                 )
+                 (i32.const 2)
+                )
+               )
+              )
+             )
+            )
+           )
+          )
+          (local.set $1
+           (local.get $4)
+          )
+          (local.set $0
+           (local.get $5)
+          )
+          (br $label$120)
+         )
+        )
+        (if
+         (i32.lt_u
+          (local.get $1)
+          (i32.load
+           (i32.const 3652)
+          )
+         )
+         (call $fimport$10)
+         (block
+          (i32.store
+           (local.get $1)
+           (local.get $3)
+          )
+          (i32.store offset=24
+           (local.get $3)
+           (local.get $0)
+          )
+          (i32.store offset=12
+           (local.get $3)
+           (local.get $3)
+          )
+          (i32.store offset=8
+           (local.get $3)
+           (local.get $3)
+          )
+          (br $label$113)
+         )
+        )
+        (br $label$117)
+       )
+       (if
+        (i32.and
+         (i32.ge_u
+          (local.tee $2
+           (i32.load
+            (local.tee $1
+             (i32.add
+              (local.get $0)
+              (i32.const 8)
+             )
+            )
+           )
+          )
+          (local.tee $4
+           (i32.load
+            (i32.const 3652)
+           )
+          )
+         )
+         (i32.ge_u
+          (local.get $0)
+          (local.get $4)
+         )
+        )
+        (block
+         (i32.store offset=12
+          (local.get $2)
+          (local.get $3)
+         )
+         (i32.store
+          (local.get $1)
+          (local.get $3)
+         )
+         (i32.store offset=8
+          (local.get $3)
+          (local.get $2)
+         )
+         (i32.store offset=12
+          (local.get $3)
+          (local.get $0)
+         )
+         (i32.store offset=24
+          (local.get $3)
+          (i32.const 0)
+         )
+        )
+        (call $fimport$10)
+       )
+      )
+     )
+     (block
+      (i32.store
+       (i32.const 3640)
+       (i32.or
+        (local.get $4)
+        (local.get $5)
+       )
+      )
+      (i32.store
+       (local.get $0)
+       (local.get $3)
+      )
+      (i32.store offset=24
+       (local.get $3)
+       (local.get $0)
+      )
+      (i32.store offset=12
+       (local.get $3)
+       (local.get $3)
+      )
+      (i32.store offset=8
+       (local.get $3)
+       (local.get $3)
+      )
+     )
+    )
+   )
+   (i32.store
+    (i32.const 3668)
+    (local.tee $0
+     (i32.add
+      (i32.load
+       (i32.const 3668)
+      )
+      (i32.const -1)
+     )
+    )
+   )
+   (if
+    (local.get $0)
+    (return)
+    (local.set $0
+     (i32.const 4092)
+    )
+   )
+   (loop $label$128
+    (local.set $0
+     (i32.add
+      (local.tee $2
+       (i32.load
+        (local.get $0)
+       )
+      )
+      (i32.const 8)
+     )
+    )
+    (br_if $label$128
+     (local.get $2)
+    )
+   )
+   (i32.store
+    (i32.const 3668)
+    (i32.const -1)
+   )
   )
-  (func $34 (;47;) (type $4) (param $0 i32) (param $1 i32) (result i32)
-    (local $2 i32) (local $3 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $2
-      global.get $global$1
-      i32.const 16
-      i32.add
-      global.set $global$1
-      local.get $2
-      local.tee $3
-      local.get $1
-      i32.store
-      i32.const 1024
-      i32.load
-      local.get $0
-      local.get $3
-      call $18
-      local.set $0
-      local.get $2
-      global.set $global$1
-      local.get $0
-    end
+ )
+ (func $39 (; 52 ;) (type $6)
+  (nop)
+ )
+ (func $40 (; 53 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (i32.add
+     (local.tee $2
+      (i32.load
+       (global.get $global$0)
+      )
+     )
+     (local.tee $0
+      (i32.and
+       (i32.add
+        (local.get $0)
+        (i32.const 15)
+       )
+       (i32.const -16)
+      )
+     )
+    )
+   )
+   (if
+    (i32.or
+     (i32.and
+      (i32.gt_s
+       (local.get $0)
+       (i32.const 0)
+      )
+      (i32.lt_s
+       (local.get $1)
+       (local.get $2)
+      )
+     )
+     (i32.lt_s
+      (local.get $1)
+      (i32.const 0)
+     )
+    )
+    (block
+     (drop
+      (call $fimport$6)
+     )
+     (call $fimport$11
+      (i32.const 12)
+     )
+     (return
+      (i32.const -1)
+     )
+    )
+   )
+   (i32.store
+    (global.get $global$0)
+    (local.get $1)
+   )
+   (if
+    (i32.gt_s
+     (local.get $1)
+     (call $fimport$5)
+    )
+    (if
+     (i32.eqz
+      (call $fimport$4)
+     )
+     (block
+      (call $fimport$11
+       (i32.const 12)
+      )
+      (i32.store
+       (global.get $global$0)
+       (local.get $2)
+      )
+      (return
+       (i32.const -1)
+      )
+     )
+    )
+   )
+   (local.get $2)
   )
-  (func $35 (;48;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32) (local $3 i32)
-    block $label$1 (result i32) ;; label = @1
-      i32.const 1024
-      i32.load
-      local.tee $1
-      i32.load offset=76
-      i32.const -1
-      i32.gt_s
-      if (result i32) ;; label = @2
-        local.get $1
-        call $20
-      else
-        i32.const 0
-      end
-      local.set $2
-      block $label$4 (result i32) ;; label = @2
-        local.get $0
-        local.get $1
-        call $36
-        i32.const 0
-        i32.lt_s
-        if (result i32) ;; label = @3
-          i32.const 1
-        else
-          block (result i32) ;; label = @4
-            local.get $1
-            i32.load8_s offset=75
-            i32.const 10
-            i32.ne
-            if ;; label = @5
-              local.get $1
-              i32.const 20
-              i32.add
-              local.tee $3
-              i32.load
-              local.tee $0
-              local.get $1
-              i32.load offset=16
-              i32.lt_u
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $3
-                  local.get $0
-                  i32.const 1
-                  i32.add
-                  i32.store
-                  local.get $0
-                  i32.const 10
-                  i32.store8
-                  i32.const 0
-                  br 5 (;@2;)
-                end
-              end
-            end
-            local.get $1
-            i32.const 10
-            call $32
-            i32.const 0
-            i32.lt_s
-          end
-        end
-      end
-      local.set $0
-      local.get $2
-      if ;; label = @2
-        local.get $1
-        call $13
-      end
-      local.get $0
-      i32.const 31
-      i32.shl
-      i32.const 31
-      i32.shr_s
-    end
+ )
+ (func $41 (; 54 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (i32.add
+     (local.get $0)
+     (local.get $2)
+    )
+   )
+   (if
+    (i32.ge_s
+     (local.get $2)
+     (i32.const 20)
+    )
+    (block
+     (local.set $1
+      (i32.and
+       (local.get $1)
+       (i32.const 255)
+      )
+     )
+     (if
+      (local.tee $3
+       (i32.and
+        (local.get $0)
+        (i32.const 3)
+       )
+      )
+      (block
+       (local.set $3
+        (i32.sub
+         (i32.add
+          (local.get $0)
+          (i32.const 4)
+         )
+         (local.get $3)
+        )
+       )
+       (loop $label$4
+        (if
+         (i32.lt_s
+          (local.get $0)
+          (local.get $3)
+         )
+         (block
+          (i32.store8
+           (local.get $0)
+           (local.get $1)
+          )
+          (local.set $0
+           (i32.add
+            (local.get $0)
+            (i32.const 1)
+           )
+          )
+          (br $label$4)
+         )
+        )
+       )
+      )
+     )
+     (local.set $3
+      (i32.or
+       (i32.or
+        (i32.or
+         (local.get $1)
+         (i32.shl
+          (local.get $1)
+          (i32.const 8)
+         )
+        )
+        (i32.shl
+         (local.get $1)
+         (i32.const 16)
+        )
+       )
+       (i32.shl
+        (local.get $1)
+        (i32.const 24)
+       )
+      )
+     )
+     (local.set $5
+      (i32.and
+       (local.get $4)
+       (i32.const -4)
+      )
+     )
+     (loop $label$6
+      (if
+       (i32.lt_s
+        (local.get $0)
+        (local.get $5)
+       )
+       (block
+        (i32.store
+         (local.get $0)
+         (local.get $3)
+        )
+        (local.set $0
+         (i32.add
+          (local.get $0)
+          (i32.const 4)
+         )
+        )
+        (br $label$6)
+       )
+      )
+     )
+    )
+   )
+   (loop $label$8
+    (if
+     (i32.lt_s
+      (local.get $0)
+      (local.get $4)
+     )
+     (block
+      (i32.store8
+       (local.get $0)
+       (local.get $1)
+      )
+      (local.set $0
+       (i32.add
+        (local.get $0)
+        (i32.const 1)
+       )
+      )
+      (br $label$8)
+     )
+    )
+   )
+   (i32.sub
+    (local.get $0)
+    (local.get $2)
+   )
   )
-  (func $36 (;49;) (type $4) (param $0 i32) (param $1 i32) (result i32)
-    local.get $0
-    local.get $0
-    call $31
-    i32.const 1
-    local.get $1
-    call $33
-    i32.const -1
-    i32.add
+ )
+ (func $42 (; 55 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (block $label$1 (result i32)
+   (if
+    (i32.ge_s
+     (local.get $2)
+     (i32.const 4096)
+    )
+    (return
+     (call $fimport$12
+      (local.get $0)
+      (local.get $1)
+      (local.get $2)
+     )
+    )
+   )
+   (local.set $3
+    (local.get $0)
+   )
+   (if
+    (i32.eq
+     (i32.and
+      (local.get $0)
+      (i32.const 3)
+     )
+     (i32.and
+      (local.get $1)
+      (i32.const 3)
+     )
+    )
+    (block
+     (loop $label$4
+      (if
+       (i32.and
+        (local.get $0)
+        (i32.const 3)
+       )
+       (block
+        (if
+         (i32.eqz
+          (local.get $2)
+         )
+         (return
+          (local.get $3)
+         )
+        )
+        (i32.store8
+         (local.get $0)
+         (i32.load8_s
+          (local.get $1)
+         )
+        )
+        (local.set $0
+         (i32.add
+          (local.get $0)
+          (i32.const 1)
+         )
+        )
+        (local.set $1
+         (i32.add
+          (local.get $1)
+          (i32.const 1)
+         )
+        )
+        (local.set $2
+         (i32.sub
+          (local.get $2)
+          (i32.const 1)
+         )
+        )
+        (br $label$4)
+       )
+      )
+     )
+     (loop $label$7
+      (if
+       (i32.ge_s
+        (local.get $2)
+        (i32.const 4)
+       )
+       (block
+        (i32.store
+         (local.get $0)
+         (i32.load
+          (local.get $1)
+         )
+        )
+        (local.set $0
+         (i32.add
+          (local.get $0)
+          (i32.const 4)
+         )
+        )
+        (local.set $1
+         (i32.add
+          (local.get $1)
+          (i32.const 4)
+         )
+        )
+        (local.set $2
+         (i32.sub
+          (local.get $2)
+          (i32.const 4)
+         )
+        )
+        (br $label$7)
+       )
+      )
+     )
+    )
+   )
+   (loop $label$9
+    (if
+     (i32.gt_s
+      (local.get $2)
+      (i32.const 0)
+     )
+     (block
+      (i32.store8
+       (local.get $0)
+       (i32.load8_s
+        (local.get $1)
+       )
+      )
+      (local.set $0
+       (i32.add
+        (local.get $0)
+        (i32.const 1)
+       )
+      )
+      (local.set $1
+       (i32.add
+        (local.get $1)
+        (i32.const 1)
+       )
+      )
+      (local.set $2
+       (i32.sub
+        (local.get $2)
+        (i32.const 1)
+       )
+      )
+      (br $label$9)
+     )
+    )
+   )
+   (local.get $3)
   )
-  (func $37 (;50;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32) (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32) (local $15 i32) (local $16 i32) (local $17 i32) (local $18 i32) (local $19 i32) (local $20 i32) (local $21 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $14
-      global.get $global$1
-      i32.const 16
-      i32.add
-      global.set $global$1
-      local.get $14
-      local.set $18
-      block $label$2 ;; label = @2
-        local.get $0
-        i32.const 245
-        i32.lt_u
-        if ;; label = @3
-          block ;; label = @4
-            local.get $0
-            i32.const 11
-            i32.add
-            i32.const -8
-            i32.and
-            local.set $3
-            i32.const 3636
-            i32.load
-            local.tee $8
-            local.get $0
-            i32.const 11
-            i32.lt_u
-            if (result i32) ;; label = @5
-              i32.const 16
-              local.tee $3
-            else
-              local.get $3
-            end
-            i32.const 3
-            i32.shr_u
-            local.tee $2
-            i32.shr_u
-            local.tee $0
-            i32.const 3
-            i32.and
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                i32.const 1
-                i32.and
-                i32.const 1
-                i32.xor
-                local.get $2
-                i32.add
-                local.tee $5
-                i32.const 1
-                i32.shl
-                i32.const 2
-                i32.shl
-                i32.const 3676
-                i32.add
-                local.tee $2
-                i32.const 8
-                i32.add
-                local.tee $3
-                i32.load
-                local.tee $7
-                i32.const 8
-                i32.add
-                local.tee $1
-                i32.load
-                local.set $4
-                local.get $2
-                local.get $4
-                i32.eq
-                if ;; label = @7
-                  i32.const 3636
-                  local.get $8
-                  i32.const 1
-                  local.get $5
-                  i32.shl
-                  i32.const -1
-                  i32.xor
-                  i32.and
-                  i32.store
-                else
-                  block ;; label = @8
-                    local.get $4
-                    i32.const 3652
-                    i32.load
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $4
-                    i32.const 12
-                    i32.add
-                    local.tee $0
-                    i32.load
-                    local.get $7
-                    i32.eq
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $0
-                        local.get $2
-                        i32.store
-                        local.get $3
-                        local.get $4
-                        i32.store
-                      end
-                    else
-                      call $fimport$10
-                    end
-                  end
-                end
-                local.get $7
-                local.get $5
-                i32.const 3
-                i32.shl
-                local.tee $0
-                i32.const 3
-                i32.or
-                i32.store offset=4
-                local.get $7
-                local.get $0
-                i32.add
-                i32.const 4
-                i32.add
-                local.tee $0
-                local.get $0
-                i32.load
-                i32.const 1
-                i32.or
-                i32.store
-                local.get $14
-                global.set $global$1
-                local.get $1
-                return
-              end
-            end
-            local.get $3
-            i32.const 3644
-            i32.load
-            local.tee $16
-            i32.gt_u
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $0
-                    local.get $2
-                    i32.shl
-                    i32.const 2
-                    local.get $2
-                    i32.shl
-                    local.tee $0
-                    i32.const 0
-                    local.get $0
-                    i32.sub
-                    i32.or
-                    i32.and
-                    local.tee $0
-                    i32.const 0
-                    local.get $0
-                    i32.sub
-                    i32.and
-                    i32.const -1
-                    i32.add
-                    local.tee $0
-                    i32.const 12
-                    i32.shr_u
-                    i32.const 16
-                    i32.and
-                    local.set $5
-                    local.get $0
-                    local.get $5
-                    i32.shr_u
-                    local.tee $2
-                    i32.const 5
-                    i32.shr_u
-                    i32.const 8
-                    i32.and
-                    local.tee $0
-                    local.get $5
-                    i32.or
-                    local.get $2
-                    local.get $0
-                    i32.shr_u
-                    local.tee $2
-                    i32.const 2
-                    i32.shr_u
-                    i32.const 4
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $2
-                    local.get $0
-                    i32.shr_u
-                    local.tee $2
-                    i32.const 1
-                    i32.shr_u
-                    i32.const 2
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $2
-                    local.get $0
-                    i32.shr_u
-                    local.tee $2
-                    i32.const 1
-                    i32.shr_u
-                    i32.const 1
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $2
-                    local.get $0
-                    i32.shr_u
-                    i32.add
-                    local.tee $11
-                    i32.const 1
-                    i32.shl
-                    i32.const 2
-                    i32.shl
-                    i32.const 3676
-                    i32.add
-                    local.tee $4
-                    i32.const 8
-                    i32.add
-                    local.tee $2
-                    i32.load
-                    local.tee $9
-                    i32.const 8
-                    i32.add
-                    local.tee $5
-                    i32.load
-                    local.set $12
-                    local.get $4
-                    local.get $12
-                    i32.eq
-                    if ;; label = @9
-                      i32.const 3636
-                      local.get $8
-                      i32.const 1
-                      local.get $11
-                      i32.shl
-                      i32.const -1
-                      i32.xor
-                      i32.and
-                      local.tee $7
-                      i32.store
-                    else
-                      block ;; label = @10
-                        local.get $12
-                        i32.const 3652
-                        i32.load
-                        i32.lt_u
-                        if ;; label = @11
-                          call $fimport$10
-                        end
-                        local.get $12
-                        i32.const 12
-                        i32.add
-                        local.tee $0
-                        i32.load
-                        local.get $9
-                        i32.eq
-                        if ;; label = @11
-                          block ;; label = @12
-                            local.get $0
-                            local.get $4
-                            i32.store
-                            local.get $2
-                            local.get $12
-                            i32.store
-                            local.get $8
-                            local.set $7
-                          end
-                        else
-                          call $fimport$10
-                        end
-                      end
-                    end
-                    local.get $9
-                    local.get $3
-                    i32.const 3
-                    i32.or
-                    i32.store offset=4
-                    local.get $9
-                    local.get $3
-                    i32.add
-                    local.tee $4
-                    local.get $11
-                    i32.const 3
-                    i32.shl
-                    local.get $3
-                    i32.sub
-                    local.tee $11
-                    i32.const 1
-                    i32.or
-                    i32.store offset=4
-                    local.get $4
-                    local.get $11
-                    i32.add
-                    local.get $11
-                    i32.store
-                    local.get $16
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const 3656
-                        i32.load
-                        local.set $9
-                        local.get $16
-                        i32.const 3
-                        i32.shr_u
-                        local.tee $0
-                        i32.const 1
-                        i32.shl
-                        i32.const 2
-                        i32.shl
-                        i32.const 3676
-                        i32.add
-                        local.set $2
-                        local.get $7
-                        i32.const 1
-                        local.get $0
-                        i32.shl
-                        local.tee $0
-                        i32.and
-                        if ;; label = @11
-                          local.get $2
-                          i32.const 8
-                          i32.add
-                          local.tee $3
-                          i32.load
-                          local.tee $0
-                          i32.const 3652
-                          i32.load
-                          i32.lt_u
-                          if ;; label = @12
-                            call $fimport$10
-                          else
-                            block ;; label = @13
-                              local.get $3
-                              local.set $6
-                              local.get $0
-                              local.set $1
-                            end
-                          end
-                        else
-                          block ;; label = @12
-                            i32.const 3636
-                            local.get $7
-                            local.get $0
-                            i32.or
-                            i32.store
-                            local.get $2
-                            i32.const 8
-                            i32.add
-                            local.set $6
-                            local.get $2
-                            local.set $1
-                          end
-                        end
-                        local.get $6
-                        local.get $9
-                        i32.store
-                        local.get $1
-                        local.get $9
-                        i32.store offset=12
-                        local.get $9
-                        local.get $1
-                        i32.store offset=8
-                        local.get $9
-                        local.get $2
-                        i32.store offset=12
-                      end
-                    end
-                    i32.const 3644
-                    local.get $11
-                    i32.store
-                    i32.const 3656
-                    local.get $4
-                    i32.store
-                    local.get $14
-                    global.set $global$1
-                    local.get $5
-                    return
-                  end
-                end
-                i32.const 3640
-                i32.load
-                local.tee $6
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $6
-                    i32.const 0
-                    local.get $6
-                    i32.sub
-                    i32.and
-                    i32.const -1
-                    i32.add
-                    local.tee $0
-                    i32.const 12
-                    i32.shr_u
-                    i32.const 16
-                    i32.and
-                    local.set $2
-                    local.get $0
-                    local.get $2
-                    i32.shr_u
-                    local.tee $1
-                    i32.const 5
-                    i32.shr_u
-                    i32.const 8
-                    i32.and
-                    local.tee $0
-                    local.get $2
-                    i32.or
-                    local.get $1
-                    local.get $0
-                    i32.shr_u
-                    local.tee $1
-                    i32.const 2
-                    i32.shr_u
-                    i32.const 4
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $1
-                    local.get $0
-                    i32.shr_u
-                    local.tee $1
-                    i32.const 1
-                    i32.shr_u
-                    i32.const 2
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $1
-                    local.get $0
-                    i32.shr_u
-                    local.tee $1
-                    i32.const 1
-                    i32.shr_u
-                    i32.const 1
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $1
-                    local.get $0
-                    i32.shr_u
-                    i32.add
-                    i32.const 2
-                    i32.shl
-                    i32.const 3940
-                    i32.add
-                    i32.load
-                    local.tee $2
-                    i32.load offset=4
-                    i32.const -8
-                    i32.and
-                    local.get $3
-                    i32.sub
-                    local.set $9
-                    local.get $2
-                    local.set $1
-                    loop $label$25 ;; label = @9
-                      block $label$26 ;; label = @10
-                        local.get $1
-                        i32.load offset=16
-                        local.tee $0
-                        i32.eqz
-                        if ;; label = @11
-                          local.get $1
-                          i32.load offset=20
-                          local.tee $0
-                          i32.eqz
-                          br_if 1 (;@10;)
-                        end
-                        local.get $0
-                        i32.load offset=4
-                        i32.const -8
-                        i32.and
-                        local.get $3
-                        i32.sub
-                        local.tee $1
-                        local.get $9
-                        i32.lt_u
-                        local.tee $7
-                        if ;; label = @11
-                          local.get $1
-                          local.set $9
-                        end
-                        local.get $0
-                        local.set $1
-                        local.get $7
-                        if ;; label = @11
-                          local.get $0
-                          local.set $2
-                        end
-                        br 1 (;@9;)
-                      end
-                    end
-                    local.get $2
-                    i32.const 3652
-                    i32.load
-                    local.tee $12
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $2
-                    local.get $2
-                    local.get $3
-                    i32.add
-                    local.tee $13
-                    i32.ge_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $2
-                    i32.load offset=24
-                    local.set $15
-                    block $label$32 ;; label = @9
-                      local.get $2
-                      i32.load offset=12
-                      local.tee $0
-                      local.get $2
-                      i32.eq
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $2
-                          i32.const 20
-                          i32.add
-                          local.tee $1
-                          i32.load
-                          local.tee $0
-                          i32.eqz
-                          if ;; label = @12
-                            local.get $2
-                            i32.const 16
-                            i32.add
-                            local.tee $1
-                            i32.load
-                            local.tee $0
-                            i32.eqz
-                            if ;; label = @13
-                              block ;; label = @14
-                                i32.const 0
-                                local.set $4
-                                br 5 (;@9;)
-                              end
-                            end
-                          end
-                          loop $label$36 ;; label = @12
-                            local.get $0
-                            i32.const 20
-                            i32.add
-                            local.tee $11
-                            i32.load
-                            local.tee $7
-                            if ;; label = @13
-                              block ;; label = @14
-                                local.get $7
-                                local.set $0
-                                local.get $11
-                                local.set $1
-                                br 2 (;@12;)
-                              end
-                            end
-                            local.get $0
-                            i32.const 16
-                            i32.add
-                            local.tee $11
-                            i32.load
-                            local.tee $7
-                            if ;; label = @13
-                              block ;; label = @14
-                                local.get $7
-                                local.set $0
-                                local.get $11
-                                local.set $1
-                                br 2 (;@12;)
-                              end
-                            end
-                          end
-                          local.get $1
-                          local.get $12
-                          i32.lt_u
-                          if ;; label = @12
-                            call $fimport$10
-                          else
-                            block ;; label = @13
-                              local.get $1
-                              i32.const 0
-                              i32.store
-                              local.get $0
-                              local.set $4
-                            end
-                          end
-                        end
-                      else
-                        block ;; label = @11
-                          local.get $2
-                          i32.load offset=8
-                          local.tee $11
-                          local.get $12
-                          i32.lt_u
-                          if ;; label = @12
-                            call $fimport$10
-                          end
-                          local.get $11
-                          i32.const 12
-                          i32.add
-                          local.tee $7
-                          i32.load
-                          local.get $2
-                          i32.ne
-                          if ;; label = @12
-                            call $fimport$10
-                          end
-                          local.get $0
-                          i32.const 8
-                          i32.add
-                          local.tee $1
-                          i32.load
-                          local.get $2
-                          i32.eq
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $7
-                              local.get $0
-                              i32.store
-                              local.get $1
-                              local.get $11
-                              i32.store
-                              local.get $0
-                              local.set $4
-                            end
-                          else
-                            call $fimport$10
-                          end
-                        end
-                      end
-                    end
-                    block $label$46 ;; label = @9
-                      local.get $15
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $2
-                          local.get $2
-                          i32.load offset=28
-                          local.tee $1
-                          i32.const 2
-                          i32.shl
-                          i32.const 3940
-                          i32.add
-                          local.tee $0
-                          i32.load
-                          i32.eq
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $0
-                              local.get $4
-                              i32.store
-                              local.get $4
-                              i32.eqz
-                              if ;; label = @14
-                                block ;; label = @15
-                                  i32.const 3640
-                                  local.get $6
-                                  i32.const 1
-                                  local.get $1
-                                  i32.shl
-                                  i32.const -1
-                                  i32.xor
-                                  i32.and
-                                  i32.store
-                                  br 6 (;@9;)
-                                end
-                              end
-                            end
-                          else
-                            block ;; label = @13
-                              local.get $15
-                              i32.const 3652
-                              i32.load
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$10
-                              end
-                              local.get $15
-                              i32.const 16
-                              i32.add
-                              local.tee $0
-                              i32.load
-                              local.get $2
-                              i32.eq
-                              if ;; label = @14
-                                local.get $0
-                                local.get $4
-                                i32.store
-                              else
-                                local.get $15
-                                local.get $4
-                                i32.store offset=20
-                              end
-                              local.get $4
-                              i32.eqz
-                              br_if 4 (;@9;)
-                            end
-                          end
-                          local.get $4
-                          i32.const 3652
-                          i32.load
-                          local.tee $0
-                          i32.lt_u
-                          if ;; label = @12
-                            call $fimport$10
-                          end
-                          local.get $4
-                          local.get $15
-                          i32.store offset=24
-                          local.get $2
-                          i32.load offset=16
-                          local.tee $1
-                          if ;; label = @12
-                            local.get $1
-                            local.get $0
-                            i32.lt_u
-                            if ;; label = @13
-                              call $fimport$10
-                            else
-                              block ;; label = @14
-                                local.get $4
-                                local.get $1
-                                i32.store offset=16
-                                local.get $1
-                                local.get $4
-                                i32.store offset=24
-                              end
-                            end
-                          end
-                          local.get $2
-                          i32.load offset=20
-                          local.tee $0
-                          if ;; label = @12
-                            local.get $0
-                            i32.const 3652
-                            i32.load
-                            i32.lt_u
-                            if ;; label = @13
-                              call $fimport$10
-                            else
-                              block ;; label = @14
-                                local.get $4
-                                local.get $0
-                                i32.store offset=20
-                                local.get $0
-                                local.get $4
-                                i32.store offset=24
-                              end
-                            end
-                          end
-                        end
-                      end
-                    end
-                    local.get $9
-                    i32.const 16
-                    i32.lt_u
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $2
-                        local.get $9
-                        local.get $3
-                        i32.add
-                        local.tee $0
-                        i32.const 3
-                        i32.or
-                        i32.store offset=4
-                        local.get $2
-                        local.get $0
-                        i32.add
-                        i32.const 4
-                        i32.add
-                        local.tee $0
-                        local.get $0
-                        i32.load
-                        i32.const 1
-                        i32.or
-                        i32.store
-                      end
-                    else
-                      block ;; label = @10
-                        local.get $2
-                        local.get $3
-                        i32.const 3
-                        i32.or
-                        i32.store offset=4
-                        local.get $13
-                        local.get $9
-                        i32.const 1
-                        i32.or
-                        i32.store offset=4
-                        local.get $13
-                        local.get $9
-                        i32.add
-                        local.get $9
-                        i32.store
-                        local.get $16
-                        if ;; label = @11
-                          block ;; label = @12
-                            i32.const 3656
-                            i32.load
-                            local.set $7
-                            local.get $16
-                            i32.const 3
-                            i32.shr_u
-                            local.tee $0
-                            i32.const 1
-                            i32.shl
-                            i32.const 2
-                            i32.shl
-                            i32.const 3676
-                            i32.add
-                            local.set $3
-                            local.get $8
-                            i32.const 1
-                            local.get $0
-                            i32.shl
-                            local.tee $0
-                            i32.and
-                            if ;; label = @13
-                              local.get $3
-                              i32.const 8
-                              i32.add
-                              local.tee $1
-                              i32.load
-                              local.tee $0
-                              i32.const 3652
-                              i32.load
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$10
-                              else
-                                block ;; label = @15
-                                  local.get $1
-                                  local.set $10
-                                  local.get $0
-                                  local.set $5
-                                end
-                              end
-                            else
-                              block ;; label = @14
-                                i32.const 3636
-                                local.get $8
-                                local.get $0
-                                i32.or
-                                i32.store
-                                local.get $3
-                                i32.const 8
-                                i32.add
-                                local.set $10
-                                local.get $3
-                                local.set $5
-                              end
-                            end
-                            local.get $10
-                            local.get $7
-                            i32.store
-                            local.get $5
-                            local.get $7
-                            i32.store offset=12
-                            local.get $7
-                            local.get $5
-                            i32.store offset=8
-                            local.get $7
-                            local.get $3
-                            i32.store offset=12
-                          end
-                        end
-                        i32.const 3644
-                        local.get $9
-                        i32.store
-                        i32.const 3656
-                        local.get $13
-                        i32.store
-                      end
-                    end
-                    local.get $14
-                    global.set $global$1
-                    local.get $2
-                    i32.const 8
-                    i32.add
-                    return
-                  end
-                else
-                  local.get $3
-                  local.set $0
-                end
-              end
-            else
-              local.get $3
-              local.set $0
-            end
-          end
-        else
-          local.get $0
-          i32.const -65
-          i32.gt_u
-          if ;; label = @4
-            i32.const -1
-            local.set $0
-          else
-            block ;; label = @5
-              local.get $0
-              i32.const 11
-              i32.add
-              local.tee $0
-              i32.const -8
-              i32.and
-              local.set $7
-              i32.const 3640
-              i32.load
-              local.tee $5
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $0
-                  i32.const 8
-                  i32.shr_u
-                  local.tee $0
-                  if (result i32) ;; label = @8
-                    local.get $7
-                    i32.const 16777215
-                    i32.gt_u
-                    if (result i32) ;; label = @9
-                      i32.const 31
-                    else
-                      local.get $7
-                      i32.const 14
-                      local.get $0
-                      local.get $0
-                      i32.const 1048320
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 8
-                      i32.and
-                      local.tee $3
-                      i32.shl
-                      local.tee $1
-                      i32.const 520192
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 4
-                      i32.and
-                      local.tee $0
-                      local.get $3
-                      i32.or
-                      local.get $1
-                      local.get $0
-                      i32.shl
-                      local.tee $1
-                      i32.const 245760
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 2
-                      i32.and
-                      local.tee $0
-                      i32.or
-                      i32.sub
-                      local.get $1
-                      local.get $0
-                      i32.shl
-                      i32.const 15
-                      i32.shr_u
-                      i32.add
-                      local.tee $0
-                      i32.const 7
-                      i32.add
-                      i32.shr_u
-                      i32.const 1
-                      i32.and
-                      local.get $0
-                      i32.const 1
-                      i32.shl
-                      i32.or
-                    end
-                  else
-                    i32.const 0
-                  end
-                  local.set $17
-                  i32.const 0
-                  local.get $7
-                  i32.sub
-                  local.set $3
-                  block $label$78 ;; label = @8
-                    block $label$79 ;; label = @9
-                      block $label$80 ;; label = @10
-                        local.get $17
-                        i32.const 2
-                        i32.shl
-                        i32.const 3940
-                        i32.add
-                        i32.load
-                        local.tee $1
-                        if ;; label = @11
-                          block ;; label = @12
-                            i32.const 25
-                            local.get $17
-                            i32.const 1
-                            i32.shr_u
-                            i32.sub
-                            local.set $0
-                            i32.const 0
-                            local.set $4
-                            local.get $7
-                            local.get $17
-                            i32.const 31
-                            i32.eq
-                            if (result i32) ;; label = @13
-                              i32.const 0
-                            else
-                              local.get $0
-                            end
-                            i32.shl
-                            local.set $10
-                            i32.const 0
-                            local.set $0
-                            loop $label$84 ;; label = @13
-                              local.get $1
-                              i32.load offset=4
-                              i32.const -8
-                              i32.and
-                              local.get $7
-                              i32.sub
-                              local.tee $6
-                              local.get $3
-                              i32.lt_u
-                              if ;; label = @14
-                                local.get $6
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $6
-                                    local.set $3
-                                    local.get $1
-                                    local.set $0
-                                  end
-                                else
-                                  block ;; label = @16
-                                    i32.const 0
-                                    local.set $3
-                                    local.get $1
-                                    local.set $0
-                                    br 7 (;@9;)
-                                  end
-                                end
-                              end
-                              local.get $1
-                              i32.load offset=20
-                              local.tee $19
-                              i32.eqz
-                              local.get $19
-                              local.get $1
-                              i32.const 16
-                              i32.add
-                              local.get $10
-                              i32.const 31
-                              i32.shr_u
-                              i32.const 2
-                              i32.shl
-                              i32.add
-                              i32.load
-                              local.tee $6
-                              i32.eq
-                              i32.or
-                              if (result i32) ;; label = @14
-                                local.get $4
-                              else
-                                local.get $19
-                              end
-                              local.set $1
-                              local.get $10
-                              local.get $6
-                              i32.eqz
-                              local.tee $4
-                              i32.const 1
-                              i32.and
-                              i32.const 1
-                              i32.xor
-                              i32.shl
-                              local.set $10
-                              local.get $4
-                              if ;; label = @14
-                                block ;; label = @15
-                                  local.get $1
-                                  local.set $4
-                                  local.get $0
-                                  local.set $1
-                                  br 5 (;@10;)
-                                end
-                              else
-                                block ;; label = @15
-                                  local.get $1
-                                  local.set $4
-                                  local.get $6
-                                  local.set $1
-                                  br 2 (;@13;)
-                                end
-                              end
-                            end
-                          end
-                        else
-                          block ;; label = @12
-                            i32.const 0
-                            local.set $4
-                            i32.const 0
-                            local.set $1
-                          end
-                        end
-                      end
-                      local.get $4
-                      i32.eqz
-                      local.get $1
-                      i32.eqz
-                      i32.and
-                      if (result i32) ;; label = @10
-                        block (result i32) ;; label = @11
-                          local.get $5
-                          i32.const 2
-                          local.get $17
-                          i32.shl
-                          local.tee $0
-                          i32.const 0
-                          local.get $0
-                          i32.sub
-                          i32.or
-                          i32.and
-                          local.tee $0
-                          i32.eqz
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $7
-                              local.set $0
-                              br 11 (;@2;)
-                            end
-                          end
-                          local.get $0
-                          i32.const 0
-                          local.get $0
-                          i32.sub
-                          i32.and
-                          i32.const -1
-                          i32.add
-                          local.tee $0
-                          i32.const 12
-                          i32.shr_u
-                          i32.const 16
-                          i32.and
-                          local.set $10
-                          local.get $0
-                          local.get $10
-                          i32.shr_u
-                          local.tee $4
-                          i32.const 5
-                          i32.shr_u
-                          i32.const 8
-                          i32.and
-                          local.tee $0
-                          local.get $10
-                          i32.or
-                          local.get $4
-                          local.get $0
-                          i32.shr_u
-                          local.tee $4
-                          i32.const 2
-                          i32.shr_u
-                          i32.const 4
-                          i32.and
-                          local.tee $0
-                          i32.or
-                          local.get $4
-                          local.get $0
-                          i32.shr_u
-                          local.tee $4
-                          i32.const 1
-                          i32.shr_u
-                          i32.const 2
-                          i32.and
-                          local.tee $0
-                          i32.or
-                          local.get $4
-                          local.get $0
-                          i32.shr_u
-                          local.tee $4
-                          i32.const 1
-                          i32.shr_u
-                          i32.const 1
-                          i32.and
-                          local.tee $0
-                          i32.or
-                          local.get $4
-                          local.get $0
-                          i32.shr_u
-                          i32.add
-                          i32.const 2
-                          i32.shl
-                          i32.const 3940
-                          i32.add
-                          i32.load
-                        end
-                      else
-                        local.get $4
-                      end
-                      local.tee $0
-                      br_if 0 (;@9;)
-                      local.get $1
-                      local.set $4
-                      br 1 (;@8;)
-                    end
-                    loop $label$96 ;; label = @9
-                      local.get $0
-                      i32.load offset=4
-                      i32.const -8
-                      i32.and
-                      local.get $7
-                      i32.sub
-                      local.tee $4
-                      local.get $3
-                      i32.lt_u
-                      local.tee $10
-                      if ;; label = @10
-                        local.get $4
-                        local.set $3
-                      end
-                      local.get $10
-                      if ;; label = @10
-                        local.get $0
-                        local.set $1
-                      end
-                      local.get $0
-                      i32.load offset=16
-                      local.tee $4
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $4
-                          local.set $0
-                          br 2 (;@9;)
-                        end
-                      end
-                      local.get $0
-                      i32.load offset=20
-                      local.tee $0
-                      br_if 0 (;@9;)
-                      local.get $1
-                      local.set $4
-                    end
-                  end
-                  local.get $4
-                  if ;; label = @8
-                    local.get $3
-                    i32.const 3644
-                    i32.load
-                    local.get $7
-                    i32.sub
-                    i32.lt_u
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $4
-                        i32.const 3652
-                        i32.load
-                        local.tee $12
-                        i32.lt_u
-                        if ;; label = @11
-                          call $fimport$10
-                        end
-                        local.get $4
-                        local.get $4
-                        local.get $7
-                        i32.add
-                        local.tee $6
-                        i32.ge_u
-                        if ;; label = @11
-                          call $fimport$10
-                        end
-                        local.get $4
-                        i32.load offset=24
-                        local.set $10
-                        block $label$104 ;; label = @11
-                          local.get $4
-                          i32.load offset=12
-                          local.tee $0
-                          local.get $4
-                          i32.eq
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $4
-                              i32.const 20
-                              i32.add
-                              local.tee $1
-                              i32.load
-                              local.tee $0
-                              i32.eqz
-                              if ;; label = @14
-                                local.get $4
-                                i32.const 16
-                                i32.add
-                                local.tee $1
-                                i32.load
-                                local.tee $0
-                                i32.eqz
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    i32.const 0
-                                    local.set $13
-                                    br 5 (;@11;)
-                                  end
-                                end
-                              end
-                              loop $label$108 ;; label = @14
-                                local.get $0
-                                i32.const 20
-                                i32.add
-                                local.tee $9
-                                i32.load
-                                local.tee $11
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $11
-                                    local.set $0
-                                    local.get $9
-                                    local.set $1
-                                    br 2 (;@14;)
-                                  end
-                                end
-                                local.get $0
-                                i32.const 16
-                                i32.add
-                                local.tee $9
-                                i32.load
-                                local.tee $11
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $11
-                                    local.set $0
-                                    local.get $9
-                                    local.set $1
-                                    br 2 (;@14;)
-                                  end
-                                end
-                              end
-                              local.get $1
-                              local.get $12
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$10
-                              else
-                                block ;; label = @15
-                                  local.get $1
-                                  i32.const 0
-                                  i32.store
-                                  local.get $0
-                                  local.set $13
-                                end
-                              end
-                            end
-                          else
-                            block ;; label = @13
-                              local.get $4
-                              i32.load offset=8
-                              local.tee $9
-                              local.get $12
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$10
-                              end
-                              local.get $9
-                              i32.const 12
-                              i32.add
-                              local.tee $11
-                              i32.load
-                              local.get $4
-                              i32.ne
-                              if ;; label = @14
-                                call $fimport$10
-                              end
-                              local.get $0
-                              i32.const 8
-                              i32.add
-                              local.tee $1
-                              i32.load
-                              local.get $4
-                              i32.eq
-                              if ;; label = @14
-                                block ;; label = @15
-                                  local.get $11
-                                  local.get $0
-                                  i32.store
-                                  local.get $1
-                                  local.get $9
-                                  i32.store
-                                  local.get $0
-                                  local.set $13
-                                end
-                              else
-                                call $fimport$10
-                              end
-                            end
-                          end
-                        end
-                        block $label$118 ;; label = @11
-                          local.get $10
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $4
-                              local.get $4
-                              i32.load offset=28
-                              local.tee $1
-                              i32.const 2
-                              i32.shl
-                              i32.const 3940
-                              i32.add
-                              local.tee $0
-                              i32.load
-                              i32.eq
-                              if ;; label = @14
-                                block ;; label = @15
-                                  local.get $0
-                                  local.get $13
-                                  i32.store
-                                  local.get $13
-                                  i32.eqz
-                                  if ;; label = @16
-                                    block ;; label = @17
-                                      i32.const 3640
-                                      local.get $5
-                                      i32.const 1
-                                      local.get $1
-                                      i32.shl
-                                      i32.const -1
-                                      i32.xor
-                                      i32.and
-                                      local.tee $2
-                                      i32.store
-                                      br 6 (;@11;)
-                                    end
-                                  end
-                                end
-                              else
-                                block ;; label = @15
-                                  local.get $10
-                                  i32.const 3652
-                                  i32.load
-                                  i32.lt_u
-                                  if ;; label = @16
-                                    call $fimport$10
-                                  end
-                                  local.get $10
-                                  i32.const 16
-                                  i32.add
-                                  local.tee $0
-                                  i32.load
-                                  local.get $4
-                                  i32.eq
-                                  if ;; label = @16
-                                    local.get $0
-                                    local.get $13
-                                    i32.store
-                                  else
-                                    local.get $10
-                                    local.get $13
-                                    i32.store offset=20
-                                  end
-                                  local.get $13
-                                  i32.eqz
-                                  if ;; label = @16
-                                    block ;; label = @17
-                                      local.get $5
-                                      local.set $2
-                                      br 6 (;@11;)
-                                    end
-                                  end
-                                end
-                              end
-                              local.get $13
-                              i32.const 3652
-                              i32.load
-                              local.tee $0
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$10
-                              end
-                              local.get $13
-                              local.get $10
-                              i32.store offset=24
-                              local.get $4
-                              i32.load offset=16
-                              local.tee $1
-                              if ;; label = @14
-                                local.get $1
-                                local.get $0
-                                i32.lt_u
-                                if ;; label = @15
-                                  call $fimport$10
-                                else
-                                  block ;; label = @16
-                                    local.get $13
-                                    local.get $1
-                                    i32.store offset=16
-                                    local.get $1
-                                    local.get $13
-                                    i32.store offset=24
-                                  end
-                                end
-                              end
-                              local.get $4
-                              i32.load offset=20
-                              local.tee $0
-                              if ;; label = @14
-                                local.get $0
-                                i32.const 3652
-                                i32.load
-                                i32.lt_u
-                                if ;; label = @15
-                                  call $fimport$10
-                                else
-                                  block ;; label = @16
-                                    local.get $13
-                                    local.get $0
-                                    i32.store offset=20
-                                    local.get $0
-                                    local.get $13
-                                    i32.store offset=24
-                                    local.get $5
-                                    local.set $2
-                                  end
-                                end
-                              else
-                                local.get $5
-                                local.set $2
-                              end
-                            end
-                          else
-                            local.get $5
-                            local.set $2
-                          end
-                        end
-                        block $label$136 ;; label = @11
-                          local.get $3
-                          i32.const 16
-                          i32.lt_u
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $4
-                              local.get $3
-                              local.get $7
-                              i32.add
-                              local.tee $0
-                              i32.const 3
-                              i32.or
-                              i32.store offset=4
-                              local.get $4
-                              local.get $0
-                              i32.add
-                              i32.const 4
-                              i32.add
-                              local.tee $0
-                              local.get $0
-                              i32.load
-                              i32.const 1
-                              i32.or
-                              i32.store
-                            end
-                          else
-                            block ;; label = @13
-                              local.get $4
-                              local.get $7
-                              i32.const 3
-                              i32.or
-                              i32.store offset=4
-                              local.get $6
-                              local.get $3
-                              i32.const 1
-                              i32.or
-                              i32.store offset=4
-                              local.get $6
-                              local.get $3
-                              i32.add
-                              local.get $3
-                              i32.store
-                              local.get $3
-                              i32.const 3
-                              i32.shr_u
-                              local.set $0
-                              local.get $3
-                              i32.const 256
-                              i32.lt_u
-                              if ;; label = @14
-                                block ;; label = @15
-                                  local.get $0
-                                  i32.const 1
-                                  i32.shl
-                                  i32.const 2
-                                  i32.shl
-                                  i32.const 3676
-                                  i32.add
-                                  local.set $3
-                                  i32.const 3636
-                                  i32.load
-                                  local.tee $1
-                                  i32.const 1
-                                  local.get $0
-                                  i32.shl
-                                  local.tee $0
-                                  i32.and
-                                  if ;; label = @16
-                                    local.get $3
-                                    i32.const 8
-                                    i32.add
-                                    local.tee $1
-                                    i32.load
-                                    local.tee $0
-                                    i32.const 3652
-                                    i32.load
-                                    i32.lt_u
-                                    if ;; label = @17
-                                      call $fimport$10
-                                    else
-                                      block ;; label = @18
-                                        local.get $1
-                                        local.set $16
-                                        local.get $0
-                                        local.set $8
-                                      end
-                                    end
-                                  else
-                                    block ;; label = @17
-                                      i32.const 3636
-                                      local.get $1
-                                      local.get $0
-                                      i32.or
-                                      i32.store
-                                      local.get $3
-                                      i32.const 8
-                                      i32.add
-                                      local.set $16
-                                      local.get $3
-                                      local.set $8
-                                    end
-                                  end
-                                  local.get $16
-                                  local.get $6
-                                  i32.store
-                                  local.get $8
-                                  local.get $6
-                                  i32.store offset=12
-                                  local.get $6
-                                  local.get $8
-                                  i32.store offset=8
-                                  local.get $6
-                                  local.get $3
-                                  i32.store offset=12
-                                  br 4 (;@11;)
-                                end
-                              end
-                              local.get $3
-                              i32.const 8
-                              i32.shr_u
-                              local.tee $0
-                              if (result i32) ;; label = @14
-                                local.get $3
-                                i32.const 16777215
-                                i32.gt_u
-                                if (result i32) ;; label = @15
-                                  i32.const 31
-                                else
-                                  local.get $3
-                                  i32.const 14
-                                  local.get $0
-                                  local.get $0
-                                  i32.const 1048320
-                                  i32.add
-                                  i32.const 16
-                                  i32.shr_u
-                                  i32.const 8
-                                  i32.and
-                                  local.tee $5
-                                  i32.shl
-                                  local.tee $1
-                                  i32.const 520192
-                                  i32.add
-                                  i32.const 16
-                                  i32.shr_u
-                                  i32.const 4
-                                  i32.and
-                                  local.tee $0
-                                  local.get $5
-                                  i32.or
-                                  local.get $1
-                                  local.get $0
-                                  i32.shl
-                                  local.tee $1
-                                  i32.const 245760
-                                  i32.add
-                                  i32.const 16
-                                  i32.shr_u
-                                  i32.const 2
-                                  i32.and
-                                  local.tee $0
-                                  i32.or
-                                  i32.sub
-                                  local.get $1
-                                  local.get $0
-                                  i32.shl
-                                  i32.const 15
-                                  i32.shr_u
-                                  i32.add
-                                  local.tee $0
-                                  i32.const 7
-                                  i32.add
-                                  i32.shr_u
-                                  i32.const 1
-                                  i32.and
-                                  local.get $0
-                                  i32.const 1
-                                  i32.shl
-                                  i32.or
-                                end
-                              else
-                                i32.const 0
-                              end
-                              local.tee $5
-                              i32.const 2
-                              i32.shl
-                              i32.const 3940
-                              i32.add
-                              local.set $1
-                              local.get $6
-                              local.get $5
-                              i32.store offset=28
-                              local.get $6
-                              i32.const 16
-                              i32.add
-                              local.tee $0
-                              i32.const 0
-                              i32.store offset=4
-                              local.get $0
-                              i32.const 0
-                              i32.store
-                              local.get $2
-                              i32.const 1
-                              local.get $5
-                              i32.shl
-                              local.tee $0
-                              i32.and
-                              i32.eqz
-                              if ;; label = @14
-                                block ;; label = @15
-                                  i32.const 3640
-                                  local.get $2
-                                  local.get $0
-                                  i32.or
-                                  i32.store
-                                  local.get $1
-                                  local.get $6
-                                  i32.store
-                                  local.get $6
-                                  local.get $1
-                                  i32.store offset=24
-                                  local.get $6
-                                  local.get $6
-                                  i32.store offset=12
-                                  local.get $6
-                                  local.get $6
-                                  i32.store offset=8
-                                  br 4 (;@11;)
-                                end
-                              end
-                              local.get $1
-                              i32.load
-                              local.set $0
-                              i32.const 25
-                              local.get $5
-                              i32.const 1
-                              i32.shr_u
-                              i32.sub
-                              local.set $1
-                              local.get $3
-                              local.get $5
-                              i32.const 31
-                              i32.eq
-                              if (result i32) ;; label = @14
-                                i32.const 0
-                              else
-                                local.get $1
-                              end
-                              i32.shl
-                              local.set $5
-                              block $label$151 ;; label = @14
-                                block $label$152 ;; label = @15
-                                  block $label$153 ;; label = @16
-                                    loop $label$154 ;; label = @17
-                                      local.get $0
-                                      i32.load offset=4
-                                      i32.const -8
-                                      i32.and
-                                      local.get $3
-                                      i32.eq
-                                      br_if 2 (;@15;)
-                                      local.get $5
-                                      i32.const 1
-                                      i32.shl
-                                      local.set $2
-                                      local.get $0
-                                      i32.const 16
-                                      i32.add
-                                      local.get $5
-                                      i32.const 31
-                                      i32.shr_u
-                                      i32.const 2
-                                      i32.shl
-                                      i32.add
-                                      local.tee $5
-                                      i32.load
-                                      local.tee $1
-                                      i32.eqz
-                                      br_if 1 (;@16;)
-                                      local.get $2
-                                      local.set $5
-                                      local.get $1
-                                      local.set $0
-                                      br 0 (;@17;)
-                                    end
-                                  end
-                                  local.get $5
-                                  i32.const 3652
-                                  i32.load
-                                  i32.lt_u
-                                  if ;; label = @16
-                                    call $fimport$10
-                                  else
-                                    block ;; label = @17
-                                      local.get $5
-                                      local.get $6
-                                      i32.store
-                                      local.get $6
-                                      local.get $0
-                                      i32.store offset=24
-                                      local.get $6
-                                      local.get $6
-                                      i32.store offset=12
-                                      local.get $6
-                                      local.get $6
-                                      i32.store offset=8
-                                      br 6 (;@11;)
-                                    end
-                                  end
-                                  br 1 (;@14;)
-                                end
-                                local.get $0
-                                i32.const 8
-                                i32.add
-                                local.tee $3
-                                i32.load
-                                local.tee $2
-                                i32.const 3652
-                                i32.load
-                                local.tee $1
-                                i32.ge_u
-                                local.get $0
-                                local.get $1
-                                i32.ge_u
-                                i32.and
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $2
-                                    local.get $6
-                                    i32.store offset=12
-                                    local.get $3
-                                    local.get $6
-                                    i32.store
-                                    local.get $6
-                                    local.get $2
-                                    i32.store offset=8
-                                    local.get $6
-                                    local.get $0
-                                    i32.store offset=12
-                                    local.get $6
-                                    i32.const 0
-                                    i32.store offset=24
-                                  end
-                                else
-                                  call $fimport$10
-                                end
-                              end
-                            end
-                          end
-                        end
-                        local.get $14
-                        global.set $global$1
-                        local.get $4
-                        i32.const 8
-                        i32.add
-                        return
-                      end
-                    else
-                      local.get $7
-                      local.set $0
-                    end
-                  else
-                    local.get $7
-                    local.set $0
-                  end
-                end
-              else
-                local.get $7
-                local.set $0
-              end
-            end
-          end
-        end
-      end
-      i32.const 3644
-      i32.load
-      local.tee $1
-      local.get $0
-      i32.ge_u
-      if ;; label = @2
-        block ;; label = @3
-          i32.const 3656
-          i32.load
-          local.set $2
-          local.get $1
-          local.get $0
-          i32.sub
-          local.tee $3
-          i32.const 15
-          i32.gt_u
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 3656
-              local.get $2
-              local.get $0
-              i32.add
-              local.tee $1
-              i32.store
-              i32.const 3644
-              local.get $3
-              i32.store
-              local.get $1
-              local.get $3
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $1
-              local.get $3
-              i32.add
-              local.get $3
-              i32.store
-              local.get $2
-              local.get $0
-              i32.const 3
-              i32.or
-              i32.store offset=4
-            end
-          else
-            block ;; label = @5
-              i32.const 3644
-              i32.const 0
-              i32.store
-              i32.const 3656
-              i32.const 0
-              i32.store
-              local.get $2
-              local.get $1
-              i32.const 3
-              i32.or
-              i32.store offset=4
-              local.get $2
-              local.get $1
-              i32.add
-              i32.const 4
-              i32.add
-              local.tee $0
-              local.get $0
-              i32.load
-              i32.const 1
-              i32.or
-              i32.store
-            end
-          end
-          local.get $14
-          global.set $global$1
-          local.get $2
-          i32.const 8
-          i32.add
-          return
-        end
-      end
-      i32.const 3648
-      i32.load
-      local.tee $10
-      local.get $0
-      i32.gt_u
-      if ;; label = @2
-        block ;; label = @3
-          i32.const 3648
-          local.get $10
-          local.get $0
-          i32.sub
-          local.tee $3
-          i32.store
-          i32.const 3660
-          i32.const 3660
-          i32.load
-          local.tee $2
-          local.get $0
-          i32.add
-          local.tee $1
-          i32.store
-          local.get $1
-          local.get $3
-          i32.const 1
-          i32.or
-          i32.store offset=4
-          local.get $2
-          local.get $0
-          i32.const 3
-          i32.or
-          i32.store offset=4
-          local.get $14
-          global.set $global$1
-          local.get $2
-          i32.const 8
-          i32.add
-          return
-        end
-      end
-      i32.const 4108
-      i32.load
-      if (result i32) ;; label = @2
-        i32.const 4116
-        i32.load
-      else
-        block (result i32) ;; label = @3
-          i32.const 4116
-          i32.const 4096
-          i32.store
-          i32.const 4112
-          i32.const 4096
-          i32.store
-          i32.const 4120
-          i32.const -1
-          i32.store
-          i32.const 4124
-          i32.const -1
-          i32.store
-          i32.const 4128
-          i32.const 0
-          i32.store
-          i32.const 4080
-          i32.const 0
-          i32.store
-          local.get $18
-          local.get $18
-          i32.const -16
-          i32.and
-          i32.const 1431655768
-          i32.xor
-          local.tee $1
-          i32.store
-          i32.const 4108
-          local.get $1
-          i32.store
-          i32.const 4096
-        end
-      end
-      local.tee $1
-      local.get $0
-      i32.const 47
-      i32.add
-      local.tee $13
-      i32.add
-      local.tee $8
-      i32.const 0
-      local.get $1
-      i32.sub
-      local.tee $4
-      i32.and
-      local.tee $6
-      local.get $0
-      i32.le_u
-      if ;; label = @2
-        block ;; label = @3
-          local.get $14
-          global.set $global$1
-          i32.const 0
-          return
-        end
-      end
-      i32.const 4076
-      i32.load
-      local.tee $2
-      if ;; label = @2
-        i32.const 4068
-        i32.load
-        local.tee $3
-        local.get $6
-        i32.add
-        local.tee $1
-        local.get $3
-        i32.le_u
-        local.get $1
-        local.get $2
-        i32.gt_u
-        i32.or
-        if ;; label = @3
-          block ;; label = @4
-            local.get $14
-            global.set $global$1
-            i32.const 0
-            return
-          end
-        end
-      end
-      local.get $0
-      i32.const 48
-      i32.add
-      local.set $7
-      block $label$171 ;; label = @2
-        block $label$172 ;; label = @3
-          i32.const 4080
-          i32.load
-          i32.const 4
-          i32.and
-          i32.eqz
-          if ;; label = @4
-            block ;; label = @5
-              block $label$174 ;; label = @6
-                block $label$175 ;; label = @7
-                  block $label$176 ;; label = @8
-                    i32.const 3660
-                    i32.load
-                    local.tee $3
-                    i32.eqz
-                    br_if 0 (;@8;)
-                    i32.const 4084
-                    local.set $2
-                    loop $label$177 ;; label = @9
-                      block $label$178 ;; label = @10
-                        local.get $2
-                        i32.load
-                        local.tee $1
-                        local.get $3
-                        i32.le_u
-                        if ;; label = @11
-                          local.get $1
-                          local.get $2
-                          i32.const 4
-                          i32.add
-                          local.tee $5
-                          i32.load
-                          i32.add
-                          local.get $3
-                          i32.gt_u
-                          br_if 1 (;@10;)
-                        end
-                        local.get $2
-                        i32.load offset=8
-                        local.tee $1
-                        i32.eqz
-                        br_if 2 (;@8;)
-                        local.get $1
-                        local.set $2
-                        br 1 (;@9;)
-                      end
-                    end
-                    local.get $8
-                    local.get $10
-                    i32.sub
-                    local.get $4
-                    i32.and
-                    local.tee $3
-                    i32.const 2147483647
-                    i32.lt_u
-                    if ;; label = @9
-                      local.get $3
-                      call $40
-                      local.tee $1
-                      local.get $2
-                      i32.load
-                      local.get $5
-                      i32.load
-                      i32.add
-                      i32.eq
-                      if ;; label = @10
-                        local.get $1
-                        i32.const -1
-                        i32.ne
-                        br_if 7 (;@3;)
-                      else
-                        block ;; label = @11
-                          local.get $1
-                          local.set $2
-                          local.get $3
-                          local.set $1
-                          br 4 (;@7;)
-                        end
-                      end
-                    end
-                    br 2 (;@6;)
-                  end
-                  i32.const 0
-                  call $40
-                  local.tee $1
-                  i32.const -1
-                  i32.ne
-                  if ;; label = @8
-                    block ;; label = @9
-                      i32.const 4112
-                      i32.load
-                      local.tee $2
-                      i32.const -1
-                      i32.add
-                      local.tee $5
-                      local.get $1
-                      local.tee $3
-                      i32.add
-                      i32.const 0
-                      local.get $2
-                      i32.sub
-                      i32.and
-                      local.get $3
-                      i32.sub
-                      local.set $2
-                      local.get $5
-                      local.get $3
-                      i32.and
-                      if (result i32) ;; label = @10
-                        local.get $2
-                      else
-                        i32.const 0
-                      end
-                      local.get $6
-                      i32.add
-                      local.tee $3
-                      i32.const 4068
-                      i32.load
-                      local.tee $5
-                      i32.add
-                      local.set $4
-                      local.get $3
-                      local.get $0
-                      i32.gt_u
-                      local.get $3
-                      i32.const 2147483647
-                      i32.lt_u
-                      i32.and
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const 4076
-                          i32.load
-                          local.tee $2
-                          if ;; label = @12
-                            local.get $4
-                            local.get $5
-                            i32.le_u
-                            local.get $4
-                            local.get $2
-                            i32.gt_u
-                            i32.or
-                            br_if 6 (;@6;)
-                          end
-                          local.get $3
-                          call $40
-                          local.tee $2
-                          local.get $1
-                          i32.eq
-                          br_if 8 (;@3;)
-                          local.get $3
-                          local.set $1
-                          br 4 (;@7;)
-                        end
-                      end
-                    end
-                  end
-                  br 1 (;@6;)
-                end
-                i32.const 0
-                local.get $1
-                i32.sub
-                local.set $5
-                local.get $7
-                local.get $1
-                i32.gt_u
-                local.get $1
-                i32.const 2147483647
-                i32.lt_u
-                local.get $2
-                i32.const -1
-                i32.ne
-                i32.and
-                i32.and
-                if ;; label = @7
-                  local.get $13
-                  local.get $1
-                  i32.sub
-                  i32.const 4116
-                  i32.load
-                  local.tee $3
-                  i32.add
-                  i32.const 0
-                  local.get $3
-                  i32.sub
-                  i32.and
-                  local.tee $3
-                  i32.const 2147483647
-                  i32.lt_u
-                  if ;; label = @8
-                    local.get $3
-                    call $40
-                    i32.const -1
-                    i32.eq
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $5
-                        call $40
-                        drop
-                        br 4 (;@6;)
-                      end
-                    else
-                      local.get $3
-                      local.get $1
-                      i32.add
-                      local.set $3
-                    end
-                  else
-                    local.get $1
-                    local.set $3
-                  end
-                else
-                  local.get $1
-                  local.set $3
-                end
-                local.get $2
-                i32.const -1
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $2
-                    local.set $1
-                    br 5 (;@3;)
-                  end
-                end
-              end
-              i32.const 4080
-              i32.const 4080
-              i32.load
-              i32.const 4
-              i32.or
-              i32.store
-            end
-          end
-          local.get $6
-          i32.const 2147483647
-          i32.lt_u
-          if ;; label = @4
-            local.get $6
-            call $40
-            local.tee $1
-            i32.const 0
-            call $40
-            local.tee $3
-            i32.lt_u
-            local.get $1
-            i32.const -1
-            i32.ne
-            local.get $3
-            i32.const -1
-            i32.ne
-            i32.and
-            i32.and
-            if ;; label = @5
-              local.get $3
-              local.get $1
-              i32.sub
-              local.tee $3
-              local.get $0
-              i32.const 40
-              i32.add
-              i32.gt_u
-              br_if 2 (;@3;)
-            end
-          end
-          br 1 (;@2;)
-        end
-        i32.const 4068
-        i32.const 4068
-        i32.load
-        local.get $3
-        i32.add
-        local.tee $2
-        i32.store
-        local.get $2
-        i32.const 4072
-        i32.load
-        i32.gt_u
-        if ;; label = @3
-          i32.const 4072
-          local.get $2
-          i32.store
-        end
-        block $label$198 ;; label = @3
-          i32.const 3660
-          i32.load
-          local.tee $8
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 4084
-              local.set $2
-              block $label$200 ;; label = @6
-                block $label$201 ;; label = @7
-                  loop $label$202 ;; label = @8
-                    local.get $1
-                    local.get $2
-                    i32.load
-                    local.tee $4
-                    local.get $2
-                    i32.const 4
-                    i32.add
-                    local.tee $7
-                    i32.load
-                    local.tee $5
-                    i32.add
-                    i32.eq
-                    br_if 1 (;@7;)
-                    local.get $2
-                    i32.load offset=8
-                    local.tee $2
-                    br_if 0 (;@8;)
-                  end
-                  br 1 (;@6;)
-                end
-                local.get $2
-                i32.load offset=12
-                i32.const 8
-                i32.and
-                i32.eqz
-                if ;; label = @7
-                  local.get $8
-                  local.get $1
-                  i32.lt_u
-                  local.get $8
-                  local.get $4
-                  i32.ge_u
-                  i32.and
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $7
-                      local.get $5
-                      local.get $3
-                      i32.add
-                      i32.store
-                      i32.const 3648
-                      i32.load
-                      local.set $5
-                      i32.const 0
-                      local.get $8
-                      i32.const 8
-                      i32.add
-                      local.tee $2
-                      i32.sub
-                      i32.const 7
-                      i32.and
-                      local.set $1
-                      i32.const 3660
-                      local.get $8
-                      local.get $2
-                      i32.const 7
-                      i32.and
-                      if (result i32) ;; label = @10
-                        local.get $1
-                      else
-                        i32.const 0
-                        local.tee $1
-                      end
-                      i32.add
-                      local.tee $2
-                      i32.store
-                      i32.const 3648
-                      local.get $3
-                      local.get $1
-                      i32.sub
-                      local.get $5
-                      i32.add
-                      local.tee $1
-                      i32.store
-                      local.get $2
-                      local.get $1
-                      i32.const 1
-                      i32.or
-                      i32.store offset=4
-                      local.get $2
-                      local.get $1
-                      i32.add
-                      i32.const 40
-                      i32.store offset=4
-                      i32.const 3664
-                      i32.const 4124
-                      i32.load
-                      i32.store
-                      br 6 (;@3;)
-                    end
-                  end
-                end
-              end
-              local.get $1
-              i32.const 3652
-              i32.load
-              local.tee $2
-              i32.lt_u
-              if ;; label = @6
-                block ;; label = @7
-                  i32.const 3652
-                  local.get $1
-                  i32.store
-                  local.get $1
-                  local.set $2
-                end
-              end
-              local.get $1
-              local.get $3
-              i32.add
-              local.set $10
-              i32.const 4084
-              local.set $5
-              block $label$208 ;; label = @6
-                block $label$209 ;; label = @7
-                  loop $label$210 ;; label = @8
-                    local.get $5
-                    i32.load
-                    local.get $10
-                    i32.eq
-                    br_if 1 (;@7;)
-                    local.get $5
-                    i32.load offset=8
-                    local.tee $5
-                    br_if 0 (;@8;)
-                    i32.const 4084
-                    local.set $5
-                  end
-                  br 1 (;@6;)
-                end
-                local.get $5
-                i32.load offset=12
-                i32.const 8
-                i32.and
-                if ;; label = @7
-                  i32.const 4084
-                  local.set $5
-                else
-                  block ;; label = @8
-                    local.get $5
-                    local.get $1
-                    i32.store
-                    local.get $5
-                    i32.const 4
-                    i32.add
-                    local.tee $5
-                    local.get $5
-                    i32.load
-                    local.get $3
-                    i32.add
-                    i32.store
-                    i32.const 0
-                    local.get $1
-                    i32.const 8
-                    i32.add
-                    local.tee $4
-                    i32.sub
-                    i32.const 7
-                    i32.and
-                    local.set $7
-                    i32.const 0
-                    local.get $10
-                    i32.const 8
-                    i32.add
-                    local.tee $5
-                    i32.sub
-                    i32.const 7
-                    i32.and
-                    local.set $3
-                    local.get $1
-                    local.get $4
-                    i32.const 7
-                    i32.and
-                    if (result i32) ;; label = @9
-                      local.get $7
-                    else
-                      i32.const 0
-                    end
-                    i32.add
-                    local.tee $13
-                    local.get $0
-                    i32.add
-                    local.set $6
-                    local.get $10
-                    local.get $5
-                    i32.const 7
-                    i32.and
-                    if (result i32) ;; label = @9
-                      local.get $3
-                    else
-                      i32.const 0
-                    end
-                    i32.add
-                    local.tee $4
-                    local.get $13
-                    i32.sub
-                    local.get $0
-                    i32.sub
-                    local.set $7
-                    local.get $13
-                    local.get $0
-                    i32.const 3
-                    i32.or
-                    i32.store offset=4
-                    block $label$217 ;; label = @9
-                      local.get $4
-                      local.get $8
-                      i32.eq
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const 3648
-                          i32.const 3648
-                          i32.load
-                          local.get $7
-                          i32.add
-                          local.tee $0
-                          i32.store
-                          i32.const 3660
-                          local.get $6
-                          i32.store
-                          local.get $6
-                          local.get $0
-                          i32.const 1
-                          i32.or
-                          i32.store offset=4
-                        end
-                      else
-                        block ;; label = @11
-                          local.get $4
-                          i32.const 3656
-                          i32.load
-                          i32.eq
-                          if ;; label = @12
-                            block ;; label = @13
-                              i32.const 3644
-                              i32.const 3644
-                              i32.load
-                              local.get $7
-                              i32.add
-                              local.tee $0
-                              i32.store
-                              i32.const 3656
-                              local.get $6
-                              i32.store
-                              local.get $6
-                              local.get $0
-                              i32.const 1
-                              i32.or
-                              i32.store offset=4
-                              local.get $6
-                              local.get $0
-                              i32.add
-                              local.get $0
-                              i32.store
-                              br 4 (;@9;)
-                            end
-                          end
-                          local.get $4
-                          i32.load offset=4
-                          local.tee $0
-                          i32.const 3
-                          i32.and
-                          i32.const 1
-                          i32.eq
-                          if (result i32) ;; label = @12
-                            block (result i32) ;; label = @13
-                              local.get $0
-                              i32.const -8
-                              i32.and
-                              local.set $11
-                              local.get $0
-                              i32.const 3
-                              i32.shr_u
-                              local.set $1
-                              block $label$222 ;; label = @14
-                                local.get $0
-                                i32.const 256
-                                i32.lt_u
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $4
-                                    i32.load offset=12
-                                    local.set $5
-                                    block $label$224 ;; label = @17
-                                      local.get $4
-                                      i32.load offset=8
-                                      local.tee $3
-                                      local.get $1
-                                      i32.const 1
-                                      i32.shl
-                                      i32.const 2
-                                      i32.shl
-                                      i32.const 3676
-                                      i32.add
-                                      local.tee $0
-                                      i32.ne
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $3
-                                          local.get $2
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$10
-                                          end
-                                          local.get $3
-                                          i32.load offset=12
-                                          local.get $4
-                                          i32.eq
-                                          br_if 2 (;@17;)
-                                          call $fimport$10
-                                        end
-                                      end
-                                    end
-                                    local.get $5
-                                    local.get $3
-                                    i32.eq
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        i32.const 3636
-                                        i32.const 3636
-                                        i32.load
-                                        i32.const 1
-                                        local.get $1
-                                        i32.shl
-                                        i32.const -1
-                                        i32.xor
-                                        i32.and
-                                        i32.store
-                                        br 4 (;@14;)
-                                      end
-                                    end
-                                    block $label$228 ;; label = @17
-                                      local.get $5
-                                      local.get $0
-                                      i32.eq
-                                      if ;; label = @18
-                                        local.get $5
-                                        i32.const 8
-                                        i32.add
-                                        local.set $20
-                                      else
-                                        block ;; label = @19
-                                          local.get $5
-                                          local.get $2
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$10
-                                          end
-                                          local.get $5
-                                          i32.const 8
-                                          i32.add
-                                          local.tee $0
-                                          i32.load
-                                          local.get $4
-                                          i32.eq
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              local.get $0
-                                              local.set $20
-                                              br 4 (;@17;)
-                                            end
-                                          end
-                                          call $fimport$10
-                                        end
-                                      end
-                                    end
-                                    local.get $3
-                                    local.get $5
-                                    i32.store offset=12
-                                    local.get $20
-                                    local.get $3
-                                    i32.store
-                                  end
-                                else
-                                  block ;; label = @16
-                                    local.get $4
-                                    i32.load offset=24
-                                    local.set $8
-                                    block $label$234 ;; label = @17
-                                      local.get $4
-                                      i32.load offset=12
-                                      local.tee $0
-                                      local.get $4
-                                      i32.eq
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $4
-                                          i32.const 16
-                                          i32.add
-                                          local.tee $3
-                                          i32.const 4
-                                          i32.add
-                                          local.tee $1
-                                          i32.load
-                                          local.tee $0
-                                          i32.eqz
-                                          if ;; label = @20
-                                            local.get $3
-                                            i32.load
-                                            local.tee $0
-                                            if ;; label = @21
-                                              local.get $3
-                                              local.set $1
-                                            else
-                                              block ;; label = @22
-                                                i32.const 0
-                                                local.set $12
-                                                br 5 (;@17;)
-                                              end
-                                            end
-                                          end
-                                          loop $label$239 ;; label = @20
-                                            local.get $0
-                                            i32.const 20
-                                            i32.add
-                                            local.tee $5
-                                            i32.load
-                                            local.tee $3
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $3
-                                                local.set $0
-                                                local.get $5
-                                                local.set $1
-                                                br 2 (;@20;)
-                                              end
-                                            end
-                                            local.get $0
-                                            i32.const 16
-                                            i32.add
-                                            local.tee $5
-                                            i32.load
-                                            local.tee $3
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $3
-                                                local.set $0
-                                                local.get $5
-                                                local.set $1
-                                                br 2 (;@20;)
-                                              end
-                                            end
-                                          end
-                                          local.get $1
-                                          local.get $2
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$10
-                                          else
-                                            block ;; label = @21
-                                              local.get $1
-                                              i32.const 0
-                                              i32.store
-                                              local.get $0
-                                              local.set $12
-                                            end
-                                          end
-                                        end
-                                      else
-                                        block ;; label = @19
-                                          local.get $4
-                                          i32.load offset=8
-                                          local.tee $5
-                                          local.get $2
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$10
-                                          end
-                                          local.get $5
-                                          i32.const 12
-                                          i32.add
-                                          local.tee $3
-                                          i32.load
-                                          local.get $4
-                                          i32.ne
-                                          if ;; label = @20
-                                            call $fimport$10
-                                          end
-                                          local.get $0
-                                          i32.const 8
-                                          i32.add
-                                          local.tee $1
-                                          i32.load
-                                          local.get $4
-                                          i32.eq
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              local.get $3
-                                              local.get $0
-                                              i32.store
-                                              local.get $1
-                                              local.get $5
-                                              i32.store
-                                              local.get $0
-                                              local.set $12
-                                            end
-                                          else
-                                            call $fimport$10
-                                          end
-                                        end
-                                      end
-                                    end
-                                    local.get $8
-                                    i32.eqz
-                                    br_if 2 (;@14;)
-                                    block $label$249 ;; label = @17
-                                      local.get $4
-                                      local.get $4
-                                      i32.load offset=28
-                                      local.tee $1
-                                      i32.const 2
-                                      i32.shl
-                                      i32.const 3940
-                                      i32.add
-                                      local.tee $0
-                                      i32.load
-                                      i32.eq
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $0
-                                          local.get $12
-                                          i32.store
-                                          local.get $12
-                                          br_if 2 (;@17;)
-                                          i32.const 3640
-                                          i32.const 3640
-                                          i32.load
-                                          i32.const 1
-                                          local.get $1
-                                          i32.shl
-                                          i32.const -1
-                                          i32.xor
-                                          i32.and
-                                          i32.store
-                                          br 5 (;@14;)
-                                        end
-                                      else
-                                        block ;; label = @19
-                                          local.get $8
-                                          i32.const 3652
-                                          i32.load
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$10
-                                          end
-                                          local.get $8
-                                          i32.const 16
-                                          i32.add
-                                          local.tee $0
-                                          i32.load
-                                          local.get $4
-                                          i32.eq
-                                          if ;; label = @20
-                                            local.get $0
-                                            local.get $12
-                                            i32.store
-                                          else
-                                            local.get $8
-                                            local.get $12
-                                            i32.store offset=20
-                                          end
-                                          local.get $12
-                                          i32.eqz
-                                          br_if 5 (;@14;)
-                                        end
-                                      end
-                                    end
-                                    local.get $12
-                                    i32.const 3652
-                                    i32.load
-                                    local.tee $1
-                                    i32.lt_u
-                                    if ;; label = @17
-                                      call $fimport$10
-                                    end
-                                    local.get $12
-                                    local.get $8
-                                    i32.store offset=24
-                                    local.get $4
-                                    i32.const 16
-                                    i32.add
-                                    local.tee $0
-                                    i32.load
-                                    local.tee $3
-                                    if ;; label = @17
-                                      local.get $3
-                                      local.get $1
-                                      i32.lt_u
-                                      if ;; label = @18
-                                        call $fimport$10
-                                      else
-                                        block ;; label = @19
-                                          local.get $12
-                                          local.get $3
-                                          i32.store offset=16
-                                          local.get $3
-                                          local.get $12
-                                          i32.store offset=24
-                                        end
-                                      end
-                                    end
-                                    local.get $0
-                                    i32.load offset=4
-                                    local.tee $0
-                                    i32.eqz
-                                    br_if 2 (;@14;)
-                                    local.get $0
-                                    i32.const 3652
-                                    i32.load
-                                    i32.lt_u
-                                    if ;; label = @17
-                                      call $fimport$10
-                                    else
-                                      block ;; label = @18
-                                        local.get $12
-                                        local.get $0
-                                        i32.store offset=20
-                                        local.get $0
-                                        local.get $12
-                                        i32.store offset=24
-                                      end
-                                    end
-                                  end
-                                end
-                              end
-                              local.get $11
-                              local.get $7
-                              i32.add
-                              local.set $7
-                              local.get $4
-                              local.get $11
-                              i32.add
-                            end
-                          else
-                            local.get $4
-                          end
-                          local.tee $0
-                          i32.const 4
-                          i32.add
-                          local.tee $0
-                          local.get $0
-                          i32.load
-                          i32.const -2
-                          i32.and
-                          i32.store
-                          local.get $6
-                          local.get $7
-                          i32.const 1
-                          i32.or
-                          i32.store offset=4
-                          local.get $6
-                          local.get $7
-                          i32.add
-                          local.get $7
-                          i32.store
-                          local.get $7
-                          i32.const 3
-                          i32.shr_u
-                          local.set $0
-                          local.get $7
-                          i32.const 256
-                          i32.lt_u
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $0
-                              i32.const 1
-                              i32.shl
-                              i32.const 2
-                              i32.shl
-                              i32.const 3676
-                              i32.add
-                              local.set $3
-                              block $label$263 ;; label = @14
-                                i32.const 3636
-                                i32.load
-                                local.tee $1
-                                i32.const 1
-                                local.get $0
-                                i32.shl
-                                local.tee $0
-                                i32.and
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $3
-                                    i32.const 8
-                                    i32.add
-                                    local.tee $1
-                                    i32.load
-                                    local.tee $0
-                                    i32.const 3652
-                                    i32.load
-                                    i32.ge_u
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $1
-                                        local.set $21
-                                        local.get $0
-                                        local.set $9
-                                        br 4 (;@14;)
-                                      end
-                                    end
-                                    call $fimport$10
-                                  end
-                                else
-                                  block ;; label = @16
-                                    i32.const 3636
-                                    local.get $1
-                                    local.get $0
-                                    i32.or
-                                    i32.store
-                                    local.get $3
-                                    i32.const 8
-                                    i32.add
-                                    local.set $21
-                                    local.get $3
-                                    local.set $9
-                                  end
-                                end
-                              end
-                              local.get $21
-                              local.get $6
-                              i32.store
-                              local.get $9
-                              local.get $6
-                              i32.store offset=12
-                              local.get $6
-                              local.get $9
-                              i32.store offset=8
-                              local.get $6
-                              local.get $3
-                              i32.store offset=12
-                              br 4 (;@9;)
-                            end
-                          end
-                          block $label$267 (result i32) ;; label = @12
-                            local.get $7
-                            i32.const 8
-                            i32.shr_u
-                            local.tee $0
-                            if (result i32) ;; label = @13
-                              block (result i32) ;; label = @14
-                                i32.const 31
-                                local.get $7
-                                i32.const 16777215
-                                i32.gt_u
-                                br_if 2 (;@12;)
-                                drop
-                                local.get $7
-                                i32.const 14
-                                local.get $0
-                                local.get $0
-                                i32.const 1048320
-                                i32.add
-                                i32.const 16
-                                i32.shr_u
-                                i32.const 8
-                                i32.and
-                                local.tee $3
-                                i32.shl
-                                local.tee $1
-                                i32.const 520192
-                                i32.add
-                                i32.const 16
-                                i32.shr_u
-                                i32.const 4
-                                i32.and
-                                local.tee $0
-                                local.get $3
-                                i32.or
-                                local.get $1
-                                local.get $0
-                                i32.shl
-                                local.tee $1
-                                i32.const 245760
-                                i32.add
-                                i32.const 16
-                                i32.shr_u
-                                i32.const 2
-                                i32.and
-                                local.tee $0
-                                i32.or
-                                i32.sub
-                                local.get $1
-                                local.get $0
-                                i32.shl
-                                i32.const 15
-                                i32.shr_u
-                                i32.add
-                                local.tee $0
-                                i32.const 7
-                                i32.add
-                                i32.shr_u
-                                i32.const 1
-                                i32.and
-                                local.get $0
-                                i32.const 1
-                                i32.shl
-                                i32.or
-                              end
-                            else
-                              i32.const 0
-                            end
-                          end
-                          local.tee $2
-                          i32.const 2
-                          i32.shl
-                          i32.const 3940
-                          i32.add
-                          local.set $3
-                          local.get $6
-                          local.get $2
-                          i32.store offset=28
-                          local.get $6
-                          i32.const 16
-                          i32.add
-                          local.tee $0
-                          i32.const 0
-                          i32.store offset=4
-                          local.get $0
-                          i32.const 0
-                          i32.store
-                          i32.const 3640
-                          i32.load
-                          local.tee $1
-                          i32.const 1
-                          local.get $2
-                          i32.shl
-                          local.tee $0
-                          i32.and
-                          i32.eqz
-                          if ;; label = @12
-                            block ;; label = @13
-                              i32.const 3640
-                              local.get $1
-                              local.get $0
-                              i32.or
-                              i32.store
-                              local.get $3
-                              local.get $6
-                              i32.store
-                              local.get $6
-                              local.get $3
-                              i32.store offset=24
-                              local.get $6
-                              local.get $6
-                              i32.store offset=12
-                              local.get $6
-                              local.get $6
-                              i32.store offset=8
-                              br 4 (;@9;)
-                            end
-                          end
-                          local.get $3
-                          i32.load
-                          local.set $0
-                          i32.const 25
-                          local.get $2
-                          i32.const 1
-                          i32.shr_u
-                          i32.sub
-                          local.set $1
-                          local.get $7
-                          local.get $2
-                          i32.const 31
-                          i32.eq
-                          if (result i32) ;; label = @12
-                            i32.const 0
-                          else
-                            local.get $1
-                          end
-                          i32.shl
-                          local.set $2
-                          block $label$273 ;; label = @12
-                            block $label$274 ;; label = @13
-                              block $label$275 ;; label = @14
-                                loop $label$276 ;; label = @15
-                                  local.get $0
-                                  i32.load offset=4
-                                  i32.const -8
-                                  i32.and
-                                  local.get $7
-                                  i32.eq
-                                  br_if 2 (;@13;)
-                                  local.get $2
-                                  i32.const 1
-                                  i32.shl
-                                  local.set $3
-                                  local.get $0
-                                  i32.const 16
-                                  i32.add
-                                  local.get $2
-                                  i32.const 31
-                                  i32.shr_u
-                                  i32.const 2
-                                  i32.shl
-                                  i32.add
-                                  local.tee $2
-                                  i32.load
-                                  local.tee $1
-                                  i32.eqz
-                                  br_if 1 (;@14;)
-                                  local.get $3
-                                  local.set $2
-                                  local.get $1
-                                  local.set $0
-                                  br 0 (;@15;)
-                                end
-                              end
-                              local.get $2
-                              i32.const 3652
-                              i32.load
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$10
-                              else
-                                block ;; label = @15
-                                  local.get $2
-                                  local.get $6
-                                  i32.store
-                                  local.get $6
-                                  local.get $0
-                                  i32.store offset=24
-                                  local.get $6
-                                  local.get $6
-                                  i32.store offset=12
-                                  local.get $6
-                                  local.get $6
-                                  i32.store offset=8
-                                  br 6 (;@9;)
-                                end
-                              end
-                              br 1 (;@12;)
-                            end
-                            local.get $0
-                            i32.const 8
-                            i32.add
-                            local.tee $3
-                            i32.load
-                            local.tee $2
-                            i32.const 3652
-                            i32.load
-                            local.tee $1
-                            i32.ge_u
-                            local.get $0
-                            local.get $1
-                            i32.ge_u
-                            i32.and
-                            if ;; label = @13
-                              block ;; label = @14
-                                local.get $2
-                                local.get $6
-                                i32.store offset=12
-                                local.get $3
-                                local.get $6
-                                i32.store
-                                local.get $6
-                                local.get $2
-                                i32.store offset=8
-                                local.get $6
-                                local.get $0
-                                i32.store offset=12
-                                local.get $6
-                                i32.const 0
-                                i32.store offset=24
-                              end
-                            else
-                              call $fimport$10
-                            end
-                          end
-                        end
-                      end
-                    end
-                    local.get $14
-                    global.set $global$1
-                    local.get $13
-                    i32.const 8
-                    i32.add
-                    return
-                  end
-                end
-              end
-              loop $label$281 ;; label = @6
-                block $label$282 ;; label = @7
-                  local.get $5
-                  i32.load
-                  local.tee $2
-                  local.get $8
-                  i32.le_u
-                  if ;; label = @8
-                    local.get $2
-                    local.get $5
-                    i32.load offset=4
-                    i32.add
-                    local.tee $13
-                    local.get $8
-                    i32.gt_u
-                    br_if 1 (;@7;)
-                  end
-                  local.get $5
-                  i32.load offset=8
-                  local.set $5
-                  br 1 (;@6;)
-                end
-              end
-              i32.const 0
-              local.get $13
-              i32.const -47
-              i32.add
-              local.tee $7
-              i32.const 8
-              i32.add
-              local.tee $5
-              i32.sub
-              i32.const 7
-              i32.and
-              local.set $2
-              local.get $7
-              local.get $5
-              i32.const 7
-              i32.and
-              if (result i32) ;; label = @6
-                local.get $2
-              else
-                i32.const 0
-              end
-              i32.add
-              local.tee $2
-              local.get $8
-              i32.const 16
-              i32.add
-              local.tee $12
-              i32.lt_u
-              if (result i32) ;; label = @6
-                local.get $8
-              else
-                local.get $2
-              end
-              local.tee $7
-              i32.const 8
-              i32.add
-              local.set $10
-              local.get $7
-              i32.const 24
-              i32.add
-              local.set $5
-              local.get $3
-              i32.const -40
-              i32.add
-              local.set $9
-              i32.const 0
-              local.get $1
-              i32.const 8
-              i32.add
-              local.tee $4
-              i32.sub
-              i32.const 7
-              i32.and
-              local.set $2
-              i32.const 3660
-              local.get $1
-              local.get $4
-              i32.const 7
-              i32.and
-              if (result i32) ;; label = @6
-                local.get $2
-              else
-                i32.const 0
-                local.tee $2
-              end
-              i32.add
-              local.tee $4
-              i32.store
-              i32.const 3648
-              local.get $9
-              local.get $2
-              i32.sub
-              local.tee $2
-              i32.store
-              local.get $4
-              local.get $2
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $4
-              local.get $2
-              i32.add
-              i32.const 40
-              i32.store offset=4
-              i32.const 3664
-              i32.const 4124
-              i32.load
-              i32.store
-              local.get $7
-              i32.const 4
-              i32.add
-              local.tee $2
-              i32.const 27
-              i32.store
-              local.get $10
-              i32.const 4084
-              i64.load align=4
-              i64.store align=4
-              local.get $10
-              i32.const 4092
-              i64.load align=4
-              i64.store offset=8 align=4
-              i32.const 4084
-              local.get $1
-              i32.store
-              i32.const 4088
-              local.get $3
-              i32.store
-              i32.const 4096
-              i32.const 0
-              i32.store
-              i32.const 4092
-              local.get $10
-              i32.store
-              local.get $5
-              local.set $1
-              loop $label$290 ;; label = @6
-                local.get $1
-                i32.const 4
-                i32.add
-                local.tee $1
-                i32.const 7
-                i32.store
-                local.get $1
-                i32.const 4
-                i32.add
-                local.get $13
-                i32.lt_u
-                br_if 0 (;@6;)
-              end
-              local.get $7
-              local.get $8
-              i32.ne
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $2
-                  local.get $2
-                  i32.load
-                  i32.const -2
-                  i32.and
-                  i32.store
-                  local.get $8
-                  local.get $7
-                  local.get $8
-                  i32.sub
-                  local.tee $4
-                  i32.const 1
-                  i32.or
-                  i32.store offset=4
-                  local.get $7
-                  local.get $4
-                  i32.store
-                  local.get $4
-                  i32.const 3
-                  i32.shr_u
-                  local.set $1
-                  local.get $4
-                  i32.const 256
-                  i32.lt_u
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $1
-                      i32.const 1
-                      i32.shl
-                      i32.const 2
-                      i32.shl
-                      i32.const 3676
-                      i32.add
-                      local.set $2
-                      i32.const 3636
-                      i32.load
-                      local.tee $3
-                      i32.const 1
-                      local.get $1
-                      i32.shl
-                      local.tee $1
-                      i32.and
-                      if ;; label = @10
-                        local.get $2
-                        i32.const 8
-                        i32.add
-                        local.tee $3
-                        i32.load
-                        local.tee $1
-                        i32.const 3652
-                        i32.load
-                        i32.lt_u
-                        if ;; label = @11
-                          call $fimport$10
-                        else
-                          block ;; label = @12
-                            local.get $3
-                            local.set $15
-                            local.get $1
-                            local.set $11
-                          end
-                        end
-                      else
-                        block ;; label = @11
-                          i32.const 3636
-                          local.get $3
-                          local.get $1
-                          i32.or
-                          i32.store
-                          local.get $2
-                          i32.const 8
-                          i32.add
-                          local.set $15
-                          local.get $2
-                          local.set $11
-                        end
-                      end
-                      local.get $15
-                      local.get $8
-                      i32.store
-                      local.get $11
-                      local.get $8
-                      i32.store offset=12
-                      local.get $8
-                      local.get $11
-                      i32.store offset=8
-                      local.get $8
-                      local.get $2
-                      i32.store offset=12
-                      br 6 (;@3;)
-                    end
-                  end
-                  local.get $4
-                  i32.const 8
-                  i32.shr_u
-                  local.tee $1
-                  if (result i32) ;; label = @8
-                    local.get $4
-                    i32.const 16777215
-                    i32.gt_u
-                    if (result i32) ;; label = @9
-                      i32.const 31
-                    else
-                      local.get $4
-                      i32.const 14
-                      local.get $1
-                      local.get $1
-                      i32.const 1048320
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 8
-                      i32.and
-                      local.tee $2
-                      i32.shl
-                      local.tee $3
-                      i32.const 520192
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 4
-                      i32.and
-                      local.tee $1
-                      local.get $2
-                      i32.or
-                      local.get $3
-                      local.get $1
-                      i32.shl
-                      local.tee $3
-                      i32.const 245760
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 2
-                      i32.and
-                      local.tee $1
-                      i32.or
-                      i32.sub
-                      local.get $3
-                      local.get $1
-                      i32.shl
-                      i32.const 15
-                      i32.shr_u
-                      i32.add
-                      local.tee $1
-                      i32.const 7
-                      i32.add
-                      i32.shr_u
-                      i32.const 1
-                      i32.and
-                      local.get $1
-                      i32.const 1
-                      i32.shl
-                      i32.or
-                    end
-                  else
-                    i32.const 0
-                  end
-                  local.tee $5
-                  i32.const 2
-                  i32.shl
-                  i32.const 3940
-                  i32.add
-                  local.set $2
-                  local.get $8
-                  local.get $5
-                  i32.store offset=28
-                  local.get $8
-                  i32.const 0
-                  i32.store offset=20
-                  local.get $12
-                  i32.const 0
-                  i32.store
-                  i32.const 3640
-                  i32.load
-                  local.tee $3
-                  i32.const 1
-                  local.get $5
-                  i32.shl
-                  local.tee $1
-                  i32.and
-                  i32.eqz
-                  if ;; label = @8
-                    block ;; label = @9
-                      i32.const 3640
-                      local.get $3
-                      local.get $1
-                      i32.or
-                      i32.store
-                      local.get $2
-                      local.get $8
-                      i32.store
-                      local.get $8
-                      local.get $2
-                      i32.store offset=24
-                      local.get $8
-                      local.get $8
-                      i32.store offset=12
-                      local.get $8
-                      local.get $8
-                      i32.store offset=8
-                      br 6 (;@3;)
-                    end
-                  end
-                  local.get $2
-                  i32.load
-                  local.set $1
-                  i32.const 25
-                  local.get $5
-                  i32.const 1
-                  i32.shr_u
-                  i32.sub
-                  local.set $3
-                  local.get $4
-                  local.get $5
-                  i32.const 31
-                  i32.eq
-                  if (result i32) ;; label = @8
-                    i32.const 0
-                  else
-                    local.get $3
-                  end
-                  i32.shl
-                  local.set $5
-                  block $label$304 ;; label = @8
-                    block $label$305 ;; label = @9
-                      block $label$306 ;; label = @10
-                        loop $label$307 ;; label = @11
-                          local.get $1
-                          i32.load offset=4
-                          i32.const -8
-                          i32.and
-                          local.get $4
-                          i32.eq
-                          br_if 2 (;@9;)
-                          local.get $5
-                          i32.const 1
-                          i32.shl
-                          local.set $2
-                          local.get $1
-                          i32.const 16
-                          i32.add
-                          local.get $5
-                          i32.const 31
-                          i32.shr_u
-                          i32.const 2
-                          i32.shl
-                          i32.add
-                          local.tee $5
-                          i32.load
-                          local.tee $3
-                          i32.eqz
-                          br_if 1 (;@10;)
-                          local.get $2
-                          local.set $5
-                          local.get $3
-                          local.set $1
-                          br 0 (;@11;)
-                        end
-                      end
-                      local.get $5
-                      i32.const 3652
-                      i32.load
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$10
-                      else
-                        block ;; label = @11
-                          local.get $5
-                          local.get $8
-                          i32.store
-                          local.get $8
-                          local.get $1
-                          i32.store offset=24
-                          local.get $8
-                          local.get $8
-                          i32.store offset=12
-                          local.get $8
-                          local.get $8
-                          i32.store offset=8
-                          br 8 (;@3;)
-                        end
-                      end
-                      br 1 (;@8;)
-                    end
-                    local.get $1
-                    i32.const 8
-                    i32.add
-                    local.tee $2
-                    i32.load
-                    local.tee $5
-                    i32.const 3652
-                    i32.load
-                    local.tee $3
-                    i32.ge_u
-                    local.get $1
-                    local.get $3
-                    i32.ge_u
-                    i32.and
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $5
-                        local.get $8
-                        i32.store offset=12
-                        local.get $2
-                        local.get $8
-                        i32.store
-                        local.get $8
-                        local.get $5
-                        i32.store offset=8
-                        local.get $8
-                        local.get $1
-                        i32.store offset=12
-                        local.get $8
-                        i32.const 0
-                        i32.store offset=24
-                      end
-                    else
-                      call $fimport$10
-                    end
-                  end
-                end
-              end
-            end
-          else
-            block ;; label = @5
-              i32.const 3652
-              i32.load
-              local.tee $2
-              i32.eqz
-              local.get $1
-              local.get $2
-              i32.lt_u
-              i32.or
-              if ;; label = @6
-                i32.const 3652
-                local.get $1
-                i32.store
-              end
-              i32.const 4084
-              local.get $1
-              i32.store
-              i32.const 4088
-              local.get $3
-              i32.store
-              i32.const 4096
-              i32.const 0
-              i32.store
-              i32.const 3672
-              i32.const 4108
-              i32.load
-              i32.store
-              i32.const 3668
-              i32.const -1
-              i32.store
-              i32.const 0
-              local.set $2
-              loop $label$314 ;; label = @6
-                local.get $2
-                i32.const 1
-                i32.shl
-                i32.const 2
-                i32.shl
-                i32.const 3676
-                i32.add
-                local.tee $5
-                local.get $5
-                i32.store offset=12
-                local.get $5
-                local.get $5
-                i32.store offset=8
-                local.get $2
-                i32.const 1
-                i32.add
-                local.tee $2
-                i32.const 32
-                i32.ne
-                br_if 0 (;@6;)
-              end
-              local.get $3
-              i32.const -40
-              i32.add
-              local.set $5
-              i32.const 0
-              local.get $1
-              i32.const 8
-              i32.add
-              local.tee $2
-              i32.sub
-              i32.const 7
-              i32.and
-              local.set $3
-              i32.const 3660
-              local.get $1
-              local.get $2
-              i32.const 7
-              i32.and
-              if (result i32) ;; label = @6
-                local.get $3
-              else
-                i32.const 0
-              end
-              local.tee $1
-              i32.add
-              local.tee $3
-              i32.store
-              i32.const 3648
-              local.get $5
-              local.get $1
-              i32.sub
-              local.tee $1
-              i32.store
-              local.get $3
-              local.get $1
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $3
-              local.get $1
-              i32.add
-              i32.const 40
-              i32.store offset=4
-              i32.const 3664
-              i32.const 4124
-              i32.load
-              i32.store
-            end
-          end
-        end
-        i32.const 3648
-        i32.load
-        local.tee $1
-        local.get $0
-        i32.gt_u
-        if ;; label = @3
-          block ;; label = @4
-            i32.const 3648
-            local.get $1
-            local.get $0
-            i32.sub
-            local.tee $3
-            i32.store
-            i32.const 3660
-            i32.const 3660
-            i32.load
-            local.tee $2
-            local.get $0
-            i32.add
-            local.tee $1
-            i32.store
-            local.get $1
-            local.get $3
-            i32.const 1
-            i32.or
-            i32.store offset=4
-            local.get $2
-            local.get $0
-            i32.const 3
-            i32.or
-            i32.store offset=4
-            local.get $14
-            global.set $global$1
-            local.get $2
-            i32.const 8
-            i32.add
-            return
-          end
-        end
-      end
-      call $12
-      i32.const 12
-      i32.store
-      local.get $14
-      global.set $global$1
-      i32.const 0
-    end
+ )
+ (func $43 (; 56 ;) (type $3) (result i32)
+  (i32.const 0)
+ )
+ (func $44 (; 57 ;) (type $4) (param $0 i32) (param $1 i32) (result i32)
+  (call_indirect (type $1)
+   (local.get $1)
+   (i32.add
+    (i32.and
+     (local.get $0)
+     (i32.const 1)
+    )
+    (i32.const 0)
+   )
   )
-  (func $38 (;51;) (type $2) (param $0 i32)
-    (local $1 i32) (local $2 i32) (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32) (local $15 i32)
-    block $label$1 ;; label = @1
-      local.get $0
-      i32.eqz
-      if ;; label = @2
-        return
-      end
-      local.get $0
-      i32.const -8
-      i32.add
-      local.tee $1
-      i32.const 3652
-      i32.load
-      local.tee $11
-      i32.lt_u
-      if ;; label = @2
-        call $fimport$10
-      end
-      local.get $0
-      i32.const -4
-      i32.add
-      i32.load
-      local.tee $0
-      i32.const 3
-      i32.and
-      local.tee $8
-      i32.const 1
-      i32.eq
-      if ;; label = @2
-        call $fimport$10
-      end
-      local.get $1
-      local.get $0
-      i32.const -8
-      i32.and
-      local.tee $4
-      i32.add
-      local.set $6
-      block $label$5 ;; label = @2
-        local.get $0
-        i32.const 1
-        i32.and
-        if ;; label = @3
-          block ;; label = @4
-            local.get $1
-            local.set $3
-            local.get $4
-            local.set $2
-          end
-        else
-          block ;; label = @4
-            local.get $8
-            i32.eqz
-            if ;; label = @5
-              return
-            end
-            local.get $1
-            i32.const 0
-            local.get $1
-            i32.load
-            local.tee $8
-            i32.sub
-            i32.add
-            local.tee $0
-            local.get $11
-            i32.lt_u
-            if ;; label = @5
-              call $fimport$10
-            end
-            local.get $8
-            local.get $4
-            i32.add
-            local.set $1
-            local.get $0
-            i32.const 3656
-            i32.load
-            i32.eq
-            if ;; label = @5
-              block ;; label = @6
-                local.get $6
-                i32.const 4
-                i32.add
-                local.tee $2
-                i32.load
-                local.tee $3
-                i32.const 3
-                i32.and
-                i32.const 3
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $0
-                    local.set $3
-                    local.get $1
-                    local.set $2
-                    br 6 (;@2;)
-                  end
-                end
-                i32.const 3644
-                local.get $1
-                i32.store
-                local.get $2
-                local.get $3
-                i32.const -2
-                i32.and
-                i32.store
-                local.get $0
-                local.get $1
-                i32.const 1
-                i32.or
-                i32.store offset=4
-                local.get $0
-                local.get $1
-                i32.add
-                local.get $1
-                i32.store
-                return
-              end
-            end
-            local.get $8
-            i32.const 3
-            i32.shr_u
-            local.set $10
-            local.get $8
-            i32.const 256
-            i32.lt_u
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                i32.load offset=12
-                local.set $3
-                local.get $0
-                i32.load offset=8
-                local.tee $4
-                local.get $10
-                i32.const 1
-                i32.shl
-                i32.const 2
-                i32.shl
-                i32.const 3676
-                i32.add
-                local.tee $2
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $4
-                    local.get $11
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $4
-                    i32.load offset=12
-                    local.get $0
-                    i32.ne
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                  end
-                end
-                local.get $3
-                local.get $4
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const 3636
-                    i32.const 3636
-                    i32.load
-                    i32.const 1
-                    local.get $10
-                    i32.shl
-                    i32.const -1
-                    i32.xor
-                    i32.and
-                    i32.store
-                    local.get $0
-                    local.set $3
-                    local.get $1
-                    local.set $2
-                    br 6 (;@2;)
-                  end
-                end
-                local.get $3
-                local.get $2
-                i32.eq
-                if ;; label = @7
-                  local.get $3
-                  i32.const 8
-                  i32.add
-                  local.set $5
-                else
-                  block ;; label = @8
-                    local.get $3
-                    local.get $11
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $3
-                    i32.const 8
-                    i32.add
-                    local.tee $2
-                    i32.load
-                    local.get $0
-                    i32.eq
-                    if ;; label = @9
-                      local.get $2
-                      local.set $5
-                    else
-                      call $fimport$10
-                    end
-                  end
-                end
-                local.get $4
-                local.get $3
-                i32.store offset=12
-                local.get $5
-                local.get $4
-                i32.store
-                local.get $0
-                local.set $3
-                local.get $1
-                local.set $2
-                br 4 (;@2;)
-              end
-            end
-            local.get $0
-            i32.load offset=24
-            local.set $12
-            block $label$22 ;; label = @5
-              local.get $0
-              i32.load offset=12
-              local.tee $4
-              local.get $0
-              i32.eq
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $0
-                  i32.const 16
-                  i32.add
-                  local.tee $5
-                  i32.const 4
-                  i32.add
-                  local.tee $8
-                  i32.load
-                  local.tee $4
-                  if ;; label = @8
-                    local.get $8
-                    local.set $5
-                  else
-                    local.get $5
-                    i32.load
-                    local.tee $4
-                    i32.eqz
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const 0
-                        local.set $7
-                        br 5 (;@5;)
-                      end
-                    end
-                  end
-                  loop $label$27 ;; label = @8
-                    local.get $4
-                    i32.const 20
-                    i32.add
-                    local.tee $8
-                    i32.load
-                    local.tee $10
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $10
-                        local.set $4
-                        local.get $8
-                        local.set $5
-                        br 2 (;@8;)
-                      end
-                    end
-                    local.get $4
-                    i32.const 16
-                    i32.add
-                    local.tee $8
-                    i32.load
-                    local.tee $10
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $10
-                        local.set $4
-                        local.get $8
-                        local.set $5
-                        br 2 (;@8;)
-                      end
-                    end
-                  end
-                  local.get $5
-                  local.get $11
-                  i32.lt_u
-                  if ;; label = @8
-                    call $fimport$10
-                  else
-                    block ;; label = @9
-                      local.get $5
-                      i32.const 0
-                      i32.store
-                      local.get $4
-                      local.set $7
-                    end
-                  end
-                end
-              else
-                block ;; label = @7
-                  local.get $0
-                  i32.load offset=8
-                  local.tee $5
-                  local.get $11
-                  i32.lt_u
-                  if ;; label = @8
-                    call $fimport$10
-                  end
-                  local.get $5
-                  i32.const 12
-                  i32.add
-                  local.tee $8
-                  i32.load
-                  local.get $0
-                  i32.ne
-                  if ;; label = @8
-                    call $fimport$10
-                  end
-                  local.get $4
-                  i32.const 8
-                  i32.add
-                  local.tee $10
-                  i32.load
-                  local.get $0
-                  i32.eq
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $8
-                      local.get $4
-                      i32.store
-                      local.get $10
-                      local.get $5
-                      i32.store
-                      local.get $4
-                      local.set $7
-                    end
-                  else
-                    call $fimport$10
-                  end
-                end
-              end
-            end
-            local.get $12
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                local.get $0
-                i32.load offset=28
-                local.tee $4
-                i32.const 2
-                i32.shl
-                i32.const 3940
-                i32.add
-                local.tee $5
-                i32.load
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $5
-                    local.get $7
-                    i32.store
-                    local.get $7
-                    i32.eqz
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const 3640
-                        i32.const 3640
-                        i32.load
-                        i32.const 1
-                        local.get $4
-                        i32.shl
-                        i32.const -1
-                        i32.xor
-                        i32.and
-                        i32.store
-                        local.get $0
-                        local.set $3
-                        local.get $1
-                        local.set $2
-                        br 8 (;@2;)
-                      end
-                    end
-                  end
-                else
-                  block ;; label = @8
-                    local.get $12
-                    i32.const 3652
-                    i32.load
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $12
-                    i32.const 16
-                    i32.add
-                    local.tee $4
-                    i32.load
-                    local.get $0
-                    i32.eq
-                    if ;; label = @9
-                      local.get $4
-                      local.get $7
-                      i32.store
-                    else
-                      local.get $12
-                      local.get $7
-                      i32.store offset=20
-                    end
-                    local.get $7
-                    i32.eqz
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $0
-                        local.set $3
-                        local.get $1
-                        local.set $2
-                        br 8 (;@2;)
-                      end
-                    end
-                  end
-                end
-                local.get $7
-                i32.const 3652
-                i32.load
-                local.tee $5
-                i32.lt_u
-                if ;; label = @7
-                  call $fimport$10
-                end
-                local.get $7
-                local.get $12
-                i32.store offset=24
-                local.get $0
-                i32.const 16
-                i32.add
-                local.tee $8
-                i32.load
-                local.tee $4
-                if ;; label = @7
-                  local.get $4
-                  local.get $5
-                  i32.lt_u
-                  if ;; label = @8
-                    call $fimport$10
-                  else
-                    block ;; label = @9
-                      local.get $7
-                      local.get $4
-                      i32.store offset=16
-                      local.get $4
-                      local.get $7
-                      i32.store offset=24
-                    end
-                  end
-                end
-                local.get $8
-                i32.load offset=4
-                local.tee $4
-                if ;; label = @7
-                  local.get $4
-                  i32.const 3652
-                  i32.load
-                  i32.lt_u
-                  if ;; label = @8
-                    call $fimport$10
-                  else
-                    block ;; label = @9
-                      local.get $7
-                      local.get $4
-                      i32.store offset=20
-                      local.get $4
-                      local.get $7
-                      i32.store offset=24
-                      local.get $0
-                      local.set $3
-                      local.get $1
-                      local.set $2
-                    end
-                  end
-                else
-                  block ;; label = @8
-                    local.get $0
-                    local.set $3
-                    local.get $1
-                    local.set $2
-                  end
-                end
-              end
-            else
-              block ;; label = @6
-                local.get $0
-                local.set $3
-                local.get $1
-                local.set $2
-              end
-            end
-          end
-        end
-      end
-      local.get $3
-      local.get $6
-      i32.ge_u
-      if ;; label = @2
-        call $fimport$10
-      end
-      local.get $6
-      i32.const 4
-      i32.add
-      local.tee $1
-      i32.load
-      local.tee $0
-      i32.const 1
-      i32.and
-      i32.eqz
-      if ;; label = @2
-        call $fimport$10
-      end
-      local.get $0
-      i32.const 2
-      i32.and
-      if ;; label = @2
-        block ;; label = @3
-          local.get $1
-          local.get $0
-          i32.const -2
-          i32.and
-          i32.store
-          local.get $3
-          local.get $2
-          i32.const 1
-          i32.or
-          i32.store offset=4
-          local.get $3
-          local.get $2
-          i32.add
-          local.get $2
-          i32.store
-        end
-      else
-        block ;; label = @3
-          local.get $6
-          i32.const 3660
-          i32.load
-          i32.eq
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 3648
-              i32.const 3648
-              i32.load
-              local.get $2
-              i32.add
-              local.tee $0
-              i32.store
-              i32.const 3660
-              local.get $3
-              i32.store
-              local.get $3
-              local.get $0
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $3
-              i32.const 3656
-              i32.load
-              i32.ne
-              if ;; label = @6
-                return
-              end
-              i32.const 3656
-              i32.const 0
-              i32.store
-              i32.const 3644
-              i32.const 0
-              i32.store
-              return
-            end
-          end
-          local.get $6
-          i32.const 3656
-          i32.load
-          i32.eq
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 3644
-              i32.const 3644
-              i32.load
-              local.get $2
-              i32.add
-              local.tee $0
-              i32.store
-              i32.const 3656
-              local.get $3
-              i32.store
-              local.get $3
-              local.get $0
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $3
-              local.get $0
-              i32.add
-              local.get $0
-              i32.store
-              return
-            end
-          end
-          local.get $0
-          i32.const -8
-          i32.and
-          local.get $2
-          i32.add
-          local.set $5
-          local.get $0
-          i32.const 3
-          i32.shr_u
-          local.set $4
-          block $label$61 ;; label = @4
-            local.get $0
-            i32.const 256
-            i32.lt_u
-            if ;; label = @5
-              block ;; label = @6
-                local.get $6
-                i32.load offset=12
-                local.set $2
-                local.get $6
-                i32.load offset=8
-                local.tee $1
-                local.get $4
-                i32.const 1
-                i32.shl
-                i32.const 2
-                i32.shl
-                i32.const 3676
-                i32.add
-                local.tee $0
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $1
-                    i32.const 3652
-                    i32.load
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $1
-                    i32.load offset=12
-                    local.get $6
-                    i32.ne
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                  end
-                end
-                local.get $2
-                local.get $1
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const 3636
-                    i32.const 3636
-                    i32.load
-                    i32.const 1
-                    local.get $4
-                    i32.shl
-                    i32.const -1
-                    i32.xor
-                    i32.and
-                    i32.store
-                    br 4 (;@4;)
-                  end
-                end
-                local.get $2
-                local.get $0
-                i32.eq
-                if ;; label = @7
-                  local.get $2
-                  i32.const 8
-                  i32.add
-                  local.set $14
-                else
-                  block ;; label = @8
-                    local.get $2
-                    i32.const 3652
-                    i32.load
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $2
-                    i32.const 8
-                    i32.add
-                    local.tee $0
-                    i32.load
-                    local.get $6
-                    i32.eq
-                    if ;; label = @9
-                      local.get $0
-                      local.set $14
-                    else
-                      call $fimport$10
-                    end
-                  end
-                end
-                local.get $1
-                local.get $2
-                i32.store offset=12
-                local.get $14
-                local.get $1
-                i32.store
-              end
-            else
-              block ;; label = @6
-                local.get $6
-                i32.load offset=24
-                local.set $7
-                block $label$73 ;; label = @7
-                  local.get $6
-                  i32.load offset=12
-                  local.tee $0
-                  local.get $6
-                  i32.eq
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $6
-                      i32.const 16
-                      i32.add
-                      local.tee $2
-                      i32.const 4
-                      i32.add
-                      local.tee $1
-                      i32.load
-                      local.tee $0
-                      if ;; label = @10
-                        local.get $1
-                        local.set $2
-                      else
-                        local.get $2
-                        i32.load
-                        local.tee $0
-                        i32.eqz
-                        if ;; label = @11
-                          block ;; label = @12
-                            i32.const 0
-                            local.set $9
-                            br 5 (;@7;)
-                          end
-                        end
-                      end
-                      loop $label$78 ;; label = @10
-                        local.get $0
-                        i32.const 20
-                        i32.add
-                        local.tee $1
-                        i32.load
-                        local.tee $4
-                        if ;; label = @11
-                          block ;; label = @12
-                            local.get $4
-                            local.set $0
-                            local.get $1
-                            local.set $2
-                            br 2 (;@10;)
-                          end
-                        end
-                        local.get $0
-                        i32.const 16
-                        i32.add
-                        local.tee $1
-                        i32.load
-                        local.tee $4
-                        if ;; label = @11
-                          block ;; label = @12
-                            local.get $4
-                            local.set $0
-                            local.get $1
-                            local.set $2
-                            br 2 (;@10;)
-                          end
-                        end
-                      end
-                      local.get $2
-                      i32.const 3652
-                      i32.load
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$10
-                      else
-                        block ;; label = @11
-                          local.get $2
-                          i32.const 0
-                          i32.store
-                          local.get $0
-                          local.set $9
-                        end
-                      end
-                    end
-                  else
-                    block ;; label = @9
-                      local.get $6
-                      i32.load offset=8
-                      local.tee $2
-                      i32.const 3652
-                      i32.load
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$10
-                      end
-                      local.get $2
-                      i32.const 12
-                      i32.add
-                      local.tee $1
-                      i32.load
-                      local.get $6
-                      i32.ne
-                      if ;; label = @10
-                        call $fimport$10
-                      end
-                      local.get $0
-                      i32.const 8
-                      i32.add
-                      local.tee $4
-                      i32.load
-                      local.get $6
-                      i32.eq
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $1
-                          local.get $0
-                          i32.store
-                          local.get $4
-                          local.get $2
-                          i32.store
-                          local.get $0
-                          local.set $9
-                        end
-                      else
-                        call $fimport$10
-                      end
-                    end
-                  end
-                end
-                local.get $7
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $6
-                    local.get $6
-                    i32.load offset=28
-                    local.tee $0
-                    i32.const 2
-                    i32.shl
-                    i32.const 3940
-                    i32.add
-                    local.tee $2
-                    i32.load
-                    i32.eq
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $2
-                        local.get $9
-                        i32.store
-                        local.get $9
-                        i32.eqz
-                        if ;; label = @11
-                          block ;; label = @12
-                            i32.const 3640
-                            i32.const 3640
-                            i32.load
-                            i32.const 1
-                            local.get $0
-                            i32.shl
-                            i32.const -1
-                            i32.xor
-                            i32.and
-                            i32.store
-                            br 8 (;@4;)
-                          end
-                        end
-                      end
-                    else
-                      block ;; label = @10
-                        local.get $7
-                        i32.const 3652
-                        i32.load
-                        i32.lt_u
-                        if ;; label = @11
-                          call $fimport$10
-                        end
-                        local.get $7
-                        i32.const 16
-                        i32.add
-                        local.tee $0
-                        i32.load
-                        local.get $6
-                        i32.eq
-                        if ;; label = @11
-                          local.get $0
-                          local.get $9
-                          i32.store
-                        else
-                          local.get $7
-                          local.get $9
-                          i32.store offset=20
-                        end
-                        local.get $9
-                        i32.eqz
-                        br_if 6 (;@4;)
-                      end
-                    end
-                    local.get $9
-                    i32.const 3652
-                    i32.load
-                    local.tee $2
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $9
-                    local.get $7
-                    i32.store offset=24
-                    local.get $6
-                    i32.const 16
-                    i32.add
-                    local.tee $1
-                    i32.load
-                    local.tee $0
-                    if ;; label = @9
-                      local.get $0
-                      local.get $2
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$10
-                      else
-                        block ;; label = @11
-                          local.get $9
-                          local.get $0
-                          i32.store offset=16
-                          local.get $0
-                          local.get $9
-                          i32.store offset=24
-                        end
-                      end
-                    end
-                    local.get $1
-                    i32.load offset=4
-                    local.tee $0
-                    if ;; label = @9
-                      local.get $0
-                      i32.const 3652
-                      i32.load
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$10
-                      else
-                        block ;; label = @11
-                          local.get $9
-                          local.get $0
-                          i32.store offset=20
-                          local.get $0
-                          local.get $9
-                          i32.store offset=24
-                        end
-                      end
-                    end
-                  end
-                end
-              end
-            end
-          end
-          local.get $3
-          local.get $5
-          i32.const 1
-          i32.or
-          i32.store offset=4
-          local.get $3
-          local.get $5
-          i32.add
-          local.get $5
-          i32.store
-          local.get $3
-          i32.const 3656
-          i32.load
-          i32.eq
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 3644
-              local.get $5
-              i32.store
-              return
-            end
-          else
-            local.get $5
-            local.set $2
-          end
-        end
-      end
-      local.get $2
-      i32.const 3
-      i32.shr_u
-      local.set $1
-      local.get $2
-      i32.const 256
-      i32.lt_u
-      if ;; label = @2
-        block ;; label = @3
-          local.get $1
-          i32.const 1
-          i32.shl
-          i32.const 2
-          i32.shl
-          i32.const 3676
-          i32.add
-          local.set $0
-          i32.const 3636
-          i32.load
-          local.tee $2
-          i32.const 1
-          local.get $1
-          i32.shl
-          local.tee $1
-          i32.and
-          if ;; label = @4
-            local.get $0
-            i32.const 8
-            i32.add
-            local.tee $2
-            i32.load
-            local.tee $1
-            i32.const 3652
-            i32.load
-            i32.lt_u
-            if ;; label = @5
-              call $fimport$10
-            else
-              block ;; label = @6
-                local.get $2
-                local.set $15
-                local.get $1
-                local.set $13
-              end
-            end
-          else
-            block ;; label = @5
-              i32.const 3636
-              local.get $2
-              local.get $1
-              i32.or
-              i32.store
-              local.get $0
-              i32.const 8
-              i32.add
-              local.set $15
-              local.get $0
-              local.set $13
-            end
-          end
-          local.get $15
-          local.get $3
-          i32.store
-          local.get $13
-          local.get $3
-          i32.store offset=12
-          local.get $3
-          local.get $13
-          i32.store offset=8
-          local.get $3
-          local.get $0
-          i32.store offset=12
-          return
-        end
-      end
-      local.get $2
-      i32.const 8
-      i32.shr_u
-      local.tee $0
-      if (result i32) ;; label = @2
-        local.get $2
-        i32.const 16777215
-        i32.gt_u
-        if (result i32) ;; label = @3
-          i32.const 31
-        else
-          local.get $2
-          i32.const 14
-          local.get $0
-          local.get $0
-          i32.const 1048320
-          i32.add
-          i32.const 16
-          i32.shr_u
-          i32.const 8
-          i32.and
-          local.tee $0
-          i32.shl
-          local.tee $1
-          i32.const 520192
-          i32.add
-          i32.const 16
-          i32.shr_u
-          i32.const 4
-          i32.and
-          local.tee $4
-          local.get $0
-          i32.or
-          local.get $1
-          local.get $4
-          i32.shl
-          local.tee $0
-          i32.const 245760
-          i32.add
-          i32.const 16
-          i32.shr_u
-          i32.const 2
-          i32.and
-          local.tee $1
-          i32.or
-          i32.sub
-          local.get $0
-          local.get $1
-          i32.shl
-          i32.const 15
-          i32.shr_u
-          i32.add
-          local.tee $0
-          i32.const 7
-          i32.add
-          i32.shr_u
-          i32.const 1
-          i32.and
-          local.get $0
-          i32.const 1
-          i32.shl
-          i32.or
-        end
-      else
-        i32.const 0
-      end
-      local.tee $1
-      i32.const 2
-      i32.shl
-      i32.const 3940
-      i32.add
-      local.set $0
-      local.get $3
-      local.get $1
-      i32.store offset=28
-      local.get $3
-      i32.const 0
-      i32.store offset=20
-      local.get $3
-      i32.const 0
-      i32.store offset=16
-      block $label$113 ;; label = @2
-        i32.const 3640
-        i32.load
-        local.tee $4
-        i32.const 1
-        local.get $1
-        i32.shl
-        local.tee $5
-        i32.and
-        if ;; label = @3
-          block ;; label = @4
-            local.get $0
-            i32.load
-            local.set $0
-            i32.const 25
-            local.get $1
-            i32.const 1
-            i32.shr_u
-            i32.sub
-            local.set $4
-            local.get $2
-            local.get $1
-            i32.const 31
-            i32.eq
-            if (result i32) ;; label = @5
-              i32.const 0
-            else
-              local.get $4
-            end
-            i32.shl
-            local.set $1
-            block $label$117 ;; label = @5
-              block $label$118 ;; label = @6
-                block $label$119 ;; label = @7
-                  loop $label$120 ;; label = @8
-                    local.get $0
-                    i32.load offset=4
-                    i32.const -8
-                    i32.and
-                    local.get $2
-                    i32.eq
-                    br_if 2 (;@6;)
-                    local.get $1
-                    i32.const 1
-                    i32.shl
-                    local.set $4
-                    local.get $0
-                    i32.const 16
-                    i32.add
-                    local.get $1
-                    i32.const 31
-                    i32.shr_u
-                    i32.const 2
-                    i32.shl
-                    i32.add
-                    local.tee $1
-                    i32.load
-                    local.tee $5
-                    i32.eqz
-                    br_if 1 (;@7;)
-                    local.get $4
-                    local.set $1
-                    local.get $5
-                    local.set $0
-                    br 0 (;@8;)
-                  end
-                end
-                local.get $1
-                i32.const 3652
-                i32.load
-                i32.lt_u
-                if ;; label = @7
-                  call $fimport$10
-                else
-                  block ;; label = @8
-                    local.get $1
-                    local.get $3
-                    i32.store
-                    local.get $3
-                    local.get $0
-                    i32.store offset=24
-                    local.get $3
-                    local.get $3
-                    i32.store offset=12
-                    local.get $3
-                    local.get $3
-                    i32.store offset=8
-                    br 6 (;@2;)
-                  end
-                end
-                br 1 (;@5;)
-              end
-              local.get $0
-              i32.const 8
-              i32.add
-              local.tee $1
-              i32.load
-              local.tee $2
-              i32.const 3652
-              i32.load
-              local.tee $4
-              i32.ge_u
-              local.get $0
-              local.get $4
-              i32.ge_u
-              i32.and
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $2
-                  local.get $3
-                  i32.store offset=12
-                  local.get $1
-                  local.get $3
-                  i32.store
-                  local.get $3
-                  local.get $2
-                  i32.store offset=8
-                  local.get $3
-                  local.get $0
-                  i32.store offset=12
-                  local.get $3
-                  i32.const 0
-                  i32.store offset=24
-                end
-              else
-                call $fimport$10
-              end
-            end
-          end
-        else
-          block ;; label = @4
-            i32.const 3640
-            local.get $4
-            local.get $5
-            i32.or
-            i32.store
-            local.get $0
-            local.get $3
-            i32.store
-            local.get $3
-            local.get $0
-            i32.store offset=24
-            local.get $3
-            local.get $3
-            i32.store offset=12
-            local.get $3
-            local.get $3
-            i32.store offset=8
-          end
-        end
-      end
-      i32.const 3668
-      i32.const 3668
-      i32.load
-      i32.const -1
-      i32.add
-      local.tee $0
-      i32.store
-      local.get $0
-      if ;; label = @2
-        return
-      else
-        i32.const 4092
-        local.set $0
-      end
-      loop $label$128 ;; label = @2
-        local.get $0
-        i32.load
-        local.tee $2
-        i32.const 8
-        i32.add
-        local.set $0
-        local.get $2
-        br_if 0 (;@2;)
-      end
-      i32.const 3668
-      i32.const -1
-      i32.store
-    end
+ )
+ (func $45 (; 58 ;) (type $12) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+  (call_indirect (type $0)
+   (local.get $1)
+   (local.get $2)
+   (local.get $3)
+   (i32.add
+    (i32.and
+     (local.get $0)
+     (i32.const 3)
+    )
+    (i32.const 2)
+   )
   )
-  (func $39 (;52;) (type $6)
-    nop
+ )
+ (func $46 (; 59 ;) (type $5) (param $0 i32) (param $1 i32)
+  (call_indirect (type $2)
+   (local.get $1)
+   (i32.add
+    (i32.and
+     (local.get $0)
+     (i32.const 1)
+    )
+    (i32.const 6)
+   )
   )
-  (func $40 (;53;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$0
-      i32.load
-      local.tee $2
-      local.get $0
-      i32.const 15
-      i32.add
-      i32.const -16
-      i32.and
-      local.tee $0
-      i32.add
-      local.set $1
-      local.get $0
-      i32.const 0
-      i32.gt_s
-      local.get $1
-      local.get $2
-      i32.lt_s
-      i32.and
-      local.get $1
-      i32.const 0
-      i32.lt_s
-      i32.or
-      if ;; label = @2
-        block ;; label = @3
-          call $fimport$6
-          drop
-          i32.const 12
-          call $fimport$11
-          i32.const -1
-          return
-        end
-      end
-      global.get $global$0
-      local.get $1
-      i32.store
-      local.get $1
-      call $fimport$5
-      i32.gt_s
-      if ;; label = @2
-        call $fimport$4
-        i32.eqz
-        if ;; label = @3
-          block ;; label = @4
-            i32.const 12
-            call $fimport$11
-            global.get $global$0
-            local.get $2
-            i32.store
-            i32.const -1
-            return
-          end
-        end
-      end
-      local.get $2
-    end
+ )
+ (func $47 (; 60 ;) (type $1) (param $0 i32) (result i32)
+  (block $label$1 (result i32)
+   (call $fimport$3
+    (i32.const 0)
+   )
+   (i32.const 0)
   )
-  (func $41 (;54;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $0
-      local.get $2
-      i32.add
-      local.set $4
-      local.get $2
-      i32.const 20
-      i32.ge_s
-      if ;; label = @2
-        block ;; label = @3
-          local.get $1
-          i32.const 255
-          i32.and
-          local.set $1
-          local.get $0
-          i32.const 3
-          i32.and
-          local.tee $3
-          if ;; label = @4
-            block ;; label = @5
-              local.get $0
-              i32.const 4
-              i32.add
-              local.get $3
-              i32.sub
-              local.set $3
-              loop $label$4 ;; label = @6
-                local.get $0
-                local.get $3
-                i32.lt_s
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $0
-                    local.get $1
-                    i32.store8
-                    local.get $0
-                    i32.const 1
-                    i32.add
-                    local.set $0
-                    br 2 (;@6;)
-                  end
-                end
-              end
-            end
-          end
-          local.get $1
-          local.get $1
-          i32.const 8
-          i32.shl
-          i32.or
-          local.get $1
-          i32.const 16
-          i32.shl
-          i32.or
-          local.get $1
-          i32.const 24
-          i32.shl
-          i32.or
-          local.set $3
-          local.get $4
-          i32.const -4
-          i32.and
-          local.set $5
-          loop $label$6 ;; label = @4
-            local.get $0
-            local.get $5
-            i32.lt_s
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                local.get $3
-                i32.store
-                local.get $0
-                i32.const 4
-                i32.add
-                local.set $0
-                br 2 (;@4;)
-              end
-            end
-          end
-        end
-      end
-      loop $label$8 ;; label = @2
-        local.get $0
-        local.get $4
-        i32.lt_s
-        if ;; label = @3
-          block ;; label = @4
-            local.get $0
-            local.get $1
-            i32.store8
-            local.get $0
-            i32.const 1
-            i32.add
-            local.set $0
-            br 2 (;@2;)
-          end
-        end
-      end
-      local.get $0
-      local.get $2
-      i32.sub
-    end
+ )
+ (func $48 (; 61 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (block $label$1 (result i32)
+   (call $fimport$3
+    (i32.const 1)
+   )
+   (i32.const 0)
   )
-  (func $42 (;55;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $2
-      i32.const 4096
-      i32.ge_s
-      if ;; label = @2
-        local.get $0
-        local.get $1
-        local.get $2
-        call $fimport$12
-        return
-      end
-      local.get $0
-      local.set $3
-      local.get $0
-      i32.const 3
-      i32.and
-      local.get $1
-      i32.const 3
-      i32.and
-      i32.eq
-      if ;; label = @2
-        block ;; label = @3
-          loop $label$4 ;; label = @4
-            local.get $0
-            i32.const 3
-            i32.and
-            if ;; label = @5
-              block ;; label = @6
-                local.get $2
-                i32.eqz
-                if ;; label = @7
-                  local.get $3
-                  return
-                end
-                local.get $0
-                local.get $1
-                i32.load8_s
-                i32.store8
-                local.get $0
-                i32.const 1
-                i32.add
-                local.set $0
-                local.get $1
-                i32.const 1
-                i32.add
-                local.set $1
-                local.get $2
-                i32.const 1
-                i32.sub
-                local.set $2
-                br 2 (;@4;)
-              end
-            end
-          end
-          loop $label$7 ;; label = @4
-            local.get $2
-            i32.const 4
-            i32.ge_s
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                local.get $1
-                i32.load
-                i32.store
-                local.get $0
-                i32.const 4
-                i32.add
-                local.set $0
-                local.get $1
-                i32.const 4
-                i32.add
-                local.set $1
-                local.get $2
-                i32.const 4
-                i32.sub
-                local.set $2
-                br 2 (;@4;)
-              end
-            end
-          end
-        end
-      end
-      loop $label$9 ;; label = @2
-        local.get $2
-        i32.const 0
-        i32.gt_s
-        if ;; label = @3
-          block ;; label = @4
-            local.get $0
-            local.get $1
-            i32.load8_s
-            i32.store8
-            local.get $0
-            i32.const 1
-            i32.add
-            local.set $0
-            local.get $1
-            i32.const 1
-            i32.add
-            local.set $1
-            local.get $2
-            i32.const 1
-            i32.sub
-            local.set $2
-            br 2 (;@2;)
-          end
-        end
-      end
-      local.get $3
-    end
+ )
+ (func $49 (; 62 ;) (type $2) (param $0 i32)
+  (call $fimport$3
+   (i32.const 2)
   )
-  (func $43 (;56;) (type $3) (result i32)
-    i32.const 0
-  )
-  (func $44 (;57;) (type $4) (param $0 i32) (param $1 i32) (result i32)
-    local.get $1
-    local.get $0
-    i32.const 1
-    i32.and
-    i32.const 0
-    i32.add
-    call_indirect (type $1)
-  )
-  (func $45 (;58;) (type $12) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
-    local.get $1
-    local.get $2
-    local.get $3
-    local.get $0
-    i32.const 3
-    i32.and
-    i32.const 2
-    i32.add
-    call_indirect (type $0)
-  )
-  (func $46 (;59;) (type $5) (param $0 i32) (param $1 i32)
-    local.get $1
-    local.get $0
-    i32.const 1
-    i32.and
-    i32.const 6
-    i32.add
-    call_indirect (type $2)
-  )
-  (func $47 (;60;) (type $1) (param $0 i32) (result i32)
-    block $label$1 (result i32) ;; label = @1
-      i32.const 0
-      call $fimport$3
-      i32.const 0
-    end
-  )
-  (func $48 (;61;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    block $label$1 (result i32) ;; label = @1
-      i32.const 1
-      call $fimport$3
-      i32.const 0
-    end
-  )
-  (func $49 (;62;) (type $2) (param $0 i32)
-    i32.const 2
-    call $fimport$3
-  )
-  (global $global$0 (;5;) (mut i32) global.get $gimport$0)
-  (global $global$1 (;6;) (mut i32) global.get $gimport$1)
-  (global $global$2 (;7;) (mut i32) global.get $gimport$2)
-  (global $global$3 (;8;) (mut i32) i32.const 0)
-  (global $global$4 (;9;) (mut i32) i32.const 0)
-  (global $global$5 (;10;) (mut i32) i32.const 0)
-  (export "_sbrk" (func $40))
-  (export "_free" (func $38))
-  (export "_main" (func $8))
-  (export "_pthread_self" (func $43))
-  (export "_memset" (func $41))
-  (export "_malloc" (func $37))
-  (export "_memcpy" (func $42))
-  (export "___errno_location" (func $12))
-  (export "runPostSets" (func $39))
-  (export "stackAlloc" (func $0))
-  (export "stackSave" (func $1))
-  (export "stackRestore" (func $2))
-  (export "establishStackSpace" (func $3))
-  (export "setThrew" (func $4))
-  (export "setTempRet0" (func $5))
-  (export "getTempRet0" (func $6))
-  (export "dynCall_ii" (func $44))
-  (export "dynCall_iiii" (func $45))
-  (export "dynCall_vi" (func $46))
-  (elem (;0;) (global.get $gimport$19) func $47 $9 $48 $14 $10 $15 $49 $16)
-  (data (;0;) (i32.const 1024) "\04\04\00\00\05")
-  (data (;1;) (i32.const 1040) "\01")
-  (data (;2;) (i32.const 1064) "\01\00\00\00\02\00\00\00,\10\00\00\00\04")
-  (data (;3;) (i32.const 1088) "\01")
-  (data (;4;) (i32.const 1103) "\0a\ff\ff\ff\ff")
-  (data (;5;) (i32.const 1140) "error: %d\5cn\00ok\00\11\00\0a\00\11\11\11\00\00\00\00\05\00\00\00\00\00\00\09\00\00\00\00\0b")
-  (data (;6;) (i32.const 1187) "\11\00\0f\0a\11\11\11\03\0a\07\00\01\13\09\0b\0b\00\00\09\06\0b\00\00\0b\00\06\11\00\00\00\11\11\11")
-  (data (;7;) (i32.const 1236) "\0b")
-  (data (;8;) (i32.const 1245) "\11\00\0a\0a\11\11\11\00\0a\00\00\02\00\09\0b\00\00\00\09\00\0b\00\00\0b")
-  (data (;9;) (i32.const 1294) "\0c")
-  (data (;10;) (i32.const 1306) "\0c\00\00\00\00\0c\00\00\00\00\09\0c\00\00\00\00\00\0c\00\00\0c")
-  (data (;11;) (i32.const 1352) "\0e")
-  (data (;12;) (i32.const 1364) "\0d\00\00\00\04\0d\00\00\00\00\09\0e\00\00\00\00\00\0e\00\00\0e")
-  (data (;13;) (i32.const 1410) "\10")
-  (data (;14;) (i32.const 1422) "\0f\00\00\00\00\0f\00\00\00\00\09\10\00\00\00\00\00\10\00\00\10\00\00\12\00\00\00\12\12\12")
-  (data (;15;) (i32.const 1477) "\12\00\00\00\12\12\12\00\00\00\00\00\00\09")
-  (data (;16;) (i32.const 1526) "\0b")
-  (data (;17;) (i32.const 1538) "\0a\00\00\00\00\0a\00\00\00\00\09\0b\00\00\00\00\00\0b\00\00\0b")
-  (data (;18;) (i32.const 1584) "\0c")
-  (data (;19;) (i32.const 1596) "\0c\00\00\00\00\0c\00\00\00\00\09\0c\00\00\00\00\00\0c\00\00\0c\00\000123456789ABCDEF-+   0X0x\00(null)\00-0X+0X 0X-0x+0x 0x\00inf\00INF\00nan\00NAN\00.\00T!\22\19\0d\01\02\03\11K\1c\0c\10\04\0b\1d\12\1e'hnopqb \05\06\0f\13\14\15\1a\08\16\07($\17\18\09\0a\0e\1b\1f%#\83\82}&*+<=>?CGJMXYZ[\5c]^_`acdefgijklrstyz{|\00Illegal byte sequence\00Domain error\00Result not representable\00Not a tty\00Permission denied\00Operation not permitted\00No such file or directory\00No such process\00File exists\00Value too large for data type\00No space left on device\00Out of memory\00Resource busy\00Interrupted system call\00Resource temporarily unavailable\00Invalid seek\00Cross-device link\00Read-only file system\00Directory not empty\00Connection reset by peer\00Operation timed out\00Connection refused\00Host is down\00Host is unreachable\00Address in use\00Broken pipe\00I/O error\00No such device or address\00Block device required\00No such device\00Not a directory\00Is a directory\00Text file busy\00Exec format error\00Invalid argument\00Argument list too long\00Symbolic link loop\00Filename too long\00Too many open files in system\00No file descriptors available\00Bad file descriptor\00No child process\00Bad address\00File too large\00Too many links\00No locks available\00Resource deadlock would occur\00State not recoverable\00Previous owner died\00Operation canceled\00Function not implemented\00No message of desired type\00Identifier removed\00Device not a stream\00No data available\00Device timeout\00Out of streams resources\00Link has been severed\00Protocol error\00Bad message\00File descriptor in bad state\00Not a socket\00Destination address required\00Message too large\00Protocol wrong type for socket\00Protocol not available\00Protocol not supported\00Socket type not supported\00Not supported\00Protocol family not supported\00Address family not supported by protocol\00Address not available\00Network is down\00Network unreachable\00Connection reset by network\00Connection aborted\00No buffer space available\00Socket is connected\00Socket not connected\00Cannot send after socket shutdown\00Operation already in progress\00Operation in progress\00Stale file handle\00Remote I/O error\00Quota exceeded\00No medium found\00Wrong medium type\00No error information")
-)
\ No newline at end of file
+ )
+)
+
diff --git a/cranelift/wasm/wasmtests/embenchen_primes.wat b/cranelift/wasm/wasmtests/embenchen_primes.wat
index 1bdf443ae581..4f4603198c9d 100644
--- a/cranelift/wasm/wasmtests/embenchen_primes.wat
+++ b/cranelift/wasm/wasmtests/embenchen_primes.wat
@@ -1,11185 +1,15334 @@
 (module
-  (type $0 (;0;) (func (param i32 i32 i32) (result i32)))
-  (type $1 (;1;) (func (param i32) (result i32)))
-  (type $2 (;2;) (func (param i32)))
-  (type $3 (;3;) (func (result i32)))
-  (type $4 (;4;) (func (param i32 i32) (result i32)))
-  (type $5 (;5;) (func (param i32 i32)))
-  (type $6 (;6;) (func))
-  (type $7 (;7;) (func (param i32 i32 i32 i32 i32) (result i32)))
-  (type $8 (;8;) (func (param i32 i32 i32)))
-  (type $9 (;9;) (func (param i64 i32) (result i32)))
-  (type $10 (;10;) (func (param i32 i32 i32 i32 i32)))
-  (type $11 (;11;) (func (param f64 i32) (result f64)))
-  (type $12 (;12;) (func (param i32 i32 i32 i32) (result i32)))
-  (import "env" "memory" (memory $16 (;0;) 2048 2048))
-  (import "env" "table" (table $timport$17 (;0;) 8 8 funcref))
-  (import "env" "DYNAMICTOP_PTR" (global $gimport$0 (;0;) i32))
-  (import "env" "STACKTOP" (global $gimport$1 (;1;) i32))
-  (import "env" "STACK_MAX" (global $gimport$2 (;2;) i32))
-  (import "env" "memoryBase" (global $gimport$18 (;3;) i32))
-  (import "env" "tableBase" (global $gimport$19 (;4;) i32))
-  (import "env" "abort" (func $fimport$3 (;0;) (type $2)))
-  (import "env" "enlargeMemory" (func $fimport$4 (;1;) (type $3)))
-  (import "env" "getTotalMemory" (func $fimport$5 (;2;) (type $3)))
-  (import "env" "abortOnCannotGrowMemory" (func $fimport$6 (;3;) (type $3)))
-  (import "env" "_pthread_cleanup_pop" (func $fimport$7 (;4;) (type $2)))
-  (import "env" "___syscall6" (func $fimport$8 (;5;) (type $4)))
-  (import "env" "_pthread_cleanup_push" (func $fimport$9 (;6;) (type $5)))
-  (import "env" "_abort" (func $fimport$10 (;7;) (type $6)))
-  (import "env" "___setErrNo" (func $fimport$11 (;8;) (type $2)))
-  (import "env" "_emscripten_memcpy_big" (func $fimport$12 (;9;) (type $0)))
-  (import "env" "___syscall54" (func $fimport$13 (;10;) (type $4)))
-  (import "env" "___syscall140" (func $fimport$14 (;11;) (type $4)))
-  (import "env" "___syscall146" (func $fimport$15 (;12;) (type $4)))
-  (func $0 (;13;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $1
-      global.get $global$1
-      local.get $0
-      i32.add
-      global.set $global$1
-      global.get $global$1
-      i32.const 15
-      i32.add
-      i32.const -16
-      i32.and
-      global.set $global$1
-      local.get $1
-    end
+ (type $0 (func (param i32 i32 i32) (result i32)))
+ (type $1 (func (param i32) (result i32)))
+ (type $2 (func (param i32)))
+ (type $3 (func (result i32)))
+ (type $4 (func (param i32 i32) (result i32)))
+ (type $5 (func (param i32 i32)))
+ (type $6 (func))
+ (type $7 (func (param i32 i32 i32 i32 i32) (result i32)))
+ (type $8 (func (param i32 i32 i32)))
+ (type $9 (func (param i64 i32) (result i32)))
+ (type $10 (func (param i32 i32 i32 i32 i32)))
+ (type $11 (func (param f64 i32) (result f64)))
+ (type $12 (func (param i32 i32 i32 i32) (result i32)))
+ (import "env" "memory" (memory $16 2048 2048))
+ (data (i32.const 1024) "\04\04\00\00\05")
+ (data (i32.const 1040) "\01")
+ (data (i32.const 1064) "\01\00\00\00\02\00\00\004\10\00\00\00\04")
+ (data (i32.const 1088) "\01")
+ (data (i32.const 1103) "\n\ff\ff\ff\ff")
+ (data (i32.const 1140) "error: %d\\n\00lastprime: %d.\n\00\11\00\n\00\11\11\11\00\00\00\00\05\00\00\00\00\00\00\t\00\00\00\00\0b")
+ (data (i32.const 1200) "\11\00\0f\n\11\11\11\03\n\07\00\01\13\t\0b\0b\00\00\t\06\0b\00\00\0b\00\06\11\00\00\00\11\11\11")
+ (data (i32.const 1249) "\0b")
+ (data (i32.const 1258) "\11\00\n\n\11\11\11\00\n\00\00\02\00\t\0b\00\00\00\t\00\0b\00\00\0b")
+ (data (i32.const 1307) "\0c")
+ (data (i32.const 1319) "\0c\00\00\00\00\0c\00\00\00\00\t\0c\00\00\00\00\00\0c\00\00\0c")
+ (data (i32.const 1365) "\0e")
+ (data (i32.const 1377) "\0d\00\00\00\04\0d\00\00\00\00\t\0e\00\00\00\00\00\0e\00\00\0e")
+ (data (i32.const 1423) "\10")
+ (data (i32.const 1435) "\0f\00\00\00\00\0f\00\00\00\00\t\10\00\00\00\00\00\10\00\00\10\00\00\12\00\00\00\12\12\12")
+ (data (i32.const 1490) "\12\00\00\00\12\12\12\00\00\00\00\00\00\t")
+ (data (i32.const 1539) "\0b")
+ (data (i32.const 1551) "\n\00\00\00\00\n\00\00\00\00\t\0b\00\00\00\00\00\0b\00\00\0b")
+ (data (i32.const 1597) "\0c")
+ (data (i32.const 1609) "\0c\00\00\00\00\0c\00\00\00\00\t\0c\00\00\00\00\00\0c\00\00\0c\00\000123456789ABCDEF-+   0X0x\00(null)\00-0X+0X 0X-0x+0x 0x\00inf\00INF\00nan\00NAN\00.\00T!\"\19\0d\01\02\03\11K\1c\0c\10\04\0b\1d\12\1e\'hnopqb \05\06\0f\13\14\15\1a\08\16\07($\17\18\t\n\0e\1b\1f%#\83\82}&*+<=>?CGJMXYZ[\\]^_`acdefgijklrstyz{|\00Illegal byte sequence\00Domain error\00Result not representable\00Not a tty\00Permission denied\00Operation not permitted\00No such file or directory\00No such process\00File exists\00Value too large for data type\00No space left on device\00Out of memory\00Resource busy\00Interrupted system call\00Resource temporarily unavailable\00Invalid seek\00Cross-device link\00Read-only file system\00Directory not empty\00Connection reset by peer\00Operation timed out\00Connection refused\00Host is down\00Host is unreachable\00Address in use\00Broken pipe\00I/O error\00No such device or address\00Block device required\00No such device\00Not a directory\00Is a directory\00Text file busy\00Exec format error\00Invalid argument\00Argument list too long\00Symbolic link loop\00Filename too long\00Too many open files in system\00No file descriptors available\00Bad file descriptor\00No child process\00Bad address\00File too large\00Too many links\00No locks available\00Resource deadlock would occur\00State not recoverable\00Previous owner died\00Operation canceled\00Function not implemented\00No message of desired type\00Identifier removed\00Device not a stream\00No data available\00Device timeout\00Out of streams resources\00Link has been severed\00Protocol error\00Bad message\00File descriptor in bad state\00Not a socket\00Destination address required\00Message too large\00Protocol wrong type for socket\00Protocol not available\00Protocol not supported\00Socket type not supported\00Not supported\00Protocol family not supported\00Address family not supported by protocol\00Address not available\00Network is down\00Network unreachable\00Connection reset by network\00Connection aborted\00No buffer space available\00Socket is connected\00Socket not connected\00Cannot send after socket shutdown\00Operation already in progress\00Operation in progress\00Stale file handle\00Remote I/O error\00Quota exceeded\00No medium found\00Wrong medium type\00No error information")
+ (import "env" "table" (table $timport$17 8 8 funcref))
+ (elem (global.get $gimport$19) $41 $8 $42 $13 $9 $14 $43 $15)
+ (import "env" "DYNAMICTOP_PTR" (global $gimport$0 i32))
+ (import "env" "STACKTOP" (global $gimport$1 i32))
+ (import "env" "STACK_MAX" (global $gimport$2 i32))
+ (import "env" "memoryBase" (global $gimport$18 i32))
+ (import "env" "tableBase" (global $gimport$19 i32))
+ (import "env" "abort" (func $fimport$3 (param i32)))
+ (import "env" "enlargeMemory" (func $fimport$4 (result i32)))
+ (import "env" "getTotalMemory" (func $fimport$5 (result i32)))
+ (import "env" "abortOnCannotGrowMemory" (func $fimport$6 (result i32)))
+ (import "env" "_pthread_cleanup_pop" (func $fimport$7 (param i32)))
+ (import "env" "___syscall6" (func $fimport$8 (param i32 i32) (result i32)))
+ (import "env" "_pthread_cleanup_push" (func $fimport$9 (param i32 i32)))
+ (import "env" "_abort" (func $fimport$10))
+ (import "env" "___setErrNo" (func $fimport$11 (param i32)))
+ (import "env" "_emscripten_memcpy_big" (func $fimport$12 (param i32 i32 i32) (result i32)))
+ (import "env" "___syscall54" (func $fimport$13 (param i32 i32) (result i32)))
+ (import "env" "___syscall140" (func $fimport$14 (param i32 i32) (result i32)))
+ (import "env" "___syscall146" (func $fimport$15 (param i32 i32) (result i32)))
+ (global $global$0 (mut i32) (global.get $gimport$0))
+ (global $global$1 (mut i32) (global.get $gimport$1))
+ (global $global$2 (mut i32) (global.get $gimport$2))
+ (global $global$3 (mut i32) (i32.const 0))
+ (global $global$4 (mut i32) (i32.const 0))
+ (global $global$5 (mut i32) (i32.const 0))
+ (export "_sbrk" (func $34))
+ (export "_free" (func $32))
+ (export "_main" (func $7))
+ (export "_pthread_self" (func $37))
+ (export "_memset" (func $35))
+ (export "_malloc" (func $31))
+ (export "_memcpy" (func $36))
+ (export "___errno_location" (func $11))
+ (export "runPostSets" (func $33))
+ (export "stackAlloc" (func $0))
+ (export "stackSave" (func $1))
+ (export "stackRestore" (func $2))
+ (export "establishStackSpace" (func $3))
+ (export "setThrew" (func $4))
+ (export "setTempRet0" (func $5))
+ (export "getTempRet0" (func $6))
+ (export "dynCall_ii" (func $38))
+ (export "dynCall_iiii" (func $39))
+ (export "dynCall_vi" (func $40))
+ (func $0 (; 13 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (local.get $0)
+    )
+   )
+   (global.set $global$1
+    (i32.and
+     (i32.add
+      (global.get $global$1)
+      (i32.const 15)
+     )
+     (i32.const -16)
+    )
+   )
+   (local.get $1)
   )
-  (func $1 (;14;) (type $3) (result i32)
-    global.get $global$1
+ )
+ (func $1 (; 14 ;) (type $3) (result i32)
+  (global.get $global$1)
+ )
+ (func $2 (; 15 ;) (type $2) (param $0 i32)
+  (global.set $global$1
+   (local.get $0)
   )
-  (func $2 (;15;) (type $2) (param $0 i32)
-    local.get $0
-    global.set $global$1
+ )
+ (func $3 (; 16 ;) (type $5) (param $0 i32) (param $1 i32)
+  (block $label$1
+   (global.set $global$1
+    (local.get $0)
+   )
+   (global.set $global$2
+    (local.get $1)
+   )
   )
-  (func $3 (;16;) (type $5) (param $0 i32) (param $1 i32)
-    block $label$1 ;; label = @1
-      local.get $0
-      global.set $global$1
-      local.get $1
-      global.set $global$2
-    end
+ )
+ (func $4 (; 17 ;) (type $5) (param $0 i32) (param $1 i32)
+  (if
+   (i32.eqz
+    (global.get $global$3)
+   )
+   (block
+    (global.set $global$3
+     (local.get $0)
+    )
+    (global.set $global$4
+     (local.get $1)
+    )
+   )
   )
-  (func $4 (;17;) (type $5) (param $0 i32) (param $1 i32)
-    global.get $global$3
-    i32.eqz
-    if ;; label = @1
-      block ;; label = @2
-        local.get $0
-        global.set $global$3
-        local.get $1
-        global.set $global$4
-      end
-    end
+ )
+ (func $5 (; 18 ;) (type $2) (param $0 i32)
+  (global.set $global$5
+   (local.get $0)
   )
-  (func $5 (;18;) (type $2) (param $0 i32)
-    local.get $0
-    global.set $global$5
+ )
+ (func $6 (; 19 ;) (type $3) (result i32)
+  (global.get $global$5)
+ )
+ (func $7 (; 20 ;) (type $4) (param $0 i32) (param $1 i32) (result i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 f32)
+  (block $label$1 (result i32)
+   (local.set $3
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 16)
+    )
+   )
+   (local.set $5
+    (i32.add
+     (local.get $3)
+     (i32.const 8)
+    )
+   )
+   (local.set $2
+    (local.get $3)
+   )
+   (block $label$2
+    (block $label$3
+     (br_if $label$3
+      (i32.le_s
+       (local.get $0)
+       (i32.const 1)
+      )
+     )
+     (block $label$4
+      (block $label$5
+       (block $label$6
+        (block $label$7
+         (block $label$8
+          (block $label$9
+           (block $label$10
+            (br_table $label$5 $label$10 $label$8 $label$9 $label$7 $label$6 $label$4
+             (i32.sub
+              (local.tee $0
+               (i32.load8_s
+                (i32.load offset=4
+                 (local.get $1)
+                )
+               )
+              )
+              (i32.const 48)
+             )
+            )
+           )
+           (local.set $4
+            (i32.const 33000)
+           )
+           (br $label$2)
+          )
+          (br $label$3)
+         )
+         (local.set $4
+          (i32.const 130000)
+         )
+         (br $label$2)
+        )
+        (local.set $4
+         (i32.const 610000)
+        )
+        (br $label$2)
+       )
+       (local.set $4
+        (i32.const 1010000)
+       )
+       (br $label$2)
+      )
+      (global.set $global$1
+       (local.get $3)
+      )
+      (return
+       (i32.const 0)
+      )
+     )
+     (i32.store
+      (local.get $2)
+      (i32.add
+       (local.get $0)
+       (i32.const -48)
+      )
+     )
+     (drop
+      (call $30
+       (i32.const 1140)
+       (local.get $2)
+      )
+     )
+     (global.set $global$1
+      (local.get $3)
+     )
+     (return
+      (i32.const -1)
+     )
+    )
+    (local.set $4
+     (i32.const 220000)
+    )
+   )
+   (local.set $1
+    (i32.const 2)
+   )
+   (local.set $0
+    (i32.const 0)
+   )
+   (loop $label$11
+    (block $label$12
+     (block $label$13
+      (br_if $label$13
+       (i32.eqz
+        (f32.gt
+         (local.tee $6
+          (f32.sqrt
+           (f32.convert_i32_s
+            (local.get $1)
+           )
+          )
+         )
+         (f32.const 2)
+        )
+       )
+      )
+      (local.set $2
+       (i32.const 2)
+      )
+      (loop $label$14
+       (br_if $label$12
+        (i32.eqz
+         (i32.rem_s
+          (local.get $1)
+          (local.get $2)
+         )
+        )
+       )
+       (br_if $label$14
+        (f32.lt
+         (f32.convert_i32_s
+          (local.tee $2
+           (i32.add
+            (local.get $2)
+            (i32.const 1)
+           )
+          )
+         )
+         (local.get $6)
+        )
+       )
+       (br $label$13)
+      )
+     )
+     (local.set $0
+      (i32.add
+       (local.get $0)
+       (i32.const 1)
+      )
+     )
+    )
+    (local.set $2
+     (i32.add
+      (local.get $1)
+      (i32.const 1)
+     )
+    )
+    (if
+     (i32.lt_s
+      (local.get $0)
+      (local.get $4)
+     )
+     (block
+      (local.set $1
+       (local.get $2)
+      )
+      (br $label$11)
+     )
+    )
+   )
+   (i32.store
+    (local.get $5)
+    (local.get $1)
+   )
+   (drop
+    (call $30
+     (i32.const 1152)
+     (local.get $5)
+    )
+   )
+   (global.set $global$1
+    (local.get $3)
+   )
+   (i32.const 0)
   )
-  (func $6 (;19;) (type $3) (result i32)
-    global.get $global$5
+ )
+ (func $8 (; 21 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 16)
+    )
+   )
+   (i32.store
+    (local.tee $2
+     (local.get $1)
+    )
+    (i32.load offset=60
+     (local.get $0)
+    )
+   )
+   (local.set $0
+    (call $10
+     (call $fimport$8
+      (i32.const 6)
+      (local.get $2)
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $1)
+   )
+   (local.get $0)
   )
-  (func $7 (;20;) (type $4) (param $0 i32) (param $1 i32) (result i32)
-    (local $2 i32) (local $3 i32) (local $4 i32) (local $5 i32) (local $6 f32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $3
-      global.get $global$1
-      i32.const 16
-      i32.add
-      global.set $global$1
-      local.get $3
-      i32.const 8
-      i32.add
-      local.set $5
-      local.get $3
-      local.set $2
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          local.get $0
-          i32.const 1
-          i32.le_s
-          br_if 0 (;@3;)
-          block $label$4 ;; label = @4
-            block $label$5 ;; label = @5
-              block $label$6 ;; label = @6
-                block $label$7 ;; label = @7
-                  block $label$8 ;; label = @8
-                    block $label$9 ;; label = @9
-                      block $label$10 ;; label = @10
-                        local.get $1
-                        i32.load offset=4
-                        i32.load8_s
-                        local.tee $0
-                        i32.const 48
-                        i32.sub
-                        br_table 5 (;@5;) 0 (;@10;) 2 (;@8;) 1 (;@9;) 3 (;@7;) 4 (;@6;) 6 (;@4;)
-                      end
-                      i32.const 33000
-                      local.set $4
-                      br 7 (;@2;)
-                    end
-                    br 5 (;@3;)
-                  end
-                  i32.const 130000
-                  local.set $4
-                  br 5 (;@2;)
-                end
-                i32.const 610000
-                local.set $4
-                br 4 (;@2;)
-              end
-              i32.const 1010000
-              local.set $4
-              br 3 (;@2;)
-            end
-            local.get $3
-            global.set $global$1
-            i32.const 0
-            return
-          end
-          local.get $2
-          local.get $0
-          i32.const -48
-          i32.add
-          i32.store
-          i32.const 1140
-          local.get $2
-          call $30
-          drop
-          local.get $3
-          global.set $global$1
-          i32.const -1
-          return
-        end
-        i32.const 220000
-        local.set $4
-      end
-      i32.const 2
-      local.set $1
-      i32.const 0
-      local.set $0
-      loop $label$11 ;; label = @2
-        block $label$12 ;; label = @3
-          block $label$13 ;; label = @4
-            local.get $1
-            f32.convert_i32_s
-            f32.sqrt
-            local.tee $6
-            f32.const 0x1p+1 (;=2;)
-            f32.gt
-            i32.eqz
-            br_if 0 (;@4;)
-            i32.const 2
-            local.set $2
-            loop $label$14 ;; label = @5
-              local.get $1
-              local.get $2
-              i32.rem_s
-              i32.eqz
-              br_if 2 (;@3;)
-              local.get $2
-              i32.const 1
-              i32.add
-              local.tee $2
-              f32.convert_i32_s
-              local.get $6
-              f32.lt
-              br_if 0 (;@5;)
-              br 1 (;@4;)
-            end
-          end
-          local.get $0
-          i32.const 1
-          i32.add
-          local.set $0
-        end
-        local.get $1
-        i32.const 1
-        i32.add
-        local.set $2
-        local.get $0
-        local.get $4
-        i32.lt_s
-        if ;; label = @3
-          block ;; label = @4
-            local.get $2
-            local.set $1
-            br 2 (;@2;)
-          end
-        end
-      end
-      local.get $5
-      local.get $1
-      i32.store
-      i32.const 1152
-      local.get $5
-      call $30
-      drop
-      local.get $3
-      global.set $global$1
-      i32.const 0
-    end
+ )
+ (func $9 (; 22 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 32)
+    )
+   )
+   (i32.store
+    (local.tee $3
+     (local.get $4)
+    )
+    (i32.load offset=60
+     (local.get $0)
+    )
+   )
+   (i32.store offset=4
+    (local.get $3)
+    (i32.const 0)
+   )
+   (i32.store offset=8
+    (local.get $3)
+    (local.get $1)
+   )
+   (i32.store offset=12
+    (local.get $3)
+    (local.tee $0
+     (i32.add
+      (local.get $4)
+      (i32.const 20)
+     )
+    )
+   )
+   (i32.store offset=16
+    (local.get $3)
+    (local.get $2)
+   )
+   (local.set $0
+    (if (result i32)
+     (i32.lt_s
+      (call $10
+       (call $fimport$14
+        (i32.const 140)
+        (local.get $3)
+       )
+      )
+      (i32.const 0)
+     )
+     (block (result i32)
+      (i32.store
+       (local.get $0)
+       (i32.const -1)
+      )
+      (i32.const -1)
+     )
+     (i32.load
+      (local.get $0)
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $4)
+   )
+   (local.get $0)
   )
-  (func $8 (;21;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $1
-      global.get $global$1
-      i32.const 16
-      i32.add
-      global.set $global$1
-      local.get $1
-      local.tee $2
-      local.get $0
-      i32.load offset=60
-      i32.store
-      i32.const 6
-      local.get $2
-      call $fimport$8
-      call $10
-      local.set $0
-      local.get $1
-      global.set $global$1
-      local.get $0
-    end
+ )
+ (func $10 (; 23 ;) (type $1) (param $0 i32) (result i32)
+  (if (result i32)
+   (i32.gt_u
+    (local.get $0)
+    (i32.const -4096)
+   )
+   (block (result i32)
+    (i32.store
+     (call $11)
+     (i32.sub
+      (i32.const 0)
+      (local.get $0)
+     )
+    )
+    (i32.const -1)
+   )
+   (local.get $0)
   )
-  (func $9 (;22;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $4
-      global.get $global$1
-      i32.const 32
-      i32.add
-      global.set $global$1
-      local.get $4
-      local.tee $3
-      local.get $0
-      i32.load offset=60
-      i32.store
-      local.get $3
-      i32.const 0
-      i32.store offset=4
-      local.get $3
-      local.get $1
-      i32.store offset=8
-      local.get $3
-      local.get $4
-      i32.const 20
-      i32.add
-      local.tee $0
-      i32.store offset=12
-      local.get $3
-      local.get $2
-      i32.store offset=16
-      i32.const 140
-      local.get $3
-      call $fimport$14
-      call $10
-      i32.const 0
-      i32.lt_s
-      if (result i32) ;; label = @2
-        block (result i32) ;; label = @3
-          local.get $0
-          i32.const -1
-          i32.store
-          i32.const -1
-        end
-      else
-        local.get $0
-        i32.load
-      end
-      local.set $0
-      local.get $4
-      global.set $global$1
-      local.get $0
-    end
+ )
+ (func $11 (; 24 ;) (type $3) (result i32)
+  (i32.const 3640)
+ )
+ (func $12 (; 25 ;) (type $2) (param $0 i32)
+  (nop)
+ )
+ (func $13 (; 26 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 80)
+    )
+   )
+   (local.set $3
+    (local.get $4)
+   )
+   (local.set $5
+    (i32.add
+     (local.get $4)
+     (i32.const 12)
+    )
+   )
+   (i32.store offset=36
+    (local.get $0)
+    (i32.const 3)
+   )
+   (if
+    (i32.eqz
+     (i32.and
+      (i32.load
+       (local.get $0)
+      )
+      (i32.const 64)
+     )
+    )
+    (block
+     (i32.store
+      (local.get $3)
+      (i32.load offset=60
+       (local.get $0)
+      )
+     )
+     (i32.store offset=4
+      (local.get $3)
+      (i32.const 21505)
+     )
+     (i32.store offset=8
+      (local.get $3)
+      (local.get $5)
+     )
+     (if
+      (call $fimport$13
+       (i32.const 54)
+       (local.get $3)
+      )
+      (i32.store8 offset=75
+       (local.get $0)
+       (i32.const -1)
+      )
+     )
+    )
+   )
+   (local.set $0
+    (call $14
+     (local.get $0)
+     (local.get $1)
+     (local.get $2)
+    )
+   )
+   (global.set $global$1
+    (local.get $4)
+   )
+   (local.get $0)
   )
-  (func $10 (;23;) (type $1) (param $0 i32) (result i32)
-    local.get $0
-    i32.const -4096
-    i32.gt_u
-    if (result i32) ;; label = @1
-      block (result i32) ;; label = @2
-        call $11
-        i32.const 0
-        local.get $0
-        i32.sub
-        i32.store
-        i32.const -1
-      end
-    else
-      local.get $0
-    end
+ )
+ (func $14 (; 27 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (block $label$1 (result i32)
+   (local.set $8
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 48)
+    )
+   )
+   (local.set $9
+    (i32.add
+     (local.get $8)
+     (i32.const 16)
+    )
+   )
+   (local.set $10
+    (local.get $8)
+   )
+   (i32.store
+    (local.tee $3
+     (i32.add
+      (local.get $8)
+      (i32.const 32)
+     )
+    )
+    (local.tee $4
+     (i32.load
+      (local.tee $6
+       (i32.add
+        (local.get $0)
+        (i32.const 28)
+       )
+      )
+     )
+    )
+   )
+   (i32.store offset=4
+    (local.get $3)
+    (local.tee $5
+     (i32.sub
+      (i32.load
+       (local.tee $11
+        (i32.add
+         (local.get $0)
+         (i32.const 20)
+        )
+       )
+      )
+      (local.get $4)
+     )
+    )
+   )
+   (i32.store offset=8
+    (local.get $3)
+    (local.get $1)
+   )
+   (i32.store offset=12
+    (local.get $3)
+    (local.get $2)
+   )
+   (local.set $13
+    (i32.add
+     (local.get $0)
+     (i32.const 60)
+    )
+   )
+   (local.set $14
+    (i32.add
+     (local.get $0)
+     (i32.const 44)
+    )
+   )
+   (local.set $1
+    (local.get $3)
+   )
+   (local.set $4
+    (i32.const 2)
+   )
+   (local.set $12
+    (i32.add
+     (local.get $5)
+     (local.get $2)
+    )
+   )
+   (block $label$2
+    (block $label$3
+     (block $label$4
+      (loop $label$5
+       (if
+        (i32.load
+         (i32.const 3596)
+        )
+        (block
+         (call $fimport$9
+          (i32.const 1)
+          (local.get $0)
+         )
+         (i32.store
+          (local.get $10)
+          (i32.load
+           (local.get $13)
+          )
+         )
+         (i32.store offset=4
+          (local.get $10)
+          (local.get $1)
+         )
+         (i32.store offset=8
+          (local.get $10)
+          (local.get $4)
+         )
+         (local.set $3
+          (call $10
+           (call $fimport$15
+            (i32.const 146)
+            (local.get $10)
+           )
+          )
+         )
+         (call $fimport$7
+          (i32.const 0)
+         )
+        )
+        (block
+         (i32.store
+          (local.get $9)
+          (i32.load
+           (local.get $13)
+          )
+         )
+         (i32.store offset=4
+          (local.get $9)
+          (local.get $1)
+         )
+         (i32.store offset=8
+          (local.get $9)
+          (local.get $4)
+         )
+         (local.set $3
+          (call $10
+           (call $fimport$15
+            (i32.const 146)
+            (local.get $9)
+           )
+          )
+         )
+        )
+       )
+       (br_if $label$4
+        (i32.eq
+         (local.get $12)
+         (local.get $3)
+        )
+       )
+       (br_if $label$3
+        (i32.lt_s
+         (local.get $3)
+         (i32.const 0)
+        )
+       )
+       (local.set $5
+        (if (result i32)
+         (i32.gt_u
+          (local.get $3)
+          (local.tee $5
+           (i32.load offset=4
+            (local.get $1)
+           )
+          )
+         )
+         (block (result i32)
+          (i32.store
+           (local.get $6)
+           (local.tee $7
+            (i32.load
+             (local.get $14)
+            )
+           )
+          )
+          (i32.store
+           (local.get $11)
+           (local.get $7)
+          )
+          (local.set $7
+           (i32.load offset=12
+            (local.get $1)
+           )
+          )
+          (local.set $1
+           (i32.add
+            (local.get $1)
+            (i32.const 8)
+           )
+          )
+          (local.set $4
+           (i32.add
+            (local.get $4)
+            (i32.const -1)
+           )
+          )
+          (i32.sub
+           (local.get $3)
+           (local.get $5)
+          )
+         )
+         (if (result i32)
+          (i32.eq
+           (local.get $4)
+           (i32.const 2)
+          )
+          (block (result i32)
+           (i32.store
+            (local.get $6)
+            (i32.add
+             (i32.load
+              (local.get $6)
+             )
+             (local.get $3)
+            )
+           )
+           (local.set $7
+            (local.get $5)
+           )
+           (local.set $4
+            (i32.const 2)
+           )
+           (local.get $3)
+          )
+          (block (result i32)
+           (local.set $7
+            (local.get $5)
+           )
+           (local.get $3)
+          )
+         )
+        )
+       )
+       (i32.store
+        (local.get $1)
+        (i32.add
+         (i32.load
+          (local.get $1)
+         )
+         (local.get $5)
+        )
+       )
+       (i32.store offset=4
+        (local.get $1)
+        (i32.sub
+         (local.get $7)
+         (local.get $5)
+        )
+       )
+       (local.set $12
+        (i32.sub
+         (local.get $12)
+         (local.get $3)
+        )
+       )
+       (br $label$5)
+      )
+     )
+     (i32.store offset=16
+      (local.get $0)
+      (i32.add
+       (local.tee $1
+        (i32.load
+         (local.get $14)
+        )
+       )
+       (i32.load offset=48
+        (local.get $0)
+       )
+      )
+     )
+     (i32.store
+      (local.get $6)
+      (local.get $1)
+     )
+     (i32.store
+      (local.get $11)
+      (local.get $1)
+     )
+     (br $label$2)
+    )
+    (i32.store offset=16
+     (local.get $0)
+     (i32.const 0)
+    )
+    (i32.store
+     (local.get $6)
+     (i32.const 0)
+    )
+    (i32.store
+     (local.get $11)
+     (i32.const 0)
+    )
+    (i32.store
+     (local.get $0)
+     (i32.or
+      (i32.load
+       (local.get $0)
+      )
+      (i32.const 32)
+     )
+    )
+    (local.set $2
+     (if (result i32)
+      (i32.eq
+       (local.get $4)
+       (i32.const 2)
+      )
+      (i32.const 0)
+      (i32.sub
+       (local.get $2)
+       (i32.load offset=4
+        (local.get $1)
+       )
+      )
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $8)
+   )
+   (local.get $2)
   )
-  (func $11 (;24;) (type $3) (result i32)
-    i32.const 3640
+ )
+ (func $15 (; 28 ;) (type $2) (param $0 i32)
+  (if
+   (i32.eqz
+    (i32.load offset=68
+     (local.get $0)
+    )
+   )
+   (call $12
+    (local.get $0)
+   )
   )
-  (func $12 (;25;) (type $2) (param $0 i32)
-    nop
+ )
+ (func $16 (; 29 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (block $label$1 (result i32)
+   (local.set $5
+    (i32.and
+     (local.get $1)
+     (i32.const 255)
+    )
+   )
+   (block $label$2
+    (block $label$3
+     (block $label$4
+      (if
+       (i32.and
+        (local.tee $4
+         (i32.ne
+          (local.get $2)
+          (i32.const 0)
+         )
+        )
+        (i32.ne
+         (i32.and
+          (local.get $0)
+          (i32.const 3)
+         )
+         (i32.const 0)
+        )
+       )
+       (block
+        (local.set $4
+         (i32.and
+          (local.get $1)
+          (i32.const 255)
+         )
+        )
+        (local.set $3
+         (local.get $2)
+        )
+        (local.set $2
+         (local.get $0)
+        )
+        (loop $label$6
+         (if
+          (i32.eq
+           (i32.load8_s
+            (local.get $2)
+           )
+           (i32.shr_s
+            (i32.shl
+             (local.get $4)
+             (i32.const 24)
+            )
+            (i32.const 24)
+           )
+          )
+          (block
+           (local.set $0
+            (local.get $3)
+           )
+           (br $label$3)
+          )
+         )
+         (br_if $label$6
+          (i32.and
+           (local.tee $0
+            (i32.ne
+             (local.tee $3
+              (i32.add
+               (local.get $3)
+               (i32.const -1)
+              )
+             )
+             (i32.const 0)
+            )
+           )
+           (i32.ne
+            (i32.and
+             (local.tee $2
+              (i32.add
+               (local.get $2)
+               (i32.const 1)
+              )
+             )
+             (i32.const 3)
+            )
+            (i32.const 0)
+           )
+          )
+         )
+         (br $label$4)
+        )
+       )
+       (block
+        (local.set $3
+         (local.get $2)
+        )
+        (local.set $2
+         (local.get $0)
+        )
+        (local.set $0
+         (local.get $4)
+        )
+       )
+      )
+     )
+     (if
+      (local.get $0)
+      (block
+       (local.set $0
+        (local.get $3)
+       )
+       (br $label$3)
+      )
+      (local.set $0
+       (i32.const 0)
+      )
+     )
+     (br $label$2)
+    )
+    (if
+     (i32.ne
+      (i32.load8_s
+       (local.get $2)
+      )
+      (i32.shr_s
+       (i32.shl
+        (local.tee $1
+         (i32.and
+          (local.get $1)
+          (i32.const 255)
+         )
+        )
+        (i32.const 24)
+       )
+       (i32.const 24)
+      )
+     )
+     (block
+      (local.set $3
+       (i32.mul
+        (local.get $5)
+        (i32.const 16843009)
+       )
+      )
+      (block $label$12
+       (block $label$13
+        (br_if $label$13
+         (i32.le_u
+          (local.get $0)
+          (i32.const 3)
+         )
+        )
+        (loop $label$14
+         (if
+          (i32.eqz
+           (i32.and
+            (i32.xor
+             (i32.and
+              (local.tee $4
+               (i32.xor
+                (i32.load
+                 (local.get $2)
+                )
+                (local.get $3)
+               )
+              )
+              (i32.const -2139062144)
+             )
+             (i32.const -2139062144)
+            )
+            (i32.add
+             (local.get $4)
+             (i32.const -16843009)
+            )
+           )
+          )
+          (block
+           (local.set $2
+            (i32.add
+             (local.get $2)
+             (i32.const 4)
+            )
+           )
+           (br_if $label$14
+            (i32.gt_u
+             (local.tee $0
+              (i32.add
+               (local.get $0)
+               (i32.const -4)
+              )
+             )
+             (i32.const 3)
+            )
+           )
+           (br $label$13)
+          )
+         )
+        )
+        (br $label$12)
+       )
+       (if
+        (i32.eqz
+         (local.get $0)
+        )
+        (block
+         (local.set $0
+          (i32.const 0)
+         )
+         (br $label$2)
+        )
+       )
+      )
+      (loop $label$17
+       (br_if $label$2
+        (i32.eq
+         (i32.load8_s
+          (local.get $2)
+         )
+         (i32.shr_s
+          (i32.shl
+           (local.get $1)
+           (i32.const 24)
+          )
+          (i32.const 24)
+         )
+        )
+       )
+       (local.set $2
+        (i32.add
+         (local.get $2)
+         (i32.const 1)
+        )
+       )
+       (br_if $label$17
+        (local.tee $0
+         (i32.add
+          (local.get $0)
+          (i32.const -1)
+         )
+        )
+       )
+       (local.set $0
+        (i32.const 0)
+       )
+      )
+     )
+    )
+   )
+   (if (result i32)
+    (local.get $0)
+    (local.get $2)
+    (i32.const 0)
+   )
   )
-  (func $13 (;26;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $4
-      global.get $global$1
-      i32.const 80
-      i32.add
-      global.set $global$1
-      local.get $4
-      local.set $3
-      local.get $4
-      i32.const 12
-      i32.add
-      local.set $5
-      local.get $0
-      i32.const 3
-      i32.store offset=36
-      local.get $0
-      i32.load
-      i32.const 64
-      i32.and
-      i32.eqz
-      if ;; label = @2
-        block ;; label = @3
-          local.get $3
-          local.get $0
-          i32.load offset=60
-          i32.store
-          local.get $3
-          i32.const 21505
-          i32.store offset=4
-          local.get $3
-          local.get $5
-          i32.store offset=8
-          i32.const 54
-          local.get $3
-          call $fimport$13
-          if ;; label = @4
-            local.get $0
-            i32.const -1
-            i32.store8 offset=75
-          end
-        end
-      end
-      local.get $0
-      local.get $1
-      local.get $2
-      call $14
-      local.set $0
-      local.get $4
-      global.set $global$1
-      local.get $0
-    end
+ )
+ (func $17 (; 30 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 224)
+    )
+   )
+   (local.set $5
+    (i32.add
+     (local.get $4)
+     (i32.const 136)
+    )
+   )
+   (i64.store align=4
+    (local.tee $3
+     (i32.add
+      (local.get $4)
+      (i32.const 80)
+     )
+    )
+    (i64.const 0)
+   )
+   (i64.store offset=8 align=4
+    (local.get $3)
+    (i64.const 0)
+   )
+   (i64.store offset=16 align=4
+    (local.get $3)
+    (i64.const 0)
+   )
+   (i64.store offset=24 align=4
+    (local.get $3)
+    (i64.const 0)
+   )
+   (i64.store offset=32 align=4
+    (local.get $3)
+    (i64.const 0)
+   )
+   (i32.store
+    (local.tee $6
+     (i32.add
+      (local.get $4)
+      (i32.const 120)
+     )
+    )
+    (i32.load
+     (local.get $2)
+    )
+   )
+   (if
+    (i32.lt_s
+     (call $18
+      (i32.const 0)
+      (local.get $1)
+      (local.get $6)
+      (local.tee $2
+       (local.get $4)
+      )
+      (local.get $3)
+     )
+     (i32.const 0)
+    )
+    (local.set $1
+     (i32.const -1)
+    )
+    (block
+     (local.set $12
+      (if (result i32)
+       (i32.gt_s
+        (i32.load offset=76
+         (local.get $0)
+        )
+        (i32.const -1)
+       )
+       (call $19
+        (local.get $0)
+       )
+       (i32.const 0)
+      )
+     )
+     (local.set $7
+      (i32.load
+       (local.get $0)
+      )
+     )
+     (if
+      (i32.lt_s
+       (i32.load8_s offset=74
+        (local.get $0)
+       )
+       (i32.const 1)
+      )
+      (i32.store
+       (local.get $0)
+       (i32.and
+        (local.get $7)
+        (i32.const -33)
+       )
+      )
+     )
+     (if
+      (i32.load
+       (local.tee $8
+        (i32.add
+         (local.get $0)
+         (i32.const 48)
+        )
+       )
+      )
+      (local.set $1
+       (call $18
+        (local.get $0)
+        (local.get $1)
+        (local.get $6)
+        (local.get $2)
+        (local.get $3)
+       )
+      )
+      (block
+       (local.set $10
+        (i32.load
+         (local.tee $9
+          (i32.add
+           (local.get $0)
+           (i32.const 44)
+          )
+         )
+        )
+       )
+       (i32.store
+        (local.get $9)
+        (local.get $5)
+       )
+       (i32.store
+        (local.tee $13
+         (i32.add
+          (local.get $0)
+          (i32.const 28)
+         )
+        )
+        (local.get $5)
+       )
+       (i32.store
+        (local.tee $11
+         (i32.add
+          (local.get $0)
+          (i32.const 20)
+         )
+        )
+        (local.get $5)
+       )
+       (i32.store
+        (local.get $8)
+        (i32.const 80)
+       )
+       (i32.store
+        (local.tee $14
+         (i32.add
+          (local.get $0)
+          (i32.const 16)
+         )
+        )
+        (i32.add
+         (local.get $5)
+         (i32.const 80)
+        )
+       )
+       (local.set $1
+        (call $18
+         (local.get $0)
+         (local.get $1)
+         (local.get $6)
+         (local.get $2)
+         (local.get $3)
+        )
+       )
+       (if
+        (local.get $10)
+        (block
+         (drop
+          (call_indirect (type $0)
+           (local.get $0)
+           (i32.const 0)
+           (i32.const 0)
+           (i32.add
+            (i32.and
+             (i32.load offset=36
+              (local.get $0)
+             )
+             (i32.const 3)
+            )
+            (i32.const 2)
+           )
+          )
+         )
+         (if
+          (i32.eqz
+           (i32.load
+            (local.get $11)
+           )
+          )
+          (local.set $1
+           (i32.const -1)
+          )
+         )
+         (i32.store
+          (local.get $9)
+          (local.get $10)
+         )
+         (i32.store
+          (local.get $8)
+          (i32.const 0)
+         )
+         (i32.store
+          (local.get $14)
+          (i32.const 0)
+         )
+         (i32.store
+          (local.get $13)
+          (i32.const 0)
+         )
+         (i32.store
+          (local.get $11)
+          (i32.const 0)
+         )
+        )
+       )
+      )
+     )
+     (i32.store
+      (local.get $0)
+      (i32.or
+       (local.tee $2
+        (i32.load
+         (local.get $0)
+        )
+       )
+       (i32.and
+        (local.get $7)
+        (i32.const 32)
+       )
+      )
+     )
+     (if
+      (local.get $12)
+      (call $12
+       (local.get $0)
+      )
+     )
+     (if
+      (i32.and
+       (local.get $2)
+       (i32.const 32)
+      )
+      (local.set $1
+       (i32.const -1)
+      )
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $4)
+   )
+   (local.get $1)
   )
-  (func $14 (;27;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $8
-      global.get $global$1
-      i32.const 48
-      i32.add
-      global.set $global$1
-      local.get $8
-      i32.const 16
-      i32.add
-      local.set $9
-      local.get $8
-      local.set $10
-      local.get $8
-      i32.const 32
-      i32.add
-      local.tee $3
-      local.get $0
-      i32.const 28
-      i32.add
-      local.tee $6
-      i32.load
-      local.tee $4
-      i32.store
-      local.get $3
-      local.get $0
-      i32.const 20
-      i32.add
-      local.tee $11
-      i32.load
-      local.get $4
-      i32.sub
-      local.tee $5
-      i32.store offset=4
-      local.get $3
-      local.get $1
-      i32.store offset=8
-      local.get $3
-      local.get $2
-      i32.store offset=12
-      local.get $0
-      i32.const 60
-      i32.add
-      local.set $13
-      local.get $0
-      i32.const 44
-      i32.add
-      local.set $14
-      local.get $3
-      local.set $1
-      i32.const 2
-      local.set $4
-      local.get $5
-      local.get $2
-      i32.add
-      local.set $12
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            loop $label$5 ;; label = @5
-              i32.const 3596
-              i32.load
-              if ;; label = @6
-                block ;; label = @7
-                  i32.const 1
-                  local.get $0
-                  call $fimport$9
-                  local.get $10
-                  local.get $13
-                  i32.load
-                  i32.store
-                  local.get $10
-                  local.get $1
-                  i32.store offset=4
-                  local.get $10
-                  local.get $4
-                  i32.store offset=8
-                  i32.const 146
-                  local.get $10
-                  call $fimport$15
-                  call $10
-                  local.set $3
-                  i32.const 0
-                  call $fimport$7
-                end
-              else
-                block ;; label = @7
-                  local.get $9
-                  local.get $13
-                  i32.load
-                  i32.store
-                  local.get $9
-                  local.get $1
-                  i32.store offset=4
-                  local.get $9
-                  local.get $4
-                  i32.store offset=8
-                  i32.const 146
-                  local.get $9
-                  call $fimport$15
-                  call $10
-                  local.set $3
-                end
-              end
-              local.get $12
-              local.get $3
-              i32.eq
-              br_if 1 (;@4;)
-              local.get $3
-              i32.const 0
-              i32.lt_s
-              br_if 2 (;@3;)
-              local.get $3
-              local.get $1
-              i32.load offset=4
-              local.tee $5
-              i32.gt_u
-              if (result i32) ;; label = @6
-                block (result i32) ;; label = @7
-                  local.get $6
-                  local.get $14
-                  i32.load
-                  local.tee $7
-                  i32.store
-                  local.get $11
-                  local.get $7
-                  i32.store
-                  local.get $1
-                  i32.load offset=12
-                  local.set $7
-                  local.get $1
-                  i32.const 8
-                  i32.add
-                  local.set $1
-                  local.get $4
-                  i32.const -1
-                  i32.add
-                  local.set $4
-                  local.get $3
-                  local.get $5
-                  i32.sub
-                end
-              else
-                local.get $4
-                i32.const 2
-                i32.eq
-                if (result i32) ;; label = @7
-                  block (result i32) ;; label = @8
-                    local.get $6
-                    local.get $6
-                    i32.load
-                    local.get $3
-                    i32.add
-                    i32.store
-                    local.get $5
-                    local.set $7
-                    i32.const 2
-                    local.set $4
-                    local.get $3
-                  end
-                else
-                  block (result i32) ;; label = @8
-                    local.get $5
-                    local.set $7
-                    local.get $3
-                  end
-                end
-              end
-              local.set $5
-              local.get $1
-              local.get $1
-              i32.load
-              local.get $5
-              i32.add
-              i32.store
-              local.get $1
-              local.get $7
-              local.get $5
-              i32.sub
-              i32.store offset=4
-              local.get $12
-              local.get $3
-              i32.sub
-              local.set $12
-              br 0 (;@5;)
-            end
-          end
-          local.get $0
-          local.get $14
-          i32.load
-          local.tee $1
-          local.get $0
-          i32.load offset=48
-          i32.add
-          i32.store offset=16
-          local.get $6
-          local.get $1
-          i32.store
-          local.get $11
-          local.get $1
-          i32.store
-          br 1 (;@2;)
-        end
-        local.get $0
-        i32.const 0
-        i32.store offset=16
-        local.get $6
-        i32.const 0
-        i32.store
-        local.get $11
-        i32.const 0
-        i32.store
-        local.get $0
-        local.get $0
-        i32.load
-        i32.const 32
-        i32.or
-        i32.store
-        local.get $4
-        i32.const 2
-        i32.eq
-        if (result i32) ;; label = @3
-          i32.const 0
-        else
-          local.get $2
-          local.get $1
-          i32.load offset=4
-          i32.sub
-        end
-        local.set $2
-      end
-      local.get $8
-      global.set $global$1
-      local.get $2
-    end
+ )
+ (func $18 (; 31 ;) (type $7) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (result i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (local $15 i32)
+  (local $16 i32)
+  (local $17 i32)
+  (local $18 i32)
+  (local $19 i32)
+  (local $20 i32)
+  (local $21 i32)
+  (local $22 i32)
+  (local $23 i32)
+  (local $24 i32)
+  (local $25 i32)
+  (local $26 i32)
+  (local $27 i32)
+  (local $28 i32)
+  (local $29 i32)
+  (local $30 i32)
+  (local $31 i32)
+  (local $32 i32)
+  (local $33 i32)
+  (local $34 i32)
+  (local $35 i32)
+  (local $36 i32)
+  (local $37 i32)
+  (local $38 i32)
+  (local $39 i32)
+  (local $40 i32)
+  (local $41 i32)
+  (local $42 i32)
+  (local $43 i32)
+  (local $44 i32)
+  (local $45 i32)
+  (local $46 i32)
+  (local $47 i32)
+  (local $48 i32)
+  (local $49 i32)
+  (local $50 i64)
+  (local $51 i64)
+  (local $52 f64)
+  (local $53 f64)
+  (block $label$1 (result i32)
+   (local.set $23
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 624)
+    )
+   )
+   (local.set $20
+    (i32.add
+     (local.get $23)
+     (i32.const 16)
+    )
+   )
+   (local.set $16
+    (local.get $23)
+   )
+   (local.set $36
+    (i32.add
+     (local.get $23)
+     (i32.const 528)
+    )
+   )
+   (local.set $30
+    (i32.ne
+     (local.get $0)
+     (i32.const 0)
+    )
+   )
+   (local.set $38
+    (local.tee $21
+     (i32.add
+      (local.tee $17
+       (i32.add
+        (local.get $23)
+        (i32.const 536)
+       )
+      )
+      (i32.const 40)
+     )
+    )
+   )
+   (local.set $39
+    (i32.add
+     (local.get $17)
+     (i32.const 39)
+    )
+   )
+   (local.set $42
+    (i32.add
+     (local.tee $37
+      (i32.add
+       (local.get $23)
+       (i32.const 8)
+      )
+     )
+     (i32.const 4)
+    )
+   )
+   (local.set $43
+    (i32.sub
+     (i32.const 0)
+     (local.tee $27
+      (local.tee $19
+       (i32.add
+        (local.get $23)
+        (i32.const 588)
+       )
+      )
+     )
+    )
+   )
+   (local.set $33
+    (i32.add
+     (local.tee $17
+      (i32.add
+       (local.get $23)
+       (i32.const 576)
+      )
+     )
+     (i32.const 12)
+    )
+   )
+   (local.set $40
+    (i32.add
+     (local.get $17)
+     (i32.const 11)
+    )
+   )
+   (local.set $44
+    (i32.sub
+     (local.tee $28
+      (local.get $33)
+     )
+     (local.get $27)
+    )
+   )
+   (local.set $45
+    (i32.sub
+     (i32.const -2)
+     (local.get $27)
+    )
+   )
+   (local.set $46
+    (i32.add
+     (local.get $28)
+     (i32.const 2)
+    )
+   )
+   (local.set $48
+    (i32.add
+     (local.tee $47
+      (i32.add
+       (local.get $23)
+       (i32.const 24)
+      )
+     )
+     (i32.const 288)
+    )
+   )
+   (local.set $41
+    (local.tee $31
+     (i32.add
+      (local.get $19)
+      (i32.const 9)
+     )
+    )
+   )
+   (local.set $34
+    (i32.add
+     (local.get $19)
+     (i32.const 8)
+    )
+   )
+   (local.set $15
+    (i32.const 0)
+   )
+   (local.set $10
+    (i32.const 0)
+   )
+   (local.set $17
+    (i32.const 0)
+   )
+   (block $label$2
+    (block $label$3
+     (loop $label$4
+      (block $label$5
+       (if
+        (i32.gt_s
+         (local.get $15)
+         (i32.const -1)
+        )
+        (local.set $15
+         (if (result i32)
+          (i32.gt_s
+           (local.get $10)
+           (i32.sub
+            (i32.const 2147483647)
+            (local.get $15)
+           )
+          )
+          (block (result i32)
+           (i32.store
+            (call $11)
+            (i32.const 75)
+           )
+           (i32.const -1)
+          )
+          (i32.add
+           (local.get $10)
+           (local.get $15)
+          )
+         )
+        )
+       )
+       (br_if $label$3
+        (i32.eqz
+         (i32.shr_s
+          (i32.shl
+           (local.tee $5
+            (i32.load8_s
+             (local.get $1)
+            )
+           )
+           (i32.const 24)
+          )
+          (i32.const 24)
+         )
+        )
+       )
+       (local.set $11
+        (local.get $1)
+       )
+       (block $label$9
+        (block $label$10
+         (loop $label$11
+          (block $label$12
+           (block $label$13
+            (block $label$14
+             (block $label$15
+              (br_table $label$14 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$13 $label$15 $label$13
+               (i32.sub
+                (i32.shr_s
+                 (i32.shl
+                  (local.get $5)
+                  (i32.const 24)
+                 )
+                 (i32.const 24)
+                )
+                (i32.const 0)
+               )
+              )
+             )
+             (local.set $5
+              (local.get $11)
+             )
+             (br $label$10)
+            )
+            (local.set $5
+             (local.get $11)
+            )
+            (br $label$12)
+           )
+           (local.set $5
+            (i32.load8_s
+             (local.tee $11
+              (i32.add
+               (local.get $11)
+               (i32.const 1)
+              )
+             )
+            )
+           )
+           (br $label$11)
+          )
+         )
+         (br $label$9)
+        )
+        (loop $label$16
+         (br_if $label$9
+          (i32.ne
+           (i32.load8_s offset=1
+            (local.get $5)
+           )
+           (i32.const 37)
+          )
+         )
+         (local.set $11
+          (i32.add
+           (local.get $11)
+           (i32.const 1)
+          )
+         )
+         (br_if $label$16
+          (i32.eq
+           (i32.load8_s
+            (local.tee $5
+             (i32.add
+              (local.get $5)
+              (i32.const 2)
+             )
+            )
+           )
+           (i32.const 37)
+          )
+         )
+        )
+       )
+       (local.set $10
+        (i32.sub
+         (local.get $11)
+         (local.get $1)
+        )
+       )
+       (if
+        (local.get $30)
+        (if
+         (i32.eqz
+          (i32.and
+           (i32.load
+            (local.get $0)
+           )
+           (i32.const 32)
+          )
+         )
+         (drop
+          (call $20
+           (local.get $1)
+           (local.get $10)
+           (local.get $0)
+          )
+         )
+        )
+       )
+       (if
+        (local.get $10)
+        (block
+         (local.set $1
+          (local.get $5)
+         )
+         (br $label$4)
+        )
+       )
+       (local.set $10
+        (if (result i32)
+         (i32.lt_u
+          (local.tee $9
+           (i32.add
+            (i32.shr_s
+             (i32.shl
+              (local.tee $10
+               (i32.load8_s
+                (local.tee $11
+                 (i32.add
+                  (local.get $5)
+                  (i32.const 1)
+                 )
+                )
+               )
+              )
+              (i32.const 24)
+             )
+             (i32.const 24)
+            )
+            (i32.const -48)
+           )
+          )
+          (i32.const 10)
+         )
+         (block (result i32)
+          (local.set $10
+           (i32.add
+            (local.get $5)
+            (i32.const 3)
+           )
+          )
+          (if
+           (local.tee $12
+            (i32.eq
+             (i32.load8_s offset=2
+              (local.get $5)
+             )
+             (i32.const 36)
+            )
+           )
+           (local.set $11
+            (local.get $10)
+           )
+          )
+          (if
+           (local.get $12)
+           (local.set $17
+            (i32.const 1)
+           )
+          )
+          (local.set $5
+           (i32.load8_s
+            (local.get $11)
+           )
+          )
+          (if
+           (i32.eqz
+            (local.get $12)
+           )
+           (local.set $9
+            (i32.const -1)
+           )
+          )
+          (local.get $17)
+         )
+         (block (result i32)
+          (local.set $5
+           (local.get $10)
+          )
+          (local.set $9
+           (i32.const -1)
+          )
+          (local.get $17)
+         )
+        )
+       )
+       (block $label$25
+        (if
+         (i32.lt_u
+          (local.tee $12
+           (i32.add
+            (i32.shr_s
+             (i32.shl
+              (local.get $5)
+              (i32.const 24)
+             )
+             (i32.const 24)
+            )
+            (i32.const -32)
+           )
+          )
+          (i32.const 32)
+         )
+         (block
+          (local.set $17
+           (i32.const 0)
+          )
+          (loop $label$27
+           (br_if $label$25
+            (i32.eqz
+             (i32.and
+              (i32.shl
+               (i32.const 1)
+               (local.get $12)
+              )
+              (i32.const 75913)
+             )
+            )
+           )
+           (local.set $17
+            (i32.or
+             (i32.shl
+              (i32.const 1)
+              (i32.add
+               (i32.shr_s
+                (i32.shl
+                 (local.get $5)
+                 (i32.const 24)
+                )
+                (i32.const 24)
+               )
+               (i32.const -32)
+              )
+             )
+             (local.get $17)
+            )
+           )
+           (br_if $label$27
+            (i32.lt_u
+             (local.tee $12
+              (i32.add
+               (i32.shr_s
+                (i32.shl
+                 (local.tee $5
+                  (i32.load8_s
+                   (local.tee $11
+                    (i32.add
+                     (local.get $11)
+                     (i32.const 1)
+                    )
+                   )
+                  )
+                 )
+                 (i32.const 24)
+                )
+                (i32.const 24)
+               )
+               (i32.const -32)
+              )
+             )
+             (i32.const 32)
+            )
+           )
+          )
+         )
+         (local.set $17
+          (i32.const 0)
+         )
+        )
+       )
+       (block $label$29
+        (if
+         (i32.eq
+          (i32.shr_s
+           (i32.shl
+            (local.get $5)
+            (i32.const 24)
+           )
+           (i32.const 24)
+          )
+          (i32.const 42)
+         )
+         (block
+          (local.set $11
+           (block $label$31 (result i32)
+            (block $label$32
+             (br_if $label$32
+              (i32.ge_u
+               (local.tee $12
+                (i32.add
+                 (i32.shr_s
+                  (i32.shl
+                   (local.tee $5
+                    (i32.load8_s
+                     (local.tee $7
+                      (i32.add
+                       (local.get $11)
+                       (i32.const 1)
+                      )
+                     )
+                    )
+                   )
+                   (i32.const 24)
+                  )
+                  (i32.const 24)
+                 )
+                 (i32.const -48)
+                )
+               )
+               (i32.const 10)
+              )
+             )
+             (br_if $label$32
+              (i32.ne
+               (i32.load8_s offset=2
+                (local.get $11)
+               )
+               (i32.const 36)
+              )
+             )
+             (i32.store
+              (i32.add
+               (local.get $4)
+               (i32.shl
+                (local.get $12)
+                (i32.const 2)
+               )
+              )
+              (i32.const 10)
+             )
+             (local.set $8
+              (i32.const 1)
+             )
+             (local.set $10
+              (i32.wrap_i64
+               (i64.load
+                (i32.add
+                 (local.get $3)
+                 (i32.shl
+                  (i32.add
+                   (i32.load8_s
+                    (local.get $7)
+                   )
+                   (i32.const -48)
+                  )
+                  (i32.const 3)
+                 )
+                )
+               )
+              )
+             )
+             (br $label$31
+              (i32.add
+               (local.get $11)
+               (i32.const 3)
+              )
+             )
+            )
+            (if
+             (local.get $10)
+             (block
+              (local.set $15
+               (i32.const -1)
+              )
+              (br $label$5)
+             )
+            )
+            (if
+             (i32.eqz
+              (local.get $30)
+             )
+             (block
+              (local.set $12
+               (local.get $17)
+              )
+              (local.set $17
+               (i32.const 0)
+              )
+              (local.set $11
+               (local.get $7)
+              )
+              (local.set $10
+               (i32.const 0)
+              )
+              (br $label$29)
+             )
+            )
+            (local.set $10
+             (i32.load
+              (local.tee $11
+               (i32.and
+                (i32.add
+                 (i32.load
+                  (local.get $2)
+                 )
+                 (i32.const 3)
+                )
+                (i32.const -4)
+               )
+              )
+             )
+            )
+            (i32.store
+             (local.get $2)
+             (i32.add
+              (local.get $11)
+              (i32.const 4)
+             )
+            )
+            (local.set $8
+             (i32.const 0)
+            )
+            (local.get $7)
+           )
+          )
+          (local.set $12
+           (i32.or
+            (local.get $17)
+            (i32.const 8192)
+           )
+          )
+          (local.set $7
+           (i32.sub
+            (i32.const 0)
+            (local.get $10)
+           )
+          )
+          (local.set $5
+           (i32.load8_s
+            (local.get $11)
+           )
+          )
+          (if
+           (i32.eqz
+            (local.tee $6
+             (i32.lt_s
+              (local.get $10)
+              (i32.const 0)
+             )
+            )
+           )
+           (local.set $12
+            (local.get $17)
+           )
+          )
+          (local.set $17
+           (local.get $8)
+          )
+          (if
+           (local.get $6)
+           (local.set $10
+            (local.get $7)
+           )
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.tee $12
+            (i32.add
+             (i32.shr_s
+              (i32.shl
+               (local.get $5)
+               (i32.const 24)
+              )
+              (i32.const 24)
+             )
+             (i32.const -48)
+            )
+           )
+           (i32.const 10)
+          )
+          (block
+           (local.set $7
+            (i32.const 0)
+           )
+           (local.set $5
+            (local.get $12)
+           )
+           (loop $label$39
+            (local.set $7
+             (i32.add
+              (i32.mul
+               (local.get $7)
+               (i32.const 10)
+              )
+              (local.get $5)
+             )
+            )
+            (br_if $label$39
+             (i32.lt_u
+              (local.tee $5
+               (i32.add
+                (i32.shr_s
+                 (i32.shl
+                  (local.tee $12
+                   (i32.load8_s
+                    (local.tee $11
+                     (i32.add
+                      (local.get $11)
+                      (i32.const 1)
+                     )
+                    )
+                   )
+                  )
+                  (i32.const 24)
+                 )
+                 (i32.const 24)
+                )
+                (i32.const -48)
+               )
+              )
+              (i32.const 10)
+             )
+            )
+           )
+           (if
+            (i32.lt_s
+             (local.get $7)
+             (i32.const 0)
+            )
+            (block
+             (local.set $15
+              (i32.const -1)
+             )
+             (br $label$5)
+            )
+            (block
+             (local.set $5
+              (local.get $12)
+             )
+             (local.set $12
+              (local.get $17)
+             )
+             (local.set $17
+              (local.get $10)
+             )
+             (local.set $10
+              (local.get $7)
+             )
+            )
+           )
+          )
+          (block
+           (local.set $12
+            (local.get $17)
+           )
+           (local.set $17
+            (local.get $10)
+           )
+           (local.set $10
+            (i32.const 0)
+           )
+          )
+         )
+        )
+       )
+       (block $label$43
+        (if
+         (i32.eq
+          (i32.shr_s
+           (i32.shl
+            (local.get $5)
+            (i32.const 24)
+           )
+           (i32.const 24)
+          )
+          (i32.const 46)
+         )
+         (block
+          (if
+           (i32.ne
+            (i32.shr_s
+             (i32.shl
+              (local.tee $5
+               (i32.load8_s
+                (local.tee $7
+                 (i32.add
+                  (local.get $11)
+                  (i32.const 1)
+                 )
+                )
+               )
+              )
+              (i32.const 24)
+             )
+             (i32.const 24)
+            )
+            (i32.const 42)
+           )
+           (block
+            (if
+             (i32.lt_u
+              (local.tee $5
+               (i32.add
+                (i32.shr_s
+                 (i32.shl
+                  (local.get $5)
+                  (i32.const 24)
+                 )
+                 (i32.const 24)
+                )
+                (i32.const -48)
+               )
+              )
+              (i32.const 10)
+             )
+             (block
+              (local.set $11
+               (local.get $7)
+              )
+              (local.set $7
+               (i32.const 0)
+              )
+             )
+             (block
+              (local.set $5
+               (i32.const 0)
+              )
+              (local.set $11
+               (local.get $7)
+              )
+              (br $label$43)
+             )
+            )
+            (loop $label$48
+             (local.set $5
+              (i32.add
+               (i32.mul
+                (local.get $7)
+                (i32.const 10)
+               )
+               (local.get $5)
+              )
+             )
+             (br_if $label$43
+              (i32.ge_u
+               (local.tee $8
+                (i32.add
+                 (i32.load8_s
+                  (local.tee $11
+                   (i32.add
+                    (local.get $11)
+                    (i32.const 1)
+                   )
+                  )
+                 )
+                 (i32.const -48)
+                )
+               )
+               (i32.const 10)
+              )
+             )
+             (local.set $7
+              (local.get $5)
+             )
+             (local.set $5
+              (local.get $8)
+             )
+             (br $label$48)
+            )
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.tee $5
+             (i32.add
+              (i32.load8_s
+               (local.tee $7
+                (i32.add
+                 (local.get $11)
+                 (i32.const 2)
+                )
+               )
+              )
+              (i32.const -48)
+             )
+            )
+            (i32.const 10)
+           )
+           (if
+            (i32.eq
+             (i32.load8_s offset=3
+              (local.get $11)
+             )
+             (i32.const 36)
+            )
+            (block
+             (i32.store
+              (i32.add
+               (local.get $4)
+               (i32.shl
+                (local.get $5)
+                (i32.const 2)
+               )
+              )
+              (i32.const 10)
+             )
+             (local.set $5
+              (i32.wrap_i64
+               (i64.load
+                (i32.add
+                 (local.get $3)
+                 (i32.shl
+                  (i32.add
+                   (i32.load8_s
+                    (local.get $7)
+                   )
+                   (i32.const -48)
+                  )
+                  (i32.const 3)
+                 )
+                )
+               )
+              )
+             )
+             (local.set $11
+              (i32.add
+               (local.get $11)
+               (i32.const 4)
+              )
+             )
+             (br $label$43)
+            )
+           )
+          )
+          (if
+           (local.get $17)
+           (block
+            (local.set $15
+             (i32.const -1)
+            )
+            (br $label$5)
+           )
+          )
+          (local.set $11
+           (if (result i32)
+            (local.get $30)
+            (block (result i32)
+             (local.set $5
+              (i32.load
+               (local.tee $11
+                (i32.and
+                 (i32.add
+                  (i32.load
+                   (local.get $2)
+                  )
+                  (i32.const 3)
+                 )
+                 (i32.const -4)
+                )
+               )
+              )
+             )
+             (i32.store
+              (local.get $2)
+              (i32.add
+               (local.get $11)
+               (i32.const 4)
+              )
+             )
+             (local.get $7)
+            )
+            (block (result i32)
+             (local.set $5
+              (i32.const 0)
+             )
+             (local.get $7)
+            )
+           )
+          )
+         )
+         (local.set $5
+          (i32.const -1)
+         )
+        )
+       )
+       (local.set $7
+        (local.get $11)
+       )
+       (local.set $8
+        (i32.const 0)
+       )
+       (loop $label$55
+        (if
+         (i32.gt_u
+          (local.tee $6
+           (i32.add
+            (i32.load8_s
+             (local.get $7)
+            )
+            (i32.const -65)
+           )
+          )
+          (i32.const 57)
+         )
+         (block
+          (local.set $15
+           (i32.const -1)
+          )
+          (br $label$5)
+         )
+        )
+        (local.set $11
+         (i32.add
+          (local.get $7)
+          (i32.const 1)
+         )
+        )
+        (if
+         (i32.lt_u
+          (i32.add
+           (local.tee $6
+            (i32.and
+             (local.tee $13
+              (i32.load8_s
+               (i32.add
+                (i32.add
+                 (i32.mul
+                  (local.get $8)
+                  (i32.const 58)
+                 )
+                 (i32.const 1168)
+                )
+                (local.get $6)
+               )
+              )
+             )
+             (i32.const 255)
+            )
+           )
+           (i32.const -1)
+          )
+          (i32.const 8)
+         )
+         (block
+          (local.set $7
+           (local.get $11)
+          )
+          (local.set $8
+           (local.get $6)
+          )
+          (br $label$55)
+         )
+        )
+       )
+       (if
+        (i32.eqz
+         (i32.shr_s
+          (i32.shl
+           (local.get $13)
+           (i32.const 24)
+          )
+          (i32.const 24)
+         )
+        )
+        (block
+         (local.set $15
+          (i32.const -1)
+         )
+         (br $label$5)
+        )
+       )
+       (local.set $14
+        (i32.gt_s
+         (local.get $9)
+         (i32.const -1)
+        )
+       )
+       (block $label$59
+        (block $label$60
+         (if
+          (i32.eq
+           (i32.shr_s
+            (i32.shl
+             (local.get $13)
+             (i32.const 24)
+            )
+            (i32.const 24)
+           )
+           (i32.const 19)
+          )
+          (if
+           (local.get $14)
+           (block
+            (local.set $15
+             (i32.const -1)
+            )
+            (br $label$5)
+           )
+           (br $label$60)
+          )
+          (block
+           (if
+            (local.get $14)
+            (block
+             (i32.store
+              (i32.add
+               (local.get $4)
+               (i32.shl
+                (local.get $9)
+                (i32.const 2)
+               )
+              )
+              (local.get $6)
+             )
+             (i64.store
+              (local.get $16)
+              (i64.load
+               (i32.add
+                (local.get $3)
+                (i32.shl
+                 (local.get $9)
+                 (i32.const 3)
+                )
+               )
+              )
+             )
+             (br $label$60)
+            )
+           )
+           (if
+            (i32.eqz
+             (local.get $30)
+            )
+            (block
+             (local.set $15
+              (i32.const 0)
+             )
+             (br $label$5)
+            )
+           )
+           (call $21
+            (local.get $16)
+            (local.get $6)
+            (local.get $2)
+           )
+          )
+         )
+         (br $label$59)
+        )
+        (if
+         (i32.eqz
+          (local.get $30)
+         )
+         (block
+          (local.set $10
+           (i32.const 0)
+          )
+          (local.set $1
+           (local.get $11)
+          )
+          (br $label$4)
+         )
+        )
+       )
+       (local.set $9
+        (i32.and
+         (local.tee $7
+          (i32.load8_s
+           (local.get $7)
+          )
+         )
+         (i32.const -33)
+        )
+       )
+       (if
+        (i32.eqz
+         (i32.and
+          (i32.ne
+           (local.get $8)
+           (i32.const 0)
+          )
+          (i32.eq
+           (i32.and
+            (local.get $7)
+            (i32.const 15)
+           )
+           (i32.const 3)
+          )
+         )
+        )
+        (local.set $9
+         (local.get $7)
+        )
+       )
+       (local.set $7
+        (i32.and
+         (local.get $12)
+         (i32.const -65537)
+        )
+       )
+       (if
+        (i32.and
+         (local.get $12)
+         (i32.const 8192)
+        )
+        (local.set $12
+         (local.get $7)
+        )
+       )
+       (block $label$70
+        (block $label$71
+         (block $label$72
+          (block $label$73
+           (block $label$74
+            (block $label$75
+             (block $label$76
+              (block $label$77
+               (block $label$78
+                (block $label$79
+                 (block $label$80
+                  (block $label$81
+                   (block $label$82
+                    (block $label$83
+                     (block $label$84
+                      (block $label$85
+                       (block $label$86
+                        (block $label$87
+                         (block $label$88
+                          (block $label$89
+                           (br_table $label$78 $label$77 $label$80 $label$77 $label$78 $label$78 $label$78 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$79 $label$77 $label$77 $label$77 $label$77 $label$87 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$77 $label$78 $label$77 $label$83 $label$85 $label$78 $label$78 $label$78 $label$77 $label$85 $label$77 $label$77 $label$77 $label$82 $label$89 $label$86 $label$88 $label$77 $label$77 $label$81 $label$77 $label$84 $label$77 $label$77 $label$87 $label$77
+                            (i32.sub
+                             (local.get $9)
+                             (i32.const 65)
+                            )
+                           )
+                          )
+                          (block $label$90
+                           (block $label$91
+                            (block $label$92
+                             (block $label$93
+                              (block $label$94
+                               (block $label$95
+                                (block $label$96
+                                 (block $label$97
+                                  (br_table $label$97 $label$96 $label$95 $label$94 $label$93 $label$90 $label$92 $label$91 $label$90
+                                   (i32.sub
+                                    (i32.shr_s
+                                     (i32.shl
+                                      (i32.and
+                                       (local.get $8)
+                                       (i32.const 255)
+                                      )
+                                      (i32.const 24)
+                                     )
+                                     (i32.const 24)
+                                    )
+                                    (i32.const 0)
+                                   )
+                                  )
+                                 )
+                                 (i32.store
+                                  (i32.load
+                                   (local.get $16)
+                                  )
+                                  (local.get $15)
+                                 )
+                                 (local.set $10
+                                  (i32.const 0)
+                                 )
+                                 (local.set $1
+                                  (local.get $11)
+                                 )
+                                 (br $label$4)
+                                )
+                                (i32.store
+                                 (i32.load
+                                  (local.get $16)
+                                 )
+                                 (local.get $15)
+                                )
+                                (local.set $10
+                                 (i32.const 0)
+                                )
+                                (local.set $1
+                                 (local.get $11)
+                                )
+                                (br $label$4)
+                               )
+                               (i64.store
+                                (i32.load
+                                 (local.get $16)
+                                )
+                                (i64.extend_i32_s
+                                 (local.get $15)
+                                )
+                               )
+                               (local.set $10
+                                (i32.const 0)
+                               )
+                               (local.set $1
+                                (local.get $11)
+                               )
+                               (br $label$4)
+                              )
+                              (i32.store16
+                               (i32.load
+                                (local.get $16)
+                               )
+                               (local.get $15)
+                              )
+                              (local.set $10
+                               (i32.const 0)
+                              )
+                              (local.set $1
+                               (local.get $11)
+                              )
+                              (br $label$4)
+                             )
+                             (i32.store8
+                              (i32.load
+                               (local.get $16)
+                              )
+                              (local.get $15)
+                             )
+                             (local.set $10
+                              (i32.const 0)
+                             )
+                             (local.set $1
+                              (local.get $11)
+                             )
+                             (br $label$4)
+                            )
+                            (i32.store
+                             (i32.load
+                              (local.get $16)
+                             )
+                             (local.get $15)
+                            )
+                            (local.set $10
+                             (i32.const 0)
+                            )
+                            (local.set $1
+                             (local.get $11)
+                            )
+                            (br $label$4)
+                           )
+                           (i64.store
+                            (i32.load
+                             (local.get $16)
+                            )
+                            (i64.extend_i32_s
+                             (local.get $15)
+                            )
+                           )
+                           (local.set $10
+                            (i32.const 0)
+                           )
+                           (local.set $1
+                            (local.get $11)
+                           )
+                           (br $label$4)
+                          )
+                          (local.set $10
+                           (i32.const 0)
+                          )
+                          (local.set $1
+                           (local.get $11)
+                          )
+                          (br $label$4)
+                         )
+                         (local.set $12
+                          (i32.or
+                           (local.get $12)
+                           (i32.const 8)
+                          )
+                         )
+                         (if
+                          (i32.le_u
+                           (local.get $5)
+                           (i32.const 8)
+                          )
+                          (local.set $5
+                           (i32.const 8)
+                          )
+                         )
+                         (local.set $9
+                          (i32.const 120)
+                         )
+                         (br $label$76)
+                        )
+                        (br $label$76)
+                       )
+                       (if
+                        (i64.eq
+                         (local.tee $50
+                          (i64.load
+                           (local.get $16)
+                          )
+                         )
+                         (i64.const 0)
+                        )
+                        (local.set $7
+                         (local.get $21)
+                        )
+                        (block
+                         (local.set $1
+                          (local.get $21)
+                         )
+                         (loop $label$101
+                          (i64.store8
+                           (local.tee $1
+                            (i32.add
+                             (local.get $1)
+                             (i32.const -1)
+                            )
+                           )
+                           (i64.or
+                            (i64.and
+                             (local.get $50)
+                             (i64.const 7)
+                            )
+                            (i64.const 48)
+                           )
+                          )
+                          (br_if $label$101
+                           (i64.ne
+                            (local.tee $50
+                             (i64.shr_u
+                              (local.get $50)
+                              (i64.const 3)
+                             )
+                            )
+                            (i64.const 0)
+                           )
+                          )
+                          (local.set $7
+                           (local.get $1)
+                          )
+                         )
+                        )
+                       )
+                       (if
+                        (i32.and
+                         (local.get $12)
+                         (i32.const 8)
+                        )
+                        (block
+                         (local.set $8
+                          (i32.add
+                           (local.tee $1
+                            (i32.sub
+                             (local.get $38)
+                             (local.get $7)
+                            )
+                           )
+                           (i32.const 1)
+                          )
+                         )
+                         (if
+                          (i32.le_s
+                           (local.get $5)
+                           (local.get $1)
+                          )
+                          (local.set $5
+                           (local.get $8)
+                          )
+                         )
+                         (local.set $6
+                          (i32.const 0)
+                         )
+                         (local.set $8
+                          (i32.const 1648)
+                         )
+                         (br $label$71)
+                        )
+                        (block
+                         (local.set $6
+                          (i32.const 0)
+                         )
+                         (local.set $8
+                          (i32.const 1648)
+                         )
+                         (br $label$71)
+                        )
+                       )
+                      )
+                      (if
+                       (i64.lt_s
+                        (local.tee $50
+                         (i64.load
+                          (local.get $16)
+                         )
+                        )
+                        (i64.const 0)
+                       )
+                       (block
+                        (i64.store
+                         (local.get $16)
+                         (local.tee $50
+                          (i64.sub
+                           (i64.const 0)
+                           (local.get $50)
+                          )
+                         )
+                        )
+                        (local.set $6
+                         (i32.const 1)
+                        )
+                        (local.set $8
+                         (i32.const 1648)
+                        )
+                        (br $label$75)
+                       )
+                      )
+                      (if
+                       (i32.and
+                        (local.get $12)
+                        (i32.const 2048)
+                       )
+                       (block
+                        (local.set $6
+                         (i32.const 1)
+                        )
+                        (local.set $8
+                         (i32.const 1649)
+                        )
+                        (br $label$75)
+                       )
+                       (block
+                        (local.set $6
+                         (local.tee $1
+                          (i32.and
+                           (local.get $12)
+                           (i32.const 1)
+                          )
+                         )
+                        )
+                        (local.set $8
+                         (if (result i32)
+                          (local.get $1)
+                          (i32.const 1650)
+                          (i32.const 1648)
+                         )
+                        )
+                        (br $label$75)
+                       )
+                      )
+                     )
+                     (local.set $50
+                      (i64.load
+                       (local.get $16)
+                      )
+                     )
+                     (local.set $6
+                      (i32.const 0)
+                     )
+                     (local.set $8
+                      (i32.const 1648)
+                     )
+                     (br $label$75)
+                    )
+                    (i64.store8
+                     (local.get $39)
+                     (i64.load
+                      (local.get $16)
+                     )
+                    )
+                    (local.set $1
+                     (local.get $39)
+                    )
+                    (local.set $12
+                     (local.get $7)
+                    )
+                    (local.set $7
+                     (i32.const 1)
+                    )
+                    (local.set $6
+                     (i32.const 0)
+                    )
+                    (local.set $8
+                     (i32.const 1648)
+                    )
+                    (local.set $5
+                     (local.get $21)
+                    )
+                    (br $label$70)
+                   )
+                   (local.set $1
+                    (call $23
+                     (i32.load
+                      (call $11)
+                     )
+                    )
+                   )
+                   (br $label$74)
+                  )
+                  (if
+                   (i32.eqz
+                    (local.tee $1
+                     (i32.load
+                      (local.get $16)
+                     )
+                    )
+                   )
+                   (local.set $1
+                    (i32.const 1658)
+                   )
+                  )
+                  (br $label$74)
+                 )
+                 (i64.store32
+                  (local.get $37)
+                  (i64.load
+                   (local.get $16)
+                  )
+                 )
+                 (i32.store
+                  (local.get $42)
+                  (i32.const 0)
+                 )
+                 (i32.store
+                  (local.get $16)
+                  (local.get $37)
+                 )
+                 (local.set $7
+                  (local.get $37)
+                 )
+                 (local.set $6
+                  (i32.const -1)
+                 )
+                 (br $label$73)
+                )
+                (local.set $7
+                 (i32.load
+                  (local.get $16)
+                 )
+                )
+                (if
+                 (local.get $5)
+                 (block
+                  (local.set $6
+                   (local.get $5)
+                  )
+                  (br $label$73)
+                 )
+                 (block
+                  (call $24
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (i32.const 0)
+                   (local.get $12)
+                  )
+                  (local.set $1
+                   (i32.const 0)
+                  )
+                  (br $label$72)
+                 )
+                )
+               )
+               (local.set $52
+                (f64.load
+                 (local.get $16)
+                )
+               )
+               (i32.store
+                (local.get $20)
+                (i32.const 0)
+               )
+               (local.set $26
+                (if (result i32)
+                 (i64.lt_s
+                  (i64.reinterpret_f64
+                   (local.get $52)
+                  )
+                  (i64.const 0)
+                 )
+                 (block (result i32)
+                  (local.set $24
+                   (i32.const 1)
+                  )
+                  (local.set $52
+                   (f64.neg
+                    (local.get $52)
+                   )
+                  )
+                  (i32.const 1665)
+                 )
+                 (block (result i32)
+                  (local.set $1
+                   (i32.and
+                    (local.get $12)
+                    (i32.const 1)
+                   )
+                  )
+                  (if (result i32)
+                   (i32.and
+                    (local.get $12)
+                    (i32.const 2048)
+                   )
+                   (block (result i32)
+                    (local.set $24
+                     (i32.const 1)
+                    )
+                    (i32.const 1668)
+                   )
+                   (block (result i32)
+                    (local.set $24
+                     (local.get $1)
+                    )
+                    (if (result i32)
+                     (local.get $1)
+                     (i32.const 1671)
+                     (i32.const 1666)
+                    )
+                   )
+                  )
+                 )
+                )
+               )
+               (block $label$119
+                (if
+                 (i64.lt_u
+                  (i64.and
+                   (i64.reinterpret_f64
+                    (local.get $52)
+                   )
+                   (i64.const 9218868437227405312)
+                  )
+                  (i64.const 9218868437227405312)
+                 )
+                 (block
+                  (if
+                   (local.tee $1
+                    (f64.ne
+                     (local.tee $52
+                      (f64.mul
+                       (call $26
+                        (local.get $52)
+                        (local.get $20)
+                       )
+                       (f64.const 2)
+                      )
+                     )
+                     (f64.const 0)
+                    )
+                   )
+                   (i32.store
+                    (local.get $20)
+                    (i32.add
+                     (i32.load
+                      (local.get $20)
+                     )
+                     (i32.const -1)
+                    )
+                   )
+                  )
+                  (if
+                   (i32.eq
+                    (local.tee $22
+                     (i32.or
+                      (local.get $9)
+                      (i32.const 32)
+                     )
+                    )
+                    (i32.const 97)
+                   )
+                   (block
+                    (local.set $1
+                     (i32.add
+                      (local.get $26)
+                      (i32.const 9)
+                     )
+                    )
+                    (if
+                     (local.tee $6
+                      (i32.and
+                       (local.get $9)
+                       (i32.const 32)
+                      )
+                     )
+                     (local.set $26
+                      (local.get $1)
+                     )
+                    )
+                    (if
+                     (i32.eqz
+                      (i32.or
+                       (i32.gt_u
+                        (local.get $5)
+                        (i32.const 11)
+                       )
+                       (i32.eqz
+                        (local.tee $1
+                         (i32.sub
+                          (i32.const 12)
+                          (local.get $5)
+                         )
+                        )
+                       )
+                      )
+                     )
+                     (block
+                      (local.set $53
+                       (f64.const 8)
+                      )
+                      (loop $label$125
+                       (local.set $53
+                        (f64.mul
+                         (local.get $53)
+                         (f64.const 16)
+                        )
+                       )
+                       (br_if $label$125
+                        (local.tee $1
+                         (i32.add
+                          (local.get $1)
+                          (i32.const -1)
+                         )
+                        )
+                       )
+                      )
+                      (local.set $52
+                       (if (result f64)
+                        (i32.eq
+                         (i32.load8_s
+                          (local.get $26)
+                         )
+                         (i32.const 45)
+                        )
+                        (f64.neg
+                         (f64.add
+                          (local.get $53)
+                          (f64.sub
+                           (f64.neg
+                            (local.get $52)
+                           )
+                           (local.get $53)
+                          )
+                         )
+                        )
+                        (f64.sub
+                         (f64.add
+                          (local.get $52)
+                          (local.get $53)
+                         )
+                         (local.get $53)
+                        )
+                       )
+                      )
+                     )
+                    )
+                    (local.set $1
+                     (i32.sub
+                      (i32.const 0)
+                      (local.tee $7
+                       (i32.load
+                        (local.get $20)
+                       )
+                      )
+                     )
+                    )
+                    (if
+                     (i32.eq
+                      (local.tee $1
+                       (call $22
+                        (i64.extend_i32_s
+                         (if (result i32)
+                          (i32.lt_s
+                           (local.get $7)
+                           (i32.const 0)
+                          )
+                          (local.get $1)
+                          (local.get $7)
+                         )
+                        )
+                        (local.get $33)
+                       )
+                      )
+                      (local.get $33)
+                     )
+                     (block
+                      (i32.store8
+                       (local.get $40)
+                       (i32.const 48)
+                      )
+                      (local.set $1
+                       (local.get $40)
+                      )
+                     )
+                    )
+                    (local.set $13
+                     (i32.or
+                      (local.get $24)
+                      (i32.const 2)
+                     )
+                    )
+                    (i32.store8
+                     (i32.add
+                      (local.get $1)
+                      (i32.const -1)
+                     )
+                     (i32.add
+                      (i32.and
+                       (i32.shr_s
+                        (local.get $7)
+                        (i32.const 31)
+                       )
+                       (i32.const 2)
+                      )
+                      (i32.const 43)
+                     )
+                    )
+                    (i32.store8
+                     (local.tee $8
+                      (i32.add
+                       (local.get $1)
+                       (i32.const -2)
+                      )
+                     )
+                     (i32.add
+                      (local.get $9)
+                      (i32.const 15)
+                     )
+                    )
+                    (local.set $9
+                     (i32.lt_s
+                      (local.get $5)
+                      (i32.const 1)
+                     )
+                    )
+                    (local.set $14
+                     (i32.eqz
+                      (i32.and
+                       (local.get $12)
+                       (i32.const 8)
+                      )
+                     )
+                    )
+                    (local.set $1
+                     (local.get $19)
+                    )
+                    (loop $label$131
+                     (i32.store8
+                      (local.get $1)
+                      (i32.or
+                       (i32.load8_u
+                        (i32.add
+                         (local.tee $7
+                          (i32.trunc_f64_s
+                           (local.get $52)
+                          )
+                         )
+                         (i32.const 1632)
+                        )
+                       )
+                       (local.get $6)
+                      )
+                     )
+                     (local.set $52
+                      (f64.mul
+                       (f64.sub
+                        (local.get $52)
+                        (f64.convert_i32_s
+                         (local.get $7)
+                        )
+                       )
+                       (f64.const 16)
+                      )
+                     )
+                     (local.set $1
+                      (block $label$132 (result i32)
+                       (if (result i32)
+                        (i32.eq
+                         (i32.sub
+                          (local.tee $7
+                           (i32.add
+                            (local.get $1)
+                            (i32.const 1)
+                           )
+                          )
+                          (local.get $27)
+                         )
+                         (i32.const 1)
+                        )
+                        (block (result i32)
+                         (drop
+                          (br_if $label$132
+                           (local.get $7)
+                           (i32.and
+                            (local.get $14)
+                            (i32.and
+                             (local.get $9)
+                             (f64.eq
+                              (local.get $52)
+                              (f64.const 0)
+                             )
+                            )
+                           )
+                          )
+                         )
+                         (i32.store8
+                          (local.get $7)
+                          (i32.const 46)
+                         )
+                         (i32.add
+                          (local.get $1)
+                          (i32.const 2)
+                         )
+                        )
+                        (local.get $7)
+                       )
+                      )
+                     )
+                     (br_if $label$131
+                      (f64.ne
+                       (local.get $52)
+                       (f64.const 0)
+                      )
+                     )
+                    )
+                    (local.set $6
+                     (i32.sub
+                      (i32.add
+                       (local.get $46)
+                       (local.get $5)
+                      )
+                      (local.tee $7
+                       (local.get $8)
+                      )
+                     )
+                    )
+                    (local.set $9
+                     (i32.add
+                      (i32.sub
+                       (local.get $44)
+                       (local.get $7)
+                      )
+                      (local.get $1)
+                     )
+                    )
+                    (call $24
+                     (local.get $0)
+                     (i32.const 32)
+                     (local.get $10)
+                     (local.tee $5
+                      (i32.add
+                       (if (result i32)
+                        (i32.and
+                         (i32.ne
+                          (local.get $5)
+                          (i32.const 0)
+                         )
+                         (i32.lt_s
+                          (i32.add
+                           (local.get $45)
+                           (local.get $1)
+                          )
+                          (local.get $5)
+                         )
+                        )
+                        (local.get $6)
+                        (local.tee $6
+                         (local.get $9)
+                        )
+                       )
+                       (local.get $13)
+                      )
+                     )
+                     (local.get $12)
+                    )
+                    (if
+                     (i32.eqz
+                      (i32.and
+                       (i32.load
+                        (local.get $0)
+                       )
+                       (i32.const 32)
+                      )
+                     )
+                     (drop
+                      (call $20
+                       (local.get $26)
+                       (local.get $13)
+                       (local.get $0)
+                      )
+                     )
+                    )
+                    (call $24
+                     (local.get $0)
+                     (i32.const 48)
+                     (local.get $10)
+                     (local.get $5)
+                     (i32.xor
+                      (local.get $12)
+                      (i32.const 65536)
+                     )
+                    )
+                    (local.set $1
+                     (i32.sub
+                      (local.get $1)
+                      (local.get $27)
+                     )
+                    )
+                    (if
+                     (i32.eqz
+                      (i32.and
+                       (i32.load
+                        (local.get $0)
+                       )
+                       (i32.const 32)
+                      )
+                     )
+                     (drop
+                      (call $20
+                       (local.get $19)
+                       (local.get $1)
+                       (local.get $0)
+                      )
+                     )
+                    )
+                    (call $24
+                     (local.get $0)
+                     (i32.const 48)
+                     (i32.sub
+                      (local.get $6)
+                      (i32.add
+                       (local.get $1)
+                       (local.tee $1
+                        (i32.sub
+                         (local.get $28)
+                         (local.get $7)
+                        )
+                       )
+                      )
+                     )
+                     (i32.const 0)
+                     (i32.const 0)
+                    )
+                    (if
+                     (i32.eqz
+                      (i32.and
+                       (i32.load
+                        (local.get $0)
+                       )
+                       (i32.const 32)
+                      )
+                     )
+                     (drop
+                      (call $20
+                       (local.get $8)
+                       (local.get $1)
+                       (local.get $0)
+                      )
+                     )
+                    )
+                    (call $24
+                     (local.get $0)
+                     (i32.const 32)
+                     (local.get $10)
+                     (local.get $5)
+                     (i32.xor
+                      (local.get $12)
+                      (i32.const 8192)
+                     )
+                    )
+                    (if
+                     (i32.ge_s
+                      (local.get $5)
+                      (local.get $10)
+                     )
+                     (local.set $10
+                      (local.get $5)
+                     )
+                    )
+                    (br $label$119)
+                   )
+                  )
+                  (if
+                   (local.get $1)
+                   (block
+                    (i32.store
+                     (local.get $20)
+                     (local.tee $6
+                      (i32.add
+                       (i32.load
+                        (local.get $20)
+                       )
+                       (i32.const -28)
+                      )
+                     )
+                    )
+                    (local.set $52
+                     (f64.mul
+                      (local.get $52)
+                      (f64.const 268435456)
+                     )
+                    )
+                   )
+                   (local.set $6
+                    (i32.load
+                     (local.get $20)
+                    )
+                   )
+                  )
+                  (local.set $8
+                   (local.tee $7
+                    (if (result i32)
+                     (i32.lt_s
+                      (local.get $6)
+                      (i32.const 0)
+                     )
+                     (local.get $47)
+                     (local.get $48)
+                    )
+                   )
+                  )
+                  (loop $label$145
+                   (i32.store
+                    (local.get $8)
+                    (local.tee $1
+                     (i32.trunc_f64_s
+                      (local.get $52)
+                     )
+                    )
+                   )
+                   (local.set $8
+                    (i32.add
+                     (local.get $8)
+                     (i32.const 4)
+                    )
+                   )
+                   (br_if $label$145
+                    (f64.ne
+                     (local.tee $52
+                      (f64.mul
+                       (f64.sub
+                        (local.get $52)
+                        (f64.convert_i32_u
+                         (local.get $1)
+                        )
+                       )
+                       (f64.const 1e9)
+                      )
+                     )
+                     (f64.const 0)
+                    )
+                   )
+                  )
+                  (if
+                   (i32.gt_s
+                    (local.get $6)
+                    (i32.const 0)
+                   )
+                   (block
+                    (local.set $1
+                     (local.get $7)
+                    )
+                    (loop $label$147
+                     (local.set $14
+                      (if (result i32)
+                       (i32.gt_s
+                        (local.get $6)
+                        (i32.const 29)
+                       )
+                       (i32.const 29)
+                       (local.get $6)
+                      )
+                     )
+                     (block $label$150
+                      (if
+                       (i32.ge_u
+                        (local.tee $6
+                         (i32.add
+                          (local.get $8)
+                          (i32.const -4)
+                         )
+                        )
+                        (local.get $1)
+                       )
+                       (block
+                        (local.set $50
+                         (i64.extend_i32_u
+                          (local.get $14)
+                         )
+                        )
+                        (local.set $13
+                         (i32.const 0)
+                        )
+                        (loop $label$152
+                         (i64.store32
+                          (local.get $6)
+                          (i64.rem_u
+                           (local.tee $51
+                            (i64.add
+                             (i64.shl
+                              (i64.extend_i32_u
+                               (i32.load
+                                (local.get $6)
+                               )
+                              )
+                              (local.get $50)
+                             )
+                             (i64.extend_i32_u
+                              (local.get $13)
+                             )
+                            )
+                           )
+                           (i64.const 1000000000)
+                          )
+                         )
+                         (local.set $13
+                          (i32.wrap_i64
+                           (i64.div_u
+                            (local.get $51)
+                            (i64.const 1000000000)
+                           )
+                          )
+                         )
+                         (br_if $label$152
+                          (i32.ge_u
+                           (local.tee $6
+                            (i32.add
+                             (local.get $6)
+                             (i32.const -4)
+                            )
+                           )
+                           (local.get $1)
+                          )
+                         )
+                        )
+                        (br_if $label$150
+                         (i32.eqz
+                          (local.get $13)
+                         )
+                        )
+                        (i32.store
+                         (local.tee $1
+                          (i32.add
+                           (local.get $1)
+                           (i32.const -4)
+                          )
+                         )
+                         (local.get $13)
+                        )
+                       )
+                      )
+                     )
+                     (loop $label$153
+                      (if
+                       (i32.gt_u
+                        (local.get $8)
+                        (local.get $1)
+                       )
+                       (if
+                        (i32.eqz
+                         (i32.load
+                          (local.tee $6
+                           (i32.add
+                            (local.get $8)
+                            (i32.const -4)
+                           )
+                          )
+                         )
+                        )
+                        (block
+                         (local.set $8
+                          (local.get $6)
+                         )
+                         (br $label$153)
+                        )
+                       )
+                      )
+                     )
+                     (i32.store
+                      (local.get $20)
+                      (local.tee $6
+                       (i32.sub
+                        (i32.load
+                         (local.get $20)
+                        )
+                        (local.get $14)
+                       )
+                      )
+                     )
+                     (br_if $label$147
+                      (i32.gt_s
+                       (local.get $6)
+                       (i32.const 0)
+                      )
+                     )
+                    )
+                   )
+                   (local.set $1
+                    (local.get $7)
+                   )
+                  )
+                  (local.set $18
+                   (if (result i32)
+                    (i32.lt_s
+                     (local.get $5)
+                     (i32.const 0)
+                    )
+                    (i32.const 6)
+                    (local.get $5)
+                   )
+                  )
+                  (if
+                   (i32.lt_s
+                    (local.get $6)
+                    (i32.const 0)
+                   )
+                   (block
+                    (local.set $14
+                     (i32.add
+                      (i32.div_s
+                       (i32.add
+                        (local.get $18)
+                        (i32.const 25)
+                       )
+                       (i32.const 9)
+                      )
+                      (i32.const 1)
+                     )
+                    )
+                    (local.set $25
+                     (i32.eq
+                      (local.get $22)
+                      (i32.const 102)
+                     )
+                    )
+                    (local.set $5
+                     (local.get $8)
+                    )
+                    (loop $label$160
+                     (if
+                      (i32.gt_s
+                       (local.tee $13
+                        (i32.sub
+                         (i32.const 0)
+                         (local.get $6)
+                        )
+                       )
+                       (i32.const 9)
+                      )
+                      (local.set $13
+                       (i32.const 9)
+                      )
+                     )
+                     (block $label$162
+                      (if
+                       (i32.lt_u
+                        (local.get $1)
+                        (local.get $5)
+                       )
+                       (block
+                        (local.set $29
+                         (i32.add
+                          (i32.shl
+                           (i32.const 1)
+                           (local.get $13)
+                          )
+                          (i32.const -1)
+                         )
+                        )
+                        (local.set $35
+                         (i32.shr_u
+                          (i32.const 1000000000)
+                          (local.get $13)
+                         )
+                        )
+                        (local.set $6
+                         (i32.const 0)
+                        )
+                        (local.set $8
+                         (local.get $1)
+                        )
+                        (loop $label$164
+                         (i32.store
+                          (local.get $8)
+                          (i32.add
+                           (i32.shr_u
+                            (local.tee $32
+                             (i32.load
+                              (local.get $8)
+                             )
+                            )
+                            (local.get $13)
+                           )
+                           (local.get $6)
+                          )
+                         )
+                         (local.set $6
+                          (i32.mul
+                           (i32.and
+                            (local.get $32)
+                            (local.get $29)
+                           )
+                           (local.get $35)
+                          )
+                         )
+                         (br_if $label$164
+                          (i32.lt_u
+                           (local.tee $8
+                            (i32.add
+                             (local.get $8)
+                             (i32.const 4)
+                            )
+                           )
+                           (local.get $5)
+                          )
+                         )
+                        )
+                        (local.set $8
+                         (i32.add
+                          (local.get $1)
+                          (i32.const 4)
+                         )
+                        )
+                        (if
+                         (i32.eqz
+                          (i32.load
+                           (local.get $1)
+                          )
+                         )
+                         (local.set $1
+                          (local.get $8)
+                         )
+                        )
+                        (br_if $label$162
+                         (i32.eqz
+                          (local.get $6)
+                         )
+                        )
+                        (i32.store
+                         (local.get $5)
+                         (local.get $6)
+                        )
+                        (local.set $5
+                         (i32.add
+                          (local.get $5)
+                          (i32.const 4)
+                         )
+                        )
+                       )
+                       (block
+                        (local.set $8
+                         (i32.add
+                          (local.get $1)
+                          (i32.const 4)
+                         )
+                        )
+                        (if
+                         (i32.eqz
+                          (i32.load
+                           (local.get $1)
+                          )
+                         )
+                         (local.set $1
+                          (local.get $8)
+                         )
+                        )
+                       )
+                      )
+                     )
+                     (local.set $6
+                      (i32.add
+                       (local.tee $8
+                        (if (result i32)
+                         (local.get $25)
+                         (local.get $7)
+                         (local.get $1)
+                        )
+                       )
+                       (i32.shl
+                        (local.get $14)
+                        (i32.const 2)
+                       )
+                      )
+                     )
+                     (if
+                      (i32.gt_s
+                       (i32.shr_s
+                        (i32.sub
+                         (local.get $5)
+                         (local.get $8)
+                        )
+                        (i32.const 2)
+                       )
+                       (local.get $14)
+                      )
+                      (local.set $5
+                       (local.get $6)
+                      )
+                     )
+                     (i32.store
+                      (local.get $20)
+                      (local.tee $6
+                       (i32.add
+                        (i32.load
+                         (local.get $20)
+                        )
+                        (local.get $13)
+                       )
+                      )
+                     )
+                     (br_if $label$160
+                      (i32.lt_s
+                       (local.get $6)
+                       (i32.const 0)
+                      )
+                     )
+                     (local.set $13
+                      (local.get $5)
+                     )
+                    )
+                   )
+                   (local.set $13
+                    (local.get $8)
+                   )
+                  )
+                  (local.set $25
+                   (local.get $7)
+                  )
+                  (block $label$172
+                   (if
+                    (i32.lt_u
+                     (local.get $1)
+                     (local.get $13)
+                    )
+                    (block
+                     (local.set $5
+                      (i32.mul
+                       (i32.shr_s
+                        (i32.sub
+                         (local.get $25)
+                         (local.get $1)
+                        )
+                        (i32.const 2)
+                       )
+                       (i32.const 9)
+                      )
+                     )
+                     (br_if $label$172
+                      (i32.lt_u
+                       (local.tee $6
+                        (i32.load
+                         (local.get $1)
+                        )
+                       )
+                       (i32.const 10)
+                      )
+                     )
+                     (local.set $8
+                      (i32.const 10)
+                     )
+                     (loop $label$174
+                      (local.set $5
+                       (i32.add
+                        (local.get $5)
+                        (i32.const 1)
+                       )
+                      )
+                      (br_if $label$174
+                       (i32.ge_u
+                        (local.get $6)
+                        (local.tee $8
+                         (i32.mul
+                          (local.get $8)
+                          (i32.const 10)
+                         )
+                        )
+                       )
+                      )
+                     )
+                    )
+                    (local.set $5
+                     (i32.const 0)
+                    )
+                   )
+                  )
+                  (local.set $29
+                   (i32.eq
+                    (local.get $22)
+                    (i32.const 103)
+                   )
+                  )
+                  (local.set $35
+                   (i32.ne
+                    (local.get $18)
+                    (i32.const 0)
+                   )
+                  )
+                  (if
+                   (i32.lt_s
+                    (local.tee $8
+                     (i32.add
+                      (i32.sub
+                       (local.get $18)
+                       (if (result i32)
+                        (i32.ne
+                         (local.get $22)
+                         (i32.const 102)
+                        )
+                        (local.get $5)
+                        (i32.const 0)
+                       )
+                      )
+                      (i32.shr_s
+                       (i32.shl
+                        (i32.and
+                         (local.get $35)
+                         (local.get $29)
+                        )
+                        (i32.const 31)
+                       )
+                       (i32.const 31)
+                      )
+                     )
+                    )
+                    (i32.add
+                     (i32.mul
+                      (i32.shr_s
+                       (i32.sub
+                        (local.get $13)
+                        (local.get $25)
+                       )
+                       (i32.const 2)
+                      )
+                      (i32.const 9)
+                     )
+                     (i32.const -9)
+                    )
+                   )
+                   (block
+                    (if
+                     (i32.lt_s
+                      (local.tee $8
+                       (i32.add
+                        (i32.rem_s
+                         (local.tee $14
+                          (i32.add
+                           (local.get $8)
+                           (i32.const 9216)
+                          )
+                         )
+                         (i32.const 9)
+                        )
+                        (i32.const 1)
+                       )
+                      )
+                      (i32.const 9)
+                     )
+                     (block
+                      (local.set $6
+                       (i32.const 10)
+                      )
+                      (loop $label$180
+                       (local.set $6
+                        (i32.mul
+                         (local.get $6)
+                         (i32.const 10)
+                        )
+                       )
+                       (br_if $label$180
+                        (i32.ne
+                         (local.tee $8
+                          (i32.add
+                           (local.get $8)
+                           (i32.const 1)
+                          )
+                         )
+                         (i32.const 9)
+                        )
+                       )
+                      )
+                     )
+                     (local.set $6
+                      (i32.const 10)
+                     )
+                    )
+                    (local.set $14
+                     (i32.rem_u
+                      (local.tee $22
+                       (i32.load
+                        (local.tee $8
+                         (i32.add
+                          (i32.add
+                           (local.get $7)
+                           (i32.const 4)
+                          )
+                          (i32.shl
+                           (i32.add
+                            (i32.div_s
+                             (local.get $14)
+                             (i32.const 9)
+                            )
+                            (i32.const -1024)
+                           )
+                           (i32.const 2)
+                          )
+                         )
+                        )
+                       )
+                      )
+                      (local.get $6)
+                     )
+                    )
+                    (block $label$182
+                     (if
+                      (i32.eqz
+                       (i32.and
+                        (local.tee $32
+                         (i32.eq
+                          (i32.add
+                           (local.get $8)
+                           (i32.const 4)
+                          )
+                          (local.get $13)
+                         )
+                        )
+                        (i32.eqz
+                         (local.get $14)
+                        )
+                       )
+                      )
+                      (block
+                       (local.set $52
+                        (if (result f64)
+                         (i32.lt_u
+                          (local.get $14)
+                          (local.tee $49
+                           (i32.div_s
+                            (local.get $6)
+                            (i32.const 2)
+                           )
+                          )
+                         )
+                         (f64.const 0.5)
+                         (if (result f64)
+                          (i32.and
+                           (local.get $32)
+                           (i32.eq
+                            (local.get $14)
+                            (local.get $49)
+                           )
+                          )
+                          (f64.const 1)
+                          (f64.const 1.5)
+                         )
+                        )
+                       )
+                       (local.set $53
+                        (if (result f64)
+                         (i32.and
+                          (i32.div_u
+                           (local.get $22)
+                           (local.get $6)
+                          )
+                          (i32.const 1)
+                         )
+                         (f64.const 9007199254740994)
+                         (f64.const 9007199254740992)
+                        )
+                       )
+                       (block $label$190
+                        (if
+                         (local.get $24)
+                         (block
+                          (br_if $label$190
+                           (i32.ne
+                            (i32.load8_s
+                             (local.get $26)
+                            )
+                            (i32.const 45)
+                           )
+                          )
+                          (local.set $53
+                           (f64.neg
+                            (local.get $53)
+                           )
+                          )
+                          (local.set $52
+                           (f64.neg
+                            (local.get $52)
+                           )
+                          )
+                         )
+                        )
+                       )
+                       (i32.store
+                        (local.get $8)
+                        (local.tee $14
+                         (i32.sub
+                          (local.get $22)
+                          (local.get $14)
+                         )
+                        )
+                       )
+                       (br_if $label$182
+                        (f64.eq
+                         (f64.add
+                          (local.get $53)
+                          (local.get $52)
+                         )
+                         (local.get $53)
+                        )
+                       )
+                       (i32.store
+                        (local.get $8)
+                        (local.tee $5
+                         (i32.add
+                          (local.get $14)
+                          (local.get $6)
+                         )
+                        )
+                       )
+                       (if
+                        (i32.gt_u
+                         (local.get $5)
+                         (i32.const 999999999)
+                        )
+                        (loop $label$193
+                         (i32.store
+                          (local.get $8)
+                          (i32.const 0)
+                         )
+                         (if
+                          (i32.lt_u
+                           (local.tee $8
+                            (i32.add
+                             (local.get $8)
+                             (i32.const -4)
+                            )
+                           )
+                           (local.get $1)
+                          )
+                          (i32.store
+                           (local.tee $1
+                            (i32.add
+                             (local.get $1)
+                             (i32.const -4)
+                            )
+                           )
+                           (i32.const 0)
+                          )
+                         )
+                         (i32.store
+                          (local.get $8)
+                          (local.tee $5
+                           (i32.add
+                            (i32.load
+                             (local.get $8)
+                            )
+                            (i32.const 1)
+                           )
+                          )
+                         )
+                         (br_if $label$193
+                          (i32.gt_u
+                           (local.get $5)
+                           (i32.const 999999999)
+                          )
+                         )
+                        )
+                       )
+                       (local.set $5
+                        (i32.mul
+                         (i32.shr_s
+                          (i32.sub
+                           (local.get $25)
+                           (local.get $1)
+                          )
+                          (i32.const 2)
+                         )
+                         (i32.const 9)
+                        )
+                       )
+                       (br_if $label$182
+                        (i32.lt_u
+                         (local.tee $14
+                          (i32.load
+                           (local.get $1)
+                          )
+                         )
+                         (i32.const 10)
+                        )
+                       )
+                       (local.set $6
+                        (i32.const 10)
+                       )
+                       (loop $label$195
+                        (local.set $5
+                         (i32.add
+                          (local.get $5)
+                          (i32.const 1)
+                         )
+                        )
+                        (br_if $label$195
+                         (i32.ge_u
+                          (local.get $14)
+                          (local.tee $6
+                           (i32.mul
+                            (local.get $6)
+                            (i32.const 10)
+                           )
+                          )
+                         )
+                        )
+                       )
+                      )
+                     )
+                    )
+                    (local.set $14
+                     (local.get $1)
+                    )
+                    (local.set $6
+                     (local.get $5)
+                    )
+                    (if
+                     (i32.le_u
+                      (local.get $13)
+                      (local.tee $8
+                       (i32.add
+                        (local.get $8)
+                        (i32.const 4)
+                       )
+                      )
+                     )
+                     (local.set $8
+                      (local.get $13)
+                     )
+                    )
+                   )
+                   (block
+                    (local.set $14
+                     (local.get $1)
+                    )
+                    (local.set $6
+                     (local.get $5)
+                    )
+                    (local.set $8
+                     (local.get $13)
+                    )
+                   )
+                  )
+                  (local.set $32
+                   (i32.sub
+                    (i32.const 0)
+                    (local.get $6)
+                   )
+                  )
+                  (loop $label$198
+                   (block $label$199
+                    (if
+                     (i32.le_u
+                      (local.get $8)
+                      (local.get $14)
+                     )
+                     (block
+                      (local.set $22
+                       (i32.const 0)
+                      )
+                      (br $label$199)
+                     )
+                    )
+                    (if
+                     (i32.load
+                      (local.tee $1
+                       (i32.add
+                        (local.get $8)
+                        (i32.const -4)
+                       )
+                      )
+                     )
+                     (local.set $22
+                      (i32.const 1)
+                     )
+                     (block
+                      (local.set $8
+                       (local.get $1)
+                      )
+                      (br $label$198)
+                     )
+                    )
+                   )
+                  )
+                  (block $label$203
+                   (if
+                    (local.get $29)
+                    (block
+                     (local.set $1
+                      (if (result i32)
+                       (i32.and
+                        (i32.gt_s
+                         (local.tee $1
+                          (i32.add
+                           (i32.xor
+                            (i32.and
+                             (local.get $35)
+                             (i32.const 1)
+                            )
+                            (i32.const 1)
+                           )
+                           (local.get $18)
+                          )
+                         )
+                         (local.get $6)
+                        )
+                        (i32.gt_s
+                         (local.get $6)
+                         (i32.const -5)
+                        )
+                       )
+                       (block (result i32)
+                        (local.set $5
+                         (i32.add
+                          (local.get $9)
+                          (i32.const -1)
+                         )
+                        )
+                        (i32.sub
+                         (i32.add
+                          (local.get $1)
+                          (i32.const -1)
+                         )
+                         (local.get $6)
+                        )
+                       )
+                       (block (result i32)
+                        (local.set $5
+                         (i32.add
+                          (local.get $9)
+                          (i32.const -2)
+                         )
+                        )
+                        (i32.add
+                         (local.get $1)
+                         (i32.const -1)
+                        )
+                       )
+                      )
+                     )
+                     (br_if $label$203
+                      (local.tee $13
+                       (i32.and
+                        (local.get $12)
+                        (i32.const 8)
+                       )
+                      )
+                     )
+                     (block $label$207
+                      (if
+                       (local.get $22)
+                       (block
+                        (if
+                         (i32.eqz
+                          (local.tee $18
+                           (i32.load
+                            (i32.add
+                             (local.get $8)
+                             (i32.const -4)
+                            )
+                           )
+                          )
+                         )
+                         (block
+                          (local.set $9
+                           (i32.const 9)
+                          )
+                          (br $label$207)
+                         )
+                        )
+                        (if
+                         (i32.rem_u
+                          (local.get $18)
+                          (i32.const 10)
+                         )
+                         (block
+                          (local.set $9
+                           (i32.const 0)
+                          )
+                          (br $label$207)
+                         )
+                         (block
+                          (local.set $13
+                           (i32.const 10)
+                          )
+                          (local.set $9
+                           (i32.const 0)
+                          )
+                         )
+                        )
+                        (loop $label$212
+                         (local.set $9
+                          (i32.add
+                           (local.get $9)
+                           (i32.const 1)
+                          )
+                         )
+                         (br_if $label$212
+                          (i32.eqz
+                           (i32.rem_u
+                            (local.get $18)
+                            (local.tee $13
+                             (i32.mul
+                              (local.get $13)
+                              (i32.const 10)
+                             )
+                            )
+                           )
+                          )
+                         )
+                        )
+                       )
+                       (local.set $9
+                        (i32.const 9)
+                       )
+                      )
+                     )
+                     (local.set $18
+                      (i32.add
+                       (i32.mul
+                        (i32.shr_s
+                         (i32.sub
+                          (local.get $8)
+                          (local.get $25)
+                         )
+                         (i32.const 2)
+                        )
+                        (i32.const 9)
+                       )
+                       (i32.const -9)
+                      )
+                     )
+                     (if
+                      (i32.eq
+                       (i32.or
+                        (local.get $5)
+                        (i32.const 32)
+                       )
+                       (i32.const 102)
+                      )
+                      (block
+                       (local.set $13
+                        (i32.const 0)
+                       )
+                       (if
+                        (i32.ge_s
+                         (local.get $1)
+                         (if (result i32)
+                          (i32.lt_s
+                           (local.tee $9
+                            (i32.sub
+                             (local.get $18)
+                             (local.get $9)
+                            )
+                           )
+                           (i32.const 0)
+                          )
+                          (local.tee $9
+                           (i32.const 0)
+                          )
+                          (local.get $9)
+                         )
+                        )
+                        (local.set $1
+                         (local.get $9)
+                        )
+                       )
+                      )
+                      (block
+                       (local.set $13
+                        (i32.const 0)
+                       )
+                       (if
+                        (i32.ge_s
+                         (local.get $1)
+                         (if (result i32)
+                          (i32.lt_s
+                           (local.tee $9
+                            (i32.sub
+                             (i32.add
+                              (local.get $18)
+                              (local.get $6)
+                             )
+                             (local.get $9)
+                            )
+                           )
+                           (i32.const 0)
+                          )
+                          (local.tee $9
+                           (i32.const 0)
+                          )
+                          (local.get $9)
+                         )
+                        )
+                        (local.set $1
+                         (local.get $9)
+                        )
+                       )
+                      )
+                     )
+                    )
+                    (block
+                     (local.set $13
+                      (i32.and
+                       (local.get $12)
+                       (i32.const 8)
+                      )
+                     )
+                     (local.set $1
+                      (local.get $18)
+                     )
+                     (local.set $5
+                      (local.get $9)
+                     )
+                    )
+                   )
+                  )
+                  (if
+                   (local.tee $25
+                    (i32.eq
+                     (i32.or
+                      (local.get $5)
+                      (i32.const 32)
+                     )
+                     (i32.const 102)
+                    )
+                   )
+                   (block
+                    (local.set $9
+                     (i32.const 0)
+                    )
+                    (if
+                     (i32.le_s
+                      (local.get $6)
+                      (i32.const 0)
+                     )
+                     (local.set $6
+                      (i32.const 0)
+                     )
+                    )
+                   )
+                   (block
+                    (if
+                     (i32.lt_s
+                      (i32.sub
+                       (local.get $28)
+                       (local.tee $9
+                        (call $22
+                         (i64.extend_i32_s
+                          (if (result i32)
+                           (i32.lt_s
+                            (local.get $6)
+                            (i32.const 0)
+                           )
+                           (local.get $32)
+                           (local.get $6)
+                          )
+                         )
+                         (local.get $33)
+                        )
+                       )
+                      )
+                      (i32.const 2)
+                     )
+                     (loop $label$229
+                      (i32.store8
+                       (local.tee $9
+                        (i32.add
+                         (local.get $9)
+                         (i32.const -1)
+                        )
+                       )
+                       (i32.const 48)
+                      )
+                      (br_if $label$229
+                       (i32.lt_s
+                        (i32.sub
+                         (local.get $28)
+                         (local.get $9)
+                        )
+                        (i32.const 2)
+                       )
+                      )
+                     )
+                    )
+                    (i32.store8
+                     (i32.add
+                      (local.get $9)
+                      (i32.const -1)
+                     )
+                     (i32.add
+                      (i32.and
+                       (i32.shr_s
+                        (local.get $6)
+                        (i32.const 31)
+                       )
+                       (i32.const 2)
+                      )
+                      (i32.const 43)
+                     )
+                    )
+                    (i32.store8
+                     (local.tee $6
+                      (i32.add
+                       (local.get $9)
+                       (i32.const -2)
+                      )
+                     )
+                     (local.get $5)
+                    )
+                    (local.set $9
+                     (local.get $6)
+                    )
+                    (local.set $6
+                     (i32.sub
+                      (local.get $28)
+                      (local.get $6)
+                     )
+                    )
+                   )
+                  )
+                  (call $24
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (local.tee $18
+                    (i32.add
+                     (i32.add
+                      (i32.add
+                       (i32.add
+                        (local.get $24)
+                        (i32.const 1)
+                       )
+                       (local.get $1)
+                      )
+                      (i32.ne
+                       (local.tee $29
+                        (i32.or
+                         (local.get $1)
+                         (local.get $13)
+                        )
+                       )
+                       (i32.const 0)
+                      )
+                     )
+                     (local.get $6)
+                    )
+                   )
+                   (local.get $12)
+                  )
+                  (if
+                   (i32.eqz
+                    (i32.and
+                     (i32.load
+                      (local.get $0)
+                     )
+                     (i32.const 32)
+                    )
+                   )
+                   (drop
+                    (call $20
+                     (local.get $26)
+                     (local.get $24)
+                     (local.get $0)
+                    )
+                   )
+                  )
+                  (call $24
+                   (local.get $0)
+                   (i32.const 48)
+                   (local.get $10)
+                   (local.get $18)
+                   (i32.xor
+                    (local.get $12)
+                    (i32.const 65536)
+                   )
+                  )
+                  (block $label$231
+                   (if
+                    (local.get $25)
+                    (block
+                     (local.set $6
+                      (local.tee $9
+                       (if (result i32)
+                        (i32.gt_u
+                         (local.get $14)
+                         (local.get $7)
+                        )
+                        (local.get $7)
+                        (local.get $14)
+                       )
+                      )
+                     )
+                     (loop $label$235
+                      (local.set $5
+                       (call $22
+                        (i64.extend_i32_u
+                         (i32.load
+                          (local.get $6)
+                         )
+                        )
+                        (local.get $31)
+                       )
+                      )
+                      (block $label$236
+                       (if
+                        (i32.eq
+                         (local.get $6)
+                         (local.get $9)
+                        )
+                        (block
+                         (br_if $label$236
+                          (i32.ne
+                           (local.get $5)
+                           (local.get $31)
+                          )
+                         )
+                         (i32.store8
+                          (local.get $34)
+                          (i32.const 48)
+                         )
+                         (local.set $5
+                          (local.get $34)
+                         )
+                        )
+                        (block
+                         (br_if $label$236
+                          (i32.le_u
+                           (local.get $5)
+                           (local.get $19)
+                          )
+                         )
+                         (drop
+                          (call $35
+                           (local.get $19)
+                           (i32.const 48)
+                           (i32.sub
+                            (local.get $5)
+                            (local.get $27)
+                           )
+                          )
+                         )
+                         (loop $label$239
+                          (br_if $label$239
+                           (i32.gt_u
+                            (local.tee $5
+                             (i32.add
+                              (local.get $5)
+                              (i32.const -1)
+                             )
+                            )
+                            (local.get $19)
+                           )
+                          )
+                         )
+                        )
+                       )
+                      )
+                      (if
+                       (i32.eqz
+                        (i32.and
+                         (i32.load
+                          (local.get $0)
+                         )
+                         (i32.const 32)
+                        )
+                       )
+                       (drop
+                        (call $20
+                         (local.get $5)
+                         (i32.sub
+                          (local.get $41)
+                          (local.get $5)
+                         )
+                         (local.get $0)
+                        )
+                       )
+                      )
+                      (if
+                       (i32.le_u
+                        (local.tee $5
+                         (i32.add
+                          (local.get $6)
+                          (i32.const 4)
+                         )
+                        )
+                        (local.get $7)
+                       )
+                       (block
+                        (local.set $6
+                         (local.get $5)
+                        )
+                        (br $label$235)
+                       )
+                      )
+                     )
+                     (block $label$242
+                      (if
+                       (local.get $29)
+                       (block
+                        (br_if $label$242
+                         (i32.and
+                          (i32.load
+                           (local.get $0)
+                          )
+                          (i32.const 32)
+                         )
+                        )
+                        (drop
+                         (call $20
+                          (i32.const 1700)
+                          (i32.const 1)
+                          (local.get $0)
+                         )
+                        )
+                       )
+                      )
+                     )
+                     (if
+                      (i32.and
+                       (i32.gt_s
+                        (local.get $1)
+                        (i32.const 0)
+                       )
+                       (i32.lt_u
+                        (local.get $5)
+                        (local.get $8)
+                       )
+                      )
+                      (loop $label$245
+                       (if
+                        (i32.gt_u
+                         (local.tee $7
+                          (call $22
+                           (i64.extend_i32_u
+                            (i32.load
+                             (local.get $5)
+                            )
+                           )
+                           (local.get $31)
+                          )
+                         )
+                         (local.get $19)
+                        )
+                        (block
+                         (drop
+                          (call $35
+                           (local.get $19)
+                           (i32.const 48)
+                           (i32.sub
+                            (local.get $7)
+                            (local.get $27)
+                           )
+                          )
+                         )
+                         (loop $label$247
+                          (br_if $label$247
+                           (i32.gt_u
+                            (local.tee $7
+                             (i32.add
+                              (local.get $7)
+                              (i32.const -1)
+                             )
+                            )
+                            (local.get $19)
+                           )
+                          )
+                         )
+                        )
+                       )
+                       (if
+                        (i32.eqz
+                         (i32.and
+                          (i32.load
+                           (local.get $0)
+                          )
+                          (i32.const 32)
+                         )
+                        )
+                        (drop
+                         (call $20
+                          (local.get $7)
+                          (if (result i32)
+                           (i32.gt_s
+                            (local.get $1)
+                            (i32.const 9)
+                           )
+                           (i32.const 9)
+                           (local.get $1)
+                          )
+                          (local.get $0)
+                         )
+                        )
+                       )
+                       (local.set $7
+                        (i32.add
+                         (local.get $1)
+                         (i32.const -9)
+                        )
+                       )
+                       (if
+                        (i32.and
+                         (i32.gt_s
+                          (local.get $1)
+                          (i32.const 9)
+                         )
+                         (i32.lt_u
+                          (local.tee $5
+                           (i32.add
+                            (local.get $5)
+                            (i32.const 4)
+                           )
+                          )
+                          (local.get $8)
+                         )
+                        )
+                        (block
+                         (local.set $1
+                          (local.get $7)
+                         )
+                         (br $label$245)
+                        )
+                        (local.set $1
+                         (local.get $7)
+                        )
+                       )
+                      )
+                     )
+                     (call $24
+                      (local.get $0)
+                      (i32.const 48)
+                      (i32.add
+                       (local.get $1)
+                       (i32.const 9)
+                      )
+                      (i32.const 9)
+                      (i32.const 0)
+                     )
+                    )
+                    (block
+                     (local.set $5
+                      (i32.add
+                       (local.get $14)
+                       (i32.const 4)
+                      )
+                     )
+                     (if
+                      (i32.eqz
+                       (local.get $22)
+                      )
+                      (local.set $8
+                       (local.get $5)
+                      )
+                     )
+                     (if
+                      (i32.gt_s
+                       (local.get $1)
+                       (i32.const -1)
+                      )
+                      (block
+                       (local.set $13
+                        (i32.eqz
+                         (local.get $13)
+                        )
+                       )
+                       (local.set $7
+                        (local.get $14)
+                       )
+                       (local.set $5
+                        (local.get $1)
+                       )
+                       (loop $label$256
+                        (if
+                         (i32.eq
+                          (local.tee $1
+                           (call $22
+                            (i64.extend_i32_u
+                             (i32.load
+                              (local.get $7)
+                             )
+                            )
+                            (local.get $31)
+                           )
+                          )
+                          (local.get $31)
+                         )
+                         (block
+                          (i32.store8
+                           (local.get $34)
+                           (i32.const 48)
+                          )
+                          (local.set $1
+                           (local.get $34)
+                          )
+                         )
+                        )
+                        (block $label$258
+                         (if
+                          (i32.eq
+                           (local.get $7)
+                           (local.get $14)
+                          )
+                          (block
+                           (if
+                            (i32.eqz
+                             (i32.and
+                              (i32.load
+                               (local.get $0)
+                              )
+                              (i32.const 32)
+                             )
+                            )
+                            (drop
+                             (call $20
+                              (local.get $1)
+                              (i32.const 1)
+                              (local.get $0)
+                             )
+                            )
+                           )
+                           (local.set $1
+                            (i32.add
+                             (local.get $1)
+                             (i32.const 1)
+                            )
+                           )
+                           (br_if $label$258
+                            (i32.and
+                             (local.get $13)
+                             (i32.lt_s
+                              (local.get $5)
+                              (i32.const 1)
+                             )
+                            )
+                           )
+                           (br_if $label$258
+                            (i32.and
+                             (i32.load
+                              (local.get $0)
+                             )
+                             (i32.const 32)
+                            )
+                           )
+                           (drop
+                            (call $20
+                             (i32.const 1700)
+                             (i32.const 1)
+                             (local.get $0)
+                            )
+                           )
+                          )
+                          (block
+                           (br_if $label$258
+                            (i32.le_u
+                             (local.get $1)
+                             (local.get $19)
+                            )
+                           )
+                           (drop
+                            (call $35
+                             (local.get $19)
+                             (i32.const 48)
+                             (i32.add
+                              (local.get $1)
+                              (local.get $43)
+                             )
+                            )
+                           )
+                           (loop $label$262
+                            (br_if $label$262
+                             (i32.gt_u
+                              (local.tee $1
+                               (i32.add
+                                (local.get $1)
+                                (i32.const -1)
+                               )
+                              )
+                              (local.get $19)
+                             )
+                            )
+                           )
+                          )
+                         )
+                        )
+                        (local.set $6
+                         (i32.sub
+                          (local.get $41)
+                          (local.get $1)
+                         )
+                        )
+                        (if
+                         (i32.eqz
+                          (i32.and
+                           (i32.load
+                            (local.get $0)
+                           )
+                           (i32.const 32)
+                          )
+                         )
+                         (drop
+                          (call $20
+                           (local.get $1)
+                           (if (result i32)
+                            (i32.gt_s
+                             (local.get $5)
+                             (local.get $6)
+                            )
+                            (local.get $6)
+                            (local.get $5)
+                           )
+                           (local.get $0)
+                          )
+                         )
+                        )
+                        (br_if $label$256
+                         (i32.and
+                          (i32.lt_u
+                           (local.tee $7
+                            (i32.add
+                             (local.get $7)
+                             (i32.const 4)
+                            )
+                           )
+                           (local.get $8)
+                          )
+                          (i32.gt_s
+                           (local.tee $5
+                            (i32.sub
+                             (local.get $5)
+                             (local.get $6)
+                            )
+                           )
+                           (i32.const -1)
+                          )
+                         )
+                        )
+                        (local.set $1
+                         (local.get $5)
+                        )
+                       )
+                      )
+                     )
+                     (call $24
+                      (local.get $0)
+                      (i32.const 48)
+                      (i32.add
+                       (local.get $1)
+                       (i32.const 18)
+                      )
+                      (i32.const 18)
+                      (i32.const 0)
+                     )
+                     (br_if $label$231
+                      (i32.and
+                       (i32.load
+                        (local.get $0)
+                       )
+                       (i32.const 32)
+                      )
+                     )
+                     (drop
+                      (call $20
+                       (local.get $9)
+                       (i32.sub
+                        (local.get $28)
+                        (local.get $9)
+                       )
+                       (local.get $0)
+                      )
+                     )
+                    )
+                   )
+                  )
+                  (call $24
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (local.get $18)
+                   (i32.xor
+                    (local.get $12)
+                    (i32.const 8192)
+                   )
+                  )
+                  (if
+                   (i32.ge_s
+                    (local.get $18)
+                    (local.get $10)
+                   )
+                   (local.set $10
+                    (local.get $18)
+                   )
+                  )
+                 )
+                 (block
+                  (call $24
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (local.tee $8
+                    (i32.add
+                     (if (result i32)
+                      (local.tee $6
+                       (i32.or
+                        (f64.ne
+                         (local.get $52)
+                         (local.get $52)
+                        )
+                        (i32.const 0)
+                       )
+                      )
+                      (local.tee $24
+                       (i32.const 0)
+                      )
+                      (local.get $24)
+                     )
+                     (i32.const 3)
+                    )
+                   )
+                   (local.get $7)
+                  )
+                  (if
+                   (i32.eqz
+                    (i32.and
+                     (local.tee $1
+                      (i32.load
+                       (local.get $0)
+                      )
+                     )
+                     (i32.const 32)
+                    )
+                   )
+                   (block
+                    (drop
+                     (call $20
+                      (local.get $26)
+                      (local.get $24)
+                      (local.get $0)
+                     )
+                    )
+                    (local.set $1
+                     (i32.load
+                      (local.get $0)
+                     )
+                    )
+                   )
+                  )
+                  (local.set $7
+                   (if (result i32)
+                    (local.tee $5
+                     (i32.ne
+                      (i32.and
+                       (local.get $9)
+                       (i32.const 32)
+                      )
+                      (i32.const 0)
+                     )
+                    )
+                    (i32.const 1684)
+                    (i32.const 1688)
+                   )
+                  )
+                  (local.set $5
+                   (if (result i32)
+                    (local.get $5)
+                    (i32.const 1692)
+                    (i32.const 1696)
+                   )
+                  )
+                  (if
+                   (i32.eqz
+                    (local.get $6)
+                   )
+                   (local.set $5
+                    (local.get $7)
+                   )
+                  )
+                  (if
+                   (i32.eqz
+                    (i32.and
+                     (local.get $1)
+                     (i32.const 32)
+                    )
+                   )
+                   (drop
+                    (call $20
+                     (local.get $5)
+                     (i32.const 3)
+                     (local.get $0)
+                    )
+                   )
+                  )
+                  (call $24
+                   (local.get $0)
+                   (i32.const 32)
+                   (local.get $10)
+                   (local.get $8)
+                   (i32.xor
+                    (local.get $12)
+                    (i32.const 8192)
+                   )
+                  )
+                  (if
+                   (i32.ge_s
+                    (local.get $8)
+                    (local.get $10)
+                   )
+                   (local.set $10
+                    (local.get $8)
+                   )
+                  )
+                 )
+                )
+               )
+               (local.set $1
+                (local.get $11)
+               )
+               (br $label$4)
+              )
+              (local.set $7
+               (local.get $5)
+              )
+              (local.set $6
+               (i32.const 0)
+              )
+              (local.set $8
+               (i32.const 1648)
+              )
+              (local.set $5
+               (local.get $21)
+              )
+              (br $label$70)
+             )
+             (local.set $7
+              (i32.and
+               (local.get $9)
+               (i32.const 32)
+              )
+             )
+             (local.set $7
+              (if (result i32)
+               (i64.eq
+                (local.tee $50
+                 (i64.load
+                  (local.get $16)
+                 )
+                )
+                (i64.const 0)
+               )
+               (block (result i32)
+                (local.set $50
+                 (i64.const 0)
+                )
+                (local.get $21)
+               )
+               (block (result i32)
+                (local.set $1
+                 (local.get $21)
+                )
+                (loop $label$280
+                 (i32.store8
+                  (local.tee $1
+                   (i32.add
+                    (local.get $1)
+                    (i32.const -1)
+                   )
+                  )
+                  (i32.or
+                   (i32.load8_u
+                    (i32.add
+                     (i32.and
+                      (i32.wrap_i64
+                       (local.get $50)
+                      )
+                      (i32.const 15)
+                     )
+                     (i32.const 1632)
+                    )
+                   )
+                   (local.get $7)
+                  )
+                 )
+                 (br_if $label$280
+                  (i64.ne
+                   (local.tee $50
+                    (i64.shr_u
+                     (local.get $50)
+                     (i64.const 4)
+                    )
+                   )
+                   (i64.const 0)
+                  )
+                 )
+                )
+                (local.set $50
+                 (i64.load
+                  (local.get $16)
+                 )
+                )
+                (local.get $1)
+               )
+              )
+             )
+             (local.set $8
+              (i32.add
+               (i32.shr_s
+                (local.get $9)
+                (i32.const 4)
+               )
+               (i32.const 1648)
+              )
+             )
+             (if
+              (local.tee $1
+               (i32.or
+                (i32.eqz
+                 (i32.and
+                  (local.get $12)
+                  (i32.const 8)
+                 )
+                )
+                (i64.eq
+                 (local.get $50)
+                 (i64.const 0)
+                )
+               )
+              )
+              (local.set $8
+               (i32.const 1648)
+              )
+             )
+             (local.set $6
+              (if (result i32)
+               (local.get $1)
+               (i32.const 0)
+               (i32.const 2)
+              )
+             )
+             (br $label$71)
+            )
+            (local.set $7
+             (call $22
+              (local.get $50)
+              (local.get $21)
+             )
+            )
+            (br $label$71)
+           )
+           (local.set $14
+            (i32.eqz
+             (local.tee $13
+              (call $16
+               (local.get $1)
+               (i32.const 0)
+               (local.get $5)
+              )
+             )
+            )
+           )
+           (local.set $8
+            (i32.sub
+             (local.get $13)
+             (local.get $1)
+            )
+           )
+           (local.set $9
+            (i32.add
+             (local.get $1)
+             (local.get $5)
+            )
+           )
+           (local.set $12
+            (local.get $7)
+           )
+           (local.set $7
+            (if (result i32)
+             (local.get $14)
+             (local.get $5)
+             (local.get $8)
+            )
+           )
+           (local.set $6
+            (i32.const 0)
+           )
+           (local.set $8
+            (i32.const 1648)
+           )
+           (local.set $5
+            (if (result i32)
+             (local.get $14)
+             (local.get $9)
+             (local.get $13)
+            )
+           )
+           (br $label$70)
+          )
+          (local.set $1
+           (i32.const 0)
+          )
+          (local.set $5
+           (i32.const 0)
+          )
+          (local.set $8
+           (local.get $7)
+          )
+          (loop $label$288
+           (block $label$289
+            (br_if $label$289
+             (i32.eqz
+              (local.tee $9
+               (i32.load
+                (local.get $8)
+               )
+              )
+             )
+            )
+            (br_if $label$289
+             (i32.or
+              (i32.lt_s
+               (local.tee $5
+                (call $25
+                 (local.get $36)
+                 (local.get $9)
+                )
+               )
+               (i32.const 0)
+              )
+              (i32.gt_u
+               (local.get $5)
+               (i32.sub
+                (local.get $6)
+                (local.get $1)
+               )
+              )
+             )
+            )
+            (local.set $8
+             (i32.add
+              (local.get $8)
+              (i32.const 4)
+             )
+            )
+            (br_if $label$288
+             (i32.gt_u
+              (local.get $6)
+              (local.tee $1
+               (i32.add
+                (local.get $5)
+                (local.get $1)
+               )
+              )
+             )
+            )
+           )
+          )
+          (if
+           (i32.lt_s
+            (local.get $5)
+            (i32.const 0)
+           )
+           (block
+            (local.set $15
+             (i32.const -1)
+            )
+            (br $label$5)
+           )
+          )
+          (call $24
+           (local.get $0)
+           (i32.const 32)
+           (local.get $10)
+           (local.get $1)
+           (local.get $12)
+          )
+          (if
+           (local.get $1)
+           (block
+            (local.set $5
+             (i32.const 0)
+            )
+            (loop $label$292
+             (br_if $label$72
+              (i32.eqz
+               (local.tee $8
+                (i32.load
+                 (local.get $7)
+                )
+               )
+              )
+             )
+             (br_if $label$72
+              (i32.gt_s
+               (local.tee $5
+                (i32.add
+                 (local.tee $8
+                  (call $25
+                   (local.get $36)
+                   (local.get $8)
+                  )
+                 )
+                 (local.get $5)
+                )
+               )
+               (local.get $1)
+              )
+             )
+             (if
+              (i32.eqz
+               (i32.and
+                (i32.load
+                 (local.get $0)
+                )
+                (i32.const 32)
+               )
+              )
+              (drop
+               (call $20
+                (local.get $36)
+                (local.get $8)
+                (local.get $0)
+               )
+              )
+             )
+             (local.set $7
+              (i32.add
+               (local.get $7)
+               (i32.const 4)
+              )
+             )
+             (br_if $label$292
+              (i32.lt_u
+               (local.get $5)
+               (local.get $1)
+              )
+             )
+             (br $label$72)
+            )
+           )
+           (block
+            (local.set $1
+             (i32.const 0)
+            )
+            (br $label$72)
+           )
+          )
+         )
+         (call $24
+          (local.get $0)
+          (i32.const 32)
+          (local.get $10)
+          (local.get $1)
+          (i32.xor
+           (local.get $12)
+           (i32.const 8192)
+          )
+         )
+         (if
+          (i32.le_s
+           (local.get $10)
+           (local.get $1)
+          )
+          (local.set $10
+           (local.get $1)
+          )
+         )
+         (local.set $1
+          (local.get $11)
+         )
+         (br $label$4)
+        )
+        (local.set $1
+         (i32.and
+          (local.get $12)
+          (i32.const -65537)
+         )
+        )
+        (if
+         (i32.gt_s
+          (local.get $5)
+          (i32.const -1)
+         )
+         (local.set $12
+          (local.get $1)
+         )
+        )
+        (local.set $5
+         (if (result i32)
+          (i32.or
+           (local.get $5)
+           (local.tee $9
+            (i64.ne
+             (i64.load
+              (local.get $16)
+             )
+             (i64.const 0)
+            )
+           )
+          )
+          (block (result i32)
+           (local.set $1
+            (local.get $7)
+           )
+           (if
+            (i32.gt_s
+             (local.get $5)
+             (local.tee $7
+              (i32.add
+               (i32.xor
+                (i32.and
+                 (local.get $9)
+                 (i32.const 1)
+                )
+                (i32.const 1)
+               )
+               (i32.sub
+                (local.get $38)
+                (local.get $7)
+               )
+              )
+             )
+            )
+            (local.set $7
+             (local.get $5)
+            )
+           )
+           (local.get $21)
+          )
+          (block (result i32)
+           (local.set $1
+            (local.get $21)
+           )
+           (local.set $7
+            (i32.const 0)
+           )
+           (local.get $21)
+          )
+         )
+        )
+       )
+       (call $24
+        (local.get $0)
+        (i32.const 32)
+        (if (result i32)
+         (i32.lt_s
+          (local.get $10)
+          (local.tee $5
+           (i32.add
+            (if (result i32)
+             (i32.lt_s
+              (local.get $7)
+              (local.tee $9
+               (i32.sub
+                (local.get $5)
+                (local.get $1)
+               )
+              )
+             )
+             (local.tee $7
+              (local.get $9)
+             )
+             (local.get $7)
+            )
+            (local.get $6)
+           )
+          )
+         )
+         (local.tee $10
+          (local.get $5)
+         )
+         (local.get $10)
+        )
+        (local.get $5)
+        (local.get $12)
+       )
+       (if
+        (i32.eqz
+         (i32.and
+          (i32.load
+           (local.get $0)
+          )
+          (i32.const 32)
+         )
+        )
+        (drop
+         (call $20
+          (local.get $8)
+          (local.get $6)
+          (local.get $0)
+         )
+        )
+       )
+       (call $24
+        (local.get $0)
+        (i32.const 48)
+        (local.get $10)
+        (local.get $5)
+        (i32.xor
+         (local.get $12)
+         (i32.const 65536)
+        )
+       )
+       (call $24
+        (local.get $0)
+        (i32.const 48)
+        (local.get $7)
+        (local.get $9)
+        (i32.const 0)
+       )
+       (if
+        (i32.eqz
+         (i32.and
+          (i32.load
+           (local.get $0)
+          )
+          (i32.const 32)
+         )
+        )
+        (drop
+         (call $20
+          (local.get $1)
+          (local.get $9)
+          (local.get $0)
+         )
+        )
+       )
+       (call $24
+        (local.get $0)
+        (i32.const 32)
+        (local.get $10)
+        (local.get $5)
+        (i32.xor
+         (local.get $12)
+         (i32.const 8192)
+        )
+       )
+       (local.set $1
+        (local.get $11)
+       )
+       (br $label$4)
+      )
+     )
+     (br $label$2)
+    )
+    (if
+     (i32.eqz
+      (local.get $0)
+     )
+     (if
+      (local.get $17)
+      (block
+       (local.set $0
+        (i32.const 1)
+       )
+       (loop $label$308
+        (if
+         (local.tee $1
+          (i32.load
+           (i32.add
+            (local.get $4)
+            (i32.shl
+             (local.get $0)
+             (i32.const 2)
+            )
+           )
+          )
+         )
+         (block
+          (call $21
+           (i32.add
+            (local.get $3)
+            (i32.shl
+             (local.get $0)
+             (i32.const 3)
+            )
+           )
+           (local.get $1)
+           (local.get $2)
+          )
+          (br_if $label$308
+           (i32.lt_s
+            (local.tee $0
+             (i32.add
+              (local.get $0)
+              (i32.const 1)
+             )
+            )
+            (i32.const 10)
+           )
+          )
+          (local.set $15
+           (i32.const 1)
+          )
+          (br $label$2)
+         )
+        )
+       )
+       (loop $label$310
+        (if
+         (i32.load
+          (i32.add
+           (local.get $4)
+           (i32.shl
+            (local.get $0)
+            (i32.const 2)
+           )
+          )
+         )
+         (block
+          (local.set $15
+           (i32.const -1)
+          )
+          (br $label$2)
+         )
+        )
+        (br_if $label$310
+         (i32.lt_s
+          (local.tee $0
+           (i32.add
+            (local.get $0)
+            (i32.const 1)
+           )
+          )
+          (i32.const 10)
+         )
+        )
+        (local.set $15
+         (i32.const 1)
+        )
+       )
+      )
+      (local.set $15
+       (i32.const 0)
+      )
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $23)
+   )
+   (local.get $15)
   )
-  (func $15 (;28;) (type $2) (param $0 i32)
-    local.get $0
-    i32.load offset=68
-    i32.eqz
-    if ;; label = @1
-      local.get $0
-      call $12
-    end
+ )
+ (func $19 (; 32 ;) (type $1) (param $0 i32) (result i32)
+  (i32.const 0)
+ )
+ (func $20 (; 33 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (block $label$1 (result i32)
+   (block $label$2
+    (block $label$3
+     (br_if $label$3
+      (local.tee $3
+       (i32.load
+        (local.tee $4
+         (i32.add
+          (local.get $2)
+          (i32.const 16)
+         )
+        )
+       )
+      )
+     )
+     (if
+      (call $29
+       (local.get $2)
+      )
+      (local.set $3
+       (i32.const 0)
+      )
+      (block
+       (local.set $3
+        (i32.load
+         (local.get $4)
+        )
+       )
+       (br $label$3)
+      )
+     )
+     (br $label$2)
+    )
+    (if
+     (i32.lt_u
+      (i32.sub
+       (local.get $3)
+       (local.tee $4
+        (i32.load
+         (local.tee $5
+          (i32.add
+           (local.get $2)
+           (i32.const 20)
+          )
+         )
+        )
+       )
+      )
+      (local.get $1)
+     )
+     (block
+      (local.set $3
+       (call_indirect (type $0)
+        (local.get $2)
+        (local.get $0)
+        (local.get $1)
+        (i32.add
+         (i32.and
+          (i32.load offset=36
+           (local.get $2)
+          )
+          (i32.const 3)
+         )
+         (i32.const 2)
+        )
+       )
+      )
+      (br $label$2)
+     )
+    )
+    (local.set $2
+     (block $label$7 (result i32)
+      (if (result i32)
+       (i32.gt_s
+        (i32.load8_s offset=75
+         (local.get $2)
+        )
+        (i32.const -1)
+       )
+       (block (result i32)
+        (local.set $3
+         (local.get $1)
+        )
+        (loop $label$9
+         (drop
+          (br_if $label$7
+           (i32.const 0)
+           (i32.eqz
+            (local.get $3)
+           )
+          )
+         )
+         (if
+          (i32.ne
+           (i32.load8_s
+            (i32.add
+             (local.get $0)
+             (local.tee $6
+              (i32.add
+               (local.get $3)
+               (i32.const -1)
+              )
+             )
+            )
+           )
+           (i32.const 10)
+          )
+          (block
+           (local.set $3
+            (local.get $6)
+           )
+           (br $label$9)
+          )
+         )
+        )
+        (br_if $label$2
+         (i32.lt_u
+          (call_indirect (type $0)
+           (local.get $2)
+           (local.get $0)
+           (local.get $3)
+           (i32.add
+            (i32.and
+             (i32.load offset=36
+              (local.get $2)
+             )
+             (i32.const 3)
+            )
+            (i32.const 2)
+           )
+          )
+          (local.get $3)
+         )
+        )
+        (local.set $4
+         (i32.load
+          (local.get $5)
+         )
+        )
+        (local.set $1
+         (i32.sub
+          (local.get $1)
+          (local.get $3)
+         )
+        )
+        (local.set $0
+         (i32.add
+          (local.get $0)
+          (local.get $3)
+         )
+        )
+        (local.get $3)
+       )
+       (i32.const 0)
+      )
+     )
+    )
+    (drop
+     (call $36
+      (local.get $4)
+      (local.get $0)
+      (local.get $1)
+     )
+    )
+    (i32.store
+     (local.get $5)
+     (i32.add
+      (i32.load
+       (local.get $5)
+      )
+      (local.get $1)
+     )
+    )
+    (local.set $3
+     (i32.add
+      (local.get $2)
+      (local.get $1)
+     )
+    )
+   )
+   (local.get $3)
   )
-  (func $16 (;29;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $1
-      i32.const 255
-      i32.and
-      local.set $5
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            local.get $2
-            i32.const 0
-            i32.ne
-            local.tee $4
-            local.get $0
-            i32.const 3
-            i32.and
-            i32.const 0
-            i32.ne
-            i32.and
-            if ;; label = @5
-              block ;; label = @6
-                local.get $1
-                i32.const 255
-                i32.and
-                local.set $4
-                local.get $2
-                local.set $3
-                local.get $0
-                local.set $2
-                loop $label$6 ;; label = @7
-                  local.get $2
-                  i32.load8_s
-                  local.get $4
-                  i32.const 24
-                  i32.shl
-                  i32.const 24
-                  i32.shr_s
-                  i32.eq
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $3
-                      local.set $0
-                      br 6 (;@3;)
-                    end
-                  end
-                  local.get $3
-                  i32.const -1
-                  i32.add
-                  local.tee $3
-                  i32.const 0
-                  i32.ne
-                  local.tee $0
-                  local.get $2
-                  i32.const 1
-                  i32.add
-                  local.tee $2
-                  i32.const 3
-                  i32.and
-                  i32.const 0
-                  i32.ne
-                  i32.and
-                  br_if 0 (;@7;)
-                  br 3 (;@4;)
-                end
-              end
-            else
-              block ;; label = @6
-                local.get $2
-                local.set $3
-                local.get $0
-                local.set $2
-                local.get $4
-                local.set $0
-              end
-            end
-          end
-          local.get $0
-          if ;; label = @4
-            block ;; label = @5
-              local.get $3
-              local.set $0
-              br 2 (;@3;)
-            end
-          else
-            i32.const 0
-            local.set $0
-          end
-          br 1 (;@2;)
-        end
-        local.get $2
-        i32.load8_s
-        local.get $1
-        i32.const 255
-        i32.and
-        local.tee $1
-        i32.const 24
-        i32.shl
-        i32.const 24
-        i32.shr_s
-        i32.ne
-        if ;; label = @3
-          block ;; label = @4
-            local.get $5
-            i32.const 16843009
-            i32.mul
-            local.set $3
-            block $label$12 ;; label = @5
-              block $label$13 ;; label = @6
-                local.get $0
-                i32.const 3
-                i32.le_u
-                br_if 0 (;@6;)
-                loop $label$14 ;; label = @7
-                  local.get $2
-                  i32.load
-                  local.get $3
-                  i32.xor
-                  local.tee $4
-                  i32.const -2139062144
-                  i32.and
-                  i32.const -2139062144
-                  i32.xor
-                  local.get $4
-                  i32.const -16843009
-                  i32.add
-                  i32.and
-                  i32.eqz
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $2
-                      i32.const 4
-                      i32.add
-                      local.set $2
-                      local.get $0
-                      i32.const -4
-                      i32.add
-                      local.tee $0
-                      i32.const 3
-                      i32.gt_u
-                      br_if 2 (;@7;)
-                      br 3 (;@6;)
-                    end
-                  end
-                end
-                br 1 (;@5;)
-              end
-              local.get $0
-              i32.eqz
-              if ;; label = @6
-                block ;; label = @7
-                  i32.const 0
-                  local.set $0
-                  br 5 (;@2;)
-                end
-              end
-            end
-            loop $label$17 ;; label = @5
-              local.get $2
-              i32.load8_s
-              local.get $1
-              i32.const 24
-              i32.shl
-              i32.const 24
-              i32.shr_s
-              i32.eq
-              br_if 3 (;@2;)
-              local.get $2
-              i32.const 1
-              i32.add
-              local.set $2
-              local.get $0
-              i32.const -1
-              i32.add
-              local.tee $0
-              br_if 0 (;@5;)
-              i32.const 0
-              local.set $0
-            end
-          end
-        end
-      end
-      local.get $0
-      if (result i32) ;; label = @2
-        local.get $2
-      else
-        i32.const 0
-      end
-    end
+ )
+ (func $21 (; 34 ;) (type $8) (param $0 i32) (param $1 i32) (param $2 i32)
+  (local $3 i32)
+  (local $4 i64)
+  (local $5 f64)
+  (block $label$1
+   (if
+    (i32.le_u
+     (local.get $1)
+     (i32.const 20)
+    )
+    (block $label$3
+     (block $label$4
+      (block $label$5
+       (block $label$6
+        (block $label$7
+         (block $label$8
+          (block $label$9
+           (block $label$10
+            (block $label$11
+             (block $label$12
+              (block $label$13
+               (br_table $label$13 $label$12 $label$11 $label$10 $label$9 $label$8 $label$7 $label$6 $label$5 $label$4 $label$3
+                (i32.sub
+                 (local.get $1)
+                 (i32.const 9)
+                )
+               )
+              )
+              (local.set $3
+               (i32.load
+                (local.tee $1
+                 (i32.and
+                  (i32.add
+                   (i32.load
+                    (local.get $2)
+                   )
+                   (i32.const 3)
+                  )
+                  (i32.const -4)
+                 )
+                )
+               )
+              )
+              (i32.store
+               (local.get $2)
+               (i32.add
+                (local.get $1)
+                (i32.const 4)
+               )
+              )
+              (i32.store
+               (local.get $0)
+               (local.get $3)
+              )
+              (br $label$1)
+             )
+             (local.set $3
+              (i32.load
+               (local.tee $1
+                (i32.and
+                 (i32.add
+                  (i32.load
+                   (local.get $2)
+                  )
+                  (i32.const 3)
+                 )
+                 (i32.const -4)
+                )
+               )
+              )
+             )
+             (i32.store
+              (local.get $2)
+              (i32.add
+               (local.get $1)
+               (i32.const 4)
+              )
+             )
+             (i64.store
+              (local.get $0)
+              (i64.extend_i32_s
+               (local.get $3)
+              )
+             )
+             (br $label$1)
+            )
+            (local.set $3
+             (i32.load
+              (local.tee $1
+               (i32.and
+                (i32.add
+                 (i32.load
+                  (local.get $2)
+                 )
+                 (i32.const 3)
+                )
+                (i32.const -4)
+               )
+              )
+             )
+            )
+            (i32.store
+             (local.get $2)
+             (i32.add
+              (local.get $1)
+              (i32.const 4)
+             )
+            )
+            (i64.store
+             (local.get $0)
+             (i64.extend_i32_u
+              (local.get $3)
+             )
+            )
+            (br $label$1)
+           )
+           (local.set $4
+            (i64.load
+             (local.tee $1
+              (i32.and
+               (i32.add
+                (i32.load
+                 (local.get $2)
+                )
+                (i32.const 7)
+               )
+               (i32.const -8)
+              )
+             )
+            )
+           )
+           (i32.store
+            (local.get $2)
+            (i32.add
+             (local.get $1)
+             (i32.const 8)
+            )
+           )
+           (i64.store
+            (local.get $0)
+            (local.get $4)
+           )
+           (br $label$1)
+          )
+          (local.set $3
+           (i32.load
+            (local.tee $1
+             (i32.and
+              (i32.add
+               (i32.load
+                (local.get $2)
+               )
+               (i32.const 3)
+              )
+              (i32.const -4)
+             )
+            )
+           )
+          )
+          (i32.store
+           (local.get $2)
+           (i32.add
+            (local.get $1)
+            (i32.const 4)
+           )
+          )
+          (i64.store
+           (local.get $0)
+           (i64.extend_i32_s
+            (i32.shr_s
+             (i32.shl
+              (i32.and
+               (local.get $3)
+               (i32.const 65535)
+              )
+              (i32.const 16)
+             )
+             (i32.const 16)
+            )
+           )
+          )
+          (br $label$1)
+         )
+         (local.set $3
+          (i32.load
+           (local.tee $1
+            (i32.and
+             (i32.add
+              (i32.load
+               (local.get $2)
+              )
+              (i32.const 3)
+             )
+             (i32.const -4)
+            )
+           )
+          )
+         )
+         (i32.store
+          (local.get $2)
+          (i32.add
+           (local.get $1)
+           (i32.const 4)
+          )
+         )
+         (i64.store
+          (local.get $0)
+          (i64.extend_i32_u
+           (i32.and
+            (local.get $3)
+            (i32.const 65535)
+           )
+          )
+         )
+         (br $label$1)
+        )
+        (local.set $3
+         (i32.load
+          (local.tee $1
+           (i32.and
+            (i32.add
+             (i32.load
+              (local.get $2)
+             )
+             (i32.const 3)
+            )
+            (i32.const -4)
+           )
+          )
+         )
+        )
+        (i32.store
+         (local.get $2)
+         (i32.add
+          (local.get $1)
+          (i32.const 4)
+         )
+        )
+        (i64.store
+         (local.get $0)
+         (i64.extend_i32_s
+          (i32.shr_s
+           (i32.shl
+            (i32.and
+             (local.get $3)
+             (i32.const 255)
+            )
+            (i32.const 24)
+           )
+           (i32.const 24)
+          )
+         )
+        )
+        (br $label$1)
+       )
+       (local.set $3
+        (i32.load
+         (local.tee $1
+          (i32.and
+           (i32.add
+            (i32.load
+             (local.get $2)
+            )
+            (i32.const 3)
+           )
+           (i32.const -4)
+          )
+         )
+        )
+       )
+       (i32.store
+        (local.get $2)
+        (i32.add
+         (local.get $1)
+         (i32.const 4)
+        )
+       )
+       (i64.store
+        (local.get $0)
+        (i64.extend_i32_u
+         (i32.and
+          (local.get $3)
+          (i32.const 255)
+         )
+        )
+       )
+       (br $label$1)
+      )
+      (local.set $5
+       (f64.load
+        (local.tee $1
+         (i32.and
+          (i32.add
+           (i32.load
+            (local.get $2)
+           )
+           (i32.const 7)
+          )
+          (i32.const -8)
+         )
+        )
+       )
+      )
+      (i32.store
+       (local.get $2)
+       (i32.add
+        (local.get $1)
+        (i32.const 8)
+       )
+      )
+      (f64.store
+       (local.get $0)
+       (local.get $5)
+      )
+      (br $label$1)
+     )
+     (local.set $5
+      (f64.load
+       (local.tee $1
+        (i32.and
+         (i32.add
+          (i32.load
+           (local.get $2)
+          )
+          (i32.const 7)
+         )
+         (i32.const -8)
+        )
+       )
+      )
+     )
+     (i32.store
+      (local.get $2)
+      (i32.add
+       (local.get $1)
+       (i32.const 8)
+      )
+     )
+     (f64.store
+      (local.get $0)
+      (local.get $5)
+     )
+    )
+   )
   )
-  (func $17 (;30;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $4
-      global.get $global$1
-      i32.const 224
-      i32.add
-      global.set $global$1
-      local.get $4
-      i32.const 136
-      i32.add
-      local.set $5
-      local.get $4
-      i32.const 80
-      i32.add
-      local.tee $3
-      i64.const 0
-      i64.store align=4
-      local.get $3
-      i64.const 0
-      i64.store offset=8 align=4
-      local.get $3
-      i64.const 0
-      i64.store offset=16 align=4
-      local.get $3
-      i64.const 0
-      i64.store offset=24 align=4
-      local.get $3
-      i64.const 0
-      i64.store offset=32 align=4
-      local.get $4
-      i32.const 120
-      i32.add
-      local.tee $6
-      local.get $2
-      i32.load
-      i32.store
-      i32.const 0
-      local.get $1
-      local.get $6
-      local.get $4
-      local.tee $2
-      local.get $3
-      call $18
-      i32.const 0
-      i32.lt_s
-      if ;; label = @2
-        i32.const -1
-        local.set $1
-      else
-        block ;; label = @3
-          local.get $0
-          i32.load offset=76
-          i32.const -1
-          i32.gt_s
-          if (result i32) ;; label = @4
-            local.get $0
-            call $19
-          else
-            i32.const 0
-          end
-          local.set $12
-          local.get $0
-          i32.load
-          local.set $7
-          local.get $0
-          i32.load8_s offset=74
-          i32.const 1
-          i32.lt_s
-          if ;; label = @4
-            local.get $0
-            local.get $7
-            i32.const -33
-            i32.and
-            i32.store
-          end
-          local.get $0
-          i32.const 48
-          i32.add
-          local.tee $8
-          i32.load
-          if ;; label = @4
-            local.get $0
-            local.get $1
-            local.get $6
-            local.get $2
-            local.get $3
-            call $18
-            local.set $1
-          else
-            block ;; label = @5
-              local.get $0
-              i32.const 44
-              i32.add
-              local.tee $9
-              i32.load
-              local.set $10
-              local.get $9
-              local.get $5
-              i32.store
-              local.get $0
-              i32.const 28
-              i32.add
-              local.tee $13
-              local.get $5
-              i32.store
-              local.get $0
-              i32.const 20
-              i32.add
-              local.tee $11
-              local.get $5
-              i32.store
-              local.get $8
-              i32.const 80
-              i32.store
-              local.get $0
-              i32.const 16
-              i32.add
-              local.tee $14
-              local.get $5
-              i32.const 80
-              i32.add
-              i32.store
-              local.get $0
-              local.get $1
-              local.get $6
-              local.get $2
-              local.get $3
-              call $18
-              local.set $1
-              local.get $10
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $0
-                  i32.const 0
-                  i32.const 0
-                  local.get $0
-                  i32.load offset=36
-                  i32.const 3
-                  i32.and
-                  i32.const 2
-                  i32.add
-                  call_indirect (type $0)
-                  drop
-                  local.get $11
-                  i32.load
-                  i32.eqz
-                  if ;; label = @8
-                    i32.const -1
-                    local.set $1
-                  end
-                  local.get $9
-                  local.get $10
-                  i32.store
-                  local.get $8
-                  i32.const 0
-                  i32.store
-                  local.get $14
-                  i32.const 0
-                  i32.store
-                  local.get $13
-                  i32.const 0
-                  i32.store
-                  local.get $11
-                  i32.const 0
-                  i32.store
-                end
-              end
-            end
-          end
-          local.get $0
-          local.get $0
-          i32.load
-          local.tee $2
-          local.get $7
-          i32.const 32
-          i32.and
-          i32.or
-          i32.store
-          local.get $12
-          if ;; label = @4
-            local.get $0
-            call $12
-          end
-          local.get $2
-          i32.const 32
-          i32.and
-          if ;; label = @4
-            i32.const -1
-            local.set $1
-          end
-        end
-      end
-      local.get $4
-      global.set $global$1
-      local.get $1
-    end
+ )
+ (func $22 (; 35 ;) (type $9) (param $0 i64) (param $1 i32) (result i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i64)
+  (block $label$1 (result i32)
+   (local.set $2
+    (i32.wrap_i64
+     (local.get $0)
+    )
+   )
+   (if
+    (i64.gt_u
+     (local.get $0)
+     (i64.const 4294967295)
+    )
+    (block
+     (loop $label$3
+      (i64.store8
+       (local.tee $1
+        (i32.add
+         (local.get $1)
+         (i32.const -1)
+        )
+       )
+       (i64.or
+        (i64.rem_u
+         (local.get $0)
+         (i64.const 10)
+        )
+        (i64.const 48)
+       )
+      )
+      (local.set $4
+       (i64.div_u
+        (local.get $0)
+        (i64.const 10)
+       )
+      )
+      (if
+       (i64.gt_u
+        (local.get $0)
+        (i64.const 42949672959)
+       )
+       (block
+        (local.set $0
+         (local.get $4)
+        )
+        (br $label$3)
+       )
+      )
+     )
+     (local.set $2
+      (i32.wrap_i64
+       (local.get $4)
+      )
+     )
+    )
+   )
+   (if
+    (local.get $2)
+    (loop $label$6
+     (i32.store8
+      (local.tee $1
+       (i32.add
+        (local.get $1)
+        (i32.const -1)
+       )
+      )
+      (i32.or
+       (i32.rem_u
+        (local.get $2)
+        (i32.const 10)
+       )
+       (i32.const 48)
+      )
+     )
+     (local.set $3
+      (i32.div_u
+       (local.get $2)
+       (i32.const 10)
+      )
+     )
+     (if
+      (i32.ge_u
+       (local.get $2)
+       (i32.const 10)
+      )
+      (block
+       (local.set $2
+        (local.get $3)
+       )
+       (br $label$6)
+      )
+     )
+    )
+   )
+   (local.get $1)
   )
-  (func $18 (;31;) (type $7) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (result i32)
-    (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32) (local $15 i32) (local $16 i32) (local $17 i32) (local $18 i32) (local $19 i32) (local $20 i32) (local $21 i32) (local $22 i32) (local $23 i32) (local $24 i32) (local $25 i32) (local $26 i32) (local $27 i32) (local $28 i32) (local $29 i32) (local $30 i32) (local $31 i32) (local $32 i32) (local $33 i32) (local $34 i32) (local $35 i32) (local $36 i32) (local $37 i32) (local $38 i32) (local $39 i32) (local $40 i32) (local $41 i32) (local $42 i32) (local $43 i32) (local $44 i32) (local $45 i32) (local $46 i32) (local $47 i32) (local $48 i32) (local $49 i32) (local $50 i64) (local $51 i64) (local $52 f64) (local $53 f64)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $23
-      global.get $global$1
-      i32.const 624
-      i32.add
-      global.set $global$1
-      local.get $23
-      i32.const 16
-      i32.add
-      local.set $20
-      local.get $23
-      local.set $16
-      local.get $23
-      i32.const 528
-      i32.add
-      local.set $36
-      local.get $0
-      i32.const 0
-      i32.ne
-      local.set $30
-      local.get $23
-      i32.const 536
-      i32.add
-      local.tee $17
-      i32.const 40
-      i32.add
-      local.tee $21
-      local.set $38
-      local.get $17
-      i32.const 39
-      i32.add
-      local.set $39
-      local.get $23
-      i32.const 8
-      i32.add
-      local.tee $37
-      i32.const 4
-      i32.add
-      local.set $42
-      i32.const 0
-      local.get $23
-      i32.const 588
-      i32.add
-      local.tee $19
-      local.tee $27
-      i32.sub
-      local.set $43
-      local.get $23
-      i32.const 576
-      i32.add
-      local.tee $17
-      i32.const 12
-      i32.add
-      local.set $33
-      local.get $17
-      i32.const 11
-      i32.add
-      local.set $40
-      local.get $33
-      local.tee $28
-      local.get $27
-      i32.sub
-      local.set $44
-      i32.const -2
-      local.get $27
-      i32.sub
-      local.set $45
-      local.get $28
-      i32.const 2
-      i32.add
-      local.set $46
-      local.get $23
-      i32.const 24
-      i32.add
-      local.tee $47
-      i32.const 288
-      i32.add
-      local.set $48
-      local.get $19
-      i32.const 9
-      i32.add
-      local.tee $31
-      local.set $41
-      local.get $19
-      i32.const 8
-      i32.add
-      local.set $34
-      i32.const 0
-      local.set $15
-      i32.const 0
-      local.set $10
-      i32.const 0
-      local.set $17
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          loop $label$4 ;; label = @4
-            block $label$5 ;; label = @5
-              local.get $15
-              i32.const -1
-              i32.gt_s
-              if ;; label = @6
-                local.get $10
-                i32.const 2147483647
-                local.get $15
-                i32.sub
-                i32.gt_s
-                if (result i32) ;; label = @7
-                  block (result i32) ;; label = @8
-                    call $11
-                    i32.const 75
-                    i32.store
-                    i32.const -1
-                  end
-                else
-                  local.get $10
-                  local.get $15
-                  i32.add
-                end
-                local.set $15
-              end
-              local.get $1
-              i32.load8_s
-              local.tee $5
-              i32.const 24
-              i32.shl
-              i32.const 24
-              i32.shr_s
-              i32.eqz
-              br_if 2 (;@3;)
-              local.get $1
-              local.set $11
-              block $label$9 ;; label = @6
-                block $label$10 ;; label = @7
-                  loop $label$11 ;; label = @8
-                    block $label$12 ;; label = @9
-                      block $label$13 ;; label = @10
-                        block $label$14 ;; label = @11
-                          block $label$15 ;; label = @12
-                            local.get $5
-                            i32.const 24
-                            i32.shl
-                            i32.const 24
-                            i32.shr_s
-                            i32.const 0
-                            i32.sub
-                            br_table 1 (;@11;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 2 (;@10;) 0 (;@12;) 2 (;@10;)
-                          end
-                          local.get $11
-                          local.set $5
-                          br 4 (;@7;)
-                        end
-                        local.get $11
-                        local.set $5
-                        br 1 (;@9;)
-                      end
-                      local.get $11
-                      i32.const 1
-                      i32.add
-                      local.tee $11
-                      i32.load8_s
-                      local.set $5
-                      br 1 (;@8;)
-                    end
-                  end
-                  br 1 (;@6;)
-                end
-                loop $label$16 ;; label = @7
-                  local.get $5
-                  i32.load8_s offset=1
-                  i32.const 37
-                  i32.ne
-                  br_if 1 (;@6;)
-                  local.get $11
-                  i32.const 1
-                  i32.add
-                  local.set $11
-                  local.get $5
-                  i32.const 2
-                  i32.add
-                  local.tee $5
-                  i32.load8_s
-                  i32.const 37
-                  i32.eq
-                  br_if 0 (;@7;)
-                end
-              end
-              local.get $11
-              local.get $1
-              i32.sub
-              local.set $10
-              local.get $30
-              if ;; label = @6
-                local.get $0
-                i32.load
-                i32.const 32
-                i32.and
-                i32.eqz
-                if ;; label = @7
-                  local.get $1
-                  local.get $10
-                  local.get $0
-                  call $20
-                  drop
-                end
-              end
-              local.get $10
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $5
-                  local.set $1
-                  br 3 (;@4;)
-                end
-              end
-              local.get $5
-              i32.const 1
-              i32.add
-              local.tee $11
-              i32.load8_s
-              local.tee $10
-              i32.const 24
-              i32.shl
-              i32.const 24
-              i32.shr_s
-              i32.const -48
-              i32.add
-              local.tee $9
-              i32.const 10
-              i32.lt_u
-              if (result i32) ;; label = @6
-                block (result i32) ;; label = @7
-                  local.get $5
-                  i32.const 3
-                  i32.add
-                  local.set $10
-                  local.get $5
-                  i32.load8_s offset=2
-                  i32.const 36
-                  i32.eq
-                  local.tee $12
-                  if ;; label = @8
-                    local.get $10
-                    local.set $11
-                  end
-                  local.get $12
-                  if ;; label = @8
-                    i32.const 1
-                    local.set $17
-                  end
-                  local.get $11
-                  i32.load8_s
-                  local.set $5
-                  local.get $12
-                  i32.eqz
-                  if ;; label = @8
-                    i32.const -1
-                    local.set $9
-                  end
-                  local.get $17
-                end
-              else
-                block (result i32) ;; label = @7
-                  local.get $10
-                  local.set $5
-                  i32.const -1
-                  local.set $9
-                  local.get $17
-                end
-              end
-              local.set $10
-              block $label$25 ;; label = @6
-                local.get $5
-                i32.const 24
-                i32.shl
-                i32.const 24
-                i32.shr_s
-                i32.const -32
-                i32.add
-                local.tee $12
-                i32.const 32
-                i32.lt_u
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const 0
-                    local.set $17
-                    loop $label$27 ;; label = @9
-                      i32.const 1
-                      local.get $12
-                      i32.shl
-                      i32.const 75913
-                      i32.and
-                      i32.eqz
-                      br_if 3 (;@6;)
-                      i32.const 1
-                      local.get $5
-                      i32.const 24
-                      i32.shl
-                      i32.const 24
-                      i32.shr_s
-                      i32.const -32
-                      i32.add
-                      i32.shl
-                      local.get $17
-                      i32.or
-                      local.set $17
-                      local.get $11
-                      i32.const 1
-                      i32.add
-                      local.tee $11
-                      i32.load8_s
-                      local.tee $5
-                      i32.const 24
-                      i32.shl
-                      i32.const 24
-                      i32.shr_s
-                      i32.const -32
-                      i32.add
-                      local.tee $12
-                      i32.const 32
-                      i32.lt_u
-                      br_if 0 (;@9;)
-                    end
-                  end
-                else
-                  i32.const 0
-                  local.set $17
-                end
-              end
-              block $label$29 ;; label = @6
-                local.get $5
-                i32.const 24
-                i32.shl
-                i32.const 24
-                i32.shr_s
-                i32.const 42
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    block $label$31 (result i32) ;; label = @9
-                      block $label$32 ;; label = @10
-                        local.get $11
-                        i32.const 1
-                        i32.add
-                        local.tee $7
-                        i32.load8_s
-                        local.tee $5
-                        i32.const 24
-                        i32.shl
-                        i32.const 24
-                        i32.shr_s
-                        i32.const -48
-                        i32.add
-                        local.tee $12
-                        i32.const 10
-                        i32.ge_u
-                        br_if 0 (;@10;)
-                        local.get $11
-                        i32.load8_s offset=2
-                        i32.const 36
-                        i32.ne
-                        br_if 0 (;@10;)
-                        local.get $4
-                        local.get $12
-                        i32.const 2
-                        i32.shl
-                        i32.add
-                        i32.const 10
-                        i32.store
-                        i32.const 1
-                        local.set $8
-                        local.get $3
-                        local.get $7
-                        i32.load8_s
-                        i32.const -48
-                        i32.add
-                        i32.const 3
-                        i32.shl
-                        i32.add
-                        i64.load
-                        i32.wrap_i64
-                        local.set $10
-                        local.get $11
-                        i32.const 3
-                        i32.add
-                        br 1 (;@9;)
-                      end
-                      local.get $10
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const -1
-                          local.set $15
-                          br 6 (;@5;)
-                        end
-                      end
-                      local.get $30
-                      i32.eqz
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $17
-                          local.set $12
-                          i32.const 0
-                          local.set $17
-                          local.get $7
-                          local.set $11
-                          i32.const 0
-                          local.set $10
-                          br 5 (;@6;)
-                        end
-                      end
-                      local.get $2
-                      i32.load
-                      i32.const 3
-                      i32.add
-                      i32.const -4
-                      i32.and
-                      local.tee $11
-                      i32.load
-                      local.set $10
-                      local.get $2
-                      local.get $11
-                      i32.const 4
-                      i32.add
-                      i32.store
-                      i32.const 0
-                      local.set $8
-                      local.get $7
-                    end
-                    local.set $11
-                    local.get $17
-                    i32.const 8192
-                    i32.or
-                    local.set $12
-                    i32.const 0
-                    local.get $10
-                    i32.sub
-                    local.set $7
-                    local.get $11
-                    i32.load8_s
-                    local.set $5
-                    local.get $10
-                    i32.const 0
-                    i32.lt_s
-                    local.tee $6
-                    i32.eqz
-                    if ;; label = @9
-                      local.get $17
-                      local.set $12
-                    end
-                    local.get $8
-                    local.set $17
-                    local.get $6
-                    if ;; label = @9
-                      local.get $7
-                      local.set $10
-                    end
-                  end
-                else
-                  local.get $5
-                  i32.const 24
-                  i32.shl
-                  i32.const 24
-                  i32.shr_s
-                  i32.const -48
-                  i32.add
-                  local.tee $12
-                  i32.const 10
-                  i32.lt_u
-                  if ;; label = @8
-                    block ;; label = @9
-                      i32.const 0
-                      local.set $7
-                      local.get $12
-                      local.set $5
-                      loop $label$39 ;; label = @10
-                        local.get $7
-                        i32.const 10
-                        i32.mul
-                        local.get $5
-                        i32.add
-                        local.set $7
-                        local.get $11
-                        i32.const 1
-                        i32.add
-                        local.tee $11
-                        i32.load8_s
-                        local.tee $12
-                        i32.const 24
-                        i32.shl
-                        i32.const 24
-                        i32.shr_s
-                        i32.const -48
-                        i32.add
-                        local.tee $5
-                        i32.const 10
-                        i32.lt_u
-                        br_if 0 (;@10;)
-                      end
-                      local.get $7
-                      i32.const 0
-                      i32.lt_s
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const -1
-                          local.set $15
-                          br 6 (;@5;)
-                        end
-                      else
-                        block ;; label = @11
-                          local.get $12
-                          local.set $5
-                          local.get $17
-                          local.set $12
-                          local.get $10
-                          local.set $17
-                          local.get $7
-                          local.set $10
-                        end
-                      end
-                    end
-                  else
-                    block ;; label = @9
-                      local.get $17
-                      local.set $12
-                      local.get $10
-                      local.set $17
-                      i32.const 0
-                      local.set $10
-                    end
-                  end
-                end
-              end
-              block $label$43 ;; label = @6
-                local.get $5
-                i32.const 24
-                i32.shl
-                i32.const 24
-                i32.shr_s
-                i32.const 46
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $11
-                    i32.const 1
-                    i32.add
-                    local.tee $7
-                    i32.load8_s
-                    local.tee $5
-                    i32.const 24
-                    i32.shl
-                    i32.const 24
-                    i32.shr_s
-                    i32.const 42
-                    i32.ne
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $5
-                        i32.const 24
-                        i32.shl
-                        i32.const 24
-                        i32.shr_s
-                        i32.const -48
-                        i32.add
-                        local.tee $5
-                        i32.const 10
-                        i32.lt_u
-                        if ;; label = @11
-                          block ;; label = @12
-                            local.get $7
-                            local.set $11
-                            i32.const 0
-                            local.set $7
-                          end
-                        else
-                          block ;; label = @12
-                            i32.const 0
-                            local.set $5
-                            local.get $7
-                            local.set $11
-                            br 6 (;@6;)
-                          end
-                        end
-                        loop $label$48 ;; label = @11
-                          local.get $7
-                          i32.const 10
-                          i32.mul
-                          local.get $5
-                          i32.add
-                          local.set $5
-                          local.get $11
-                          i32.const 1
-                          i32.add
-                          local.tee $11
-                          i32.load8_s
-                          i32.const -48
-                          i32.add
-                          local.tee $8
-                          i32.const 10
-                          i32.ge_u
-                          br_if 5 (;@6;)
-                          local.get $5
-                          local.set $7
-                          local.get $8
-                          local.set $5
-                          br 0 (;@11;)
-                        end
-                      end
-                    end
-                    local.get $11
-                    i32.const 2
-                    i32.add
-                    local.tee $7
-                    i32.load8_s
-                    i32.const -48
-                    i32.add
-                    local.tee $5
-                    i32.const 10
-                    i32.lt_u
-                    if ;; label = @9
-                      local.get $11
-                      i32.load8_s offset=3
-                      i32.const 36
-                      i32.eq
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $4
-                          local.get $5
-                          i32.const 2
-                          i32.shl
-                          i32.add
-                          i32.const 10
-                          i32.store
-                          local.get $3
-                          local.get $7
-                          i32.load8_s
-                          i32.const -48
-                          i32.add
-                          i32.const 3
-                          i32.shl
-                          i32.add
-                          i64.load
-                          i32.wrap_i64
-                          local.set $5
-                          local.get $11
-                          i32.const 4
-                          i32.add
-                          local.set $11
-                          br 5 (;@6;)
-                        end
-                      end
-                    end
-                    local.get $17
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const -1
-                        local.set $15
-                        br 5 (;@5;)
-                      end
-                    end
-                    local.get $30
-                    if (result i32) ;; label = @9
-                      block (result i32) ;; label = @10
-                        local.get $2
-                        i32.load
-                        i32.const 3
-                        i32.add
-                        i32.const -4
-                        i32.and
-                        local.tee $11
-                        i32.load
-                        local.set $5
-                        local.get $2
-                        local.get $11
-                        i32.const 4
-                        i32.add
-                        i32.store
-                        local.get $7
-                      end
-                    else
-                      block (result i32) ;; label = @10
-                        i32.const 0
-                        local.set $5
-                        local.get $7
-                      end
-                    end
-                    local.set $11
-                  end
-                else
-                  i32.const -1
-                  local.set $5
-                end
-              end
-              local.get $11
-              local.set $7
-              i32.const 0
-              local.set $8
-              loop $label$55 ;; label = @6
-                local.get $7
-                i32.load8_s
-                i32.const -65
-                i32.add
-                local.tee $6
-                i32.const 57
-                i32.gt_u
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const -1
-                    local.set $15
-                    br 3 (;@5;)
-                  end
-                end
-                local.get $7
-                i32.const 1
-                i32.add
-                local.set $11
-                local.get $8
-                i32.const 58
-                i32.mul
-                i32.const 1168
-                i32.add
-                local.get $6
-                i32.add
-                i32.load8_s
-                local.tee $13
-                i32.const 255
-                i32.and
-                local.tee $6
-                i32.const -1
-                i32.add
-                i32.const 8
-                i32.lt_u
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $11
-                    local.set $7
-                    local.get $6
-                    local.set $8
-                    br 2 (;@6;)
-                  end
-                end
-              end
-              local.get $13
-              i32.const 24
-              i32.shl
-              i32.const 24
-              i32.shr_s
-              i32.eqz
-              if ;; label = @6
-                block ;; label = @7
-                  i32.const -1
-                  local.set $15
-                  br 2 (;@5;)
-                end
-              end
-              local.get $9
-              i32.const -1
-              i32.gt_s
-              local.set $14
-              block $label$59 ;; label = @6
-                block $label$60 ;; label = @7
-                  local.get $13
-                  i32.const 24
-                  i32.shl
-                  i32.const 24
-                  i32.shr_s
-                  i32.const 19
-                  i32.eq
-                  if ;; label = @8
-                    local.get $14
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const -1
-                        local.set $15
-                        br 5 (;@5;)
-                      end
-                    else
-                      br 2 (;@7;)
-                    end
-                  else
-                    block ;; label = @9
-                      local.get $14
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $4
-                          local.get $9
-                          i32.const 2
-                          i32.shl
-                          i32.add
-                          local.get $6
-                          i32.store
-                          local.get $16
-                          local.get $3
-                          local.get $9
-                          i32.const 3
-                          i32.shl
-                          i32.add
-                          i64.load
-                          i64.store
-                          br 4 (;@7;)
-                        end
-                      end
-                      local.get $30
-                      i32.eqz
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const 0
-                          local.set $15
-                          br 6 (;@5;)
-                        end
-                      end
-                      local.get $16
-                      local.get $6
-                      local.get $2
-                      call $21
-                    end
-                  end
-                  br 1 (;@6;)
-                end
-                local.get $30
-                i32.eqz
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const 0
-                    local.set $10
-                    local.get $11
-                    local.set $1
-                    br 4 (;@4;)
-                  end
-                end
-              end
-              local.get $7
-              i32.load8_s
-              local.tee $7
-              i32.const -33
-              i32.and
-              local.set $9
-              local.get $8
-              i32.const 0
-              i32.ne
-              local.get $7
-              i32.const 15
-              i32.and
-              i32.const 3
-              i32.eq
-              i32.and
-              i32.eqz
-              if ;; label = @6
-                local.get $7
-                local.set $9
-              end
-              local.get $12
-              i32.const -65537
-              i32.and
-              local.set $7
-              local.get $12
-              i32.const 8192
-              i32.and
-              if ;; label = @6
-                local.get $7
-                local.set $12
-              end
-              block $label$70 ;; label = @6
-                block $label$71 ;; label = @7
-                  block $label$72 ;; label = @8
-                    block $label$73 ;; label = @9
-                      block $label$74 ;; label = @10
-                        block $label$75 ;; label = @11
-                          block $label$76 ;; label = @12
-                            block $label$77 ;; label = @13
-                              block $label$78 ;; label = @14
-                                block $label$79 ;; label = @15
-                                  block $label$80 ;; label = @16
-                                    block $label$81 ;; label = @17
-                                      block $label$82 ;; label = @18
-                                        block $label$83 ;; label = @19
-                                          block $label$84 ;; label = @20
-                                            block $label$85 ;; label = @21
-                                              block $label$86 ;; label = @22
-                                                block $label$87 ;; label = @23
-                                                  block $label$88 ;; label = @24
-                                                    block $label$89 ;; label = @25
-                                                      local.get $9
-                                                      i32.const 65
-                                                      i32.sub
-                                                      br_table 11 (;@14;) 12 (;@13;) 9 (;@16;) 12 (;@13;) 11 (;@14;) 11 (;@14;) 11 (;@14;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 10 (;@15;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 2 (;@23;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 11 (;@14;) 12 (;@13;) 6 (;@19;) 4 (;@21;) 11 (;@14;) 11 (;@14;) 11 (;@14;) 12 (;@13;) 4 (;@21;) 12 (;@13;) 12 (;@13;) 12 (;@13;) 7 (;@18;) 0 (;@25;) 3 (;@22;) 1 (;@24;) 12 (;@13;) 12 (;@13;) 8 (;@17;) 12 (;@13;) 5 (;@20;) 12 (;@13;) 12 (;@13;) 2 (;@23;) 12 (;@13;)
-                                                    end
-                                                    block $label$90 ;; label = @25
-                                                      block $label$91 ;; label = @26
-                                                        block $label$92 ;; label = @27
-                                                          block $label$93 ;; label = @28
-                                                            block $label$94 ;; label = @29
-                                                              block $label$95 ;; label = @30
-                                                                block $label$96 ;; label = @31
-                                                                  block $label$97 ;; label = @32
-                                                                    local.get $8
-                                                                    i32.const 255
-                                                                    i32.and
-                                                                    i32.const 24
-                                                                    i32.shl
-                                                                    i32.const 24
-                                                                    i32.shr_s
-                                                                    i32.const 0
-                                                                    i32.sub
-                                                                    br_table 0 (;@32;) 1 (;@31;) 2 (;@30;) 3 (;@29;) 4 (;@28;) 7 (;@25;) 5 (;@27;) 6 (;@26;) 7 (;@25;)
-                                                                  end
-                                                                  local.get $16
-                                                                  i32.load
-                                                                  local.get $15
-                                                                  i32.store
-                                                                  i32.const 0
-                                                                  local.set $10
-                                                                  local.get $11
-                                                                  local.set $1
-                                                                  br 27 (;@4;)
-                                                                end
-                                                                local.get $16
-                                                                i32.load
-                                                                local.get $15
-                                                                i32.store
-                                                                i32.const 0
-                                                                local.set $10
-                                                                local.get $11
-                                                                local.set $1
-                                                                br 26 (;@4;)
-                                                              end
-                                                              local.get $16
-                                                              i32.load
-                                                              local.get $15
-                                                              i64.extend_i32_s
-                                                              i64.store
-                                                              i32.const 0
-                                                              local.set $10
-                                                              local.get $11
-                                                              local.set $1
-                                                              br 25 (;@4;)
-                                                            end
-                                                            local.get $16
-                                                            i32.load
-                                                            local.get $15
-                                                            i32.store16
-                                                            i32.const 0
-                                                            local.set $10
-                                                            local.get $11
-                                                            local.set $1
-                                                            br 24 (;@4;)
-                                                          end
-                                                          local.get $16
-                                                          i32.load
-                                                          local.get $15
-                                                          i32.store8
-                                                          i32.const 0
-                                                          local.set $10
-                                                          local.get $11
-                                                          local.set $1
-                                                          br 23 (;@4;)
-                                                        end
-                                                        local.get $16
-                                                        i32.load
-                                                        local.get $15
-                                                        i32.store
-                                                        i32.const 0
-                                                        local.set $10
-                                                        local.get $11
-                                                        local.set $1
-                                                        br 22 (;@4;)
-                                                      end
-                                                      local.get $16
-                                                      i32.load
-                                                      local.get $15
-                                                      i64.extend_i32_s
-                                                      i64.store
-                                                      i32.const 0
-                                                      local.set $10
-                                                      local.get $11
-                                                      local.set $1
-                                                      br 21 (;@4;)
-                                                    end
-                                                    i32.const 0
-                                                    local.set $10
-                                                    local.get $11
-                                                    local.set $1
-                                                    br 20 (;@4;)
-                                                  end
-                                                  local.get $12
-                                                  i32.const 8
-                                                  i32.or
-                                                  local.set $12
-                                                  local.get $5
-                                                  i32.const 8
-                                                  i32.le_u
-                                                  if ;; label = @24
-                                                    i32.const 8
-                                                    local.set $5
-                                                  end
-                                                  i32.const 120
-                                                  local.set $9
-                                                  br 11 (;@12;)
-                                                end
-                                                br 10 (;@12;)
-                                              end
-                                              local.get $16
-                                              i64.load
-                                              local.tee $50
-                                              i64.const 0
-                                              i64.eq
-                                              if ;; label = @22
-                                                local.get $21
-                                                local.set $7
-                                              else
-                                                block ;; label = @23
-                                                  local.get $21
-                                                  local.set $1
-                                                  loop $label$101 ;; label = @24
-                                                    local.get $1
-                                                    i32.const -1
-                                                    i32.add
-                                                    local.tee $1
-                                                    local.get $50
-                                                    i64.const 7
-                                                    i64.and
-                                                    i64.const 48
-                                                    i64.or
-                                                    i64.store8
-                                                    local.get $50
-                                                    i64.const 3
-                                                    i64.shr_u
-                                                    local.tee $50
-                                                    i64.const 0
-                                                    i64.ne
-                                                    br_if 0 (;@24;)
-                                                    local.get $1
-                                                    local.set $7
-                                                  end
-                                                end
-                                              end
-                                              local.get $12
-                                              i32.const 8
-                                              i32.and
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $38
-                                                  local.get $7
-                                                  i32.sub
-                                                  local.tee $1
-                                                  i32.const 1
-                                                  i32.add
-                                                  local.set $8
-                                                  local.get $5
-                                                  local.get $1
-                                                  i32.le_s
-                                                  if ;; label = @24
-                                                    local.get $8
-                                                    local.set $5
-                                                  end
-                                                  i32.const 0
-                                                  local.set $6
-                                                  i32.const 1648
-                                                  local.set $8
-                                                  br 16 (;@7;)
-                                                end
-                                              else
-                                                block ;; label = @23
-                                                  i32.const 0
-                                                  local.set $6
-                                                  i32.const 1648
-                                                  local.set $8
-                                                  br 16 (;@7;)
-                                                end
-                                              end
-                                            end
-                                            local.get $16
-                                            i64.load
-                                            local.tee $50
-                                            i64.const 0
-                                            i64.lt_s
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $16
-                                                i64.const 0
-                                                local.get $50
-                                                i64.sub
-                                                local.tee $50
-                                                i64.store
-                                                i32.const 1
-                                                local.set $6
-                                                i32.const 1648
-                                                local.set $8
-                                                br 11 (;@11;)
-                                              end
-                                            end
-                                            local.get $12
-                                            i32.const 2048
-                                            i32.and
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                i32.const 1
-                                                local.set $6
-                                                i32.const 1649
-                                                local.set $8
-                                                br 11 (;@11;)
-                                              end
-                                            else
-                                              block ;; label = @22
-                                                local.get $12
-                                                i32.const 1
-                                                i32.and
-                                                local.tee $1
-                                                local.set $6
-                                                local.get $1
-                                                if (result i32) ;; label = @23
-                                                  i32.const 1650
-                                                else
-                                                  i32.const 1648
-                                                end
-                                                local.set $8
-                                                br 11 (;@11;)
-                                              end
-                                            end
-                                          end
-                                          local.get $16
-                                          i64.load
-                                          local.set $50
-                                          i32.const 0
-                                          local.set $6
-                                          i32.const 1648
-                                          local.set $8
-                                          br 8 (;@11;)
-                                        end
-                                        local.get $39
-                                        local.get $16
-                                        i64.load
-                                        i64.store8
-                                        local.get $39
-                                        local.set $1
-                                        local.get $7
-                                        local.set $12
-                                        i32.const 1
-                                        local.set $7
-                                        i32.const 0
-                                        local.set $6
-                                        i32.const 1648
-                                        local.set $8
-                                        local.get $21
-                                        local.set $5
-                                        br 12 (;@6;)
-                                      end
-                                      call $11
-                                      i32.load
-                                      call $23
-                                      local.set $1
-                                      br 7 (;@10;)
-                                    end
-                                    local.get $16
-                                    i32.load
-                                    local.tee $1
-                                    i32.eqz
-                                    if ;; label = @17
-                                      i32.const 1658
-                                      local.set $1
-                                    end
-                                    br 6 (;@10;)
-                                  end
-                                  local.get $37
-                                  local.get $16
-                                  i64.load
-                                  i64.store32
-                                  local.get $42
-                                  i32.const 0
-                                  i32.store
-                                  local.get $16
-                                  local.get $37
-                                  i32.store
-                                  local.get $37
-                                  local.set $7
-                                  i32.const -1
-                                  local.set $6
-                                  br 6 (;@9;)
-                                end
-                                local.get $16
-                                i32.load
-                                local.set $7
-                                local.get $5
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $5
-                                    local.set $6
-                                    br 7 (;@9;)
-                                  end
-                                else
-                                  block ;; label = @16
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    i32.const 0
-                                    local.get $12
-                                    call $24
-                                    i32.const 0
-                                    local.set $1
-                                    br 8 (;@8;)
-                                  end
-                                end
-                              end
-                              local.get $16
-                              f64.load
-                              local.set $52
-                              local.get $20
-                              i32.const 0
-                              i32.store
-                              local.get $52
-                              i64.reinterpret_f64
-                              i64.const 0
-                              i64.lt_s
-                              if (result i32) ;; label = @14
-                                block (result i32) ;; label = @15
-                                  i32.const 1
-                                  local.set $24
-                                  local.get $52
-                                  f64.neg
-                                  local.set $52
-                                  i32.const 1665
-                                end
-                              else
-                                block (result i32) ;; label = @15
-                                  local.get $12
-                                  i32.const 1
-                                  i32.and
-                                  local.set $1
-                                  local.get $12
-                                  i32.const 2048
-                                  i32.and
-                                  if (result i32) ;; label = @16
-                                    block (result i32) ;; label = @17
-                                      i32.const 1
-                                      local.set $24
-                                      i32.const 1668
-                                    end
-                                  else
-                                    block (result i32) ;; label = @17
-                                      local.get $1
-                                      local.set $24
-                                      local.get $1
-                                      if (result i32) ;; label = @18
-                                        i32.const 1671
-                                      else
-                                        i32.const 1666
-                                      end
-                                    end
-                                  end
-                                end
-                              end
-                              local.set $26
-                              block $label$119 ;; label = @14
-                                local.get $52
-                                i64.reinterpret_f64
-                                i64.const 9218868437227405312
-                                i64.and
-                                i64.const 9218868437227405312
-                                i64.lt_u
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $52
-                                    local.get $20
-                                    call $26
-                                    f64.const 0x1p+1 (;=2;)
-                                    f64.mul
-                                    local.tee $52
-                                    f64.const 0x0p+0 (;=0;)
-                                    f64.ne
-                                    local.tee $1
-                                    if ;; label = @17
-                                      local.get $20
-                                      local.get $20
-                                      i32.load
-                                      i32.const -1
-                                      i32.add
-                                      i32.store
-                                    end
-                                    local.get $9
-                                    i32.const 32
-                                    i32.or
-                                    local.tee $22
-                                    i32.const 97
-                                    i32.eq
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $26
-                                        i32.const 9
-                                        i32.add
-                                        local.set $1
-                                        local.get $9
-                                        i32.const 32
-                                        i32.and
-                                        local.tee $6
-                                        if ;; label = @19
-                                          local.get $1
-                                          local.set $26
-                                        end
-                                        local.get $5
-                                        i32.const 11
-                                        i32.gt_u
-                                        i32.const 12
-                                        local.get $5
-                                        i32.sub
-                                        local.tee $1
-                                        i32.eqz
-                                        i32.or
-                                        i32.eqz
-                                        if ;; label = @19
-                                          block ;; label = @20
-                                            f64.const 0x1p+3 (;=8;)
-                                            local.set $53
-                                            loop $label$125 ;; label = @21
-                                              local.get $53
-                                              f64.const 0x1p+4 (;=16;)
-                                              f64.mul
-                                              local.set $53
-                                              local.get $1
-                                              i32.const -1
-                                              i32.add
-                                              local.tee $1
-                                              br_if 0 (;@21;)
-                                            end
-                                            local.get $26
-                                            i32.load8_s
-                                            i32.const 45
-                                            i32.eq
-                                            if (result f64) ;; label = @21
-                                              local.get $53
-                                              local.get $52
-                                              f64.neg
-                                              local.get $53
-                                              f64.sub
-                                              f64.add
-                                              f64.neg
-                                            else
-                                              local.get $52
-                                              local.get $53
-                                              f64.add
-                                              local.get $53
-                                              f64.sub
-                                            end
-                                            local.set $52
-                                          end
-                                        end
-                                        i32.const 0
-                                        local.get $20
-                                        i32.load
-                                        local.tee $7
-                                        i32.sub
-                                        local.set $1
-                                        local.get $7
-                                        i32.const 0
-                                        i32.lt_s
-                                        if (result i32) ;; label = @19
-                                          local.get $1
-                                        else
-                                          local.get $7
-                                        end
-                                        i64.extend_i32_s
-                                        local.get $33
-                                        call $22
-                                        local.tee $1
-                                        local.get $33
-                                        i32.eq
-                                        if ;; label = @19
-                                          block ;; label = @20
-                                            local.get $40
-                                            i32.const 48
-                                            i32.store8
-                                            local.get $40
-                                            local.set $1
-                                          end
-                                        end
-                                        local.get $24
-                                        i32.const 2
-                                        i32.or
-                                        local.set $13
-                                        local.get $1
-                                        i32.const -1
-                                        i32.add
-                                        local.get $7
-                                        i32.const 31
-                                        i32.shr_s
-                                        i32.const 2
-                                        i32.and
-                                        i32.const 43
-                                        i32.add
-                                        i32.store8
-                                        local.get $1
-                                        i32.const -2
-                                        i32.add
-                                        local.tee $8
-                                        local.get $9
-                                        i32.const 15
-                                        i32.add
-                                        i32.store8
-                                        local.get $5
-                                        i32.const 1
-                                        i32.lt_s
-                                        local.set $9
-                                        local.get $12
-                                        i32.const 8
-                                        i32.and
-                                        i32.eqz
-                                        local.set $14
-                                        local.get $19
-                                        local.set $1
-                                        loop $label$131 ;; label = @19
-                                          local.get $1
-                                          local.get $52
-                                          i32.trunc_f64_s
-                                          local.tee $7
-                                          i32.const 1632
-                                          i32.add
-                                          i32.load8_u
-                                          local.get $6
-                                          i32.or
-                                          i32.store8
-                                          local.get $52
-                                          local.get $7
-                                          f64.convert_i32_s
-                                          f64.sub
-                                          f64.const 0x1p+4 (;=16;)
-                                          f64.mul
-                                          local.set $52
-                                          block $label$132 (result i32) ;; label = @20
-                                            local.get $1
-                                            i32.const 1
-                                            i32.add
-                                            local.tee $7
-                                            local.get $27
-                                            i32.sub
-                                            i32.const 1
-                                            i32.eq
-                                            if (result i32) ;; label = @21
-                                              block (result i32) ;; label = @22
-                                                local.get $7
-                                                local.get $14
-                                                local.get $9
-                                                local.get $52
-                                                f64.const 0x0p+0 (;=0;)
-                                                f64.eq
-                                                i32.and
-                                                i32.and
-                                                br_if 2 (;@20;)
-                                                drop
-                                                local.get $7
-                                                i32.const 46
-                                                i32.store8
-                                                local.get $1
-                                                i32.const 2
-                                                i32.add
-                                              end
-                                            else
-                                              local.get $7
-                                            end
-                                          end
-                                          local.set $1
-                                          local.get $52
-                                          f64.const 0x0p+0 (;=0;)
-                                          f64.ne
-                                          br_if 0 (;@19;)
-                                        end
-                                        local.get $46
-                                        local.get $5
-                                        i32.add
-                                        local.get $8
-                                        local.tee $7
-                                        i32.sub
-                                        local.set $6
-                                        local.get $44
-                                        local.get $7
-                                        i32.sub
-                                        local.get $1
-                                        i32.add
-                                        local.set $9
-                                        local.get $0
-                                        i32.const 32
-                                        local.get $10
-                                        local.get $5
-                                        i32.const 0
-                                        i32.ne
-                                        local.get $45
-                                        local.get $1
-                                        i32.add
-                                        local.get $5
-                                        i32.lt_s
-                                        i32.and
-                                        if (result i32) ;; label = @19
-                                          local.get $6
-                                        else
-                                          local.get $9
-                                          local.tee $6
-                                        end
-                                        local.get $13
-                                        i32.add
-                                        local.tee $5
-                                        local.get $12
-                                        call $24
-                                        local.get $0
-                                        i32.load
-                                        i32.const 32
-                                        i32.and
-                                        i32.eqz
-                                        if ;; label = @19
-                                          local.get $26
-                                          local.get $13
-                                          local.get $0
-                                          call $20
-                                          drop
-                                        end
-                                        local.get $0
-                                        i32.const 48
-                                        local.get $10
-                                        local.get $5
-                                        local.get $12
-                                        i32.const 65536
-                                        i32.xor
-                                        call $24
-                                        local.get $1
-                                        local.get $27
-                                        i32.sub
-                                        local.set $1
-                                        local.get $0
-                                        i32.load
-                                        i32.const 32
-                                        i32.and
-                                        i32.eqz
-                                        if ;; label = @19
-                                          local.get $19
-                                          local.get $1
-                                          local.get $0
-                                          call $20
-                                          drop
-                                        end
-                                        local.get $0
-                                        i32.const 48
-                                        local.get $6
-                                        local.get $1
-                                        local.get $28
-                                        local.get $7
-                                        i32.sub
-                                        local.tee $1
-                                        i32.add
-                                        i32.sub
-                                        i32.const 0
-                                        i32.const 0
-                                        call $24
-                                        local.get $0
-                                        i32.load
-                                        i32.const 32
-                                        i32.and
-                                        i32.eqz
-                                        if ;; label = @19
-                                          local.get $8
-                                          local.get $1
-                                          local.get $0
-                                          call $20
-                                          drop
-                                        end
-                                        local.get $0
-                                        i32.const 32
-                                        local.get $10
-                                        local.get $5
-                                        local.get $12
-                                        i32.const 8192
-                                        i32.xor
-                                        call $24
-                                        local.get $5
-                                        local.get $10
-                                        i32.ge_s
-                                        if ;; label = @19
-                                          local.get $5
-                                          local.set $10
-                                        end
-                                        br 4 (;@14;)
-                                      end
-                                    end
-                                    local.get $1
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $20
-                                        local.get $20
-                                        i32.load
-                                        i32.const -28
-                                        i32.add
-                                        local.tee $6
-                                        i32.store
-                                        local.get $52
-                                        f64.const 0x1p+28 (;=268435456;)
-                                        f64.mul
-                                        local.set $52
-                                      end
-                                    else
-                                      local.get $20
-                                      i32.load
-                                      local.set $6
-                                    end
-                                    local.get $6
-                                    i32.const 0
-                                    i32.lt_s
-                                    if (result i32) ;; label = @17
-                                      local.get $47
-                                    else
-                                      local.get $48
-                                    end
-                                    local.tee $7
-                                    local.set $8
-                                    loop $label$145 ;; label = @17
-                                      local.get $8
-                                      local.get $52
-                                      i32.trunc_f64_s
-                                      local.tee $1
-                                      i32.store
-                                      local.get $8
-                                      i32.const 4
-                                      i32.add
-                                      local.set $8
-                                      local.get $52
-                                      local.get $1
-                                      f64.convert_i32_u
-                                      f64.sub
-                                      f64.const 0x1.dcd65p+29 (;=1000000000;)
-                                      f64.mul
-                                      local.tee $52
-                                      f64.const 0x0p+0 (;=0;)
-                                      f64.ne
-                                      br_if 0 (;@17;)
-                                    end
-                                    local.get $6
-                                    i32.const 0
-                                    i32.gt_s
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $7
-                                        local.set $1
-                                        loop $label$147 ;; label = @19
-                                          local.get $6
-                                          i32.const 29
-                                          i32.gt_s
-                                          if (result i32) ;; label = @20
-                                            i32.const 29
-                                          else
-                                            local.get $6
-                                          end
-                                          local.set $14
-                                          block $label$150 ;; label = @20
-                                            local.get $8
-                                            i32.const -4
-                                            i32.add
-                                            local.tee $6
-                                            local.get $1
-                                            i32.ge_u
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $14
-                                                i64.extend_i32_u
-                                                local.set $50
-                                                i32.const 0
-                                                local.set $13
-                                                loop $label$152 ;; label = @23
-                                                  local.get $6
-                                                  local.get $6
-                                                  i32.load
-                                                  i64.extend_i32_u
-                                                  local.get $50
-                                                  i64.shl
-                                                  local.get $13
-                                                  i64.extend_i32_u
-                                                  i64.add
-                                                  local.tee $51
-                                                  i64.const 1000000000
-                                                  i64.rem_u
-                                                  i64.store32
-                                                  local.get $51
-                                                  i64.const 1000000000
-                                                  i64.div_u
-                                                  i32.wrap_i64
-                                                  local.set $13
-                                                  local.get $6
-                                                  i32.const -4
-                                                  i32.add
-                                                  local.tee $6
-                                                  local.get $1
-                                                  i32.ge_u
-                                                  br_if 0 (;@23;)
-                                                end
-                                                local.get $13
-                                                i32.eqz
-                                                br_if 2 (;@20;)
-                                                local.get $1
-                                                i32.const -4
-                                                i32.add
-                                                local.tee $1
-                                                local.get $13
-                                                i32.store
-                                              end
-                                            end
-                                          end
-                                          loop $label$153 ;; label = @20
-                                            local.get $8
-                                            local.get $1
-                                            i32.gt_u
-                                            if ;; label = @21
-                                              local.get $8
-                                              i32.const -4
-                                              i32.add
-                                              local.tee $6
-                                              i32.load
-                                              i32.eqz
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $6
-                                                  local.set $8
-                                                  br 3 (;@20;)
-                                                end
-                                              end
-                                            end
-                                          end
-                                          local.get $20
-                                          local.get $20
-                                          i32.load
-                                          local.get $14
-                                          i32.sub
-                                          local.tee $6
-                                          i32.store
-                                          local.get $6
-                                          i32.const 0
-                                          i32.gt_s
-                                          br_if 0 (;@19;)
-                                        end
-                                      end
-                                    else
-                                      local.get $7
-                                      local.set $1
-                                    end
-                                    local.get $5
-                                    i32.const 0
-                                    i32.lt_s
-                                    if (result i32) ;; label = @17
-                                      i32.const 6
-                                    else
-                                      local.get $5
-                                    end
-                                    local.set $18
-                                    local.get $6
-                                    i32.const 0
-                                    i32.lt_s
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $18
-                                        i32.const 25
-                                        i32.add
-                                        i32.const 9
-                                        i32.div_s
-                                        i32.const 1
-                                        i32.add
-                                        local.set $14
-                                        local.get $22
-                                        i32.const 102
-                                        i32.eq
-                                        local.set $25
-                                        local.get $8
-                                        local.set $5
-                                        loop $label$160 ;; label = @19
-                                          i32.const 0
-                                          local.get $6
-                                          i32.sub
-                                          local.tee $13
-                                          i32.const 9
-                                          i32.gt_s
-                                          if ;; label = @20
-                                            i32.const 9
-                                            local.set $13
-                                          end
-                                          block $label$162 ;; label = @20
-                                            local.get $1
-                                            local.get $5
-                                            i32.lt_u
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                i32.const 1
-                                                local.get $13
-                                                i32.shl
-                                                i32.const -1
-                                                i32.add
-                                                local.set $29
-                                                i32.const 1000000000
-                                                local.get $13
-                                                i32.shr_u
-                                                local.set $35
-                                                i32.const 0
-                                                local.set $6
-                                                local.get $1
-                                                local.set $8
-                                                loop $label$164 ;; label = @23
-                                                  local.get $8
-                                                  local.get $8
-                                                  i32.load
-                                                  local.tee $32
-                                                  local.get $13
-                                                  i32.shr_u
-                                                  local.get $6
-                                                  i32.add
-                                                  i32.store
-                                                  local.get $32
-                                                  local.get $29
-                                                  i32.and
-                                                  local.get $35
-                                                  i32.mul
-                                                  local.set $6
-                                                  local.get $8
-                                                  i32.const 4
-                                                  i32.add
-                                                  local.tee $8
-                                                  local.get $5
-                                                  i32.lt_u
-                                                  br_if 0 (;@23;)
-                                                end
-                                                local.get $1
-                                                i32.const 4
-                                                i32.add
-                                                local.set $8
-                                                local.get $1
-                                                i32.load
-                                                i32.eqz
-                                                if ;; label = @23
-                                                  local.get $8
-                                                  local.set $1
-                                                end
-                                                local.get $6
-                                                i32.eqz
-                                                br_if 2 (;@20;)
-                                                local.get $5
-                                                local.get $6
-                                                i32.store
-                                                local.get $5
-                                                i32.const 4
-                                                i32.add
-                                                local.set $5
-                                              end
-                                            else
-                                              block ;; label = @22
-                                                local.get $1
-                                                i32.const 4
-                                                i32.add
-                                                local.set $8
-                                                local.get $1
-                                                i32.load
-                                                i32.eqz
-                                                if ;; label = @23
-                                                  local.get $8
-                                                  local.set $1
-                                                end
-                                              end
-                                            end
-                                          end
-                                          local.get $25
-                                          if (result i32) ;; label = @20
-                                            local.get $7
-                                          else
-                                            local.get $1
-                                          end
-                                          local.tee $8
-                                          local.get $14
-                                          i32.const 2
-                                          i32.shl
-                                          i32.add
-                                          local.set $6
-                                          local.get $5
-                                          local.get $8
-                                          i32.sub
-                                          i32.const 2
-                                          i32.shr_s
-                                          local.get $14
-                                          i32.gt_s
-                                          if ;; label = @20
-                                            local.get $6
-                                            local.set $5
-                                          end
-                                          local.get $20
-                                          local.get $20
-                                          i32.load
-                                          local.get $13
-                                          i32.add
-                                          local.tee $6
-                                          i32.store
-                                          local.get $6
-                                          i32.const 0
-                                          i32.lt_s
-                                          br_if 0 (;@19;)
-                                          local.get $5
-                                          local.set $13
-                                        end
-                                      end
-                                    else
-                                      local.get $8
-                                      local.set $13
-                                    end
-                                    local.get $7
-                                    local.set $25
-                                    block $label$172 ;; label = @17
-                                      local.get $1
-                                      local.get $13
-                                      i32.lt_u
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $25
-                                          local.get $1
-                                          i32.sub
-                                          i32.const 2
-                                          i32.shr_s
-                                          i32.const 9
-                                          i32.mul
-                                          local.set $5
-                                          local.get $1
-                                          i32.load
-                                          local.tee $6
-                                          i32.const 10
-                                          i32.lt_u
-                                          br_if 2 (;@17;)
-                                          i32.const 10
-                                          local.set $8
-                                          loop $label$174 ;; label = @20
-                                            local.get $5
-                                            i32.const 1
-                                            i32.add
-                                            local.set $5
-                                            local.get $6
-                                            local.get $8
-                                            i32.const 10
-                                            i32.mul
-                                            local.tee $8
-                                            i32.ge_u
-                                            br_if 0 (;@20;)
-                                          end
-                                        end
-                                      else
-                                        i32.const 0
-                                        local.set $5
-                                      end
-                                    end
-                                    local.get $22
-                                    i32.const 103
-                                    i32.eq
-                                    local.set $29
-                                    local.get $18
-                                    i32.const 0
-                                    i32.ne
-                                    local.set $35
-                                    local.get $18
-                                    local.get $22
-                                    i32.const 102
-                                    i32.ne
-                                    if (result i32) ;; label = @17
-                                      local.get $5
-                                    else
-                                      i32.const 0
-                                    end
-                                    i32.sub
-                                    local.get $35
-                                    local.get $29
-                                    i32.and
-                                    i32.const 31
-                                    i32.shl
-                                    i32.const 31
-                                    i32.shr_s
-                                    i32.add
-                                    local.tee $8
-                                    local.get $13
-                                    local.get $25
-                                    i32.sub
-                                    i32.const 2
-                                    i32.shr_s
-                                    i32.const 9
-                                    i32.mul
-                                    i32.const -9
-                                    i32.add
-                                    i32.lt_s
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $8
-                                        i32.const 9216
-                                        i32.add
-                                        local.tee $14
-                                        i32.const 9
-                                        i32.rem_s
-                                        i32.const 1
-                                        i32.add
-                                        local.tee $8
-                                        i32.const 9
-                                        i32.lt_s
-                                        if ;; label = @19
-                                          block ;; label = @20
-                                            i32.const 10
-                                            local.set $6
-                                            loop $label$180 ;; label = @21
-                                              local.get $6
-                                              i32.const 10
-                                              i32.mul
-                                              local.set $6
-                                              local.get $8
-                                              i32.const 1
-                                              i32.add
-                                              local.tee $8
-                                              i32.const 9
-                                              i32.ne
-                                              br_if 0 (;@21;)
-                                            end
-                                          end
-                                        else
-                                          i32.const 10
-                                          local.set $6
-                                        end
-                                        local.get $7
-                                        i32.const 4
-                                        i32.add
-                                        local.get $14
-                                        i32.const 9
-                                        i32.div_s
-                                        i32.const -1024
-                                        i32.add
-                                        i32.const 2
-                                        i32.shl
-                                        i32.add
-                                        local.tee $8
-                                        i32.load
-                                        local.tee $22
-                                        local.get $6
-                                        i32.rem_u
-                                        local.set $14
-                                        block $label$182 ;; label = @19
-                                          local.get $8
-                                          i32.const 4
-                                          i32.add
-                                          local.get $13
-                                          i32.eq
-                                          local.tee $32
-                                          local.get $14
-                                          i32.eqz
-                                          i32.and
-                                          i32.eqz
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              local.get $14
-                                              local.get $6
-                                              i32.const 2
-                                              i32.div_s
-                                              local.tee $49
-                                              i32.lt_u
-                                              if (result f64) ;; label = @22
-                                                f64.const 0x1p-1 (;=0.5;)
-                                              else
-                                                local.get $32
-                                                local.get $14
-                                                local.get $49
-                                                i32.eq
-                                                i32.and
-                                                if (result f64) ;; label = @23
-                                                  f64.const 0x1p+0 (;=1;)
-                                                else
-                                                  f64.const 0x1.8p+0 (;=1.5;)
-                                                end
-                                              end
-                                              local.set $52
-                                              local.get $22
-                                              local.get $6
-                                              i32.div_u
-                                              i32.const 1
-                                              i32.and
-                                              if (result f64) ;; label = @22
-                                                f64.const 0x1.0000000000001p+53 (;=9007199254740994;)
-                                              else
-                                                f64.const 0x1p+53 (;=9007199254740992;)
-                                              end
-                                              local.set $53
-                                              block $label$190 ;; label = @22
-                                                local.get $24
-                                                if ;; label = @23
-                                                  block ;; label = @24
-                                                    local.get $26
-                                                    i32.load8_s
-                                                    i32.const 45
-                                                    i32.ne
-                                                    br_if 2 (;@22;)
-                                                    local.get $53
-                                                    f64.neg
-                                                    local.set $53
-                                                    local.get $52
-                                                    f64.neg
-                                                    local.set $52
-                                                  end
-                                                end
-                                              end
-                                              local.get $8
-                                              local.get $22
-                                              local.get $14
-                                              i32.sub
-                                              local.tee $14
-                                              i32.store
-                                              local.get $53
-                                              local.get $52
-                                              f64.add
-                                              local.get $53
-                                              f64.eq
-                                              br_if 2 (;@19;)
-                                              local.get $8
-                                              local.get $14
-                                              local.get $6
-                                              i32.add
-                                              local.tee $5
-                                              i32.store
-                                              local.get $5
-                                              i32.const 999999999
-                                              i32.gt_u
-                                              if ;; label = @22
-                                                loop $label$193 ;; label = @23
-                                                  local.get $8
-                                                  i32.const 0
-                                                  i32.store
-                                                  local.get $8
-                                                  i32.const -4
-                                                  i32.add
-                                                  local.tee $8
-                                                  local.get $1
-                                                  i32.lt_u
-                                                  if ;; label = @24
-                                                    local.get $1
-                                                    i32.const -4
-                                                    i32.add
-                                                    local.tee $1
-                                                    i32.const 0
-                                                    i32.store
-                                                  end
-                                                  local.get $8
-                                                  local.get $8
-                                                  i32.load
-                                                  i32.const 1
-                                                  i32.add
-                                                  local.tee $5
-                                                  i32.store
-                                                  local.get $5
-                                                  i32.const 999999999
-                                                  i32.gt_u
-                                                  br_if 0 (;@23;)
-                                                end
-                                              end
-                                              local.get $25
-                                              local.get $1
-                                              i32.sub
-                                              i32.const 2
-                                              i32.shr_s
-                                              i32.const 9
-                                              i32.mul
-                                              local.set $5
-                                              local.get $1
-                                              i32.load
-                                              local.tee $14
-                                              i32.const 10
-                                              i32.lt_u
-                                              br_if 2 (;@19;)
-                                              i32.const 10
-                                              local.set $6
-                                              loop $label$195 ;; label = @22
-                                                local.get $5
-                                                i32.const 1
-                                                i32.add
-                                                local.set $5
-                                                local.get $14
-                                                local.get $6
-                                                i32.const 10
-                                                i32.mul
-                                                local.tee $6
-                                                i32.ge_u
-                                                br_if 0 (;@22;)
-                                              end
-                                            end
-                                          end
-                                        end
-                                        local.get $1
-                                        local.set $14
-                                        local.get $5
-                                        local.set $6
-                                        local.get $13
-                                        local.get $8
-                                        i32.const 4
-                                        i32.add
-                                        local.tee $8
-                                        i32.le_u
-                                        if ;; label = @19
-                                          local.get $13
-                                          local.set $8
-                                        end
-                                      end
-                                    else
-                                      block ;; label = @18
-                                        local.get $1
-                                        local.set $14
-                                        local.get $5
-                                        local.set $6
-                                        local.get $13
-                                        local.set $8
-                                      end
-                                    end
-                                    i32.const 0
-                                    local.get $6
-                                    i32.sub
-                                    local.set $32
-                                    loop $label$198 ;; label = @17
-                                      block $label$199 ;; label = @18
-                                        local.get $8
-                                        local.get $14
-                                        i32.le_u
-                                        if ;; label = @19
-                                          block ;; label = @20
-                                            i32.const 0
-                                            local.set $22
-                                            br 2 (;@18;)
-                                          end
-                                        end
-                                        local.get $8
-                                        i32.const -4
-                                        i32.add
-                                        local.tee $1
-                                        i32.load
-                                        if ;; label = @19
-                                          i32.const 1
-                                          local.set $22
-                                        else
-                                          block ;; label = @20
-                                            local.get $1
-                                            local.set $8
-                                            br 3 (;@17;)
-                                          end
-                                        end
-                                      end
-                                    end
-                                    block $label$203 ;; label = @17
-                                      local.get $29
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $35
-                                          i32.const 1
-                                          i32.and
-                                          i32.const 1
-                                          i32.xor
-                                          local.get $18
-                                          i32.add
-                                          local.tee $1
-                                          local.get $6
-                                          i32.gt_s
-                                          local.get $6
-                                          i32.const -5
-                                          i32.gt_s
-                                          i32.and
-                                          if (result i32) ;; label = @20
-                                            block (result i32) ;; label = @21
-                                              local.get $9
-                                              i32.const -1
-                                              i32.add
-                                              local.set $5
-                                              local.get $1
-                                              i32.const -1
-                                              i32.add
-                                              local.get $6
-                                              i32.sub
-                                            end
-                                          else
-                                            block (result i32) ;; label = @21
-                                              local.get $9
-                                              i32.const -2
-                                              i32.add
-                                              local.set $5
-                                              local.get $1
-                                              i32.const -1
-                                              i32.add
-                                            end
-                                          end
-                                          local.set $1
-                                          local.get $12
-                                          i32.const 8
-                                          i32.and
-                                          local.tee $13
-                                          br_if 2 (;@17;)
-                                          block $label$207 ;; label = @20
-                                            local.get $22
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $8
-                                                i32.const -4
-                                                i32.add
-                                                i32.load
-                                                local.tee $18
-                                                i32.eqz
-                                                if ;; label = @23
-                                                  block ;; label = @24
-                                                    i32.const 9
-                                                    local.set $9
-                                                    br 4 (;@20;)
-                                                  end
-                                                end
-                                                local.get $18
-                                                i32.const 10
-                                                i32.rem_u
-                                                if ;; label = @23
-                                                  block ;; label = @24
-                                                    i32.const 0
-                                                    local.set $9
-                                                    br 4 (;@20;)
-                                                  end
-                                                else
-                                                  block ;; label = @24
-                                                    i32.const 10
-                                                    local.set $13
-                                                    i32.const 0
-                                                    local.set $9
-                                                  end
-                                                end
-                                                loop $label$212 ;; label = @23
-                                                  local.get $9
-                                                  i32.const 1
-                                                  i32.add
-                                                  local.set $9
-                                                  local.get $18
-                                                  local.get $13
-                                                  i32.const 10
-                                                  i32.mul
-                                                  local.tee $13
-                                                  i32.rem_u
-                                                  i32.eqz
-                                                  br_if 0 (;@23;)
-                                                end
-                                              end
-                                            else
-                                              i32.const 9
-                                              local.set $9
-                                            end
-                                          end
-                                          local.get $8
-                                          local.get $25
-                                          i32.sub
-                                          i32.const 2
-                                          i32.shr_s
-                                          i32.const 9
-                                          i32.mul
-                                          i32.const -9
-                                          i32.add
-                                          local.set $18
-                                          local.get $5
-                                          i32.const 32
-                                          i32.or
-                                          i32.const 102
-                                          i32.eq
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              i32.const 0
-                                              local.set $13
-                                              local.get $1
-                                              local.get $18
-                                              local.get $9
-                                              i32.sub
-                                              local.tee $9
-                                              i32.const 0
-                                              i32.lt_s
-                                              if (result i32) ;; label = @22
-                                                i32.const 0
-                                                local.tee $9
-                                              else
-                                                local.get $9
-                                              end
-                                              i32.ge_s
-                                              if ;; label = @22
-                                                local.get $9
-                                                local.set $1
-                                              end
-                                            end
-                                          else
-                                            block ;; label = @21
-                                              i32.const 0
-                                              local.set $13
-                                              local.get $1
-                                              local.get $18
-                                              local.get $6
-                                              i32.add
-                                              local.get $9
-                                              i32.sub
-                                              local.tee $9
-                                              i32.const 0
-                                              i32.lt_s
-                                              if (result i32) ;; label = @22
-                                                i32.const 0
-                                                local.tee $9
-                                              else
-                                                local.get $9
-                                              end
-                                              i32.ge_s
-                                              if ;; label = @22
-                                                local.get $9
-                                                local.set $1
-                                              end
-                                            end
-                                          end
-                                        end
-                                      else
-                                        block ;; label = @19
-                                          local.get $12
-                                          i32.const 8
-                                          i32.and
-                                          local.set $13
-                                          local.get $18
-                                          local.set $1
-                                          local.get $9
-                                          local.set $5
-                                        end
-                                      end
-                                    end
-                                    local.get $5
-                                    i32.const 32
-                                    i32.or
-                                    i32.const 102
-                                    i32.eq
-                                    local.tee $25
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        i32.const 0
-                                        local.set $9
-                                        local.get $6
-                                        i32.const 0
-                                        i32.le_s
-                                        if ;; label = @19
-                                          i32.const 0
-                                          local.set $6
-                                        end
-                                      end
-                                    else
-                                      block ;; label = @18
-                                        local.get $28
-                                        local.get $6
-                                        i32.const 0
-                                        i32.lt_s
-                                        if (result i32) ;; label = @19
-                                          local.get $32
-                                        else
-                                          local.get $6
-                                        end
-                                        i64.extend_i32_s
-                                        local.get $33
-                                        call $22
-                                        local.tee $9
-                                        i32.sub
-                                        i32.const 2
-                                        i32.lt_s
-                                        if ;; label = @19
-                                          loop $label$229 ;; label = @20
-                                            local.get $9
-                                            i32.const -1
-                                            i32.add
-                                            local.tee $9
-                                            i32.const 48
-                                            i32.store8
-                                            local.get $28
-                                            local.get $9
-                                            i32.sub
-                                            i32.const 2
-                                            i32.lt_s
-                                            br_if 0 (;@20;)
-                                          end
-                                        end
-                                        local.get $9
-                                        i32.const -1
-                                        i32.add
-                                        local.get $6
-                                        i32.const 31
-                                        i32.shr_s
-                                        i32.const 2
-                                        i32.and
-                                        i32.const 43
-                                        i32.add
-                                        i32.store8
-                                        local.get $9
-                                        i32.const -2
-                                        i32.add
-                                        local.tee $6
-                                        local.get $5
-                                        i32.store8
-                                        local.get $6
-                                        local.set $9
-                                        local.get $28
-                                        local.get $6
-                                        i32.sub
-                                        local.set $6
-                                      end
-                                    end
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    local.get $24
-                                    i32.const 1
-                                    i32.add
-                                    local.get $1
-                                    i32.add
-                                    local.get $1
-                                    local.get $13
-                                    i32.or
-                                    local.tee $29
-                                    i32.const 0
-                                    i32.ne
-                                    i32.add
-                                    local.get $6
-                                    i32.add
-                                    local.tee $18
-                                    local.get $12
-                                    call $24
-                                    local.get $0
-                                    i32.load
-                                    i32.const 32
-                                    i32.and
-                                    i32.eqz
-                                    if ;; label = @17
-                                      local.get $26
-                                      local.get $24
-                                      local.get $0
-                                      call $20
-                                      drop
-                                    end
-                                    local.get $0
-                                    i32.const 48
-                                    local.get $10
-                                    local.get $18
-                                    local.get $12
-                                    i32.const 65536
-                                    i32.xor
-                                    call $24
-                                    block $label$231 ;; label = @17
-                                      local.get $25
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $14
-                                          local.get $7
-                                          i32.gt_u
-                                          if (result i32) ;; label = @20
-                                            local.get $7
-                                          else
-                                            local.get $14
-                                          end
-                                          local.tee $9
-                                          local.set $6
-                                          loop $label$235 ;; label = @20
-                                            local.get $6
-                                            i32.load
-                                            i64.extend_i32_u
-                                            local.get $31
-                                            call $22
-                                            local.set $5
-                                            block $label$236 ;; label = @21
-                                              local.get $6
-                                              local.get $9
-                                              i32.eq
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $5
-                                                  local.get $31
-                                                  i32.ne
-                                                  br_if 2 (;@21;)
-                                                  local.get $34
-                                                  i32.const 48
-                                                  i32.store8
-                                                  local.get $34
-                                                  local.set $5
-                                                end
-                                              else
-                                                block ;; label = @23
-                                                  local.get $5
-                                                  local.get $19
-                                                  i32.le_u
-                                                  br_if 2 (;@21;)
-                                                  local.get $19
-                                                  i32.const 48
-                                                  local.get $5
-                                                  local.get $27
-                                                  i32.sub
-                                                  call $35
-                                                  drop
-                                                  loop $label$239 ;; label = @24
-                                                    local.get $5
-                                                    i32.const -1
-                                                    i32.add
-                                                    local.tee $5
-                                                    local.get $19
-                                                    i32.gt_u
-                                                    br_if 0 (;@24;)
-                                                  end
-                                                end
-                                              end
-                                            end
-                                            local.get $0
-                                            i32.load
-                                            i32.const 32
-                                            i32.and
-                                            i32.eqz
-                                            if ;; label = @21
-                                              local.get $5
-                                              local.get $41
-                                              local.get $5
-                                              i32.sub
-                                              local.get $0
-                                              call $20
-                                              drop
-                                            end
-                                            local.get $6
-                                            i32.const 4
-                                            i32.add
-                                            local.tee $5
-                                            local.get $7
-                                            i32.le_u
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $5
-                                                local.set $6
-                                                br 2 (;@20;)
-                                              end
-                                            end
-                                          end
-                                          block $label$242 ;; label = @20
-                                            local.get $29
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $0
-                                                i32.load
-                                                i32.const 32
-                                                i32.and
-                                                br_if 2 (;@20;)
-                                                i32.const 1700
-                                                i32.const 1
-                                                local.get $0
-                                                call $20
-                                                drop
-                                              end
-                                            end
-                                          end
-                                          local.get $1
-                                          i32.const 0
-                                          i32.gt_s
-                                          local.get $5
-                                          local.get $8
-                                          i32.lt_u
-                                          i32.and
-                                          if ;; label = @20
-                                            loop $label$245 ;; label = @21
-                                              local.get $5
-                                              i32.load
-                                              i64.extend_i32_u
-                                              local.get $31
-                                              call $22
-                                              local.tee $7
-                                              local.get $19
-                                              i32.gt_u
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $19
-                                                  i32.const 48
-                                                  local.get $7
-                                                  local.get $27
-                                                  i32.sub
-                                                  call $35
-                                                  drop
-                                                  loop $label$247 ;; label = @24
-                                                    local.get $7
-                                                    i32.const -1
-                                                    i32.add
-                                                    local.tee $7
-                                                    local.get $19
-                                                    i32.gt_u
-                                                    br_if 0 (;@24;)
-                                                  end
-                                                end
-                                              end
-                                              local.get $0
-                                              i32.load
-                                              i32.const 32
-                                              i32.and
-                                              i32.eqz
-                                              if ;; label = @22
-                                                local.get $7
-                                                local.get $1
-                                                i32.const 9
-                                                i32.gt_s
-                                                if (result i32) ;; label = @23
-                                                  i32.const 9
-                                                else
-                                                  local.get $1
-                                                end
-                                                local.get $0
-                                                call $20
-                                                drop
-                                              end
-                                              local.get $1
-                                              i32.const -9
-                                              i32.add
-                                              local.set $7
-                                              local.get $1
-                                              i32.const 9
-                                              i32.gt_s
-                                              local.get $5
-                                              i32.const 4
-                                              i32.add
-                                              local.tee $5
-                                              local.get $8
-                                              i32.lt_u
-                                              i32.and
-                                              if ;; label = @22
-                                                block ;; label = @23
-                                                  local.get $7
-                                                  local.set $1
-                                                  br 2 (;@21;)
-                                                end
-                                              else
-                                                local.get $7
-                                                local.set $1
-                                              end
-                                            end
-                                          end
-                                          local.get $0
-                                          i32.const 48
-                                          local.get $1
-                                          i32.const 9
-                                          i32.add
-                                          i32.const 9
-                                          i32.const 0
-                                          call $24
-                                        end
-                                      else
-                                        block ;; label = @19
-                                          local.get $14
-                                          i32.const 4
-                                          i32.add
-                                          local.set $5
-                                          local.get $22
-                                          i32.eqz
-                                          if ;; label = @20
-                                            local.get $5
-                                            local.set $8
-                                          end
-                                          local.get $1
-                                          i32.const -1
-                                          i32.gt_s
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              local.get $13
-                                              i32.eqz
-                                              local.set $13
-                                              local.get $14
-                                              local.set $7
-                                              local.get $1
-                                              local.set $5
-                                              loop $label$256 ;; label = @22
-                                                local.get $7
-                                                i32.load
-                                                i64.extend_i32_u
-                                                local.get $31
-                                                call $22
-                                                local.tee $1
-                                                local.get $31
-                                                i32.eq
-                                                if ;; label = @23
-                                                  block ;; label = @24
-                                                    local.get $34
-                                                    i32.const 48
-                                                    i32.store8
-                                                    local.get $34
-                                                    local.set $1
-                                                  end
-                                                end
-                                                block $label$258 ;; label = @23
-                                                  local.get $7
-                                                  local.get $14
-                                                  i32.eq
-                                                  if ;; label = @24
-                                                    block ;; label = @25
-                                                      local.get $0
-                                                      i32.load
-                                                      i32.const 32
-                                                      i32.and
-                                                      i32.eqz
-                                                      if ;; label = @26
-                                                        local.get $1
-                                                        i32.const 1
-                                                        local.get $0
-                                                        call $20
-                                                        drop
-                                                      end
-                                                      local.get $1
-                                                      i32.const 1
-                                                      i32.add
-                                                      local.set $1
-                                                      local.get $13
-                                                      local.get $5
-                                                      i32.const 1
-                                                      i32.lt_s
-                                                      i32.and
-                                                      br_if 2 (;@23;)
-                                                      local.get $0
-                                                      i32.load
-                                                      i32.const 32
-                                                      i32.and
-                                                      br_if 2 (;@23;)
-                                                      i32.const 1700
-                                                      i32.const 1
-                                                      local.get $0
-                                                      call $20
-                                                      drop
-                                                    end
-                                                  else
-                                                    block ;; label = @25
-                                                      local.get $1
-                                                      local.get $19
-                                                      i32.le_u
-                                                      br_if 2 (;@23;)
-                                                      local.get $19
-                                                      i32.const 48
-                                                      local.get $1
-                                                      local.get $43
-                                                      i32.add
-                                                      call $35
-                                                      drop
-                                                      loop $label$262 ;; label = @26
-                                                        local.get $1
-                                                        i32.const -1
-                                                        i32.add
-                                                        local.tee $1
-                                                        local.get $19
-                                                        i32.gt_u
-                                                        br_if 0 (;@26;)
-                                                      end
-                                                    end
-                                                  end
-                                                end
-                                                local.get $41
-                                                local.get $1
-                                                i32.sub
-                                                local.set $6
-                                                local.get $0
-                                                i32.load
-                                                i32.const 32
-                                                i32.and
-                                                i32.eqz
-                                                if ;; label = @23
-                                                  local.get $1
-                                                  local.get $5
-                                                  local.get $6
-                                                  i32.gt_s
-                                                  if (result i32) ;; label = @24
-                                                    local.get $6
-                                                  else
-                                                    local.get $5
-                                                  end
-                                                  local.get $0
-                                                  call $20
-                                                  drop
-                                                end
-                                                local.get $7
-                                                i32.const 4
-                                                i32.add
-                                                local.tee $7
-                                                local.get $8
-                                                i32.lt_u
-                                                local.get $5
-                                                local.get $6
-                                                i32.sub
-                                                local.tee $5
-                                                i32.const -1
-                                                i32.gt_s
-                                                i32.and
-                                                br_if 0 (;@22;)
-                                                local.get $5
-                                                local.set $1
-                                              end
-                                            end
-                                          end
-                                          local.get $0
-                                          i32.const 48
-                                          local.get $1
-                                          i32.const 18
-                                          i32.add
-                                          i32.const 18
-                                          i32.const 0
-                                          call $24
-                                          local.get $0
-                                          i32.load
-                                          i32.const 32
-                                          i32.and
-                                          br_if 2 (;@17;)
-                                          local.get $9
-                                          local.get $28
-                                          local.get $9
-                                          i32.sub
-                                          local.get $0
-                                          call $20
-                                          drop
-                                        end
-                                      end
-                                    end
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    local.get $18
-                                    local.get $12
-                                    i32.const 8192
-                                    i32.xor
-                                    call $24
-                                    local.get $18
-                                    local.get $10
-                                    i32.ge_s
-                                    if ;; label = @17
-                                      local.get $18
-                                      local.set $10
-                                    end
-                                  end
-                                else
-                                  block ;; label = @16
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    local.get $52
-                                    local.get $52
-                                    f64.ne
-                                    i32.const 0
-                                    i32.or
-                                    local.tee $6
-                                    if (result i32) ;; label = @17
-                                      i32.const 0
-                                      local.tee $24
-                                    else
-                                      local.get $24
-                                    end
-                                    i32.const 3
-                                    i32.add
-                                    local.tee $8
-                                    local.get $7
-                                    call $24
-                                    local.get $0
-                                    i32.load
-                                    local.tee $1
-                                    i32.const 32
-                                    i32.and
-                                    i32.eqz
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $26
-                                        local.get $24
-                                        local.get $0
-                                        call $20
-                                        drop
-                                        local.get $0
-                                        i32.load
-                                        local.set $1
-                                      end
-                                    end
-                                    local.get $9
-                                    i32.const 32
-                                    i32.and
-                                    i32.const 0
-                                    i32.ne
-                                    local.tee $5
-                                    if (result i32) ;; label = @17
-                                      i32.const 1684
-                                    else
-                                      i32.const 1688
-                                    end
-                                    local.set $7
-                                    local.get $5
-                                    if (result i32) ;; label = @17
-                                      i32.const 1692
-                                    else
-                                      i32.const 1696
-                                    end
-                                    local.set $5
-                                    local.get $6
-                                    i32.eqz
-                                    if ;; label = @17
-                                      local.get $7
-                                      local.set $5
-                                    end
-                                    local.get $1
-                                    i32.const 32
-                                    i32.and
-                                    i32.eqz
-                                    if ;; label = @17
-                                      local.get $5
-                                      i32.const 3
-                                      local.get $0
-                                      call $20
-                                      drop
-                                    end
-                                    local.get $0
-                                    i32.const 32
-                                    local.get $10
-                                    local.get $8
-                                    local.get $12
-                                    i32.const 8192
-                                    i32.xor
-                                    call $24
-                                    local.get $8
-                                    local.get $10
-                                    i32.ge_s
-                                    if ;; label = @17
-                                      local.get $8
-                                      local.set $10
-                                    end
-                                  end
-                                end
-                              end
-                              local.get $11
-                              local.set $1
-                              br 9 (;@4;)
-                            end
-                            local.get $5
-                            local.set $7
-                            i32.const 0
-                            local.set $6
-                            i32.const 1648
-                            local.set $8
-                            local.get $21
-                            local.set $5
-                            br 6 (;@6;)
-                          end
-                          local.get $9
-                          i32.const 32
-                          i32.and
-                          local.set $7
-                          local.get $16
-                          i64.load
-                          local.tee $50
-                          i64.const 0
-                          i64.eq
-                          if (result i32) ;; label = @12
-                            block (result i32) ;; label = @13
-                              i64.const 0
-                              local.set $50
-                              local.get $21
-                            end
-                          else
-                            block (result i32) ;; label = @13
-                              local.get $21
-                              local.set $1
-                              loop $label$280 ;; label = @14
-                                local.get $1
-                                i32.const -1
-                                i32.add
-                                local.tee $1
-                                local.get $50
-                                i32.wrap_i64
-                                i32.const 15
-                                i32.and
-                                i32.const 1632
-                                i32.add
-                                i32.load8_u
-                                local.get $7
-                                i32.or
-                                i32.store8
-                                local.get $50
-                                i64.const 4
-                                i64.shr_u
-                                local.tee $50
-                                i64.const 0
-                                i64.ne
-                                br_if 0 (;@14;)
-                              end
-                              local.get $16
-                              i64.load
-                              local.set $50
-                              local.get $1
-                            end
-                          end
-                          local.set $7
-                          local.get $9
-                          i32.const 4
-                          i32.shr_s
-                          i32.const 1648
-                          i32.add
-                          local.set $8
-                          local.get $12
-                          i32.const 8
-                          i32.and
-                          i32.eqz
-                          local.get $50
-                          i64.const 0
-                          i64.eq
-                          i32.or
-                          local.tee $1
-                          if ;; label = @12
-                            i32.const 1648
-                            local.set $8
-                          end
-                          local.get $1
-                          if (result i32) ;; label = @12
-                            i32.const 0
-                          else
-                            i32.const 2
-                          end
-                          local.set $6
-                          br 4 (;@7;)
-                        end
-                        local.get $50
-                        local.get $21
-                        call $22
-                        local.set $7
-                        br 3 (;@7;)
-                      end
-                      local.get $1
-                      i32.const 0
-                      local.get $5
-                      call $16
-                      local.tee $13
-                      i32.eqz
-                      local.set $14
-                      local.get $13
-                      local.get $1
-                      i32.sub
-                      local.set $8
-                      local.get $1
-                      local.get $5
-                      i32.add
-                      local.set $9
-                      local.get $7
-                      local.set $12
-                      local.get $14
-                      if (result i32) ;; label = @10
-                        local.get $5
-                      else
-                        local.get $8
-                      end
-                      local.set $7
-                      i32.const 0
-                      local.set $6
-                      i32.const 1648
-                      local.set $8
-                      local.get $14
-                      if (result i32) ;; label = @10
-                        local.get $9
-                      else
-                        local.get $13
-                      end
-                      local.set $5
-                      br 3 (;@6;)
-                    end
-                    i32.const 0
-                    local.set $1
-                    i32.const 0
-                    local.set $5
-                    local.get $7
-                    local.set $8
-                    loop $label$288 ;; label = @9
-                      block $label$289 ;; label = @10
-                        local.get $8
-                        i32.load
-                        local.tee $9
-                        i32.eqz
-                        br_if 0 (;@10;)
-                        local.get $36
-                        local.get $9
-                        call $25
-                        local.tee $5
-                        i32.const 0
-                        i32.lt_s
-                        local.get $5
-                        local.get $6
-                        local.get $1
-                        i32.sub
-                        i32.gt_u
-                        i32.or
-                        br_if 0 (;@10;)
-                        local.get $8
-                        i32.const 4
-                        i32.add
-                        local.set $8
-                        local.get $6
-                        local.get $5
-                        local.get $1
-                        i32.add
-                        local.tee $1
-                        i32.gt_u
-                        br_if 1 (;@9;)
-                      end
-                    end
-                    local.get $5
-                    i32.const 0
-                    i32.lt_s
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const -1
-                        local.set $15
-                        br 5 (;@5;)
-                      end
-                    end
-                    local.get $0
-                    i32.const 32
-                    local.get $10
-                    local.get $1
-                    local.get $12
-                    call $24
-                    local.get $1
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const 0
-                        local.set $5
-                        loop $label$292 ;; label = @11
-                          local.get $7
-                          i32.load
-                          local.tee $8
-                          i32.eqz
-                          br_if 3 (;@8;)
-                          local.get $36
-                          local.get $8
-                          call $25
-                          local.tee $8
-                          local.get $5
-                          i32.add
-                          local.tee $5
-                          local.get $1
-                          i32.gt_s
-                          br_if 3 (;@8;)
-                          local.get $0
-                          i32.load
-                          i32.const 32
-                          i32.and
-                          i32.eqz
-                          if ;; label = @12
-                            local.get $36
-                            local.get $8
-                            local.get $0
-                            call $20
-                            drop
-                          end
-                          local.get $7
-                          i32.const 4
-                          i32.add
-                          local.set $7
-                          local.get $5
-                          local.get $1
-                          i32.lt_u
-                          br_if 0 (;@11;)
-                          br 3 (;@8;)
-                        end
-                      end
-                    else
-                      block ;; label = @10
-                        i32.const 0
-                        local.set $1
-                        br 2 (;@8;)
-                      end
-                    end
-                  end
-                  local.get $0
-                  i32.const 32
-                  local.get $10
-                  local.get $1
-                  local.get $12
-                  i32.const 8192
-                  i32.xor
-                  call $24
-                  local.get $10
-                  local.get $1
-                  i32.le_s
-                  if ;; label = @8
-                    local.get $1
-                    local.set $10
-                  end
-                  local.get $11
-                  local.set $1
-                  br 3 (;@4;)
-                end
-                local.get $12
-                i32.const -65537
-                i32.and
-                local.set $1
-                local.get $5
-                i32.const -1
-                i32.gt_s
-                if ;; label = @7
-                  local.get $1
-                  local.set $12
-                end
-                local.get $5
-                local.get $16
-                i64.load
-                i64.const 0
-                i64.ne
-                local.tee $9
-                i32.or
-                if (result i32) ;; label = @7
-                  block (result i32) ;; label = @8
-                    local.get $7
-                    local.set $1
-                    local.get $5
-                    local.get $9
-                    i32.const 1
-                    i32.and
-                    i32.const 1
-                    i32.xor
-                    local.get $38
-                    local.get $7
-                    i32.sub
-                    i32.add
-                    local.tee $7
-                    i32.gt_s
-                    if ;; label = @9
-                      local.get $5
-                      local.set $7
-                    end
-                    local.get $21
-                  end
-                else
-                  block (result i32) ;; label = @8
-                    local.get $21
-                    local.set $1
-                    i32.const 0
-                    local.set $7
-                    local.get $21
-                  end
-                end
-                local.set $5
-              end
-              local.get $0
-              i32.const 32
-              local.get $10
-              local.get $7
-              local.get $5
-              local.get $1
-              i32.sub
-              local.tee $9
-              i32.lt_s
-              if (result i32) ;; label = @6
-                local.get $9
-                local.tee $7
-              else
-                local.get $7
-              end
-              local.get $6
-              i32.add
-              local.tee $5
-              i32.lt_s
-              if (result i32) ;; label = @6
-                local.get $5
-                local.tee $10
-              else
-                local.get $10
-              end
-              local.get $5
-              local.get $12
-              call $24
-              local.get $0
-              i32.load
-              i32.const 32
-              i32.and
-              i32.eqz
-              if ;; label = @6
-                local.get $8
-                local.get $6
-                local.get $0
-                call $20
-                drop
-              end
-              local.get $0
-              i32.const 48
-              local.get $10
-              local.get $5
-              local.get $12
-              i32.const 65536
-              i32.xor
-              call $24
-              local.get $0
-              i32.const 48
-              local.get $7
-              local.get $9
-              i32.const 0
-              call $24
-              local.get $0
-              i32.load
-              i32.const 32
-              i32.and
-              i32.eqz
-              if ;; label = @6
-                local.get $1
-                local.get $9
-                local.get $0
-                call $20
-                drop
-              end
-              local.get $0
-              i32.const 32
-              local.get $10
-              local.get $5
-              local.get $12
-              i32.const 8192
-              i32.xor
-              call $24
-              local.get $11
-              local.set $1
-              br 1 (;@4;)
-            end
-          end
-          br 1 (;@2;)
-        end
-        local.get $0
-        i32.eqz
-        if ;; label = @3
-          local.get $17
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 1
-              local.set $0
-              loop $label$308 ;; label = @6
-                local.get $4
-                local.get $0
-                i32.const 2
-                i32.shl
-                i32.add
-                i32.load
-                local.tee $1
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $3
-                    local.get $0
-                    i32.const 3
-                    i32.shl
-                    i32.add
-                    local.get $1
-                    local.get $2
-                    call $21
-                    local.get $0
-                    i32.const 1
-                    i32.add
-                    local.tee $0
-                    i32.const 10
-                    i32.lt_s
-                    br_if 2 (;@6;)
-                    i32.const 1
-                    local.set $15
-                    br 6 (;@2;)
-                  end
-                end
-              end
-              loop $label$310 ;; label = @6
-                local.get $4
-                local.get $0
-                i32.const 2
-                i32.shl
-                i32.add
-                i32.load
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const -1
-                    local.set $15
-                    br 6 (;@2;)
-                  end
-                end
-                local.get $0
-                i32.const 1
-                i32.add
-                local.tee $0
-                i32.const 10
-                i32.lt_s
-                br_if 0 (;@6;)
-                i32.const 1
-                local.set $15
-              end
-            end
-          else
-            i32.const 0
-            local.set $15
-          end
-        end
-      end
-      local.get $23
-      global.set $global$1
-      local.get $15
-    end
+ )
+ (func $23 (; 36 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (i32.const 0)
+   )
+   (block $label$2
+    (block $label$3
+     (block $label$4
+      (loop $label$5
+       (br_if $label$4
+        (i32.eq
+         (i32.load8_u
+          (i32.add
+           (local.get $1)
+           (i32.const 1702)
+          )
+         )
+         (local.get $0)
+        )
+       )
+       (br_if $label$5
+        (i32.ne
+         (local.tee $1
+          (i32.add
+           (local.get $1)
+           (i32.const 1)
+          )
+         )
+         (i32.const 87)
+        )
+       )
+       (local.set $1
+        (i32.const 87)
+       )
+       (local.set $0
+        (i32.const 1790)
+       )
+       (br $label$3)
+      )
+     )
+     (if
+      (local.get $1)
+      (block
+       (local.set $0
+        (i32.const 1790)
+       )
+       (br $label$3)
+      )
+      (local.set $0
+       (i32.const 1790)
+      )
+     )
+     (br $label$2)
+    )
+    (loop $label$8
+     (local.set $2
+      (local.get $0)
+     )
+     (loop $label$9
+      (local.set $0
+       (i32.add
+        (local.get $2)
+        (i32.const 1)
+       )
+      )
+      (if
+       (i32.load8_s
+        (local.get $2)
+       )
+       (block
+        (local.set $2
+         (local.get $0)
+        )
+        (br $label$9)
+       )
+      )
+     )
+     (br_if $label$8
+      (local.tee $1
+       (i32.add
+        (local.get $1)
+        (i32.const -1)
+       )
+      )
+     )
+    )
+   )
+   (local.get $0)
   )
-  (func $19 (;32;) (type $1) (param $0 i32) (result i32)
-    i32.const 0
+ )
+ (func $24 (; 37 ;) (type $10) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (block $label$1
+   (local.set $7
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 256)
+    )
+   )
+   (local.set $6
+    (local.get $7)
+   )
+   (block $label$2
+    (if
+     (i32.and
+      (i32.gt_s
+       (local.get $2)
+       (local.get $3)
+      )
+      (i32.eqz
+       (i32.and
+        (local.get $4)
+        (i32.const 73728)
+       )
+      )
+     )
+     (block
+      (drop
+       (call $35
+        (local.get $6)
+        (local.get $1)
+        (if (result i32)
+         (i32.gt_u
+          (local.tee $5
+           (i32.sub
+            (local.get $2)
+            (local.get $3)
+           )
+          )
+          (i32.const 256)
+         )
+         (i32.const 256)
+         (local.get $5)
+        )
+       )
+      )
+      (local.set $4
+       (i32.eqz
+        (i32.and
+         (local.tee $1
+          (i32.load
+           (local.get $0)
+          )
+         )
+         (i32.const 32)
+        )
+       )
+      )
+      (if
+       (i32.gt_u
+        (local.get $5)
+        (i32.const 255)
+       )
+       (block
+        (loop $label$7
+         (if
+          (local.get $4)
+          (block
+           (drop
+            (call $20
+             (local.get $6)
+             (i32.const 256)
+             (local.get $0)
+            )
+           )
+           (local.set $1
+            (i32.load
+             (local.get $0)
+            )
+           )
+          )
+         )
+         (local.set $4
+          (i32.eqz
+           (i32.and
+            (local.get $1)
+            (i32.const 32)
+           )
+          )
+         )
+         (br_if $label$7
+          (i32.gt_u
+           (local.tee $5
+            (i32.add
+             (local.get $5)
+             (i32.const -256)
+            )
+           )
+           (i32.const 255)
+          )
+         )
+        )
+        (br_if $label$2
+         (i32.eqz
+          (local.get $4)
+         )
+        )
+        (local.set $5
+         (i32.and
+          (i32.sub
+           (local.get $2)
+           (local.get $3)
+          )
+          (i32.const 255)
+         )
+        )
+       )
+       (br_if $label$2
+        (i32.eqz
+         (local.get $4)
+        )
+       )
+      )
+      (drop
+       (call $20
+        (local.get $6)
+        (local.get $5)
+        (local.get $0)
+       )
+      )
+     )
+    )
+   )
+   (global.set $global$1
+    (local.get $7)
+   )
   )
-  (func $20 (;33;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32)
-    block $label$1 (result i32) ;; label = @1
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          local.get $2
-          i32.const 16
-          i32.add
-          local.tee $4
-          i32.load
-          local.tee $3
-          br_if 0 (;@3;)
-          local.get $2
-          call $29
-          if ;; label = @4
-            i32.const 0
-            local.set $3
-          else
-            block ;; label = @5
-              local.get $4
-              i32.load
-              local.set $3
-              br 2 (;@3;)
-            end
-          end
-          br 1 (;@2;)
-        end
-        local.get $3
-        local.get $2
-        i32.const 20
-        i32.add
-        local.tee $5
-        i32.load
-        local.tee $4
-        i32.sub
-        local.get $1
-        i32.lt_u
-        if ;; label = @3
-          block ;; label = @4
-            local.get $2
-            local.get $0
-            local.get $1
-            local.get $2
-            i32.load offset=36
-            i32.const 3
-            i32.and
-            i32.const 2
-            i32.add
-            call_indirect (type $0)
-            local.set $3
-            br 2 (;@2;)
-          end
-        end
-        block $label$7 (result i32) ;; label = @3
-          local.get $2
-          i32.load8_s offset=75
-          i32.const -1
-          i32.gt_s
-          if (result i32) ;; label = @4
-            block (result i32) ;; label = @5
-              local.get $1
-              local.set $3
-              loop $label$9 ;; label = @6
-                i32.const 0
-                local.get $3
-                i32.eqz
-                br_if 3 (;@3;)
-                drop
-                local.get $0
-                local.get $3
-                i32.const -1
-                i32.add
-                local.tee $6
-                i32.add
-                i32.load8_s
-                i32.const 10
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $6
-                    local.set $3
-                    br 2 (;@6;)
-                  end
-                end
-              end
-              local.get $2
-              local.get $0
-              local.get $3
-              local.get $2
-              i32.load offset=36
-              i32.const 3
-              i32.and
-              i32.const 2
-              i32.add
-              call_indirect (type $0)
-              local.get $3
-              i32.lt_u
-              br_if 3 (;@2;)
-              local.get $5
-              i32.load
-              local.set $4
-              local.get $1
-              local.get $3
-              i32.sub
-              local.set $1
-              local.get $0
-              local.get $3
-              i32.add
-              local.set $0
-              local.get $3
-            end
-          else
-            i32.const 0
-          end
-        end
-        local.set $2
-        local.get $4
-        local.get $0
-        local.get $1
-        call $36
-        drop
-        local.get $5
-        local.get $5
-        i32.load
-        local.get $1
-        i32.add
-        i32.store
-        local.get $2
-        local.get $1
-        i32.add
-        local.set $3
-      end
-      local.get $3
-    end
+ )
+ (func $25 (; 38 ;) (type $4) (param $0 i32) (param $1 i32) (result i32)
+  (if (result i32)
+   (local.get $0)
+   (call $28
+    (local.get $0)
+    (local.get $1)
+    (i32.const 0)
+   )
+   (i32.const 0)
   )
-  (func $21 (;34;) (type $8) (param $0 i32) (param $1 i32) (param $2 i32)
-    (local $3 i32) (local $4 i64) (local $5 f64)
-    block $label$1 ;; label = @1
-      local.get $1
-      i32.const 20
-      i32.le_u
-      if ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            block $label$5 ;; label = @5
-              block $label$6 ;; label = @6
-                block $label$7 ;; label = @7
-                  block $label$8 ;; label = @8
-                    block $label$9 ;; label = @9
-                      block $label$10 ;; label = @10
-                        block $label$11 ;; label = @11
-                          block $label$12 ;; label = @12
-                            block $label$13 ;; label = @13
-                              local.get $1
-                              i32.const 9
-                              i32.sub
-                              br_table 0 (;@13;) 1 (;@12;) 2 (;@11;) 3 (;@10;) 4 (;@9;) 5 (;@8;) 6 (;@7;) 7 (;@6;) 8 (;@5;) 9 (;@4;) 10 (;@3;)
-                            end
-                            local.get $2
-                            i32.load
-                            i32.const 3
-                            i32.add
-                            i32.const -4
-                            i32.and
-                            local.tee $1
-                            i32.load
-                            local.set $3
-                            local.get $2
-                            local.get $1
-                            i32.const 4
-                            i32.add
-                            i32.store
-                            local.get $0
-                            local.get $3
-                            i32.store
-                            br 11 (;@1;)
-                          end
-                          local.get $2
-                          i32.load
-                          i32.const 3
-                          i32.add
-                          i32.const -4
-                          i32.and
-                          local.tee $1
-                          i32.load
-                          local.set $3
-                          local.get $2
-                          local.get $1
-                          i32.const 4
-                          i32.add
-                          i32.store
-                          local.get $0
-                          local.get $3
-                          i64.extend_i32_s
-                          i64.store
-                          br 10 (;@1;)
-                        end
-                        local.get $2
-                        i32.load
-                        i32.const 3
-                        i32.add
-                        i32.const -4
-                        i32.and
-                        local.tee $1
-                        i32.load
-                        local.set $3
-                        local.get $2
-                        local.get $1
-                        i32.const 4
-                        i32.add
-                        i32.store
-                        local.get $0
-                        local.get $3
-                        i64.extend_i32_u
-                        i64.store
-                        br 9 (;@1;)
-                      end
-                      local.get $2
-                      i32.load
-                      i32.const 7
-                      i32.add
-                      i32.const -8
-                      i32.and
-                      local.tee $1
-                      i64.load
-                      local.set $4
-                      local.get $2
-                      local.get $1
-                      i32.const 8
-                      i32.add
-                      i32.store
-                      local.get $0
-                      local.get $4
-                      i64.store
-                      br 8 (;@1;)
-                    end
-                    local.get $2
-                    i32.load
-                    i32.const 3
-                    i32.add
-                    i32.const -4
-                    i32.and
-                    local.tee $1
-                    i32.load
-                    local.set $3
-                    local.get $2
-                    local.get $1
-                    i32.const 4
-                    i32.add
-                    i32.store
-                    local.get $0
-                    local.get $3
-                    i32.const 65535
-                    i32.and
-                    i32.const 16
-                    i32.shl
-                    i32.const 16
-                    i32.shr_s
-                    i64.extend_i32_s
-                    i64.store
-                    br 7 (;@1;)
-                  end
-                  local.get $2
-                  i32.load
-                  i32.const 3
-                  i32.add
-                  i32.const -4
-                  i32.and
-                  local.tee $1
-                  i32.load
-                  local.set $3
-                  local.get $2
-                  local.get $1
-                  i32.const 4
-                  i32.add
-                  i32.store
-                  local.get $0
-                  local.get $3
-                  i32.const 65535
-                  i32.and
-                  i64.extend_i32_u
-                  i64.store
-                  br 6 (;@1;)
-                end
-                local.get $2
-                i32.load
-                i32.const 3
-                i32.add
-                i32.const -4
-                i32.and
-                local.tee $1
-                i32.load
-                local.set $3
-                local.get $2
-                local.get $1
-                i32.const 4
-                i32.add
-                i32.store
-                local.get $0
-                local.get $3
-                i32.const 255
-                i32.and
-                i32.const 24
-                i32.shl
-                i32.const 24
-                i32.shr_s
-                i64.extend_i32_s
-                i64.store
-                br 5 (;@1;)
-              end
-              local.get $2
-              i32.load
-              i32.const 3
-              i32.add
-              i32.const -4
-              i32.and
-              local.tee $1
-              i32.load
-              local.set $3
-              local.get $2
-              local.get $1
-              i32.const 4
-              i32.add
-              i32.store
-              local.get $0
-              local.get $3
-              i32.const 255
-              i32.and
-              i64.extend_i32_u
-              i64.store
-              br 4 (;@1;)
-            end
-            local.get $2
-            i32.load
-            i32.const 7
-            i32.add
-            i32.const -8
-            i32.and
-            local.tee $1
-            f64.load
-            local.set $5
-            local.get $2
-            local.get $1
-            i32.const 8
-            i32.add
-            i32.store
-            local.get $0
-            local.get $5
-            f64.store
-            br 3 (;@1;)
-          end
-          local.get $2
-          i32.load
-          i32.const 7
-          i32.add
-          i32.const -8
-          i32.and
-          local.tee $1
-          f64.load
-          local.set $5
-          local.get $2
-          local.get $1
-          i32.const 8
-          i32.add
-          i32.store
-          local.get $0
-          local.get $5
-          f64.store
-        end
-      end
-    end
+ )
+ (func $26 (; 39 ;) (type $11) (param $0 f64) (param $1 i32) (result f64)
+  (call $27
+   (local.get $0)
+   (local.get $1)
   )
-  (func $22 (;35;) (type $9) (param $0 i64) (param $1 i32) (result i32)
-    (local $2 i32) (local $3 i32) (local $4 i64)
-    block $label$1 (result i32) ;; label = @1
-      local.get $0
-      i32.wrap_i64
-      local.set $2
-      local.get $0
-      i64.const 4294967295
-      i64.gt_u
-      if ;; label = @2
-        block ;; label = @3
-          loop $label$3 ;; label = @4
-            local.get $1
-            i32.const -1
-            i32.add
-            local.tee $1
-            local.get $0
-            i64.const 10
-            i64.rem_u
-            i64.const 48
-            i64.or
-            i64.store8
-            local.get $0
-            i64.const 10
-            i64.div_u
-            local.set $4
-            local.get $0
-            i64.const 42949672959
-            i64.gt_u
-            if ;; label = @5
-              block ;; label = @6
-                local.get $4
-                local.set $0
-                br 2 (;@4;)
-              end
-            end
-          end
-          local.get $4
-          i32.wrap_i64
-          local.set $2
-        end
-      end
-      local.get $2
-      if ;; label = @2
-        loop $label$6 ;; label = @3
-          local.get $1
-          i32.const -1
-          i32.add
-          local.tee $1
-          local.get $2
-          i32.const 10
-          i32.rem_u
-          i32.const 48
-          i32.or
-          i32.store8
-          local.get $2
-          i32.const 10
-          i32.div_u
-          local.set $3
-          local.get $2
-          i32.const 10
-          i32.ge_u
-          if ;; label = @4
-            block ;; label = @5
-              local.get $3
-              local.set $2
-              br 2 (;@3;)
-            end
-          end
-        end
-      end
-      local.get $1
-    end
+ )
+ (func $27 (; 40 ;) (type $11) (param $0 f64) (param $1 i32) (result f64)
+  (local $2 i64)
+  (local $3 i64)
+  (block $label$1 (result f64)
+   (block $label$2
+    (block $label$3
+     (block $label$4
+      (block $label$5
+       (br_table $label$5 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$3 $label$4 $label$3
+        (i32.sub
+         (i32.shr_s
+          (i32.shl
+           (i32.and
+            (i32.and
+             (i32.wrap_i64
+              (local.tee $3
+               (i64.shr_u
+                (local.tee $2
+                 (i64.reinterpret_f64
+                  (local.get $0)
+                 )
+                )
+                (i64.const 52)
+               )
+              )
+             )
+             (i32.const 65535)
+            )
+            (i32.const 2047)
+           )
+           (i32.const 16)
+          )
+          (i32.const 16)
+         )
+         (i32.const 0)
+        )
+       )
+      )
+      (i32.store
+       (local.get $1)
+       (if (result i32)
+        (f64.ne
+         (local.get $0)
+         (f64.const 0)
+        )
+        (block (result i32)
+         (local.set $0
+          (call $27
+           (f64.mul
+            (local.get $0)
+            (f64.const 18446744073709551615)
+           )
+           (local.get $1)
+          )
+         )
+         (i32.add
+          (i32.load
+           (local.get $1)
+          )
+          (i32.const -64)
+         )
+        )
+        (i32.const 0)
+       )
+      )
+      (br $label$2)
+     )
+     (br $label$2)
+    )
+    (i32.store
+     (local.get $1)
+     (i32.add
+      (i32.and
+       (i32.wrap_i64
+        (local.get $3)
+       )
+       (i32.const 2047)
+      )
+      (i32.const -1022)
+     )
+    )
+    (local.set $0
+     (f64.reinterpret_i64
+      (i64.or
+       (i64.and
+        (local.get $2)
+        (i64.const -9218868437227405313)
+       )
+       (i64.const 4602678819172646912)
+      )
+     )
+    )
+   )
+   (local.get $0)
   )
-  (func $23 (;36;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32)
-    block $label$1 (result i32) ;; label = @1
-      i32.const 0
-      local.set $1
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            loop $label$5 ;; label = @5
-              local.get $1
-              i32.const 1702
-              i32.add
-              i32.load8_u
-              local.get $0
-              i32.eq
-              br_if 1 (;@4;)
-              local.get $1
-              i32.const 1
-              i32.add
-              local.tee $1
-              i32.const 87
-              i32.ne
-              br_if 0 (;@5;)
-              i32.const 87
-              local.set $1
-              i32.const 1790
-              local.set $0
-              br 2 (;@3;)
-            end
-          end
-          local.get $1
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 1790
-              local.set $0
-              br 2 (;@3;)
-            end
-          else
-            i32.const 1790
-            local.set $0
-          end
-          br 1 (;@2;)
-        end
-        loop $label$8 ;; label = @3
-          local.get $0
-          local.set $2
-          loop $label$9 ;; label = @4
-            local.get $2
-            i32.const 1
-            i32.add
-            local.set $0
-            local.get $2
-            i32.load8_s
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                local.set $2
-                br 2 (;@4;)
-              end
-            end
-          end
-          local.get $1
-          i32.const -1
-          i32.add
-          local.tee $1
-          br_if 0 (;@3;)
-        end
-      end
-      local.get $0
-    end
+ )
+ (func $28 (; 41 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (block $label$1 (result i32)
+   (if (result i32)
+    (local.get $0)
+    (block (result i32)
+     (if
+      (i32.lt_u
+       (local.get $1)
+       (i32.const 128)
+      )
+      (block
+       (i32.store8
+        (local.get $0)
+        (local.get $1)
+       )
+       (br $label$1
+        (i32.const 1)
+       )
+      )
+     )
+     (if
+      (i32.lt_u
+       (local.get $1)
+       (i32.const 2048)
+      )
+      (block
+       (i32.store8
+        (local.get $0)
+        (i32.or
+         (i32.shr_u
+          (local.get $1)
+          (i32.const 6)
+         )
+         (i32.const 192)
+        )
+       )
+       (i32.store8 offset=1
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (local.get $1)
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (br $label$1
+        (i32.const 2)
+       )
+      )
+     )
+     (if
+      (i32.or
+       (i32.lt_u
+        (local.get $1)
+        (i32.const 55296)
+       )
+       (i32.eq
+        (i32.and
+         (local.get $1)
+         (i32.const -8192)
+        )
+        (i32.const 57344)
+       )
+      )
+      (block
+       (i32.store8
+        (local.get $0)
+        (i32.or
+         (i32.shr_u
+          (local.get $1)
+          (i32.const 12)
+         )
+         (i32.const 224)
+        )
+       )
+       (i32.store8 offset=1
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (i32.shr_u
+           (local.get $1)
+           (i32.const 6)
+          )
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (i32.store8 offset=2
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (local.get $1)
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (br $label$1
+        (i32.const 3)
+       )
+      )
+     )
+     (if (result i32)
+      (i32.lt_u
+       (i32.add
+        (local.get $1)
+        (i32.const -65536)
+       )
+       (i32.const 1048576)
+      )
+      (block (result i32)
+       (i32.store8
+        (local.get $0)
+        (i32.or
+         (i32.shr_u
+          (local.get $1)
+          (i32.const 18)
+         )
+         (i32.const 240)
+        )
+       )
+       (i32.store8 offset=1
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (i32.shr_u
+           (local.get $1)
+           (i32.const 12)
+          )
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (i32.store8 offset=2
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (i32.shr_u
+           (local.get $1)
+           (i32.const 6)
+          )
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (i32.store8 offset=3
+        (local.get $0)
+        (i32.or
+         (i32.and
+          (local.get $1)
+          (i32.const 63)
+         )
+         (i32.const 128)
+        )
+       )
+       (i32.const 4)
+      )
+      (block (result i32)
+       (i32.store
+        (call $11)
+        (i32.const 84)
+       )
+       (i32.const -1)
+      )
+     )
+    )
+    (i32.const 1)
+   )
   )
-  (func $24 (;37;) (type $10) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32)
-    (local $5 i32) (local $6 i32) (local $7 i32)
-    block $label$1 ;; label = @1
-      global.get $global$1
-      local.set $7
-      global.get $global$1
-      i32.const 256
-      i32.add
-      global.set $global$1
-      local.get $7
-      local.set $6
-      block $label$2 ;; label = @2
-        local.get $2
-        local.get $3
-        i32.gt_s
-        local.get $4
-        i32.const 73728
-        i32.and
-        i32.eqz
-        i32.and
-        if ;; label = @3
-          block ;; label = @4
-            local.get $6
-            local.get $1
-            local.get $2
-            local.get $3
-            i32.sub
-            local.tee $5
-            i32.const 256
-            i32.gt_u
-            if (result i32) ;; label = @5
-              i32.const 256
-            else
-              local.get $5
-            end
-            call $35
-            drop
-            local.get $0
-            i32.load
-            local.tee $1
-            i32.const 32
-            i32.and
-            i32.eqz
-            local.set $4
-            local.get $5
-            i32.const 255
-            i32.gt_u
-            if ;; label = @5
-              block ;; label = @6
-                loop $label$7 ;; label = @7
-                  local.get $4
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $6
-                      i32.const 256
-                      local.get $0
-                      call $20
-                      drop
-                      local.get $0
-                      i32.load
-                      local.set $1
-                    end
-                  end
-                  local.get $1
-                  i32.const 32
-                  i32.and
-                  i32.eqz
-                  local.set $4
-                  local.get $5
-                  i32.const -256
-                  i32.add
-                  local.tee $5
-                  i32.const 255
-                  i32.gt_u
-                  br_if 0 (;@7;)
-                end
-                local.get $4
-                i32.eqz
-                br_if 4 (;@2;)
-                local.get $2
-                local.get $3
-                i32.sub
-                i32.const 255
-                i32.and
-                local.set $5
-              end
-            else
-              local.get $4
-              i32.eqz
-              br_if 3 (;@2;)
-            end
-            local.get $6
-            local.get $5
-            local.get $0
-            call $20
-            drop
-          end
-        end
-      end
-      local.get $7
-      global.set $global$1
-    end
+ )
+ (func $29 (; 42 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (i32.load8_s
+     (local.tee $2
+      (i32.add
+       (local.get $0)
+       (i32.const 74)
+      )
+     )
+    )
+   )
+   (i32.store8
+    (local.get $2)
+    (i32.or
+     (i32.add
+      (local.get $1)
+      (i32.const 255)
+     )
+     (local.get $1)
+    )
+   )
+   (local.tee $0
+    (if (result i32)
+     (i32.and
+      (local.tee $1
+       (i32.load
+        (local.get $0)
+       )
+      )
+      (i32.const 8)
+     )
+     (block (result i32)
+      (i32.store
+       (local.get $0)
+       (i32.or
+        (local.get $1)
+        (i32.const 32)
+       )
+      )
+      (i32.const -1)
+     )
+     (block (result i32)
+      (i32.store offset=8
+       (local.get $0)
+       (i32.const 0)
+      )
+      (i32.store offset=4
+       (local.get $0)
+       (i32.const 0)
+      )
+      (i32.store offset=28
+       (local.get $0)
+       (local.tee $1
+        (i32.load offset=44
+         (local.get $0)
+        )
+       )
+      )
+      (i32.store offset=20
+       (local.get $0)
+       (local.get $1)
+      )
+      (i32.store offset=16
+       (local.get $0)
+       (i32.add
+        (local.get $1)
+        (i32.load offset=48
+         (local.get $0)
+        )
+       )
+      )
+      (i32.const 0)
+     )
+    )
+   )
   )
-  (func $25 (;38;) (type $4) (param $0 i32) (param $1 i32) (result i32)
-    local.get $0
-    if (result i32) ;; label = @1
-      local.get $0
-      local.get $1
-      i32.const 0
-      call $28
-    else
-      i32.const 0
-    end
+ )
+ (func $30 (; 43 ;) (type $4) (param $0 i32) (param $1 i32) (result i32)
+  (local $2 i32)
+  (local $3 i32)
+  (block $label$1 (result i32)
+   (local.set $2
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 16)
+    )
+   )
+   (i32.store
+    (local.tee $3
+     (local.get $2)
+    )
+    (local.get $1)
+   )
+   (local.set $0
+    (call $17
+     (i32.load
+      (i32.const 1024)
+     )
+     (local.get $0)
+     (local.get $3)
+    )
+   )
+   (global.set $global$1
+    (local.get $2)
+   )
+   (local.get $0)
   )
-  (func $26 (;39;) (type $11) (param $0 f64) (param $1 i32) (result f64)
-    local.get $0
-    local.get $1
-    call $27
+ )
+ (func $31 (; 44 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (local $15 i32)
+  (local $16 i32)
+  (local $17 i32)
+  (local $18 i32)
+  (local $19 i32)
+  (local $20 i32)
+  (local $21 i32)
+  (block $label$1 (result i32)
+   (local.set $14
+    (global.get $global$1)
+   )
+   (global.set $global$1
+    (i32.add
+     (global.get $global$1)
+     (i32.const 16)
+    )
+   )
+   (local.set $18
+    (local.get $14)
+   )
+   (block $label$2
+    (if
+     (i32.lt_u
+      (local.get $0)
+      (i32.const 245)
+     )
+     (block
+      (local.set $3
+       (i32.and
+        (i32.add
+         (local.get $0)
+         (i32.const 11)
+        )
+        (i32.const -8)
+       )
+      )
+      (if
+       (i32.and
+        (local.tee $0
+         (i32.shr_u
+          (local.tee $8
+           (i32.load
+            (i32.const 3644)
+           )
+          )
+          (local.tee $2
+           (i32.shr_u
+            (if (result i32)
+             (i32.lt_u
+              (local.get $0)
+              (i32.const 11)
+             )
+             (local.tee $3
+              (i32.const 16)
+             )
+             (local.get $3)
+            )
+            (i32.const 3)
+           )
+          )
+         )
+        )
+        (i32.const 3)
+       )
+       (block
+        (local.set $4
+         (i32.load
+          (local.tee $1
+           (i32.add
+            (local.tee $7
+             (i32.load
+              (local.tee $3
+               (i32.add
+                (local.tee $2
+                 (i32.add
+                  (i32.shl
+                   (i32.shl
+                    (local.tee $5
+                     (i32.add
+                      (i32.xor
+                       (i32.and
+                        (local.get $0)
+                        (i32.const 1)
+                       )
+                       (i32.const 1)
+                      )
+                      (local.get $2)
+                     )
+                    )
+                    (i32.const 1)
+                   )
+                   (i32.const 2)
+                  )
+                  (i32.const 3684)
+                 )
+                )
+                (i32.const 8)
+               )
+              )
+             )
+            )
+            (i32.const 8)
+           )
+          )
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $2)
+          (local.get $4)
+         )
+         (i32.store
+          (i32.const 3644)
+          (i32.and
+           (local.get $8)
+           (i32.xor
+            (i32.shl
+             (i32.const 1)
+             (local.get $5)
+            )
+            (i32.const -1)
+           )
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $4)
+            (i32.load
+             (i32.const 3660)
+            )
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.eq
+            (i32.load
+             (local.tee $0
+              (i32.add
+               (local.get $4)
+               (i32.const 12)
+              )
+             )
+            )
+            (local.get $7)
+           )
+           (block
+            (i32.store
+             (local.get $0)
+             (local.get $2)
+            )
+            (i32.store
+             (local.get $3)
+             (local.get $4)
+            )
+           )
+           (call $fimport$10)
+          )
+         )
+        )
+        (i32.store offset=4
+         (local.get $7)
+         (i32.or
+          (local.tee $0
+           (i32.shl
+            (local.get $5)
+            (i32.const 3)
+           )
+          )
+          (i32.const 3)
+         )
+        )
+        (i32.store
+         (local.tee $0
+          (i32.add
+           (i32.add
+            (local.get $7)
+            (local.get $0)
+           )
+           (i32.const 4)
+          )
+         )
+         (i32.or
+          (i32.load
+           (local.get $0)
+          )
+          (i32.const 1)
+         )
+        )
+        (global.set $global$1
+         (local.get $14)
+        )
+        (return
+         (local.get $1)
+        )
+       )
+      )
+      (if
+       (i32.gt_u
+        (local.get $3)
+        (local.tee $16
+         (i32.load
+          (i32.const 3652)
+         )
+        )
+       )
+       (block
+        (if
+         (local.get $0)
+         (block
+          (local.set $5
+           (i32.and
+            (i32.shr_u
+             (local.tee $0
+              (i32.add
+               (i32.and
+                (local.tee $0
+                 (i32.and
+                  (i32.shl
+                   (local.get $0)
+                   (local.get $2)
+                  )
+                  (i32.or
+                   (local.tee $0
+                    (i32.shl
+                     (i32.const 2)
+                     (local.get $2)
+                    )
+                   )
+                   (i32.sub
+                    (i32.const 0)
+                    (local.get $0)
+                   )
+                  )
+                 )
+                )
+                (i32.sub
+                 (i32.const 0)
+                 (local.get $0)
+                )
+               )
+               (i32.const -1)
+              )
+             )
+             (i32.const 12)
+            )
+            (i32.const 16)
+           )
+          )
+          (local.set $12
+           (i32.load
+            (local.tee $5
+             (i32.add
+              (local.tee $9
+               (i32.load
+                (local.tee $2
+                 (i32.add
+                  (local.tee $4
+                   (i32.add
+                    (i32.shl
+                     (i32.shl
+                      (local.tee $11
+                       (i32.add
+                        (i32.or
+                         (i32.or
+                          (i32.or
+                           (i32.or
+                            (local.tee $0
+                             (i32.and
+                              (i32.shr_u
+                               (local.tee $2
+                                (i32.shr_u
+                                 (local.get $0)
+                                 (local.get $5)
+                                )
+                               )
+                               (i32.const 5)
+                              )
+                              (i32.const 8)
+                             )
+                            )
+                            (local.get $5)
+                           )
+                           (local.tee $0
+                            (i32.and
+                             (i32.shr_u
+                              (local.tee $2
+                               (i32.shr_u
+                                (local.get $2)
+                                (local.get $0)
+                               )
+                              )
+                              (i32.const 2)
+                             )
+                             (i32.const 4)
+                            )
+                           )
+                          )
+                          (local.tee $0
+                           (i32.and
+                            (i32.shr_u
+                             (local.tee $2
+                              (i32.shr_u
+                               (local.get $2)
+                               (local.get $0)
+                              )
+                             )
+                             (i32.const 1)
+                            )
+                            (i32.const 2)
+                           )
+                          )
+                         )
+                         (local.tee $0
+                          (i32.and
+                           (i32.shr_u
+                            (local.tee $2
+                             (i32.shr_u
+                              (local.get $2)
+                              (local.get $0)
+                             )
+                            )
+                            (i32.const 1)
+                           )
+                           (i32.const 1)
+                          )
+                         )
+                        )
+                        (i32.shr_u
+                         (local.get $2)
+                         (local.get $0)
+                        )
+                       )
+                      )
+                      (i32.const 1)
+                     )
+                     (i32.const 2)
+                    )
+                    (i32.const 3684)
+                   )
+                  )
+                  (i32.const 8)
+                 )
+                )
+               )
+              )
+              (i32.const 8)
+             )
+            )
+           )
+          )
+          (if
+           (i32.eq
+            (local.get $4)
+            (local.get $12)
+           )
+           (i32.store
+            (i32.const 3644)
+            (local.tee $7
+             (i32.and
+              (local.get $8)
+              (i32.xor
+               (i32.shl
+                (i32.const 1)
+                (local.get $11)
+               )
+               (i32.const -1)
+              )
+             )
+            )
+           )
+           (block
+            (if
+             (i32.lt_u
+              (local.get $12)
+              (i32.load
+               (i32.const 3660)
+              )
+             )
+             (call $fimport$10)
+            )
+            (if
+             (i32.eq
+              (i32.load
+               (local.tee $0
+                (i32.add
+                 (local.get $12)
+                 (i32.const 12)
+                )
+               )
+              )
+              (local.get $9)
+             )
+             (block
+              (i32.store
+               (local.get $0)
+               (local.get $4)
+              )
+              (i32.store
+               (local.get $2)
+               (local.get $12)
+              )
+              (local.set $7
+               (local.get $8)
+              )
+             )
+             (call $fimport$10)
+            )
+           )
+          )
+          (i32.store offset=4
+           (local.get $9)
+           (i32.or
+            (local.get $3)
+            (i32.const 3)
+           )
+          )
+          (i32.store offset=4
+           (local.tee $4
+            (i32.add
+             (local.get $9)
+             (local.get $3)
+            )
+           )
+           (i32.or
+            (local.tee $11
+             (i32.sub
+              (i32.shl
+               (local.get $11)
+               (i32.const 3)
+              )
+              (local.get $3)
+             )
+            )
+            (i32.const 1)
+           )
+          )
+          (i32.store
+           (i32.add
+            (local.get $4)
+            (local.get $11)
+           )
+           (local.get $11)
+          )
+          (if
+           (local.get $16)
+           (block
+            (local.set $9
+             (i32.load
+              (i32.const 3664)
+             )
+            )
+            (local.set $2
+             (i32.add
+              (i32.shl
+               (i32.shl
+                (local.tee $0
+                 (i32.shr_u
+                  (local.get $16)
+                  (i32.const 3)
+                 )
+                )
+                (i32.const 1)
+               )
+               (i32.const 2)
+              )
+              (i32.const 3684)
+             )
+            )
+            (if
+             (i32.and
+              (local.get $7)
+              (local.tee $0
+               (i32.shl
+                (i32.const 1)
+                (local.get $0)
+               )
+              )
+             )
+             (if
+              (i32.lt_u
+               (local.tee $0
+                (i32.load
+                 (local.tee $3
+                  (i32.add
+                   (local.get $2)
+                   (i32.const 8)
+                  )
+                 )
+                )
+               )
+               (i32.load
+                (i32.const 3660)
+               )
+              )
+              (call $fimport$10)
+              (block
+               (local.set $6
+                (local.get $3)
+               )
+               (local.set $1
+                (local.get $0)
+               )
+              )
+             )
+             (block
+              (i32.store
+               (i32.const 3644)
+               (i32.or
+                (local.get $7)
+                (local.get $0)
+               )
+              )
+              (local.set $6
+               (i32.add
+                (local.get $2)
+                (i32.const 8)
+               )
+              )
+              (local.set $1
+               (local.get $2)
+              )
+             )
+            )
+            (i32.store
+             (local.get $6)
+             (local.get $9)
+            )
+            (i32.store offset=12
+             (local.get $1)
+             (local.get $9)
+            )
+            (i32.store offset=8
+             (local.get $9)
+             (local.get $1)
+            )
+            (i32.store offset=12
+             (local.get $9)
+             (local.get $2)
+            )
+           )
+          )
+          (i32.store
+           (i32.const 3652)
+           (local.get $11)
+          )
+          (i32.store
+           (i32.const 3664)
+           (local.get $4)
+          )
+          (global.set $global$1
+           (local.get $14)
+          )
+          (return
+           (local.get $5)
+          )
+         )
+        )
+        (if
+         (local.tee $6
+          (i32.load
+           (i32.const 3648)
+          )
+         )
+         (block
+          (local.set $2
+           (i32.and
+            (i32.shr_u
+             (local.tee $0
+              (i32.add
+               (i32.and
+                (local.get $6)
+                (i32.sub
+                 (i32.const 0)
+                 (local.get $6)
+                )
+               )
+               (i32.const -1)
+              )
+             )
+             (i32.const 12)
+            )
+            (i32.const 16)
+           )
+          )
+          (local.set $9
+           (i32.sub
+            (i32.and
+             (i32.load offset=4
+              (local.tee $2
+               (i32.load
+                (i32.add
+                 (i32.shl
+                  (i32.add
+                   (i32.or
+                    (i32.or
+                     (i32.or
+                      (i32.or
+                       (local.tee $0
+                        (i32.and
+                         (i32.shr_u
+                          (local.tee $1
+                           (i32.shr_u
+                            (local.get $0)
+                            (local.get $2)
+                           )
+                          )
+                          (i32.const 5)
+                         )
+                         (i32.const 8)
+                        )
+                       )
+                       (local.get $2)
+                      )
+                      (local.tee $0
+                       (i32.and
+                        (i32.shr_u
+                         (local.tee $1
+                          (i32.shr_u
+                           (local.get $1)
+                           (local.get $0)
+                          )
+                         )
+                         (i32.const 2)
+                        )
+                        (i32.const 4)
+                       )
+                      )
+                     )
+                     (local.tee $0
+                      (i32.and
+                       (i32.shr_u
+                        (local.tee $1
+                         (i32.shr_u
+                          (local.get $1)
+                          (local.get $0)
+                         )
+                        )
+                        (i32.const 1)
+                       )
+                       (i32.const 2)
+                      )
+                     )
+                    )
+                    (local.tee $0
+                     (i32.and
+                      (i32.shr_u
+                       (local.tee $1
+                        (i32.shr_u
+                         (local.get $1)
+                         (local.get $0)
+                        )
+                       )
+                       (i32.const 1)
+                      )
+                      (i32.const 1)
+                     )
+                    )
+                   )
+                   (i32.shr_u
+                    (local.get $1)
+                    (local.get $0)
+                   )
+                  )
+                  (i32.const 2)
+                 )
+                 (i32.const 3948)
+                )
+               )
+              )
+             )
+             (i32.const -8)
+            )
+            (local.get $3)
+           )
+          )
+          (local.set $1
+           (local.get $2)
+          )
+          (loop $label$25
+           (block $label$26
+            (if
+             (i32.eqz
+              (local.tee $0
+               (i32.load offset=16
+                (local.get $1)
+               )
+              )
+             )
+             (br_if $label$26
+              (i32.eqz
+               (local.tee $0
+                (i32.load offset=20
+                 (local.get $1)
+                )
+               )
+              )
+             )
+            )
+            (if
+             (local.tee $7
+              (i32.lt_u
+               (local.tee $1
+                (i32.sub
+                 (i32.and
+                  (i32.load offset=4
+                   (local.get $0)
+                  )
+                  (i32.const -8)
+                 )
+                 (local.get $3)
+                )
+               )
+               (local.get $9)
+              )
+             )
+             (local.set $9
+              (local.get $1)
+             )
+            )
+            (local.set $1
+             (local.get $0)
+            )
+            (if
+             (local.get $7)
+             (local.set $2
+              (local.get $0)
+             )
+            )
+            (br $label$25)
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.get $2)
+            (local.tee $12
+             (i32.load
+              (i32.const 3660)
+             )
+            )
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.ge_u
+            (local.get $2)
+            (local.tee $13
+             (i32.add
+              (local.get $2)
+              (local.get $3)
+             )
+            )
+           )
+           (call $fimport$10)
+          )
+          (local.set $15
+           (i32.load offset=24
+            (local.get $2)
+           )
+          )
+          (block $label$32
+           (if
+            (i32.eq
+             (local.tee $0
+              (i32.load offset=12
+               (local.get $2)
+              )
+             )
+             (local.get $2)
+            )
+            (block
+             (if
+              (i32.eqz
+               (local.tee $0
+                (i32.load
+                 (local.tee $1
+                  (i32.add
+                   (local.get $2)
+                   (i32.const 20)
+                  )
+                 )
+                )
+               )
+              )
+              (if
+               (i32.eqz
+                (local.tee $0
+                 (i32.load
+                  (local.tee $1
+                   (i32.add
+                    (local.get $2)
+                    (i32.const 16)
+                   )
+                  )
+                 )
+                )
+               )
+               (block
+                (local.set $4
+                 (i32.const 0)
+                )
+                (br $label$32)
+               )
+              )
+             )
+             (loop $label$36
+              (if
+               (local.tee $7
+                (i32.load
+                 (local.tee $11
+                  (i32.add
+                   (local.get $0)
+                   (i32.const 20)
+                  )
+                 )
+                )
+               )
+               (block
+                (local.set $0
+                 (local.get $7)
+                )
+                (local.set $1
+                 (local.get $11)
+                )
+                (br $label$36)
+               )
+              )
+              (if
+               (local.tee $7
+                (i32.load
+                 (local.tee $11
+                  (i32.add
+                   (local.get $0)
+                   (i32.const 16)
+                  )
+                 )
+                )
+               )
+               (block
+                (local.set $0
+                 (local.get $7)
+                )
+                (local.set $1
+                 (local.get $11)
+                )
+                (br $label$36)
+               )
+              )
+             )
+             (if
+              (i32.lt_u
+               (local.get $1)
+               (local.get $12)
+              )
+              (call $fimport$10)
+              (block
+               (i32.store
+                (local.get $1)
+                (i32.const 0)
+               )
+               (local.set $4
+                (local.get $0)
+               )
+              )
+             )
+            )
+            (block
+             (if
+              (i32.lt_u
+               (local.tee $11
+                (i32.load offset=8
+                 (local.get $2)
+                )
+               )
+               (local.get $12)
+              )
+              (call $fimport$10)
+             )
+             (if
+              (i32.ne
+               (i32.load
+                (local.tee $7
+                 (i32.add
+                  (local.get $11)
+                  (i32.const 12)
+                 )
+                )
+               )
+               (local.get $2)
+              )
+              (call $fimport$10)
+             )
+             (if
+              (i32.eq
+               (i32.load
+                (local.tee $1
+                 (i32.add
+                  (local.get $0)
+                  (i32.const 8)
+                 )
+                )
+               )
+               (local.get $2)
+              )
+              (block
+               (i32.store
+                (local.get $7)
+                (local.get $0)
+               )
+               (i32.store
+                (local.get $1)
+                (local.get $11)
+               )
+               (local.set $4
+                (local.get $0)
+               )
+              )
+              (call $fimport$10)
+             )
+            )
+           )
+          )
+          (block $label$46
+           (if
+            (local.get $15)
+            (block
+             (if
+              (i32.eq
+               (local.get $2)
+               (i32.load
+                (local.tee $0
+                 (i32.add
+                  (i32.shl
+                   (local.tee $1
+                    (i32.load offset=28
+                     (local.get $2)
+                    )
+                   )
+                   (i32.const 2)
+                  )
+                  (i32.const 3948)
+                 )
+                )
+               )
+              )
+              (block
+               (i32.store
+                (local.get $0)
+                (local.get $4)
+               )
+               (if
+                (i32.eqz
+                 (local.get $4)
+                )
+                (block
+                 (i32.store
+                  (i32.const 3648)
+                  (i32.and
+                   (local.get $6)
+                   (i32.xor
+                    (i32.shl
+                     (i32.const 1)
+                     (local.get $1)
+                    )
+                    (i32.const -1)
+                   )
+                  )
+                 )
+                 (br $label$46)
+                )
+               )
+              )
+              (block
+               (if
+                (i32.lt_u
+                 (local.get $15)
+                 (i32.load
+                  (i32.const 3660)
+                 )
+                )
+                (call $fimport$10)
+               )
+               (if
+                (i32.eq
+                 (i32.load
+                  (local.tee $0
+                   (i32.add
+                    (local.get $15)
+                    (i32.const 16)
+                   )
+                  )
+                 )
+                 (local.get $2)
+                )
+                (i32.store
+                 (local.get $0)
+                 (local.get $4)
+                )
+                (i32.store offset=20
+                 (local.get $15)
+                 (local.get $4)
+                )
+               )
+               (br_if $label$46
+                (i32.eqz
+                 (local.get $4)
+                )
+               )
+              )
+             )
+             (if
+              (i32.lt_u
+               (local.get $4)
+               (local.tee $0
+                (i32.load
+                 (i32.const 3660)
+                )
+               )
+              )
+              (call $fimport$10)
+             )
+             (i32.store offset=24
+              (local.get $4)
+              (local.get $15)
+             )
+             (if
+              (local.tee $1
+               (i32.load offset=16
+                (local.get $2)
+               )
+              )
+              (if
+               (i32.lt_u
+                (local.get $1)
+                (local.get $0)
+               )
+               (call $fimport$10)
+               (block
+                (i32.store offset=16
+                 (local.get $4)
+                 (local.get $1)
+                )
+                (i32.store offset=24
+                 (local.get $1)
+                 (local.get $4)
+                )
+               )
+              )
+             )
+             (if
+              (local.tee $0
+               (i32.load offset=20
+                (local.get $2)
+               )
+              )
+              (if
+               (i32.lt_u
+                (local.get $0)
+                (i32.load
+                 (i32.const 3660)
+                )
+               )
+               (call $fimport$10)
+               (block
+                (i32.store offset=20
+                 (local.get $4)
+                 (local.get $0)
+                )
+                (i32.store offset=24
+                 (local.get $0)
+                 (local.get $4)
+                )
+               )
+              )
+             )
+            )
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.get $9)
+            (i32.const 16)
+           )
+           (block
+            (i32.store offset=4
+             (local.get $2)
+             (i32.or
+              (local.tee $0
+               (i32.add
+                (local.get $9)
+                (local.get $3)
+               )
+              )
+              (i32.const 3)
+             )
+            )
+            (i32.store
+             (local.tee $0
+              (i32.add
+               (i32.add
+                (local.get $2)
+                (local.get $0)
+               )
+               (i32.const 4)
+              )
+             )
+             (i32.or
+              (i32.load
+               (local.get $0)
+              )
+              (i32.const 1)
+             )
+            )
+           )
+           (block
+            (i32.store offset=4
+             (local.get $2)
+             (i32.or
+              (local.get $3)
+              (i32.const 3)
+             )
+            )
+            (i32.store offset=4
+             (local.get $13)
+             (i32.or
+              (local.get $9)
+              (i32.const 1)
+             )
+            )
+            (i32.store
+             (i32.add
+              (local.get $13)
+              (local.get $9)
+             )
+             (local.get $9)
+            )
+            (if
+             (local.get $16)
+             (block
+              (local.set $7
+               (i32.load
+                (i32.const 3664)
+               )
+              )
+              (local.set $3
+               (i32.add
+                (i32.shl
+                 (i32.shl
+                  (local.tee $0
+                   (i32.shr_u
+                    (local.get $16)
+                    (i32.const 3)
+                   )
+                  )
+                  (i32.const 1)
+                 )
+                 (i32.const 2)
+                )
+                (i32.const 3684)
+               )
+              )
+              (if
+               (i32.and
+                (local.get $8)
+                (local.tee $0
+                 (i32.shl
+                  (i32.const 1)
+                  (local.get $0)
+                 )
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.tee $0
+                  (i32.load
+                   (local.tee $1
+                    (i32.add
+                     (local.get $3)
+                     (i32.const 8)
+                    )
+                   )
+                  )
+                 )
+                 (i32.load
+                  (i32.const 3660)
+                 )
+                )
+                (call $fimport$10)
+                (block
+                 (local.set $10
+                  (local.get $1)
+                 )
+                 (local.set $5
+                  (local.get $0)
+                 )
+                )
+               )
+               (block
+                (i32.store
+                 (i32.const 3644)
+                 (i32.or
+                  (local.get $8)
+                  (local.get $0)
+                 )
+                )
+                (local.set $10
+                 (i32.add
+                  (local.get $3)
+                  (i32.const 8)
+                 )
+                )
+                (local.set $5
+                 (local.get $3)
+                )
+               )
+              )
+              (i32.store
+               (local.get $10)
+               (local.get $7)
+              )
+              (i32.store offset=12
+               (local.get $5)
+               (local.get $7)
+              )
+              (i32.store offset=8
+               (local.get $7)
+               (local.get $5)
+              )
+              (i32.store offset=12
+               (local.get $7)
+               (local.get $3)
+              )
+             )
+            )
+            (i32.store
+             (i32.const 3652)
+             (local.get $9)
+            )
+            (i32.store
+             (i32.const 3664)
+             (local.get $13)
+            )
+           )
+          )
+          (global.set $global$1
+           (local.get $14)
+          )
+          (return
+           (i32.add
+            (local.get $2)
+            (i32.const 8)
+           )
+          )
+         )
+         (local.set $0
+          (local.get $3)
+         )
+        )
+       )
+       (local.set $0
+        (local.get $3)
+       )
+      )
+     )
+     (if
+      (i32.gt_u
+       (local.get $0)
+       (i32.const -65)
+      )
+      (local.set $0
+       (i32.const -1)
+      )
+      (block
+       (local.set $7
+        (i32.and
+         (local.tee $0
+          (i32.add
+           (local.get $0)
+           (i32.const 11)
+          )
+         )
+         (i32.const -8)
+        )
+       )
+       (if
+        (local.tee $5
+         (i32.load
+          (i32.const 3648)
+         )
+        )
+        (block
+         (local.set $17
+          (if (result i32)
+           (local.tee $0
+            (i32.shr_u
+             (local.get $0)
+             (i32.const 8)
+            )
+           )
+           (if (result i32)
+            (i32.gt_u
+             (local.get $7)
+             (i32.const 16777215)
+            )
+            (i32.const 31)
+            (i32.or
+             (i32.and
+              (i32.shr_u
+               (local.get $7)
+               (i32.add
+                (local.tee $0
+                 (i32.add
+                  (i32.sub
+                   (i32.const 14)
+                   (i32.or
+                    (i32.or
+                     (local.tee $0
+                      (i32.and
+                       (i32.shr_u
+                        (i32.add
+                         (local.tee $1
+                          (i32.shl
+                           (local.get $0)
+                           (local.tee $3
+                            (i32.and
+                             (i32.shr_u
+                              (i32.add
+                               (local.get $0)
+                               (i32.const 1048320)
+                              )
+                              (i32.const 16)
+                             )
+                             (i32.const 8)
+                            )
+                           )
+                          )
+                         )
+                         (i32.const 520192)
+                        )
+                        (i32.const 16)
+                       )
+                       (i32.const 4)
+                      )
+                     )
+                     (local.get $3)
+                    )
+                    (local.tee $0
+                     (i32.and
+                      (i32.shr_u
+                       (i32.add
+                        (local.tee $1
+                         (i32.shl
+                          (local.get $1)
+                          (local.get $0)
+                         )
+                        )
+                        (i32.const 245760)
+                       )
+                       (i32.const 16)
+                      )
+                      (i32.const 2)
+                     )
+                    )
+                   )
+                  )
+                  (i32.shr_u
+                   (i32.shl
+                    (local.get $1)
+                    (local.get $0)
+                   )
+                   (i32.const 15)
+                  )
+                 )
+                )
+                (i32.const 7)
+               )
+              )
+              (i32.const 1)
+             )
+             (i32.shl
+              (local.get $0)
+              (i32.const 1)
+             )
+            )
+           )
+           (i32.const 0)
+          )
+         )
+         (local.set $3
+          (i32.sub
+           (i32.const 0)
+           (local.get $7)
+          )
+         )
+         (block $label$78
+          (block $label$79
+           (block $label$80
+            (if
+             (local.tee $1
+              (i32.load
+               (i32.add
+                (i32.shl
+                 (local.get $17)
+                 (i32.const 2)
+                )
+                (i32.const 3948)
+               )
+              )
+             )
+             (block
+              (local.set $0
+               (i32.sub
+                (i32.const 25)
+                (i32.shr_u
+                 (local.get $17)
+                 (i32.const 1)
+                )
+               )
+              )
+              (local.set $4
+               (i32.const 0)
+              )
+              (local.set $10
+               (i32.shl
+                (local.get $7)
+                (if (result i32)
+                 (i32.eq
+                  (local.get $17)
+                  (i32.const 31)
+                 )
+                 (i32.const 0)
+                 (local.get $0)
+                )
+               )
+              )
+              (local.set $0
+               (i32.const 0)
+              )
+              (loop $label$84
+               (if
+                (i32.lt_u
+                 (local.tee $6
+                  (i32.sub
+                   (i32.and
+                    (i32.load offset=4
+                     (local.get $1)
+                    )
+                    (i32.const -8)
+                   )
+                   (local.get $7)
+                  )
+                 )
+                 (local.get $3)
+                )
+                (if
+                 (local.get $6)
+                 (block
+                  (local.set $3
+                   (local.get $6)
+                  )
+                  (local.set $0
+                   (local.get $1)
+                  )
+                 )
+                 (block
+                  (local.set $3
+                   (i32.const 0)
+                  )
+                  (local.set $0
+                   (local.get $1)
+                  )
+                  (br $label$79)
+                 )
+                )
+               )
+               (local.set $1
+                (if (result i32)
+                 (i32.or
+                  (i32.eqz
+                   (local.tee $19
+                    (i32.load offset=20
+                     (local.get $1)
+                    )
+                   )
+                  )
+                  (i32.eq
+                   (local.get $19)
+                   (local.tee $6
+                    (i32.load
+                     (i32.add
+                      (i32.add
+                       (local.get $1)
+                       (i32.const 16)
+                      )
+                      (i32.shl
+                       (i32.shr_u
+                        (local.get $10)
+                        (i32.const 31)
+                       )
+                       (i32.const 2)
+                      )
+                     )
+                    )
+                   )
+                  )
+                 )
+                 (local.get $4)
+                 (local.get $19)
+                )
+               )
+               (local.set $10
+                (i32.shl
+                 (local.get $10)
+                 (i32.xor
+                  (i32.and
+                   (local.tee $4
+                    (i32.eqz
+                     (local.get $6)
+                    )
+                   )
+                   (i32.const 1)
+                  )
+                  (i32.const 1)
+                 )
+                )
+               )
+               (if
+                (local.get $4)
+                (block
+                 (local.set $4
+                  (local.get $1)
+                 )
+                 (local.set $1
+                  (local.get $0)
+                 )
+                 (br $label$80)
+                )
+                (block
+                 (local.set $4
+                  (local.get $1)
+                 )
+                 (local.set $1
+                  (local.get $6)
+                 )
+                 (br $label$84)
+                )
+               )
+              )
+             )
+             (block
+              (local.set $4
+               (i32.const 0)
+              )
+              (local.set $1
+               (i32.const 0)
+              )
+             )
+            )
+           )
+           (br_if $label$79
+            (local.tee $0
+             (if (result i32)
+              (i32.and
+               (i32.eqz
+                (local.get $4)
+               )
+               (i32.eqz
+                (local.get $1)
+               )
+              )
+              (block (result i32)
+               (if
+                (i32.eqz
+                 (local.tee $0
+                  (i32.and
+                   (local.get $5)
+                   (i32.or
+                    (local.tee $0
+                     (i32.shl
+                      (i32.const 2)
+                      (local.get $17)
+                     )
+                    )
+                    (i32.sub
+                     (i32.const 0)
+                     (local.get $0)
+                    )
+                   )
+                  )
+                 )
+                )
+                (block
+                 (local.set $0
+                  (local.get $7)
+                 )
+                 (br $label$2)
+                )
+               )
+               (local.set $10
+                (i32.and
+                 (i32.shr_u
+                  (local.tee $0
+                   (i32.add
+                    (i32.and
+                     (local.get $0)
+                     (i32.sub
+                      (i32.const 0)
+                      (local.get $0)
+                     )
+                    )
+                    (i32.const -1)
+                   )
+                  )
+                  (i32.const 12)
+                 )
+                 (i32.const 16)
+                )
+               )
+               (i32.load
+                (i32.add
+                 (i32.shl
+                  (i32.add
+                   (i32.or
+                    (i32.or
+                     (i32.or
+                      (i32.or
+                       (local.tee $0
+                        (i32.and
+                         (i32.shr_u
+                          (local.tee $4
+                           (i32.shr_u
+                            (local.get $0)
+                            (local.get $10)
+                           )
+                          )
+                          (i32.const 5)
+                         )
+                         (i32.const 8)
+                        )
+                       )
+                       (local.get $10)
+                      )
+                      (local.tee $0
+                       (i32.and
+                        (i32.shr_u
+                         (local.tee $4
+                          (i32.shr_u
+                           (local.get $4)
+                           (local.get $0)
+                          )
+                         )
+                         (i32.const 2)
+                        )
+                        (i32.const 4)
+                       )
+                      )
+                     )
+                     (local.tee $0
+                      (i32.and
+                       (i32.shr_u
+                        (local.tee $4
+                         (i32.shr_u
+                          (local.get $4)
+                          (local.get $0)
+                         )
+                        )
+                        (i32.const 1)
+                       )
+                       (i32.const 2)
+                      )
+                     )
+                    )
+                    (local.tee $0
+                     (i32.and
+                      (i32.shr_u
+                       (local.tee $4
+                        (i32.shr_u
+                         (local.get $4)
+                         (local.get $0)
+                        )
+                       )
+                       (i32.const 1)
+                      )
+                      (i32.const 1)
+                     )
+                    )
+                   )
+                   (i32.shr_u
+                    (local.get $4)
+                    (local.get $0)
+                   )
+                  )
+                  (i32.const 2)
+                 )
+                 (i32.const 3948)
+                )
+               )
+              )
+              (local.get $4)
+             )
+            )
+           )
+           (local.set $4
+            (local.get $1)
+           )
+           (br $label$78)
+          )
+          (loop $label$96
+           (if
+            (local.tee $10
+             (i32.lt_u
+              (local.tee $4
+               (i32.sub
+                (i32.and
+                 (i32.load offset=4
+                  (local.get $0)
+                 )
+                 (i32.const -8)
+                )
+                (local.get $7)
+               )
+              )
+              (local.get $3)
+             )
+            )
+            (local.set $3
+             (local.get $4)
+            )
+           )
+           (if
+            (local.get $10)
+            (local.set $1
+             (local.get $0)
+            )
+           )
+           (if
+            (local.tee $4
+             (i32.load offset=16
+              (local.get $0)
+             )
+            )
+            (block
+             (local.set $0
+              (local.get $4)
+             )
+             (br $label$96)
+            )
+           )
+           (br_if $label$96
+            (local.tee $0
+             (i32.load offset=20
+              (local.get $0)
+             )
+            )
+           )
+           (local.set $4
+            (local.get $1)
+           )
+          )
+         )
+         (if
+          (local.get $4)
+          (if
+           (i32.lt_u
+            (local.get $3)
+            (i32.sub
+             (i32.load
+              (i32.const 3652)
+             )
+             (local.get $7)
+            )
+           )
+           (block
+            (if
+             (i32.lt_u
+              (local.get $4)
+              (local.tee $12
+               (i32.load
+                (i32.const 3660)
+               )
+              )
+             )
+             (call $fimport$10)
+            )
+            (if
+             (i32.ge_u
+              (local.get $4)
+              (local.tee $6
+               (i32.add
+                (local.get $4)
+                (local.get $7)
+               )
+              )
+             )
+             (call $fimport$10)
+            )
+            (local.set $10
+             (i32.load offset=24
+              (local.get $4)
+             )
+            )
+            (block $label$104
+             (if
+              (i32.eq
+               (local.tee $0
+                (i32.load offset=12
+                 (local.get $4)
+                )
+               )
+               (local.get $4)
+              )
+              (block
+               (if
+                (i32.eqz
+                 (local.tee $0
+                  (i32.load
+                   (local.tee $1
+                    (i32.add
+                     (local.get $4)
+                     (i32.const 20)
+                    )
+                   )
+                  )
+                 )
+                )
+                (if
+                 (i32.eqz
+                  (local.tee $0
+                   (i32.load
+                    (local.tee $1
+                     (i32.add
+                      (local.get $4)
+                      (i32.const 16)
+                     )
+                    )
+                   )
+                  )
+                 )
+                 (block
+                  (local.set $13
+                   (i32.const 0)
+                  )
+                  (br $label$104)
+                 )
+                )
+               )
+               (loop $label$108
+                (if
+                 (local.tee $11
+                  (i32.load
+                   (local.tee $9
+                    (i32.add
+                     (local.get $0)
+                     (i32.const 20)
+                    )
+                   )
+                  )
+                 )
+                 (block
+                  (local.set $0
+                   (local.get $11)
+                  )
+                  (local.set $1
+                   (local.get $9)
+                  )
+                  (br $label$108)
+                 )
+                )
+                (if
+                 (local.tee $11
+                  (i32.load
+                   (local.tee $9
+                    (i32.add
+                     (local.get $0)
+                     (i32.const 16)
+                    )
+                   )
+                  )
+                 )
+                 (block
+                  (local.set $0
+                   (local.get $11)
+                  )
+                  (local.set $1
+                   (local.get $9)
+                  )
+                  (br $label$108)
+                 )
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.get $1)
+                 (local.get $12)
+                )
+                (call $fimport$10)
+                (block
+                 (i32.store
+                  (local.get $1)
+                  (i32.const 0)
+                 )
+                 (local.set $13
+                  (local.get $0)
+                 )
+                )
+               )
+              )
+              (block
+               (if
+                (i32.lt_u
+                 (local.tee $9
+                  (i32.load offset=8
+                   (local.get $4)
+                  )
+                 )
+                 (local.get $12)
+                )
+                (call $fimport$10)
+               )
+               (if
+                (i32.ne
+                 (i32.load
+                  (local.tee $11
+                   (i32.add
+                    (local.get $9)
+                    (i32.const 12)
+                   )
+                  )
+                 )
+                 (local.get $4)
+                )
+                (call $fimport$10)
+               )
+               (if
+                (i32.eq
+                 (i32.load
+                  (local.tee $1
+                   (i32.add
+                    (local.get $0)
+                    (i32.const 8)
+                   )
+                  )
+                 )
+                 (local.get $4)
+                )
+                (block
+                 (i32.store
+                  (local.get $11)
+                  (local.get $0)
+                 )
+                 (i32.store
+                  (local.get $1)
+                  (local.get $9)
+                 )
+                 (local.set $13
+                  (local.get $0)
+                 )
+                )
+                (call $fimport$10)
+               )
+              )
+             )
+            )
+            (block $label$118
+             (if
+              (local.get $10)
+              (block
+               (if
+                (i32.eq
+                 (local.get $4)
+                 (i32.load
+                  (local.tee $0
+                   (i32.add
+                    (i32.shl
+                     (local.tee $1
+                      (i32.load offset=28
+                       (local.get $4)
+                      )
+                     )
+                     (i32.const 2)
+                    )
+                    (i32.const 3948)
+                   )
+                  )
+                 )
+                )
+                (block
+                 (i32.store
+                  (local.get $0)
+                  (local.get $13)
+                 )
+                 (if
+                  (i32.eqz
+                   (local.get $13)
+                  )
+                  (block
+                   (i32.store
+                    (i32.const 3648)
+                    (local.tee $2
+                     (i32.and
+                      (local.get $5)
+                      (i32.xor
+                       (i32.shl
+                        (i32.const 1)
+                        (local.get $1)
+                       )
+                       (i32.const -1)
+                      )
+                     )
+                    )
+                   )
+                   (br $label$118)
+                  )
+                 )
+                )
+                (block
+                 (if
+                  (i32.lt_u
+                   (local.get $10)
+                   (i32.load
+                    (i32.const 3660)
+                   )
+                  )
+                  (call $fimport$10)
+                 )
+                 (if
+                  (i32.eq
+                   (i32.load
+                    (local.tee $0
+                     (i32.add
+                      (local.get $10)
+                      (i32.const 16)
+                     )
+                    )
+                   )
+                   (local.get $4)
+                  )
+                  (i32.store
+                   (local.get $0)
+                   (local.get $13)
+                  )
+                  (i32.store offset=20
+                   (local.get $10)
+                   (local.get $13)
+                  )
+                 )
+                 (if
+                  (i32.eqz
+                   (local.get $13)
+                  )
+                  (block
+                   (local.set $2
+                    (local.get $5)
+                   )
+                   (br $label$118)
+                  )
+                 )
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.get $13)
+                 (local.tee $0
+                  (i32.load
+                   (i32.const 3660)
+                  )
+                 )
+                )
+                (call $fimport$10)
+               )
+               (i32.store offset=24
+                (local.get $13)
+                (local.get $10)
+               )
+               (if
+                (local.tee $1
+                 (i32.load offset=16
+                  (local.get $4)
+                 )
+                )
+                (if
+                 (i32.lt_u
+                  (local.get $1)
+                  (local.get $0)
+                 )
+                 (call $fimport$10)
+                 (block
+                  (i32.store offset=16
+                   (local.get $13)
+                   (local.get $1)
+                  )
+                  (i32.store offset=24
+                   (local.get $1)
+                   (local.get $13)
+                  )
+                 )
+                )
+               )
+               (if
+                (local.tee $0
+                 (i32.load offset=20
+                  (local.get $4)
+                 )
+                )
+                (if
+                 (i32.lt_u
+                  (local.get $0)
+                  (i32.load
+                   (i32.const 3660)
+                  )
+                 )
+                 (call $fimport$10)
+                 (block
+                  (i32.store offset=20
+                   (local.get $13)
+                   (local.get $0)
+                  )
+                  (i32.store offset=24
+                   (local.get $0)
+                   (local.get $13)
+                  )
+                  (local.set $2
+                   (local.get $5)
+                  )
+                 )
+                )
+                (local.set $2
+                 (local.get $5)
+                )
+               )
+              )
+              (local.set $2
+               (local.get $5)
+              )
+             )
+            )
+            (block $label$136
+             (if
+              (i32.lt_u
+               (local.get $3)
+               (i32.const 16)
+              )
+              (block
+               (i32.store offset=4
+                (local.get $4)
+                (i32.or
+                 (local.tee $0
+                  (i32.add
+                   (local.get $3)
+                   (local.get $7)
+                  )
+                 )
+                 (i32.const 3)
+                )
+               )
+               (i32.store
+                (local.tee $0
+                 (i32.add
+                  (i32.add
+                   (local.get $4)
+                   (local.get $0)
+                  )
+                  (i32.const 4)
+                 )
+                )
+                (i32.or
+                 (i32.load
+                  (local.get $0)
+                 )
+                 (i32.const 1)
+                )
+               )
+              )
+              (block
+               (i32.store offset=4
+                (local.get $4)
+                (i32.or
+                 (local.get $7)
+                 (i32.const 3)
+                )
+               )
+               (i32.store offset=4
+                (local.get $6)
+                (i32.or
+                 (local.get $3)
+                 (i32.const 1)
+                )
+               )
+               (i32.store
+                (i32.add
+                 (local.get $6)
+                 (local.get $3)
+                )
+                (local.get $3)
+               )
+               (local.set $0
+                (i32.shr_u
+                 (local.get $3)
+                 (i32.const 3)
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.get $3)
+                 (i32.const 256)
+                )
+                (block
+                 (local.set $3
+                  (i32.add
+                   (i32.shl
+                    (i32.shl
+                     (local.get $0)
+                     (i32.const 1)
+                    )
+                    (i32.const 2)
+                   )
+                   (i32.const 3684)
+                  )
+                 )
+                 (if
+                  (i32.and
+                   (local.tee $1
+                    (i32.load
+                     (i32.const 3644)
+                    )
+                   )
+                   (local.tee $0
+                    (i32.shl
+                     (i32.const 1)
+                     (local.get $0)
+                    )
+                   )
+                  )
+                  (if
+                   (i32.lt_u
+                    (local.tee $0
+                     (i32.load
+                      (local.tee $1
+                       (i32.add
+                        (local.get $3)
+                        (i32.const 8)
+                       )
+                      )
+                     )
+                    )
+                    (i32.load
+                     (i32.const 3660)
+                    )
+                   )
+                   (call $fimport$10)
+                   (block
+                    (local.set $16
+                     (local.get $1)
+                    )
+                    (local.set $8
+                     (local.get $0)
+                    )
+                   )
+                  )
+                  (block
+                   (i32.store
+                    (i32.const 3644)
+                    (i32.or
+                     (local.get $1)
+                     (local.get $0)
+                    )
+                   )
+                   (local.set $16
+                    (i32.add
+                     (local.get $3)
+                     (i32.const 8)
+                    )
+                   )
+                   (local.set $8
+                    (local.get $3)
+                   )
+                  )
+                 )
+                 (i32.store
+                  (local.get $16)
+                  (local.get $6)
+                 )
+                 (i32.store offset=12
+                  (local.get $8)
+                  (local.get $6)
+                 )
+                 (i32.store offset=8
+                  (local.get $6)
+                  (local.get $8)
+                 )
+                 (i32.store offset=12
+                  (local.get $6)
+                  (local.get $3)
+                 )
+                 (br $label$136)
+                )
+               )
+               (local.set $1
+                (i32.add
+                 (i32.shl
+                  (local.tee $5
+                   (if (result i32)
+                    (local.tee $0
+                     (i32.shr_u
+                      (local.get $3)
+                      (i32.const 8)
+                     )
+                    )
+                    (if (result i32)
+                     (i32.gt_u
+                      (local.get $3)
+                      (i32.const 16777215)
+                     )
+                     (i32.const 31)
+                     (i32.or
+                      (i32.and
+                       (i32.shr_u
+                        (local.get $3)
+                        (i32.add
+                         (local.tee $0
+                          (i32.add
+                           (i32.sub
+                            (i32.const 14)
+                            (i32.or
+                             (i32.or
+                              (local.tee $0
+                               (i32.and
+                                (i32.shr_u
+                                 (i32.add
+                                  (local.tee $1
+                                   (i32.shl
+                                    (local.get $0)
+                                    (local.tee $5
+                                     (i32.and
+                                      (i32.shr_u
+                                       (i32.add
+                                        (local.get $0)
+                                        (i32.const 1048320)
+                                       )
+                                       (i32.const 16)
+                                      )
+                                      (i32.const 8)
+                                     )
+                                    )
+                                   )
+                                  )
+                                  (i32.const 520192)
+                                 )
+                                 (i32.const 16)
+                                )
+                                (i32.const 4)
+                               )
+                              )
+                              (local.get $5)
+                             )
+                             (local.tee $0
+                              (i32.and
+                               (i32.shr_u
+                                (i32.add
+                                 (local.tee $1
+                                  (i32.shl
+                                   (local.get $1)
+                                   (local.get $0)
+                                  )
+                                 )
+                                 (i32.const 245760)
+                                )
+                                (i32.const 16)
+                               )
+                               (i32.const 2)
+                              )
+                             )
+                            )
+                           )
+                           (i32.shr_u
+                            (i32.shl
+                             (local.get $1)
+                             (local.get $0)
+                            )
+                            (i32.const 15)
+                           )
+                          )
+                         )
+                         (i32.const 7)
+                        )
+                       )
+                       (i32.const 1)
+                      )
+                      (i32.shl
+                       (local.get $0)
+                       (i32.const 1)
+                      )
+                     )
+                    )
+                    (i32.const 0)
+                   )
+                  )
+                  (i32.const 2)
+                 )
+                 (i32.const 3948)
+                )
+               )
+               (i32.store offset=28
+                (local.get $6)
+                (local.get $5)
+               )
+               (i32.store offset=4
+                (local.tee $0
+                 (i32.add
+                  (local.get $6)
+                  (i32.const 16)
+                 )
+                )
+                (i32.const 0)
+               )
+               (i32.store
+                (local.get $0)
+                (i32.const 0)
+               )
+               (if
+                (i32.eqz
+                 (i32.and
+                  (local.get $2)
+                  (local.tee $0
+                   (i32.shl
+                    (i32.const 1)
+                    (local.get $5)
+                   )
+                  )
+                 )
+                )
+                (block
+                 (i32.store
+                  (i32.const 3648)
+                  (i32.or
+                   (local.get $2)
+                   (local.get $0)
+                  )
+                 )
+                 (i32.store
+                  (local.get $1)
+                  (local.get $6)
+                 )
+                 (i32.store offset=24
+                  (local.get $6)
+                  (local.get $1)
+                 )
+                 (i32.store offset=12
+                  (local.get $6)
+                  (local.get $6)
+                 )
+                 (i32.store offset=8
+                  (local.get $6)
+                  (local.get $6)
+                 )
+                 (br $label$136)
+                )
+               )
+               (local.set $0
+                (i32.load
+                 (local.get $1)
+                )
+               )
+               (local.set $1
+                (i32.sub
+                 (i32.const 25)
+                 (i32.shr_u
+                  (local.get $5)
+                  (i32.const 1)
+                 )
+                )
+               )
+               (local.set $5
+                (i32.shl
+                 (local.get $3)
+                 (if (result i32)
+                  (i32.eq
+                   (local.get $5)
+                   (i32.const 31)
+                  )
+                  (i32.const 0)
+                  (local.get $1)
+                 )
+                )
+               )
+               (block $label$151
+                (block $label$152
+                 (block $label$153
+                  (loop $label$154
+                   (br_if $label$152
+                    (i32.eq
+                     (i32.and
+                      (i32.load offset=4
+                       (local.get $0)
+                      )
+                      (i32.const -8)
+                     )
+                     (local.get $3)
+                    )
+                   )
+                   (local.set $2
+                    (i32.shl
+                     (local.get $5)
+                     (i32.const 1)
+                    )
+                   )
+                   (br_if $label$153
+                    (i32.eqz
+                     (local.tee $1
+                      (i32.load
+                       (local.tee $5
+                        (i32.add
+                         (i32.add
+                          (local.get $0)
+                          (i32.const 16)
+                         )
+                         (i32.shl
+                          (i32.shr_u
+                           (local.get $5)
+                           (i32.const 31)
+                          )
+                          (i32.const 2)
+                         )
+                        )
+                       )
+                      )
+                     )
+                    )
+                   )
+                   (local.set $5
+                    (local.get $2)
+                   )
+                   (local.set $0
+                    (local.get $1)
+                   )
+                   (br $label$154)
+                  )
+                 )
+                 (if
+                  (i32.lt_u
+                   (local.get $5)
+                   (i32.load
+                    (i32.const 3660)
+                   )
+                  )
+                  (call $fimport$10)
+                  (block
+                   (i32.store
+                    (local.get $5)
+                    (local.get $6)
+                   )
+                   (i32.store offset=24
+                    (local.get $6)
+                    (local.get $0)
+                   )
+                   (i32.store offset=12
+                    (local.get $6)
+                    (local.get $6)
+                   )
+                   (i32.store offset=8
+                    (local.get $6)
+                    (local.get $6)
+                   )
+                   (br $label$136)
+                  )
+                 )
+                 (br $label$151)
+                )
+                (if
+                 (i32.and
+                  (i32.ge_u
+                   (local.tee $2
+                    (i32.load
+                     (local.tee $3
+                      (i32.add
+                       (local.get $0)
+                       (i32.const 8)
+                      )
+                     )
+                    )
+                   )
+                   (local.tee $1
+                    (i32.load
+                     (i32.const 3660)
+                    )
+                   )
+                  )
+                  (i32.ge_u
+                   (local.get $0)
+                   (local.get $1)
+                  )
+                 )
+                 (block
+                  (i32.store offset=12
+                   (local.get $2)
+                   (local.get $6)
+                  )
+                  (i32.store
+                   (local.get $3)
+                   (local.get $6)
+                  )
+                  (i32.store offset=8
+                   (local.get $6)
+                   (local.get $2)
+                  )
+                  (i32.store offset=12
+                   (local.get $6)
+                   (local.get $0)
+                  )
+                  (i32.store offset=24
+                   (local.get $6)
+                   (i32.const 0)
+                  )
+                 )
+                 (call $fimport$10)
+                )
+               )
+              )
+             )
+            )
+            (global.set $global$1
+             (local.get $14)
+            )
+            (return
+             (i32.add
+              (local.get $4)
+              (i32.const 8)
+             )
+            )
+           )
+           (local.set $0
+            (local.get $7)
+           )
+          )
+          (local.set $0
+           (local.get $7)
+          )
+         )
+        )
+        (local.set $0
+         (local.get $7)
+        )
+       )
+      )
+     )
+    )
+   )
+   (if
+    (i32.ge_u
+     (local.tee $1
+      (i32.load
+       (i32.const 3652)
+      )
+     )
+     (local.get $0)
+    )
+    (block
+     (local.set $2
+      (i32.load
+       (i32.const 3664)
+      )
+     )
+     (if
+      (i32.gt_u
+       (local.tee $3
+        (i32.sub
+         (local.get $1)
+         (local.get $0)
+        )
+       )
+       (i32.const 15)
+      )
+      (block
+       (i32.store
+        (i32.const 3664)
+        (local.tee $1
+         (i32.add
+          (local.get $2)
+          (local.get $0)
+         )
+        )
+       )
+       (i32.store
+        (i32.const 3652)
+        (local.get $3)
+       )
+       (i32.store offset=4
+        (local.get $1)
+        (i32.or
+         (local.get $3)
+         (i32.const 1)
+        )
+       )
+       (i32.store
+        (i32.add
+         (local.get $1)
+         (local.get $3)
+        )
+        (local.get $3)
+       )
+       (i32.store offset=4
+        (local.get $2)
+        (i32.or
+         (local.get $0)
+         (i32.const 3)
+        )
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 3652)
+        (i32.const 0)
+       )
+       (i32.store
+        (i32.const 3664)
+        (i32.const 0)
+       )
+       (i32.store offset=4
+        (local.get $2)
+        (i32.or
+         (local.get $1)
+         (i32.const 3)
+        )
+       )
+       (i32.store
+        (local.tee $0
+         (i32.add
+          (i32.add
+           (local.get $2)
+           (local.get $1)
+          )
+          (i32.const 4)
+         )
+        )
+        (i32.or
+         (i32.load
+          (local.get $0)
+         )
+         (i32.const 1)
+        )
+       )
+      )
+     )
+     (global.set $global$1
+      (local.get $14)
+     )
+     (return
+      (i32.add
+       (local.get $2)
+       (i32.const 8)
+      )
+     )
+    )
+   )
+   (if
+    (i32.gt_u
+     (local.tee $10
+      (i32.load
+       (i32.const 3656)
+      )
+     )
+     (local.get $0)
+    )
+    (block
+     (i32.store
+      (i32.const 3656)
+      (local.tee $3
+       (i32.sub
+        (local.get $10)
+        (local.get $0)
+       )
+      )
+     )
+     (i32.store
+      (i32.const 3668)
+      (local.tee $1
+       (i32.add
+        (local.tee $2
+         (i32.load
+          (i32.const 3668)
+         )
+        )
+        (local.get $0)
+       )
+      )
+     )
+     (i32.store offset=4
+      (local.get $1)
+      (i32.or
+       (local.get $3)
+       (i32.const 1)
+      )
+     )
+     (i32.store offset=4
+      (local.get $2)
+      (i32.or
+       (local.get $0)
+       (i32.const 3)
+      )
+     )
+     (global.set $global$1
+      (local.get $14)
+     )
+     (return
+      (i32.add
+       (local.get $2)
+       (i32.const 8)
+      )
+     )
+    )
+   )
+   (if
+    (i32.le_u
+     (local.tee $6
+      (i32.and
+       (local.tee $8
+        (i32.add
+         (local.tee $1
+          (if (result i32)
+           (i32.load
+            (i32.const 4116)
+           )
+           (i32.load
+            (i32.const 4124)
+           )
+           (block (result i32)
+            (i32.store
+             (i32.const 4124)
+             (i32.const 4096)
+            )
+            (i32.store
+             (i32.const 4120)
+             (i32.const 4096)
+            )
+            (i32.store
+             (i32.const 4128)
+             (i32.const -1)
+            )
+            (i32.store
+             (i32.const 4132)
+             (i32.const -1)
+            )
+            (i32.store
+             (i32.const 4136)
+             (i32.const 0)
+            )
+            (i32.store
+             (i32.const 4088)
+             (i32.const 0)
+            )
+            (i32.store
+             (local.get $18)
+             (local.tee $1
+              (i32.xor
+               (i32.and
+                (local.get $18)
+                (i32.const -16)
+               )
+               (i32.const 1431655768)
+              )
+             )
+            )
+            (i32.store
+             (i32.const 4116)
+             (local.get $1)
+            )
+            (i32.const 4096)
+           )
+          )
+         )
+         (local.tee $13
+          (i32.add
+           (local.get $0)
+           (i32.const 47)
+          )
+         )
+        )
+       )
+       (local.tee $4
+        (i32.sub
+         (i32.const 0)
+         (local.get $1)
+        )
+       )
+      )
+     )
+     (local.get $0)
+    )
+    (block
+     (global.set $global$1
+      (local.get $14)
+     )
+     (return
+      (i32.const 0)
+     )
+    )
+   )
+   (if
+    (local.tee $2
+     (i32.load
+      (i32.const 4084)
+     )
+    )
+    (if
+     (i32.or
+      (i32.le_u
+       (local.tee $1
+        (i32.add
+         (local.tee $3
+          (i32.load
+           (i32.const 4076)
+          )
+         )
+         (local.get $6)
+        )
+       )
+       (local.get $3)
+      )
+      (i32.gt_u
+       (local.get $1)
+       (local.get $2)
+      )
+     )
+     (block
+      (global.set $global$1
+       (local.get $14)
+      )
+      (return
+       (i32.const 0)
+      )
+     )
+    )
+   )
+   (local.set $7
+    (i32.add
+     (local.get $0)
+     (i32.const 48)
+    )
+   )
+   (block $label$171
+    (block $label$172
+     (if
+      (i32.eqz
+       (i32.and
+        (i32.load
+         (i32.const 4088)
+        )
+        (i32.const 4)
+       )
+      )
+      (block
+       (block $label$174
+        (block $label$175
+         (block $label$176
+          (br_if $label$176
+           (i32.eqz
+            (local.tee $3
+             (i32.load
+              (i32.const 3668)
+             )
+            )
+           )
+          )
+          (local.set $2
+           (i32.const 4092)
+          )
+          (loop $label$177
+           (block $label$178
+            (if
+             (i32.le_u
+              (local.tee $1
+               (i32.load
+                (local.get $2)
+               )
+              )
+              (local.get $3)
+             )
+             (br_if $label$178
+              (i32.gt_u
+               (i32.add
+                (local.get $1)
+                (i32.load
+                 (local.tee $5
+                  (i32.add
+                   (local.get $2)
+                   (i32.const 4)
+                  )
+                 )
+                )
+               )
+               (local.get $3)
+              )
+             )
+            )
+            (br_if $label$176
+             (i32.eqz
+              (local.tee $1
+               (i32.load offset=8
+                (local.get $2)
+               )
+              )
+             )
+            )
+            (local.set $2
+             (local.get $1)
+            )
+            (br $label$177)
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.tee $3
+             (i32.and
+              (i32.sub
+               (local.get $8)
+               (local.get $10)
+              )
+              (local.get $4)
+             )
+            )
+            (i32.const 2147483647)
+           )
+           (if
+            (i32.eq
+             (local.tee $1
+              (call $34
+               (local.get $3)
+              )
+             )
+             (i32.add
+              (i32.load
+               (local.get $2)
+              )
+              (i32.load
+               (local.get $5)
+              )
+             )
+            )
+            (br_if $label$172
+             (i32.ne
+              (local.get $1)
+              (i32.const -1)
+             )
+            )
+            (block
+             (local.set $2
+              (local.get $1)
+             )
+             (local.set $1
+              (local.get $3)
+             )
+             (br $label$175)
+            )
+           )
+          )
+          (br $label$174)
+         )
+         (if
+          (i32.ne
+           (local.tee $1
+            (call $34
+             (i32.const 0)
+            )
+           )
+           (i32.const -1)
+          )
+          (block
+           (local.set $2
+            (i32.sub
+             (i32.and
+              (i32.add
+               (local.tee $5
+                (i32.add
+                 (local.tee $2
+                  (i32.load
+                   (i32.const 4120)
+                  )
+                 )
+                 (i32.const -1)
+                )
+               )
+               (local.tee $3
+                (local.get $1)
+               )
+              )
+              (i32.sub
+               (i32.const 0)
+               (local.get $2)
+              )
+             )
+             (local.get $3)
+            )
+           )
+           (local.set $4
+            (i32.add
+             (local.tee $3
+              (i32.add
+               (if (result i32)
+                (i32.and
+                 (local.get $5)
+                 (local.get $3)
+                )
+                (local.get $2)
+                (i32.const 0)
+               )
+               (local.get $6)
+              )
+             )
+             (local.tee $5
+              (i32.load
+               (i32.const 4076)
+              )
+             )
+            )
+           )
+           (if
+            (i32.and
+             (i32.gt_u
+              (local.get $3)
+              (local.get $0)
+             )
+             (i32.lt_u
+              (local.get $3)
+              (i32.const 2147483647)
+             )
+            )
+            (block
+             (if
+              (local.tee $2
+               (i32.load
+                (i32.const 4084)
+               )
+              )
+              (br_if $label$174
+               (i32.or
+                (i32.le_u
+                 (local.get $4)
+                 (local.get $5)
+                )
+                (i32.gt_u
+                 (local.get $4)
+                 (local.get $2)
+                )
+               )
+              )
+             )
+             (br_if $label$172
+              (i32.eq
+               (local.tee $2
+                (call $34
+                 (local.get $3)
+                )
+               )
+               (local.get $1)
+              )
+             )
+             (local.set $1
+              (local.get $3)
+             )
+             (br $label$175)
+            )
+           )
+          )
+         )
+         (br $label$174)
+        )
+        (local.set $5
+         (i32.sub
+          (i32.const 0)
+          (local.get $1)
+         )
+        )
+        (if
+         (i32.and
+          (i32.gt_u
+           (local.get $7)
+           (local.get $1)
+          )
+          (i32.and
+           (i32.lt_u
+            (local.get $1)
+            (i32.const 2147483647)
+           )
+           (i32.ne
+            (local.get $2)
+            (i32.const -1)
+           )
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.tee $3
+            (i32.and
+             (i32.add
+              (i32.sub
+               (local.get $13)
+               (local.get $1)
+              )
+              (local.tee $3
+               (i32.load
+                (i32.const 4124)
+               )
+              )
+             )
+             (i32.sub
+              (i32.const 0)
+              (local.get $3)
+             )
+            )
+           )
+           (i32.const 2147483647)
+          )
+          (if
+           (i32.eq
+            (call $34
+             (local.get $3)
+            )
+            (i32.const -1)
+           )
+           (block
+            (drop
+             (call $34
+              (local.get $5)
+             )
+            )
+            (br $label$174)
+           )
+           (local.set $3
+            (i32.add
+             (local.get $3)
+             (local.get $1)
+            )
+           )
+          )
+          (local.set $3
+           (local.get $1)
+          )
+         )
+         (local.set $3
+          (local.get $1)
+         )
+        )
+        (if
+         (i32.ne
+          (local.get $2)
+          (i32.const -1)
+         )
+         (block
+          (local.set $1
+           (local.get $2)
+          )
+          (br $label$172)
+         )
+        )
+       )
+       (i32.store
+        (i32.const 4088)
+        (i32.or
+         (i32.load
+          (i32.const 4088)
+         )
+         (i32.const 4)
+        )
+       )
+      )
+     )
+     (if
+      (i32.lt_u
+       (local.get $6)
+       (i32.const 2147483647)
+      )
+      (if
+       (i32.and
+        (i32.lt_u
+         (local.tee $1
+          (call $34
+           (local.get $6)
+          )
+         )
+         (local.tee $3
+          (call $34
+           (i32.const 0)
+          )
+         )
+        )
+        (i32.and
+         (i32.ne
+          (local.get $1)
+          (i32.const -1)
+         )
+         (i32.ne
+          (local.get $3)
+          (i32.const -1)
+         )
+        )
+       )
+       (br_if $label$172
+        (i32.gt_u
+         (local.tee $3
+          (i32.sub
+           (local.get $3)
+           (local.get $1)
+          )
+         )
+         (i32.add
+          (local.get $0)
+          (i32.const 40)
+         )
+        )
+       )
+      )
+     )
+     (br $label$171)
+    )
+    (i32.store
+     (i32.const 4076)
+     (local.tee $2
+      (i32.add
+       (i32.load
+        (i32.const 4076)
+       )
+       (local.get $3)
+      )
+     )
+    )
+    (if
+     (i32.gt_u
+      (local.get $2)
+      (i32.load
+       (i32.const 4080)
+      )
+     )
+     (i32.store
+      (i32.const 4080)
+      (local.get $2)
+     )
+    )
+    (block $label$198
+     (if
+      (local.tee $8
+       (i32.load
+        (i32.const 3668)
+       )
+      )
+      (block
+       (local.set $2
+        (i32.const 4092)
+       )
+       (block $label$200
+        (block $label$201
+         (loop $label$202
+          (br_if $label$201
+           (i32.eq
+            (local.get $1)
+            (i32.add
+             (local.tee $4
+              (i32.load
+               (local.get $2)
+              )
+             )
+             (local.tee $5
+              (i32.load
+               (local.tee $7
+                (i32.add
+                 (local.get $2)
+                 (i32.const 4)
+                )
+               )
+              )
+             )
+            )
+           )
+          )
+          (br_if $label$202
+           (local.tee $2
+            (i32.load offset=8
+             (local.get $2)
+            )
+           )
+          )
+         )
+         (br $label$200)
+        )
+        (if
+         (i32.eqz
+          (i32.and
+           (i32.load offset=12
+            (local.get $2)
+           )
+           (i32.const 8)
+          )
+         )
+         (if
+          (i32.and
+           (i32.lt_u
+            (local.get $8)
+            (local.get $1)
+           )
+           (i32.ge_u
+            (local.get $8)
+            (local.get $4)
+           )
+          )
+          (block
+           (i32.store
+            (local.get $7)
+            (i32.add
+             (local.get $5)
+             (local.get $3)
+            )
+           )
+           (local.set $5
+            (i32.load
+             (i32.const 3656)
+            )
+           )
+           (local.set $1
+            (i32.and
+             (i32.sub
+              (i32.const 0)
+              (local.tee $2
+               (i32.add
+                (local.get $8)
+                (i32.const 8)
+               )
+              )
+             )
+             (i32.const 7)
+            )
+           )
+           (i32.store
+            (i32.const 3668)
+            (local.tee $2
+             (i32.add
+              (local.get $8)
+              (if (result i32)
+               (i32.and
+                (local.get $2)
+                (i32.const 7)
+               )
+               (local.get $1)
+               (local.tee $1
+                (i32.const 0)
+               )
+              )
+             )
+            )
+           )
+           (i32.store
+            (i32.const 3656)
+            (local.tee $1
+             (i32.add
+              (i32.sub
+               (local.get $3)
+               (local.get $1)
+              )
+              (local.get $5)
+             )
+            )
+           )
+           (i32.store offset=4
+            (local.get $2)
+            (i32.or
+             (local.get $1)
+             (i32.const 1)
+            )
+           )
+           (i32.store offset=4
+            (i32.add
+             (local.get $2)
+             (local.get $1)
+            )
+            (i32.const 40)
+           )
+           (i32.store
+            (i32.const 3672)
+            (i32.load
+             (i32.const 4132)
+            )
+           )
+           (br $label$198)
+          )
+         )
+        )
+       )
+       (if
+        (i32.lt_u
+         (local.get $1)
+         (local.tee $2
+          (i32.load
+           (i32.const 3660)
+          )
+         )
+        )
+        (block
+         (i32.store
+          (i32.const 3660)
+          (local.get $1)
+         )
+         (local.set $2
+          (local.get $1)
+         )
+        )
+       )
+       (local.set $10
+        (i32.add
+         (local.get $1)
+         (local.get $3)
+        )
+       )
+       (local.set $5
+        (i32.const 4092)
+       )
+       (block $label$208
+        (block $label$209
+         (loop $label$210
+          (br_if $label$209
+           (i32.eq
+            (i32.load
+             (local.get $5)
+            )
+            (local.get $10)
+           )
+          )
+          (br_if $label$210
+           (local.tee $5
+            (i32.load offset=8
+             (local.get $5)
+            )
+           )
+          )
+          (local.set $5
+           (i32.const 4092)
+          )
+         )
+         (br $label$208)
+        )
+        (if
+         (i32.and
+          (i32.load offset=12
+           (local.get $5)
+          )
+          (i32.const 8)
+         )
+         (local.set $5
+          (i32.const 4092)
+         )
+         (block
+          (i32.store
+           (local.get $5)
+           (local.get $1)
+          )
+          (i32.store
+           (local.tee $5
+            (i32.add
+             (local.get $5)
+             (i32.const 4)
+            )
+           )
+           (i32.add
+            (i32.load
+             (local.get $5)
+            )
+            (local.get $3)
+           )
+          )
+          (local.set $7
+           (i32.and
+            (i32.sub
+             (i32.const 0)
+             (local.tee $4
+              (i32.add
+               (local.get $1)
+               (i32.const 8)
+              )
+             )
+            )
+            (i32.const 7)
+           )
+          )
+          (local.set $3
+           (i32.and
+            (i32.sub
+             (i32.const 0)
+             (local.tee $5
+              (i32.add
+               (local.get $10)
+               (i32.const 8)
+              )
+             )
+            )
+            (i32.const 7)
+           )
+          )
+          (local.set $6
+           (i32.add
+            (local.tee $13
+             (i32.add
+              (local.get $1)
+              (if (result i32)
+               (i32.and
+                (local.get $4)
+                (i32.const 7)
+               )
+               (local.get $7)
+               (i32.const 0)
+              )
+             )
+            )
+            (local.get $0)
+           )
+          )
+          (local.set $7
+           (i32.sub
+            (i32.sub
+             (local.tee $4
+              (i32.add
+               (local.get $10)
+               (if (result i32)
+                (i32.and
+                 (local.get $5)
+                 (i32.const 7)
+                )
+                (local.get $3)
+                (i32.const 0)
+               )
+              )
+             )
+             (local.get $13)
+            )
+            (local.get $0)
+           )
+          )
+          (i32.store offset=4
+           (local.get $13)
+           (i32.or
+            (local.get $0)
+            (i32.const 3)
+           )
+          )
+          (block $label$217
+           (if
+            (i32.eq
+             (local.get $4)
+             (local.get $8)
+            )
+            (block
+             (i32.store
+              (i32.const 3656)
+              (local.tee $0
+               (i32.add
+                (i32.load
+                 (i32.const 3656)
+                )
+                (local.get $7)
+               )
+              )
+             )
+             (i32.store
+              (i32.const 3668)
+              (local.get $6)
+             )
+             (i32.store offset=4
+              (local.get $6)
+              (i32.or
+               (local.get $0)
+               (i32.const 1)
+              )
+             )
+            )
+            (block
+             (if
+              (i32.eq
+               (local.get $4)
+               (i32.load
+                (i32.const 3664)
+               )
+              )
+              (block
+               (i32.store
+                (i32.const 3652)
+                (local.tee $0
+                 (i32.add
+                  (i32.load
+                   (i32.const 3652)
+                  )
+                  (local.get $7)
+                 )
+                )
+               )
+               (i32.store
+                (i32.const 3664)
+                (local.get $6)
+               )
+               (i32.store offset=4
+                (local.get $6)
+                (i32.or
+                 (local.get $0)
+                 (i32.const 1)
+                )
+               )
+               (i32.store
+                (i32.add
+                 (local.get $6)
+                 (local.get $0)
+                )
+                (local.get $0)
+               )
+               (br $label$217)
+              )
+             )
+             (i32.store
+              (local.tee $0
+               (i32.add
+                (local.tee $0
+                 (if (result i32)
+                  (i32.eq
+                   (i32.and
+                    (local.tee $0
+                     (i32.load offset=4
+                      (local.get $4)
+                     )
+                    )
+                    (i32.const 3)
+                   )
+                   (i32.const 1)
+                  )
+                  (block (result i32)
+                   (local.set $11
+                    (i32.and
+                     (local.get $0)
+                     (i32.const -8)
+                    )
+                   )
+                   (local.set $1
+                    (i32.shr_u
+                     (local.get $0)
+                     (i32.const 3)
+                    )
+                   )
+                   (block $label$222
+                    (if
+                     (i32.lt_u
+                      (local.get $0)
+                      (i32.const 256)
+                     )
+                     (block
+                      (local.set $5
+                       (i32.load offset=12
+                        (local.get $4)
+                       )
+                      )
+                      (block $label$224
+                       (if
+                        (i32.ne
+                         (local.tee $3
+                          (i32.load offset=8
+                           (local.get $4)
+                          )
+                         )
+                         (local.tee $0
+                          (i32.add
+                           (i32.shl
+                            (i32.shl
+                             (local.get $1)
+                             (i32.const 1)
+                            )
+                            (i32.const 2)
+                           )
+                           (i32.const 3684)
+                          )
+                         )
+                        )
+                        (block
+                         (if
+                          (i32.lt_u
+                           (local.get $3)
+                           (local.get $2)
+                          )
+                          (call $fimport$10)
+                         )
+                         (br_if $label$224
+                          (i32.eq
+                           (i32.load offset=12
+                            (local.get $3)
+                           )
+                           (local.get $4)
+                          )
+                         )
+                         (call $fimport$10)
+                        )
+                       )
+                      )
+                      (if
+                       (i32.eq
+                        (local.get $5)
+                        (local.get $3)
+                       )
+                       (block
+                        (i32.store
+                         (i32.const 3644)
+                         (i32.and
+                          (i32.load
+                           (i32.const 3644)
+                          )
+                          (i32.xor
+                           (i32.shl
+                            (i32.const 1)
+                            (local.get $1)
+                           )
+                           (i32.const -1)
+                          )
+                         )
+                        )
+                        (br $label$222)
+                       )
+                      )
+                      (block $label$228
+                       (if
+                        (i32.eq
+                         (local.get $5)
+                         (local.get $0)
+                        )
+                        (local.set $20
+                         (i32.add
+                          (local.get $5)
+                          (i32.const 8)
+                         )
+                        )
+                        (block
+                         (if
+                          (i32.lt_u
+                           (local.get $5)
+                           (local.get $2)
+                          )
+                          (call $fimport$10)
+                         )
+                         (if
+                          (i32.eq
+                           (i32.load
+                            (local.tee $0
+                             (i32.add
+                              (local.get $5)
+                              (i32.const 8)
+                             )
+                            )
+                           )
+                           (local.get $4)
+                          )
+                          (block
+                           (local.set $20
+                            (local.get $0)
+                           )
+                           (br $label$228)
+                          )
+                         )
+                         (call $fimport$10)
+                        )
+                       )
+                      )
+                      (i32.store offset=12
+                       (local.get $3)
+                       (local.get $5)
+                      )
+                      (i32.store
+                       (local.get $20)
+                       (local.get $3)
+                      )
+                     )
+                     (block
+                      (local.set $8
+                       (i32.load offset=24
+                        (local.get $4)
+                       )
+                      )
+                      (block $label$234
+                       (if
+                        (i32.eq
+                         (local.tee $0
+                          (i32.load offset=12
+                           (local.get $4)
+                          )
+                         )
+                         (local.get $4)
+                        )
+                        (block
+                         (if
+                          (i32.eqz
+                           (local.tee $0
+                            (i32.load
+                             (local.tee $1
+                              (i32.add
+                               (local.tee $3
+                                (i32.add
+                                 (local.get $4)
+                                 (i32.const 16)
+                                )
+                               )
+                               (i32.const 4)
+                              )
+                             )
+                            )
+                           )
+                          )
+                          (if
+                           (local.tee $0
+                            (i32.load
+                             (local.get $3)
+                            )
+                           )
+                           (local.set $1
+                            (local.get $3)
+                           )
+                           (block
+                            (local.set $12
+                             (i32.const 0)
+                            )
+                            (br $label$234)
+                           )
+                          )
+                         )
+                         (loop $label$239
+                          (if
+                           (local.tee $3
+                            (i32.load
+                             (local.tee $5
+                              (i32.add
+                               (local.get $0)
+                               (i32.const 20)
+                              )
+                             )
+                            )
+                           )
+                           (block
+                            (local.set $0
+                             (local.get $3)
+                            )
+                            (local.set $1
+                             (local.get $5)
+                            )
+                            (br $label$239)
+                           )
+                          )
+                          (if
+                           (local.tee $3
+                            (i32.load
+                             (local.tee $5
+                              (i32.add
+                               (local.get $0)
+                               (i32.const 16)
+                              )
+                             )
+                            )
+                           )
+                           (block
+                            (local.set $0
+                             (local.get $3)
+                            )
+                            (local.set $1
+                             (local.get $5)
+                            )
+                            (br $label$239)
+                           )
+                          )
+                         )
+                         (if
+                          (i32.lt_u
+                           (local.get $1)
+                           (local.get $2)
+                          )
+                          (call $fimport$10)
+                          (block
+                           (i32.store
+                            (local.get $1)
+                            (i32.const 0)
+                           )
+                           (local.set $12
+                            (local.get $0)
+                           )
+                          )
+                         )
+                        )
+                        (block
+                         (if
+                          (i32.lt_u
+                           (local.tee $5
+                            (i32.load offset=8
+                             (local.get $4)
+                            )
+                           )
+                           (local.get $2)
+                          )
+                          (call $fimport$10)
+                         )
+                         (if
+                          (i32.ne
+                           (i32.load
+                            (local.tee $3
+                             (i32.add
+                              (local.get $5)
+                              (i32.const 12)
+                             )
+                            )
+                           )
+                           (local.get $4)
+                          )
+                          (call $fimport$10)
+                         )
+                         (if
+                          (i32.eq
+                           (i32.load
+                            (local.tee $1
+                             (i32.add
+                              (local.get $0)
+                              (i32.const 8)
+                             )
+                            )
+                           )
+                           (local.get $4)
+                          )
+                          (block
+                           (i32.store
+                            (local.get $3)
+                            (local.get $0)
+                           )
+                           (i32.store
+                            (local.get $1)
+                            (local.get $5)
+                           )
+                           (local.set $12
+                            (local.get $0)
+                           )
+                          )
+                          (call $fimport$10)
+                         )
+                        )
+                       )
+                      )
+                      (br_if $label$222
+                       (i32.eqz
+                        (local.get $8)
+                       )
+                      )
+                      (block $label$249
+                       (if
+                        (i32.eq
+                         (local.get $4)
+                         (i32.load
+                          (local.tee $0
+                           (i32.add
+                            (i32.shl
+                             (local.tee $1
+                              (i32.load offset=28
+                               (local.get $4)
+                              )
+                             )
+                             (i32.const 2)
+                            )
+                            (i32.const 3948)
+                           )
+                          )
+                         )
+                        )
+                        (block
+                         (i32.store
+                          (local.get $0)
+                          (local.get $12)
+                         )
+                         (br_if $label$249
+                          (local.get $12)
+                         )
+                         (i32.store
+                          (i32.const 3648)
+                          (i32.and
+                           (i32.load
+                            (i32.const 3648)
+                           )
+                           (i32.xor
+                            (i32.shl
+                             (i32.const 1)
+                             (local.get $1)
+                            )
+                            (i32.const -1)
+                           )
+                          )
+                         )
+                         (br $label$222)
+                        )
+                        (block
+                         (if
+                          (i32.lt_u
+                           (local.get $8)
+                           (i32.load
+                            (i32.const 3660)
+                           )
+                          )
+                          (call $fimport$10)
+                         )
+                         (if
+                          (i32.eq
+                           (i32.load
+                            (local.tee $0
+                             (i32.add
+                              (local.get $8)
+                              (i32.const 16)
+                             )
+                            )
+                           )
+                           (local.get $4)
+                          )
+                          (i32.store
+                           (local.get $0)
+                           (local.get $12)
+                          )
+                          (i32.store offset=20
+                           (local.get $8)
+                           (local.get $12)
+                          )
+                         )
+                         (br_if $label$222
+                          (i32.eqz
+                           (local.get $12)
+                          )
+                         )
+                        )
+                       )
+                      )
+                      (if
+                       (i32.lt_u
+                        (local.get $12)
+                        (local.tee $1
+                         (i32.load
+                          (i32.const 3660)
+                         )
+                        )
+                       )
+                       (call $fimport$10)
+                      )
+                      (i32.store offset=24
+                       (local.get $12)
+                       (local.get $8)
+                      )
+                      (if
+                       (local.tee $3
+                        (i32.load
+                         (local.tee $0
+                          (i32.add
+                           (local.get $4)
+                           (i32.const 16)
+                          )
+                         )
+                        )
+                       )
+                       (if
+                        (i32.lt_u
+                         (local.get $3)
+                         (local.get $1)
+                        )
+                        (call $fimport$10)
+                        (block
+                         (i32.store offset=16
+                          (local.get $12)
+                          (local.get $3)
+                         )
+                         (i32.store offset=24
+                          (local.get $3)
+                          (local.get $12)
+                         )
+                        )
+                       )
+                      )
+                      (br_if $label$222
+                       (i32.eqz
+                        (local.tee $0
+                         (i32.load offset=4
+                          (local.get $0)
+                         )
+                        )
+                       )
+                      )
+                      (if
+                       (i32.lt_u
+                        (local.get $0)
+                        (i32.load
+                         (i32.const 3660)
+                        )
+                       )
+                       (call $fimport$10)
+                       (block
+                        (i32.store offset=20
+                         (local.get $12)
+                         (local.get $0)
+                        )
+                        (i32.store offset=24
+                         (local.get $0)
+                         (local.get $12)
+                        )
+                       )
+                      )
+                     )
+                    )
+                   )
+                   (local.set $7
+                    (i32.add
+                     (local.get $11)
+                     (local.get $7)
+                    )
+                   )
+                   (i32.add
+                    (local.get $4)
+                    (local.get $11)
+                   )
+                  )
+                  (local.get $4)
+                 )
+                )
+                (i32.const 4)
+               )
+              )
+              (i32.and
+               (i32.load
+                (local.get $0)
+               )
+               (i32.const -2)
+              )
+             )
+             (i32.store offset=4
+              (local.get $6)
+              (i32.or
+               (local.get $7)
+               (i32.const 1)
+              )
+             )
+             (i32.store
+              (i32.add
+               (local.get $6)
+               (local.get $7)
+              )
+              (local.get $7)
+             )
+             (local.set $0
+              (i32.shr_u
+               (local.get $7)
+               (i32.const 3)
+              )
+             )
+             (if
+              (i32.lt_u
+               (local.get $7)
+               (i32.const 256)
+              )
+              (block
+               (local.set $3
+                (i32.add
+                 (i32.shl
+                  (i32.shl
+                   (local.get $0)
+                   (i32.const 1)
+                  )
+                  (i32.const 2)
+                 )
+                 (i32.const 3684)
+                )
+               )
+               (block $label$263
+                (if
+                 (i32.and
+                  (local.tee $1
+                   (i32.load
+                    (i32.const 3644)
+                   )
+                  )
+                  (local.tee $0
+                   (i32.shl
+                    (i32.const 1)
+                    (local.get $0)
+                   )
+                  )
+                 )
+                 (block
+                  (if
+                   (i32.ge_u
+                    (local.tee $0
+                     (i32.load
+                      (local.tee $1
+                       (i32.add
+                        (local.get $3)
+                        (i32.const 8)
+                       )
+                      )
+                     )
+                    )
+                    (i32.load
+                     (i32.const 3660)
+                    )
+                   )
+                   (block
+                    (local.set $21
+                     (local.get $1)
+                    )
+                    (local.set $9
+                     (local.get $0)
+                    )
+                    (br $label$263)
+                   )
+                  )
+                  (call $fimport$10)
+                 )
+                 (block
+                  (i32.store
+                   (i32.const 3644)
+                   (i32.or
+                    (local.get $1)
+                    (local.get $0)
+                   )
+                  )
+                  (local.set $21
+                   (i32.add
+                    (local.get $3)
+                    (i32.const 8)
+                   )
+                  )
+                  (local.set $9
+                   (local.get $3)
+                  )
+                 )
+                )
+               )
+               (i32.store
+                (local.get $21)
+                (local.get $6)
+               )
+               (i32.store offset=12
+                (local.get $9)
+                (local.get $6)
+               )
+               (i32.store offset=8
+                (local.get $6)
+                (local.get $9)
+               )
+               (i32.store offset=12
+                (local.get $6)
+                (local.get $3)
+               )
+               (br $label$217)
+              )
+             )
+             (local.set $3
+              (i32.add
+               (i32.shl
+                (local.tee $2
+                 (block $label$267 (result i32)
+                  (if (result i32)
+                   (local.tee $0
+                    (i32.shr_u
+                     (local.get $7)
+                     (i32.const 8)
+                    )
+                   )
+                   (block (result i32)
+                    (drop
+                     (br_if $label$267
+                      (i32.const 31)
+                      (i32.gt_u
+                       (local.get $7)
+                       (i32.const 16777215)
+                      )
+                     )
+                    )
+                    (i32.or
+                     (i32.and
+                      (i32.shr_u
+                       (local.get $7)
+                       (i32.add
+                        (local.tee $0
+                         (i32.add
+                          (i32.sub
+                           (i32.const 14)
+                           (i32.or
+                            (i32.or
+                             (local.tee $0
+                              (i32.and
+                               (i32.shr_u
+                                (i32.add
+                                 (local.tee $1
+                                  (i32.shl
+                                   (local.get $0)
+                                   (local.tee $3
+                                    (i32.and
+                                     (i32.shr_u
+                                      (i32.add
+                                       (local.get $0)
+                                       (i32.const 1048320)
+                                      )
+                                      (i32.const 16)
+                                     )
+                                     (i32.const 8)
+                                    )
+                                   )
+                                  )
+                                 )
+                                 (i32.const 520192)
+                                )
+                                (i32.const 16)
+                               )
+                               (i32.const 4)
+                              )
+                             )
+                             (local.get $3)
+                            )
+                            (local.tee $0
+                             (i32.and
+                              (i32.shr_u
+                               (i32.add
+                                (local.tee $1
+                                 (i32.shl
+                                  (local.get $1)
+                                  (local.get $0)
+                                 )
+                                )
+                                (i32.const 245760)
+                               )
+                               (i32.const 16)
+                              )
+                              (i32.const 2)
+                             )
+                            )
+                           )
+                          )
+                          (i32.shr_u
+                           (i32.shl
+                            (local.get $1)
+                            (local.get $0)
+                           )
+                           (i32.const 15)
+                          )
+                         )
+                        )
+                        (i32.const 7)
+                       )
+                      )
+                      (i32.const 1)
+                     )
+                     (i32.shl
+                      (local.get $0)
+                      (i32.const 1)
+                     )
+                    )
+                   )
+                   (i32.const 0)
+                  )
+                 )
+                )
+                (i32.const 2)
+               )
+               (i32.const 3948)
+              )
+             )
+             (i32.store offset=28
+              (local.get $6)
+              (local.get $2)
+             )
+             (i32.store offset=4
+              (local.tee $0
+               (i32.add
+                (local.get $6)
+                (i32.const 16)
+               )
+              )
+              (i32.const 0)
+             )
+             (i32.store
+              (local.get $0)
+              (i32.const 0)
+             )
+             (if
+              (i32.eqz
+               (i32.and
+                (local.tee $1
+                 (i32.load
+                  (i32.const 3648)
+                 )
+                )
+                (local.tee $0
+                 (i32.shl
+                  (i32.const 1)
+                  (local.get $2)
+                 )
+                )
+               )
+              )
+              (block
+               (i32.store
+                (i32.const 3648)
+                (i32.or
+                 (local.get $1)
+                 (local.get $0)
+                )
+               )
+               (i32.store
+                (local.get $3)
+                (local.get $6)
+               )
+               (i32.store offset=24
+                (local.get $6)
+                (local.get $3)
+               )
+               (i32.store offset=12
+                (local.get $6)
+                (local.get $6)
+               )
+               (i32.store offset=8
+                (local.get $6)
+                (local.get $6)
+               )
+               (br $label$217)
+              )
+             )
+             (local.set $0
+              (i32.load
+               (local.get $3)
+              )
+             )
+             (local.set $1
+              (i32.sub
+               (i32.const 25)
+               (i32.shr_u
+                (local.get $2)
+                (i32.const 1)
+               )
+              )
+             )
+             (local.set $2
+              (i32.shl
+               (local.get $7)
+               (if (result i32)
+                (i32.eq
+                 (local.get $2)
+                 (i32.const 31)
+                )
+                (i32.const 0)
+                (local.get $1)
+               )
+              )
+             )
+             (block $label$273
+              (block $label$274
+               (block $label$275
+                (loop $label$276
+                 (br_if $label$274
+                  (i32.eq
+                   (i32.and
+                    (i32.load offset=4
+                     (local.get $0)
+                    )
+                    (i32.const -8)
+                   )
+                   (local.get $7)
+                  )
+                 )
+                 (local.set $3
+                  (i32.shl
+                   (local.get $2)
+                   (i32.const 1)
+                  )
+                 )
+                 (br_if $label$275
+                  (i32.eqz
+                   (local.tee $1
+                    (i32.load
+                     (local.tee $2
+                      (i32.add
+                       (i32.add
+                        (local.get $0)
+                        (i32.const 16)
+                       )
+                       (i32.shl
+                        (i32.shr_u
+                         (local.get $2)
+                         (i32.const 31)
+                        )
+                        (i32.const 2)
+                       )
+                      )
+                     )
+                    )
+                   )
+                  )
+                 )
+                 (local.set $2
+                  (local.get $3)
+                 )
+                 (local.set $0
+                  (local.get $1)
+                 )
+                 (br $label$276)
+                )
+               )
+               (if
+                (i32.lt_u
+                 (local.get $2)
+                 (i32.load
+                  (i32.const 3660)
+                 )
+                )
+                (call $fimport$10)
+                (block
+                 (i32.store
+                  (local.get $2)
+                  (local.get $6)
+                 )
+                 (i32.store offset=24
+                  (local.get $6)
+                  (local.get $0)
+                 )
+                 (i32.store offset=12
+                  (local.get $6)
+                  (local.get $6)
+                 )
+                 (i32.store offset=8
+                  (local.get $6)
+                  (local.get $6)
+                 )
+                 (br $label$217)
+                )
+               )
+               (br $label$273)
+              )
+              (if
+               (i32.and
+                (i32.ge_u
+                 (local.tee $2
+                  (i32.load
+                   (local.tee $3
+                    (i32.add
+                     (local.get $0)
+                     (i32.const 8)
+                    )
+                   )
+                  )
+                 )
+                 (local.tee $1
+                  (i32.load
+                   (i32.const 3660)
+                  )
+                 )
+                )
+                (i32.ge_u
+                 (local.get $0)
+                 (local.get $1)
+                )
+               )
+               (block
+                (i32.store offset=12
+                 (local.get $2)
+                 (local.get $6)
+                )
+                (i32.store
+                 (local.get $3)
+                 (local.get $6)
+                )
+                (i32.store offset=8
+                 (local.get $6)
+                 (local.get $2)
+                )
+                (i32.store offset=12
+                 (local.get $6)
+                 (local.get $0)
+                )
+                (i32.store offset=24
+                 (local.get $6)
+                 (i32.const 0)
+                )
+               )
+               (call $fimport$10)
+              )
+             )
+            )
+           )
+          )
+          (global.set $global$1
+           (local.get $14)
+          )
+          (return
+           (i32.add
+            (local.get $13)
+            (i32.const 8)
+           )
+          )
+         )
+        )
+       )
+       (loop $label$281
+        (block $label$282
+         (if
+          (i32.le_u
+           (local.tee $2
+            (i32.load
+             (local.get $5)
+            )
+           )
+           (local.get $8)
+          )
+          (br_if $label$282
+           (i32.gt_u
+            (local.tee $13
+             (i32.add
+              (local.get $2)
+              (i32.load offset=4
+               (local.get $5)
+              )
+             )
+            )
+            (local.get $8)
+           )
+          )
+         )
+         (local.set $5
+          (i32.load offset=8
+           (local.get $5)
+          )
+         )
+         (br $label$281)
+        )
+       )
+       (local.set $2
+        (i32.and
+         (i32.sub
+          (i32.const 0)
+          (local.tee $5
+           (i32.add
+            (local.tee $7
+             (i32.add
+              (local.get $13)
+              (i32.const -47)
+             )
+            )
+            (i32.const 8)
+           )
+          )
+         )
+         (i32.const 7)
+        )
+       )
+       (local.set $10
+        (i32.add
+         (local.tee $7
+          (if (result i32)
+           (i32.lt_u
+            (local.tee $2
+             (i32.add
+              (local.get $7)
+              (if (result i32)
+               (i32.and
+                (local.get $5)
+                (i32.const 7)
+               )
+               (local.get $2)
+               (i32.const 0)
+              )
+             )
+            )
+            (local.tee $12
+             (i32.add
+              (local.get $8)
+              (i32.const 16)
+             )
+            )
+           )
+           (local.get $8)
+           (local.get $2)
+          )
+         )
+         (i32.const 8)
+        )
+       )
+       (local.set $5
+        (i32.add
+         (local.get $7)
+         (i32.const 24)
+        )
+       )
+       (local.set $9
+        (i32.add
+         (local.get $3)
+         (i32.const -40)
+        )
+       )
+       (local.set $2
+        (i32.and
+         (i32.sub
+          (i32.const 0)
+          (local.tee $4
+           (i32.add
+            (local.get $1)
+            (i32.const 8)
+           )
+          )
+         )
+         (i32.const 7)
+        )
+       )
+       (i32.store
+        (i32.const 3668)
+        (local.tee $4
+         (i32.add
+          (local.get $1)
+          (if (result i32)
+           (i32.and
+            (local.get $4)
+            (i32.const 7)
+           )
+           (local.get $2)
+           (local.tee $2
+            (i32.const 0)
+           )
+          )
+         )
+        )
+       )
+       (i32.store
+        (i32.const 3656)
+        (local.tee $2
+         (i32.sub
+          (local.get $9)
+          (local.get $2)
+         )
+        )
+       )
+       (i32.store offset=4
+        (local.get $4)
+        (i32.or
+         (local.get $2)
+         (i32.const 1)
+        )
+       )
+       (i32.store offset=4
+        (i32.add
+         (local.get $4)
+         (local.get $2)
+        )
+        (i32.const 40)
+       )
+       (i32.store
+        (i32.const 3672)
+        (i32.load
+         (i32.const 4132)
+        )
+       )
+       (i32.store
+        (local.tee $2
+         (i32.add
+          (local.get $7)
+          (i32.const 4)
+         )
+        )
+        (i32.const 27)
+       )
+       (i64.store align=4
+        (local.get $10)
+        (i64.load align=4
+         (i32.const 4092)
+        )
+       )
+       (i64.store offset=8 align=4
+        (local.get $10)
+        (i64.load align=4
+         (i32.const 4100)
+        )
+       )
+       (i32.store
+        (i32.const 4092)
+        (local.get $1)
+       )
+       (i32.store
+        (i32.const 4096)
+        (local.get $3)
+       )
+       (i32.store
+        (i32.const 4104)
+        (i32.const 0)
+       )
+       (i32.store
+        (i32.const 4100)
+        (local.get $10)
+       )
+       (local.set $1
+        (local.get $5)
+       )
+       (loop $label$290
+        (i32.store
+         (local.tee $1
+          (i32.add
+           (local.get $1)
+           (i32.const 4)
+          )
+         )
+         (i32.const 7)
+        )
+        (br_if $label$290
+         (i32.lt_u
+          (i32.add
+           (local.get $1)
+           (i32.const 4)
+          )
+          (local.get $13)
+         )
+        )
+       )
+       (if
+        (i32.ne
+         (local.get $7)
+         (local.get $8)
+        )
+        (block
+         (i32.store
+          (local.get $2)
+          (i32.and
+           (i32.load
+            (local.get $2)
+           )
+           (i32.const -2)
+          )
+         )
+         (i32.store offset=4
+          (local.get $8)
+          (i32.or
+           (local.tee $4
+            (i32.sub
+             (local.get $7)
+             (local.get $8)
+            )
+           )
+           (i32.const 1)
+          )
+         )
+         (i32.store
+          (local.get $7)
+          (local.get $4)
+         )
+         (local.set $1
+          (i32.shr_u
+           (local.get $4)
+           (i32.const 3)
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.get $4)
+           (i32.const 256)
+          )
+          (block
+           (local.set $2
+            (i32.add
+             (i32.shl
+              (i32.shl
+               (local.get $1)
+               (i32.const 1)
+              )
+              (i32.const 2)
+             )
+             (i32.const 3684)
+            )
+           )
+           (if
+            (i32.and
+             (local.tee $3
+              (i32.load
+               (i32.const 3644)
+              )
+             )
+             (local.tee $1
+              (i32.shl
+               (i32.const 1)
+               (local.get $1)
+              )
+             )
+            )
+            (if
+             (i32.lt_u
+              (local.tee $1
+               (i32.load
+                (local.tee $3
+                 (i32.add
+                  (local.get $2)
+                  (i32.const 8)
+                 )
+                )
+               )
+              )
+              (i32.load
+               (i32.const 3660)
+              )
+             )
+             (call $fimport$10)
+             (block
+              (local.set $15
+               (local.get $3)
+              )
+              (local.set $11
+               (local.get $1)
+              )
+             )
+            )
+            (block
+             (i32.store
+              (i32.const 3644)
+              (i32.or
+               (local.get $3)
+               (local.get $1)
+              )
+             )
+             (local.set $15
+              (i32.add
+               (local.get $2)
+               (i32.const 8)
+              )
+             )
+             (local.set $11
+              (local.get $2)
+             )
+            )
+           )
+           (i32.store
+            (local.get $15)
+            (local.get $8)
+           )
+           (i32.store offset=12
+            (local.get $11)
+            (local.get $8)
+           )
+           (i32.store offset=8
+            (local.get $8)
+            (local.get $11)
+           )
+           (i32.store offset=12
+            (local.get $8)
+            (local.get $2)
+           )
+           (br $label$198)
+          )
+         )
+         (local.set $2
+          (i32.add
+           (i32.shl
+            (local.tee $5
+             (if (result i32)
+              (local.tee $1
+               (i32.shr_u
+                (local.get $4)
+                (i32.const 8)
+               )
+              )
+              (if (result i32)
+               (i32.gt_u
+                (local.get $4)
+                (i32.const 16777215)
+               )
+               (i32.const 31)
+               (i32.or
+                (i32.and
+                 (i32.shr_u
+                  (local.get $4)
+                  (i32.add
+                   (local.tee $1
+                    (i32.add
+                     (i32.sub
+                      (i32.const 14)
+                      (i32.or
+                       (i32.or
+                        (local.tee $1
+                         (i32.and
+                          (i32.shr_u
+                           (i32.add
+                            (local.tee $3
+                             (i32.shl
+                              (local.get $1)
+                              (local.tee $2
+                               (i32.and
+                                (i32.shr_u
+                                 (i32.add
+                                  (local.get $1)
+                                  (i32.const 1048320)
+                                 )
+                                 (i32.const 16)
+                                )
+                                (i32.const 8)
+                               )
+                              )
+                             )
+                            )
+                            (i32.const 520192)
+                           )
+                           (i32.const 16)
+                          )
+                          (i32.const 4)
+                         )
+                        )
+                        (local.get $2)
+                       )
+                       (local.tee $1
+                        (i32.and
+                         (i32.shr_u
+                          (i32.add
+                           (local.tee $3
+                            (i32.shl
+                             (local.get $3)
+                             (local.get $1)
+                            )
+                           )
+                           (i32.const 245760)
+                          )
+                          (i32.const 16)
+                         )
+                         (i32.const 2)
+                        )
+                       )
+                      )
+                     )
+                     (i32.shr_u
+                      (i32.shl
+                       (local.get $3)
+                       (local.get $1)
+                      )
+                      (i32.const 15)
+                     )
+                    )
+                   )
+                   (i32.const 7)
+                  )
+                 )
+                 (i32.const 1)
+                )
+                (i32.shl
+                 (local.get $1)
+                 (i32.const 1)
+                )
+               )
+              )
+              (i32.const 0)
+             )
+            )
+            (i32.const 2)
+           )
+           (i32.const 3948)
+          )
+         )
+         (i32.store offset=28
+          (local.get $8)
+          (local.get $5)
+         )
+         (i32.store offset=20
+          (local.get $8)
+          (i32.const 0)
+         )
+         (i32.store
+          (local.get $12)
+          (i32.const 0)
+         )
+         (if
+          (i32.eqz
+           (i32.and
+            (local.tee $3
+             (i32.load
+              (i32.const 3648)
+             )
+            )
+            (local.tee $1
+             (i32.shl
+              (i32.const 1)
+              (local.get $5)
+             )
+            )
+           )
+          )
+          (block
+           (i32.store
+            (i32.const 3648)
+            (i32.or
+             (local.get $3)
+             (local.get $1)
+            )
+           )
+           (i32.store
+            (local.get $2)
+            (local.get $8)
+           )
+           (i32.store offset=24
+            (local.get $8)
+            (local.get $2)
+           )
+           (i32.store offset=12
+            (local.get $8)
+            (local.get $8)
+           )
+           (i32.store offset=8
+            (local.get $8)
+            (local.get $8)
+           )
+           (br $label$198)
+          )
+         )
+         (local.set $1
+          (i32.load
+           (local.get $2)
+          )
+         )
+         (local.set $3
+          (i32.sub
+           (i32.const 25)
+           (i32.shr_u
+            (local.get $5)
+            (i32.const 1)
+           )
+          )
+         )
+         (local.set $5
+          (i32.shl
+           (local.get $4)
+           (if (result i32)
+            (i32.eq
+             (local.get $5)
+             (i32.const 31)
+            )
+            (i32.const 0)
+            (local.get $3)
+           )
+          )
+         )
+         (block $label$304
+          (block $label$305
+           (block $label$306
+            (loop $label$307
+             (br_if $label$305
+              (i32.eq
+               (i32.and
+                (i32.load offset=4
+                 (local.get $1)
+                )
+                (i32.const -8)
+               )
+               (local.get $4)
+              )
+             )
+             (local.set $2
+              (i32.shl
+               (local.get $5)
+               (i32.const 1)
+              )
+             )
+             (br_if $label$306
+              (i32.eqz
+               (local.tee $3
+                (i32.load
+                 (local.tee $5
+                  (i32.add
+                   (i32.add
+                    (local.get $1)
+                    (i32.const 16)
+                   )
+                   (i32.shl
+                    (i32.shr_u
+                     (local.get $5)
+                     (i32.const 31)
+                    )
+                    (i32.const 2)
+                   )
+                  )
+                 )
+                )
+               )
+              )
+             )
+             (local.set $5
+              (local.get $2)
+             )
+             (local.set $1
+              (local.get $3)
+             )
+             (br $label$307)
+            )
+           )
+           (if
+            (i32.lt_u
+             (local.get $5)
+             (i32.load
+              (i32.const 3660)
+             )
+            )
+            (call $fimport$10)
+            (block
+             (i32.store
+              (local.get $5)
+              (local.get $8)
+             )
+             (i32.store offset=24
+              (local.get $8)
+              (local.get $1)
+             )
+             (i32.store offset=12
+              (local.get $8)
+              (local.get $8)
+             )
+             (i32.store offset=8
+              (local.get $8)
+              (local.get $8)
+             )
+             (br $label$198)
+            )
+           )
+           (br $label$304)
+          )
+          (if
+           (i32.and
+            (i32.ge_u
+             (local.tee $5
+              (i32.load
+               (local.tee $2
+                (i32.add
+                 (local.get $1)
+                 (i32.const 8)
+                )
+               )
+              )
+             )
+             (local.tee $3
+              (i32.load
+               (i32.const 3660)
+              )
+             )
+            )
+            (i32.ge_u
+             (local.get $1)
+             (local.get $3)
+            )
+           )
+           (block
+            (i32.store offset=12
+             (local.get $5)
+             (local.get $8)
+            )
+            (i32.store
+             (local.get $2)
+             (local.get $8)
+            )
+            (i32.store offset=8
+             (local.get $8)
+             (local.get $5)
+            )
+            (i32.store offset=12
+             (local.get $8)
+             (local.get $1)
+            )
+            (i32.store offset=24
+             (local.get $8)
+             (i32.const 0)
+            )
+           )
+           (call $fimport$10)
+          )
+         )
+        )
+       )
+      )
+      (block
+       (if
+        (i32.or
+         (i32.eqz
+          (local.tee $2
+           (i32.load
+            (i32.const 3660)
+           )
+          )
+         )
+         (i32.lt_u
+          (local.get $1)
+          (local.get $2)
+         )
+        )
+        (i32.store
+         (i32.const 3660)
+         (local.get $1)
+        )
+       )
+       (i32.store
+        (i32.const 4092)
+        (local.get $1)
+       )
+       (i32.store
+        (i32.const 4096)
+        (local.get $3)
+       )
+       (i32.store
+        (i32.const 4104)
+        (i32.const 0)
+       )
+       (i32.store
+        (i32.const 3680)
+        (i32.load
+         (i32.const 4116)
+        )
+       )
+       (i32.store
+        (i32.const 3676)
+        (i32.const -1)
+       )
+       (local.set $2
+        (i32.const 0)
+       )
+       (loop $label$314
+        (i32.store offset=12
+         (local.tee $5
+          (i32.add
+           (i32.shl
+            (i32.shl
+             (local.get $2)
+             (i32.const 1)
+            )
+            (i32.const 2)
+           )
+           (i32.const 3684)
+          )
+         )
+         (local.get $5)
+        )
+        (i32.store offset=8
+         (local.get $5)
+         (local.get $5)
+        )
+        (br_if $label$314
+         (i32.ne
+          (local.tee $2
+           (i32.add
+            (local.get $2)
+            (i32.const 1)
+           )
+          )
+          (i32.const 32)
+         )
+        )
+       )
+       (local.set $5
+        (i32.add
+         (local.get $3)
+         (i32.const -40)
+        )
+       )
+       (local.set $3
+        (i32.and
+         (i32.sub
+          (i32.const 0)
+          (local.tee $2
+           (i32.add
+            (local.get $1)
+            (i32.const 8)
+           )
+          )
+         )
+         (i32.const 7)
+        )
+       )
+       (i32.store
+        (i32.const 3668)
+        (local.tee $3
+         (i32.add
+          (local.get $1)
+          (local.tee $1
+           (if (result i32)
+            (i32.and
+             (local.get $2)
+             (i32.const 7)
+            )
+            (local.get $3)
+            (i32.const 0)
+           )
+          )
+         )
+        )
+       )
+       (i32.store
+        (i32.const 3656)
+        (local.tee $1
+         (i32.sub
+          (local.get $5)
+          (local.get $1)
+         )
+        )
+       )
+       (i32.store offset=4
+        (local.get $3)
+        (i32.or
+         (local.get $1)
+         (i32.const 1)
+        )
+       )
+       (i32.store offset=4
+        (i32.add
+         (local.get $3)
+         (local.get $1)
+        )
+        (i32.const 40)
+       )
+       (i32.store
+        (i32.const 3672)
+        (i32.load
+         (i32.const 4132)
+        )
+       )
+      )
+     )
+    )
+    (if
+     (i32.gt_u
+      (local.tee $1
+       (i32.load
+        (i32.const 3656)
+       )
+      )
+      (local.get $0)
+     )
+     (block
+      (i32.store
+       (i32.const 3656)
+       (local.tee $3
+        (i32.sub
+         (local.get $1)
+         (local.get $0)
+        )
+       )
+      )
+      (i32.store
+       (i32.const 3668)
+       (local.tee $1
+        (i32.add
+         (local.tee $2
+          (i32.load
+           (i32.const 3668)
+          )
+         )
+         (local.get $0)
+        )
+       )
+      )
+      (i32.store offset=4
+       (local.get $1)
+       (i32.or
+        (local.get $3)
+        (i32.const 1)
+       )
+      )
+      (i32.store offset=4
+       (local.get $2)
+       (i32.or
+        (local.get $0)
+        (i32.const 3)
+       )
+      )
+      (global.set $global$1
+       (local.get $14)
+      )
+      (return
+       (i32.add
+        (local.get $2)
+        (i32.const 8)
+       )
+      )
+     )
+    )
+   )
+   (i32.store
+    (call $11)
+    (i32.const 12)
+   )
+   (global.set $global$1
+    (local.get $14)
+   )
+   (i32.const 0)
   )
-  (func $27 (;40;) (type $11) (param $0 f64) (param $1 i32) (result f64)
-    (local $2 i64) (local $3 i64)
-    block $label$1 (result f64) ;; label = @1
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          block $label$4 ;; label = @4
-            block $label$5 ;; label = @5
-              local.get $0
-              i64.reinterpret_f64
-              local.tee $2
-              i64.const 52
-              i64.shr_u
-              local.tee $3
-              i32.wrap_i64
-              i32.const 65535
-              i32.and
-              i32.const 2047
-              i32.and
-              i32.const 16
-              i32.shl
-              i32.const 16
-              i32.shr_s
-              i32.const 0
-              i32.sub
-              br_table 0 (;@5;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 2 (;@3;) 1 (;@4;) 2 (;@3;)
-            end
-            local.get $1
-            local.get $0
-            f64.const 0x0p+0 (;=0;)
-            f64.ne
-            if (result i32) ;; label = @5
-              block (result i32) ;; label = @6
-                local.get $0
-                f64.const 0x1p+64 (;=18446744073709552000;)
-                f64.mul
-                local.get $1
-                call $27
-                local.set $0
-                local.get $1
-                i32.load
-                i32.const -64
-                i32.add
-              end
-            else
-              i32.const 0
-            end
-            i32.store
-            br 2 (;@2;)
-          end
-          br 1 (;@2;)
-        end
-        local.get $1
-        local.get $3
-        i32.wrap_i64
-        i32.const 2047
-        i32.and
-        i32.const -1022
-        i32.add
-        i32.store
-        local.get $2
-        i64.const -9218868437227405313
-        i64.and
-        i64.const 4602678819172646912
-        i64.or
-        f64.reinterpret_i64
-        local.set $0
-      end
-      local.get $0
-    end
+ )
+ (func $32 (; 45 ;) (type $2) (param $0 i32)
+  (local $1 i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (local $15 i32)
+  (block $label$1
+   (if
+    (i32.eqz
+     (local.get $0)
+    )
+    (return)
+   )
+   (if
+    (i32.lt_u
+     (local.tee $1
+      (i32.add
+       (local.get $0)
+       (i32.const -8)
+      )
+     )
+     (local.tee $11
+      (i32.load
+       (i32.const 3660)
+      )
+     )
+    )
+    (call $fimport$10)
+   )
+   (if
+    (i32.eq
+     (local.tee $8
+      (i32.and
+       (local.tee $0
+        (i32.load
+         (i32.add
+          (local.get $0)
+          (i32.const -4)
+         )
+        )
+       )
+       (i32.const 3)
+      )
+     )
+     (i32.const 1)
+    )
+    (call $fimport$10)
+   )
+   (local.set $6
+    (i32.add
+     (local.get $1)
+     (local.tee $4
+      (i32.and
+       (local.get $0)
+       (i32.const -8)
+      )
+     )
+    )
+   )
+   (block $label$5
+    (if
+     (i32.and
+      (local.get $0)
+      (i32.const 1)
+     )
+     (block
+      (local.set $3
+       (local.get $1)
+      )
+      (local.set $2
+       (local.get $4)
+      )
+     )
+     (block
+      (if
+       (i32.eqz
+        (local.get $8)
+       )
+       (return)
+      )
+      (if
+       (i32.lt_u
+        (local.tee $0
+         (i32.add
+          (local.get $1)
+          (i32.sub
+           (i32.const 0)
+           (local.tee $8
+            (i32.load
+             (local.get $1)
+            )
+           )
+          )
+         )
+        )
+        (local.get $11)
+       )
+       (call $fimport$10)
+      )
+      (local.set $1
+       (i32.add
+        (local.get $8)
+        (local.get $4)
+       )
+      )
+      (if
+       (i32.eq
+        (local.get $0)
+        (i32.load
+         (i32.const 3664)
+        )
+       )
+       (block
+        (if
+         (i32.ne
+          (i32.and
+           (local.tee $3
+            (i32.load
+             (local.tee $2
+              (i32.add
+               (local.get $6)
+               (i32.const 4)
+              )
+             )
+            )
+           )
+           (i32.const 3)
+          )
+          (i32.const 3)
+         )
+         (block
+          (local.set $3
+           (local.get $0)
+          )
+          (local.set $2
+           (local.get $1)
+          )
+          (br $label$5)
+         )
+        )
+        (i32.store
+         (i32.const 3652)
+         (local.get $1)
+        )
+        (i32.store
+         (local.get $2)
+         (i32.and
+          (local.get $3)
+          (i32.const -2)
+         )
+        )
+        (i32.store offset=4
+         (local.get $0)
+         (i32.or
+          (local.get $1)
+          (i32.const 1)
+         )
+        )
+        (i32.store
+         (i32.add
+          (local.get $0)
+          (local.get $1)
+         )
+         (local.get $1)
+        )
+        (return)
+       )
+      )
+      (local.set $10
+       (i32.shr_u
+        (local.get $8)
+        (i32.const 3)
+       )
+      )
+      (if
+       (i32.lt_u
+        (local.get $8)
+        (i32.const 256)
+       )
+       (block
+        (local.set $3
+         (i32.load offset=12
+          (local.get $0)
+         )
+        )
+        (if
+         (i32.ne
+          (local.tee $4
+           (i32.load offset=8
+            (local.get $0)
+           )
+          )
+          (local.tee $2
+           (i32.add
+            (i32.shl
+             (i32.shl
+              (local.get $10)
+              (i32.const 1)
+             )
+             (i32.const 2)
+            )
+            (i32.const 3684)
+           )
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $4)
+            (local.get $11)
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.ne
+            (i32.load offset=12
+             (local.get $4)
+            )
+            (local.get $0)
+           )
+           (call $fimport$10)
+          )
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $3)
+          (local.get $4)
+         )
+         (block
+          (i32.store
+           (i32.const 3644)
+           (i32.and
+            (i32.load
+             (i32.const 3644)
+            )
+            (i32.xor
+             (i32.shl
+              (i32.const 1)
+              (local.get $10)
+             )
+             (i32.const -1)
+            )
+           )
+          )
+          (local.set $3
+           (local.get $0)
+          )
+          (local.set $2
+           (local.get $1)
+          )
+          (br $label$5)
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $3)
+          (local.get $2)
+         )
+         (local.set $5
+          (i32.add
+           (local.get $3)
+           (i32.const 8)
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $3)
+            (local.get $11)
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.eq
+            (i32.load
+             (local.tee $2
+              (i32.add
+               (local.get $3)
+               (i32.const 8)
+              )
+             )
+            )
+            (local.get $0)
+           )
+           (local.set $5
+            (local.get $2)
+           )
+           (call $fimport$10)
+          )
+         )
+        )
+        (i32.store offset=12
+         (local.get $4)
+         (local.get $3)
+        )
+        (i32.store
+         (local.get $5)
+         (local.get $4)
+        )
+        (local.set $3
+         (local.get $0)
+        )
+        (local.set $2
+         (local.get $1)
+        )
+        (br $label$5)
+       )
+      )
+      (local.set $12
+       (i32.load offset=24
+        (local.get $0)
+       )
+      )
+      (block $label$22
+       (if
+        (i32.eq
+         (local.tee $4
+          (i32.load offset=12
+           (local.get $0)
+          )
+         )
+         (local.get $0)
+        )
+        (block
+         (if
+          (local.tee $4
+           (i32.load
+            (local.tee $8
+             (i32.add
+              (local.tee $5
+               (i32.add
+                (local.get $0)
+                (i32.const 16)
+               )
+              )
+              (i32.const 4)
+             )
+            )
+           )
+          )
+          (local.set $5
+           (local.get $8)
+          )
+          (if
+           (i32.eqz
+            (local.tee $4
+             (i32.load
+              (local.get $5)
+             )
+            )
+           )
+           (block
+            (local.set $7
+             (i32.const 0)
+            )
+            (br $label$22)
+           )
+          )
+         )
+         (loop $label$27
+          (if
+           (local.tee $10
+            (i32.load
+             (local.tee $8
+              (i32.add
+               (local.get $4)
+               (i32.const 20)
+              )
+             )
+            )
+           )
+           (block
+            (local.set $4
+             (local.get $10)
+            )
+            (local.set $5
+             (local.get $8)
+            )
+            (br $label$27)
+           )
+          )
+          (if
+           (local.tee $10
+            (i32.load
+             (local.tee $8
+              (i32.add
+               (local.get $4)
+               (i32.const 16)
+              )
+             )
+            )
+           )
+           (block
+            (local.set $4
+             (local.get $10)
+            )
+            (local.set $5
+             (local.get $8)
+            )
+            (br $label$27)
+           )
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.get $5)
+           (local.get $11)
+          )
+          (call $fimport$10)
+          (block
+           (i32.store
+            (local.get $5)
+            (i32.const 0)
+           )
+           (local.set $7
+            (local.get $4)
+           )
+          )
+         )
+        )
+        (block
+         (if
+          (i32.lt_u
+           (local.tee $5
+            (i32.load offset=8
+             (local.get $0)
+            )
+           )
+           (local.get $11)
+          )
+          (call $fimport$10)
+         )
+         (if
+          (i32.ne
+           (i32.load
+            (local.tee $8
+             (i32.add
+              (local.get $5)
+              (i32.const 12)
+             )
+            )
+           )
+           (local.get $0)
+          )
+          (call $fimport$10)
+         )
+         (if
+          (i32.eq
+           (i32.load
+            (local.tee $10
+             (i32.add
+              (local.get $4)
+              (i32.const 8)
+             )
+            )
+           )
+           (local.get $0)
+          )
+          (block
+           (i32.store
+            (local.get $8)
+            (local.get $4)
+           )
+           (i32.store
+            (local.get $10)
+            (local.get $5)
+           )
+           (local.set $7
+            (local.get $4)
+           )
+          )
+          (call $fimport$10)
+         )
+        )
+       )
+      )
+      (if
+       (local.get $12)
+       (block
+        (if
+         (i32.eq
+          (local.get $0)
+          (i32.load
+           (local.tee $5
+            (i32.add
+             (i32.shl
+              (local.tee $4
+               (i32.load offset=28
+                (local.get $0)
+               )
+              )
+              (i32.const 2)
+             )
+             (i32.const 3948)
+            )
+           )
+          )
+         )
+         (block
+          (i32.store
+           (local.get $5)
+           (local.get $7)
+          )
+          (if
+           (i32.eqz
+            (local.get $7)
+           )
+           (block
+            (i32.store
+             (i32.const 3648)
+             (i32.and
+              (i32.load
+               (i32.const 3648)
+              )
+              (i32.xor
+               (i32.shl
+                (i32.const 1)
+                (local.get $4)
+               )
+               (i32.const -1)
+              )
+             )
+            )
+            (local.set $3
+             (local.get $0)
+            )
+            (local.set $2
+             (local.get $1)
+            )
+            (br $label$5)
+           )
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $12)
+            (i32.load
+             (i32.const 3660)
+            )
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.eq
+            (i32.load
+             (local.tee $4
+              (i32.add
+               (local.get $12)
+               (i32.const 16)
+              )
+             )
+            )
+            (local.get $0)
+           )
+           (i32.store
+            (local.get $4)
+            (local.get $7)
+           )
+           (i32.store offset=20
+            (local.get $12)
+            (local.get $7)
+           )
+          )
+          (if
+           (i32.eqz
+            (local.get $7)
+           )
+           (block
+            (local.set $3
+             (local.get $0)
+            )
+            (local.set $2
+             (local.get $1)
+            )
+            (br $label$5)
+           )
+          )
+         )
+        )
+        (if
+         (i32.lt_u
+          (local.get $7)
+          (local.tee $5
+           (i32.load
+            (i32.const 3660)
+           )
+          )
+         )
+         (call $fimport$10)
+        )
+        (i32.store offset=24
+         (local.get $7)
+         (local.get $12)
+        )
+        (if
+         (local.tee $4
+          (i32.load
+           (local.tee $8
+            (i32.add
+             (local.get $0)
+             (i32.const 16)
+            )
+           )
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.get $4)
+           (local.get $5)
+          )
+          (call $fimport$10)
+          (block
+           (i32.store offset=16
+            (local.get $7)
+            (local.get $4)
+           )
+           (i32.store offset=24
+            (local.get $4)
+            (local.get $7)
+           )
+          )
+         )
+        )
+        (if
+         (local.tee $4
+          (i32.load offset=4
+           (local.get $8)
+          )
+         )
+         (if
+          (i32.lt_u
+           (local.get $4)
+           (i32.load
+            (i32.const 3660)
+           )
+          )
+          (call $fimport$10)
+          (block
+           (i32.store offset=20
+            (local.get $7)
+            (local.get $4)
+           )
+           (i32.store offset=24
+            (local.get $4)
+            (local.get $7)
+           )
+           (local.set $3
+            (local.get $0)
+           )
+           (local.set $2
+            (local.get $1)
+           )
+          )
+         )
+         (block
+          (local.set $3
+           (local.get $0)
+          )
+          (local.set $2
+           (local.get $1)
+          )
+         )
+        )
+       )
+       (block
+        (local.set $3
+         (local.get $0)
+        )
+        (local.set $2
+         (local.get $1)
+        )
+       )
+      )
+     )
+    )
+   )
+   (if
+    (i32.ge_u
+     (local.get $3)
+     (local.get $6)
+    )
+    (call $fimport$10)
+   )
+   (if
+    (i32.eqz
+     (i32.and
+      (local.tee $0
+       (i32.load
+        (local.tee $1
+         (i32.add
+          (local.get $6)
+          (i32.const 4)
+         )
+        )
+       )
+      )
+      (i32.const 1)
+     )
+    )
+    (call $fimport$10)
+   )
+   (if
+    (i32.and
+     (local.get $0)
+     (i32.const 2)
+    )
+    (block
+     (i32.store
+      (local.get $1)
+      (i32.and
+       (local.get $0)
+       (i32.const -2)
+      )
+     )
+     (i32.store offset=4
+      (local.get $3)
+      (i32.or
+       (local.get $2)
+       (i32.const 1)
+      )
+     )
+     (i32.store
+      (i32.add
+       (local.get $3)
+       (local.get $2)
+      )
+      (local.get $2)
+     )
+    )
+    (block
+     (if
+      (i32.eq
+       (local.get $6)
+       (i32.load
+        (i32.const 3668)
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 3656)
+        (local.tee $0
+         (i32.add
+          (i32.load
+           (i32.const 3656)
+          )
+          (local.get $2)
+         )
+        )
+       )
+       (i32.store
+        (i32.const 3668)
+        (local.get $3)
+       )
+       (i32.store offset=4
+        (local.get $3)
+        (i32.or
+         (local.get $0)
+         (i32.const 1)
+        )
+       )
+       (if
+        (i32.ne
+         (local.get $3)
+         (i32.load
+          (i32.const 3664)
+         )
+        )
+        (return)
+       )
+       (i32.store
+        (i32.const 3664)
+        (i32.const 0)
+       )
+       (i32.store
+        (i32.const 3652)
+        (i32.const 0)
+       )
+       (return)
+      )
+     )
+     (if
+      (i32.eq
+       (local.get $6)
+       (i32.load
+        (i32.const 3664)
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 3652)
+        (local.tee $0
+         (i32.add
+          (i32.load
+           (i32.const 3652)
+          )
+          (local.get $2)
+         )
+        )
+       )
+       (i32.store
+        (i32.const 3664)
+        (local.get $3)
+       )
+       (i32.store offset=4
+        (local.get $3)
+        (i32.or
+         (local.get $0)
+         (i32.const 1)
+        )
+       )
+       (i32.store
+        (i32.add
+         (local.get $3)
+         (local.get $0)
+        )
+        (local.get $0)
+       )
+       (return)
+      )
+     )
+     (local.set $5
+      (i32.add
+       (i32.and
+        (local.get $0)
+        (i32.const -8)
+       )
+       (local.get $2)
+      )
+     )
+     (local.set $4
+      (i32.shr_u
+       (local.get $0)
+       (i32.const 3)
+      )
+     )
+     (block $label$61
+      (if
+       (i32.lt_u
+        (local.get $0)
+        (i32.const 256)
+       )
+       (block
+        (local.set $2
+         (i32.load offset=12
+          (local.get $6)
+         )
+        )
+        (if
+         (i32.ne
+          (local.tee $1
+           (i32.load offset=8
+            (local.get $6)
+           )
+          )
+          (local.tee $0
+           (i32.add
+            (i32.shl
+             (i32.shl
+              (local.get $4)
+              (i32.const 1)
+             )
+             (i32.const 2)
+            )
+            (i32.const 3684)
+           )
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $1)
+            (i32.load
+             (i32.const 3660)
+            )
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.ne
+            (i32.load offset=12
+             (local.get $1)
+            )
+            (local.get $6)
+           )
+           (call $fimport$10)
+          )
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $2)
+          (local.get $1)
+         )
+         (block
+          (i32.store
+           (i32.const 3644)
+           (i32.and
+            (i32.load
+             (i32.const 3644)
+            )
+            (i32.xor
+             (i32.shl
+              (i32.const 1)
+              (local.get $4)
+             )
+             (i32.const -1)
+            )
+           )
+          )
+          (br $label$61)
+         )
+        )
+        (if
+         (i32.eq
+          (local.get $2)
+          (local.get $0)
+         )
+         (local.set $14
+          (i32.add
+           (local.get $2)
+           (i32.const 8)
+          )
+         )
+         (block
+          (if
+           (i32.lt_u
+            (local.get $2)
+            (i32.load
+             (i32.const 3660)
+            )
+           )
+           (call $fimport$10)
+          )
+          (if
+           (i32.eq
+            (i32.load
+             (local.tee $0
+              (i32.add
+               (local.get $2)
+               (i32.const 8)
+              )
+             )
+            )
+            (local.get $6)
+           )
+           (local.set $14
+            (local.get $0)
+           )
+           (call $fimport$10)
+          )
+         )
+        )
+        (i32.store offset=12
+         (local.get $1)
+         (local.get $2)
+        )
+        (i32.store
+         (local.get $14)
+         (local.get $1)
+        )
+       )
+       (block
+        (local.set $7
+         (i32.load offset=24
+          (local.get $6)
+         )
+        )
+        (block $label$73
+         (if
+          (i32.eq
+           (local.tee $0
+            (i32.load offset=12
+             (local.get $6)
+            )
+           )
+           (local.get $6)
+          )
+          (block
+           (if
+            (local.tee $0
+             (i32.load
+              (local.tee $1
+               (i32.add
+                (local.tee $2
+                 (i32.add
+                  (local.get $6)
+                  (i32.const 16)
+                 )
+                )
+                (i32.const 4)
+               )
+              )
+             )
+            )
+            (local.set $2
+             (local.get $1)
+            )
+            (if
+             (i32.eqz
+              (local.tee $0
+               (i32.load
+                (local.get $2)
+               )
+              )
+             )
+             (block
+              (local.set $9
+               (i32.const 0)
+              )
+              (br $label$73)
+             )
+            )
+           )
+           (loop $label$78
+            (if
+             (local.tee $4
+              (i32.load
+               (local.tee $1
+                (i32.add
+                 (local.get $0)
+                 (i32.const 20)
+                )
+               )
+              )
+             )
+             (block
+              (local.set $0
+               (local.get $4)
+              )
+              (local.set $2
+               (local.get $1)
+              )
+              (br $label$78)
+             )
+            )
+            (if
+             (local.tee $4
+              (i32.load
+               (local.tee $1
+                (i32.add
+                 (local.get $0)
+                 (i32.const 16)
+                )
+               )
+              )
+             )
+             (block
+              (local.set $0
+               (local.get $4)
+              )
+              (local.set $2
+               (local.get $1)
+              )
+              (br $label$78)
+             )
+            )
+           )
+           (if
+            (i32.lt_u
+             (local.get $2)
+             (i32.load
+              (i32.const 3660)
+             )
+            )
+            (call $fimport$10)
+            (block
+             (i32.store
+              (local.get $2)
+              (i32.const 0)
+             )
+             (local.set $9
+              (local.get $0)
+             )
+            )
+           )
+          )
+          (block
+           (if
+            (i32.lt_u
+             (local.tee $2
+              (i32.load offset=8
+               (local.get $6)
+              )
+             )
+             (i32.load
+              (i32.const 3660)
+             )
+            )
+            (call $fimport$10)
+           )
+           (if
+            (i32.ne
+             (i32.load
+              (local.tee $1
+               (i32.add
+                (local.get $2)
+                (i32.const 12)
+               )
+              )
+             )
+             (local.get $6)
+            )
+            (call $fimport$10)
+           )
+           (if
+            (i32.eq
+             (i32.load
+              (local.tee $4
+               (i32.add
+                (local.get $0)
+                (i32.const 8)
+               )
+              )
+             )
+             (local.get $6)
+            )
+            (block
+             (i32.store
+              (local.get $1)
+              (local.get $0)
+             )
+             (i32.store
+              (local.get $4)
+              (local.get $2)
+             )
+             (local.set $9
+              (local.get $0)
+             )
+            )
+            (call $fimport$10)
+           )
+          )
+         )
+        )
+        (if
+         (local.get $7)
+         (block
+          (if
+           (i32.eq
+            (local.get $6)
+            (i32.load
+             (local.tee $2
+              (i32.add
+               (i32.shl
+                (local.tee $0
+                 (i32.load offset=28
+                  (local.get $6)
+                 )
+                )
+                (i32.const 2)
+               )
+               (i32.const 3948)
+              )
+             )
+            )
+           )
+           (block
+            (i32.store
+             (local.get $2)
+             (local.get $9)
+            )
+            (if
+             (i32.eqz
+              (local.get $9)
+             )
+             (block
+              (i32.store
+               (i32.const 3648)
+               (i32.and
+                (i32.load
+                 (i32.const 3648)
+                )
+                (i32.xor
+                 (i32.shl
+                  (i32.const 1)
+                  (local.get $0)
+                 )
+                 (i32.const -1)
+                )
+               )
+              )
+              (br $label$61)
+             )
+            )
+           )
+           (block
+            (if
+             (i32.lt_u
+              (local.get $7)
+              (i32.load
+               (i32.const 3660)
+              )
+             )
+             (call $fimport$10)
+            )
+            (if
+             (i32.eq
+              (i32.load
+               (local.tee $0
+                (i32.add
+                 (local.get $7)
+                 (i32.const 16)
+                )
+               )
+              )
+              (local.get $6)
+             )
+             (i32.store
+              (local.get $0)
+              (local.get $9)
+             )
+             (i32.store offset=20
+              (local.get $7)
+              (local.get $9)
+             )
+            )
+            (br_if $label$61
+             (i32.eqz
+              (local.get $9)
+             )
+            )
+           )
+          )
+          (if
+           (i32.lt_u
+            (local.get $9)
+            (local.tee $2
+             (i32.load
+              (i32.const 3660)
+             )
+            )
+           )
+           (call $fimport$10)
+          )
+          (i32.store offset=24
+           (local.get $9)
+           (local.get $7)
+          )
+          (if
+           (local.tee $0
+            (i32.load
+             (local.tee $1
+              (i32.add
+               (local.get $6)
+               (i32.const 16)
+              )
+             )
+            )
+           )
+           (if
+            (i32.lt_u
+             (local.get $0)
+             (local.get $2)
+            )
+            (call $fimport$10)
+            (block
+             (i32.store offset=16
+              (local.get $9)
+              (local.get $0)
+             )
+             (i32.store offset=24
+              (local.get $0)
+              (local.get $9)
+             )
+            )
+           )
+          )
+          (if
+           (local.tee $0
+            (i32.load offset=4
+             (local.get $1)
+            )
+           )
+           (if
+            (i32.lt_u
+             (local.get $0)
+             (i32.load
+              (i32.const 3660)
+             )
+            )
+            (call $fimport$10)
+            (block
+             (i32.store offset=20
+              (local.get $9)
+              (local.get $0)
+             )
+             (i32.store offset=24
+              (local.get $0)
+              (local.get $9)
+             )
+            )
+           )
+          )
+         )
+        )
+       )
+      )
+     )
+     (i32.store offset=4
+      (local.get $3)
+      (i32.or
+       (local.get $5)
+       (i32.const 1)
+      )
+     )
+     (i32.store
+      (i32.add
+       (local.get $3)
+       (local.get $5)
+      )
+      (local.get $5)
+     )
+     (if
+      (i32.eq
+       (local.get $3)
+       (i32.load
+        (i32.const 3664)
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 3652)
+        (local.get $5)
+       )
+       (return)
+      )
+      (local.set $2
+       (local.get $5)
+      )
+     )
+    )
+   )
+   (local.set $1
+    (i32.shr_u
+     (local.get $2)
+     (i32.const 3)
+    )
+   )
+   (if
+    (i32.lt_u
+     (local.get $2)
+     (i32.const 256)
+    )
+    (block
+     (local.set $0
+      (i32.add
+       (i32.shl
+        (i32.shl
+         (local.get $1)
+         (i32.const 1)
+        )
+        (i32.const 2)
+       )
+       (i32.const 3684)
+      )
+     )
+     (if
+      (i32.and
+       (local.tee $2
+        (i32.load
+         (i32.const 3644)
+        )
+       )
+       (local.tee $1
+        (i32.shl
+         (i32.const 1)
+         (local.get $1)
+        )
+       )
+      )
+      (if
+       (i32.lt_u
+        (local.tee $1
+         (i32.load
+          (local.tee $2
+           (i32.add
+            (local.get $0)
+            (i32.const 8)
+           )
+          )
+         )
+        )
+        (i32.load
+         (i32.const 3660)
+        )
+       )
+       (call $fimport$10)
+       (block
+        (local.set $15
+         (local.get $2)
+        )
+        (local.set $13
+         (local.get $1)
+        )
+       )
+      )
+      (block
+       (i32.store
+        (i32.const 3644)
+        (i32.or
+         (local.get $2)
+         (local.get $1)
+        )
+       )
+       (local.set $15
+        (i32.add
+         (local.get $0)
+         (i32.const 8)
+        )
+       )
+       (local.set $13
+        (local.get $0)
+       )
+      )
+     )
+     (i32.store
+      (local.get $15)
+      (local.get $3)
+     )
+     (i32.store offset=12
+      (local.get $13)
+      (local.get $3)
+     )
+     (i32.store offset=8
+      (local.get $3)
+      (local.get $13)
+     )
+     (i32.store offset=12
+      (local.get $3)
+      (local.get $0)
+     )
+     (return)
+    )
+   )
+   (local.set $0
+    (i32.add
+     (i32.shl
+      (local.tee $1
+       (if (result i32)
+        (local.tee $0
+         (i32.shr_u
+          (local.get $2)
+          (i32.const 8)
+         )
+        )
+        (if (result i32)
+         (i32.gt_u
+          (local.get $2)
+          (i32.const 16777215)
+         )
+         (i32.const 31)
+         (i32.or
+          (i32.and
+           (i32.shr_u
+            (local.get $2)
+            (i32.add
+             (local.tee $0
+              (i32.add
+               (i32.sub
+                (i32.const 14)
+                (i32.or
+                 (i32.or
+                  (local.tee $4
+                   (i32.and
+                    (i32.shr_u
+                     (i32.add
+                      (local.tee $1
+                       (i32.shl
+                        (local.get $0)
+                        (local.tee $0
+                         (i32.and
+                          (i32.shr_u
+                           (i32.add
+                            (local.get $0)
+                            (i32.const 1048320)
+                           )
+                           (i32.const 16)
+                          )
+                          (i32.const 8)
+                         )
+                        )
+                       )
+                      )
+                      (i32.const 520192)
+                     )
+                     (i32.const 16)
+                    )
+                    (i32.const 4)
+                   )
+                  )
+                  (local.get $0)
+                 )
+                 (local.tee $1
+                  (i32.and
+                   (i32.shr_u
+                    (i32.add
+                     (local.tee $0
+                      (i32.shl
+                       (local.get $1)
+                       (local.get $4)
+                      )
+                     )
+                     (i32.const 245760)
+                    )
+                    (i32.const 16)
+                   )
+                   (i32.const 2)
+                  )
+                 )
+                )
+               )
+               (i32.shr_u
+                (i32.shl
+                 (local.get $0)
+                 (local.get $1)
+                )
+                (i32.const 15)
+               )
+              )
+             )
+             (i32.const 7)
+            )
+           )
+           (i32.const 1)
+          )
+          (i32.shl
+           (local.get $0)
+           (i32.const 1)
+          )
+         )
+        )
+        (i32.const 0)
+       )
+      )
+      (i32.const 2)
+     )
+     (i32.const 3948)
+    )
+   )
+   (i32.store offset=28
+    (local.get $3)
+    (local.get $1)
+   )
+   (i32.store offset=20
+    (local.get $3)
+    (i32.const 0)
+   )
+   (i32.store offset=16
+    (local.get $3)
+    (i32.const 0)
+   )
+   (block $label$113
+    (if
+     (i32.and
+      (local.tee $4
+       (i32.load
+        (i32.const 3648)
+       )
+      )
+      (local.tee $5
+       (i32.shl
+        (i32.const 1)
+        (local.get $1)
+       )
+      )
+     )
+     (block
+      (local.set $0
+       (i32.load
+        (local.get $0)
+       )
+      )
+      (local.set $4
+       (i32.sub
+        (i32.const 25)
+        (i32.shr_u
+         (local.get $1)
+         (i32.const 1)
+        )
+       )
+      )
+      (local.set $1
+       (i32.shl
+        (local.get $2)
+        (if (result i32)
+         (i32.eq
+          (local.get $1)
+          (i32.const 31)
+         )
+         (i32.const 0)
+         (local.get $4)
+        )
+       )
+      )
+      (block $label$117
+       (block $label$118
+        (block $label$119
+         (loop $label$120
+          (br_if $label$118
+           (i32.eq
+            (i32.and
+             (i32.load offset=4
+              (local.get $0)
+             )
+             (i32.const -8)
+            )
+            (local.get $2)
+           )
+          )
+          (local.set $4
+           (i32.shl
+            (local.get $1)
+            (i32.const 1)
+           )
+          )
+          (br_if $label$119
+           (i32.eqz
+            (local.tee $5
+             (i32.load
+              (local.tee $1
+               (i32.add
+                (i32.add
+                 (local.get $0)
+                 (i32.const 16)
+                )
+                (i32.shl
+                 (i32.shr_u
+                  (local.get $1)
+                  (i32.const 31)
+                 )
+                 (i32.const 2)
+                )
+               )
+              )
+             )
+            )
+           )
+          )
+          (local.set $1
+           (local.get $4)
+          )
+          (local.set $0
+           (local.get $5)
+          )
+          (br $label$120)
+         )
+        )
+        (if
+         (i32.lt_u
+          (local.get $1)
+          (i32.load
+           (i32.const 3660)
+          )
+         )
+         (call $fimport$10)
+         (block
+          (i32.store
+           (local.get $1)
+           (local.get $3)
+          )
+          (i32.store offset=24
+           (local.get $3)
+           (local.get $0)
+          )
+          (i32.store offset=12
+           (local.get $3)
+           (local.get $3)
+          )
+          (i32.store offset=8
+           (local.get $3)
+           (local.get $3)
+          )
+          (br $label$113)
+         )
+        )
+        (br $label$117)
+       )
+       (if
+        (i32.and
+         (i32.ge_u
+          (local.tee $2
+           (i32.load
+            (local.tee $1
+             (i32.add
+              (local.get $0)
+              (i32.const 8)
+             )
+            )
+           )
+          )
+          (local.tee $4
+           (i32.load
+            (i32.const 3660)
+           )
+          )
+         )
+         (i32.ge_u
+          (local.get $0)
+          (local.get $4)
+         )
+        )
+        (block
+         (i32.store offset=12
+          (local.get $2)
+          (local.get $3)
+         )
+         (i32.store
+          (local.get $1)
+          (local.get $3)
+         )
+         (i32.store offset=8
+          (local.get $3)
+          (local.get $2)
+         )
+         (i32.store offset=12
+          (local.get $3)
+          (local.get $0)
+         )
+         (i32.store offset=24
+          (local.get $3)
+          (i32.const 0)
+         )
+        )
+        (call $fimport$10)
+       )
+      )
+     )
+     (block
+      (i32.store
+       (i32.const 3648)
+       (i32.or
+        (local.get $4)
+        (local.get $5)
+       )
+      )
+      (i32.store
+       (local.get $0)
+       (local.get $3)
+      )
+      (i32.store offset=24
+       (local.get $3)
+       (local.get $0)
+      )
+      (i32.store offset=12
+       (local.get $3)
+       (local.get $3)
+      )
+      (i32.store offset=8
+       (local.get $3)
+       (local.get $3)
+      )
+     )
+    )
+   )
+   (i32.store
+    (i32.const 3676)
+    (local.tee $0
+     (i32.add
+      (i32.load
+       (i32.const 3676)
+      )
+      (i32.const -1)
+     )
+    )
+   )
+   (if
+    (local.get $0)
+    (return)
+    (local.set $0
+     (i32.const 4100)
+    )
+   )
+   (loop $label$128
+    (local.set $0
+     (i32.add
+      (local.tee $2
+       (i32.load
+        (local.get $0)
+       )
+      )
+      (i32.const 8)
+     )
+    )
+    (br_if $label$128
+     (local.get $2)
+    )
+   )
+   (i32.store
+    (i32.const 3676)
+    (i32.const -1)
+   )
   )
-  (func $28 (;41;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $0
-      if (result i32) ;; label = @2
-        block (result i32) ;; label = @3
-          local.get $1
-          i32.const 128
-          i32.lt_u
-          if ;; label = @4
-            block ;; label = @5
-              local.get $0
-              local.get $1
-              i32.store8
-              i32.const 1
-              br 4 (;@1;)
-            end
-          end
-          local.get $1
-          i32.const 2048
-          i32.lt_u
-          if ;; label = @4
-            block ;; label = @5
-              local.get $0
-              local.get $1
-              i32.const 6
-              i32.shr_u
-              i32.const 192
-              i32.or
-              i32.store8
-              local.get $0
-              local.get $1
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=1
-              i32.const 2
-              br 4 (;@1;)
-            end
-          end
-          local.get $1
-          i32.const 55296
-          i32.lt_u
-          local.get $1
-          i32.const -8192
-          i32.and
-          i32.const 57344
-          i32.eq
-          i32.or
-          if ;; label = @4
-            block ;; label = @5
-              local.get $0
-              local.get $1
-              i32.const 12
-              i32.shr_u
-              i32.const 224
-              i32.or
-              i32.store8
-              local.get $0
-              local.get $1
-              i32.const 6
-              i32.shr_u
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=1
-              local.get $0
-              local.get $1
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=2
-              i32.const 3
-              br 4 (;@1;)
-            end
-          end
-          local.get $1
-          i32.const -65536
-          i32.add
-          i32.const 1048576
-          i32.lt_u
-          if (result i32) ;; label = @4
-            block (result i32) ;; label = @5
-              local.get $0
-              local.get $1
-              i32.const 18
-              i32.shr_u
-              i32.const 240
-              i32.or
-              i32.store8
-              local.get $0
-              local.get $1
-              i32.const 12
-              i32.shr_u
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=1
-              local.get $0
-              local.get $1
-              i32.const 6
-              i32.shr_u
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=2
-              local.get $0
-              local.get $1
-              i32.const 63
-              i32.and
-              i32.const 128
-              i32.or
-              i32.store8 offset=3
-              i32.const 4
-            end
-          else
-            block (result i32) ;; label = @5
-              call $11
-              i32.const 84
-              i32.store
-              i32.const -1
-            end
-          end
-        end
-      else
-        i32.const 1
-      end
-    end
+ )
+ (func $33 (; 46 ;) (type $6)
+  (nop)
+ )
+ (func $34 (; 47 ;) (type $1) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (block $label$1 (result i32)
+   (local.set $1
+    (i32.add
+     (local.tee $2
+      (i32.load
+       (global.get $global$0)
+      )
+     )
+     (local.tee $0
+      (i32.and
+       (i32.add
+        (local.get $0)
+        (i32.const 15)
+       )
+       (i32.const -16)
+      )
+     )
+    )
+   )
+   (if
+    (i32.or
+     (i32.and
+      (i32.gt_s
+       (local.get $0)
+       (i32.const 0)
+      )
+      (i32.lt_s
+       (local.get $1)
+       (local.get $2)
+      )
+     )
+     (i32.lt_s
+      (local.get $1)
+      (i32.const 0)
+     )
+    )
+    (block
+     (drop
+      (call $fimport$6)
+     )
+     (call $fimport$11
+      (i32.const 12)
+     )
+     (return
+      (i32.const -1)
+     )
+    )
+   )
+   (i32.store
+    (global.get $global$0)
+    (local.get $1)
+   )
+   (if
+    (i32.gt_s
+     (local.get $1)
+     (call $fimport$5)
+    )
+    (if
+     (i32.eqz
+      (call $fimport$4)
+     )
+     (block
+      (call $fimport$11
+       (i32.const 12)
+      )
+      (i32.store
+       (global.get $global$0)
+       (local.get $2)
+      )
+      (return
+       (i32.const -1)
+      )
+     )
+    )
+   )
+   (local.get $2)
   )
-  (func $29 (;42;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $0
-      i32.const 74
-      i32.add
-      local.tee $2
-      i32.load8_s
-      local.set $1
-      local.get $2
-      local.get $1
-      i32.const 255
-      i32.add
-      local.get $1
-      i32.or
-      i32.store8
-      local.get $0
-      i32.load
-      local.tee $1
-      i32.const 8
-      i32.and
-      if (result i32) ;; label = @2
-        block (result i32) ;; label = @3
-          local.get $0
-          local.get $1
-          i32.const 32
-          i32.or
-          i32.store
-          i32.const -1
-        end
-      else
-        block (result i32) ;; label = @3
-          local.get $0
-          i32.const 0
-          i32.store offset=8
-          local.get $0
-          i32.const 0
-          i32.store offset=4
-          local.get $0
-          local.get $0
-          i32.load offset=44
-          local.tee $1
-          i32.store offset=28
-          local.get $0
-          local.get $1
-          i32.store offset=20
-          local.get $0
-          local.get $1
-          local.get $0
-          i32.load offset=48
-          i32.add
-          i32.store offset=16
-          i32.const 0
-        end
-      end
-      local.tee $0
-    end
+ )
+ (func $35 (; 48 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (block $label$1 (result i32)
+   (local.set $4
+    (i32.add
+     (local.get $0)
+     (local.get $2)
+    )
+   )
+   (if
+    (i32.ge_s
+     (local.get $2)
+     (i32.const 20)
+    )
+    (block
+     (local.set $1
+      (i32.and
+       (local.get $1)
+       (i32.const 255)
+      )
+     )
+     (if
+      (local.tee $3
+       (i32.and
+        (local.get $0)
+        (i32.const 3)
+       )
+      )
+      (block
+       (local.set $3
+        (i32.sub
+         (i32.add
+          (local.get $0)
+          (i32.const 4)
+         )
+         (local.get $3)
+        )
+       )
+       (loop $label$4
+        (if
+         (i32.lt_s
+          (local.get $0)
+          (local.get $3)
+         )
+         (block
+          (i32.store8
+           (local.get $0)
+           (local.get $1)
+          )
+          (local.set $0
+           (i32.add
+            (local.get $0)
+            (i32.const 1)
+           )
+          )
+          (br $label$4)
+         )
+        )
+       )
+      )
+     )
+     (local.set $3
+      (i32.or
+       (i32.or
+        (i32.or
+         (local.get $1)
+         (i32.shl
+          (local.get $1)
+          (i32.const 8)
+         )
+        )
+        (i32.shl
+         (local.get $1)
+         (i32.const 16)
+        )
+       )
+       (i32.shl
+        (local.get $1)
+        (i32.const 24)
+       )
+      )
+     )
+     (local.set $5
+      (i32.and
+       (local.get $4)
+       (i32.const -4)
+      )
+     )
+     (loop $label$6
+      (if
+       (i32.lt_s
+        (local.get $0)
+        (local.get $5)
+       )
+       (block
+        (i32.store
+         (local.get $0)
+         (local.get $3)
+        )
+        (local.set $0
+         (i32.add
+          (local.get $0)
+          (i32.const 4)
+         )
+        )
+        (br $label$6)
+       )
+      )
+     )
+    )
+   )
+   (loop $label$8
+    (if
+     (i32.lt_s
+      (local.get $0)
+      (local.get $4)
+     )
+     (block
+      (i32.store8
+       (local.get $0)
+       (local.get $1)
+      )
+      (local.set $0
+       (i32.add
+        (local.get $0)
+        (i32.const 1)
+       )
+      )
+      (br $label$8)
+     )
+    )
+   )
+   (i32.sub
+    (local.get $0)
+    (local.get $2)
+   )
   )
-  (func $30 (;43;) (type $4) (param $0 i32) (param $1 i32) (result i32)
-    (local $2 i32) (local $3 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $2
-      global.get $global$1
-      i32.const 16
-      i32.add
-      global.set $global$1
-      local.get $2
-      local.tee $3
-      local.get $1
-      i32.store
-      i32.const 1024
-      i32.load
-      local.get $0
-      local.get $3
-      call $17
-      local.set $0
-      local.get $2
-      global.set $global$1
-      local.get $0
-    end
+ )
+ (func $36 (; 49 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (local $3 i32)
+  (block $label$1 (result i32)
+   (if
+    (i32.ge_s
+     (local.get $2)
+     (i32.const 4096)
+    )
+    (return
+     (call $fimport$12
+      (local.get $0)
+      (local.get $1)
+      (local.get $2)
+     )
+    )
+   )
+   (local.set $3
+    (local.get $0)
+   )
+   (if
+    (i32.eq
+     (i32.and
+      (local.get $0)
+      (i32.const 3)
+     )
+     (i32.and
+      (local.get $1)
+      (i32.const 3)
+     )
+    )
+    (block
+     (loop $label$4
+      (if
+       (i32.and
+        (local.get $0)
+        (i32.const 3)
+       )
+       (block
+        (if
+         (i32.eqz
+          (local.get $2)
+         )
+         (return
+          (local.get $3)
+         )
+        )
+        (i32.store8
+         (local.get $0)
+         (i32.load8_s
+          (local.get $1)
+         )
+        )
+        (local.set $0
+         (i32.add
+          (local.get $0)
+          (i32.const 1)
+         )
+        )
+        (local.set $1
+         (i32.add
+          (local.get $1)
+          (i32.const 1)
+         )
+        )
+        (local.set $2
+         (i32.sub
+          (local.get $2)
+          (i32.const 1)
+         )
+        )
+        (br $label$4)
+       )
+      )
+     )
+     (loop $label$7
+      (if
+       (i32.ge_s
+        (local.get $2)
+        (i32.const 4)
+       )
+       (block
+        (i32.store
+         (local.get $0)
+         (i32.load
+          (local.get $1)
+         )
+        )
+        (local.set $0
+         (i32.add
+          (local.get $0)
+          (i32.const 4)
+         )
+        )
+        (local.set $1
+         (i32.add
+          (local.get $1)
+          (i32.const 4)
+         )
+        )
+        (local.set $2
+         (i32.sub
+          (local.get $2)
+          (i32.const 4)
+         )
+        )
+        (br $label$7)
+       )
+      )
+     )
+    )
+   )
+   (loop $label$9
+    (if
+     (i32.gt_s
+      (local.get $2)
+      (i32.const 0)
+     )
+     (block
+      (i32.store8
+       (local.get $0)
+       (i32.load8_s
+        (local.get $1)
+       )
+      )
+      (local.set $0
+       (i32.add
+        (local.get $0)
+        (i32.const 1)
+       )
+      )
+      (local.set $1
+       (i32.add
+        (local.get $1)
+        (i32.const 1)
+       )
+      )
+      (local.set $2
+       (i32.sub
+        (local.get $2)
+        (i32.const 1)
+       )
+      )
+      (br $label$9)
+     )
+    )
+   )
+   (local.get $3)
   )
-  (func $31 (;44;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32) (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32) (local $15 i32) (local $16 i32) (local $17 i32) (local $18 i32) (local $19 i32) (local $20 i32) (local $21 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$1
-      local.set $14
-      global.get $global$1
-      i32.const 16
-      i32.add
-      global.set $global$1
-      local.get $14
-      local.set $18
-      block $label$2 ;; label = @2
-        local.get $0
-        i32.const 245
-        i32.lt_u
-        if ;; label = @3
-          block ;; label = @4
-            local.get $0
-            i32.const 11
-            i32.add
-            i32.const -8
-            i32.and
-            local.set $3
-            i32.const 3644
-            i32.load
-            local.tee $8
-            local.get $0
-            i32.const 11
-            i32.lt_u
-            if (result i32) ;; label = @5
-              i32.const 16
-              local.tee $3
-            else
-              local.get $3
-            end
-            i32.const 3
-            i32.shr_u
-            local.tee $2
-            i32.shr_u
-            local.tee $0
-            i32.const 3
-            i32.and
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                i32.const 1
-                i32.and
-                i32.const 1
-                i32.xor
-                local.get $2
-                i32.add
-                local.tee $5
-                i32.const 1
-                i32.shl
-                i32.const 2
-                i32.shl
-                i32.const 3684
-                i32.add
-                local.tee $2
-                i32.const 8
-                i32.add
-                local.tee $3
-                i32.load
-                local.tee $7
-                i32.const 8
-                i32.add
-                local.tee $1
-                i32.load
-                local.set $4
-                local.get $2
-                local.get $4
-                i32.eq
-                if ;; label = @7
-                  i32.const 3644
-                  local.get $8
-                  i32.const 1
-                  local.get $5
-                  i32.shl
-                  i32.const -1
-                  i32.xor
-                  i32.and
-                  i32.store
-                else
-                  block ;; label = @8
-                    local.get $4
-                    i32.const 3660
-                    i32.load
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $4
-                    i32.const 12
-                    i32.add
-                    local.tee $0
-                    i32.load
-                    local.get $7
-                    i32.eq
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $0
-                        local.get $2
-                        i32.store
-                        local.get $3
-                        local.get $4
-                        i32.store
-                      end
-                    else
-                      call $fimport$10
-                    end
-                  end
-                end
-                local.get $7
-                local.get $5
-                i32.const 3
-                i32.shl
-                local.tee $0
-                i32.const 3
-                i32.or
-                i32.store offset=4
-                local.get $7
-                local.get $0
-                i32.add
-                i32.const 4
-                i32.add
-                local.tee $0
-                local.get $0
-                i32.load
-                i32.const 1
-                i32.or
-                i32.store
-                local.get $14
-                global.set $global$1
-                local.get $1
-                return
-              end
-            end
-            local.get $3
-            i32.const 3652
-            i32.load
-            local.tee $16
-            i32.gt_u
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $0
-                    local.get $2
-                    i32.shl
-                    i32.const 2
-                    local.get $2
-                    i32.shl
-                    local.tee $0
-                    i32.const 0
-                    local.get $0
-                    i32.sub
-                    i32.or
-                    i32.and
-                    local.tee $0
-                    i32.const 0
-                    local.get $0
-                    i32.sub
-                    i32.and
-                    i32.const -1
-                    i32.add
-                    local.tee $0
-                    i32.const 12
-                    i32.shr_u
-                    i32.const 16
-                    i32.and
-                    local.set $5
-                    local.get $0
-                    local.get $5
-                    i32.shr_u
-                    local.tee $2
-                    i32.const 5
-                    i32.shr_u
-                    i32.const 8
-                    i32.and
-                    local.tee $0
-                    local.get $5
-                    i32.or
-                    local.get $2
-                    local.get $0
-                    i32.shr_u
-                    local.tee $2
-                    i32.const 2
-                    i32.shr_u
-                    i32.const 4
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $2
-                    local.get $0
-                    i32.shr_u
-                    local.tee $2
-                    i32.const 1
-                    i32.shr_u
-                    i32.const 2
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $2
-                    local.get $0
-                    i32.shr_u
-                    local.tee $2
-                    i32.const 1
-                    i32.shr_u
-                    i32.const 1
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $2
-                    local.get $0
-                    i32.shr_u
-                    i32.add
-                    local.tee $11
-                    i32.const 1
-                    i32.shl
-                    i32.const 2
-                    i32.shl
-                    i32.const 3684
-                    i32.add
-                    local.tee $4
-                    i32.const 8
-                    i32.add
-                    local.tee $2
-                    i32.load
-                    local.tee $9
-                    i32.const 8
-                    i32.add
-                    local.tee $5
-                    i32.load
-                    local.set $12
-                    local.get $4
-                    local.get $12
-                    i32.eq
-                    if ;; label = @9
-                      i32.const 3644
-                      local.get $8
-                      i32.const 1
-                      local.get $11
-                      i32.shl
-                      i32.const -1
-                      i32.xor
-                      i32.and
-                      local.tee $7
-                      i32.store
-                    else
-                      block ;; label = @10
-                        local.get $12
-                        i32.const 3660
-                        i32.load
-                        i32.lt_u
-                        if ;; label = @11
-                          call $fimport$10
-                        end
-                        local.get $12
-                        i32.const 12
-                        i32.add
-                        local.tee $0
-                        i32.load
-                        local.get $9
-                        i32.eq
-                        if ;; label = @11
-                          block ;; label = @12
-                            local.get $0
-                            local.get $4
-                            i32.store
-                            local.get $2
-                            local.get $12
-                            i32.store
-                            local.get $8
-                            local.set $7
-                          end
-                        else
-                          call $fimport$10
-                        end
-                      end
-                    end
-                    local.get $9
-                    local.get $3
-                    i32.const 3
-                    i32.or
-                    i32.store offset=4
-                    local.get $9
-                    local.get $3
-                    i32.add
-                    local.tee $4
-                    local.get $11
-                    i32.const 3
-                    i32.shl
-                    local.get $3
-                    i32.sub
-                    local.tee $11
-                    i32.const 1
-                    i32.or
-                    i32.store offset=4
-                    local.get $4
-                    local.get $11
-                    i32.add
-                    local.get $11
-                    i32.store
-                    local.get $16
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const 3664
-                        i32.load
-                        local.set $9
-                        local.get $16
-                        i32.const 3
-                        i32.shr_u
-                        local.tee $0
-                        i32.const 1
-                        i32.shl
-                        i32.const 2
-                        i32.shl
-                        i32.const 3684
-                        i32.add
-                        local.set $2
-                        local.get $7
-                        i32.const 1
-                        local.get $0
-                        i32.shl
-                        local.tee $0
-                        i32.and
-                        if ;; label = @11
-                          local.get $2
-                          i32.const 8
-                          i32.add
-                          local.tee $3
-                          i32.load
-                          local.tee $0
-                          i32.const 3660
-                          i32.load
-                          i32.lt_u
-                          if ;; label = @12
-                            call $fimport$10
-                          else
-                            block ;; label = @13
-                              local.get $3
-                              local.set $6
-                              local.get $0
-                              local.set $1
-                            end
-                          end
-                        else
-                          block ;; label = @12
-                            i32.const 3644
-                            local.get $7
-                            local.get $0
-                            i32.or
-                            i32.store
-                            local.get $2
-                            i32.const 8
-                            i32.add
-                            local.set $6
-                            local.get $2
-                            local.set $1
-                          end
-                        end
-                        local.get $6
-                        local.get $9
-                        i32.store
-                        local.get $1
-                        local.get $9
-                        i32.store offset=12
-                        local.get $9
-                        local.get $1
-                        i32.store offset=8
-                        local.get $9
-                        local.get $2
-                        i32.store offset=12
-                      end
-                    end
-                    i32.const 3652
-                    local.get $11
-                    i32.store
-                    i32.const 3664
-                    local.get $4
-                    i32.store
-                    local.get $14
-                    global.set $global$1
-                    local.get $5
-                    return
-                  end
-                end
-                i32.const 3648
-                i32.load
-                local.tee $6
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $6
-                    i32.const 0
-                    local.get $6
-                    i32.sub
-                    i32.and
-                    i32.const -1
-                    i32.add
-                    local.tee $0
-                    i32.const 12
-                    i32.shr_u
-                    i32.const 16
-                    i32.and
-                    local.set $2
-                    local.get $0
-                    local.get $2
-                    i32.shr_u
-                    local.tee $1
-                    i32.const 5
-                    i32.shr_u
-                    i32.const 8
-                    i32.and
-                    local.tee $0
-                    local.get $2
-                    i32.or
-                    local.get $1
-                    local.get $0
-                    i32.shr_u
-                    local.tee $1
-                    i32.const 2
-                    i32.shr_u
-                    i32.const 4
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $1
-                    local.get $0
-                    i32.shr_u
-                    local.tee $1
-                    i32.const 1
-                    i32.shr_u
-                    i32.const 2
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $1
-                    local.get $0
-                    i32.shr_u
-                    local.tee $1
-                    i32.const 1
-                    i32.shr_u
-                    i32.const 1
-                    i32.and
-                    local.tee $0
-                    i32.or
-                    local.get $1
-                    local.get $0
-                    i32.shr_u
-                    i32.add
-                    i32.const 2
-                    i32.shl
-                    i32.const 3948
-                    i32.add
-                    i32.load
-                    local.tee $2
-                    i32.load offset=4
-                    i32.const -8
-                    i32.and
-                    local.get $3
-                    i32.sub
-                    local.set $9
-                    local.get $2
-                    local.set $1
-                    loop $label$25 ;; label = @9
-                      block $label$26 ;; label = @10
-                        local.get $1
-                        i32.load offset=16
-                        local.tee $0
-                        i32.eqz
-                        if ;; label = @11
-                          local.get $1
-                          i32.load offset=20
-                          local.tee $0
-                          i32.eqz
-                          br_if 1 (;@10;)
-                        end
-                        local.get $0
-                        i32.load offset=4
-                        i32.const -8
-                        i32.and
-                        local.get $3
-                        i32.sub
-                        local.tee $1
-                        local.get $9
-                        i32.lt_u
-                        local.tee $7
-                        if ;; label = @11
-                          local.get $1
-                          local.set $9
-                        end
-                        local.get $0
-                        local.set $1
-                        local.get $7
-                        if ;; label = @11
-                          local.get $0
-                          local.set $2
-                        end
-                        br 1 (;@9;)
-                      end
-                    end
-                    local.get $2
-                    i32.const 3660
-                    i32.load
-                    local.tee $12
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $2
-                    local.get $2
-                    local.get $3
-                    i32.add
-                    local.tee $13
-                    i32.ge_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $2
-                    i32.load offset=24
-                    local.set $15
-                    block $label$32 ;; label = @9
-                      local.get $2
-                      i32.load offset=12
-                      local.tee $0
-                      local.get $2
-                      i32.eq
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $2
-                          i32.const 20
-                          i32.add
-                          local.tee $1
-                          i32.load
-                          local.tee $0
-                          i32.eqz
-                          if ;; label = @12
-                            local.get $2
-                            i32.const 16
-                            i32.add
-                            local.tee $1
-                            i32.load
-                            local.tee $0
-                            i32.eqz
-                            if ;; label = @13
-                              block ;; label = @14
-                                i32.const 0
-                                local.set $4
-                                br 5 (;@9;)
-                              end
-                            end
-                          end
-                          loop $label$36 ;; label = @12
-                            local.get $0
-                            i32.const 20
-                            i32.add
-                            local.tee $11
-                            i32.load
-                            local.tee $7
-                            if ;; label = @13
-                              block ;; label = @14
-                                local.get $7
-                                local.set $0
-                                local.get $11
-                                local.set $1
-                                br 2 (;@12;)
-                              end
-                            end
-                            local.get $0
-                            i32.const 16
-                            i32.add
-                            local.tee $11
-                            i32.load
-                            local.tee $7
-                            if ;; label = @13
-                              block ;; label = @14
-                                local.get $7
-                                local.set $0
-                                local.get $11
-                                local.set $1
-                                br 2 (;@12;)
-                              end
-                            end
-                          end
-                          local.get $1
-                          local.get $12
-                          i32.lt_u
-                          if ;; label = @12
-                            call $fimport$10
-                          else
-                            block ;; label = @13
-                              local.get $1
-                              i32.const 0
-                              i32.store
-                              local.get $0
-                              local.set $4
-                            end
-                          end
-                        end
-                      else
-                        block ;; label = @11
-                          local.get $2
-                          i32.load offset=8
-                          local.tee $11
-                          local.get $12
-                          i32.lt_u
-                          if ;; label = @12
-                            call $fimport$10
-                          end
-                          local.get $11
-                          i32.const 12
-                          i32.add
-                          local.tee $7
-                          i32.load
-                          local.get $2
-                          i32.ne
-                          if ;; label = @12
-                            call $fimport$10
-                          end
-                          local.get $0
-                          i32.const 8
-                          i32.add
-                          local.tee $1
-                          i32.load
-                          local.get $2
-                          i32.eq
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $7
-                              local.get $0
-                              i32.store
-                              local.get $1
-                              local.get $11
-                              i32.store
-                              local.get $0
-                              local.set $4
-                            end
-                          else
-                            call $fimport$10
-                          end
-                        end
-                      end
-                    end
-                    block $label$46 ;; label = @9
-                      local.get $15
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $2
-                          local.get $2
-                          i32.load offset=28
-                          local.tee $1
-                          i32.const 2
-                          i32.shl
-                          i32.const 3948
-                          i32.add
-                          local.tee $0
-                          i32.load
-                          i32.eq
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $0
-                              local.get $4
-                              i32.store
-                              local.get $4
-                              i32.eqz
-                              if ;; label = @14
-                                block ;; label = @15
-                                  i32.const 3648
-                                  local.get $6
-                                  i32.const 1
-                                  local.get $1
-                                  i32.shl
-                                  i32.const -1
-                                  i32.xor
-                                  i32.and
-                                  i32.store
-                                  br 6 (;@9;)
-                                end
-                              end
-                            end
-                          else
-                            block ;; label = @13
-                              local.get $15
-                              i32.const 3660
-                              i32.load
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$10
-                              end
-                              local.get $15
-                              i32.const 16
-                              i32.add
-                              local.tee $0
-                              i32.load
-                              local.get $2
-                              i32.eq
-                              if ;; label = @14
-                                local.get $0
-                                local.get $4
-                                i32.store
-                              else
-                                local.get $15
-                                local.get $4
-                                i32.store offset=20
-                              end
-                              local.get $4
-                              i32.eqz
-                              br_if 4 (;@9;)
-                            end
-                          end
-                          local.get $4
-                          i32.const 3660
-                          i32.load
-                          local.tee $0
-                          i32.lt_u
-                          if ;; label = @12
-                            call $fimport$10
-                          end
-                          local.get $4
-                          local.get $15
-                          i32.store offset=24
-                          local.get $2
-                          i32.load offset=16
-                          local.tee $1
-                          if ;; label = @12
-                            local.get $1
-                            local.get $0
-                            i32.lt_u
-                            if ;; label = @13
-                              call $fimport$10
-                            else
-                              block ;; label = @14
-                                local.get $4
-                                local.get $1
-                                i32.store offset=16
-                                local.get $1
-                                local.get $4
-                                i32.store offset=24
-                              end
-                            end
-                          end
-                          local.get $2
-                          i32.load offset=20
-                          local.tee $0
-                          if ;; label = @12
-                            local.get $0
-                            i32.const 3660
-                            i32.load
-                            i32.lt_u
-                            if ;; label = @13
-                              call $fimport$10
-                            else
-                              block ;; label = @14
-                                local.get $4
-                                local.get $0
-                                i32.store offset=20
-                                local.get $0
-                                local.get $4
-                                i32.store offset=24
-                              end
-                            end
-                          end
-                        end
-                      end
-                    end
-                    local.get $9
-                    i32.const 16
-                    i32.lt_u
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $2
-                        local.get $9
-                        local.get $3
-                        i32.add
-                        local.tee $0
-                        i32.const 3
-                        i32.or
-                        i32.store offset=4
-                        local.get $2
-                        local.get $0
-                        i32.add
-                        i32.const 4
-                        i32.add
-                        local.tee $0
-                        local.get $0
-                        i32.load
-                        i32.const 1
-                        i32.or
-                        i32.store
-                      end
-                    else
-                      block ;; label = @10
-                        local.get $2
-                        local.get $3
-                        i32.const 3
-                        i32.or
-                        i32.store offset=4
-                        local.get $13
-                        local.get $9
-                        i32.const 1
-                        i32.or
-                        i32.store offset=4
-                        local.get $13
-                        local.get $9
-                        i32.add
-                        local.get $9
-                        i32.store
-                        local.get $16
-                        if ;; label = @11
-                          block ;; label = @12
-                            i32.const 3664
-                            i32.load
-                            local.set $7
-                            local.get $16
-                            i32.const 3
-                            i32.shr_u
-                            local.tee $0
-                            i32.const 1
-                            i32.shl
-                            i32.const 2
-                            i32.shl
-                            i32.const 3684
-                            i32.add
-                            local.set $3
-                            local.get $8
-                            i32.const 1
-                            local.get $0
-                            i32.shl
-                            local.tee $0
-                            i32.and
-                            if ;; label = @13
-                              local.get $3
-                              i32.const 8
-                              i32.add
-                              local.tee $1
-                              i32.load
-                              local.tee $0
-                              i32.const 3660
-                              i32.load
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$10
-                              else
-                                block ;; label = @15
-                                  local.get $1
-                                  local.set $10
-                                  local.get $0
-                                  local.set $5
-                                end
-                              end
-                            else
-                              block ;; label = @14
-                                i32.const 3644
-                                local.get $8
-                                local.get $0
-                                i32.or
-                                i32.store
-                                local.get $3
-                                i32.const 8
-                                i32.add
-                                local.set $10
-                                local.get $3
-                                local.set $5
-                              end
-                            end
-                            local.get $10
-                            local.get $7
-                            i32.store
-                            local.get $5
-                            local.get $7
-                            i32.store offset=12
-                            local.get $7
-                            local.get $5
-                            i32.store offset=8
-                            local.get $7
-                            local.get $3
-                            i32.store offset=12
-                          end
-                        end
-                        i32.const 3652
-                        local.get $9
-                        i32.store
-                        i32.const 3664
-                        local.get $13
-                        i32.store
-                      end
-                    end
-                    local.get $14
-                    global.set $global$1
-                    local.get $2
-                    i32.const 8
-                    i32.add
-                    return
-                  end
-                else
-                  local.get $3
-                  local.set $0
-                end
-              end
-            else
-              local.get $3
-              local.set $0
-            end
-          end
-        else
-          local.get $0
-          i32.const -65
-          i32.gt_u
-          if ;; label = @4
-            i32.const -1
-            local.set $0
-          else
-            block ;; label = @5
-              local.get $0
-              i32.const 11
-              i32.add
-              local.tee $0
-              i32.const -8
-              i32.and
-              local.set $7
-              i32.const 3648
-              i32.load
-              local.tee $5
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $0
-                  i32.const 8
-                  i32.shr_u
-                  local.tee $0
-                  if (result i32) ;; label = @8
-                    local.get $7
-                    i32.const 16777215
-                    i32.gt_u
-                    if (result i32) ;; label = @9
-                      i32.const 31
-                    else
-                      local.get $7
-                      i32.const 14
-                      local.get $0
-                      local.get $0
-                      i32.const 1048320
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 8
-                      i32.and
-                      local.tee $3
-                      i32.shl
-                      local.tee $1
-                      i32.const 520192
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 4
-                      i32.and
-                      local.tee $0
-                      local.get $3
-                      i32.or
-                      local.get $1
-                      local.get $0
-                      i32.shl
-                      local.tee $1
-                      i32.const 245760
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 2
-                      i32.and
-                      local.tee $0
-                      i32.or
-                      i32.sub
-                      local.get $1
-                      local.get $0
-                      i32.shl
-                      i32.const 15
-                      i32.shr_u
-                      i32.add
-                      local.tee $0
-                      i32.const 7
-                      i32.add
-                      i32.shr_u
-                      i32.const 1
-                      i32.and
-                      local.get $0
-                      i32.const 1
-                      i32.shl
-                      i32.or
-                    end
-                  else
-                    i32.const 0
-                  end
-                  local.set $17
-                  i32.const 0
-                  local.get $7
-                  i32.sub
-                  local.set $3
-                  block $label$78 ;; label = @8
-                    block $label$79 ;; label = @9
-                      block $label$80 ;; label = @10
-                        local.get $17
-                        i32.const 2
-                        i32.shl
-                        i32.const 3948
-                        i32.add
-                        i32.load
-                        local.tee $1
-                        if ;; label = @11
-                          block ;; label = @12
-                            i32.const 25
-                            local.get $17
-                            i32.const 1
-                            i32.shr_u
-                            i32.sub
-                            local.set $0
-                            i32.const 0
-                            local.set $4
-                            local.get $7
-                            local.get $17
-                            i32.const 31
-                            i32.eq
-                            if (result i32) ;; label = @13
-                              i32.const 0
-                            else
-                              local.get $0
-                            end
-                            i32.shl
-                            local.set $10
-                            i32.const 0
-                            local.set $0
-                            loop $label$84 ;; label = @13
-                              local.get $1
-                              i32.load offset=4
-                              i32.const -8
-                              i32.and
-                              local.get $7
-                              i32.sub
-                              local.tee $6
-                              local.get $3
-                              i32.lt_u
-                              if ;; label = @14
-                                local.get $6
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $6
-                                    local.set $3
-                                    local.get $1
-                                    local.set $0
-                                  end
-                                else
-                                  block ;; label = @16
-                                    i32.const 0
-                                    local.set $3
-                                    local.get $1
-                                    local.set $0
-                                    br 7 (;@9;)
-                                  end
-                                end
-                              end
-                              local.get $1
-                              i32.load offset=20
-                              local.tee $19
-                              i32.eqz
-                              local.get $19
-                              local.get $1
-                              i32.const 16
-                              i32.add
-                              local.get $10
-                              i32.const 31
-                              i32.shr_u
-                              i32.const 2
-                              i32.shl
-                              i32.add
-                              i32.load
-                              local.tee $6
-                              i32.eq
-                              i32.or
-                              if (result i32) ;; label = @14
-                                local.get $4
-                              else
-                                local.get $19
-                              end
-                              local.set $1
-                              local.get $10
-                              local.get $6
-                              i32.eqz
-                              local.tee $4
-                              i32.const 1
-                              i32.and
-                              i32.const 1
-                              i32.xor
-                              i32.shl
-                              local.set $10
-                              local.get $4
-                              if ;; label = @14
-                                block ;; label = @15
-                                  local.get $1
-                                  local.set $4
-                                  local.get $0
-                                  local.set $1
-                                  br 5 (;@10;)
-                                end
-                              else
-                                block ;; label = @15
-                                  local.get $1
-                                  local.set $4
-                                  local.get $6
-                                  local.set $1
-                                  br 2 (;@13;)
-                                end
-                              end
-                            end
-                          end
-                        else
-                          block ;; label = @12
-                            i32.const 0
-                            local.set $4
-                            i32.const 0
-                            local.set $1
-                          end
-                        end
-                      end
-                      local.get $4
-                      i32.eqz
-                      local.get $1
-                      i32.eqz
-                      i32.and
-                      if (result i32) ;; label = @10
-                        block (result i32) ;; label = @11
-                          local.get $5
-                          i32.const 2
-                          local.get $17
-                          i32.shl
-                          local.tee $0
-                          i32.const 0
-                          local.get $0
-                          i32.sub
-                          i32.or
-                          i32.and
-                          local.tee $0
-                          i32.eqz
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $7
-                              local.set $0
-                              br 11 (;@2;)
-                            end
-                          end
-                          local.get $0
-                          i32.const 0
-                          local.get $0
-                          i32.sub
-                          i32.and
-                          i32.const -1
-                          i32.add
-                          local.tee $0
-                          i32.const 12
-                          i32.shr_u
-                          i32.const 16
-                          i32.and
-                          local.set $10
-                          local.get $0
-                          local.get $10
-                          i32.shr_u
-                          local.tee $4
-                          i32.const 5
-                          i32.shr_u
-                          i32.const 8
-                          i32.and
-                          local.tee $0
-                          local.get $10
-                          i32.or
-                          local.get $4
-                          local.get $0
-                          i32.shr_u
-                          local.tee $4
-                          i32.const 2
-                          i32.shr_u
-                          i32.const 4
-                          i32.and
-                          local.tee $0
-                          i32.or
-                          local.get $4
-                          local.get $0
-                          i32.shr_u
-                          local.tee $4
-                          i32.const 1
-                          i32.shr_u
-                          i32.const 2
-                          i32.and
-                          local.tee $0
-                          i32.or
-                          local.get $4
-                          local.get $0
-                          i32.shr_u
-                          local.tee $4
-                          i32.const 1
-                          i32.shr_u
-                          i32.const 1
-                          i32.and
-                          local.tee $0
-                          i32.or
-                          local.get $4
-                          local.get $0
-                          i32.shr_u
-                          i32.add
-                          i32.const 2
-                          i32.shl
-                          i32.const 3948
-                          i32.add
-                          i32.load
-                        end
-                      else
-                        local.get $4
-                      end
-                      local.tee $0
-                      br_if 0 (;@9;)
-                      local.get $1
-                      local.set $4
-                      br 1 (;@8;)
-                    end
-                    loop $label$96 ;; label = @9
-                      local.get $0
-                      i32.load offset=4
-                      i32.const -8
-                      i32.and
-                      local.get $7
-                      i32.sub
-                      local.tee $4
-                      local.get $3
-                      i32.lt_u
-                      local.tee $10
-                      if ;; label = @10
-                        local.get $4
-                        local.set $3
-                      end
-                      local.get $10
-                      if ;; label = @10
-                        local.get $0
-                        local.set $1
-                      end
-                      local.get $0
-                      i32.load offset=16
-                      local.tee $4
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $4
-                          local.set $0
-                          br 2 (;@9;)
-                        end
-                      end
-                      local.get $0
-                      i32.load offset=20
-                      local.tee $0
-                      br_if 0 (;@9;)
-                      local.get $1
-                      local.set $4
-                    end
-                  end
-                  local.get $4
-                  if ;; label = @8
-                    local.get $3
-                    i32.const 3652
-                    i32.load
-                    local.get $7
-                    i32.sub
-                    i32.lt_u
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $4
-                        i32.const 3660
-                        i32.load
-                        local.tee $12
-                        i32.lt_u
-                        if ;; label = @11
-                          call $fimport$10
-                        end
-                        local.get $4
-                        local.get $4
-                        local.get $7
-                        i32.add
-                        local.tee $6
-                        i32.ge_u
-                        if ;; label = @11
-                          call $fimport$10
-                        end
-                        local.get $4
-                        i32.load offset=24
-                        local.set $10
-                        block $label$104 ;; label = @11
-                          local.get $4
-                          i32.load offset=12
-                          local.tee $0
-                          local.get $4
-                          i32.eq
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $4
-                              i32.const 20
-                              i32.add
-                              local.tee $1
-                              i32.load
-                              local.tee $0
-                              i32.eqz
-                              if ;; label = @14
-                                local.get $4
-                                i32.const 16
-                                i32.add
-                                local.tee $1
-                                i32.load
-                                local.tee $0
-                                i32.eqz
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    i32.const 0
-                                    local.set $13
-                                    br 5 (;@11;)
-                                  end
-                                end
-                              end
-                              loop $label$108 ;; label = @14
-                                local.get $0
-                                i32.const 20
-                                i32.add
-                                local.tee $9
-                                i32.load
-                                local.tee $11
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $11
-                                    local.set $0
-                                    local.get $9
-                                    local.set $1
-                                    br 2 (;@14;)
-                                  end
-                                end
-                                local.get $0
-                                i32.const 16
-                                i32.add
-                                local.tee $9
-                                i32.load
-                                local.tee $11
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $11
-                                    local.set $0
-                                    local.get $9
-                                    local.set $1
-                                    br 2 (;@14;)
-                                  end
-                                end
-                              end
-                              local.get $1
-                              local.get $12
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$10
-                              else
-                                block ;; label = @15
-                                  local.get $1
-                                  i32.const 0
-                                  i32.store
-                                  local.get $0
-                                  local.set $13
-                                end
-                              end
-                            end
-                          else
-                            block ;; label = @13
-                              local.get $4
-                              i32.load offset=8
-                              local.tee $9
-                              local.get $12
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$10
-                              end
-                              local.get $9
-                              i32.const 12
-                              i32.add
-                              local.tee $11
-                              i32.load
-                              local.get $4
-                              i32.ne
-                              if ;; label = @14
-                                call $fimport$10
-                              end
-                              local.get $0
-                              i32.const 8
-                              i32.add
-                              local.tee $1
-                              i32.load
-                              local.get $4
-                              i32.eq
-                              if ;; label = @14
-                                block ;; label = @15
-                                  local.get $11
-                                  local.get $0
-                                  i32.store
-                                  local.get $1
-                                  local.get $9
-                                  i32.store
-                                  local.get $0
-                                  local.set $13
-                                end
-                              else
-                                call $fimport$10
-                              end
-                            end
-                          end
-                        end
-                        block $label$118 ;; label = @11
-                          local.get $10
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $4
-                              local.get $4
-                              i32.load offset=28
-                              local.tee $1
-                              i32.const 2
-                              i32.shl
-                              i32.const 3948
-                              i32.add
-                              local.tee $0
-                              i32.load
-                              i32.eq
-                              if ;; label = @14
-                                block ;; label = @15
-                                  local.get $0
-                                  local.get $13
-                                  i32.store
-                                  local.get $13
-                                  i32.eqz
-                                  if ;; label = @16
-                                    block ;; label = @17
-                                      i32.const 3648
-                                      local.get $5
-                                      i32.const 1
-                                      local.get $1
-                                      i32.shl
-                                      i32.const -1
-                                      i32.xor
-                                      i32.and
-                                      local.tee $2
-                                      i32.store
-                                      br 6 (;@11;)
-                                    end
-                                  end
-                                end
-                              else
-                                block ;; label = @15
-                                  local.get $10
-                                  i32.const 3660
-                                  i32.load
-                                  i32.lt_u
-                                  if ;; label = @16
-                                    call $fimport$10
-                                  end
-                                  local.get $10
-                                  i32.const 16
-                                  i32.add
-                                  local.tee $0
-                                  i32.load
-                                  local.get $4
-                                  i32.eq
-                                  if ;; label = @16
-                                    local.get $0
-                                    local.get $13
-                                    i32.store
-                                  else
-                                    local.get $10
-                                    local.get $13
-                                    i32.store offset=20
-                                  end
-                                  local.get $13
-                                  i32.eqz
-                                  if ;; label = @16
-                                    block ;; label = @17
-                                      local.get $5
-                                      local.set $2
-                                      br 6 (;@11;)
-                                    end
-                                  end
-                                end
-                              end
-                              local.get $13
-                              i32.const 3660
-                              i32.load
-                              local.tee $0
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$10
-                              end
-                              local.get $13
-                              local.get $10
-                              i32.store offset=24
-                              local.get $4
-                              i32.load offset=16
-                              local.tee $1
-                              if ;; label = @14
-                                local.get $1
-                                local.get $0
-                                i32.lt_u
-                                if ;; label = @15
-                                  call $fimport$10
-                                else
-                                  block ;; label = @16
-                                    local.get $13
-                                    local.get $1
-                                    i32.store offset=16
-                                    local.get $1
-                                    local.get $13
-                                    i32.store offset=24
-                                  end
-                                end
-                              end
-                              local.get $4
-                              i32.load offset=20
-                              local.tee $0
-                              if ;; label = @14
-                                local.get $0
-                                i32.const 3660
-                                i32.load
-                                i32.lt_u
-                                if ;; label = @15
-                                  call $fimport$10
-                                else
-                                  block ;; label = @16
-                                    local.get $13
-                                    local.get $0
-                                    i32.store offset=20
-                                    local.get $0
-                                    local.get $13
-                                    i32.store offset=24
-                                    local.get $5
-                                    local.set $2
-                                  end
-                                end
-                              else
-                                local.get $5
-                                local.set $2
-                              end
-                            end
-                          else
-                            local.get $5
-                            local.set $2
-                          end
-                        end
-                        block $label$136 ;; label = @11
-                          local.get $3
-                          i32.const 16
-                          i32.lt_u
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $4
-                              local.get $3
-                              local.get $7
-                              i32.add
-                              local.tee $0
-                              i32.const 3
-                              i32.or
-                              i32.store offset=4
-                              local.get $4
-                              local.get $0
-                              i32.add
-                              i32.const 4
-                              i32.add
-                              local.tee $0
-                              local.get $0
-                              i32.load
-                              i32.const 1
-                              i32.or
-                              i32.store
-                            end
-                          else
-                            block ;; label = @13
-                              local.get $4
-                              local.get $7
-                              i32.const 3
-                              i32.or
-                              i32.store offset=4
-                              local.get $6
-                              local.get $3
-                              i32.const 1
-                              i32.or
-                              i32.store offset=4
-                              local.get $6
-                              local.get $3
-                              i32.add
-                              local.get $3
-                              i32.store
-                              local.get $3
-                              i32.const 3
-                              i32.shr_u
-                              local.set $0
-                              local.get $3
-                              i32.const 256
-                              i32.lt_u
-                              if ;; label = @14
-                                block ;; label = @15
-                                  local.get $0
-                                  i32.const 1
-                                  i32.shl
-                                  i32.const 2
-                                  i32.shl
-                                  i32.const 3684
-                                  i32.add
-                                  local.set $3
-                                  i32.const 3644
-                                  i32.load
-                                  local.tee $1
-                                  i32.const 1
-                                  local.get $0
-                                  i32.shl
-                                  local.tee $0
-                                  i32.and
-                                  if ;; label = @16
-                                    local.get $3
-                                    i32.const 8
-                                    i32.add
-                                    local.tee $1
-                                    i32.load
-                                    local.tee $0
-                                    i32.const 3660
-                                    i32.load
-                                    i32.lt_u
-                                    if ;; label = @17
-                                      call $fimport$10
-                                    else
-                                      block ;; label = @18
-                                        local.get $1
-                                        local.set $16
-                                        local.get $0
-                                        local.set $8
-                                      end
-                                    end
-                                  else
-                                    block ;; label = @17
-                                      i32.const 3644
-                                      local.get $1
-                                      local.get $0
-                                      i32.or
-                                      i32.store
-                                      local.get $3
-                                      i32.const 8
-                                      i32.add
-                                      local.set $16
-                                      local.get $3
-                                      local.set $8
-                                    end
-                                  end
-                                  local.get $16
-                                  local.get $6
-                                  i32.store
-                                  local.get $8
-                                  local.get $6
-                                  i32.store offset=12
-                                  local.get $6
-                                  local.get $8
-                                  i32.store offset=8
-                                  local.get $6
-                                  local.get $3
-                                  i32.store offset=12
-                                  br 4 (;@11;)
-                                end
-                              end
-                              local.get $3
-                              i32.const 8
-                              i32.shr_u
-                              local.tee $0
-                              if (result i32) ;; label = @14
-                                local.get $3
-                                i32.const 16777215
-                                i32.gt_u
-                                if (result i32) ;; label = @15
-                                  i32.const 31
-                                else
-                                  local.get $3
-                                  i32.const 14
-                                  local.get $0
-                                  local.get $0
-                                  i32.const 1048320
-                                  i32.add
-                                  i32.const 16
-                                  i32.shr_u
-                                  i32.const 8
-                                  i32.and
-                                  local.tee $5
-                                  i32.shl
-                                  local.tee $1
-                                  i32.const 520192
-                                  i32.add
-                                  i32.const 16
-                                  i32.shr_u
-                                  i32.const 4
-                                  i32.and
-                                  local.tee $0
-                                  local.get $5
-                                  i32.or
-                                  local.get $1
-                                  local.get $0
-                                  i32.shl
-                                  local.tee $1
-                                  i32.const 245760
-                                  i32.add
-                                  i32.const 16
-                                  i32.shr_u
-                                  i32.const 2
-                                  i32.and
-                                  local.tee $0
-                                  i32.or
-                                  i32.sub
-                                  local.get $1
-                                  local.get $0
-                                  i32.shl
-                                  i32.const 15
-                                  i32.shr_u
-                                  i32.add
-                                  local.tee $0
-                                  i32.const 7
-                                  i32.add
-                                  i32.shr_u
-                                  i32.const 1
-                                  i32.and
-                                  local.get $0
-                                  i32.const 1
-                                  i32.shl
-                                  i32.or
-                                end
-                              else
-                                i32.const 0
-                              end
-                              local.tee $5
-                              i32.const 2
-                              i32.shl
-                              i32.const 3948
-                              i32.add
-                              local.set $1
-                              local.get $6
-                              local.get $5
-                              i32.store offset=28
-                              local.get $6
-                              i32.const 16
-                              i32.add
-                              local.tee $0
-                              i32.const 0
-                              i32.store offset=4
-                              local.get $0
-                              i32.const 0
-                              i32.store
-                              local.get $2
-                              i32.const 1
-                              local.get $5
-                              i32.shl
-                              local.tee $0
-                              i32.and
-                              i32.eqz
-                              if ;; label = @14
-                                block ;; label = @15
-                                  i32.const 3648
-                                  local.get $2
-                                  local.get $0
-                                  i32.or
-                                  i32.store
-                                  local.get $1
-                                  local.get $6
-                                  i32.store
-                                  local.get $6
-                                  local.get $1
-                                  i32.store offset=24
-                                  local.get $6
-                                  local.get $6
-                                  i32.store offset=12
-                                  local.get $6
-                                  local.get $6
-                                  i32.store offset=8
-                                  br 4 (;@11;)
-                                end
-                              end
-                              local.get $1
-                              i32.load
-                              local.set $0
-                              i32.const 25
-                              local.get $5
-                              i32.const 1
-                              i32.shr_u
-                              i32.sub
-                              local.set $1
-                              local.get $3
-                              local.get $5
-                              i32.const 31
-                              i32.eq
-                              if (result i32) ;; label = @14
-                                i32.const 0
-                              else
-                                local.get $1
-                              end
-                              i32.shl
-                              local.set $5
-                              block $label$151 ;; label = @14
-                                block $label$152 ;; label = @15
-                                  block $label$153 ;; label = @16
-                                    loop $label$154 ;; label = @17
-                                      local.get $0
-                                      i32.load offset=4
-                                      i32.const -8
-                                      i32.and
-                                      local.get $3
-                                      i32.eq
-                                      br_if 2 (;@15;)
-                                      local.get $5
-                                      i32.const 1
-                                      i32.shl
-                                      local.set $2
-                                      local.get $0
-                                      i32.const 16
-                                      i32.add
-                                      local.get $5
-                                      i32.const 31
-                                      i32.shr_u
-                                      i32.const 2
-                                      i32.shl
-                                      i32.add
-                                      local.tee $5
-                                      i32.load
-                                      local.tee $1
-                                      i32.eqz
-                                      br_if 1 (;@16;)
-                                      local.get $2
-                                      local.set $5
-                                      local.get $1
-                                      local.set $0
-                                      br 0 (;@17;)
-                                    end
-                                  end
-                                  local.get $5
-                                  i32.const 3660
-                                  i32.load
-                                  i32.lt_u
-                                  if ;; label = @16
-                                    call $fimport$10
-                                  else
-                                    block ;; label = @17
-                                      local.get $5
-                                      local.get $6
-                                      i32.store
-                                      local.get $6
-                                      local.get $0
-                                      i32.store offset=24
-                                      local.get $6
-                                      local.get $6
-                                      i32.store offset=12
-                                      local.get $6
-                                      local.get $6
-                                      i32.store offset=8
-                                      br 6 (;@11;)
-                                    end
-                                  end
-                                  br 1 (;@14;)
-                                end
-                                local.get $0
-                                i32.const 8
-                                i32.add
-                                local.tee $3
-                                i32.load
-                                local.tee $2
-                                i32.const 3660
-                                i32.load
-                                local.tee $1
-                                i32.ge_u
-                                local.get $0
-                                local.get $1
-                                i32.ge_u
-                                i32.and
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $2
-                                    local.get $6
-                                    i32.store offset=12
-                                    local.get $3
-                                    local.get $6
-                                    i32.store
-                                    local.get $6
-                                    local.get $2
-                                    i32.store offset=8
-                                    local.get $6
-                                    local.get $0
-                                    i32.store offset=12
-                                    local.get $6
-                                    i32.const 0
-                                    i32.store offset=24
-                                  end
-                                else
-                                  call $fimport$10
-                                end
-                              end
-                            end
-                          end
-                        end
-                        local.get $14
-                        global.set $global$1
-                        local.get $4
-                        i32.const 8
-                        i32.add
-                        return
-                      end
-                    else
-                      local.get $7
-                      local.set $0
-                    end
-                  else
-                    local.get $7
-                    local.set $0
-                  end
-                end
-              else
-                local.get $7
-                local.set $0
-              end
-            end
-          end
-        end
-      end
-      i32.const 3652
-      i32.load
-      local.tee $1
-      local.get $0
-      i32.ge_u
-      if ;; label = @2
-        block ;; label = @3
-          i32.const 3664
-          i32.load
-          local.set $2
-          local.get $1
-          local.get $0
-          i32.sub
-          local.tee $3
-          i32.const 15
-          i32.gt_u
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 3664
-              local.get $2
-              local.get $0
-              i32.add
-              local.tee $1
-              i32.store
-              i32.const 3652
-              local.get $3
-              i32.store
-              local.get $1
-              local.get $3
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $1
-              local.get $3
-              i32.add
-              local.get $3
-              i32.store
-              local.get $2
-              local.get $0
-              i32.const 3
-              i32.or
-              i32.store offset=4
-            end
-          else
-            block ;; label = @5
-              i32.const 3652
-              i32.const 0
-              i32.store
-              i32.const 3664
-              i32.const 0
-              i32.store
-              local.get $2
-              local.get $1
-              i32.const 3
-              i32.or
-              i32.store offset=4
-              local.get $2
-              local.get $1
-              i32.add
-              i32.const 4
-              i32.add
-              local.tee $0
-              local.get $0
-              i32.load
-              i32.const 1
-              i32.or
-              i32.store
-            end
-          end
-          local.get $14
-          global.set $global$1
-          local.get $2
-          i32.const 8
-          i32.add
-          return
-        end
-      end
-      i32.const 3656
-      i32.load
-      local.tee $10
-      local.get $0
-      i32.gt_u
-      if ;; label = @2
-        block ;; label = @3
-          i32.const 3656
-          local.get $10
-          local.get $0
-          i32.sub
-          local.tee $3
-          i32.store
-          i32.const 3668
-          i32.const 3668
-          i32.load
-          local.tee $2
-          local.get $0
-          i32.add
-          local.tee $1
-          i32.store
-          local.get $1
-          local.get $3
-          i32.const 1
-          i32.or
-          i32.store offset=4
-          local.get $2
-          local.get $0
-          i32.const 3
-          i32.or
-          i32.store offset=4
-          local.get $14
-          global.set $global$1
-          local.get $2
-          i32.const 8
-          i32.add
-          return
-        end
-      end
-      i32.const 4116
-      i32.load
-      if (result i32) ;; label = @2
-        i32.const 4124
-        i32.load
-      else
-        block (result i32) ;; label = @3
-          i32.const 4124
-          i32.const 4096
-          i32.store
-          i32.const 4120
-          i32.const 4096
-          i32.store
-          i32.const 4128
-          i32.const -1
-          i32.store
-          i32.const 4132
-          i32.const -1
-          i32.store
-          i32.const 4136
-          i32.const 0
-          i32.store
-          i32.const 4088
-          i32.const 0
-          i32.store
-          local.get $18
-          local.get $18
-          i32.const -16
-          i32.and
-          i32.const 1431655768
-          i32.xor
-          local.tee $1
-          i32.store
-          i32.const 4116
-          local.get $1
-          i32.store
-          i32.const 4096
-        end
-      end
-      local.tee $1
-      local.get $0
-      i32.const 47
-      i32.add
-      local.tee $13
-      i32.add
-      local.tee $8
-      i32.const 0
-      local.get $1
-      i32.sub
-      local.tee $4
-      i32.and
-      local.tee $6
-      local.get $0
-      i32.le_u
-      if ;; label = @2
-        block ;; label = @3
-          local.get $14
-          global.set $global$1
-          i32.const 0
-          return
-        end
-      end
-      i32.const 4084
-      i32.load
-      local.tee $2
-      if ;; label = @2
-        i32.const 4076
-        i32.load
-        local.tee $3
-        local.get $6
-        i32.add
-        local.tee $1
-        local.get $3
-        i32.le_u
-        local.get $1
-        local.get $2
-        i32.gt_u
-        i32.or
-        if ;; label = @3
-          block ;; label = @4
-            local.get $14
-            global.set $global$1
-            i32.const 0
-            return
-          end
-        end
-      end
-      local.get $0
-      i32.const 48
-      i32.add
-      local.set $7
-      block $label$171 ;; label = @2
-        block $label$172 ;; label = @3
-          i32.const 4088
-          i32.load
-          i32.const 4
-          i32.and
-          i32.eqz
-          if ;; label = @4
-            block ;; label = @5
-              block $label$174 ;; label = @6
-                block $label$175 ;; label = @7
-                  block $label$176 ;; label = @8
-                    i32.const 3668
-                    i32.load
-                    local.tee $3
-                    i32.eqz
-                    br_if 0 (;@8;)
-                    i32.const 4092
-                    local.set $2
-                    loop $label$177 ;; label = @9
-                      block $label$178 ;; label = @10
-                        local.get $2
-                        i32.load
-                        local.tee $1
-                        local.get $3
-                        i32.le_u
-                        if ;; label = @11
-                          local.get $1
-                          local.get $2
-                          i32.const 4
-                          i32.add
-                          local.tee $5
-                          i32.load
-                          i32.add
-                          local.get $3
-                          i32.gt_u
-                          br_if 1 (;@10;)
-                        end
-                        local.get $2
-                        i32.load offset=8
-                        local.tee $1
-                        i32.eqz
-                        br_if 2 (;@8;)
-                        local.get $1
-                        local.set $2
-                        br 1 (;@9;)
-                      end
-                    end
-                    local.get $8
-                    local.get $10
-                    i32.sub
-                    local.get $4
-                    i32.and
-                    local.tee $3
-                    i32.const 2147483647
-                    i32.lt_u
-                    if ;; label = @9
-                      local.get $3
-                      call $34
-                      local.tee $1
-                      local.get $2
-                      i32.load
-                      local.get $5
-                      i32.load
-                      i32.add
-                      i32.eq
-                      if ;; label = @10
-                        local.get $1
-                        i32.const -1
-                        i32.ne
-                        br_if 7 (;@3;)
-                      else
-                        block ;; label = @11
-                          local.get $1
-                          local.set $2
-                          local.get $3
-                          local.set $1
-                          br 4 (;@7;)
-                        end
-                      end
-                    end
-                    br 2 (;@6;)
-                  end
-                  i32.const 0
-                  call $34
-                  local.tee $1
-                  i32.const -1
-                  i32.ne
-                  if ;; label = @8
-                    block ;; label = @9
-                      i32.const 4120
-                      i32.load
-                      local.tee $2
-                      i32.const -1
-                      i32.add
-                      local.tee $5
-                      local.get $1
-                      local.tee $3
-                      i32.add
-                      i32.const 0
-                      local.get $2
-                      i32.sub
-                      i32.and
-                      local.get $3
-                      i32.sub
-                      local.set $2
-                      local.get $5
-                      local.get $3
-                      i32.and
-                      if (result i32) ;; label = @10
-                        local.get $2
-                      else
-                        i32.const 0
-                      end
-                      local.get $6
-                      i32.add
-                      local.tee $3
-                      i32.const 4076
-                      i32.load
-                      local.tee $5
-                      i32.add
-                      local.set $4
-                      local.get $3
-                      local.get $0
-                      i32.gt_u
-                      local.get $3
-                      i32.const 2147483647
-                      i32.lt_u
-                      i32.and
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const 4084
-                          i32.load
-                          local.tee $2
-                          if ;; label = @12
-                            local.get $4
-                            local.get $5
-                            i32.le_u
-                            local.get $4
-                            local.get $2
-                            i32.gt_u
-                            i32.or
-                            br_if 6 (;@6;)
-                          end
-                          local.get $3
-                          call $34
-                          local.tee $2
-                          local.get $1
-                          i32.eq
-                          br_if 8 (;@3;)
-                          local.get $3
-                          local.set $1
-                          br 4 (;@7;)
-                        end
-                      end
-                    end
-                  end
-                  br 1 (;@6;)
-                end
-                i32.const 0
-                local.get $1
-                i32.sub
-                local.set $5
-                local.get $7
-                local.get $1
-                i32.gt_u
-                local.get $1
-                i32.const 2147483647
-                i32.lt_u
-                local.get $2
-                i32.const -1
-                i32.ne
-                i32.and
-                i32.and
-                if ;; label = @7
-                  local.get $13
-                  local.get $1
-                  i32.sub
-                  i32.const 4124
-                  i32.load
-                  local.tee $3
-                  i32.add
-                  i32.const 0
-                  local.get $3
-                  i32.sub
-                  i32.and
-                  local.tee $3
-                  i32.const 2147483647
-                  i32.lt_u
-                  if ;; label = @8
-                    local.get $3
-                    call $34
-                    i32.const -1
-                    i32.eq
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $5
-                        call $34
-                        drop
-                        br 4 (;@6;)
-                      end
-                    else
-                      local.get $3
-                      local.get $1
-                      i32.add
-                      local.set $3
-                    end
-                  else
-                    local.get $1
-                    local.set $3
-                  end
-                else
-                  local.get $1
-                  local.set $3
-                end
-                local.get $2
-                i32.const -1
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $2
-                    local.set $1
-                    br 5 (;@3;)
-                  end
-                end
-              end
-              i32.const 4088
-              i32.const 4088
-              i32.load
-              i32.const 4
-              i32.or
-              i32.store
-            end
-          end
-          local.get $6
-          i32.const 2147483647
-          i32.lt_u
-          if ;; label = @4
-            local.get $6
-            call $34
-            local.tee $1
-            i32.const 0
-            call $34
-            local.tee $3
-            i32.lt_u
-            local.get $1
-            i32.const -1
-            i32.ne
-            local.get $3
-            i32.const -1
-            i32.ne
-            i32.and
-            i32.and
-            if ;; label = @5
-              local.get $3
-              local.get $1
-              i32.sub
-              local.tee $3
-              local.get $0
-              i32.const 40
-              i32.add
-              i32.gt_u
-              br_if 2 (;@3;)
-            end
-          end
-          br 1 (;@2;)
-        end
-        i32.const 4076
-        i32.const 4076
-        i32.load
-        local.get $3
-        i32.add
-        local.tee $2
-        i32.store
-        local.get $2
-        i32.const 4080
-        i32.load
-        i32.gt_u
-        if ;; label = @3
-          i32.const 4080
-          local.get $2
-          i32.store
-        end
-        block $label$198 ;; label = @3
-          i32.const 3668
-          i32.load
-          local.tee $8
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 4092
-              local.set $2
-              block $label$200 ;; label = @6
-                block $label$201 ;; label = @7
-                  loop $label$202 ;; label = @8
-                    local.get $1
-                    local.get $2
-                    i32.load
-                    local.tee $4
-                    local.get $2
-                    i32.const 4
-                    i32.add
-                    local.tee $7
-                    i32.load
-                    local.tee $5
-                    i32.add
-                    i32.eq
-                    br_if 1 (;@7;)
-                    local.get $2
-                    i32.load offset=8
-                    local.tee $2
-                    br_if 0 (;@8;)
-                  end
-                  br 1 (;@6;)
-                end
-                local.get $2
-                i32.load offset=12
-                i32.const 8
-                i32.and
-                i32.eqz
-                if ;; label = @7
-                  local.get $8
-                  local.get $1
-                  i32.lt_u
-                  local.get $8
-                  local.get $4
-                  i32.ge_u
-                  i32.and
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $7
-                      local.get $5
-                      local.get $3
-                      i32.add
-                      i32.store
-                      i32.const 3656
-                      i32.load
-                      local.set $5
-                      i32.const 0
-                      local.get $8
-                      i32.const 8
-                      i32.add
-                      local.tee $2
-                      i32.sub
-                      i32.const 7
-                      i32.and
-                      local.set $1
-                      i32.const 3668
-                      local.get $8
-                      local.get $2
-                      i32.const 7
-                      i32.and
-                      if (result i32) ;; label = @10
-                        local.get $1
-                      else
-                        i32.const 0
-                        local.tee $1
-                      end
-                      i32.add
-                      local.tee $2
-                      i32.store
-                      i32.const 3656
-                      local.get $3
-                      local.get $1
-                      i32.sub
-                      local.get $5
-                      i32.add
-                      local.tee $1
-                      i32.store
-                      local.get $2
-                      local.get $1
-                      i32.const 1
-                      i32.or
-                      i32.store offset=4
-                      local.get $2
-                      local.get $1
-                      i32.add
-                      i32.const 40
-                      i32.store offset=4
-                      i32.const 3672
-                      i32.const 4132
-                      i32.load
-                      i32.store
-                      br 6 (;@3;)
-                    end
-                  end
-                end
-              end
-              local.get $1
-              i32.const 3660
-              i32.load
-              local.tee $2
-              i32.lt_u
-              if ;; label = @6
-                block ;; label = @7
-                  i32.const 3660
-                  local.get $1
-                  i32.store
-                  local.get $1
-                  local.set $2
-                end
-              end
-              local.get $1
-              local.get $3
-              i32.add
-              local.set $10
-              i32.const 4092
-              local.set $5
-              block $label$208 ;; label = @6
-                block $label$209 ;; label = @7
-                  loop $label$210 ;; label = @8
-                    local.get $5
-                    i32.load
-                    local.get $10
-                    i32.eq
-                    br_if 1 (;@7;)
-                    local.get $5
-                    i32.load offset=8
-                    local.tee $5
-                    br_if 0 (;@8;)
-                    i32.const 4092
-                    local.set $5
-                  end
-                  br 1 (;@6;)
-                end
-                local.get $5
-                i32.load offset=12
-                i32.const 8
-                i32.and
-                if ;; label = @7
-                  i32.const 4092
-                  local.set $5
-                else
-                  block ;; label = @8
-                    local.get $5
-                    local.get $1
-                    i32.store
-                    local.get $5
-                    i32.const 4
-                    i32.add
-                    local.tee $5
-                    local.get $5
-                    i32.load
-                    local.get $3
-                    i32.add
-                    i32.store
-                    i32.const 0
-                    local.get $1
-                    i32.const 8
-                    i32.add
-                    local.tee $4
-                    i32.sub
-                    i32.const 7
-                    i32.and
-                    local.set $7
-                    i32.const 0
-                    local.get $10
-                    i32.const 8
-                    i32.add
-                    local.tee $5
-                    i32.sub
-                    i32.const 7
-                    i32.and
-                    local.set $3
-                    local.get $1
-                    local.get $4
-                    i32.const 7
-                    i32.and
-                    if (result i32) ;; label = @9
-                      local.get $7
-                    else
-                      i32.const 0
-                    end
-                    i32.add
-                    local.tee $13
-                    local.get $0
-                    i32.add
-                    local.set $6
-                    local.get $10
-                    local.get $5
-                    i32.const 7
-                    i32.and
-                    if (result i32) ;; label = @9
-                      local.get $3
-                    else
-                      i32.const 0
-                    end
-                    i32.add
-                    local.tee $4
-                    local.get $13
-                    i32.sub
-                    local.get $0
-                    i32.sub
-                    local.set $7
-                    local.get $13
-                    local.get $0
-                    i32.const 3
-                    i32.or
-                    i32.store offset=4
-                    block $label$217 ;; label = @9
-                      local.get $4
-                      local.get $8
-                      i32.eq
-                      if ;; label = @10
-                        block ;; label = @11
-                          i32.const 3656
-                          i32.const 3656
-                          i32.load
-                          local.get $7
-                          i32.add
-                          local.tee $0
-                          i32.store
-                          i32.const 3668
-                          local.get $6
-                          i32.store
-                          local.get $6
-                          local.get $0
-                          i32.const 1
-                          i32.or
-                          i32.store offset=4
-                        end
-                      else
-                        block ;; label = @11
-                          local.get $4
-                          i32.const 3664
-                          i32.load
-                          i32.eq
-                          if ;; label = @12
-                            block ;; label = @13
-                              i32.const 3652
-                              i32.const 3652
-                              i32.load
-                              local.get $7
-                              i32.add
-                              local.tee $0
-                              i32.store
-                              i32.const 3664
-                              local.get $6
-                              i32.store
-                              local.get $6
-                              local.get $0
-                              i32.const 1
-                              i32.or
-                              i32.store offset=4
-                              local.get $6
-                              local.get $0
-                              i32.add
-                              local.get $0
-                              i32.store
-                              br 4 (;@9;)
-                            end
-                          end
-                          local.get $4
-                          i32.load offset=4
-                          local.tee $0
-                          i32.const 3
-                          i32.and
-                          i32.const 1
-                          i32.eq
-                          if (result i32) ;; label = @12
-                            block (result i32) ;; label = @13
-                              local.get $0
-                              i32.const -8
-                              i32.and
-                              local.set $11
-                              local.get $0
-                              i32.const 3
-                              i32.shr_u
-                              local.set $1
-                              block $label$222 ;; label = @14
-                                local.get $0
-                                i32.const 256
-                                i32.lt_u
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $4
-                                    i32.load offset=12
-                                    local.set $5
-                                    block $label$224 ;; label = @17
-                                      local.get $4
-                                      i32.load offset=8
-                                      local.tee $3
-                                      local.get $1
-                                      i32.const 1
-                                      i32.shl
-                                      i32.const 2
-                                      i32.shl
-                                      i32.const 3684
-                                      i32.add
-                                      local.tee $0
-                                      i32.ne
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $3
-                                          local.get $2
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$10
-                                          end
-                                          local.get $3
-                                          i32.load offset=12
-                                          local.get $4
-                                          i32.eq
-                                          br_if 2 (;@17;)
-                                          call $fimport$10
-                                        end
-                                      end
-                                    end
-                                    local.get $5
-                                    local.get $3
-                                    i32.eq
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        i32.const 3644
-                                        i32.const 3644
-                                        i32.load
-                                        i32.const 1
-                                        local.get $1
-                                        i32.shl
-                                        i32.const -1
-                                        i32.xor
-                                        i32.and
-                                        i32.store
-                                        br 4 (;@14;)
-                                      end
-                                    end
-                                    block $label$228 ;; label = @17
-                                      local.get $5
-                                      local.get $0
-                                      i32.eq
-                                      if ;; label = @18
-                                        local.get $5
-                                        i32.const 8
-                                        i32.add
-                                        local.set $20
-                                      else
-                                        block ;; label = @19
-                                          local.get $5
-                                          local.get $2
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$10
-                                          end
-                                          local.get $5
-                                          i32.const 8
-                                          i32.add
-                                          local.tee $0
-                                          i32.load
-                                          local.get $4
-                                          i32.eq
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              local.get $0
-                                              local.set $20
-                                              br 4 (;@17;)
-                                            end
-                                          end
-                                          call $fimport$10
-                                        end
-                                      end
-                                    end
-                                    local.get $3
-                                    local.get $5
-                                    i32.store offset=12
-                                    local.get $20
-                                    local.get $3
-                                    i32.store
-                                  end
-                                else
-                                  block ;; label = @16
-                                    local.get $4
-                                    i32.load offset=24
-                                    local.set $8
-                                    block $label$234 ;; label = @17
-                                      local.get $4
-                                      i32.load offset=12
-                                      local.tee $0
-                                      local.get $4
-                                      i32.eq
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $4
-                                          i32.const 16
-                                          i32.add
-                                          local.tee $3
-                                          i32.const 4
-                                          i32.add
-                                          local.tee $1
-                                          i32.load
-                                          local.tee $0
-                                          i32.eqz
-                                          if ;; label = @20
-                                            local.get $3
-                                            i32.load
-                                            local.tee $0
-                                            if ;; label = @21
-                                              local.get $3
-                                              local.set $1
-                                            else
-                                              block ;; label = @22
-                                                i32.const 0
-                                                local.set $12
-                                                br 5 (;@17;)
-                                              end
-                                            end
-                                          end
-                                          loop $label$239 ;; label = @20
-                                            local.get $0
-                                            i32.const 20
-                                            i32.add
-                                            local.tee $5
-                                            i32.load
-                                            local.tee $3
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $3
-                                                local.set $0
-                                                local.get $5
-                                                local.set $1
-                                                br 2 (;@20;)
-                                              end
-                                            end
-                                            local.get $0
-                                            i32.const 16
-                                            i32.add
-                                            local.tee $5
-                                            i32.load
-                                            local.tee $3
-                                            if ;; label = @21
-                                              block ;; label = @22
-                                                local.get $3
-                                                local.set $0
-                                                local.get $5
-                                                local.set $1
-                                                br 2 (;@20;)
-                                              end
-                                            end
-                                          end
-                                          local.get $1
-                                          local.get $2
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$10
-                                          else
-                                            block ;; label = @21
-                                              local.get $1
-                                              i32.const 0
-                                              i32.store
-                                              local.get $0
-                                              local.set $12
-                                            end
-                                          end
-                                        end
-                                      else
-                                        block ;; label = @19
-                                          local.get $4
-                                          i32.load offset=8
-                                          local.tee $5
-                                          local.get $2
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$10
-                                          end
-                                          local.get $5
-                                          i32.const 12
-                                          i32.add
-                                          local.tee $3
-                                          i32.load
-                                          local.get $4
-                                          i32.ne
-                                          if ;; label = @20
-                                            call $fimport$10
-                                          end
-                                          local.get $0
-                                          i32.const 8
-                                          i32.add
-                                          local.tee $1
-                                          i32.load
-                                          local.get $4
-                                          i32.eq
-                                          if ;; label = @20
-                                            block ;; label = @21
-                                              local.get $3
-                                              local.get $0
-                                              i32.store
-                                              local.get $1
-                                              local.get $5
-                                              i32.store
-                                              local.get $0
-                                              local.set $12
-                                            end
-                                          else
-                                            call $fimport$10
-                                          end
-                                        end
-                                      end
-                                    end
-                                    local.get $8
-                                    i32.eqz
-                                    br_if 2 (;@14;)
-                                    block $label$249 ;; label = @17
-                                      local.get $4
-                                      local.get $4
-                                      i32.load offset=28
-                                      local.tee $1
-                                      i32.const 2
-                                      i32.shl
-                                      i32.const 3948
-                                      i32.add
-                                      local.tee $0
-                                      i32.load
-                                      i32.eq
-                                      if ;; label = @18
-                                        block ;; label = @19
-                                          local.get $0
-                                          local.get $12
-                                          i32.store
-                                          local.get $12
-                                          br_if 2 (;@17;)
-                                          i32.const 3648
-                                          i32.const 3648
-                                          i32.load
-                                          i32.const 1
-                                          local.get $1
-                                          i32.shl
-                                          i32.const -1
-                                          i32.xor
-                                          i32.and
-                                          i32.store
-                                          br 5 (;@14;)
-                                        end
-                                      else
-                                        block ;; label = @19
-                                          local.get $8
-                                          i32.const 3660
-                                          i32.load
-                                          i32.lt_u
-                                          if ;; label = @20
-                                            call $fimport$10
-                                          end
-                                          local.get $8
-                                          i32.const 16
-                                          i32.add
-                                          local.tee $0
-                                          i32.load
-                                          local.get $4
-                                          i32.eq
-                                          if ;; label = @20
-                                            local.get $0
-                                            local.get $12
-                                            i32.store
-                                          else
-                                            local.get $8
-                                            local.get $12
-                                            i32.store offset=20
-                                          end
-                                          local.get $12
-                                          i32.eqz
-                                          br_if 5 (;@14;)
-                                        end
-                                      end
-                                    end
-                                    local.get $12
-                                    i32.const 3660
-                                    i32.load
-                                    local.tee $1
-                                    i32.lt_u
-                                    if ;; label = @17
-                                      call $fimport$10
-                                    end
-                                    local.get $12
-                                    local.get $8
-                                    i32.store offset=24
-                                    local.get $4
-                                    i32.const 16
-                                    i32.add
-                                    local.tee $0
-                                    i32.load
-                                    local.tee $3
-                                    if ;; label = @17
-                                      local.get $3
-                                      local.get $1
-                                      i32.lt_u
-                                      if ;; label = @18
-                                        call $fimport$10
-                                      else
-                                        block ;; label = @19
-                                          local.get $12
-                                          local.get $3
-                                          i32.store offset=16
-                                          local.get $3
-                                          local.get $12
-                                          i32.store offset=24
-                                        end
-                                      end
-                                    end
-                                    local.get $0
-                                    i32.load offset=4
-                                    local.tee $0
-                                    i32.eqz
-                                    br_if 2 (;@14;)
-                                    local.get $0
-                                    i32.const 3660
-                                    i32.load
-                                    i32.lt_u
-                                    if ;; label = @17
-                                      call $fimport$10
-                                    else
-                                      block ;; label = @18
-                                        local.get $12
-                                        local.get $0
-                                        i32.store offset=20
-                                        local.get $0
-                                        local.get $12
-                                        i32.store offset=24
-                                      end
-                                    end
-                                  end
-                                end
-                              end
-                              local.get $11
-                              local.get $7
-                              i32.add
-                              local.set $7
-                              local.get $4
-                              local.get $11
-                              i32.add
-                            end
-                          else
-                            local.get $4
-                          end
-                          local.tee $0
-                          i32.const 4
-                          i32.add
-                          local.tee $0
-                          local.get $0
-                          i32.load
-                          i32.const -2
-                          i32.and
-                          i32.store
-                          local.get $6
-                          local.get $7
-                          i32.const 1
-                          i32.or
-                          i32.store offset=4
-                          local.get $6
-                          local.get $7
-                          i32.add
-                          local.get $7
-                          i32.store
-                          local.get $7
-                          i32.const 3
-                          i32.shr_u
-                          local.set $0
-                          local.get $7
-                          i32.const 256
-                          i32.lt_u
-                          if ;; label = @12
-                            block ;; label = @13
-                              local.get $0
-                              i32.const 1
-                              i32.shl
-                              i32.const 2
-                              i32.shl
-                              i32.const 3684
-                              i32.add
-                              local.set $3
-                              block $label$263 ;; label = @14
-                                i32.const 3644
-                                i32.load
-                                local.tee $1
-                                i32.const 1
-                                local.get $0
-                                i32.shl
-                                local.tee $0
-                                i32.and
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $3
-                                    i32.const 8
-                                    i32.add
-                                    local.tee $1
-                                    i32.load
-                                    local.tee $0
-                                    i32.const 3660
-                                    i32.load
-                                    i32.ge_u
-                                    if ;; label = @17
-                                      block ;; label = @18
-                                        local.get $1
-                                        local.set $21
-                                        local.get $0
-                                        local.set $9
-                                        br 4 (;@14;)
-                                      end
-                                    end
-                                    call $fimport$10
-                                  end
-                                else
-                                  block ;; label = @16
-                                    i32.const 3644
-                                    local.get $1
-                                    local.get $0
-                                    i32.or
-                                    i32.store
-                                    local.get $3
-                                    i32.const 8
-                                    i32.add
-                                    local.set $21
-                                    local.get $3
-                                    local.set $9
-                                  end
-                                end
-                              end
-                              local.get $21
-                              local.get $6
-                              i32.store
-                              local.get $9
-                              local.get $6
-                              i32.store offset=12
-                              local.get $6
-                              local.get $9
-                              i32.store offset=8
-                              local.get $6
-                              local.get $3
-                              i32.store offset=12
-                              br 4 (;@9;)
-                            end
-                          end
-                          block $label$267 (result i32) ;; label = @12
-                            local.get $7
-                            i32.const 8
-                            i32.shr_u
-                            local.tee $0
-                            if (result i32) ;; label = @13
-                              block (result i32) ;; label = @14
-                                i32.const 31
-                                local.get $7
-                                i32.const 16777215
-                                i32.gt_u
-                                br_if 2 (;@12;)
-                                drop
-                                local.get $7
-                                i32.const 14
-                                local.get $0
-                                local.get $0
-                                i32.const 1048320
-                                i32.add
-                                i32.const 16
-                                i32.shr_u
-                                i32.const 8
-                                i32.and
-                                local.tee $3
-                                i32.shl
-                                local.tee $1
-                                i32.const 520192
-                                i32.add
-                                i32.const 16
-                                i32.shr_u
-                                i32.const 4
-                                i32.and
-                                local.tee $0
-                                local.get $3
-                                i32.or
-                                local.get $1
-                                local.get $0
-                                i32.shl
-                                local.tee $1
-                                i32.const 245760
-                                i32.add
-                                i32.const 16
-                                i32.shr_u
-                                i32.const 2
-                                i32.and
-                                local.tee $0
-                                i32.or
-                                i32.sub
-                                local.get $1
-                                local.get $0
-                                i32.shl
-                                i32.const 15
-                                i32.shr_u
-                                i32.add
-                                local.tee $0
-                                i32.const 7
-                                i32.add
-                                i32.shr_u
-                                i32.const 1
-                                i32.and
-                                local.get $0
-                                i32.const 1
-                                i32.shl
-                                i32.or
-                              end
-                            else
-                              i32.const 0
-                            end
-                          end
-                          local.tee $2
-                          i32.const 2
-                          i32.shl
-                          i32.const 3948
-                          i32.add
-                          local.set $3
-                          local.get $6
-                          local.get $2
-                          i32.store offset=28
-                          local.get $6
-                          i32.const 16
-                          i32.add
-                          local.tee $0
-                          i32.const 0
-                          i32.store offset=4
-                          local.get $0
-                          i32.const 0
-                          i32.store
-                          i32.const 3648
-                          i32.load
-                          local.tee $1
-                          i32.const 1
-                          local.get $2
-                          i32.shl
-                          local.tee $0
-                          i32.and
-                          i32.eqz
-                          if ;; label = @12
-                            block ;; label = @13
-                              i32.const 3648
-                              local.get $1
-                              local.get $0
-                              i32.or
-                              i32.store
-                              local.get $3
-                              local.get $6
-                              i32.store
-                              local.get $6
-                              local.get $3
-                              i32.store offset=24
-                              local.get $6
-                              local.get $6
-                              i32.store offset=12
-                              local.get $6
-                              local.get $6
-                              i32.store offset=8
-                              br 4 (;@9;)
-                            end
-                          end
-                          local.get $3
-                          i32.load
-                          local.set $0
-                          i32.const 25
-                          local.get $2
-                          i32.const 1
-                          i32.shr_u
-                          i32.sub
-                          local.set $1
-                          local.get $7
-                          local.get $2
-                          i32.const 31
-                          i32.eq
-                          if (result i32) ;; label = @12
-                            i32.const 0
-                          else
-                            local.get $1
-                          end
-                          i32.shl
-                          local.set $2
-                          block $label$273 ;; label = @12
-                            block $label$274 ;; label = @13
-                              block $label$275 ;; label = @14
-                                loop $label$276 ;; label = @15
-                                  local.get $0
-                                  i32.load offset=4
-                                  i32.const -8
-                                  i32.and
-                                  local.get $7
-                                  i32.eq
-                                  br_if 2 (;@13;)
-                                  local.get $2
-                                  i32.const 1
-                                  i32.shl
-                                  local.set $3
-                                  local.get $0
-                                  i32.const 16
-                                  i32.add
-                                  local.get $2
-                                  i32.const 31
-                                  i32.shr_u
-                                  i32.const 2
-                                  i32.shl
-                                  i32.add
-                                  local.tee $2
-                                  i32.load
-                                  local.tee $1
-                                  i32.eqz
-                                  br_if 1 (;@14;)
-                                  local.get $3
-                                  local.set $2
-                                  local.get $1
-                                  local.set $0
-                                  br 0 (;@15;)
-                                end
-                              end
-                              local.get $2
-                              i32.const 3660
-                              i32.load
-                              i32.lt_u
-                              if ;; label = @14
-                                call $fimport$10
-                              else
-                                block ;; label = @15
-                                  local.get $2
-                                  local.get $6
-                                  i32.store
-                                  local.get $6
-                                  local.get $0
-                                  i32.store offset=24
-                                  local.get $6
-                                  local.get $6
-                                  i32.store offset=12
-                                  local.get $6
-                                  local.get $6
-                                  i32.store offset=8
-                                  br 6 (;@9;)
-                                end
-                              end
-                              br 1 (;@12;)
-                            end
-                            local.get $0
-                            i32.const 8
-                            i32.add
-                            local.tee $3
-                            i32.load
-                            local.tee $2
-                            i32.const 3660
-                            i32.load
-                            local.tee $1
-                            i32.ge_u
-                            local.get $0
-                            local.get $1
-                            i32.ge_u
-                            i32.and
-                            if ;; label = @13
-                              block ;; label = @14
-                                local.get $2
-                                local.get $6
-                                i32.store offset=12
-                                local.get $3
-                                local.get $6
-                                i32.store
-                                local.get $6
-                                local.get $2
-                                i32.store offset=8
-                                local.get $6
-                                local.get $0
-                                i32.store offset=12
-                                local.get $6
-                                i32.const 0
-                                i32.store offset=24
-                              end
-                            else
-                              call $fimport$10
-                            end
-                          end
-                        end
-                      end
-                    end
-                    local.get $14
-                    global.set $global$1
-                    local.get $13
-                    i32.const 8
-                    i32.add
-                    return
-                  end
-                end
-              end
-              loop $label$281 ;; label = @6
-                block $label$282 ;; label = @7
-                  local.get $5
-                  i32.load
-                  local.tee $2
-                  local.get $8
-                  i32.le_u
-                  if ;; label = @8
-                    local.get $2
-                    local.get $5
-                    i32.load offset=4
-                    i32.add
-                    local.tee $13
-                    local.get $8
-                    i32.gt_u
-                    br_if 1 (;@7;)
-                  end
-                  local.get $5
-                  i32.load offset=8
-                  local.set $5
-                  br 1 (;@6;)
-                end
-              end
-              i32.const 0
-              local.get $13
-              i32.const -47
-              i32.add
-              local.tee $7
-              i32.const 8
-              i32.add
-              local.tee $5
-              i32.sub
-              i32.const 7
-              i32.and
-              local.set $2
-              local.get $7
-              local.get $5
-              i32.const 7
-              i32.and
-              if (result i32) ;; label = @6
-                local.get $2
-              else
-                i32.const 0
-              end
-              i32.add
-              local.tee $2
-              local.get $8
-              i32.const 16
-              i32.add
-              local.tee $12
-              i32.lt_u
-              if (result i32) ;; label = @6
-                local.get $8
-              else
-                local.get $2
-              end
-              local.tee $7
-              i32.const 8
-              i32.add
-              local.set $10
-              local.get $7
-              i32.const 24
-              i32.add
-              local.set $5
-              local.get $3
-              i32.const -40
-              i32.add
-              local.set $9
-              i32.const 0
-              local.get $1
-              i32.const 8
-              i32.add
-              local.tee $4
-              i32.sub
-              i32.const 7
-              i32.and
-              local.set $2
-              i32.const 3668
-              local.get $1
-              local.get $4
-              i32.const 7
-              i32.and
-              if (result i32) ;; label = @6
-                local.get $2
-              else
-                i32.const 0
-                local.tee $2
-              end
-              i32.add
-              local.tee $4
-              i32.store
-              i32.const 3656
-              local.get $9
-              local.get $2
-              i32.sub
-              local.tee $2
-              i32.store
-              local.get $4
-              local.get $2
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $4
-              local.get $2
-              i32.add
-              i32.const 40
-              i32.store offset=4
-              i32.const 3672
-              i32.const 4132
-              i32.load
-              i32.store
-              local.get $7
-              i32.const 4
-              i32.add
-              local.tee $2
-              i32.const 27
-              i32.store
-              local.get $10
-              i32.const 4092
-              i64.load align=4
-              i64.store align=4
-              local.get $10
-              i32.const 4100
-              i64.load align=4
-              i64.store offset=8 align=4
-              i32.const 4092
-              local.get $1
-              i32.store
-              i32.const 4096
-              local.get $3
-              i32.store
-              i32.const 4104
-              i32.const 0
-              i32.store
-              i32.const 4100
-              local.get $10
-              i32.store
-              local.get $5
-              local.set $1
-              loop $label$290 ;; label = @6
-                local.get $1
-                i32.const 4
-                i32.add
-                local.tee $1
-                i32.const 7
-                i32.store
-                local.get $1
-                i32.const 4
-                i32.add
-                local.get $13
-                i32.lt_u
-                br_if 0 (;@6;)
-              end
-              local.get $7
-              local.get $8
-              i32.ne
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $2
-                  local.get $2
-                  i32.load
-                  i32.const -2
-                  i32.and
-                  i32.store
-                  local.get $8
-                  local.get $7
-                  local.get $8
-                  i32.sub
-                  local.tee $4
-                  i32.const 1
-                  i32.or
-                  i32.store offset=4
-                  local.get $7
-                  local.get $4
-                  i32.store
-                  local.get $4
-                  i32.const 3
-                  i32.shr_u
-                  local.set $1
-                  local.get $4
-                  i32.const 256
-                  i32.lt_u
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $1
-                      i32.const 1
-                      i32.shl
-                      i32.const 2
-                      i32.shl
-                      i32.const 3684
-                      i32.add
-                      local.set $2
-                      i32.const 3644
-                      i32.load
-                      local.tee $3
-                      i32.const 1
-                      local.get $1
-                      i32.shl
-                      local.tee $1
-                      i32.and
-                      if ;; label = @10
-                        local.get $2
-                        i32.const 8
-                        i32.add
-                        local.tee $3
-                        i32.load
-                        local.tee $1
-                        i32.const 3660
-                        i32.load
-                        i32.lt_u
-                        if ;; label = @11
-                          call $fimport$10
-                        else
-                          block ;; label = @12
-                            local.get $3
-                            local.set $15
-                            local.get $1
-                            local.set $11
-                          end
-                        end
-                      else
-                        block ;; label = @11
-                          i32.const 3644
-                          local.get $3
-                          local.get $1
-                          i32.or
-                          i32.store
-                          local.get $2
-                          i32.const 8
-                          i32.add
-                          local.set $15
-                          local.get $2
-                          local.set $11
-                        end
-                      end
-                      local.get $15
-                      local.get $8
-                      i32.store
-                      local.get $11
-                      local.get $8
-                      i32.store offset=12
-                      local.get $8
-                      local.get $11
-                      i32.store offset=8
-                      local.get $8
-                      local.get $2
-                      i32.store offset=12
-                      br 6 (;@3;)
-                    end
-                  end
-                  local.get $4
-                  i32.const 8
-                  i32.shr_u
-                  local.tee $1
-                  if (result i32) ;; label = @8
-                    local.get $4
-                    i32.const 16777215
-                    i32.gt_u
-                    if (result i32) ;; label = @9
-                      i32.const 31
-                    else
-                      local.get $4
-                      i32.const 14
-                      local.get $1
-                      local.get $1
-                      i32.const 1048320
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 8
-                      i32.and
-                      local.tee $2
-                      i32.shl
-                      local.tee $3
-                      i32.const 520192
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 4
-                      i32.and
-                      local.tee $1
-                      local.get $2
-                      i32.or
-                      local.get $3
-                      local.get $1
-                      i32.shl
-                      local.tee $3
-                      i32.const 245760
-                      i32.add
-                      i32.const 16
-                      i32.shr_u
-                      i32.const 2
-                      i32.and
-                      local.tee $1
-                      i32.or
-                      i32.sub
-                      local.get $3
-                      local.get $1
-                      i32.shl
-                      i32.const 15
-                      i32.shr_u
-                      i32.add
-                      local.tee $1
-                      i32.const 7
-                      i32.add
-                      i32.shr_u
-                      i32.const 1
-                      i32.and
-                      local.get $1
-                      i32.const 1
-                      i32.shl
-                      i32.or
-                    end
-                  else
-                    i32.const 0
-                  end
-                  local.tee $5
-                  i32.const 2
-                  i32.shl
-                  i32.const 3948
-                  i32.add
-                  local.set $2
-                  local.get $8
-                  local.get $5
-                  i32.store offset=28
-                  local.get $8
-                  i32.const 0
-                  i32.store offset=20
-                  local.get $12
-                  i32.const 0
-                  i32.store
-                  i32.const 3648
-                  i32.load
-                  local.tee $3
-                  i32.const 1
-                  local.get $5
-                  i32.shl
-                  local.tee $1
-                  i32.and
-                  i32.eqz
-                  if ;; label = @8
-                    block ;; label = @9
-                      i32.const 3648
-                      local.get $3
-                      local.get $1
-                      i32.or
-                      i32.store
-                      local.get $2
-                      local.get $8
-                      i32.store
-                      local.get $8
-                      local.get $2
-                      i32.store offset=24
-                      local.get $8
-                      local.get $8
-                      i32.store offset=12
-                      local.get $8
-                      local.get $8
-                      i32.store offset=8
-                      br 6 (;@3;)
-                    end
-                  end
-                  local.get $2
-                  i32.load
-                  local.set $1
-                  i32.const 25
-                  local.get $5
-                  i32.const 1
-                  i32.shr_u
-                  i32.sub
-                  local.set $3
-                  local.get $4
-                  local.get $5
-                  i32.const 31
-                  i32.eq
-                  if (result i32) ;; label = @8
-                    i32.const 0
-                  else
-                    local.get $3
-                  end
-                  i32.shl
-                  local.set $5
-                  block $label$304 ;; label = @8
-                    block $label$305 ;; label = @9
-                      block $label$306 ;; label = @10
-                        loop $label$307 ;; label = @11
-                          local.get $1
-                          i32.load offset=4
-                          i32.const -8
-                          i32.and
-                          local.get $4
-                          i32.eq
-                          br_if 2 (;@9;)
-                          local.get $5
-                          i32.const 1
-                          i32.shl
-                          local.set $2
-                          local.get $1
-                          i32.const 16
-                          i32.add
-                          local.get $5
-                          i32.const 31
-                          i32.shr_u
-                          i32.const 2
-                          i32.shl
-                          i32.add
-                          local.tee $5
-                          i32.load
-                          local.tee $3
-                          i32.eqz
-                          br_if 1 (;@10;)
-                          local.get $2
-                          local.set $5
-                          local.get $3
-                          local.set $1
-                          br 0 (;@11;)
-                        end
-                      end
-                      local.get $5
-                      i32.const 3660
-                      i32.load
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$10
-                      else
-                        block ;; label = @11
-                          local.get $5
-                          local.get $8
-                          i32.store
-                          local.get $8
-                          local.get $1
-                          i32.store offset=24
-                          local.get $8
-                          local.get $8
-                          i32.store offset=12
-                          local.get $8
-                          local.get $8
-                          i32.store offset=8
-                          br 8 (;@3;)
-                        end
-                      end
-                      br 1 (;@8;)
-                    end
-                    local.get $1
-                    i32.const 8
-                    i32.add
-                    local.tee $2
-                    i32.load
-                    local.tee $5
-                    i32.const 3660
-                    i32.load
-                    local.tee $3
-                    i32.ge_u
-                    local.get $1
-                    local.get $3
-                    i32.ge_u
-                    i32.and
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $5
-                        local.get $8
-                        i32.store offset=12
-                        local.get $2
-                        local.get $8
-                        i32.store
-                        local.get $8
-                        local.get $5
-                        i32.store offset=8
-                        local.get $8
-                        local.get $1
-                        i32.store offset=12
-                        local.get $8
-                        i32.const 0
-                        i32.store offset=24
-                      end
-                    else
-                      call $fimport$10
-                    end
-                  end
-                end
-              end
-            end
-          else
-            block ;; label = @5
-              i32.const 3660
-              i32.load
-              local.tee $2
-              i32.eqz
-              local.get $1
-              local.get $2
-              i32.lt_u
-              i32.or
-              if ;; label = @6
-                i32.const 3660
-                local.get $1
-                i32.store
-              end
-              i32.const 4092
-              local.get $1
-              i32.store
-              i32.const 4096
-              local.get $3
-              i32.store
-              i32.const 4104
-              i32.const 0
-              i32.store
-              i32.const 3680
-              i32.const 4116
-              i32.load
-              i32.store
-              i32.const 3676
-              i32.const -1
-              i32.store
-              i32.const 0
-              local.set $2
-              loop $label$314 ;; label = @6
-                local.get $2
-                i32.const 1
-                i32.shl
-                i32.const 2
-                i32.shl
-                i32.const 3684
-                i32.add
-                local.tee $5
-                local.get $5
-                i32.store offset=12
-                local.get $5
-                local.get $5
-                i32.store offset=8
-                local.get $2
-                i32.const 1
-                i32.add
-                local.tee $2
-                i32.const 32
-                i32.ne
-                br_if 0 (;@6;)
-              end
-              local.get $3
-              i32.const -40
-              i32.add
-              local.set $5
-              i32.const 0
-              local.get $1
-              i32.const 8
-              i32.add
-              local.tee $2
-              i32.sub
-              i32.const 7
-              i32.and
-              local.set $3
-              i32.const 3668
-              local.get $1
-              local.get $2
-              i32.const 7
-              i32.and
-              if (result i32) ;; label = @6
-                local.get $3
-              else
-                i32.const 0
-              end
-              local.tee $1
-              i32.add
-              local.tee $3
-              i32.store
-              i32.const 3656
-              local.get $5
-              local.get $1
-              i32.sub
-              local.tee $1
-              i32.store
-              local.get $3
-              local.get $1
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $3
-              local.get $1
-              i32.add
-              i32.const 40
-              i32.store offset=4
-              i32.const 3672
-              i32.const 4132
-              i32.load
-              i32.store
-            end
-          end
-        end
-        i32.const 3656
-        i32.load
-        local.tee $1
-        local.get $0
-        i32.gt_u
-        if ;; label = @3
-          block ;; label = @4
-            i32.const 3656
-            local.get $1
-            local.get $0
-            i32.sub
-            local.tee $3
-            i32.store
-            i32.const 3668
-            i32.const 3668
-            i32.load
-            local.tee $2
-            local.get $0
-            i32.add
-            local.tee $1
-            i32.store
-            local.get $1
-            local.get $3
-            i32.const 1
-            i32.or
-            i32.store offset=4
-            local.get $2
-            local.get $0
-            i32.const 3
-            i32.or
-            i32.store offset=4
-            local.get $14
-            global.set $global$1
-            local.get $2
-            i32.const 8
-            i32.add
-            return
-          end
-        end
-      end
-      call $11
-      i32.const 12
-      i32.store
-      local.get $14
-      global.set $global$1
-      i32.const 0
-    end
+ )
+ (func $37 (; 50 ;) (type $3) (result i32)
+  (i32.const 0)
+ )
+ (func $38 (; 51 ;) (type $4) (param $0 i32) (param $1 i32) (result i32)
+  (call_indirect (type $1)
+   (local.get $1)
+   (i32.add
+    (i32.and
+     (local.get $0)
+     (i32.const 1)
+    )
+    (i32.const 0)
+   )
   )
-  (func $32 (;45;) (type $2) (param $0 i32)
-    (local $1 i32) (local $2 i32) (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32) (local $15 i32)
-    block $label$1 ;; label = @1
-      local.get $0
-      i32.eqz
-      if ;; label = @2
-        return
-      end
-      local.get $0
-      i32.const -8
-      i32.add
-      local.tee $1
-      i32.const 3660
-      i32.load
-      local.tee $11
-      i32.lt_u
-      if ;; label = @2
-        call $fimport$10
-      end
-      local.get $0
-      i32.const -4
-      i32.add
-      i32.load
-      local.tee $0
-      i32.const 3
-      i32.and
-      local.tee $8
-      i32.const 1
-      i32.eq
-      if ;; label = @2
-        call $fimport$10
-      end
-      local.get $1
-      local.get $0
-      i32.const -8
-      i32.and
-      local.tee $4
-      i32.add
-      local.set $6
-      block $label$5 ;; label = @2
-        local.get $0
-        i32.const 1
-        i32.and
-        if ;; label = @3
-          block ;; label = @4
-            local.get $1
-            local.set $3
-            local.get $4
-            local.set $2
-          end
-        else
-          block ;; label = @4
-            local.get $8
-            i32.eqz
-            if ;; label = @5
-              return
-            end
-            local.get $1
-            i32.const 0
-            local.get $1
-            i32.load
-            local.tee $8
-            i32.sub
-            i32.add
-            local.tee $0
-            local.get $11
-            i32.lt_u
-            if ;; label = @5
-              call $fimport$10
-            end
-            local.get $8
-            local.get $4
-            i32.add
-            local.set $1
-            local.get $0
-            i32.const 3664
-            i32.load
-            i32.eq
-            if ;; label = @5
-              block ;; label = @6
-                local.get $6
-                i32.const 4
-                i32.add
-                local.tee $2
-                i32.load
-                local.tee $3
-                i32.const 3
-                i32.and
-                i32.const 3
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $0
-                    local.set $3
-                    local.get $1
-                    local.set $2
-                    br 6 (;@2;)
-                  end
-                end
-                i32.const 3652
-                local.get $1
-                i32.store
-                local.get $2
-                local.get $3
-                i32.const -2
-                i32.and
-                i32.store
-                local.get $0
-                local.get $1
-                i32.const 1
-                i32.or
-                i32.store offset=4
-                local.get $0
-                local.get $1
-                i32.add
-                local.get $1
-                i32.store
-                return
-              end
-            end
-            local.get $8
-            i32.const 3
-            i32.shr_u
-            local.set $10
-            local.get $8
-            i32.const 256
-            i32.lt_u
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                i32.load offset=12
-                local.set $3
-                local.get $0
-                i32.load offset=8
-                local.tee $4
-                local.get $10
-                i32.const 1
-                i32.shl
-                i32.const 2
-                i32.shl
-                i32.const 3684
-                i32.add
-                local.tee $2
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $4
-                    local.get $11
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $4
-                    i32.load offset=12
-                    local.get $0
-                    i32.ne
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                  end
-                end
-                local.get $3
-                local.get $4
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const 3644
-                    i32.const 3644
-                    i32.load
-                    i32.const 1
-                    local.get $10
-                    i32.shl
-                    i32.const -1
-                    i32.xor
-                    i32.and
-                    i32.store
-                    local.get $0
-                    local.set $3
-                    local.get $1
-                    local.set $2
-                    br 6 (;@2;)
-                  end
-                end
-                local.get $3
-                local.get $2
-                i32.eq
-                if ;; label = @7
-                  local.get $3
-                  i32.const 8
-                  i32.add
-                  local.set $5
-                else
-                  block ;; label = @8
-                    local.get $3
-                    local.get $11
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $3
-                    i32.const 8
-                    i32.add
-                    local.tee $2
-                    i32.load
-                    local.get $0
-                    i32.eq
-                    if ;; label = @9
-                      local.get $2
-                      local.set $5
-                    else
-                      call $fimport$10
-                    end
-                  end
-                end
-                local.get $4
-                local.get $3
-                i32.store offset=12
-                local.get $5
-                local.get $4
-                i32.store
-                local.get $0
-                local.set $3
-                local.get $1
-                local.set $2
-                br 4 (;@2;)
-              end
-            end
-            local.get $0
-            i32.load offset=24
-            local.set $12
-            block $label$22 ;; label = @5
-              local.get $0
-              i32.load offset=12
-              local.tee $4
-              local.get $0
-              i32.eq
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $0
-                  i32.const 16
-                  i32.add
-                  local.tee $5
-                  i32.const 4
-                  i32.add
-                  local.tee $8
-                  i32.load
-                  local.tee $4
-                  if ;; label = @8
-                    local.get $8
-                    local.set $5
-                  else
-                    local.get $5
-                    i32.load
-                    local.tee $4
-                    i32.eqz
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const 0
-                        local.set $7
-                        br 5 (;@5;)
-                      end
-                    end
-                  end
-                  loop $label$27 ;; label = @8
-                    local.get $4
-                    i32.const 20
-                    i32.add
-                    local.tee $8
-                    i32.load
-                    local.tee $10
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $10
-                        local.set $4
-                        local.get $8
-                        local.set $5
-                        br 2 (;@8;)
-                      end
-                    end
-                    local.get $4
-                    i32.const 16
-                    i32.add
-                    local.tee $8
-                    i32.load
-                    local.tee $10
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $10
-                        local.set $4
-                        local.get $8
-                        local.set $5
-                        br 2 (;@8;)
-                      end
-                    end
-                  end
-                  local.get $5
-                  local.get $11
-                  i32.lt_u
-                  if ;; label = @8
-                    call $fimport$10
-                  else
-                    block ;; label = @9
-                      local.get $5
-                      i32.const 0
-                      i32.store
-                      local.get $4
-                      local.set $7
-                    end
-                  end
-                end
-              else
-                block ;; label = @7
-                  local.get $0
-                  i32.load offset=8
-                  local.tee $5
-                  local.get $11
-                  i32.lt_u
-                  if ;; label = @8
-                    call $fimport$10
-                  end
-                  local.get $5
-                  i32.const 12
-                  i32.add
-                  local.tee $8
-                  i32.load
-                  local.get $0
-                  i32.ne
-                  if ;; label = @8
-                    call $fimport$10
-                  end
-                  local.get $4
-                  i32.const 8
-                  i32.add
-                  local.tee $10
-                  i32.load
-                  local.get $0
-                  i32.eq
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $8
-                      local.get $4
-                      i32.store
-                      local.get $10
-                      local.get $5
-                      i32.store
-                      local.get $4
-                      local.set $7
-                    end
-                  else
-                    call $fimport$10
-                  end
-                end
-              end
-            end
-            local.get $12
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                local.get $0
-                i32.load offset=28
-                local.tee $4
-                i32.const 2
-                i32.shl
-                i32.const 3948
-                i32.add
-                local.tee $5
-                i32.load
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $5
-                    local.get $7
-                    i32.store
-                    local.get $7
-                    i32.eqz
-                    if ;; label = @9
-                      block ;; label = @10
-                        i32.const 3648
-                        i32.const 3648
-                        i32.load
-                        i32.const 1
-                        local.get $4
-                        i32.shl
-                        i32.const -1
-                        i32.xor
-                        i32.and
-                        i32.store
-                        local.get $0
-                        local.set $3
-                        local.get $1
-                        local.set $2
-                        br 8 (;@2;)
-                      end
-                    end
-                  end
-                else
-                  block ;; label = @8
-                    local.get $12
-                    i32.const 3660
-                    i32.load
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $12
-                    i32.const 16
-                    i32.add
-                    local.tee $4
-                    i32.load
-                    local.get $0
-                    i32.eq
-                    if ;; label = @9
-                      local.get $4
-                      local.get $7
-                      i32.store
-                    else
-                      local.get $12
-                      local.get $7
-                      i32.store offset=20
-                    end
-                    local.get $7
-                    i32.eqz
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $0
-                        local.set $3
-                        local.get $1
-                        local.set $2
-                        br 8 (;@2;)
-                      end
-                    end
-                  end
-                end
-                local.get $7
-                i32.const 3660
-                i32.load
-                local.tee $5
-                i32.lt_u
-                if ;; label = @7
-                  call $fimport$10
-                end
-                local.get $7
-                local.get $12
-                i32.store offset=24
-                local.get $0
-                i32.const 16
-                i32.add
-                local.tee $8
-                i32.load
-                local.tee $4
-                if ;; label = @7
-                  local.get $4
-                  local.get $5
-                  i32.lt_u
-                  if ;; label = @8
-                    call $fimport$10
-                  else
-                    block ;; label = @9
-                      local.get $7
-                      local.get $4
-                      i32.store offset=16
-                      local.get $4
-                      local.get $7
-                      i32.store offset=24
-                    end
-                  end
-                end
-                local.get $8
-                i32.load offset=4
-                local.tee $4
-                if ;; label = @7
-                  local.get $4
-                  i32.const 3660
-                  i32.load
-                  i32.lt_u
-                  if ;; label = @8
-                    call $fimport$10
-                  else
-                    block ;; label = @9
-                      local.get $7
-                      local.get $4
-                      i32.store offset=20
-                      local.get $4
-                      local.get $7
-                      i32.store offset=24
-                      local.get $0
-                      local.set $3
-                      local.get $1
-                      local.set $2
-                    end
-                  end
-                else
-                  block ;; label = @8
-                    local.get $0
-                    local.set $3
-                    local.get $1
-                    local.set $2
-                  end
-                end
-              end
-            else
-              block ;; label = @6
-                local.get $0
-                local.set $3
-                local.get $1
-                local.set $2
-              end
-            end
-          end
-        end
-      end
-      local.get $3
-      local.get $6
-      i32.ge_u
-      if ;; label = @2
-        call $fimport$10
-      end
-      local.get $6
-      i32.const 4
-      i32.add
-      local.tee $1
-      i32.load
-      local.tee $0
-      i32.const 1
-      i32.and
-      i32.eqz
-      if ;; label = @2
-        call $fimport$10
-      end
-      local.get $0
-      i32.const 2
-      i32.and
-      if ;; label = @2
-        block ;; label = @3
-          local.get $1
-          local.get $0
-          i32.const -2
-          i32.and
-          i32.store
-          local.get $3
-          local.get $2
-          i32.const 1
-          i32.or
-          i32.store offset=4
-          local.get $3
-          local.get $2
-          i32.add
-          local.get $2
-          i32.store
-        end
-      else
-        block ;; label = @3
-          local.get $6
-          i32.const 3668
-          i32.load
-          i32.eq
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 3656
-              i32.const 3656
-              i32.load
-              local.get $2
-              i32.add
-              local.tee $0
-              i32.store
-              i32.const 3668
-              local.get $3
-              i32.store
-              local.get $3
-              local.get $0
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $3
-              i32.const 3664
-              i32.load
-              i32.ne
-              if ;; label = @6
-                return
-              end
-              i32.const 3664
-              i32.const 0
-              i32.store
-              i32.const 3652
-              i32.const 0
-              i32.store
-              return
-            end
-          end
-          local.get $6
-          i32.const 3664
-          i32.load
-          i32.eq
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 3652
-              i32.const 3652
-              i32.load
-              local.get $2
-              i32.add
-              local.tee $0
-              i32.store
-              i32.const 3664
-              local.get $3
-              i32.store
-              local.get $3
-              local.get $0
-              i32.const 1
-              i32.or
-              i32.store offset=4
-              local.get $3
-              local.get $0
-              i32.add
-              local.get $0
-              i32.store
-              return
-            end
-          end
-          local.get $0
-          i32.const -8
-          i32.and
-          local.get $2
-          i32.add
-          local.set $5
-          local.get $0
-          i32.const 3
-          i32.shr_u
-          local.set $4
-          block $label$61 ;; label = @4
-            local.get $0
-            i32.const 256
-            i32.lt_u
-            if ;; label = @5
-              block ;; label = @6
-                local.get $6
-                i32.load offset=12
-                local.set $2
-                local.get $6
-                i32.load offset=8
-                local.tee $1
-                local.get $4
-                i32.const 1
-                i32.shl
-                i32.const 2
-                i32.shl
-                i32.const 3684
-                i32.add
-                local.tee $0
-                i32.ne
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $1
-                    i32.const 3660
-                    i32.load
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $1
-                    i32.load offset=12
-                    local.get $6
-                    i32.ne
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                  end
-                end
-                local.get $2
-                local.get $1
-                i32.eq
-                if ;; label = @7
-                  block ;; label = @8
-                    i32.const 3644
-                    i32.const 3644
-                    i32.load
-                    i32.const 1
-                    local.get $4
-                    i32.shl
-                    i32.const -1
-                    i32.xor
-                    i32.and
-                    i32.store
-                    br 4 (;@4;)
-                  end
-                end
-                local.get $2
-                local.get $0
-                i32.eq
-                if ;; label = @7
-                  local.get $2
-                  i32.const 8
-                  i32.add
-                  local.set $14
-                else
-                  block ;; label = @8
-                    local.get $2
-                    i32.const 3660
-                    i32.load
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $2
-                    i32.const 8
-                    i32.add
-                    local.tee $0
-                    i32.load
-                    local.get $6
-                    i32.eq
-                    if ;; label = @9
-                      local.get $0
-                      local.set $14
-                    else
-                      call $fimport$10
-                    end
-                  end
-                end
-                local.get $1
-                local.get $2
-                i32.store offset=12
-                local.get $14
-                local.get $1
-                i32.store
-              end
-            else
-              block ;; label = @6
-                local.get $6
-                i32.load offset=24
-                local.set $7
-                block $label$73 ;; label = @7
-                  local.get $6
-                  i32.load offset=12
-                  local.tee $0
-                  local.get $6
-                  i32.eq
-                  if ;; label = @8
-                    block ;; label = @9
-                      local.get $6
-                      i32.const 16
-                      i32.add
-                      local.tee $2
-                      i32.const 4
-                      i32.add
-                      local.tee $1
-                      i32.load
-                      local.tee $0
-                      if ;; label = @10
-                        local.get $1
-                        local.set $2
-                      else
-                        local.get $2
-                        i32.load
-                        local.tee $0
-                        i32.eqz
-                        if ;; label = @11
-                          block ;; label = @12
-                            i32.const 0
-                            local.set $9
-                            br 5 (;@7;)
-                          end
-                        end
-                      end
-                      loop $label$78 ;; label = @10
-                        local.get $0
-                        i32.const 20
-                        i32.add
-                        local.tee $1
-                        i32.load
-                        local.tee $4
-                        if ;; label = @11
-                          block ;; label = @12
-                            local.get $4
-                            local.set $0
-                            local.get $1
-                            local.set $2
-                            br 2 (;@10;)
-                          end
-                        end
-                        local.get $0
-                        i32.const 16
-                        i32.add
-                        local.tee $1
-                        i32.load
-                        local.tee $4
-                        if ;; label = @11
-                          block ;; label = @12
-                            local.get $4
-                            local.set $0
-                            local.get $1
-                            local.set $2
-                            br 2 (;@10;)
-                          end
-                        end
-                      end
-                      local.get $2
-                      i32.const 3660
-                      i32.load
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$10
-                      else
-                        block ;; label = @11
-                          local.get $2
-                          i32.const 0
-                          i32.store
-                          local.get $0
-                          local.set $9
-                        end
-                      end
-                    end
-                  else
-                    block ;; label = @9
-                      local.get $6
-                      i32.load offset=8
-                      local.tee $2
-                      i32.const 3660
-                      i32.load
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$10
-                      end
-                      local.get $2
-                      i32.const 12
-                      i32.add
-                      local.tee $1
-                      i32.load
-                      local.get $6
-                      i32.ne
-                      if ;; label = @10
-                        call $fimport$10
-                      end
-                      local.get $0
-                      i32.const 8
-                      i32.add
-                      local.tee $4
-                      i32.load
-                      local.get $6
-                      i32.eq
-                      if ;; label = @10
-                        block ;; label = @11
-                          local.get $1
-                          local.get $0
-                          i32.store
-                          local.get $4
-                          local.get $2
-                          i32.store
-                          local.get $0
-                          local.set $9
-                        end
-                      else
-                        call $fimport$10
-                      end
-                    end
-                  end
-                end
-                local.get $7
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $6
-                    local.get $6
-                    i32.load offset=28
-                    local.tee $0
-                    i32.const 2
-                    i32.shl
-                    i32.const 3948
-                    i32.add
-                    local.tee $2
-                    i32.load
-                    i32.eq
-                    if ;; label = @9
-                      block ;; label = @10
-                        local.get $2
-                        local.get $9
-                        i32.store
-                        local.get $9
-                        i32.eqz
-                        if ;; label = @11
-                          block ;; label = @12
-                            i32.const 3648
-                            i32.const 3648
-                            i32.load
-                            i32.const 1
-                            local.get $0
-                            i32.shl
-                            i32.const -1
-                            i32.xor
-                            i32.and
-                            i32.store
-                            br 8 (;@4;)
-                          end
-                        end
-                      end
-                    else
-                      block ;; label = @10
-                        local.get $7
-                        i32.const 3660
-                        i32.load
-                        i32.lt_u
-                        if ;; label = @11
-                          call $fimport$10
-                        end
-                        local.get $7
-                        i32.const 16
-                        i32.add
-                        local.tee $0
-                        i32.load
-                        local.get $6
-                        i32.eq
-                        if ;; label = @11
-                          local.get $0
-                          local.get $9
-                          i32.store
-                        else
-                          local.get $7
-                          local.get $9
-                          i32.store offset=20
-                        end
-                        local.get $9
-                        i32.eqz
-                        br_if 6 (;@4;)
-                      end
-                    end
-                    local.get $9
-                    i32.const 3660
-                    i32.load
-                    local.tee $2
-                    i32.lt_u
-                    if ;; label = @9
-                      call $fimport$10
-                    end
-                    local.get $9
-                    local.get $7
-                    i32.store offset=24
-                    local.get $6
-                    i32.const 16
-                    i32.add
-                    local.tee $1
-                    i32.load
-                    local.tee $0
-                    if ;; label = @9
-                      local.get $0
-                      local.get $2
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$10
-                      else
-                        block ;; label = @11
-                          local.get $9
-                          local.get $0
-                          i32.store offset=16
-                          local.get $0
-                          local.get $9
-                          i32.store offset=24
-                        end
-                      end
-                    end
-                    local.get $1
-                    i32.load offset=4
-                    local.tee $0
-                    if ;; label = @9
-                      local.get $0
-                      i32.const 3660
-                      i32.load
-                      i32.lt_u
-                      if ;; label = @10
-                        call $fimport$10
-                      else
-                        block ;; label = @11
-                          local.get $9
-                          local.get $0
-                          i32.store offset=20
-                          local.get $0
-                          local.get $9
-                          i32.store offset=24
-                        end
-                      end
-                    end
-                  end
-                end
-              end
-            end
-          end
-          local.get $3
-          local.get $5
-          i32.const 1
-          i32.or
-          i32.store offset=4
-          local.get $3
-          local.get $5
-          i32.add
-          local.get $5
-          i32.store
-          local.get $3
-          i32.const 3664
-          i32.load
-          i32.eq
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 3652
-              local.get $5
-              i32.store
-              return
-            end
-          else
-            local.get $5
-            local.set $2
-          end
-        end
-      end
-      local.get $2
-      i32.const 3
-      i32.shr_u
-      local.set $1
-      local.get $2
-      i32.const 256
-      i32.lt_u
-      if ;; label = @2
-        block ;; label = @3
-          local.get $1
-          i32.const 1
-          i32.shl
-          i32.const 2
-          i32.shl
-          i32.const 3684
-          i32.add
-          local.set $0
-          i32.const 3644
-          i32.load
-          local.tee $2
-          i32.const 1
-          local.get $1
-          i32.shl
-          local.tee $1
-          i32.and
-          if ;; label = @4
-            local.get $0
-            i32.const 8
-            i32.add
-            local.tee $2
-            i32.load
-            local.tee $1
-            i32.const 3660
-            i32.load
-            i32.lt_u
-            if ;; label = @5
-              call $fimport$10
-            else
-              block ;; label = @6
-                local.get $2
-                local.set $15
-                local.get $1
-                local.set $13
-              end
-            end
-          else
-            block ;; label = @5
-              i32.const 3644
-              local.get $2
-              local.get $1
-              i32.or
-              i32.store
-              local.get $0
-              i32.const 8
-              i32.add
-              local.set $15
-              local.get $0
-              local.set $13
-            end
-          end
-          local.get $15
-          local.get $3
-          i32.store
-          local.get $13
-          local.get $3
-          i32.store offset=12
-          local.get $3
-          local.get $13
-          i32.store offset=8
-          local.get $3
-          local.get $0
-          i32.store offset=12
-          return
-        end
-      end
-      local.get $2
-      i32.const 8
-      i32.shr_u
-      local.tee $0
-      if (result i32) ;; label = @2
-        local.get $2
-        i32.const 16777215
-        i32.gt_u
-        if (result i32) ;; label = @3
-          i32.const 31
-        else
-          local.get $2
-          i32.const 14
-          local.get $0
-          local.get $0
-          i32.const 1048320
-          i32.add
-          i32.const 16
-          i32.shr_u
-          i32.const 8
-          i32.and
-          local.tee $0
-          i32.shl
-          local.tee $1
-          i32.const 520192
-          i32.add
-          i32.const 16
-          i32.shr_u
-          i32.const 4
-          i32.and
-          local.tee $4
-          local.get $0
-          i32.or
-          local.get $1
-          local.get $4
-          i32.shl
-          local.tee $0
-          i32.const 245760
-          i32.add
-          i32.const 16
-          i32.shr_u
-          i32.const 2
-          i32.and
-          local.tee $1
-          i32.or
-          i32.sub
-          local.get $0
-          local.get $1
-          i32.shl
-          i32.const 15
-          i32.shr_u
-          i32.add
-          local.tee $0
-          i32.const 7
-          i32.add
-          i32.shr_u
-          i32.const 1
-          i32.and
-          local.get $0
-          i32.const 1
-          i32.shl
-          i32.or
-        end
-      else
-        i32.const 0
-      end
-      local.tee $1
-      i32.const 2
-      i32.shl
-      i32.const 3948
-      i32.add
-      local.set $0
-      local.get $3
-      local.get $1
-      i32.store offset=28
-      local.get $3
-      i32.const 0
-      i32.store offset=20
-      local.get $3
-      i32.const 0
-      i32.store offset=16
-      block $label$113 ;; label = @2
-        i32.const 3648
-        i32.load
-        local.tee $4
-        i32.const 1
-        local.get $1
-        i32.shl
-        local.tee $5
-        i32.and
-        if ;; label = @3
-          block ;; label = @4
-            local.get $0
-            i32.load
-            local.set $0
-            i32.const 25
-            local.get $1
-            i32.const 1
-            i32.shr_u
-            i32.sub
-            local.set $4
-            local.get $2
-            local.get $1
-            i32.const 31
-            i32.eq
-            if (result i32) ;; label = @5
-              i32.const 0
-            else
-              local.get $4
-            end
-            i32.shl
-            local.set $1
-            block $label$117 ;; label = @5
-              block $label$118 ;; label = @6
-                block $label$119 ;; label = @7
-                  loop $label$120 ;; label = @8
-                    local.get $0
-                    i32.load offset=4
-                    i32.const -8
-                    i32.and
-                    local.get $2
-                    i32.eq
-                    br_if 2 (;@6;)
-                    local.get $1
-                    i32.const 1
-                    i32.shl
-                    local.set $4
-                    local.get $0
-                    i32.const 16
-                    i32.add
-                    local.get $1
-                    i32.const 31
-                    i32.shr_u
-                    i32.const 2
-                    i32.shl
-                    i32.add
-                    local.tee $1
-                    i32.load
-                    local.tee $5
-                    i32.eqz
-                    br_if 1 (;@7;)
-                    local.get $4
-                    local.set $1
-                    local.get $5
-                    local.set $0
-                    br 0 (;@8;)
-                  end
-                end
-                local.get $1
-                i32.const 3660
-                i32.load
-                i32.lt_u
-                if ;; label = @7
-                  call $fimport$10
-                else
-                  block ;; label = @8
-                    local.get $1
-                    local.get $3
-                    i32.store
-                    local.get $3
-                    local.get $0
-                    i32.store offset=24
-                    local.get $3
-                    local.get $3
-                    i32.store offset=12
-                    local.get $3
-                    local.get $3
-                    i32.store offset=8
-                    br 6 (;@2;)
-                  end
-                end
-                br 1 (;@5;)
-              end
-              local.get $0
-              i32.const 8
-              i32.add
-              local.tee $1
-              i32.load
-              local.tee $2
-              i32.const 3660
-              i32.load
-              local.tee $4
-              i32.ge_u
-              local.get $0
-              local.get $4
-              i32.ge_u
-              i32.and
-              if ;; label = @6
-                block ;; label = @7
-                  local.get $2
-                  local.get $3
-                  i32.store offset=12
-                  local.get $1
-                  local.get $3
-                  i32.store
-                  local.get $3
-                  local.get $2
-                  i32.store offset=8
-                  local.get $3
-                  local.get $0
-                  i32.store offset=12
-                  local.get $3
-                  i32.const 0
-                  i32.store offset=24
-                end
-              else
-                call $fimport$10
-              end
-            end
-          end
-        else
-          block ;; label = @4
-            i32.const 3648
-            local.get $4
-            local.get $5
-            i32.or
-            i32.store
-            local.get $0
-            local.get $3
-            i32.store
-            local.get $3
-            local.get $0
-            i32.store offset=24
-            local.get $3
-            local.get $3
-            i32.store offset=12
-            local.get $3
-            local.get $3
-            i32.store offset=8
-          end
-        end
-      end
-      i32.const 3676
-      i32.const 3676
-      i32.load
-      i32.const -1
-      i32.add
-      local.tee $0
-      i32.store
-      local.get $0
-      if ;; label = @2
-        return
-      else
-        i32.const 4100
-        local.set $0
-      end
-      loop $label$128 ;; label = @2
-        local.get $0
-        i32.load
-        local.tee $2
-        i32.const 8
-        i32.add
-        local.set $0
-        local.get $2
-        br_if 0 (;@2;)
-      end
-      i32.const 3676
-      i32.const -1
-      i32.store
-    end
+ )
+ (func $39 (; 52 ;) (type $12) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+  (call_indirect (type $0)
+   (local.get $1)
+   (local.get $2)
+   (local.get $3)
+   (i32.add
+    (i32.and
+     (local.get $0)
+     (i32.const 3)
+    )
+    (i32.const 2)
+   )
   )
-  (func $33 (;46;) (type $6)
-    nop
+ )
+ (func $40 (; 53 ;) (type $5) (param $0 i32) (param $1 i32)
+  (call_indirect (type $2)
+   (local.get $1)
+   (i32.add
+    (i32.and
+     (local.get $0)
+     (i32.const 1)
+    )
+    (i32.const 6)
+   )
   )
-  (func $34 (;47;) (type $1) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32)
-    block $label$1 (result i32) ;; label = @1
-      global.get $global$0
-      i32.load
-      local.tee $2
-      local.get $0
-      i32.const 15
-      i32.add
-      i32.const -16
-      i32.and
-      local.tee $0
-      i32.add
-      local.set $1
-      local.get $0
-      i32.const 0
-      i32.gt_s
-      local.get $1
-      local.get $2
-      i32.lt_s
-      i32.and
-      local.get $1
-      i32.const 0
-      i32.lt_s
-      i32.or
-      if ;; label = @2
-        block ;; label = @3
-          call $fimport$6
-          drop
-          i32.const 12
-          call $fimport$11
-          i32.const -1
-          return
-        end
-      end
-      global.get $global$0
-      local.get $1
-      i32.store
-      local.get $1
-      call $fimport$5
-      i32.gt_s
-      if ;; label = @2
-        call $fimport$4
-        i32.eqz
-        if ;; label = @3
-          block ;; label = @4
-            i32.const 12
-            call $fimport$11
-            global.get $global$0
-            local.get $2
-            i32.store
-            i32.const -1
-            return
-          end
-        end
-      end
-      local.get $2
-    end
+ )
+ (func $41 (; 54 ;) (type $1) (param $0 i32) (result i32)
+  (block $label$1 (result i32)
+   (call $fimport$3
+    (i32.const 0)
+   )
+   (i32.const 0)
   )
-  (func $35 (;48;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32) (local $4 i32) (local $5 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $0
-      local.get $2
-      i32.add
-      local.set $4
-      local.get $2
-      i32.const 20
-      i32.ge_s
-      if ;; label = @2
-        block ;; label = @3
-          local.get $1
-          i32.const 255
-          i32.and
-          local.set $1
-          local.get $0
-          i32.const 3
-          i32.and
-          local.tee $3
-          if ;; label = @4
-            block ;; label = @5
-              local.get $0
-              i32.const 4
-              i32.add
-              local.get $3
-              i32.sub
-              local.set $3
-              loop $label$4 ;; label = @6
-                local.get $0
-                local.get $3
-                i32.lt_s
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $0
-                    local.get $1
-                    i32.store8
-                    local.get $0
-                    i32.const 1
-                    i32.add
-                    local.set $0
-                    br 2 (;@6;)
-                  end
-                end
-              end
-            end
-          end
-          local.get $1
-          local.get $1
-          i32.const 8
-          i32.shl
-          i32.or
-          local.get $1
-          i32.const 16
-          i32.shl
-          i32.or
-          local.get $1
-          i32.const 24
-          i32.shl
-          i32.or
-          local.set $3
-          local.get $4
-          i32.const -4
-          i32.and
-          local.set $5
-          loop $label$6 ;; label = @4
-            local.get $0
-            local.get $5
-            i32.lt_s
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                local.get $3
-                i32.store
-                local.get $0
-                i32.const 4
-                i32.add
-                local.set $0
-                br 2 (;@4;)
-              end
-            end
-          end
-        end
-      end
-      loop $label$8 ;; label = @2
-        local.get $0
-        local.get $4
-        i32.lt_s
-        if ;; label = @3
-          block ;; label = @4
-            local.get $0
-            local.get $1
-            i32.store8
-            local.get $0
-            i32.const 1
-            i32.add
-            local.set $0
-            br 2 (;@2;)
-          end
-        end
-      end
-      local.get $0
-      local.get $2
-      i32.sub
-    end
+ )
+ (func $42 (; 55 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (block $label$1 (result i32)
+   (call $fimport$3
+    (i32.const 1)
+   )
+   (i32.const 0)
   )
-  (func $36 (;49;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    (local $3 i32)
-    block $label$1 (result i32) ;; label = @1
-      local.get $2
-      i32.const 4096
-      i32.ge_s
-      if ;; label = @2
-        local.get $0
-        local.get $1
-        local.get $2
-        call $fimport$12
-        return
-      end
-      local.get $0
-      local.set $3
-      local.get $0
-      i32.const 3
-      i32.and
-      local.get $1
-      i32.const 3
-      i32.and
-      i32.eq
-      if ;; label = @2
-        block ;; label = @3
-          loop $label$4 ;; label = @4
-            local.get $0
-            i32.const 3
-            i32.and
-            if ;; label = @5
-              block ;; label = @6
-                local.get $2
-                i32.eqz
-                if ;; label = @7
-                  local.get $3
-                  return
-                end
-                local.get $0
-                local.get $1
-                i32.load8_s
-                i32.store8
-                local.get $0
-                i32.const 1
-                i32.add
-                local.set $0
-                local.get $1
-                i32.const 1
-                i32.add
-                local.set $1
-                local.get $2
-                i32.const 1
-                i32.sub
-                local.set $2
-                br 2 (;@4;)
-              end
-            end
-          end
-          loop $label$7 ;; label = @4
-            local.get $2
-            i32.const 4
-            i32.ge_s
-            if ;; label = @5
-              block ;; label = @6
-                local.get $0
-                local.get $1
-                i32.load
-                i32.store
-                local.get $0
-                i32.const 4
-                i32.add
-                local.set $0
-                local.get $1
-                i32.const 4
-                i32.add
-                local.set $1
-                local.get $2
-                i32.const 4
-                i32.sub
-                local.set $2
-                br 2 (;@4;)
-              end
-            end
-          end
-        end
-      end
-      loop $label$9 ;; label = @2
-        local.get $2
-        i32.const 0
-        i32.gt_s
-        if ;; label = @3
-          block ;; label = @4
-            local.get $0
-            local.get $1
-            i32.load8_s
-            i32.store8
-            local.get $0
-            i32.const 1
-            i32.add
-            local.set $0
-            local.get $1
-            i32.const 1
-            i32.add
-            local.set $1
-            local.get $2
-            i32.const 1
-            i32.sub
-            local.set $2
-            br 2 (;@2;)
-          end
-        end
-      end
-      local.get $3
-    end
+ )
+ (func $43 (; 56 ;) (type $2) (param $0 i32)
+  (call $fimport$3
+   (i32.const 2)
   )
-  (func $37 (;50;) (type $3) (result i32)
-    i32.const 0
-  )
-  (func $38 (;51;) (type $4) (param $0 i32) (param $1 i32) (result i32)
-    local.get $1
-    local.get $0
-    i32.const 1
-    i32.and
-    i32.const 0
-    i32.add
-    call_indirect (type $1)
-  )
-  (func $39 (;52;) (type $12) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
-    local.get $1
-    local.get $2
-    local.get $3
-    local.get $0
-    i32.const 3
-    i32.and
-    i32.const 2
-    i32.add
-    call_indirect (type $0)
-  )
-  (func $40 (;53;) (type $5) (param $0 i32) (param $1 i32)
-    local.get $1
-    local.get $0
-    i32.const 1
-    i32.and
-    i32.const 6
-    i32.add
-    call_indirect (type $2)
-  )
-  (func $41 (;54;) (type $1) (param $0 i32) (result i32)
-    block $label$1 (result i32) ;; label = @1
-      i32.const 0
-      call $fimport$3
-      i32.const 0
-    end
-  )
-  (func $42 (;55;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    block $label$1 (result i32) ;; label = @1
-      i32.const 1
-      call $fimport$3
-      i32.const 0
-    end
-  )
-  (func $43 (;56;) (type $2) (param $0 i32)
-    i32.const 2
-    call $fimport$3
-  )
-  (global $global$0 (;5;) (mut i32) global.get $gimport$0)
-  (global $global$1 (;6;) (mut i32) global.get $gimport$1)
-  (global $global$2 (;7;) (mut i32) global.get $gimport$2)
-  (global $global$3 (;8;) (mut i32) i32.const 0)
-  (global $global$4 (;9;) (mut i32) i32.const 0)
-  (global $global$5 (;10;) (mut i32) i32.const 0)
-  (export "_sbrk" (func $34))
-  (export "_free" (func $32))
-  (export "_main" (func $7))
-  (export "_pthread_self" (func $37))
-  (export "_memset" (func $35))
-  (export "_malloc" (func $31))
-  (export "_memcpy" (func $36))
-  (export "___errno_location" (func $11))
-  (export "runPostSets" (func $33))
-  (export "stackAlloc" (func $0))
-  (export "stackSave" (func $1))
-  (export "stackRestore" (func $2))
-  (export "establishStackSpace" (func $3))
-  (export "setThrew" (func $4))
-  (export "setTempRet0" (func $5))
-  (export "getTempRet0" (func $6))
-  (export "dynCall_ii" (func $38))
-  (export "dynCall_iiii" (func $39))
-  (export "dynCall_vi" (func $40))
-  (elem (;0;) (global.get $gimport$19) func $41 $8 $42 $13 $9 $14 $43 $15)
-  (data (;0;) (i32.const 1024) "\04\04\00\00\05")
-  (data (;1;) (i32.const 1040) "\01")
-  (data (;2;) (i32.const 1064) "\01\00\00\00\02\00\00\004\10\00\00\00\04")
-  (data (;3;) (i32.const 1088) "\01")
-  (data (;4;) (i32.const 1103) "\0a\ff\ff\ff\ff")
-  (data (;5;) (i32.const 1140) "error: %d\5cn\00lastprime: %d.\0a\00\11\00\0a\00\11\11\11\00\00\00\00\05\00\00\00\00\00\00\09\00\00\00\00\0b")
-  (data (;6;) (i32.const 1200) "\11\00\0f\0a\11\11\11\03\0a\07\00\01\13\09\0b\0b\00\00\09\06\0b\00\00\0b\00\06\11\00\00\00\11\11\11")
-  (data (;7;) (i32.const 1249) "\0b")
-  (data (;8;) (i32.const 1258) "\11\00\0a\0a\11\11\11\00\0a\00\00\02\00\09\0b\00\00\00\09\00\0b\00\00\0b")
-  (data (;9;) (i32.const 1307) "\0c")
-  (data (;10;) (i32.const 1319) "\0c\00\00\00\00\0c\00\00\00\00\09\0c\00\00\00\00\00\0c\00\00\0c")
-  (data (;11;) (i32.const 1365) "\0e")
-  (data (;12;) (i32.const 1377) "\0d\00\00\00\04\0d\00\00\00\00\09\0e\00\00\00\00\00\0e\00\00\0e")
-  (data (;13;) (i32.const 1423) "\10")
-  (data (;14;) (i32.const 1435) "\0f\00\00\00\00\0f\00\00\00\00\09\10\00\00\00\00\00\10\00\00\10\00\00\12\00\00\00\12\12\12")
-  (data (;15;) (i32.const 1490) "\12\00\00\00\12\12\12\00\00\00\00\00\00\09")
-  (data (;16;) (i32.const 1539) "\0b")
-  (data (;17;) (i32.const 1551) "\0a\00\00\00\00\0a\00\00\00\00\09\0b\00\00\00\00\00\0b\00\00\0b")
-  (data (;18;) (i32.const 1597) "\0c")
-  (data (;19;) (i32.const 1609) "\0c\00\00\00\00\0c\00\00\00\00\09\0c\00\00\00\00\00\0c\00\00\0c\00\000123456789ABCDEF-+   0X0x\00(null)\00-0X+0X 0X-0x+0x 0x\00inf\00INF\00nan\00NAN\00.\00T!\22\19\0d\01\02\03\11K\1c\0c\10\04\0b\1d\12\1e'hnopqb \05\06\0f\13\14\15\1a\08\16\07($\17\18\09\0a\0e\1b\1f%#\83\82}&*+<=>?CGJMXYZ[\5c]^_`acdefgijklrstyz{|\00Illegal byte sequence\00Domain error\00Result not representable\00Not a tty\00Permission denied\00Operation not permitted\00No such file or directory\00No such process\00File exists\00Value too large for data type\00No space left on device\00Out of memory\00Resource busy\00Interrupted system call\00Resource temporarily unavailable\00Invalid seek\00Cross-device link\00Read-only file system\00Directory not empty\00Connection reset by peer\00Operation timed out\00Connection refused\00Host is down\00Host is unreachable\00Address in use\00Broken pipe\00I/O error\00No such device or address\00Block device required\00No such device\00Not a directory\00Is a directory\00Text file busy\00Exec format error\00Invalid argument\00Argument list too long\00Symbolic link loop\00Filename too long\00Too many open files in system\00No file descriptors available\00Bad file descriptor\00No child process\00Bad address\00File too large\00Too many links\00No locks available\00Resource deadlock would occur\00State not recoverable\00Previous owner died\00Operation canceled\00Function not implemented\00No message of desired type\00Identifier removed\00Device not a stream\00No data available\00Device timeout\00Out of streams resources\00Link has been severed\00Protocol error\00Bad message\00File descriptor in bad state\00Not a socket\00Destination address required\00Message too large\00Protocol wrong type for socket\00Protocol not available\00Protocol not supported\00Socket type not supported\00Not supported\00Protocol family not supported\00Address family not supported by protocol\00Address not available\00Network is down\00Network unreachable\00Connection reset by network\00Connection aborted\00No buffer space available\00Socket is connected\00Socket not connected\00Cannot send after socket shutdown\00Operation already in progress\00Operation in progress\00Stale file handle\00Remote I/O error\00Quota exceeded\00No medium found\00Wrong medium type\00No error information")
-)
\ No newline at end of file
+ )
+)
+
diff --git a/cranelift/wasm/wasmtests/rust_fannkuch.wat b/cranelift/wasm/wasmtests/rust_fannkuch.wat
index c61f08c67a98..cd47f661c82c 100644
--- a/cranelift/wasm/wasmtests/rust_fannkuch.wat
+++ b/cranelift/wasm/wasmtests/rust_fannkuch.wat
@@ -1,1723 +1,2511 @@
 (module
-  (type $0 (;0;) (func (param i32 i32 i32) (result i32)))
-  (type $1 (;1;) (func (param i32 i32) (result i32)))
-  (type $2 (;2;) (func (param i32)))
-  (type $3 (;3;) (func (param i32) (result i32)))
-  (type $4 (;4;) (func (param i32 i32)))
-  (type $5 (;5;) (func (param i64 i32) (result i32)))
-  (type $6 (;6;) (func (param i32) (result i64)))
-  (type $7 (;7;) (func))
-  (type $8 (;8;) (func (param i32 i32)))
-  (type $9 (;9;) (func (param i32 i32 i32) (result i32)))
-  (func $0 (;0;) (type $7)
-    (local $0 i32) (local $1 i32)
-    i32.const 1
-    local.set $0
-    block $label$1 ;; label = @1
-      block $label$2 ;; label = @2
-        block $label$3 ;; label = @3
-          i32.const 1049232
-          i32.load
-          i32.const 1
-          i32.eq
-          if ;; label = @4
-            block ;; label = @5
-              i32.const 1049236
-              i32.const 1049236
-              i32.load
-              i32.const 1
-              i32.add
-              local.tee $0
-              i32.store
-              local.get $0
-              i32.const 3
-              i32.lt_u
-              br_if 2 (;@3;)
-              br 3 (;@2;)
-            end
-          end
-          i32.const 1049232
-          i64.const 4294967297
-          i64.store
-        end
-        i32.const 1049240
-        i32.load
-        local.tee $1
-        i32.const -1
-        i32.le_s
-        br_if 0 (;@2;)
-        i32.const 1049240
-        local.get $1
-        i32.store
-        local.get $0
-        i32.const 2
-        i32.lt_u
-        br_if 1 (;@1;)
-      end
-      unreachable
-    end
-    unreachable
+ (type $0 (func (param i32 i32 i32) (result i32)))
+ (type $1 (func (param i32 i32) (result i32)))
+ (type $2 (func (param i32)))
+ (type $3 (func (param i32) (result i32)))
+ (type $4 (func (param i32 i32)))
+ (type $5 (func (param i64 i32) (result i32)))
+ (type $6 (func (param i32) (result i64)))
+ (type $7 (func))
+ (type $8 (func (param i32 i32)))
+ (type $9 (func (param i32 i32 i32) (result i32)))
+ (memory $0 17)
+ (data (i32.const 1048576) "src/lib.rs\00\00\00\00\00\00attempt to divide by zero\00\00\00\00\00\00\00attempt to divide with overflow\00index out of bounds: the len is  but the index is 00010203040506070809101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899called `Option::unwrap()` on a `None` valuesrc/libcore/option.rssrc/lib.rs")
+ (data (i32.const 1048982) "\10\00\n\00\00\00%\00\00\00\1d\00\00\00\10\00\10\00\19\00\00\00\00\00\10\00\n\00\00\00&\00\00\00\15\00\00\000\00\10\00\1f\00\00\00\00\00\10\00\n\00\00\00&\00\00\00\15\00\00\00\00\00\10\00\n\00\00\00.\00\00\00\15\00\00\00\00\00\10\00\n\00\00\000\00\00\00\15\00\00\00\00\00\10\00\n\00\00\00-\00\00\00\11\00\00\00\00\00\10\00\n\00\00\00E\00\00\00\17\00\00\00\00\00\10\00\n\00\00\00q\00\00\00\"\00\00\00\00\00\10\00\n\00\00\00s\00\00\00\11\00\00\00P\00\10\00 \00\00\00p\00\10\00\12\00\00\00\02\00\00\00\00\00\00\00\01\00\00\00\03\00\00\00J\01\10\00+\00\00\00u\01\10\00\15\00\00\00Y\01\00\00\15\00\00\00\8a\01\10\00\n\00\00\00\08\00\00\00\t\00\00\00\8a\01\10\00\n\00\00\00\n\00\00\00\14")
+ (table $0 4 4 funcref)
+ (elem (i32.const 1) $4 $7 $8)
+ (global $global$0 (mut i32) (i32.const 1048576))
+ (global $global$1 i32 (i32.const 1049244))
+ (global $global$2 i32 (i32.const 1049244))
+ (export "memory" (memory $0))
+ (export "__heap_base" (global $global$1))
+ (export "__data_end" (global $global$2))
+ (export "run_fannkuch" (func $10))
+ (func $0 (; 0 ;) (type $7)
+  (local $0 i32)
+  (local $1 i32)
+  (local.set $0
+   (i32.const 1)
   )
-  (func $1 (;1;) (type $2) (param $0 i32)
-    (local $1 i32)
-    global.get $global$0
-    i32.const 16
-    i32.sub
-    local.tee $1
-    global.set $global$0
-    local.get $0
-    i32.load offset=8
-    i32.eqz
-    if ;; label = @1
-      block ;; label = @2
-        i32.const 1049172
-        call $2
-        unreachable
-      end
-    end
-    local.get $1
-    local.get $0
-    i32.const 20
-    i32.add
-    i64.load align=4
-    i64.store offset=8
-    local.get $1
-    local.get $0
-    i64.load offset=12 align=4
-    i64.store
-    call $0
-    unreachable
+  (block $label$1
+   (block $label$2
+    (block $label$3
+     (if
+      (i32.eq
+       (i32.load
+        (i32.const 1049232)
+       )
+       (i32.const 1)
+      )
+      (block
+       (i32.store
+        (i32.const 1049236)
+        (local.tee $0
+         (i32.add
+          (i32.load
+           (i32.const 1049236)
+          )
+          (i32.const 1)
+         )
+        )
+       )
+       (br_if $label$3
+        (i32.lt_u
+         (local.get $0)
+         (i32.const 3)
+        )
+       )
+       (br $label$2)
+      )
+     )
+     (i64.store
+      (i32.const 1049232)
+      (i64.const 4294967297)
+     )
+    )
+    (br_if $label$2
+     (i32.le_s
+      (local.tee $1
+       (i32.load
+        (i32.const 1049240)
+       )
+      )
+      (i32.const -1)
+     )
+    )
+    (i32.store
+     (i32.const 1049240)
+     (local.get $1)
+    )
+    (br_if $label$1
+     (i32.lt_u
+      (local.get $0)
+      (i32.const 2)
+     )
+    )
+   )
+   (unreachable)
   )
-  (func $2 (;2;) (type $2) (param $0 i32)
-    (local $1 i32) (local $2 i64) (local $3 i64) (local $4 i64)
-    global.get $global$0
-    i32.const 48
-    i32.sub
-    local.tee $1
-    global.set $global$0
-    local.get $0
-    i64.load offset=8 align=4
-    local.set $2
-    local.get $0
-    i64.load offset=16 align=4
-    local.set $3
-    local.get $0
-    i64.load align=4
-    local.set $4
-    local.get $1
-    i32.const 20
-    i32.add
-    i32.const 0
-    i32.store
-    local.get $1
-    local.get $4
-    i64.store offset=24
-    local.get $1
-    i32.const 1048656
-    i32.store offset=16
-    local.get $1
-    i64.const 1
-    i64.store offset=4 align=4
-    local.get $1
-    local.get $1
-    i32.const 24
-    i32.add
-    i32.store
-    local.get $1
-    local.get $3
-    i64.store offset=40
-    local.get $1
-    local.get $2
-    i64.store offset=32
-    local.get $1
-    local.get $1
-    i32.const 32
-    i32.add
-    call $5
-    unreachable
+  (unreachable)
+ )
+ (func $1 (; 1 ;) (type $2) (param $0 i32)
+  (local $1 i32)
+  (global.set $global$0
+   (local.tee $1
+    (i32.sub
+     (global.get $global$0)
+     (i32.const 16)
+    )
+   )
   )
-  (func $3 (;3;) (type $8) (param $0 i32) (param $1 i32)
-    (local $2 i32)
-    global.get $global$0
-    i32.const 48
-    i32.sub
-    local.tee $2
-    global.set $global$0
-    local.get $2
-    i32.const 16
-    i32.store offset=4
-    local.get $2
-    local.get $1
-    i32.store
-    local.get $2
-    i32.const 44
-    i32.add
-    i32.const 1
-    i32.store
-    local.get $2
-    i32.const 28
-    i32.add
-    i32.const 2
-    i32.store
-    local.get $2
-    i32.const 1
-    i32.store offset=36
-    local.get $2
-    i64.const 2
-    i64.store offset=12 align=4
-    local.get $2
-    i32.const 1049140
-    i32.store offset=8
-    local.get $2
-    local.get $2
-    i32.store offset=40
-    local.get $2
-    local.get $2
-    i32.const 4
-    i32.add
-    i32.store offset=32
-    local.get $2
-    local.get $2
-    i32.const 32
-    i32.add
-    i32.store offset=24
-    local.get $2
-    i32.const 8
-    i32.add
-    local.get $0
-    call $5
-    unreachable
+  (if
+   (i32.eqz
+    (i32.load offset=8
+     (local.get $0)
+    )
+   )
+   (block
+    (call $2
+     (i32.const 1049172)
+    )
+    (unreachable)
+   )
   )
-  (func $4 (;4;) (type $1) (param $0 i32) (param $1 i32) (result i32)
-    local.get $0
-    i64.load32_u
-    local.get $1
-    call $6
+  (i64.store offset=8
+   (local.get $1)
+   (i64.load align=4
+    (i32.add
+     (local.get $0)
+     (i32.const 20)
+    )
+   )
   )
-  (func $5 (;5;) (type $4) (param $0 i32) (param $1 i32)
-    (local $2 i32) (local $3 i64)
-    global.get $global$0
-    i32.const 32
-    i32.sub
-    local.tee $2
-    global.set $global$0
-    local.get $1
-    i64.load align=4
-    local.set $3
-    local.get $2
-    i32.const 20
-    i32.add
-    local.get $1
-    i64.load offset=8 align=4
-    i64.store align=4
-    local.get $2
-    local.get $3
-    i64.store offset=12 align=4
-    local.get $2
-    local.get $0
-    i32.store offset=8
-    local.get $2
-    i32.const 1049156
-    i32.store offset=4
-    local.get $2
-    i32.const 1048656
-    i32.store
-    local.get $2
-    call $1
-    unreachable
+  (i64.store
+   (local.get $1)
+   (i64.load offset=12 align=4
+    (local.get $0)
+   )
   )
-  (func $6 (;6;) (type $5) (param $0 i64) (param $1 i32) (result i32)
-    (local $2 i32) (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i64) (local $14 i32) (local $15 i32)
-    global.get $global$0
-    i32.const 48
-    i32.sub
-    local.tee $6
-    global.set $global$0
-    i32.const 39
-    local.set $2
-    block $label$1 ;; label = @1
-      block $label$2 ;; label = @2
-        local.get $0
-        i64.const 10000
-        i64.ge_u
-        if ;; label = @3
-          block ;; label = @4
-            loop $label$4 ;; label = @5
-              local.get $6
-              i32.const 9
-              i32.add
-              local.get $2
-              i32.add
-              local.tee $3
-              i32.const -4
-              i32.add
-              local.get $0
-              local.get $0
-              i64.const 10000
-              i64.div_u
-              local.tee $13
-              i64.const -10000
-              i64.mul
-              i64.add
-              i32.wrap_i64
-              local.tee $4
-              i32.const 100
-              i32.div_u
-              local.tee $5
-              i32.const 1
-              i32.shl
-              i32.const 1048706
-              i32.add
-              i32.load16_u align=1
-              i32.store16 align=1
-              local.get $3
-              i32.const -2
-              i32.add
-              local.get $5
-              i32.const -100
-              i32.mul
-              local.get $4
-              i32.add
-              i32.const 1
-              i32.shl
-              i32.const 1048706
-              i32.add
-              i32.load16_u align=1
-              i32.store16 align=1
-              local.get $2
-              i32.const -4
-              i32.add
-              local.set $2
-              block (result i32) ;; label = @6
-                local.get $0
-                i64.const 99999999
-                i64.gt_u
-                local.set $14
-                local.get $13
-                local.set $0
-                local.get $14
-              end
-              br_if 0 (;@5;)
-            end
-            local.get $13
-            i32.wrap_i64
-            local.tee $3
-            i32.const 99
-            i32.le_s
-            br_if 3 (;@1;)
-            br 2 (;@2;)
-          end
-        end
-        local.get $0
-        local.tee $13
-        i32.wrap_i64
-        local.tee $3
-        i32.const 99
-        i32.le_s
-        br_if 1 (;@1;)
-      end
-      local.get $2
-      i32.const -2
-      i32.add
-      local.tee $2
-      local.get $6
-      i32.const 9
-      i32.add
-      i32.add
-      local.get $13
-      i32.wrap_i64
-      local.tee $4
-      i32.const 65535
-      i32.and
-      i32.const 100
-      i32.div_u
-      local.tee $3
-      i32.const -100
-      i32.mul
-      local.get $4
-      i32.add
-      i32.const 65535
-      i32.and
-      i32.const 1
-      i32.shl
-      i32.const 1048706
-      i32.add
-      i32.load16_u align=1
-      i32.store16 align=1
-    end
-    block $label$5 ;; label = @1
-      local.get $3
-      i32.const 9
-      i32.le_s
-      if ;; label = @2
-        block ;; label = @3
-          local.get $2
-          i32.const -1
-          i32.add
-          local.tee $2
-          local.get $6
-          i32.const 9
-          i32.add
-          i32.add
-          local.get $3
-          i32.const 48
-          i32.add
-          i32.store8
-          br 2 (;@1;)
-        end
-      end
-      local.get $2
-      i32.const -2
-      i32.add
-      local.tee $2
-      local.get $6
-      i32.const 9
-      i32.add
-      i32.add
-      local.get $3
-      i32.const 1
-      i32.shl
-      i32.const 1048706
-      i32.add
-      i32.load16_u align=1
-      i32.store16 align=1
-    end
-    i32.const 39
-    local.get $2
-    i32.sub
-    local.set $7
-    i32.const 1
-    local.set $3
-    i32.const 43
-    i32.const 1114112
-    local.get $1
-    i32.load
-    local.tee $4
-    i32.const 1
-    i32.and
-    local.tee $11
-    select
-    local.set $8
-    local.get $4
-    i32.const 29
-    i32.shl
-    i32.const 31
-    i32.shr_s
-    i32.const 1048656
-    i32.and
-    local.set $9
-    local.get $6
-    i32.const 9
-    i32.add
-    local.get $2
-    i32.add
-    local.set $10
-    block $label$7 ;; label = @1
-      block $label$8 ;; label = @2
-        block $label$9 ;; label = @3
-          block $label$10 ;; label = @4
-            block $label$11 ;; label = @5
-              block $label$12 ;; label = @6
-                block $label$13 ;; label = @7
-                  block $label$14 ;; label = @8
-                    block $label$15 (result i32) ;; label = @9
-                      block $label$16 ;; label = @10
-                        block $label$17 ;; label = @11
-                          block $label$18 ;; label = @12
-                            block $label$19 ;; label = @13
-                              local.get $1
-                              i32.load offset=8
-                              i32.const 1
-                              i32.eq
-                              if ;; label = @14
-                                block ;; label = @15
-                                  local.get $1
-                                  i32.const 12
-                                  i32.add
-                                  i32.load
-                                  local.tee $5
-                                  local.get $7
-                                  local.get $11
-                                  i32.add
-                                  local.tee $2
-                                  i32.le_u
-                                  br_if 2 (;@13;)
-                                  local.get $4
-                                  i32.const 8
-                                  i32.and
-                                  br_if 3 (;@12;)
-                                  local.get $5
-                                  local.get $2
-                                  i32.sub
-                                  local.set $4
-                                  i32.const 1
-                                  local.get $1
-                                  i32.load8_u offset=48
-                                  local.tee $3
-                                  local.get $3
-                                  i32.const 3
-                                  i32.eq
-                                  select
-                                  local.tee $3
-                                  i32.const 3
-                                  i32.and
-                                  i32.eqz
-                                  br_if 4 (;@11;)
-                                  local.get $3
-                                  i32.const 2
-                                  i32.eq
-                                  br_if 5 (;@10;)
-                                  i32.const 0
-                                  local.set $5
-                                  local.get $4
-                                  br 6 (;@9;)
-                                end
-                              end
-                              local.get $1
-                              local.get $8
-                              local.get $9
-                              call $9
-                              br_if 10 (;@3;)
-                              br 11 (;@2;)
-                            end
-                            local.get $1
-                            local.get $8
-                            local.get $9
-                            call $9
-                            br_if 9 (;@3;)
-                            br 10 (;@2;)
-                          end
-                          local.get $1
-                          i32.const 1
-                          i32.store8 offset=48
-                          local.get $1
-                          i32.const 48
-                          i32.store offset=4
-                          local.get $1
-                          local.get $8
-                          local.get $9
-                          call $9
-                          br_if 8 (;@3;)
-                          local.get $5
-                          local.get $2
-                          i32.sub
-                          local.set $3
-                          i32.const 1
-                          local.get $1
-                          i32.const 48
-                          i32.add
-                          i32.load8_u
-                          local.tee $4
-                          local.get $4
-                          i32.const 3
-                          i32.eq
-                          select
-                          local.tee $4
-                          i32.const 3
-                          i32.and
-                          i32.eqz
-                          br_if 3 (;@8;)
-                          local.get $4
-                          i32.const 2
-                          i32.eq
-                          br_if 4 (;@7;)
-                          i32.const 0
-                          local.set $4
-                          br 5 (;@6;)
-                        end
-                        local.get $4
-                        local.set $5
-                        i32.const 0
-                        br 1 (;@9;)
-                      end
-                      local.get $4
-                      i32.const 1
-                      i32.add
-                      i32.const 1
-                      i32.shr_u
-                      local.set $5
-                      local.get $4
-                      i32.const 1
-                      i32.shr_u
-                    end
-                    local.set $3
-                    i32.const -1
-                    local.set $2
-                    local.get $1
-                    i32.const 4
-                    i32.add
-                    local.set $4
-                    local.get $1
-                    i32.const 24
-                    i32.add
-                    local.set $11
-                    local.get $1
-                    i32.const 28
-                    i32.add
-                    local.set $12
-                    block $label$21 ;; label = @9
-                      loop $label$22 ;; label = @10
-                        local.get $2
-                        i32.const 1
-                        i32.add
-                        local.tee $2
-                        local.get $3
-                        i32.ge_u
-                        br_if 1 (;@9;)
-                        local.get $11
-                        i32.load
-                        local.get $4
-                        i32.load
-                        local.get $12
-                        i32.load
-                        i32.load offset=16
-                        call_indirect (type $1)
-                        i32.eqz
-                        br_if 0 (;@10;)
-                      end
-                      br 8 (;@1;)
-                    end
-                    local.get $1
-                    i32.const 4
-                    i32.add
-                    i32.load
-                    local.set $4
-                    i32.const 1
-                    local.set $3
-                    local.get $1
-                    local.get $8
-                    local.get $9
-                    call $9
-                    br_if 5 (;@3;)
-                    local.get $1
-                    i32.const 24
-                    i32.add
-                    local.tee $2
-                    i32.load
-                    local.get $10
-                    local.get $7
-                    local.get $1
-                    i32.const 28
-                    i32.add
-                    local.tee $1
-                    i32.load
-                    i32.load offset=12
-                    call_indirect (type $0)
-                    br_if 5 (;@3;)
-                    local.get $2
-                    i32.load
-                    local.set $7
-                    i32.const -1
-                    local.set $2
-                    local.get $1
-                    i32.load
-                    i32.const 16
-                    i32.add
-                    local.set $1
-                    loop $label$23 ;; label = @9
-                      local.get $2
-                      i32.const 1
-                      i32.add
-                      local.tee $2
-                      local.get $5
-                      i32.ge_u
-                      br_if 4 (;@5;)
-                      local.get $7
-                      local.get $4
-                      local.get $1
-                      i32.load
-                      call_indirect (type $1)
-                      i32.eqz
-                      br_if 0 (;@9;)
-                    end
-                    br 5 (;@3;)
-                  end
-                  local.get $3
-                  local.set $4
-                  i32.const 0
-                  local.set $3
-                  br 1 (;@6;)
-                end
-                local.get $3
-                i32.const 1
-                i32.add
-                i32.const 1
-                i32.shr_u
-                local.set $4
-                local.get $3
-                i32.const 1
-                i32.shr_u
-                local.set $3
-              end
-              i32.const -1
-              local.set $2
-              local.get $1
-              i32.const 4
-              i32.add
-              local.set $5
-              local.get $1
-              i32.const 24
-              i32.add
-              local.set $8
-              local.get $1
-              i32.const 28
-              i32.add
-              local.set $9
-              block $label$24 ;; label = @6
-                loop $label$25 ;; label = @7
-                  local.get $2
-                  i32.const 1
-                  i32.add
-                  local.tee $2
-                  local.get $3
-                  i32.ge_u
-                  br_if 1 (;@6;)
-                  local.get $8
-                  i32.load
-                  local.get $5
-                  i32.load
-                  local.get $9
-                  i32.load
-                  i32.load offset=16
-                  call_indirect (type $1)
-                  i32.eqz
-                  br_if 0 (;@7;)
-                end
-                br 5 (;@1;)
-              end
-              local.get $1
-              i32.const 4
-              i32.add
-              i32.load
-              local.set $5
-              i32.const 1
-              local.set $3
-              local.get $1
-              i32.const 24
-              i32.add
-              local.tee $2
-              i32.load
-              local.get $10
-              local.get $7
-              local.get $1
-              i32.const 28
-              i32.add
-              local.tee $1
-              i32.load
-              i32.load offset=12
-              call_indirect (type $0)
-              br_if 2 (;@3;)
-              local.get $2
-              i32.load
-              local.set $7
-              i32.const -1
-              local.set $2
-              local.get $1
-              i32.load
-              i32.const 16
-              i32.add
-              local.set $1
-              loop $label$26 ;; label = @6
-                local.get $2
-                i32.const 1
-                i32.add
-                local.tee $2
-                local.get $4
-                i32.ge_u
-                br_if 2 (;@4;)
-                local.get $7
-                local.get $5
-                local.get $1
-                i32.load
-                call_indirect (type $1)
-                i32.eqz
-                br_if 0 (;@6;)
-              end
-              br 2 (;@3;)
-            end
-            local.get $6
-            i32.const 48
-            i32.add
-            global.set $global$0
-            i32.const 0
-            return
-          end
-          i32.const 0
-          local.set $3
-        end
-        local.get $6
-        i32.const 48
-        i32.add
-        global.set $global$0
-        local.get $3
-        return
-      end
-      block (result i32) ;; label = @2
-        local.get $1
-        i32.load offset=24
-        local.get $10
-        local.get $7
-        local.get $1
-        i32.const 28
-        i32.add
-        i32.load
-        i32.load offset=12
-        call_indirect (type $0)
-        local.set $15
-        local.get $6
-        i32.const 48
-        i32.add
-        global.set $global$0
-        local.get $15
-      end
-      return
-    end
-    local.get $6
-    i32.const 48
-    i32.add
-    global.set $global$0
-    i32.const 1
+  (call $0)
+  (unreachable)
+ )
+ (func $2 (; 2 ;) (type $2) (param $0 i32)
+  (local $1 i32)
+  (local $2 i64)
+  (local $3 i64)
+  (local $4 i64)
+  (global.set $global$0
+   (local.tee $1
+    (i32.sub
+     (global.get $global$0)
+     (i32.const 48)
+    )
+   )
   )
-  (func $7 (;7;) (type $2) (param $0 i32)
-    nop
+  (local.set $2
+   (i64.load offset=8 align=4
+    (local.get $0)
+   )
   )
-  (func $8 (;8;) (type $6) (param $0 i32) (result i64)
-    i64.const -2357177763932378009
+  (local.set $3
+   (i64.load offset=16 align=4
+    (local.get $0)
+   )
   )
-  (func $9 (;9;) (type $9) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
-    block $label$1 ;; label = @1
-      block $label$2 (result i32) ;; label = @2
-        local.get $1
-        i32.const 1114112
-        i32.ne
-        if ;; label = @3
-          i32.const 1
-          local.get $0
-          i32.load offset=24
-          local.get $1
-          local.get $0
-          i32.const 28
-          i32.add
-          i32.load
-          i32.load offset=16
-          call_indirect (type $1)
-          br_if 1 (;@2;)
-          drop
-        end
-        local.get $2
-        i32.eqz
-        br_if 1 (;@1;)
-        local.get $0
-        i32.load offset=24
-        local.get $2
-        i32.const 0
-        local.get $0
-        i32.const 28
-        i32.add
-        i32.load
-        i32.load offset=12
-        call_indirect (type $0)
-      end
-      return
-    end
-    i32.const 0
+  (local.set $4
+   (i64.load align=4
+    (local.get $0)
+   )
   )
-  (func $10 (;10;) (type $3) (param $0 i32) (result i32)
-    (local $1 i32) (local $2 i32) (local $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) (local $8 i32) (local $9 i32) (local $10 i32) (local $11 i32) (local $12 i32) (local $13 i32) (local $14 i32) (local $15 i32) (local $16 i32) (local $17 i32) (local $18 i32) (local $19 i32) (local $20 i32) (local $21 i32) (local $22 i32) (local $23 i32) (local $24 i32) (local $25 i32) (local $26 i32) (local $27 i32) (local $28 i32) (local $29 i32) (local $30 i32) (local $31 i32) (local $32 i32) (local $33 i32) (local $34 i32) (local $35 i32) (local $36 i32) (local $37 i32) (local $38 i32) (local $39 i32) (local $40 i32) (local $41 i32) (local $42 i32) (local $43 i32) (local $44 i32) (local $45 i32) (local $46 i32)
-    global.get $global$0
-    i32.const 256
-    i32.sub
-    local.tee $1
-    global.set $global$0
-    local.get $1
-    i64.const 4294967297
-    i64.store offset=56 align=4
-    local.get $1
-    i64.const 4294967297
-    i64.store offset=48 align=4
-    local.get $1
-    i64.const 4294967297
-    i64.store offset=40 align=4
-    local.get $1
-    i64.const 4294967297
-    i64.store offset=32 align=4
-    local.get $1
-    i64.const 4294967297
-    i64.store offset=24 align=4
-    local.get $1
-    i64.const 4294967297
-    i64.store offset=16 align=4
-    local.get $1
-    i64.const 4294967297
-    i64.store offset=8 align=4
-    local.get $1
-    i64.const 4294967297
-    i64.store align=4
-    block $label$1 ;; label = @1
-      local.get $0
-      i32.const 1
-      i32.add
-      local.tee $11
-      i32.const 2
-      i32.ge_u
-      if ;; label = @2
-        block ;; label = @3
-          local.get $1
-          local.set $3
-          i32.const 1
-          local.set $2
-          loop $label$3 ;; label = @4
-            local.get $2
-            i32.const 16
-            i32.ge_u
-            br_if 3 (;@1;)
-            local.get $3
-            i32.const 4
-            i32.add
-            local.tee $4
-            local.get $3
-            i32.load
-            local.get $2
-            i32.mul
-            i32.store
-            local.get $4
-            local.set $3
-            local.get $2
-            i32.const 1
-            i32.add
-            local.tee $4
-            local.set $2
-            local.get $4
-            local.get $11
-            i32.lt_u
-            br_if 0 (;@4;)
-          end
-        end
-      end
-      local.get $0
-      i32.const 16
-      i32.lt_u
-      if ;; label = @2
-        block ;; label = @3
-          i32.const 1
-          local.set $20
-          local.get $1
-          local.get $0
-          i32.const 2
-          i32.shl
-          i32.add
-          i32.load
-          local.tee $9
-          local.set $21
-          local.get $9
-          i32.const 24
-          i32.ge_u
-          if ;; label = @4
-            i32.const 24
-            i32.const 25
-            local.get $9
-            local.get $9
-            i32.const 24
-            i32.div_u
-            local.tee $21
-            i32.const 24
-            i32.mul
-            i32.eq
-            select
-            local.set $20
-          end
-          i32.const 0
-          local.get $0
-          i32.sub
-          local.set $40
-          local.get $1
-          i32.const 196
-          i32.add
-          local.set $12
-          local.get $1
-          i32.const 132
-          i32.add
-          local.set $41
-          local.get $1
-          i32.const 124
-          i32.add
-          local.set $42
-          local.get $1
-          i32.const 68
-          i32.add
-          local.set $11
-          local.get $0
-          i32.const 2
-          i32.lt_u
-          local.set $43
-          loop $label$6 ;; label = @4
-            local.get $1
-            i32.const 120
-            i32.add
-            i64.const 0
-            i64.store
-            local.get $1
-            i32.const 112
-            i32.add
-            i64.const 0
-            i64.store
-            local.get $1
-            i32.const 104
-            i32.add
-            i64.const 0
-            i64.store
-            local.get $1
-            i32.const 96
-            i32.add
-            i64.const 0
-            i64.store
-            local.get $1
-            i32.const 88
-            i32.add
-            i64.const 0
-            i64.store
-            local.get $1
-            i32.const 80
-            i32.add
-            i64.const 0
-            i64.store
-            local.get $1
-            i32.const 72
-            i32.add
-            i64.const 0
-            i64.store
-            local.get $1
-            i64.const 0
-            i64.store offset=64
-            local.get $1
-            i32.const 184
-            i32.add
-            local.tee $26
-            i64.const 0
-            i64.store
-            local.get $1
-            i32.const 176
-            i32.add
-            local.tee $27
-            i64.const 0
-            i64.store
-            local.get $1
-            i32.const 168
-            i32.add
-            local.tee $28
-            i64.const 0
-            i64.store
-            local.get $1
-            i32.const 160
-            i32.add
-            local.tee $29
-            i64.const 0
-            i64.store
-            local.get $1
-            i32.const 152
-            i32.add
-            local.tee $30
-            i64.const 0
-            i64.store
-            local.get $1
-            i32.const 144
-            i32.add
-            local.tee $31
-            i64.const 0
-            i64.store
-            local.get $1
-            i32.const 136
-            i32.add
-            local.tee $32
-            i64.const 0
-            i64.store
-            local.get $1
-            i64.const 0
-            i64.store offset=128
-            local.get $1
-            i32.const 248
-            i32.add
-            local.tee $33
-            i64.const 64424509454
-            i64.store align=4
-            local.get $1
-            i32.const 240
-            i32.add
-            local.tee $34
-            i64.const 55834574860
-            i64.store align=4
-            local.get $1
-            i32.const 232
-            i32.add
-            local.tee $35
-            i64.const 47244640266
-            i64.store align=4
-            local.get $1
-            i32.const 224
-            i32.add
-            local.tee $36
-            i64.const 38654705672
-            i64.store align=4
-            local.get $1
-            i32.const 216
-            i32.add
-            local.tee $37
-            i64.const 30064771078
-            i64.store align=4
-            local.get $1
-            i32.const 208
-            i32.add
-            local.tee $38
-            i64.const 21474836484
-            i64.store align=4
-            local.get $1
-            i32.const 200
-            i32.add
-            local.tee $39
-            i64.const 12884901890
-            i64.store align=4
-            local.get $1
-            i64.const 4294967296
-            i64.store offset=192 align=4
-            local.get $13
-            local.get $21
-            i32.mul
-            local.set $7
-            block $label$7 (result i32) ;; label = @5
-              block $label$8 ;; label = @6
-                local.get $43
-                i32.eqz
-                if ;; label = @7
-                  block ;; label = @8
-                    local.get $40
-                    local.set $23
-                    local.get $7
-                    local.set $14
-                    local.get $0
-                    local.set $15
-                    i32.const 0
-                    local.set $5
-                    br 2 (;@6;)
-                  end
-                end
-                i32.const 0
-                br 1 (;@5;)
-              end
-              i32.const 1
-            end
-            local.set $2
-            loop $label$10 ;; label = @5
-              block $label$11 ;; label = @6
-                block $label$12 ;; label = @7
-                  block $label$13 (result i32) ;; label = @8
-                    block $label$14 ;; label = @9
-                      block $label$15 ;; label = @10
-                        block $label$16 ;; label = @11
-                          block $label$17 ;; label = @12
-                            block $label$18 ;; label = @13
-                              block $label$19 ;; label = @14
-                                local.get $2
-                                i32.eqz
-                                if ;; label = @15
-                                  block ;; label = @16
-                                    local.get $13
-                                    i32.const 1
-                                    i32.add
-                                    local.set $13
-                                    local.get $9
-                                    local.get $7
-                                    local.get $21
-                                    i32.add
-                                    local.tee $3
-                                    local.get $3
-                                    local.get $9
-                                    i32.gt_u
-                                    select
-                                    i32.const -1
-                                    i32.add
-                                    local.set $44
-                                    i32.const 0
-                                    local.set $24
-                                    local.get $1
-                                    i32.load offset=192
-                                    local.tee $6
-                                    i32.const 1
-                                    i32.ge_s
-                                    br_if 2 (;@14;)
-                                    br 3 (;@13;)
-                                  end
-                                end
-                                block $label$21 ;; label = @15
-                                  block $label$22 ;; label = @16
-                                    block $label$23 ;; label = @17
-                                      block $label$24 ;; label = @18
-                                        block $label$25 ;; label = @19
-                                          block $label$26 ;; label = @20
-                                            block $label$27 ;; label = @21
-                                              block $label$28 ;; label = @22
-                                                block $label$29 ;; label = @23
-                                                  block $label$30 ;; label = @24
-                                                    block $label$31 ;; label = @25
-                                                      local.get $5
-                                                      br_table 0 (;@25;) 1 (;@24;) 2 (;@23;)
-                                                    end
-                                                    local.get $15
-                                                    i32.const -1
-                                                    i32.add
-                                                    local.tee $4
-                                                    i32.const 16
-                                                    i32.ge_u
-                                                    br_if 6 (;@18;)
-                                                    local.get $1
-                                                    local.get $4
-                                                    i32.const 2
-                                                    i32.shl
-                                                    local.tee $2
-                                                    i32.add
-                                                    i32.load
-                                                    local.tee $3
-                                                    i32.eqz
-                                                    br_if 7 (;@17;)
-                                                    local.get $14
-                                                    i32.const -2147483648
-                                                    i32.eq
-                                                    if ;; label = @25
-                                                      local.get $3
-                                                      i32.const -1
-                                                      i32.eq
-                                                      br_if 9 (;@16;)
-                                                    end
-                                                    local.get $1
-                                                    i32.const -64
-                                                    i32.sub
-                                                    local.get $2
-                                                    i32.add
-                                                    local.get $14
-                                                    local.get $3
-                                                    i32.div_s
-                                                    local.tee $16
-                                                    i32.store
-                                                    local.get $32
-                                                    local.get $39
-                                                    i64.load align=4
-                                                    i64.store
-                                                    local.get $31
-                                                    local.get $38
-                                                    i64.load align=4
-                                                    i64.store
-                                                    local.get $30
-                                                    local.get $37
-                                                    i64.load align=4
-                                                    i64.store
-                                                    local.get $29
-                                                    local.get $36
-                                                    i64.load align=4
-                                                    i64.store
-                                                    local.get $28
-                                                    local.get $35
-                                                    i64.load align=4
-                                                    i64.store
-                                                    local.get $27
-                                                    local.get $34
-                                                    i64.load align=4
-                                                    i64.store
-                                                    local.get $26
-                                                    local.get $33
-                                                    i64.load align=4
-                                                    i64.store
-                                                    local.get $1
-                                                    local.get $1
-                                                    i64.load offset=192 align=4
-                                                    i64.store offset=128
-                                                    local.get $16
-                                                    local.get $23
-                                                    i32.add
-                                                    local.set $45
-                                                    local.get $14
-                                                    local.get $3
-                                                    local.get $16
-                                                    i32.mul
-                                                    i32.sub
-                                                    local.set $14
-                                                    i32.const 0
-                                                    local.set $2
-                                                    local.get $1
-                                                    i32.const 192
-                                                    i32.add
-                                                    local.set $8
-                                                    loop $label$33 ;; label = @25
-                                                      block $label$34 ;; label = @26
-                                                        local.get $2
-                                                        local.get $16
-                                                        i32.add
-                                                        local.tee $3
-                                                        local.get $4
-                                                        i32.gt_u
-                                                        if ;; label = @27
-                                                          block ;; label = @28
-                                                            local.get $2
-                                                            local.get $45
-                                                            i32.add
-                                                            local.tee $46
-                                                            i32.const 15
-                                                            i32.gt_u
-                                                            br_if 7 (;@21;)
-                                                            local.get $3
-                                                            local.get $15
-                                                            i32.sub
-                                                            local.set $3
-                                                            local.get $2
-                                                            i32.const 15
-                                                            i32.le_u
-                                                            br_if 2 (;@26;)
-                                                            br 6 (;@22;)
-                                                          end
-                                                        end
-                                                        local.get $3
-                                                        i32.const 16
-                                                        i32.ge_u
-                                                        br_if 6 (;@20;)
-                                                        local.get $2
-                                                        i32.const 15
-                                                        i32.gt_u
-                                                        br_if 4 (;@22;)
-                                                      end
-                                                      local.get $8
-                                                      local.get $1
-                                                      i32.const 128
-                                                      i32.add
-                                                      local.get $3
-                                                      i32.const 2
-                                                      i32.shl
-                                                      i32.add
-                                                      i32.load
-                                                      i32.store
-                                                      local.get $8
-                                                      i32.const 4
-                                                      i32.add
-                                                      local.set $8
-                                                      local.get $2
-                                                      i32.const 1
-                                                      i32.add
-                                                      local.tee $2
-                                                      local.get $15
-                                                      i32.lt_u
-                                                      br_if 0 (;@25;)
-                                                    end
-                                                    local.get $23
-                                                    i32.const 1
-                                                    i32.add
-                                                    local.set $23
-                                                    local.get $4
-                                                    local.tee $15
-                                                    i32.const 1
-                                                    i32.gt_u
-                                                    br_if 9 (;@15;)
-                                                    i32.const 0
-                                                    local.set $2
-                                                    br 19 (;@5;)
-                                                  end
-                                                  local.get $26
-                                                  local.get $33
-                                                  i64.load align=4
-                                                  i64.store
-                                                  local.get $27
-                                                  local.get $34
-                                                  i64.load align=4
-                                                  i64.store
-                                                  local.get $28
-                                                  local.get $35
-                                                  i64.load align=4
-                                                  i64.store
-                                                  local.get $29
-                                                  local.get $36
-                                                  i64.load align=4
-                                                  i64.store
-                                                  local.get $30
-                                                  local.get $37
-                                                  i64.load align=4
-                                                  i64.store
-                                                  local.get $31
-                                                  local.get $38
-                                                  i64.load align=4
-                                                  i64.store
-                                                  local.get $32
-                                                  local.get $39
-                                                  i64.load align=4
-                                                  i64.store
-                                                  local.get $1
-                                                  local.get $1
-                                                  i64.load offset=192 align=4
-                                                  i64.store offset=128
-                                                  local.get $6
-                                                  i32.const 15
-                                                  i32.gt_u
-                                                  br_if 4 (;@19;)
-                                                  i32.const 1
-                                                  local.set $17
-                                                  local.get $6
-                                                  local.set $10
-                                                  i32.const 0
-                                                  br 15 (;@8;)
-                                                end
-                                                local.get $7
-                                                local.get $44
-                                                i32.lt_u
-                                                if ;; label = @23
-                                                  block ;; label = @24
-                                                    local.get $12
-                                                    i32.load
-                                                    local.set $25
-                                                    local.get $12
-                                                    local.get $6
-                                                    i32.store
-                                                    local.get $1
-                                                    local.get $25
-                                                    i32.store offset=192
-                                                    local.get $11
-                                                    local.set $18
-                                                    local.get $1
-                                                    i32.load offset=68
-                                                    local.tee $2
-                                                    i32.const 1
-                                                    i32.lt_s
-                                                    br_if 18 (;@6;)
-                                                    i32.const 1
-                                                    local.set $19
-                                                    br 15 (;@9;)
-                                                  end
-                                                end
-                                                local.get $22
-                                                local.get $24
-                                                i32.add
-                                                local.set $22
-                                                local.get $13
-                                                local.get $20
-                                                i32.lt_u
-                                                br_if 18 (;@4;)
-                                                local.get $1
-                                                i32.const 256
-                                                i32.add
-                                                global.set $global$0
-                                                local.get $22
-                                                return
-                                              end
-                                              i32.const 1049076
-                                              local.get $2
-                                              call $3
-                                              unreachable
-                                            end
-                                            i32.const 1049060
-                                            local.get $46
-                                            call $3
-                                            unreachable
-                                          end
-                                          i32.const 1049044
-                                          local.get $2
-                                          local.get $16
-                                          i32.add
-                                          call $3
-                                          unreachable
-                                        end
-                                        local.get $6
-                                        local.set $10
-                                        br 11 (;@7;)
-                                      end
-                                      i32.const 1048980
-                                      local.get $4
-                                      call $3
-                                      unreachable
-                                    end
-                                    i32.const 1048996
-                                    call $2
-                                    unreachable
-                                  end
-                                  i32.const 1049020
-                                  call $2
-                                  unreachable
-                                end
-                                i32.const 0
-                                local.set $5
-                                br 2 (;@12;)
-                              end
-                              i32.const 1
-                              local.set $5
-                              br 2 (;@11;)
-                            end
-                            i32.const 2
-                            local.set $5
-                            br 2 (;@10;)
-                          end
-                          i32.const 1
-                          local.set $2
-                          br 6 (;@5;)
-                        end
-                        i32.const 1
-                        local.set $2
-                        br 5 (;@5;)
-                      end
-                      i32.const 1
-                      local.set $2
-                      br 4 (;@5;)
-                    end
-                    i32.const 1
-                  end
-                  local.set $2
-                  loop $label$37 ;; label = @8
-                    block $label$38 ;; label = @9
-                      block $label$39 ;; label = @10
-                        local.get $2
-                        i32.eqz
-                        if ;; label = @11
-                          block ;; label = @12
-                            local.get $10
-                            local.tee $3
-                            i32.const 2
-                            i32.shl
-                            local.tee $4
-                            local.get $1
-                            i32.const 128
-                            i32.add
-                            i32.add
-                            local.tee $5
-                            i32.load
-                            local.tee $10
-                            if ;; label = @13
-                              block ;; label = @14
-                                local.get $5
-                                local.get $3
-                                i32.store
-                                block $label$42 ;; label = @15
-                                  local.get $3
-                                  i32.const 3
-                                  i32.lt_u
-                                  br_if 0 (;@15;)
-                                  local.get $3
-                                  i32.const -1
-                                  i32.add
-                                  i32.const 1
-                                  i32.shr_u
-                                  local.tee $8
-                                  i32.eqz
-                                  br_if 0 (;@15;)
-                                  local.get $4
-                                  local.get $42
-                                  i32.add
-                                  local.set $2
-                                  local.get $41
-                                  local.set $3
-                                  loop $label$43 ;; label = @16
-                                    local.get $3
-                                    i32.load
-                                    local.set $4
-                                    local.get $3
-                                    local.get $2
-                                    i32.load
-                                    i32.store
-                                    local.get $2
-                                    local.get $4
-                                    i32.store
-                                    local.get $3
-                                    i32.const 4
-                                    i32.add
-                                    local.set $3
-                                    local.get $2
-                                    i32.const -4
-                                    i32.add
-                                    local.set $2
-                                    local.get $8
-                                    i32.const -1
-                                    i32.add
-                                    local.tee $8
-                                    br_if 0 (;@16;)
-                                  end
-                                end
-                                local.get $17
-                                i32.const 1
-                                i32.add
-                                local.set $17
-                                local.get $10
-                                i32.const 16
-                                i32.lt_u
-                                br_if 5 (;@9;)
-                                br 7 (;@7;)
-                              end
-                            end
-                            i32.const 0
-                            local.get $17
-                            i32.sub
-                            local.get $17
-                            local.get $7
-                            i32.const 1
-                            i32.and
-                            select
-                            local.get $24
-                            i32.add
-                            local.set $24
-                            i32.const 2
-                            local.set $5
-                            br 2 (;@10;)
-                          end
-                        end
-                        i32.const 0
-                        local.set $2
-                        local.get $18
-                        i32.const 0
-                        i32.store
-                        local.get $1
-                        local.get $6
-                        local.tee $4
-                        i32.store offset=192
-                        local.get $19
-                        i32.const 1
-                        i32.add
-                        local.set $5
-                        local.get $12
-                        local.set $3
-                        block $label$44 ;; label = @11
-                          block $label$45 ;; label = @12
-                            loop $label$46 ;; label = @13
-                              local.get $2
-                              i32.const 2
-                              i32.add
-                              i32.const 16
-                              i32.ge_u
-                              br_if 1 (;@12;)
-                              local.get $3
-                              local.get $3
-                              i32.const 4
-                              i32.add
-                              local.tee $3
-                              i32.load
-                              i32.store
-                              local.get $2
-                              i32.const 1
-                              i32.add
-                              local.tee $2
-                              local.get $19
-                              i32.lt_u
-                              br_if 0 (;@13;)
-                            end
-                            local.get $5
-                            i32.const 16
-                            i32.ge_u
-                            br_if 1 (;@11;)
-                            local.get $5
-                            i32.const 2
-                            i32.shl
-                            local.tee $3
-                            local.get $1
-                            i32.const 192
-                            i32.add
-                            i32.add
-                            local.get $25
-                            i32.store
-                            local.get $1
-                            i32.const -64
-                            i32.sub
-                            local.get $3
-                            i32.add
-                            local.tee $18
-                            i32.load
-                            local.tee $2
-                            local.get $19
-                            i32.le_s
-                            br_if 6 (;@6;)
-                            local.get $12
-                            i32.load
-                            local.set $6
-                            local.get $5
-                            local.set $19
-                            local.get $4
-                            local.set $25
-                            i32.const 1
-                            local.set $2
-                            br 4 (;@8;)
-                          end
-                          i32.const 1049108
-                          local.get $2
-                          i32.const 2
-                          i32.add
-                          call $3
-                          unreachable
-                        end
-                        i32.const 1049124
-                        local.get $5
-                        call $3
-                        unreachable
-                      end
-                      i32.const 1
-                      local.set $2
-                      br 4 (;@5;)
-                    end
-                    i32.const 0
-                    local.set $2
-                    br 0 (;@8;)
-                  end
-                end
-                i32.const 1049092
-                local.get $10
-                call $3
-                unreachable
-              end
-              local.get $7
-              i32.const 1
-              i32.add
-              local.set $7
-              local.get $18
-              local.get $2
-              i32.const 1
-              i32.add
-              i32.store
-              block $label$47 ;; label = @6
-                block $label$48 ;; label = @7
-                  local.get $1
-                  i32.load offset=192
-                  local.tee $6
-                  i32.const 1
-                  i32.ge_s
-                  if ;; label = @8
-                    block ;; label = @9
-                      i32.const 1
-                      local.set $5
-                      br 2 (;@7;)
-                    end
-                  end
-                  i32.const 2
-                  local.set $5
-                  br 1 (;@6;)
-                end
-                i32.const 1
-                local.set $2
-                br 1 (;@5;)
-              end
-              i32.const 1
-              local.set $2
-              br 0 (;@5;)
-            end
-          end
-        end
-      end
-      i32.const 1049212
-      local.get $0
-      call $3
-      unreachable
-    end
-    i32.const 1049196
-    local.get $2
-    call $3
-    unreachable
+  (i32.store
+   (i32.add
+    (local.get $1)
+    (i32.const 20)
+   )
+   (i32.const 0)
   )
-  (table $0 (;0;) 4 4 funcref)
-  (memory $0 (;0;) 17)
-  (global $global$0 (;0;) (mut i32) i32.const 1048576)
-  (global $global$1 (;1;) i32 i32.const 1049244)
-  (global $global$2 (;2;) i32 i32.const 1049244)
-  (export "memory" (memory $0))
-  (export "__heap_base" (global $global$1))
-  (export "__data_end" (global $global$2))
-  (export "run_fannkuch" (func $10))
-  (elem (;0;) (i32.const 1) func $4 $7 $8)
-  (data (;0;) (i32.const 1048576) "src/lib.rs\00\00\00\00\00\00attempt to divide by zero\00\00\00\00\00\00\00attempt to divide with overflow\00index out of bounds: the len is  but the index is 00010203040506070809101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899called `Option::unwrap()` on a `None` valuesrc/libcore/option.rssrc/lib.rs")
-  (data (;1;) (i32.const 1048982) "\10\00\0a\00\00\00%\00\00\00\1d\00\00\00\10\00\10\00\19\00\00\00\00\00\10\00\0a\00\00\00&\00\00\00\15\00\00\000\00\10\00\1f\00\00\00\00\00\10\00\0a\00\00\00&\00\00\00\15\00\00\00\00\00\10\00\0a\00\00\00.\00\00\00\15\00\00\00\00\00\10\00\0a\00\00\000\00\00\00\15\00\00\00\00\00\10\00\0a\00\00\00-\00\00\00\11\00\00\00\00\00\10\00\0a\00\00\00E\00\00\00\17\00\00\00\00\00\10\00\0a\00\00\00q\00\00\00\22\00\00\00\00\00\10\00\0a\00\00\00s\00\00\00\11\00\00\00P\00\10\00 \00\00\00p\00\10\00\12\00\00\00\02\00\00\00\00\00\00\00\01\00\00\00\03\00\00\00J\01\10\00+\00\00\00u\01\10\00\15\00\00\00Y\01\00\00\15\00\00\00\8a\01\10\00\0a\00\00\00\08\00\00\00\09\00\00\00\8a\01\10\00\0a\00\00\00\0a\00\00\00\14")
-)
\ No newline at end of file
+  (i64.store offset=24
+   (local.get $1)
+   (local.get $4)
+  )
+  (i32.store offset=16
+   (local.get $1)
+   (i32.const 1048656)
+  )
+  (i64.store offset=4 align=4
+   (local.get $1)
+   (i64.const 1)
+  )
+  (i32.store
+   (local.get $1)
+   (i32.add
+    (local.get $1)
+    (i32.const 24)
+   )
+  )
+  (i64.store offset=40
+   (local.get $1)
+   (local.get $3)
+  )
+  (i64.store offset=32
+   (local.get $1)
+   (local.get $2)
+  )
+  (call $5
+   (local.get $1)
+   (i32.add
+    (local.get $1)
+    (i32.const 32)
+   )
+  )
+  (unreachable)
+ )
+ (func $3 (; 3 ;) (type $8) (param $0 i32) (param $1 i32)
+  (local $2 i32)
+  (global.set $global$0
+   (local.tee $2
+    (i32.sub
+     (global.get $global$0)
+     (i32.const 48)
+    )
+   )
+  )
+  (i32.store offset=4
+   (local.get $2)
+   (i32.const 16)
+  )
+  (i32.store
+   (local.get $2)
+   (local.get $1)
+  )
+  (i32.store
+   (i32.add
+    (local.get $2)
+    (i32.const 44)
+   )
+   (i32.const 1)
+  )
+  (i32.store
+   (i32.add
+    (local.get $2)
+    (i32.const 28)
+   )
+   (i32.const 2)
+  )
+  (i32.store offset=36
+   (local.get $2)
+   (i32.const 1)
+  )
+  (i64.store offset=12 align=4
+   (local.get $2)
+   (i64.const 2)
+  )
+  (i32.store offset=8
+   (local.get $2)
+   (i32.const 1049140)
+  )
+  (i32.store offset=40
+   (local.get $2)
+   (local.get $2)
+  )
+  (i32.store offset=32
+   (local.get $2)
+   (i32.add
+    (local.get $2)
+    (i32.const 4)
+   )
+  )
+  (i32.store offset=24
+   (local.get $2)
+   (i32.add
+    (local.get $2)
+    (i32.const 32)
+   )
+  )
+  (call $5
+   (i32.add
+    (local.get $2)
+    (i32.const 8)
+   )
+   (local.get $0)
+  )
+  (unreachable)
+ )
+ (func $4 (; 4 ;) (type $1) (param $0 i32) (param $1 i32) (result i32)
+  (call $6
+   (i64.load32_u
+    (local.get $0)
+   )
+   (local.get $1)
+  )
+ )
+ (func $5 (; 5 ;) (type $4) (param $0 i32) (param $1 i32)
+  (local $2 i32)
+  (local $3 i64)
+  (global.set $global$0
+   (local.tee $2
+    (i32.sub
+     (global.get $global$0)
+     (i32.const 32)
+    )
+   )
+  )
+  (local.set $3
+   (i64.load align=4
+    (local.get $1)
+   )
+  )
+  (i64.store align=4
+   (i32.add
+    (local.get $2)
+    (i32.const 20)
+   )
+   (i64.load offset=8 align=4
+    (local.get $1)
+   )
+  )
+  (i64.store offset=12 align=4
+   (local.get $2)
+   (local.get $3)
+  )
+  (i32.store offset=8
+   (local.get $2)
+   (local.get $0)
+  )
+  (i32.store offset=4
+   (local.get $2)
+   (i32.const 1049156)
+  )
+  (i32.store
+   (local.get $2)
+   (i32.const 1048656)
+  )
+  (call $1
+   (local.get $2)
+  )
+  (unreachable)
+ )
+ (func $6 (; 6 ;) (type $5) (param $0 i64) (param $1 i32) (result i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i64)
+  (local $14 i32)
+  (local $15 i32)
+  (global.set $global$0
+   (local.tee $6
+    (i32.sub
+     (global.get $global$0)
+     (i32.const 48)
+    )
+   )
+  )
+  (local.set $2
+   (i32.const 39)
+  )
+  (block $label$1
+   (block $label$2
+    (if
+     (i64.ge_u
+      (local.get $0)
+      (i64.const 10000)
+     )
+     (block
+      (loop $label$4
+       (i32.store16 align=1
+        (i32.add
+         (local.tee $3
+          (i32.add
+           (i32.add
+            (local.get $6)
+            (i32.const 9)
+           )
+           (local.get $2)
+          )
+         )
+         (i32.const -4)
+        )
+        (i32.load16_u align=1
+         (i32.add
+          (i32.shl
+           (local.tee $5
+            (i32.div_u
+             (local.tee $4
+              (i32.wrap_i64
+               (i64.add
+                (local.get $0)
+                (i64.mul
+                 (local.tee $13
+                  (i64.div_u
+                   (local.get $0)
+                   (i64.const 10000)
+                  )
+                 )
+                 (i64.const -10000)
+                )
+               )
+              )
+             )
+             (i32.const 100)
+            )
+           )
+           (i32.const 1)
+          )
+          (i32.const 1048706)
+         )
+        )
+       )
+       (i32.store16 align=1
+        (i32.add
+         (local.get $3)
+         (i32.const -2)
+        )
+        (i32.load16_u align=1
+         (i32.add
+          (i32.shl
+           (i32.add
+            (i32.mul
+             (local.get $5)
+             (i32.const -100)
+            )
+            (local.get $4)
+           )
+           (i32.const 1)
+          )
+          (i32.const 1048706)
+         )
+        )
+       )
+       (local.set $2
+        (i32.add
+         (local.get $2)
+         (i32.const -4)
+        )
+       )
+       (br_if $label$4
+        (block (result i32)
+         (local.set $14
+          (i64.gt_u
+           (local.get $0)
+           (i64.const 99999999)
+          )
+         )
+         (local.set $0
+          (local.get $13)
+         )
+         (local.get $14)
+        )
+       )
+      )
+      (br_if $label$1
+       (i32.le_s
+        (local.tee $3
+         (i32.wrap_i64
+          (local.get $13)
+         )
+        )
+        (i32.const 99)
+       )
+      )
+      (br $label$2)
+     )
+    )
+    (br_if $label$1
+     (i32.le_s
+      (local.tee $3
+       (i32.wrap_i64
+        (local.tee $13
+         (local.get $0)
+        )
+       )
+      )
+      (i32.const 99)
+     )
+    )
+   )
+   (i32.store16 align=1
+    (i32.add
+     (local.tee $2
+      (i32.add
+       (local.get $2)
+       (i32.const -2)
+      )
+     )
+     (i32.add
+      (local.get $6)
+      (i32.const 9)
+     )
+    )
+    (i32.load16_u align=1
+     (i32.add
+      (i32.shl
+       (i32.and
+        (i32.add
+         (i32.mul
+          (local.tee $3
+           (i32.div_u
+            (i32.and
+             (local.tee $4
+              (i32.wrap_i64
+               (local.get $13)
+              )
+             )
+             (i32.const 65535)
+            )
+            (i32.const 100)
+           )
+          )
+          (i32.const -100)
+         )
+         (local.get $4)
+        )
+        (i32.const 65535)
+       )
+       (i32.const 1)
+      )
+      (i32.const 1048706)
+     )
+    )
+   )
+  )
+  (block $label$5
+   (if
+    (i32.le_s
+     (local.get $3)
+     (i32.const 9)
+    )
+    (block
+     (i32.store8
+      (i32.add
+       (local.tee $2
+        (i32.add
+         (local.get $2)
+         (i32.const -1)
+        )
+       )
+       (i32.add
+        (local.get $6)
+        (i32.const 9)
+       )
+      )
+      (i32.add
+       (local.get $3)
+       (i32.const 48)
+      )
+     )
+     (br $label$5)
+    )
+   )
+   (i32.store16 align=1
+    (i32.add
+     (local.tee $2
+      (i32.add
+       (local.get $2)
+       (i32.const -2)
+      )
+     )
+     (i32.add
+      (local.get $6)
+      (i32.const 9)
+     )
+    )
+    (i32.load16_u align=1
+     (i32.add
+      (i32.shl
+       (local.get $3)
+       (i32.const 1)
+      )
+      (i32.const 1048706)
+     )
+    )
+   )
+  )
+  (local.set $7
+   (i32.sub
+    (i32.const 39)
+    (local.get $2)
+   )
+  )
+  (local.set $3
+   (i32.const 1)
+  )
+  (local.set $8
+   (select
+    (i32.const 43)
+    (i32.const 1114112)
+    (local.tee $11
+     (i32.and
+      (local.tee $4
+       (i32.load
+        (local.get $1)
+       )
+      )
+      (i32.const 1)
+     )
+    )
+   )
+  )
+  (local.set $9
+   (i32.and
+    (i32.shr_s
+     (i32.shl
+      (local.get $4)
+      (i32.const 29)
+     )
+     (i32.const 31)
+    )
+    (i32.const 1048656)
+   )
+  )
+  (local.set $10
+   (i32.add
+    (i32.add
+     (local.get $6)
+     (i32.const 9)
+    )
+    (local.get $2)
+   )
+  )
+  (block $label$7
+   (block $label$8
+    (block $label$9
+     (block $label$10
+      (block $label$11
+       (block $label$12
+        (block $label$13
+         (block $label$14
+          (local.set $3
+           (block $label$15 (result i32)
+            (block $label$16
+             (block $label$17
+              (block $label$18
+               (block $label$19
+                (if
+                 (i32.eq
+                  (i32.load offset=8
+                   (local.get $1)
+                  )
+                  (i32.const 1)
+                 )
+                 (block
+                  (br_if $label$19
+                   (i32.le_u
+                    (local.tee $5
+                     (i32.load
+                      (i32.add
+                       (local.get $1)
+                       (i32.const 12)
+                      )
+                     )
+                    )
+                    (local.tee $2
+                     (i32.add
+                      (local.get $7)
+                      (local.get $11)
+                     )
+                    )
+                   )
+                  )
+                  (br_if $label$18
+                   (i32.and
+                    (local.get $4)
+                    (i32.const 8)
+                   )
+                  )
+                  (local.set $4
+                   (i32.sub
+                    (local.get $5)
+                    (local.get $2)
+                   )
+                  )
+                  (br_if $label$17
+                   (i32.eqz
+                    (i32.and
+                     (local.tee $3
+                      (select
+                       (i32.const 1)
+                       (local.tee $3
+                        (i32.load8_u offset=48
+                         (local.get $1)
+                        )
+                       )
+                       (i32.eq
+                        (local.get $3)
+                        (i32.const 3)
+                       )
+                      )
+                     )
+                     (i32.const 3)
+                    )
+                   )
+                  )
+                  (br_if $label$16
+                   (i32.eq
+                    (local.get $3)
+                    (i32.const 2)
+                   )
+                  )
+                  (local.set $5
+                   (i32.const 0)
+                  )
+                  (br $label$15
+                   (local.get $4)
+                  )
+                 )
+                )
+                (br_if $label$9
+                 (call $9
+                  (local.get $1)
+                  (local.get $8)
+                  (local.get $9)
+                 )
+                )
+                (br $label$8)
+               )
+               (br_if $label$9
+                (call $9
+                 (local.get $1)
+                 (local.get $8)
+                 (local.get $9)
+                )
+               )
+               (br $label$8)
+              )
+              (i32.store8 offset=48
+               (local.get $1)
+               (i32.const 1)
+              )
+              (i32.store offset=4
+               (local.get $1)
+               (i32.const 48)
+              )
+              (br_if $label$9
+               (call $9
+                (local.get $1)
+                (local.get $8)
+                (local.get $9)
+               )
+              )
+              (local.set $3
+               (i32.sub
+                (local.get $5)
+                (local.get $2)
+               )
+              )
+              (br_if $label$14
+               (i32.eqz
+                (i32.and
+                 (local.tee $4
+                  (select
+                   (i32.const 1)
+                   (local.tee $4
+                    (i32.load8_u
+                     (i32.add
+                      (local.get $1)
+                      (i32.const 48)
+                     )
+                    )
+                   )
+                   (i32.eq
+                    (local.get $4)
+                    (i32.const 3)
+                   )
+                  )
+                 )
+                 (i32.const 3)
+                )
+               )
+              )
+              (br_if $label$13
+               (i32.eq
+                (local.get $4)
+                (i32.const 2)
+               )
+              )
+              (local.set $4
+               (i32.const 0)
+              )
+              (br $label$12)
+             )
+             (local.set $5
+              (local.get $4)
+             )
+             (br $label$15
+              (i32.const 0)
+             )
+            )
+            (local.set $5
+             (i32.shr_u
+              (i32.add
+               (local.get $4)
+               (i32.const 1)
+              )
+              (i32.const 1)
+             )
+            )
+            (i32.shr_u
+             (local.get $4)
+             (i32.const 1)
+            )
+           )
+          )
+          (local.set $2
+           (i32.const -1)
+          )
+          (local.set $4
+           (i32.add
+            (local.get $1)
+            (i32.const 4)
+           )
+          )
+          (local.set $11
+           (i32.add
+            (local.get $1)
+            (i32.const 24)
+           )
+          )
+          (local.set $12
+           (i32.add
+            (local.get $1)
+            (i32.const 28)
+           )
+          )
+          (block $label$21
+           (loop $label$22
+            (br_if $label$21
+             (i32.ge_u
+              (local.tee $2
+               (i32.add
+                (local.get $2)
+                (i32.const 1)
+               )
+              )
+              (local.get $3)
+             )
+            )
+            (br_if $label$22
+             (i32.eqz
+              (call_indirect (type $1)
+               (i32.load
+                (local.get $11)
+               )
+               (i32.load
+                (local.get $4)
+               )
+               (i32.load offset=16
+                (i32.load
+                 (local.get $12)
+                )
+               )
+              )
+             )
+            )
+           )
+           (br $label$7)
+          )
+          (local.set $4
+           (i32.load
+            (i32.add
+             (local.get $1)
+             (i32.const 4)
+            )
+           )
+          )
+          (local.set $3
+           (i32.const 1)
+          )
+          (br_if $label$9
+           (call $9
+            (local.get $1)
+            (local.get $8)
+            (local.get $9)
+           )
+          )
+          (br_if $label$9
+           (call_indirect (type $0)
+            (i32.load
+             (local.tee $2
+              (i32.add
+               (local.get $1)
+               (i32.const 24)
+              )
+             )
+            )
+            (local.get $10)
+            (local.get $7)
+            (i32.load offset=12
+             (i32.load
+              (local.tee $1
+               (i32.add
+                (local.get $1)
+                (i32.const 28)
+               )
+              )
+             )
+            )
+           )
+          )
+          (local.set $7
+           (i32.load
+            (local.get $2)
+           )
+          )
+          (local.set $2
+           (i32.const -1)
+          )
+          (local.set $1
+           (i32.add
+            (i32.load
+             (local.get $1)
+            )
+            (i32.const 16)
+           )
+          )
+          (loop $label$23
+           (br_if $label$11
+            (i32.ge_u
+             (local.tee $2
+              (i32.add
+               (local.get $2)
+               (i32.const 1)
+              )
+             )
+             (local.get $5)
+            )
+           )
+           (br_if $label$23
+            (i32.eqz
+             (call_indirect (type $1)
+              (local.get $7)
+              (local.get $4)
+              (i32.load
+               (local.get $1)
+              )
+             )
+            )
+           )
+          )
+          (br $label$9)
+         )
+         (local.set $4
+          (local.get $3)
+         )
+         (local.set $3
+          (i32.const 0)
+         )
+         (br $label$12)
+        )
+        (local.set $4
+         (i32.shr_u
+          (i32.add
+           (local.get $3)
+           (i32.const 1)
+          )
+          (i32.const 1)
+         )
+        )
+        (local.set $3
+         (i32.shr_u
+          (local.get $3)
+          (i32.const 1)
+         )
+        )
+       )
+       (local.set $2
+        (i32.const -1)
+       )
+       (local.set $5
+        (i32.add
+         (local.get $1)
+         (i32.const 4)
+        )
+       )
+       (local.set $8
+        (i32.add
+         (local.get $1)
+         (i32.const 24)
+        )
+       )
+       (local.set $9
+        (i32.add
+         (local.get $1)
+         (i32.const 28)
+        )
+       )
+       (block $label$24
+        (loop $label$25
+         (br_if $label$24
+          (i32.ge_u
+           (local.tee $2
+            (i32.add
+             (local.get $2)
+             (i32.const 1)
+            )
+           )
+           (local.get $3)
+          )
+         )
+         (br_if $label$25
+          (i32.eqz
+           (call_indirect (type $1)
+            (i32.load
+             (local.get $8)
+            )
+            (i32.load
+             (local.get $5)
+            )
+            (i32.load offset=16
+             (i32.load
+              (local.get $9)
+             )
+            )
+           )
+          )
+         )
+        )
+        (br $label$7)
+       )
+       (local.set $5
+        (i32.load
+         (i32.add
+          (local.get $1)
+          (i32.const 4)
+         )
+        )
+       )
+       (local.set $3
+        (i32.const 1)
+       )
+       (br_if $label$9
+        (call_indirect (type $0)
+         (i32.load
+          (local.tee $2
+           (i32.add
+            (local.get $1)
+            (i32.const 24)
+           )
+          )
+         )
+         (local.get $10)
+         (local.get $7)
+         (i32.load offset=12
+          (i32.load
+           (local.tee $1
+            (i32.add
+             (local.get $1)
+             (i32.const 28)
+            )
+           )
+          )
+         )
+        )
+       )
+       (local.set $7
+        (i32.load
+         (local.get $2)
+        )
+       )
+       (local.set $2
+        (i32.const -1)
+       )
+       (local.set $1
+        (i32.add
+         (i32.load
+          (local.get $1)
+         )
+         (i32.const 16)
+        )
+       )
+       (loop $label$26
+        (br_if $label$10
+         (i32.ge_u
+          (local.tee $2
+           (i32.add
+            (local.get $2)
+            (i32.const 1)
+           )
+          )
+          (local.get $4)
+         )
+        )
+        (br_if $label$26
+         (i32.eqz
+          (call_indirect (type $1)
+           (local.get $7)
+           (local.get $5)
+           (i32.load
+            (local.get $1)
+           )
+          )
+         )
+        )
+       )
+       (br $label$9)
+      )
+      (global.set $global$0
+       (i32.add
+        (local.get $6)
+        (i32.const 48)
+       )
+      )
+      (return
+       (i32.const 0)
+      )
+     )
+     (local.set $3
+      (i32.const 0)
+     )
+    )
+    (global.set $global$0
+     (i32.add
+      (local.get $6)
+      (i32.const 48)
+     )
+    )
+    (return
+     (local.get $3)
+    )
+   )
+   (return
+    (block (result i32)
+     (local.set $15
+      (call_indirect (type $0)
+       (i32.load offset=24
+        (local.get $1)
+       )
+       (local.get $10)
+       (local.get $7)
+       (i32.load offset=12
+        (i32.load
+         (i32.add
+          (local.get $1)
+          (i32.const 28)
+         )
+        )
+       )
+      )
+     )
+     (global.set $global$0
+      (i32.add
+       (local.get $6)
+       (i32.const 48)
+      )
+     )
+     (local.get $15)
+    )
+   )
+  )
+  (global.set $global$0
+   (i32.add
+    (local.get $6)
+    (i32.const 48)
+   )
+  )
+  (i32.const 1)
+ )
+ (func $7 (; 7 ;) (type $2) (param $0 i32)
+  (nop)
+ )
+ (func $8 (; 8 ;) (type $6) (param $0 i32) (result i64)
+  (i64.const -2357177763932378009)
+ )
+ (func $9 (; 9 ;) (type $9) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
+  (block $label$1
+   (return
+    (block $label$2 (result i32)
+     (if
+      (i32.ne
+       (local.get $1)
+       (i32.const 1114112)
+      )
+      (drop
+       (br_if $label$2
+        (i32.const 1)
+        (call_indirect (type $1)
+         (i32.load offset=24
+          (local.get $0)
+         )
+         (local.get $1)
+         (i32.load offset=16
+          (i32.load
+           (i32.add
+            (local.get $0)
+            (i32.const 28)
+           )
+          )
+         )
+        )
+       )
+      )
+     )
+     (br_if $label$1
+      (i32.eqz
+       (local.get $2)
+      )
+     )
+     (call_indirect (type $0)
+      (i32.load offset=24
+       (local.get $0)
+      )
+      (local.get $2)
+      (i32.const 0)
+      (i32.load offset=12
+       (i32.load
+        (i32.add
+         (local.get $0)
+         (i32.const 28)
+        )
+       )
+      )
+     )
+    )
+   )
+  )
+  (i32.const 0)
+ )
+ (func $10 (; 10 ;) (type $3) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (local $3 i32)
+  (local $4 i32)
+  (local $5 i32)
+  (local $6 i32)
+  (local $7 i32)
+  (local $8 i32)
+  (local $9 i32)
+  (local $10 i32)
+  (local $11 i32)
+  (local $12 i32)
+  (local $13 i32)
+  (local $14 i32)
+  (local $15 i32)
+  (local $16 i32)
+  (local $17 i32)
+  (local $18 i32)
+  (local $19 i32)
+  (local $20 i32)
+  (local $21 i32)
+  (local $22 i32)
+  (local $23 i32)
+  (local $24 i32)
+  (local $25 i32)
+  (local $26 i32)
+  (local $27 i32)
+  (local $28 i32)
+  (local $29 i32)
+  (local $30 i32)
+  (local $31 i32)
+  (local $32 i32)
+  (local $33 i32)
+  (local $34 i32)
+  (local $35 i32)
+  (local $36 i32)
+  (local $37 i32)
+  (local $38 i32)
+  (local $39 i32)
+  (local $40 i32)
+  (local $41 i32)
+  (local $42 i32)
+  (local $43 i32)
+  (local $44 i32)
+  (local $45 i32)
+  (local $46 i32)
+  (global.set $global$0
+   (local.tee $1
+    (i32.sub
+     (global.get $global$0)
+     (i32.const 256)
+    )
+   )
+  )
+  (i64.store offset=56 align=4
+   (local.get $1)
+   (i64.const 4294967297)
+  )
+  (i64.store offset=48 align=4
+   (local.get $1)
+   (i64.const 4294967297)
+  )
+  (i64.store offset=40 align=4
+   (local.get $1)
+   (i64.const 4294967297)
+  )
+  (i64.store offset=32 align=4
+   (local.get $1)
+   (i64.const 4294967297)
+  )
+  (i64.store offset=24 align=4
+   (local.get $1)
+   (i64.const 4294967297)
+  )
+  (i64.store offset=16 align=4
+   (local.get $1)
+   (i64.const 4294967297)
+  )
+  (i64.store offset=8 align=4
+   (local.get $1)
+   (i64.const 4294967297)
+  )
+  (i64.store align=4
+   (local.get $1)
+   (i64.const 4294967297)
+  )
+  (block $label$1
+   (if
+    (i32.ge_u
+     (local.tee $11
+      (i32.add
+       (local.get $0)
+       (i32.const 1)
+      )
+     )
+     (i32.const 2)
+    )
+    (block
+     (local.set $3
+      (local.get $1)
+     )
+     (local.set $2
+      (i32.const 1)
+     )
+     (loop $label$3
+      (br_if $label$1
+       (i32.ge_u
+        (local.get $2)
+        (i32.const 16)
+       )
+      )
+      (i32.store
+       (local.tee $4
+        (i32.add
+         (local.get $3)
+         (i32.const 4)
+        )
+       )
+       (i32.mul
+        (i32.load
+         (local.get $3)
+        )
+        (local.get $2)
+       )
+      )
+      (local.set $3
+       (local.get $4)
+      )
+      (local.set $2
+       (local.tee $4
+        (i32.add
+         (local.get $2)
+         (i32.const 1)
+        )
+       )
+      )
+      (br_if $label$3
+       (i32.lt_u
+        (local.get $4)
+        (local.get $11)
+       )
+      )
+     )
+    )
+   )
+   (if
+    (i32.lt_u
+     (local.get $0)
+     (i32.const 16)
+    )
+    (block
+     (local.set $20
+      (i32.const 1)
+     )
+     (local.set $21
+      (local.tee $9
+       (i32.load
+        (i32.add
+         (local.get $1)
+         (i32.shl
+          (local.get $0)
+          (i32.const 2)
+         )
+        )
+       )
+      )
+     )
+     (if
+      (i32.ge_u
+       (local.get $9)
+       (i32.const 24)
+      )
+      (local.set $20
+       (select
+        (i32.const 24)
+        (i32.const 25)
+        (i32.eq
+         (local.get $9)
+         (i32.mul
+          (local.tee $21
+           (i32.div_u
+            (local.get $9)
+            (i32.const 24)
+           )
+          )
+          (i32.const 24)
+         )
+        )
+       )
+      )
+     )
+     (local.set $40
+      (i32.sub
+       (i32.const 0)
+       (local.get $0)
+      )
+     )
+     (local.set $12
+      (i32.add
+       (local.get $1)
+       (i32.const 196)
+      )
+     )
+     (local.set $41
+      (i32.add
+       (local.get $1)
+       (i32.const 132)
+      )
+     )
+     (local.set $42
+      (i32.add
+       (local.get $1)
+       (i32.const 124)
+      )
+     )
+     (local.set $11
+      (i32.add
+       (local.get $1)
+       (i32.const 68)
+      )
+     )
+     (local.set $43
+      (i32.lt_u
+       (local.get $0)
+       (i32.const 2)
+      )
+     )
+     (loop $label$6
+      (i64.store
+       (i32.add
+        (local.get $1)
+        (i32.const 120)
+       )
+       (i64.const 0)
+      )
+      (i64.store
+       (i32.add
+        (local.get $1)
+        (i32.const 112)
+       )
+       (i64.const 0)
+      )
+      (i64.store
+       (i32.add
+        (local.get $1)
+        (i32.const 104)
+       )
+       (i64.const 0)
+      )
+      (i64.store
+       (i32.add
+        (local.get $1)
+        (i32.const 96)
+       )
+       (i64.const 0)
+      )
+      (i64.store
+       (i32.add
+        (local.get $1)
+        (i32.const 88)
+       )
+       (i64.const 0)
+      )
+      (i64.store
+       (i32.add
+        (local.get $1)
+        (i32.const 80)
+       )
+       (i64.const 0)
+      )
+      (i64.store
+       (i32.add
+        (local.get $1)
+        (i32.const 72)
+       )
+       (i64.const 0)
+      )
+      (i64.store offset=64
+       (local.get $1)
+       (i64.const 0)
+      )
+      (i64.store
+       (local.tee $26
+        (i32.add
+         (local.get $1)
+         (i32.const 184)
+        )
+       )
+       (i64.const 0)
+      )
+      (i64.store
+       (local.tee $27
+        (i32.add
+         (local.get $1)
+         (i32.const 176)
+        )
+       )
+       (i64.const 0)
+      )
+      (i64.store
+       (local.tee $28
+        (i32.add
+         (local.get $1)
+         (i32.const 168)
+        )
+       )
+       (i64.const 0)
+      )
+      (i64.store
+       (local.tee $29
+        (i32.add
+         (local.get $1)
+         (i32.const 160)
+        )
+       )
+       (i64.const 0)
+      )
+      (i64.store
+       (local.tee $30
+        (i32.add
+         (local.get $1)
+         (i32.const 152)
+        )
+       )
+       (i64.const 0)
+      )
+      (i64.store
+       (local.tee $31
+        (i32.add
+         (local.get $1)
+         (i32.const 144)
+        )
+       )
+       (i64.const 0)
+      )
+      (i64.store
+       (local.tee $32
+        (i32.add
+         (local.get $1)
+         (i32.const 136)
+        )
+       )
+       (i64.const 0)
+      )
+      (i64.store offset=128
+       (local.get $1)
+       (i64.const 0)
+      )
+      (i64.store align=4
+       (local.tee $33
+        (i32.add
+         (local.get $1)
+         (i32.const 248)
+        )
+       )
+       (i64.const 64424509454)
+      )
+      (i64.store align=4
+       (local.tee $34
+        (i32.add
+         (local.get $1)
+         (i32.const 240)
+        )
+       )
+       (i64.const 55834574860)
+      )
+      (i64.store align=4
+       (local.tee $35
+        (i32.add
+         (local.get $1)
+         (i32.const 232)
+        )
+       )
+       (i64.const 47244640266)
+      )
+      (i64.store align=4
+       (local.tee $36
+        (i32.add
+         (local.get $1)
+         (i32.const 224)
+        )
+       )
+       (i64.const 38654705672)
+      )
+      (i64.store align=4
+       (local.tee $37
+        (i32.add
+         (local.get $1)
+         (i32.const 216)
+        )
+       )
+       (i64.const 30064771078)
+      )
+      (i64.store align=4
+       (local.tee $38
+        (i32.add
+         (local.get $1)
+         (i32.const 208)
+        )
+       )
+       (i64.const 21474836484)
+      )
+      (i64.store align=4
+       (local.tee $39
+        (i32.add
+         (local.get $1)
+         (i32.const 200)
+        )
+       )
+       (i64.const 12884901890)
+      )
+      (i64.store offset=192 align=4
+       (local.get $1)
+       (i64.const 4294967296)
+      )
+      (local.set $7
+       (i32.mul
+        (local.get $13)
+        (local.get $21)
+       )
+      )
+      (local.set $2
+       (block $label$7 (result i32)
+        (block $label$8
+         (if
+          (i32.eqz
+           (local.get $43)
+          )
+          (block
+           (local.set $23
+            (local.get $40)
+           )
+           (local.set $14
+            (local.get $7)
+           )
+           (local.set $15
+            (local.get $0)
+           )
+           (local.set $5
+            (i32.const 0)
+           )
+           (br $label$8)
+          )
+         )
+         (br $label$7
+          (i32.const 0)
+         )
+        )
+        (i32.const 1)
+       )
+      )
+      (loop $label$10
+       (block $label$11
+        (block $label$12
+         (local.set $2
+          (block $label$13 (result i32)
+           (block $label$14
+            (block $label$15
+             (block $label$16
+              (block $label$17
+               (block $label$18
+                (block $label$19
+                 (if
+                  (i32.eqz
+                   (local.get $2)
+                  )
+                  (block
+                   (local.set $13
+                    (i32.add
+                     (local.get $13)
+                     (i32.const 1)
+                    )
+                   )
+                   (local.set $44
+                    (i32.add
+                     (select
+                      (local.get $9)
+                      (local.tee $3
+                       (i32.add
+                        (local.get $7)
+                        (local.get $21)
+                       )
+                      )
+                      (i32.gt_u
+                       (local.get $3)
+                       (local.get $9)
+                      )
+                     )
+                     (i32.const -1)
+                    )
+                   )
+                   (local.set $24
+                    (i32.const 0)
+                   )
+                   (br_if $label$19
+                    (i32.ge_s
+                     (local.tee $6
+                      (i32.load offset=192
+                       (local.get $1)
+                      )
+                     )
+                     (i32.const 1)
+                    )
+                   )
+                   (br $label$18)
+                  )
+                 )
+                 (block $label$21
+                  (block $label$22
+                   (block $label$23
+                    (block $label$24
+                     (block $label$25
+                      (block $label$26
+                       (block $label$27
+                        (block $label$28
+                         (block $label$29
+                          (block $label$30
+                           (block $label$31
+                            (br_table $label$31 $label$30 $label$29
+                             (local.get $5)
+                            )
+                           )
+                           (br_if $label$24
+                            (i32.ge_u
+                             (local.tee $4
+                              (i32.add
+                               (local.get $15)
+                               (i32.const -1)
+                              )
+                             )
+                             (i32.const 16)
+                            )
+                           )
+                           (br_if $label$23
+                            (i32.eqz
+                             (local.tee $3
+                              (i32.load
+                               (i32.add
+                                (local.get $1)
+                                (local.tee $2
+                                 (i32.shl
+                                  (local.get $4)
+                                  (i32.const 2)
+                                 )
+                                )
+                               )
+                              )
+                             )
+                            )
+                           )
+                           (if
+                            (i32.eq
+                             (local.get $14)
+                             (i32.const -2147483648)
+                            )
+                            (br_if $label$22
+                             (i32.eq
+                              (local.get $3)
+                              (i32.const -1)
+                             )
+                            )
+                           )
+                           (i32.store
+                            (i32.add
+                             (i32.sub
+                              (local.get $1)
+                              (i32.const -64)
+                             )
+                             (local.get $2)
+                            )
+                            (local.tee $16
+                             (i32.div_s
+                              (local.get $14)
+                              (local.get $3)
+                             )
+                            )
+                           )
+                           (i64.store
+                            (local.get $32)
+                            (i64.load align=4
+                             (local.get $39)
+                            )
+                           )
+                           (i64.store
+                            (local.get $31)
+                            (i64.load align=4
+                             (local.get $38)
+                            )
+                           )
+                           (i64.store
+                            (local.get $30)
+                            (i64.load align=4
+                             (local.get $37)
+                            )
+                           )
+                           (i64.store
+                            (local.get $29)
+                            (i64.load align=4
+                             (local.get $36)
+                            )
+                           )
+                           (i64.store
+                            (local.get $28)
+                            (i64.load align=4
+                             (local.get $35)
+                            )
+                           )
+                           (i64.store
+                            (local.get $27)
+                            (i64.load align=4
+                             (local.get $34)
+                            )
+                           )
+                           (i64.store
+                            (local.get $26)
+                            (i64.load align=4
+                             (local.get $33)
+                            )
+                           )
+                           (i64.store offset=128
+                            (local.get $1)
+                            (i64.load offset=192 align=4
+                             (local.get $1)
+                            )
+                           )
+                           (local.set $45
+                            (i32.add
+                             (local.get $16)
+                             (local.get $23)
+                            )
+                           )
+                           (local.set $14
+                            (i32.sub
+                             (local.get $14)
+                             (i32.mul
+                              (local.get $3)
+                              (local.get $16)
+                             )
+                            )
+                           )
+                           (local.set $2
+                            (i32.const 0)
+                           )
+                           (local.set $8
+                            (i32.add
+                             (local.get $1)
+                             (i32.const 192)
+                            )
+                           )
+                           (loop $label$33
+                            (block $label$34
+                             (if
+                              (i32.gt_u
+                               (local.tee $3
+                                (i32.add
+                                 (local.get $2)
+                                 (local.get $16)
+                                )
+                               )
+                               (local.get $4)
+                              )
+                              (block
+                               (br_if $label$27
+                                (i32.gt_u
+                                 (local.tee $46
+                                  (i32.add
+                                   (local.get $2)
+                                   (local.get $45)
+                                  )
+                                 )
+                                 (i32.const 15)
+                                )
+                               )
+                               (local.set $3
+                                (i32.sub
+                                 (local.get $3)
+                                 (local.get $15)
+                                )
+                               )
+                               (br_if $label$34
+                                (i32.le_u
+                                 (local.get $2)
+                                 (i32.const 15)
+                                )
+                               )
+                               (br $label$28)
+                              )
+                             )
+                             (br_if $label$26
+                              (i32.ge_u
+                               (local.get $3)
+                               (i32.const 16)
+                              )
+                             )
+                             (br_if $label$28
+                              (i32.gt_u
+                               (local.get $2)
+                               (i32.const 15)
+                              )
+                             )
+                            )
+                            (i32.store
+                             (local.get $8)
+                             (i32.load
+                              (i32.add
+                               (i32.add
+                                (local.get $1)
+                                (i32.const 128)
+                               )
+                               (i32.shl
+                                (local.get $3)
+                                (i32.const 2)
+                               )
+                              )
+                             )
+                            )
+                            (local.set $8
+                             (i32.add
+                              (local.get $8)
+                              (i32.const 4)
+                             )
+                            )
+                            (br_if $label$33
+                             (i32.lt_u
+                              (local.tee $2
+                               (i32.add
+                                (local.get $2)
+                                (i32.const 1)
+                               )
+                              )
+                              (local.get $15)
+                             )
+                            )
+                           )
+                           (local.set $23
+                            (i32.add
+                             (local.get $23)
+                             (i32.const 1)
+                            )
+                           )
+                           (br_if $label$21
+                            (i32.gt_u
+                             (local.tee $15
+                              (local.get $4)
+                             )
+                             (i32.const 1)
+                            )
+                           )
+                           (local.set $2
+                            (i32.const 0)
+                           )
+                           (br $label$10)
+                          )
+                          (i64.store
+                           (local.get $26)
+                           (i64.load align=4
+                            (local.get $33)
+                           )
+                          )
+                          (i64.store
+                           (local.get $27)
+                           (i64.load align=4
+                            (local.get $34)
+                           )
+                          )
+                          (i64.store
+                           (local.get $28)
+                           (i64.load align=4
+                            (local.get $35)
+                           )
+                          )
+                          (i64.store
+                           (local.get $29)
+                           (i64.load align=4
+                            (local.get $36)
+                           )
+                          )
+                          (i64.store
+                           (local.get $30)
+                           (i64.load align=4
+                            (local.get $37)
+                           )
+                          )
+                          (i64.store
+                           (local.get $31)
+                           (i64.load align=4
+                            (local.get $38)
+                           )
+                          )
+                          (i64.store
+                           (local.get $32)
+                           (i64.load align=4
+                            (local.get $39)
+                           )
+                          )
+                          (i64.store offset=128
+                           (local.get $1)
+                           (i64.load offset=192 align=4
+                            (local.get $1)
+                           )
+                          )
+                          (br_if $label$25
+                           (i32.gt_u
+                            (local.get $6)
+                            (i32.const 15)
+                           )
+                          )
+                          (local.set $17
+                           (i32.const 1)
+                          )
+                          (local.set $10
+                           (local.get $6)
+                          )
+                          (br $label$13
+                           (i32.const 0)
+                          )
+                         )
+                         (if
+                          (i32.lt_u
+                           (local.get $7)
+                           (local.get $44)
+                          )
+                          (block
+                           (local.set $25
+                            (i32.load
+                             (local.get $12)
+                            )
+                           )
+                           (i32.store
+                            (local.get $12)
+                            (local.get $6)
+                           )
+                           (i32.store offset=192
+                            (local.get $1)
+                            (local.get $25)
+                           )
+                           (local.set $18
+                            (local.get $11)
+                           )
+                           (br_if $label$11
+                            (i32.lt_s
+                             (local.tee $2
+                              (i32.load offset=68
+                               (local.get $1)
+                              )
+                             )
+                             (i32.const 1)
+                            )
+                           )
+                           (local.set $19
+                            (i32.const 1)
+                           )
+                           (br $label$14)
+                          )
+                         )
+                         (local.set $22
+                          (i32.add
+                           (local.get $22)
+                           (local.get $24)
+                          )
+                         )
+                         (br_if $label$6
+                          (i32.lt_u
+                           (local.get $13)
+                           (local.get $20)
+                          )
+                         )
+                         (global.set $global$0
+                          (i32.add
+                           (local.get $1)
+                           (i32.const 256)
+                          )
+                         )
+                         (return
+                          (local.get $22)
+                         )
+                        )
+                        (call $3
+                         (i32.const 1049076)
+                         (local.get $2)
+                        )
+                        (unreachable)
+                       )
+                       (call $3
+                        (i32.const 1049060)
+                        (local.get $46)
+                       )
+                       (unreachable)
+                      )
+                      (call $3
+                       (i32.const 1049044)
+                       (i32.add
+                        (local.get $2)
+                        (local.get $16)
+                       )
+                      )
+                      (unreachable)
+                     )
+                     (local.set $10
+                      (local.get $6)
+                     )
+                     (br $label$12)
+                    )
+                    (call $3
+                     (i32.const 1048980)
+                     (local.get $4)
+                    )
+                    (unreachable)
+                   )
+                   (call $2
+                    (i32.const 1048996)
+                   )
+                   (unreachable)
+                  )
+                  (call $2
+                   (i32.const 1049020)
+                  )
+                  (unreachable)
+                 )
+                 (local.set $5
+                  (i32.const 0)
+                 )
+                 (br $label$17)
+                )
+                (local.set $5
+                 (i32.const 1)
+                )
+                (br $label$16)
+               )
+               (local.set $5
+                (i32.const 2)
+               )
+               (br $label$15)
+              )
+              (local.set $2
+               (i32.const 1)
+              )
+              (br $label$10)
+             )
+             (local.set $2
+              (i32.const 1)
+             )
+             (br $label$10)
+            )
+            (local.set $2
+             (i32.const 1)
+            )
+            (br $label$10)
+           )
+           (i32.const 1)
+          )
+         )
+         (loop $label$37
+          (block $label$38
+           (block $label$39
+            (if
+             (i32.eqz
+              (local.get $2)
+             )
+             (block
+              (if
+               (local.tee $10
+                (i32.load
+                 (local.tee $5
+                  (i32.add
+                   (local.tee $4
+                    (i32.shl
+                     (local.tee $3
+                      (local.get $10)
+                     )
+                     (i32.const 2)
+                    )
+                   )
+                   (i32.add
+                    (local.get $1)
+                    (i32.const 128)
+                   )
+                  )
+                 )
+                )
+               )
+               (block
+                (i32.store
+                 (local.get $5)
+                 (local.get $3)
+                )
+                (block $label$42
+                 (br_if $label$42
+                  (i32.lt_u
+                   (local.get $3)
+                   (i32.const 3)
+                  )
+                 )
+                 (br_if $label$42
+                  (i32.eqz
+                   (local.tee $8
+                    (i32.shr_u
+                     (i32.add
+                      (local.get $3)
+                      (i32.const -1)
+                     )
+                     (i32.const 1)
+                    )
+                   )
+                  )
+                 )
+                 (local.set $2
+                  (i32.add
+                   (local.get $4)
+                   (local.get $42)
+                  )
+                 )
+                 (local.set $3
+                  (local.get $41)
+                 )
+                 (loop $label$43
+                  (local.set $4
+                   (i32.load
+                    (local.get $3)
+                   )
+                  )
+                  (i32.store
+                   (local.get $3)
+                   (i32.load
+                    (local.get $2)
+                   )
+                  )
+                  (i32.store
+                   (local.get $2)
+                   (local.get $4)
+                  )
+                  (local.set $3
+                   (i32.add
+                    (local.get $3)
+                    (i32.const 4)
+                   )
+                  )
+                  (local.set $2
+                   (i32.add
+                    (local.get $2)
+                    (i32.const -4)
+                   )
+                  )
+                  (br_if $label$43
+                   (local.tee $8
+                    (i32.add
+                     (local.get $8)
+                     (i32.const -1)
+                    )
+                   )
+                  )
+                 )
+                )
+                (local.set $17
+                 (i32.add
+                  (local.get $17)
+                  (i32.const 1)
+                 )
+                )
+                (br_if $label$38
+                 (i32.lt_u
+                  (local.get $10)
+                  (i32.const 16)
+                 )
+                )
+                (br $label$12)
+               )
+              )
+              (local.set $24
+               (i32.add
+                (select
+                 (i32.sub
+                  (i32.const 0)
+                  (local.get $17)
+                 )
+                 (local.get $17)
+                 (i32.and
+                  (local.get $7)
+                  (i32.const 1)
+                 )
+                )
+                (local.get $24)
+               )
+              )
+              (local.set $5
+               (i32.const 2)
+              )
+              (br $label$39)
+             )
+            )
+            (local.set $2
+             (i32.const 0)
+            )
+            (i32.store
+             (local.get $18)
+             (i32.const 0)
+            )
+            (i32.store offset=192
+             (local.get $1)
+             (local.tee $4
+              (local.get $6)
+             )
+            )
+            (local.set $5
+             (i32.add
+              (local.get $19)
+              (i32.const 1)
+             )
+            )
+            (local.set $3
+             (local.get $12)
+            )
+            (block $label$44
+             (block $label$45
+              (loop $label$46
+               (br_if $label$45
+                (i32.ge_u
+                 (i32.add
+                  (local.get $2)
+                  (i32.const 2)
+                 )
+                 (i32.const 16)
+                )
+               )
+               (i32.store
+                (local.get $3)
+                (i32.load
+                 (local.tee $3
+                  (i32.add
+                   (local.get $3)
+                   (i32.const 4)
+                  )
+                 )
+                )
+               )
+               (br_if $label$46
+                (i32.lt_u
+                 (local.tee $2
+                  (i32.add
+                   (local.get $2)
+                   (i32.const 1)
+                  )
+                 )
+                 (local.get $19)
+                )
+               )
+              )
+              (br_if $label$44
+               (i32.ge_u
+                (local.get $5)
+                (i32.const 16)
+               )
+              )
+              (i32.store
+               (i32.add
+                (local.tee $3
+                 (i32.shl
+                  (local.get $5)
+                  (i32.const 2)
+                 )
+                )
+                (i32.add
+                 (local.get $1)
+                 (i32.const 192)
+                )
+               )
+               (local.get $25)
+              )
+              (br_if $label$11
+               (i32.le_s
+                (local.tee $2
+                 (i32.load
+                  (local.tee $18
+                   (i32.add
+                    (i32.sub
+                     (local.get $1)
+                     (i32.const -64)
+                    )
+                    (local.get $3)
+                   )
+                  )
+                 )
+                )
+                (local.get $19)
+               )
+              )
+              (local.set $6
+               (i32.load
+                (local.get $12)
+               )
+              )
+              (local.set $19
+               (local.get $5)
+              )
+              (local.set $25
+               (local.get $4)
+              )
+              (local.set $2
+               (i32.const 1)
+              )
+              (br $label$37)
+             )
+             (call $3
+              (i32.const 1049108)
+              (i32.add
+               (local.get $2)
+               (i32.const 2)
+              )
+             )
+             (unreachable)
+            )
+            (call $3
+             (i32.const 1049124)
+             (local.get $5)
+            )
+            (unreachable)
+           )
+           (local.set $2
+            (i32.const 1)
+           )
+           (br $label$10)
+          )
+          (local.set $2
+           (i32.const 0)
+          )
+          (br $label$37)
+         )
+        )
+        (call $3
+         (i32.const 1049092)
+         (local.get $10)
+        )
+        (unreachable)
+       )
+       (local.set $7
+        (i32.add
+         (local.get $7)
+         (i32.const 1)
+        )
+       )
+       (i32.store
+        (local.get $18)
+        (i32.add
+         (local.get $2)
+         (i32.const 1)
+        )
+       )
+       (block $label$47
+        (block $label$48
+         (if
+          (i32.ge_s
+           (local.tee $6
+            (i32.load offset=192
+             (local.get $1)
+            )
+           )
+           (i32.const 1)
+          )
+          (block
+           (local.set $5
+            (i32.const 1)
+           )
+           (br $label$48)
+          )
+         )
+         (local.set $5
+          (i32.const 2)
+         )
+         (br $label$47)
+        )
+        (local.set $2
+         (i32.const 1)
+        )
+        (br $label$10)
+       )
+       (local.set $2
+        (i32.const 1)
+       )
+       (br $label$10)
+      )
+     )
+    )
+   )
+   (call $3
+    (i32.const 1049212)
+    (local.get $0)
+   )
+   (unreachable)
+  )
+  (call $3
+   (i32.const 1049196)
+   (local.get $2)
+  )
+  (unreachable)
+ )
+)
+
diff --git a/crates/bench-api/Cargo.toml b/crates/bench-api/Cargo.toml
index ebfdeb871002..83cce9065cae 100644
--- a/crates/bench-api/Cargo.toml
+++ b/crates/bench-api/Cargo.toml
@@ -18,10 +18,8 @@ doctest = false
 anyhow = { workspace = true }
 shuffling-allocator = { version = "1.1.1", optional = true }
 target-lexicon = { workspace = true }
-wasmtime = { workspace = true, default-features = true }
-wasmtime-cli-flags = { workspace = true, default-features = true, features = [
-    "cranelift",
-] }
+wasmtime = { workspace = true }
+wasmtime-cli-flags = { workspace = true, default-features = true }
 wasmtime-wasi = { workspace = true, default-features = true }
 wasmtime-wasi-nn = { workspace = true, optional = true }
 wasi-cap-std-sync = { workspace = true }
diff --git a/crates/bench-api/src/lib.rs b/crates/bench-api/src/lib.rs
index bb4f6ed551ba..a2ec33a9f5fd 100644
--- a/crates/bench-api/src/lib.rs
+++ b/crates/bench-api/src/lib.rs
@@ -522,7 +522,7 @@ impl BenchState {
             store.set_epoch_deadline(1);
         }
         if let Some(fuel) = self.fuel {
-            store.set_fuel(fuel).unwrap();
+            store.add_fuel(fuel).unwrap();
         }
 
         let instance = self.linker.instantiate(&mut store, &module)?;
diff --git a/crates/c-api/CMakeLists.txt b/crates/c-api/CMakeLists.txt
index b5fb5e085f08..37ec5761106e 100644
--- a/crates/c-api/CMakeLists.txt
+++ b/crates/c-api/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-set(WASMTIME_USER_CARGO_BUILD_OPTIONS "" CACHE STRING "Additional cargo flags (such as --features) to apply to the build command")
 option(BUILD_SHARED_LIBS "Build using shared libraries" OFF)
-option(WASMTIME_ALWAYS_BUILD "If cmake should always invoke cargo to build wasmtime" ON)
 
 if(CMAKE_BUILD_TYPE STREQUAL "Release")
 	set(WASMTIME_BUILD_TYPE_FLAG "--release")
@@ -99,9 +97,9 @@ ExternalProject_Add(
 	DOWNLOAD_COMMAND ""
 	CONFIGURE_COMMAND ""
 	INSTALL_COMMAND "${WASMTIME_INSTALL_COMMAND}"
-        BUILD_COMMAND ${WASMTIME_PREBUILD_COMMAND} ${WASMTIME_CARGO_BINARY} build ${WASMTIME_BUILD_TYPE_FLAG} ${WASMTIME_USER_CARGO_BUILD_OPTIONS} ${WASMTIME_BUILD_TARGET}
-	BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/artifact
-        BUILD_ALWAYS ${WASMTIME_ALWAYS_BUILD}
+        BUILD_COMMAND ${WASMTIME_PREBUILD_COMMAND} ${WASMTIME_CARGO_BINARY} build ${WASMTIME_BUILD_TYPE_FLAG} ${WASMTIME_BUILD_TARGET}
+	BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}
+	BUILD_ALWAYS ON
 	BUILD_BYPRODUCTS ${WASMTIME_BUILD_PRODUCT})
 add_library(wasmtime INTERFACE)
 add_dependencies(wasmtime wasmtime-crate)
@@ -137,5 +135,5 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wasm-c-api/include/wasm.h
 	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/wasmtime
 	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-install(FILES ${WASMTIME_BUILD_PRODUCT}
+install(FILES ${WASMTIME_BUILD_PRODUCT} 
 	DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/crates/c-api/Cargo.toml b/crates/c-api/Cargo.toml
index 82d46337bba9..26e358424405 100644
--- a/crates/c-api/Cargo.toml
+++ b/crates/c-api/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "wasmtime-c-api-impl"
+name = "wasmtime-c-api"
 version.workspace = true
 authors.workspace = true
 description = "C API to expose the Wasmtime runtime"
@@ -10,19 +10,18 @@ edition.workspace = true
 publish = false
 
 [lib]
-name = "wamstime_c_api"
+name = "wasmtime"
+crate-type = ["staticlib", "cdylib"]
 doc = false
 test = false
 doctest = false
 
 [dependencies]
-env_logger = { workspace = true, optional = true }
+env_logger = { workspace = true }
 anyhow = { workspace = true }
 once_cell = { workspace = true }
 wasmtime = { workspace = true, features = ['cranelift'] }
 wasmtime-c-api-macros = { path = "macros" }
-log = { workspace = true }
-tracing = { workspace = true }
 
 # Optional dependency for the `wat2wasm` API
 wat = { workspace = true, optional = true }
@@ -33,16 +32,9 @@ wasmtime-wasi = { workspace = true, default-features = true, optional = true }
 cap-std = { workspace = true, optional = true }
 wasi-common = { workspace = true, optional = true }
 
-# Optional dependencies for the `async` feature
-futures = { workspace = true, optional = true }
-
 [features]
-async = ['wasmtime/async', 'futures']
-profiling = ["wasmtime/profiling"]
+default = ['jitdump', 'wat', 'wasi', 'cache', 'parallel-compilation']
+jitdump = ["wasmtime/jitdump"]
 cache = ["wasmtime/cache"]
 parallel-compilation = ['wasmtime/parallel-compilation']
 wasi = ['wasi-cap-std-sync', 'wasmtime-wasi', 'cap-std', 'wasi-common']
-logging = ['dep:env_logger']
-disable-logging = ["log/max_level_off", "tracing/max_level_off"]
-coredump = ["wasmtime/coredump"]
-addr2line = ["wasmtime/addr2line"]
diff --git a/crates/c-api/artifact/Cargo.toml b/crates/c-api/artifact/Cargo.toml
deleted file mode 100644
index 0738a9df1dc0..000000000000
--- a/crates/c-api/artifact/Cargo.toml
+++ /dev/null
@@ -1,42 +0,0 @@
-[package]
-name = "wasmtime-c-api"
-version.workspace = true
-authors.workspace = true
-description = "C API to expose the Wasmtime runtime"
-license = "Apache-2.0 WITH LLVM-exception"
-repository = "https://github.com/bytecodealliance/wasmtime"
-readme = "README.md"
-edition.workspace = true
-publish = false
-
-[lib]
-name = "wasmtime"
-crate-type = ["staticlib", "cdylib"]
-doc = false
-test = false
-doctest = false
-
-[dependencies]
-wasmtime-c-api = { path = '..', package = 'wasmtime-c-api-impl' }
-
-[features]
-default = [
-  'profiling',
-  'wat',
-  'wasi',
-  'cache',
-  'parallel-compilation',
-  'async',
-  'coredump',
-  'addr2line',
-]
-async = ['wasmtime-c-api/async']
-profiling = ["wasmtime-c-api/profiling"]
-cache = ["wasmtime-c-api/cache"]
-parallel-compilation = ['wasmtime-c-api/parallel-compilation']
-wasi = ['wasmtime-c-api/wasi']
-logging = ['wasmtime-c-api/logging']
-disable-logging = ["wasmtime-c-api/disable-logging"]
-coredump = ["wasmtime-c-api/coredump"]
-addr2line = ["wasmtime-c-api/addr2line"]
-wat = ["wasmtime-c-api/wat"]
diff --git a/crates/c-api/artifact/src/lib.rs b/crates/c-api/artifact/src/lib.rs
deleted file mode 100644
index 43929bb8605f..000000000000
--- a/crates/c-api/artifact/src/lib.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub use wasmtime_c_api::*;
diff --git a/crates/c-api/include/wasmtime.h b/crates/c-api/include/wasmtime.h
index 44e4e3d2c3c6..dfe80372d70e 100644
--- a/crates/c-api/include/wasmtime.h
+++ b/crates/c-api/include/wasmtime.h
@@ -195,16 +195,15 @@
 #include <wasmtime/table.h>
 #include <wasmtime/trap.h>
 #include <wasmtime/val.h>
-#include <wasmtime/async.h>
 
 /**
  * \brief Wasmtime version string.
  */
-#define WASMTIME_VERSION "15.0.0"
+#define WASMTIME_VERSION "14.0.0"
 /**
  * \brief Wasmtime major version number.
  */
-#define WASMTIME_VERSION_MAJOR 15
+#define WASMTIME_VERSION_MAJOR 14
 /**
  * \brief Wasmtime minor version number.
  */
diff --git a/crates/c-api/include/wasmtime/async.h b/crates/c-api/include/wasmtime/async.h
deleted file mode 100644
index 1b490003a3ab..000000000000
--- a/crates/c-api/include/wasmtime/async.h
+++ /dev/null
@@ -1,369 +0,0 @@
-/**
- * \file wasmtime/async.h
- *
- * \brief Wasmtime async functionality
- *
- * Async functionality in Wasmtime is well documented here:
- * https://docs.wasmtime.dev/api/wasmtime/struct.Config.html#method.async_support
- *
- * All WebAssembly executes synchronously, but an async support enables the Wasm code
- * be executed on a seperate stack, so it can be paused and resumed. There are three
- * mechanisms for yielding control from wasm to the caller: fuel, epochs, and async host functions.
- *
- * When WebAssembly is executed, a #wasmtime_call_future_t is returned. This struct represents the
- * state of the execution and each call to #wasmtime_call_future_poll will execute the WebAssembly
- * code on a seperate stack until the function returns or yields control back to the caller.
- *
- * It's expected these futures are pulled in a loop until completed, at which point the future 
- * should be deleted. Functions that return a #wasmtime_call_future_t are special in that all 
- * parameters to that function should not be modified in any way and must be kept alive until
- * the future is deleted. This includes concurrent calls for a single store - another function
- * on a store should not be called while there is a #wasmtime_call_future_t alive.
- *
- * As for asynchronous host calls - the reverse contract is upheld. Wasmtime will keep all parameters
- * to the function alive and unmodified until the #wasmtime_func_async_continuation_callback_t returns
- * true.
- *
- */
-
-#ifndef WASMTIME_ASYNC_H
-#define WASMTIME_ASYNC_H
-
-#include <wasm.h>
-#include <wasmtime/error.h>
-#include <wasmtime/config.h>
-#include <wasmtime/store.h>
-#include <wasmtime/func.h>
-#include <wasmtime/linker.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief Whether or not to enable support for asynchronous functions in Wasmtime.
- *
- * When enabled, the config can optionally define host functions with async. 
- * Instances created and functions called with this Config must be called through their asynchronous APIs, however.
- * For example using wasmtime_func_call will panic when used with this config.
- *
- * For more information see the Rust documentation at
- * https://docs.wasmtime.dev/api/wasmtime/struct.Config.html#method.async_support
- */
-WASMTIME_CONFIG_PROP(void, async_support, bool)
-
-/**
- * \brief Configures the size of the stacks used for asynchronous execution.
- *
- * This setting configures the size of the stacks that are allocated for asynchronous execution. 
- *
- * The value cannot be less than max_wasm_stack.
- *
- * The amount of stack space guaranteed for host functions is async_stack_size - max_wasm_stack, so take care
- * not to set these two values close to one another; doing so may cause host functions to overflow the stack 
- * and abort the process.
- *
- * By default this option is 2 MiB.
- *
- * For more information see the Rust documentation at
- * https://docs.wasmtime.dev/api/wasmtime/struct.Config.html#method.async_stack_size
- */
-WASMTIME_CONFIG_PROP(void, async_stack_size, uint64_t)
-
-/**
- * \brief Configures a Store to yield execution of async WebAssembly code
- * periodically.
- *
- * When a Store is configured to consume fuel with
- * `wasmtime_config_consume_fuel` this method will configure what happens when
- * fuel runs out. Specifically executing WebAssembly will be suspended and
- * control will be yielded back to the caller.
- *
- * This is only suitable with use of a store associated with an async config
- * because only then are futures used and yields are possible.
- *
- * \param context the context for the store to configure.
- * \param interval the amount of fuel at which to yield. A value of 0 will
- *        disable yielding.
- */
-WASM_API_EXTERN void
-wasmtime_context_fuel_async_yield_interval(wasmtime_context_t *context,
-                                           uint64_t interval);
-
-/**
- * \brief Configures epoch-deadline expiration to yield to the async caller and the update the deadline.
- *
- * This is only suitable with use of a store associated with an async config because
- * only then are futures used and yields are possible.
- *
- * See the Rust documentation for more:
- * https://docs.wasmtime.dev/api/wasmtime/struct.Store.html#method.epoch_deadline_async_yield_and_update
- */
-WASM_API_EXTERN wasmtime_error_t* wasmtime_context_epoch_deadline_async_yield_and_update(
-    wasmtime_context_t *context,
-    uint64_t delta);
-
-/**
- * The callback to determine a continuation's current state.
- *
- * Return true if the host call has completed, otherwise false will 
- * continue to yield WebAssembly execution.
- */
-typedef bool (*wasmtime_func_async_continuation_callback_t)(void *env);
-
-/**
- * A continuation for the current state of the host function's execution.
- */
-typedef struct wasmtime_async_continuation_t {
-  /// Callback for if the async function has completed.
-  wasmtime_func_async_continuation_callback_t callback;
-  /// User-provided argument to pass to the callback.
-  void *env;
-  /// A finalizer for the user-provided *env
-  void (*finalizer)(void *);
-} wasmtime_async_continuation_t;
-
-/**
- * \brief Callback signature for #wasmtime_linker_define_async_func.
- *
- * This is a host function that returns a continuation to be called later. 
- *
- * All the arguments to this function will be kept alive until the continuation
- * returns that it has errored or has completed.
- *
- * \param env user-provided argument passed to #wasmtime_linker_define_async_func
- * \param caller a temporary object that can only be used during this function
- * call. Used to acquire #wasmtime_context_t or caller's state
- * \param args the arguments provided to this function invocation
- * \param nargs how many arguments are provided
- * \param results where to write the results of this function
- * \param nresults how many results must be produced
- * \param trap_ret if assigned a not `NULL` value then the called function will
- *        trap with the returned error. Note that ownership of trap is transferred
- *        to wasmtime.
- * \param continuation_ret the returned continuation that determines when the 
- *        async function has completed executing.
- *
- * Only supported for async stores.
- *
- * See #wasmtime_func_callback_t for more information.
- */
-typedef void (*wasmtime_func_async_callback_t)(
-    void *env,
-    wasmtime_caller_t *caller, 
-    const wasmtime_val_t *args,
-    size_t nargs, 
-    wasmtime_val_t *results,
-    size_t nresults,
-    wasm_trap_t** trap_ret,
-    wasmtime_async_continuation_t * continuation_ret);
-
-/**
- * \brief The structure representing a asynchronously running function.
- *
- * This structure is always owned by the caller and must be deleted using #wasmtime_call_future_delete.
- *
- * Functions that return this type require that the parameters to the function are unmodified until 
- * this future is destroyed.
- */
-typedef struct wasmtime_call_future wasmtime_call_future_t;
-
-/**
- * \brief Executes WebAssembly in the function.
- *
- * Returns true if the function call has completed. After this function returns true, it should *not* be 
- * called again for a given future.
- *
- * This function returns false if execution has yielded either due to being out of fuel 
- * (see wasmtime_context_fuel_async_yield_interval), or the epoch has been incremented enough 
- * (see wasmtime_context_epoch_deadline_async_yield_and_update). The function may also return false if 
- * asynchronous host functions have been called, which then calling this  function will call the 
- * continuation from the async host function.
- *
- * For more see the information at
- * https://docs.wasmtime.dev/api/wasmtime/struct.Config.html#asynchronous-wasm
- *
- */
-WASM_API_EXTERN bool wasmtime_call_future_poll(wasmtime_call_future_t *future);
-
-/**
- * /brief Frees the underlying memory for a future.
- *
- * All wasmtime_call_future_t are owned by the caller and should be deleted using this function.
- */
-WASM_API_EXTERN void wasmtime_call_future_delete(wasmtime_call_future_t *future);
-
-/**
- * \brief Invokes this function with the params given, returning the results asynchronously.
- *
- * This function is the same as wasmtime_func_call except that it is asynchronous.
- * This is only compatible with stores associated with an asynchronous config.
- *
- * The result is a future that is owned by the caller and must be deleted via #wasmtime_call_future_delete. 
- *
- * The `args` and `results` pointers may be `NULL` if the corresponding length is zero.
- * The `trap_ret` and `error_ret` pointers may *not* be `NULL`.
- *
- * Does not take ownership of #wasmtime_val_t arguments or #wasmtime_val_t results,
- * and all parameters to this function must be kept alive and not modified until the
- * returned #wasmtime_call_future_t is deleted. This includes the context and store
- * parameters. Only a single future can be alive for a given store at a single time 
- * (meaning only call this function after the previous call's future was deleted).
- *
- * See the header documentation for for more information.
- *
- * For more information see the Rust documentation at
- * https://docs.wasmtime.dev/api/wasmtime/struct.Func.html#method.call_async
- */
-WASM_API_EXTERN wasmtime_call_future_t* wasmtime_func_call_async(
-    wasmtime_context_t *context,
-    const wasmtime_func_t *func,
-    const wasmtime_val_t *args,
-    size_t nargs,
-    wasmtime_val_t *results,
-    size_t nresults,
-    wasm_trap_t** trap_ret,
-    wasmtime_error_t** error_ret);
-
-/**
- * \brief Defines a new async function in this linker.
- *
- * This function behaves similar to #wasmtime_linker_define_func, except it supports async
- * callbacks.
- *
- * The callback `cb` will be invoked on another stack (fiber for Windows).
- */
-WASM_API_EXTERN wasmtime_error_t *wasmtime_linker_define_async_func(
-    wasmtime_linker_t *linker,
-    const char *module,
-    size_t module_len,
-    const char *name,
-    size_t name_len,
-    const wasm_functype_t *ty,
-    wasmtime_func_async_callback_t cb,
-    void *data,
-    void (*finalizer)(void *));
-
-/**
- * \brief Instantiates a #wasm_module_t with the items defined in this linker for an async store.
- *
- * This is the same as #wasmtime_linker_instantiate but used for async stores 
- * (which requires functions are called asynchronously). The returning #wasmtime_call_future_t 
- * must be polled using #wasmtime_call_future_poll, and is owned and must be deleted using #wasmtime_call_future_delete.
- *
- * The `trap_ret` and `error_ret` pointers may *not* be `NULL` and the returned memory is owned by the caller.
- *
- * All arguments to this function must outlive the returned future and be unmodified until the future is deleted.
- */
-WASM_API_EXTERN wasmtime_call_future_t *wasmtime_linker_instantiate_async(
-    const wasmtime_linker_t *linker,
-    wasmtime_context_t *store,
-    const wasmtime_module_t *module,
-    wasmtime_instance_t *instance,
-    wasm_trap_t** trap_ret,
-    wasmtime_error_t** error_ret);
-
-/**
- * \brief Instantiates instance within the given store.
- *
- * This will also run the function's startup function, if there is one.
- *
- * For more information on async instantiation see #wasmtime_linker_instantiate_async.
- *
- * \param instance_pre the pre-initialized instance
- * \param store the store in which to create the instance
- * \param instance where to store the returned instance
- * \param trap_ret where to store the returned trap
- * \param error_ret where to store the returned trap
- *
- * The `trap_ret` and `error_ret` pointers may *not* be `NULL` and the returned memory is owned by the caller.
- *
- * All arguments to this function must outlive the returned future and be unmodified until the future is deleted.
- */
-WASM_API_EXTERN wasmtime_call_future_t *wasmtime_instance_pre_instantiate_async(
-    const wasmtime_instance_pre_t* instance_pre,
-    wasmtime_context_t *store,
-    wasmtime_instance_t *instance,
-    wasm_trap_t** trap_ret,
-    wasmtime_error_t** error_ret);
-
-/**
- * A callback to get the top of the stack address and the length of the stack,
- * excluding guard pages.
- *
- * For more information about the parameters see the Rust documentation at
- * https://docs.wasmtime.dev/api/wasmtime/trait.StackMemory.html
- */
-typedef uint8_t *(*wasmtime_stack_memory_get_callback_t)(
-    void *env,
-    size_t *out_len);
-
-/**
- * A Stack instance created from a #wasmtime_new_stack_memory_callback_t.
- *
- * For more information see the Rust documentation at
- * https://docs.wasmtime.dev/api/wasmtime/trait.StackMemory.html
- */
-typedef struct {
-  /// User provided value to be passed to get_memory and grow_memory
-  void *env;
-  /// Callback to get the memory and size of this LinearMemory
-  wasmtime_stack_memory_get_callback_t get_stack_memory;
-  /// An optional finalizer for env
-  void (*finalizer)(void*);
-} wasmtime_stack_memory_t;
-
-/**
- * A callback to create a new StackMemory from the specified parameters.
- *
- * The result should be written to `stack_ret` and wasmtime will own the values written 
- * into that struct.
- *
- * This callback must be thread-safe.
- *
- * For more information about the parameters see the Rust documentation at
- * https://docs.wasmtime.dev/api/wasmtime/trait.StackCreator.html#tymethod.new_stack
- */
-typedef wasmtime_error_t *(*wasmtime_new_stack_memory_callback_t)(
-    void *env,
-    size_t size,
-    wasmtime_stack_memory_t *stack_ret);
-
-/**
- * A representation of custom stack creator.
- *
- * For more information see the Rust documentation at
- * https://docs.wasmtime.dev/api/wasmtime/trait.StackCreator.html
- */
-typedef struct {
-  /// User provided value to be passed to new_stack
-  void* env;
-  /// The callback to create a new stack, must be thread safe
-  wasmtime_new_stack_memory_callback_t new_stack;
-  /// An optional finalizer for env.
-  void (*finalizer)(void*);
-} wasmtime_stack_creator_t;
-
-/**
- * Sets a custom stack creator.
- *
- * Custom memory creators are used when creating creating async instance stacks for
- * the on-demand instance allocation strategy.
- *
- * The config does **not** take ownership of the #wasmtime_stack_creator_t passed in, but 
- * instead copies all the values in the struct.
- *
- * For more information see the Rust documentation at
- * https://docs.wasmtime.dev/api/wasmtime/struct.Config.html#method.with_host_stack
- */
-WASM_API_EXTERN void wasmtime_config_host_stack_creator_set(
-    wasm_config_t*,
-    wasmtime_stack_creator_t*);
-
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif // WASMTIME_ASYNC_H
-
diff --git a/crates/c-api/include/wasmtime/config.h b/crates/c-api/include/wasmtime/config.h
index b299d048ea8a..6ecebe7c04c7 100644
--- a/crates/c-api/include/wasmtime/config.h
+++ b/crates/c-api/include/wasmtime/config.h
@@ -367,115 +367,6 @@ WASM_API_EXTERN void wasmtime_config_cranelift_flag_enable(wasm_config_t*, const
  */
 WASM_API_EXTERN void wasmtime_config_cranelift_flag_set(wasm_config_t*, const char *key, const char *value);
 
-
-/**
- * Return the data from a LinearMemory instance.
- *
- * The size in bytes as well as the maximum number of bytes that can be allocated should be
- * returned as well.
- *
- * For more information about see the Rust documentation at
- * https://docs.wasmtime.dev/api/wasmtime/trait.LinearMemory.html
- */
-typedef uint8_t *(*wasmtime_memory_get_callback_t)(
-    void *env,
-    size_t *byte_size,
-    size_t *maximum_byte_size);
-
-/**
- * Grow the memory to the `new_size` in bytes.
- *
- * For more information about the parameters see the Rust documentation at
- * https://docs.wasmtime.dev/api/wasmtime/trait.LinearMemory.html#tymethod.grow_to
- */
-typedef wasmtime_error_t *(*wasmtime_memory_grow_callback_t)(
-    void *env,
-    size_t new_size);
-
-/**
- * A LinearMemory instance created from a #wasmtime_new_memory_callback_t.
- *
- * For more information see the Rust documentation at
- * https://docs.wasmtime.dev/api/wasmtime/trait.LinearMemory.html
- */
-typedef struct wasmtime_linear_memory {
-  /// User provided value to be passed to get_memory and grow_memory
-  void *env;
-  /// Callback to get the memory and size of this LinearMemory
-  wasmtime_memory_get_callback_t get_memory;
-  /// Callback to request growing the memory
-  wasmtime_memory_grow_callback_t grow_memory;
-  /// An optional finalizer for env
-  void (*finalizer)(void*);
-} wasmtime_linear_memory_t;
-
-/**
- * A callback to create a new LinearMemory from the specified parameters.
- *
- * The result should be written to `memory_ret` and wasmtime will own the values written
- * into that struct.
- *
- * This callback must be thread-safe.
- *
- * For more information about the parameters see the Rust documentation at
- * https://docs.wasmtime.dev/api/wasmtime/trait.MemoryCreator.html#tymethod.new_memory
- */
-typedef wasmtime_error_t *(*wasmtime_new_memory_callback_t)(
-    void *env,
-    const wasm_memorytype_t *ty,
-    size_t minimum,
-    size_t maximum,
-    size_t reserved_size_in_bytes,
-    size_t guard_size_in_bytes,
-    wasmtime_linear_memory_t *memory_ret);
-
-/**
- * A representation of custom memory creator and methods for an instance of LinearMemory.
- *
- * For more information see the Rust documentation at
- * https://docs.wasmtime.dev/api/wasmtime/trait.MemoryCreator.html
- */
-typedef struct wasmtime_memory_creator {
-  /// User provided value to be passed to new_memory
-  void* env;
-  /// The callback to create new memory, must be thread safe
-  wasmtime_new_memory_callback_t new_memory;
-  /// An optional finalizer for env.
-  void (*finalizer)(void*);
-} wasmtime_memory_creator_t;
-
-/**
- * Sets a custom memory creator.
- *
- * Custom memory creators are used when creating host Memory objects or when creating instance
- * linear memories for the on-demand instance allocation strategy.
- *
- * The config does **not** take ownership of the #wasmtime_memory_creator_t passed in, but
- * instead copies all the values in the struct.
- *
- * For more information see the Rust documentation at
- * https://docs.wasmtime.dev/api/wasmtime/struct.Config.html#method.with_host_memory
- */
-WASM_API_EXTERN void wasmtime_config_host_memory_creator_set(
-    wasm_config_t*,
-    wasmtime_memory_creator_t*);
-
-/**
- * \brief Configures whether copy-on-write memory-mapped data is used to initialize a linear memory.
- *
- * Initializing linear memory via a copy-on-write mapping can drastically improve instantiation costs
- * of a WebAssembly module because copying memory is deferred. Additionally if a page of memory is
- * only ever read from WebAssembly and never written too then the same underlying page of data will
- * be reused between all instantiations of a module meaning that if a module is instantiated many
- * times this can lower the overall memory required needed to run that module.
- *
- * This option defaults to true.
- *
- * For more information see the Rust documentation at
- * https://docs.wasmtime.dev/api/wasmtime/struct.Config.html#method.memory_init_cow
- */
-WASMTIME_CONFIG_PROP(void, memory_init_cow, bool)
-
 #ifdef __cplusplus
 }  // extern "C"
 #endif
diff --git a/crates/c-api/include/wasmtime/instance.h b/crates/c-api/include/wasmtime/instance.h
index 72f398ec9cff..544661f9d8fe 100644
--- a/crates/c-api/include/wasmtime/instance.h
+++ b/crates/c-api/include/wasmtime/instance.h
@@ -121,51 +121,6 @@ WASM_API_EXTERN bool wasmtime_instance_export_nth(
     wasmtime_extern_t *item
 );
 
-/**
- * \brief A #wasmtime_instance_t, pre-instantiation, that is ready to be instantiated.
- *
- * Must be deleted using #wasmtime_instance_pre_delete.
- *
- * For more information see the Rust documentation:
- * https://docs.wasmtime.dev/api/wasmtime/struct.InstancePre.html
- */
-typedef struct wasmtime_instance_pre wasmtime_instance_pre_t;
-
-/**
- * \brief Delete a previously created wasmtime_instance_pre_t.
- */
-WASM_API_EXTERN void
-wasmtime_instance_pre_delete(wasmtime_instance_pre_t *instance);
-
-/**
- * \brief Instantiates instance within the given store.
- *
- * This will also run the function's startup function, if there is one.
- *
- * For more information on instantiation see #wasmtime_instance_new.
- *
- * \param instance_pre the pre-initialized instance
- * \param store the store in which to create the instance
- * \param instance where to store the returned instance
- * \param trap_ptr where to store the returned trap
- *
- * \return One of three things can happen as a result of this function. First
- * the module could be successfully instantiated and returned through
- * `instance`, meaning the return value and `trap` are both set to `NULL`.
- * Second the start function may trap, meaning the return value and `instance`
- * are set to `NULL` and `trap` describes the trap that happens. Finally
- * instantiation may fail for another reason, in which case an error is returned
- * and `trap` and `instance` are set to `NULL`.
- *
- * This function does not take ownership of any of its arguments, and all return
- * values are owned by the caller.
- */
-WASM_API_EXTERN wasmtime_error_t* wasmtime_instance_pre_instantiate(
-    const wasmtime_instance_pre_t* instance_pre,
-    wasmtime_store_t *store,
-    wasmtime_instance_t* instance,
-    wasm_trap_t **trap_ptr);
-
 #ifdef __cplusplus
 }  // extern "C"
 #endif
diff --git a/crates/c-api/include/wasmtime/linker.h b/crates/c-api/include/wasmtime/linker.h
index 750c18d8558a..453ef73d64ea 100644
--- a/crates/c-api/include/wasmtime/linker.h
+++ b/crates/c-api/include/wasmtime/linker.h
@@ -292,24 +292,6 @@ WASM_API_EXTERN bool wasmtime_linker_get(
     wasmtime_extern_t *item
 );
 
-/**
- * \brief Preform all the checks for instantiating `module` with the linker,
- *        except that instantiation doesn't actually finish.
- *
- * \param linker the linker used to instantiate the provided module.
- * \param module the module that is being instantiated.
- * \param instance_pre the returned instance_pre, if successful.
- *
- * \return An error or `NULL` if successful.
- *
- * For more information see the Rust documentation at:
- * https://docs.wasmtime.dev/api/wasmtime/struct.Linker.html#method.instantiate_pre
- */
-WASM_API_EXTERN wasmtime_error_t* wasmtime_linker_instantiate_pre(
-    const wasmtime_linker_t *linker,
-    const wasmtime_module_t *module,
-    wasmtime_instance_pre_t **instance_pre);
-
 #ifdef __cplusplus
 }  // extern "C"
 #endif
diff --git a/crates/c-api/include/wasmtime/module.h b/crates/c-api/include/wasmtime/module.h
index 222239e81f66..8eca72a4899e 100644
--- a/crates/c-api/include/wasmtime/module.h
+++ b/crates/c-api/include/wasmtime/module.h
@@ -158,7 +158,7 @@ WASM_API_EXTERN wasmtime_error_t *wasmtime_module_deserialize_file(
  * For more details see: https://docs.wasmtime.dev/api/wasmtime/struct.Module.html#method.image_range
  */
 WASM_API_EXTERN void wasmtime_module_image_range(
-    const wasmtime_module_t *module,
+    const wasm_module_t *module,
     size_t *start,
     size_t *end
 );
diff --git a/crates/c-api/include/wasmtime/store.h b/crates/c-api/include/wasmtime/store.h
index 740d98a339f5..c86ac57234e6 100644
--- a/crates/c-api/include/wasmtime/store.h
+++ b/crates/c-api/include/wasmtime/store.h
@@ -148,7 +148,7 @@ WASM_API_EXTERN void wasmtime_context_set_data(wasmtime_context_t* context, void
 WASM_API_EXTERN void wasmtime_context_gc(wasmtime_context_t* context);
 
 /**
- * \brief Set fuel to this context's store for wasm to consume while executing.
+ * \brief Adds fuel to this context's store for wasm to consume while executing.
  *
  * For this method to work fuel consumption must be enabled via
  * #wasmtime_config_consume_fuel_set. By default a store starts with 0 fuel
@@ -156,24 +156,53 @@ WASM_API_EXTERN void wasmtime_context_gc(wasmtime_context_t* context);
  * This function must be called for the store to have
  * some fuel to allow WebAssembly to execute.
  *
- * Note that when fuel is entirely consumed it will cause wasm to trap.
+ * Note that at this time when fuel is entirely consumed it will cause
+ * wasm to trap. More usages of fuel are planned for the future.
  *
  * If fuel is not enabled within this store then an error is returned. If fuel
  * is successfully added then NULL is returned.
  */
-WASM_API_EXTERN wasmtime_error_t *wasmtime_context_set_fuel(wasmtime_context_t *store, uint64_t fuel);
+WASM_API_EXTERN wasmtime_error_t *wasmtime_context_add_fuel(wasmtime_context_t *store, uint64_t fuel);
 
 /**
- * \brief Returns the amount of fuel remaining in this context's store.
+ * \brief Returns the amount of fuel consumed by this context's store execution
+ * so far.
  *
  * If fuel consumption is not enabled via #wasmtime_config_consume_fuel_set
- * then this function will return an error. Otherwise `NULL` is returned and the
+ * then this function will return false. Otherwise true is returned and the
  * fuel parameter is filled in with fuel consumed so far.
  *
  * Also note that fuel, if enabled, must be originally configured via
- * #wasmtime_context_set_fuel.
+ * #wasmtime_context_add_fuel.
  */
-WASM_API_EXTERN wasmtime_error_t* wasmtime_context_get_fuel(const wasmtime_context_t *context, uint64_t *fuel);
+WASM_API_EXTERN bool wasmtime_context_fuel_consumed(const wasmtime_context_t *context, uint64_t *fuel);
+
+/**
+ * \brief Returns the amount of fuel remaining in this context's store execution
+ * before engine traps execution.
+ *
+ * If fuel consumption is not enabled via #wasmtime_config_consume_fuel_set
+ * then this function will return false. Otherwise true is returned and the
+ * fuel parameter is filled in with remaining fuel.
+ *
+ * Also note that fuel, if enabled, must be originally configured via
+ * #wasmtime_context_add_fuel.
+ */
+WASM_API_EXTERN bool wasmtime_context_fuel_remaining(const wasmtime_context_t *context, uint64_t *fuel);
+
+/**
+ * \brief Attempt to manually consume fuel from the store.
+ *
+ * If fuel consumption is not enabled via #wasmtime_config_consume_fuel_set then
+ * this function will return an error. Otherwise this will attempt to consume
+ * the specified amount of `fuel` from the store. If successful the remaining
+ * amount of fuel is stored into `remaining`. If `fuel` couldn't be consumed
+ * then an error is returned.
+ *
+ * Also note that fuel, if enabled, must be originally configured via
+ * #wasmtime_context_add_fuel.
+ */
+WASM_API_EXTERN wasmtime_error_t *wasmtime_context_consume_fuel(wasmtime_context_t *context, uint64_t fuel, uint64_t *remaining);
 
 /**
  * \brief Configures WASI state within the specified store.
diff --git a/crates/c-api/src/async.rs b/crates/c-api/src/async.rs
deleted file mode 100644
index ffd9b10c1048..000000000000
--- a/crates/c-api/src/async.rs
+++ /dev/null
@@ -1,433 +0,0 @@
-use std::ffi::c_void;
-use std::future::Future;
-use std::mem::{self, MaybeUninit};
-use std::num::NonZeroU64;
-use std::ops::Range;
-use std::pin::Pin;
-use std::sync::Arc;
-use std::task::{Context, Poll};
-use std::{ptr, str};
-
-use wasmtime::{
-    AsContextMut, Caller, Func, Instance, Result, StackCreator, StackMemory, Trap, Val,
-};
-
-use crate::{
-    bad_utf8, handle_result, to_str, translate_args, wasm_config_t, wasm_functype_t, wasm_trap_t,
-    wasmtime_caller_t, wasmtime_error_t, wasmtime_instance_pre_t, wasmtime_linker_t,
-    wasmtime_module_t, wasmtime_val_t, wasmtime_val_union, CStoreContextMut, WASMTIME_I32,
-};
-
-#[no_mangle]
-pub extern "C" fn wasmtime_config_async_support_set(c: &mut wasm_config_t, enable: bool) {
-    c.config.async_support(enable);
-}
-
-#[no_mangle]
-pub extern "C" fn wasmtime_config_async_stack_size_set(c: &mut wasm_config_t, size: usize) {
-    c.config.async_stack_size(size);
-}
-
-#[no_mangle]
-pub extern "C" fn wasmtime_context_epoch_deadline_async_yield_and_update(
-    mut store: CStoreContextMut<'_>,
-    delta: u64,
-) {
-    store.epoch_deadline_async_yield_and_update(delta);
-}
-
-#[no_mangle]
-pub extern "C" fn wasmtime_context_fuel_async_yield_interval(
-    mut store: CStoreContextMut<'_>,
-    interval: Option<NonZeroU64>,
-) -> Option<Box<wasmtime_error_t>> {
-    handle_result(
-        store.fuel_async_yield_interval(interval.map(|n| n.get())),
-        |()| {},
-    )
-}
-
-pub type wasmtime_func_async_callback_t = extern "C" fn(
-    *mut c_void,
-    *mut wasmtime_caller_t,
-    *const wasmtime_val_t,
-    usize,
-    *mut wasmtime_val_t,
-    usize,
-    &mut Option<Box<wasm_trap_t>>,
-    &mut wasmtime_async_continuation_t,
-);
-
-#[repr(C)]
-pub struct wasmtime_async_continuation_t {
-    pub callback: wasmtime_func_async_continuation_callback_t,
-    pub env: *mut c_void,
-    pub finalizer: Option<extern "C" fn(*mut c_void)>,
-}
-
-unsafe impl Send for wasmtime_async_continuation_t {}
-unsafe impl Sync for wasmtime_async_continuation_t {}
-impl Drop for wasmtime_async_continuation_t {
-    fn drop(&mut self) {
-        if let Some(f) = self.finalizer {
-            f(self.env);
-        }
-    }
-}
-impl Future for wasmtime_async_continuation_t {
-    type Output = ();
-    fn poll(self: Pin<&mut Self>, _cx: &mut Context) -> Poll<Self::Output> {
-        let this = self.get_mut();
-        let cb = this.callback;
-        if cb(this.env) {
-            Poll::Ready(())
-        } else {
-            Poll::Pending
-        }
-    }
-}
-
-pub type wasmtime_func_async_continuation_callback_t = extern "C" fn(*mut c_void) -> bool;
-
-struct CallbackData {
-    env: *mut c_void,
-}
-unsafe impl Send for CallbackData {}
-
-async fn invoke_c_async_callback<'a>(
-    cb: wasmtime_func_async_callback_t,
-    data: CallbackData,
-    mut caller: Caller<'a, crate::StoreData>,
-    params: &'a [Val],
-    results: &'a mut [Val],
-) -> Result<()> {
-    // Convert `params/results` to `wasmtime_val_t`. Use the previous
-    // storage in `hostcall_val_storage` to help avoid allocations all the
-    // time.
-    let mut hostcall_val_storage = mem::take(&mut caller.data_mut().hostcall_val_storage);
-    debug_assert!(hostcall_val_storage.is_empty());
-    hostcall_val_storage.reserve(params.len() + results.len());
-    hostcall_val_storage.extend(params.iter().cloned().map(|p| wasmtime_val_t::from_val(p)));
-    hostcall_val_storage.extend((0..results.len()).map(|_| wasmtime_val_t {
-        kind: WASMTIME_I32,
-        of: wasmtime_val_union { i32: 0 },
-    }));
-    let (params, out_results) = hostcall_val_storage.split_at_mut(params.len());
-
-    // Invoke the C function pointer.
-    // The result will be a continutation which we will wrap in a Future.
-    let mut caller = wasmtime_caller_t { caller };
-    let mut trap = None;
-    extern "C" fn panic_callback(_: *mut c_void) -> bool {
-        panic!("callback must be set")
-    }
-    let mut continuation = wasmtime_async_continuation_t {
-        callback: panic_callback,
-        env: ptr::null_mut(),
-        finalizer: None,
-    };
-    cb(
-        data.env,
-        &mut caller,
-        params.as_ptr(),
-        params.len(),
-        out_results.as_mut_ptr(),
-        out_results.len(),
-        &mut trap,
-        &mut continuation,
-    );
-    continuation.await;
-
-    if let Some(trap) = trap {
-        return Err(trap.error);
-    }
-
-    // Translate the `wasmtime_val_t` results into the `results` space
-    for (i, result) in out_results.iter().enumerate() {
-        unsafe {
-            results[i] = result.to_val();
-        }
-    }
-    // Move our `vals` storage back into the store now that we no longer
-    // need it. This'll get picked up by the next hostcall and reuse our
-    // same storage.
-    hostcall_val_storage.truncate(0);
-    caller.caller.data_mut().hostcall_val_storage = hostcall_val_storage;
-    Ok(())
-}
-
-unsafe fn c_async_callback_to_rust_fn(
-    callback: wasmtime_func_async_callback_t,
-    data: *mut c_void,
-    finalizer: Option<extern "C" fn(*mut std::ffi::c_void)>,
-) -> impl for<'a> Fn(
-    Caller<'a, crate::StoreData>,
-    &'a [Val],
-    &'a mut [Val],
-) -> Box<dyn Future<Output = Result<()>> + Send + 'a>
-       + Send
-       + Sync
-       + 'static {
-    let foreign = crate::ForeignData { data, finalizer };
-    move |caller, params, results| {
-        let _ = &foreign; // move entire foreign into this closure
-        let data = CallbackData { env: foreign.data };
-        Box::new(invoke_c_async_callback(
-            callback, data, caller, params, results,
-        ))
-    }
-}
-
-#[repr(transparent)]
-pub struct wasmtime_call_future_t<'a> {
-    underlying: Pin<Box<dyn Future<Output = ()> + 'a>>,
-}
-
-#[no_mangle]
-pub extern "C" fn wasmtime_call_future_delete(_future: Box<wasmtime_call_future_t>) {}
-
-#[no_mangle]
-pub extern "C" fn wasmtime_call_future_poll(future: &mut wasmtime_call_future_t) -> bool {
-    let w = futures::task::noop_waker_ref();
-    match future.underlying.as_mut().poll(&mut Context::from_waker(w)) {
-        Poll::Ready(()) => true,
-        Poll::Pending => false,
-    }
-}
-
-fn handle_call_error(
-    err: wasmtime::Error,
-    trap_ret: &mut *mut wasm_trap_t,
-    err_ret: &mut *mut wasmtime_error_t,
-) {
-    if err.is::<Trap>() {
-        *trap_ret = Box::into_raw(Box::new(wasm_trap_t::new(err)));
-    } else {
-        *err_ret = Box::into_raw(Box::new(wasmtime_error_t::from(err)));
-    }
-}
-
-async fn do_func_call_async(
-    mut store: CStoreContextMut<'_>,
-    func: &Func,
-    args: impl ExactSizeIterator<Item = Val>,
-    results: &mut [MaybeUninit<wasmtime_val_t>],
-    trap_ret: &mut *mut wasm_trap_t,
-    err_ret: &mut *mut wasmtime_error_t,
-) {
-    let mut store = store.as_context_mut();
-    let mut params = mem::take(&mut store.data_mut().wasm_val_storage);
-    let (wt_params, wt_results) = translate_args(&mut params, args, results.len());
-    let result = func.call_async(&mut store, wt_params, wt_results).await;
-
-    match result {
-        Ok(()) => {
-            for (slot, val) in results.iter_mut().zip(wt_results.iter()) {
-                crate::initialize(slot, wasmtime_val_t::from_val(val.clone()));
-            }
-            params.truncate(0);
-            store.data_mut().wasm_val_storage = params;
-        }
-        Err(err) => handle_call_error(err, trap_ret, err_ret),
-    }
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn wasmtime_func_call_async<'a>(
-    store: CStoreContextMut<'a>,
-    func: &'a Func,
-    args: *const wasmtime_val_t,
-    nargs: usize,
-    results: *mut MaybeUninit<wasmtime_val_t>,
-    nresults: usize,
-    trap_ret: &'a mut *mut wasm_trap_t,
-    err_ret: &'a mut *mut wasmtime_error_t,
-) -> Box<wasmtime_call_future_t<'a>> {
-    let args = crate::slice_from_raw_parts(args, nargs)
-        .iter()
-        .map(|i| i.to_val());
-    let results = crate::slice_from_raw_parts_mut(results, nresults);
-    let fut = Box::pin(do_func_call_async(
-        store, func, args, results, trap_ret, err_ret,
-    ));
-    Box::new(wasmtime_call_future_t { underlying: fut })
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn wasmtime_linker_define_async_func(
-    linker: &mut wasmtime_linker_t,
-    module: *const u8,
-    module_len: usize,
-    name: *const u8,
-    name_len: usize,
-    ty: &wasm_functype_t,
-    callback: crate::wasmtime_func_async_callback_t,
-    data: *mut c_void,
-    finalizer: Option<extern "C" fn(*mut std::ffi::c_void)>,
-) -> Option<Box<wasmtime_error_t>> {
-    let ty = ty.ty().ty.clone();
-    let module = to_str!(module, module_len);
-    let name = to_str!(name, name_len);
-    let cb = c_async_callback_to_rust_fn(callback, data, finalizer);
-
-    handle_result(
-        linker.linker.func_new_async(module, name, ty, cb),
-        |_linker| (),
-    )
-}
-
-async fn do_linker_instantiate_async(
-    linker: &wasmtime_linker_t,
-    store: CStoreContextMut<'_>,
-    module: &wasmtime_module_t,
-    instance_ptr: &mut Instance,
-    trap_ret: &mut *mut wasm_trap_t,
-    err_ret: &mut *mut wasmtime_error_t,
-) {
-    let result = linker.linker.instantiate_async(store, &module.module).await;
-    match result {
-        Ok(instance) => *instance_ptr = instance,
-        Err(err) => handle_call_error(err, trap_ret, err_ret),
-    }
-}
-
-#[no_mangle]
-pub extern "C" fn wasmtime_linker_instantiate_async<'a>(
-    linker: &'a wasmtime_linker_t,
-    store: CStoreContextMut<'a>,
-    module: &'a wasmtime_module_t,
-    instance_ptr: &'a mut Instance,
-    trap_ret: &'a mut *mut wasm_trap_t,
-    err_ret: &'a mut *mut wasmtime_error_t,
-) -> Box<crate::wasmtime_call_future_t<'a>> {
-    let fut = Box::pin(do_linker_instantiate_async(
-        linker,
-        store,
-        module,
-        instance_ptr,
-        trap_ret,
-        err_ret,
-    ));
-    Box::new(crate::wasmtime_call_future_t { underlying: fut })
-}
-
-async fn do_instance_pre_instantiate_async(
-    instance_pre: &wasmtime_instance_pre_t,
-    store: CStoreContextMut<'_>,
-    instance_ptr: &mut Instance,
-    trap_ret: &mut *mut wasm_trap_t,
-    err_ret: &mut *mut wasmtime_error_t,
-) {
-    let result = instance_pre.underlying.instantiate_async(store).await;
-    match result {
-        Ok(instance) => *instance_ptr = instance,
-        Err(err) => handle_call_error(err, trap_ret, err_ret),
-    }
-}
-
-#[no_mangle]
-pub extern "C" fn wasmtime_instance_pre_instantiate_async<'a>(
-    instance_pre: &'a wasmtime_instance_pre_t,
-    store: CStoreContextMut<'a>,
-    instance_ptr: &'a mut Instance,
-    trap_ret: &'a mut *mut wasm_trap_t,
-    err_ret: &'a mut *mut wasmtime_error_t,
-) -> Box<crate::wasmtime_call_future_t<'a>> {
-    let fut = Box::pin(do_instance_pre_instantiate_async(
-        instance_pre,
-        store,
-        instance_ptr,
-        trap_ret,
-        err_ret,
-    ));
-    Box::new(crate::wasmtime_call_future_t { underlying: fut })
-}
-
-pub type wasmtime_stack_memory_get_callback_t =
-    extern "C" fn(env: *mut std::ffi::c_void, out_len: &mut usize) -> *mut u8;
-
-#[repr(C)]
-pub struct wasmtime_stack_memory_t {
-    env: *mut std::ffi::c_void,
-    get_stack_memory: wasmtime_stack_memory_get_callback_t,
-    finalizer: Option<extern "C" fn(arg1: *mut std::ffi::c_void)>,
-}
-
-struct CHostStackMemory {
-    foreign: crate::ForeignData,
-    get_memory: wasmtime_stack_memory_get_callback_t,
-}
-unsafe impl Send for CHostStackMemory {}
-unsafe impl Sync for CHostStackMemory {}
-unsafe impl StackMemory for CHostStackMemory {
-    fn top(&self) -> *mut u8 {
-        let mut len = 0;
-        let cb = self.get_memory;
-        cb(self.foreign.data, &mut len)
-    }
-    fn range(&self) -> Range<usize> {
-        let mut len = 0;
-        let cb = self.get_memory;
-        let top = cb(self.foreign.data, &mut len);
-        let base = unsafe { top.sub(len) as usize };
-        base..base + len
-    }
-}
-
-pub type wasmtime_new_stack_memory_callback_t = extern "C" fn(
-    env: *mut std::ffi::c_void,
-    size: usize,
-    stack_ret: &mut wasmtime_stack_memory_t,
-) -> Option<Box<wasmtime_error_t>>;
-
-#[repr(C)]
-pub struct wasmtime_stack_creator_t {
-    env: *mut std::ffi::c_void,
-    new_stack: wasmtime_new_stack_memory_callback_t,
-    finalizer: Option<extern "C" fn(arg1: *mut std::ffi::c_void)>,
-}
-
-struct CHostStackCreator {
-    foreign: crate::ForeignData,
-    new_stack: wasmtime_new_stack_memory_callback_t,
-}
-unsafe impl Send for CHostStackCreator {}
-unsafe impl Sync for CHostStackCreator {}
-unsafe impl StackCreator for CHostStackCreator {
-    fn new_stack(&self, size: usize) -> Result<Box<dyn wasmtime::StackMemory>> {
-        extern "C" fn panic_callback(_env: *mut std::ffi::c_void, _out_len: &mut usize) -> *mut u8 {
-            panic!("a callback must be set");
-        }
-        let mut out = wasmtime_stack_memory_t {
-            env: ptr::null_mut(),
-            get_stack_memory: panic_callback,
-            finalizer: None,
-        };
-        let cb = self.new_stack;
-        let result = cb(self.foreign.data, size, &mut out);
-        match result {
-            Some(error) => Err((*error).into()),
-            None => Ok(Box::new(CHostStackMemory {
-                foreign: crate::ForeignData {
-                    data: out.env,
-                    finalizer: out.finalizer,
-                },
-                get_memory: out.get_stack_memory,
-            })),
-        }
-    }
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn wasmtime_config_host_stack_creator_set(
-    c: &mut wasm_config_t,
-    creator: &wasmtime_stack_creator_t,
-) {
-    c.config.with_host_stack(Arc::new(CHostStackCreator {
-        foreign: crate::ForeignData {
-            data: creator.env,
-            finalizer: creator.finalizer,
-        },
-        new_stack: creator.new_stack,
-    }));
-}
diff --git a/crates/c-api/src/config.rs b/crates/c-api/src/config.rs
index 201e0519665e..fcd9fb4166f3 100644
--- a/crates/c-api/src/config.rs
+++ b/crates/c-api/src/config.rs
@@ -2,14 +2,10 @@
 // them with the default set of features enabled.
 #![cfg_attr(not(feature = "cache"), allow(unused_imports))]
 
-use crate::{handle_result, wasm_memorytype_t, wasmtime_error_t};
-use std::ops::Range;
+use crate::{handle_result, wasmtime_error_t};
+use std::ffi::CStr;
 use std::os::raw::c_char;
-use std::ptr;
-use std::{ffi::CStr, sync::Arc};
-use wasmtime::{
-    Config, LinearMemory, MemoryCreator, OptLevel, ProfilingStrategy, Result, Strategy,
-};
+use wasmtime::{Config, OptLevel, ProfilingStrategy, Strategy};
 
 #[repr(C)]
 #[derive(Clone)]
@@ -259,173 +255,3 @@ pub unsafe extern "C" fn wasmtime_config_cranelift_flag_set(
     let value = CStr::from_ptr(value).to_str().expect("not valid utf-8");
     c.config.cranelift_flag_set(flag, value);
 }
-
-pub type wasmtime_memory_get_callback_t = extern "C" fn(
-    env: *mut std::ffi::c_void,
-    byte_size: &mut usize,
-    maximum_byte_size: &mut usize,
-) -> *mut u8;
-
-pub type wasmtime_memory_grow_callback_t =
-    extern "C" fn(env: *mut std::ffi::c_void, new_size: usize) -> Option<Box<wasmtime_error_t>>;
-
-#[repr(C)]
-pub struct wasmtime_linear_memory_t {
-    env: *mut std::ffi::c_void,
-    get_memory: wasmtime_memory_get_callback_t,
-    grow_memory: wasmtime_memory_grow_callback_t,
-    finalizer: Option<extern "C" fn(arg1: *mut std::ffi::c_void)>,
-}
-
-pub type wasmtime_new_memory_callback_t = extern "C" fn(
-    env: *mut std::ffi::c_void,
-    ty: &wasm_memorytype_t,
-    minimum: usize,
-    maximum: usize,
-    reserved_size_in_bytes: usize,
-    guard_size_in_bytes: usize,
-    memory_ret: *mut wasmtime_linear_memory_t,
-) -> Option<Box<wasmtime_error_t>>;
-
-struct CHostLinearMemory {
-    foreign: crate::ForeignData,
-    get_memory: wasmtime_memory_get_callback_t,
-    grow_memory: wasmtime_memory_grow_callback_t,
-}
-
-unsafe impl LinearMemory for CHostLinearMemory {
-    fn byte_size(&self) -> usize {
-        let mut byte_size = 0;
-        let mut maximum_byte_size = 0;
-        let cb = self.get_memory;
-        cb(self.foreign.data, &mut byte_size, &mut maximum_byte_size);
-        return byte_size;
-    }
-    fn maximum_byte_size(&self) -> Option<usize> {
-        let mut byte_size = 0;
-        let mut maximum_byte_size = 0;
-        let cb = self.get_memory;
-        cb(self.foreign.data, &mut byte_size, &mut maximum_byte_size);
-        if maximum_byte_size == 0 {
-            None
-        } else {
-            Some(maximum_byte_size)
-        }
-    }
-    fn as_ptr(&self) -> *mut u8 {
-        let mut byte_size = 0;
-        let mut maximum_byte_size = 0;
-        let cb = self.get_memory;
-        cb(self.foreign.data, &mut byte_size, &mut maximum_byte_size)
-    }
-    fn wasm_accessible(&self) -> Range<usize> {
-        let mut byte_size = 0;
-        let mut maximum_byte_size = 0;
-        let cb = self.get_memory;
-        let ptr = cb(self.foreign.data, &mut byte_size, &mut maximum_byte_size);
-        Range {
-            start: ptr as usize,
-            end: ptr as usize + byte_size,
-        }
-    }
-    fn grow_to(&mut self, new_size: usize) -> Result<()> {
-        let cb = self.grow_memory;
-        let error = cb(self.foreign.data, new_size);
-        if let Some(err) = error {
-            Err((*err).into())
-        } else {
-            Ok(())
-        }
-    }
-}
-
-#[repr(C)]
-pub struct wasmtime_memory_creator_t {
-    env: *mut std::ffi::c_void,
-    new_memory: wasmtime_new_memory_callback_t,
-    finalizer: Option<extern "C" fn(arg1: *mut std::ffi::c_void)>,
-}
-
-struct CHostMemoryCreator {
-    foreign: crate::ForeignData,
-    new_memory: wasmtime_new_memory_callback_t,
-}
-unsafe impl Send for CHostMemoryCreator {}
-unsafe impl Sync for CHostMemoryCreator {}
-
-unsafe impl MemoryCreator for CHostMemoryCreator {
-    fn new_memory(
-        &self,
-        ty: wasmtime::MemoryType,
-        minimum: usize,
-        maximum: Option<usize>,
-        reserved_size_in_bytes: Option<usize>,
-        guard_size_in_bytes: usize,
-    ) -> Result<Box<dyn wasmtime::LinearMemory>, String> {
-        extern "C" fn panic_get_callback(
-            _env: *mut std::ffi::c_void,
-            _byte_size: &mut usize,
-            _maximum_byte_size: &mut usize,
-        ) -> *mut u8 {
-            panic!("a callback must be set");
-        }
-        extern "C" fn panic_grow_callback(
-            _env: *mut std::ffi::c_void,
-            _size: usize,
-        ) -> Option<Box<wasmtime_error_t>> {
-            panic!("a callback must be set");
-        }
-        let mut memory = wasmtime_linear_memory_t {
-            env: ptr::null_mut(),
-            get_memory: panic_get_callback,
-            grow_memory: panic_grow_callback,
-            finalizer: None,
-        };
-        let cb = self.new_memory;
-        let error = cb(
-            self.foreign.data,
-            &wasm_memorytype_t::new(ty),
-            minimum,
-            maximum.unwrap_or(usize::MAX),
-            reserved_size_in_bytes.unwrap_or(0),
-            guard_size_in_bytes,
-            &mut memory,
-        );
-        match error {
-            None => {
-                let foreign = crate::ForeignData {
-                    data: memory.env,
-                    finalizer: memory.finalizer,
-                };
-                Ok(Box::new(CHostLinearMemory {
-                    foreign,
-                    get_memory: memory.get_memory,
-                    grow_memory: memory.grow_memory,
-                }))
-            }
-            Some(err) => {
-                let err: anyhow::Error = (*err).into();
-                Err(format!("{}", err))
-            }
-        }
-    }
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn wasmtime_config_host_memory_creator_set(
-    c: &mut wasm_config_t,
-    creator: &wasmtime_memory_creator_t,
-) {
-    c.config.with_host_memory(Arc::new(CHostMemoryCreator {
-        foreign: crate::ForeignData {
-            data: creator.env,
-            finalizer: creator.finalizer,
-        },
-        new_memory: creator.new_memory,
-    }));
-}
-
-#[no_mangle]
-pub extern "C" fn wasmtime_config_memory_init_cow_set(c: &mut wasm_config_t, enable: bool) {
-    c.config.memory_init_cow(enable);
-}
diff --git a/crates/c-api/src/engine.rs b/crates/c-api/src/engine.rs
index 06a2b1b3f4c3..67785fc03fc5 100644
--- a/crates/c-api/src/engine.rs
+++ b/crates/c-api/src/engine.rs
@@ -19,7 +19,6 @@ pub extern "C" fn wasm_engine_new() -> Box<wasm_engine_t> {
     // Note that we `drop` the result here since this fails after the first
     // initialization attempt. We don't mind that though because this function
     // can be called multiple times, so we just ignore the result.
-    #[cfg(feature = "logging")]
     drop(env_logger::try_init());
 
     Box::new(wasm_engine_t {
diff --git a/crates/c-api/src/func.rs b/crates/c-api/src/func.rs
index 8fbec441da29..31da871ae7c7 100644
--- a/crates/c-api/src/func.rs
+++ b/crates/c-api/src/func.rs
@@ -113,7 +113,7 @@ pub unsafe extern "C" fn wasm_func_new_with_env(
 
 /// Places the `args` into `dst` and additionally reserves space in `dst` for `results_size`
 /// returns. The params/results slices are then returned separately.
-pub(crate) fn translate_args<'a>(
+fn translate_args<'a>(
     dst: &'a mut Vec<Val>,
     args: impl ExactSizeIterator<Item = Val>,
     results_size: usize,
@@ -200,7 +200,7 @@ pub extern "C" fn wasm_func_as_extern_const(f: &wasm_func_t) -> &wasm_extern_t {
 
 #[repr(C)]
 pub struct wasmtime_caller_t<'a> {
-    pub(crate) caller: Caller<'a, crate::StoreData>,
+    caller: Caller<'a, crate::StoreData>,
 }
 
 pub type wasmtime_func_callback_t = extern "C" fn(
diff --git a/crates/c-api/src/instance.rs b/crates/c-api/src/instance.rs
index b8ae5bc82341..13fb96a36914 100644
--- a/crates/c-api/src/instance.rs
+++ b/crates/c-api/src/instance.rs
@@ -1,9 +1,9 @@
 use crate::{
     wasm_extern_t, wasm_extern_vec_t, wasm_module_t, wasm_store_t, wasm_trap_t, wasmtime_error_t,
-    wasmtime_extern_t, wasmtime_module_t, CStoreContextMut, StoreData, StoreRef,
+    wasmtime_extern_t, wasmtime_module_t, CStoreContextMut, StoreRef,
 };
 use std::mem::MaybeUninit;
-use wasmtime::{Instance, InstancePre, Trap};
+use wasmtime::{Instance, Trap};
 
 #[derive(Clone)]
 pub struct wasm_instance_t {
@@ -150,23 +150,3 @@ pub unsafe extern "C" fn wasmtime_instance_export_nth(
         None => false,
     }
 }
-
-#[repr(transparent)]
-pub struct wasmtime_instance_pre_t {
-    pub(crate) underlying: InstancePre<StoreData>,
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn wasmtime_instance_pre_delete(_instance_pre: Box<wasmtime_instance_pre_t>) {
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn wasmtime_instance_pre_instantiate(
-    instance_pre: &wasmtime_instance_pre_t,
-    store: CStoreContextMut<'_>,
-    instance_ptr: &mut Instance,
-    trap_ptr: &mut *mut wasm_trap_t,
-) -> Option<Box<wasmtime_error_t>> {
-    let result = instance_pre.underlying.instantiate(store);
-    handle_instantiate(result, instance_ptr, trap_ptr)
-}
diff --git a/crates/c-api/src/lib.rs b/crates/c-api/src/lib.rs
index fb686427e6d6..4bc111b5dc1b 100644
--- a/crates/c-api/src/lib.rs
+++ b/crates/c-api/src/lib.rs
@@ -11,8 +11,6 @@
 
 #![allow(non_snake_case, non_camel_case_types, non_upper_case_globals)]
 
-pub use wasmtime;
-
 mod config;
 mod engine;
 mod error;
@@ -49,11 +47,6 @@ pub use crate::types::*;
 pub use crate::val::*;
 pub use crate::vec::*;
 
-#[cfg(feature = "async")]
-mod r#async;
-#[cfg(feature = "async")]
-pub use crate::r#async::*;
-
 #[cfg(feature = "wasi")]
 mod wasi;
 #[cfg(feature = "wasi")]
diff --git a/crates/c-api/src/linker.rs b/crates/c-api/src/linker.rs
index 7cf9391d8f8a..05c274ef9eb3 100644
--- a/crates/c-api/src/linker.rs
+++ b/crates/c-api/src/linker.rs
@@ -1,6 +1,6 @@
 use crate::{
     bad_utf8, handle_result, wasm_engine_t, wasm_functype_t, wasm_trap_t, wasmtime_error_t,
-    wasmtime_extern_t, wasmtime_instance_pre_t, wasmtime_module_t, CStoreContext, CStoreContextMut,
+    wasmtime_extern_t, wasmtime_module_t, CStoreContext, CStoreContextMut,
 };
 use std::ffi::c_void;
 use std::mem::MaybeUninit;
@@ -9,7 +9,7 @@ use wasmtime::{Func, Instance, Linker};
 
 #[repr(C)]
 pub struct wasmtime_linker_t {
-    pub(crate) linker: Linker<crate::StoreData>,
+    linker: Linker<crate::StoreData>,
 }
 
 wasmtime_c_api_macros::declare_own!(wasmtime_linker_t);
@@ -38,8 +38,6 @@ macro_rules! to_str {
     };
 }
 
-pub(crate) use to_str;
-
 #[no_mangle]
 pub unsafe extern "C" fn wasmtime_linker_define(
     linker: &mut wasmtime_linker_t,
@@ -138,19 +136,6 @@ pub extern "C" fn wasmtime_linker_instantiate(
     super::instance::handle_instantiate(result, instance_ptr, trap_ptr)
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn wasmtime_linker_instantiate_pre(
-    linker: &wasmtime_linker_t,
-    module: &wasmtime_module_t,
-    instance_ptr: &mut *mut wasmtime_instance_pre_t,
-) -> Option<Box<wasmtime_error_t>> {
-    let linker = &linker.linker;
-    handle_result(linker.instantiate_pre(&module.module), |i| {
-        let instance_pre = Box::new(wasmtime_instance_pre_t { underlying: i });
-        *instance_ptr = Box::into_raw(instance_pre)
-    })
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn wasmtime_linker_module(
     linker: &mut wasmtime_linker_t,
diff --git a/crates/c-api/src/store.rs b/crates/c-api/src/store.rs
index 844357fb2f8f..d56977619888 100644
--- a/crates/c-api/src/store.rs
+++ b/crates/c-api/src/store.rs
@@ -209,20 +209,46 @@ pub extern "C" fn wasmtime_context_gc(mut context: CStoreContextMut<'_>) {
 }
 
 #[no_mangle]
-pub extern "C" fn wasmtime_context_set_fuel(
+pub extern "C" fn wasmtime_context_add_fuel(
     mut store: CStoreContextMut<'_>,
     fuel: u64,
 ) -> Option<Box<wasmtime_error_t>> {
-    crate::handle_result(store.set_fuel(fuel), |()| {})
+    crate::handle_result(store.add_fuel(fuel), |()| {})
 }
 
 #[no_mangle]
-pub extern "C" fn wasmtime_context_get_fuel(
-    store: CStoreContext<'_>,
+pub extern "C" fn wasmtime_context_fuel_consumed(store: CStoreContext<'_>, fuel: &mut u64) -> bool {
+    match store.fuel_consumed() {
+        Some(amt) => {
+            *fuel = amt;
+            true
+        }
+        None => false,
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn wasmtime_context_fuel_remaining(
+    store: CStoreContextMut<'_>,
     fuel: &mut u64,
+) -> bool {
+    match store.fuel_remaining() {
+        Some(remaining) => {
+            *fuel = remaining;
+            true
+        }
+        None => false,
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn wasmtime_context_consume_fuel(
+    mut store: CStoreContextMut<'_>,
+    fuel: u64,
+    remaining_fuel: &mut u64,
 ) -> Option<Box<wasmtime_error_t>> {
-    crate::handle_result(store.get_fuel(), |amt| {
-        *fuel = amt;
+    crate::handle_result(store.consume_fuel(fuel), |remaining| {
+        *remaining_fuel = remaining;
     })
 }
 
diff --git a/crates/c-api/src/trap.rs b/crates/c-api/src/trap.rs
index f2a4a64b6082..44b9dfb6043b 100644
--- a/crates/c-api/src/trap.rs
+++ b/crates/c-api/src/trap.rs
@@ -167,8 +167,7 @@ pub extern "C" fn wasmtime_frame_module_name<'a>(
         .module_name
         .get_or_init(|| {
             frame.trace.frames()[frame.idx]
-                .module()
-                .name()
+                .module_name()
                 .map(|s| wasm_name_t::from(s.to_string().into_bytes()))
         })
         .as_ref()
diff --git a/crates/cli-flags/Cargo.toml b/crates/cli-flags/Cargo.toml
index 0b76652200e5..e15b4d14f149 100644
--- a/crates/cli-flags/Cargo.toml
+++ b/crates/cli-flags/Cargo.toml
@@ -11,17 +11,19 @@ edition.workspace = true
 [dependencies]
 anyhow = { workspace = true }
 clap = { workspace = true }
-file-per-thread-logger = { workspace = true, optional = true }
-tracing-subscriber = { workspace = true, optional = true }
-rayon = { version = "1.5.0", optional = true }
+file-per-thread-logger = { workspace = true }
+pretty_env_logger = { workspace = true }
+rayon = "1.5.0"
 wasmtime = { workspace = true }
 humantime = "2.0.0"
 
 [features]
+default = [
+    "wasmtime/cache",
+    "wasmtime/cranelift",
+    "wasmtime/jitdump",
+    "wasmtime/vtune",
+    "wasmtime/parallel-compilation",
+]
 pooling-allocator = []
 component-model = ["wasmtime/component-model"]
-cache = ["wasmtime/cache"]
-parallel-compilation = ["wasmtime/parallel-compilation", "dep:rayon"]
-logging = ["dep:file-per-thread-logger", "dep:tracing-subscriber"]
-cranelift = ["wasmtime/cranelift"]
-coredump = ["wasmtime/coredump"]
diff --git a/crates/cli-flags/src/lib.rs b/crates/cli-flags/src/lib.rs
index 31b0232b22d8..9df8c1147ab8 100644
--- a/crates/cli-flags/src/lib.rs
+++ b/crates/cli-flags/src/lib.rs
@@ -10,7 +10,6 @@ use wasmtime::Config;
 
 pub mod opt;
 
-#[cfg(feature = "logging")]
 fn init_file_per_thread_logger(prefix: &'static str) {
     file_per_thread_logger::initialize(prefix);
 
@@ -18,7 +17,6 @@ fn init_file_per_thread_logger(prefix: &'static str) {
     // https://docs.rs/rayon/1.1.0/rayon/struct.ThreadPoolBuilder.html#method.spawn_handler
     // Source code says DefaultSpawner is implementation detail and
     // shouldn't be used directly.
-    #[cfg(feature = "parallel-compilation")]
     rayon::ThreadPoolBuilder::new()
         .spawn_handler(move |thread| {
             let mut b = std::thread::Builder::new();
@@ -88,8 +86,6 @@ wasmtime_option_group! {
         pub cache_config: Option<String>,
         /// Whether or not to enable parallel compilation of modules.
         pub parallel_compilation: Option<bool>,
-        /// Whether to enable proof-carrying code (PCC)-based validation.
-        pub pcc: Option<bool>,
 
         #[prefixed = "cranelift"]
         /// Set a cranelift-specific option. Use `wasmtime settings` to see
@@ -246,8 +242,6 @@ wasmtime_option_group! {
         /// Flag for WASI preview2 to inherit the host's network within the
         /// guest so it has full access to all addresses/ports/etc.
         pub inherit_network: Option<bool>,
-        /// Indicates whether `wasi:sockets/ip-name-lookup` is enabled or not.
-        pub allow_ip_name_lookup: Option<bool>,
 
     }
 
@@ -310,27 +304,6 @@ pub struct CommonOptions {
     pub wasi: WasiOptions,
 }
 
-macro_rules! match_feature {
-    (
-        [$feat:tt : $config:expr]
-        $val:ident => $e:expr,
-        $p:pat => err,
-    ) => {
-        #[cfg(feature = $feat)]
-        {
-            if let Some($val) = $config {
-                $e;
-            }
-        }
-        #[cfg(not(feature = $feat))]
-        {
-            if let Some($p) = $config {
-                anyhow::bail!(concat!("support for ", $feat, " disabled at compile time"));
-            }
-        }
-    };
-}
-
 impl CommonOptions {
     fn configure(&mut self) {
         if self.configured {
@@ -344,80 +317,48 @@ impl CommonOptions {
         self.wasi.configure_with(&self.wasi_raw);
     }
 
-    pub fn init_logging(&mut self) -> Result<()> {
+    pub fn init_logging(&mut self) {
         self.configure();
         if self.debug.logging == Some(false) {
-            return Ok(());
+            return;
         }
-        #[cfg(feature = "logging")]
         if self.debug.log_to_files == Some(true) {
             let prefix = "wasmtime.dbg.";
             init_file_per_thread_logger(prefix);
         } else {
-            use std::io::IsTerminal;
-            use tracing_subscriber::{EnvFilter, FmtSubscriber};
-            let mut b = FmtSubscriber::builder()
-                .with_writer(std::io::stderr)
-                .with_env_filter(EnvFilter::from_env("WASMTIME_LOG"));
-            if std::io::stderr().is_terminal() {
-                b = b.with_ansi(true);
-            }
-            b.init();
-        }
-        #[cfg(not(feature = "logging"))]
-        if self.debug.log_to_files == Some(true) || self.debug.logging == Some(true) {
-            anyhow::bail!("support for logging disabled at compile time");
+            pretty_env_logger::init();
         }
-        Ok(())
     }
 
     pub fn config(&mut self, target: Option<&str>) -> Result<Config> {
         self.configure();
         let mut config = Config::new();
 
-        match_feature! {
-            ["cranelift" : self.codegen.compiler]
-            strategy => config.strategy(strategy),
-            _ => err,
+        if let Some(strategy) = self.codegen.compiler {
+            config.strategy(strategy);
         }
-        match_feature! {
-            ["cranelift" : target]
-            target => config.target(target)?,
-            _ => err,
+
+        // Set the target before setting any cranelift options, since the
+        // target will reset any target-specific options.
+        if let Some(target) = target {
+            config.target(target)?;
         }
-        match_feature! {
-            ["cranelift" : self.codegen.cranelift_debug_verifier]
-            enable => config.cranelift_debug_verifier(enable),
-            true => err,
+
+        if let Some(enable) = self.codegen.cranelift_debug_verifier {
+            config.cranelift_debug_verifier(enable);
         }
         if let Some(enable) = self.debug.debug_info {
             config.debug_info(enable);
         }
-        if self.debug.coredump.is_some() {
-            #[cfg(feature = "coredump")]
-            config.coredump_on_trap(true);
-            #[cfg(not(feature = "coredump"))]
-            anyhow::bail!("support for coredumps disabled at compile time");
-        }
-        match_feature! {
-            ["cranelift" : self.opts.opt_level]
-            level => config.cranelift_opt_level(level),
-            _ => err,
+        if let Some(level) = self.opts.opt_level {
+            config.cranelift_opt_level(level);
         }
-        match_feature! {
-            ["cranelift" : self.wasm.nan_canonicalization]
-            enable => config.cranelift_nan_canonicalization(enable),
-            true => err,
-        }
-        match_feature! {
-            ["cranelift" : self.codegen.pcc]
-            enable => config.cranelift_pcc(enable),
-            true => err,
+        if let Some(enable) = self.wasm.nan_canonicalization {
+            config.cranelift_nan_canonicalization(enable);
         }
 
         self.enable_wasm_features(&mut config)?;
 
-        #[cfg(feature = "cranelift")]
         for (name, value) in self.codegen.cranelift.iter() {
             let name = name.replace('-', "_");
             unsafe {
@@ -431,12 +372,7 @@ impl CommonOptions {
                 }
             }
         }
-        #[cfg(not(feature = "cranelift"))]
-        if !self.codegen.cranelift.is_empty() {
-            anyhow::bail!("support for cranelift disabled at compile time");
-        }
 
-        #[cfg(feature = "cache")]
         if self.codegen.cache != Some(false) {
             match &self.codegen.cache_config {
                 Some(path) => {
@@ -447,15 +383,9 @@ impl CommonOptions {
                 }
             }
         }
-        #[cfg(not(feature = "cache"))]
-        if self.codegen.cache == Some(true) {
-            anyhow::bail!("support for caching disabled at compile time");
-        }
 
-        match_feature! {
-            ["parallel-compilation" : self.codegen.parallel_compilation]
-            enable => config.parallel_compilation(enable),
-            true => err,
+        if let Some(enable) = self.codegen.parallel_compilation {
+            config.parallel_compilation(enable);
         }
 
         if let Some(max) = self.opts.static_memory_maximum_size {
@@ -492,14 +422,11 @@ impl CommonOptions {
             config.memory_init_cow(enable);
         }
 
-        match_feature! {
-            ["pooling-allocator" : self.opts.pooling_allocator]
-            enable => {
-                if enable {
-                    config.allocation_strategy(wasmtime::InstanceAllocationStrategy::pooling());
-                }
-            },
-            true => err,
+        if self.opts.pooling_allocator == Some(true) {
+            #[cfg(feature = "pooling-allocator")]
+            config.allocation_strategy(wasmtime::InstanceAllocationStrategy::pooling());
+            #[cfg(not(feature = "pooling-allocator"))]
+            anyhow::bail!("support for the pooling allocator was disabled at compile-time");
         }
 
         if let Some(max) = self.wasm.max_wasm_stack {
@@ -509,10 +436,8 @@ impl CommonOptions {
         if let Some(enable) = self.wasm.relaxed_simd_deterministic {
             config.relaxed_simd_deterministic(enable);
         }
-        match_feature! {
-            ["cranelift" : self.wasm.wmemcheck]
-            enable => config.wmemcheck(enable),
-            true => err,
+        if let Some(enable) = self.wasm.wmemcheck {
+            config.wmemcheck(enable);
         }
 
         Ok(config)
diff --git a/crates/component-macro/src/bindgen.rs b/crates/component-macro/src/bindgen.rs
index a508d1e99483..a87616e55d82 100644
--- a/crates/component-macro/src/bindgen.rs
+++ b/crates/component-macro/src/bindgen.rs
@@ -1,11 +1,10 @@
 use proc_macro2::{Span, TokenStream};
-use quote::ToTokens;
 use std::collections::HashMap;
 use std::collections::HashSet;
 use std::path::{Path, PathBuf};
 use syn::parse::{Error, Parse, ParseStream, Result};
 use syn::punctuated::Punctuated;
-use syn::{braced, token, Token};
+use syn::{braced, token, Ident, Token};
 use wasmtime_wit_bindgen::{AsyncConfig, Opts, Ownership, TrappableError};
 use wit_parser::{PackageId, Resolve, UnresolvedPackage, WorldId};
 
@@ -89,7 +88,7 @@ impl Parse for Config {
                         }
                         inline = Some(format!(
                             "
-                                package wasmtime:component-macro-synthesized;
+                                package wasmtime:component-macro-synthesized
 
                                 world interfaces {{
                                     {}
@@ -318,11 +317,28 @@ impl Parse for Opt {
 }
 
 fn trappable_error_field_parse(input: ParseStream<'_>) -> Result<TrappableError> {
-    let wit_path = input.parse::<syn::LitStr>()?.value();
-    input.parse::<Token![=>]>()?;
-    let rust_type_name = input.parse::<syn::Path>()?.to_token_stream().to_string();
+    // Accept a Rust identifier or a string literal. This is required
+    // because not all wit identifiers are Rust identifiers, so we can
+    // smuggle the invalid ones inside quotes.
+    fn ident_or_str(input: ParseStream<'_>) -> Result<String> {
+        let l = input.lookahead1();
+        if l.peek(syn::LitStr) {
+            Ok(input.parse::<syn::LitStr>()?.value())
+        } else if l.peek(syn::Ident) {
+            Ok(input.parse::<syn::Ident>()?.to_string())
+        } else {
+            Err(l.error())
+        }
+    }
+
+    let wit_package_path = input.parse::<syn::LitStr>()?.value();
+    input.parse::<Token![::]>()?;
+    let wit_type_name = ident_or_str(input)?;
+    input.parse::<Token![:]>()?;
+    let rust_type_name = input.parse::<Ident>()?.to_string();
     Ok(TrappableError {
-        wit_path,
+        wit_package_path,
+        wit_type_name,
         rust_type_name,
     })
 }
diff --git a/crates/component-macro/test-helpers/src/lib.rs b/crates/component-macro/test-helpers/src/lib.rs
index 9029b90bc686..28ea3ca4652f 100644
--- a/crates/component-macro/test-helpers/src/lib.rs
+++ b/crates/component-macro/test-helpers/src/lib.rs
@@ -10,7 +10,7 @@ pub fn foreach(input: TokenStream) -> TokenStream {
     let mut result = Vec::new();
     for f in cwd.read_dir().unwrap() {
         let f = f.unwrap().path();
-        if f.extension().and_then(|s| s.to_str()) == Some("wit") || f.is_dir() {
+        if f.extension().and_then(|s| s.to_str()) == Some("wit") {
             let name = f.file_stem().unwrap().to_str().unwrap();
             let ident = Ident::new(&name.replace("-", "_"), Span::call_site());
             let path = f.to_str().unwrap();
diff --git a/crates/component-macro/tests/codegen.rs b/crates/component-macro/tests/codegen.rs
index 66f9fb1c26bb..216d03e52062 100644
--- a/crates/component-macro/tests/codegen.rs
+++ b/crates/component-macro/tests/codegen.rs
@@ -24,127 +24,3 @@ macro_rules! gentest {
 }
 
 component_macro_test_helpers::foreach!(gentest);
-
-mod with_key_and_resources {
-    use anyhow::Result;
-    use wasmtime::component::Resource;
-
-    wasmtime::component::bindgen!({
-        inline: "
-            package demo:pkg;
-
-            interface bar {
-                resource a;
-                resource b;
-            }
-
-            world foo {
-                resource a;
-                resource b;
-
-                import foo: interface {
-                    resource a;
-                    resource b;
-                }
-
-                import bar;
-            }
-        ",
-        with: {
-            "a": MyA,
-            "b": MyA,
-            "foo/a": MyA,
-            "foo/b": MyA,
-            "demo:pkg/bar/a": MyA,
-            "demo:pkg/bar/b": MyA,
-        },
-    });
-
-    pub struct MyA;
-
-    struct MyComponent;
-
-    impl FooImports for MyComponent {}
-
-    impl HostA for MyComponent {
-        fn drop(&mut self, _: Resource<MyA>) -> Result<()> {
-            loop {}
-        }
-    }
-
-    impl HostB for MyComponent {
-        fn drop(&mut self, _: Resource<MyA>) -> Result<()> {
-            loop {}
-        }
-    }
-
-    impl foo::Host for MyComponent {}
-
-    impl foo::HostA for MyComponent {
-        fn drop(&mut self, _: Resource<MyA>) -> Result<()> {
-            loop {}
-        }
-    }
-
-    impl foo::HostB for MyComponent {
-        fn drop(&mut self, _: Resource<MyA>) -> Result<()> {
-            loop {}
-        }
-    }
-
-    impl demo::pkg::bar::Host for MyComponent {}
-
-    impl demo::pkg::bar::HostA for MyComponent {
-        fn drop(&mut self, _: Resource<MyA>) -> Result<()> {
-            loop {}
-        }
-    }
-
-    impl demo::pkg::bar::HostB for MyComponent {
-        fn drop(&mut self, _: Resource<MyA>) -> Result<()> {
-            loop {}
-        }
-    }
-}
-
-mod trappable_errors {
-    wasmtime::component::bindgen!({
-        inline: "
-            package demo:pkg;
-
-            interface a {
-                type b = u64;
-
-                z1: func() -> result<_, b>;
-                z2: func() -> result<_, b>;
-            }
-
-            interface b {
-                use a.{b};
-                z: func() -> result<_, b>;
-            }
-
-            interface c {
-                type b = u64;
-            }
-
-            interface d {
-                use c.{b};
-                z: func() -> result<_, b>;
-            }
-
-            world foo {
-                import a;
-                import b;
-                import d;
-            }
-        ",
-        trappable_error_type: {
-            "demo:pkg/a/b" => MyX,
-            "demo:pkg/c/b" => MyX,
-        },
-    });
-
-    #[allow(dead_code)]
-    type MyX = u32;
-}
diff --git a/crates/component-macro/tests/codegen/char.wit b/crates/component-macro/tests/codegen/char.wit
index 165642279af0..b49947b38abb 100644
--- a/crates/component-macro/tests/codegen/char.wit
+++ b/crates/component-macro/tests/codegen/char.wit
@@ -1,13 +1,13 @@
-package foo:foo;
+package foo:foo
 
 interface chars {
   /// A function that accepts a character
-  take-char: func(x: char);
+  take-char: func(x: char)
   /// A function that returns a character
-  return-char: func() -> char;
+  return-char: func() -> char
 }
 
 world the-world {
-  import chars;
-  export chars;
+  import chars
+  export chars
 }
diff --git a/crates/component-macro/tests/codegen/conventions.wit b/crates/component-macro/tests/codegen/conventions.wit
index 507ef40b95b4..a96b5afd3444 100644
--- a/crates/component-macro/tests/codegen/conventions.wit
+++ b/crates/component-macro/tests/codegen/conventions.wit
@@ -1,22 +1,22 @@
 // hello 🐱 world
-package foo:foo;
+package foo:foo
 
 interface conventions {
-  kebab-case: func();
+  kebab-case: func()
 
   record ludicrous-speed {
     how-fast-are-you-going: u32,
     i-am-going-extremely-slow: u64,
   }
 
-  foo: func(x: ludicrous-speed);
-  %function-with-dashes: func();
-  %function-with-no-weird-characters: func();
+  foo: func(x: ludicrous-speed)
+  %function-with-dashes: func()
+  %function-with-no-weird-characters: func()
 
-  apple: func();
-  apple-pear: func();
-  apple-pear-grape: func();
-  a0: func();
+  apple: func()
+  apple-pear: func()
+  apple-pear-grape: func()
+  a0: func()
 
   // Comment out identifiers that collide when mapped to snake_case, for now; see
   // https://github.com/WebAssembly/component-model/issues/118
@@ -24,16 +24,16 @@ interface conventions {
   //APPLE-pear-GRAPE: func()
   //apple-PEAR-grape: func()
 
-  is-XML: func();
+  is-XML: func()
 
-  %explicit: func();
-  %explicit-kebab: func();
+  %explicit: func()
+  %explicit-kebab: func()
 
   // Identifiers with the same name as keywords are quoted.
-  %bool: func();
+  %bool: func()
 }
 
 world the-world {
-  import conventions;
-  export conventions;
+  import conventions
+  export conventions
 }
diff --git a/crates/component-macro/tests/codegen/direct-import.wit b/crates/component-macro/tests/codegen/direct-import.wit
index 20d8fe753517..67d252a4a898 100644
--- a/crates/component-macro/tests/codegen/direct-import.wit
+++ b/crates/component-macro/tests/codegen/direct-import.wit
@@ -1,5 +1,5 @@
-package foo:foo;
+package foo:foo
 
 world foo {
-  import foo: func();
+  import foo: func()
 }
diff --git a/crates/component-macro/tests/codegen/empty.wit b/crates/component-macro/tests/codegen/empty.wit
index ea2e3c8d405e..b720c27d628e 100644
--- a/crates/component-macro/tests/codegen/empty.wit
+++ b/crates/component-macro/tests/codegen/empty.wit
@@ -1,2 +1,2 @@
-package foo:foo;
+package foo:foo
 world empty {}
diff --git a/crates/component-macro/tests/codegen/flags.wit b/crates/component-macro/tests/codegen/flags.wit
index 296c47e65c62..8c9c1437169d 100644
--- a/crates/component-macro/tests/codegen/flags.wit
+++ b/crates/component-macro/tests/codegen/flags.wit
@@ -1,4 +1,4 @@
-package foo:foo;
+package foo:foo
 
 interface flegs {
   flags flag1 {
@@ -40,16 +40,16 @@ interface flegs {
     b56, b57, b58, b59, b60, b61, b62, b63,
   }
 
-  roundtrip-flag1: func(x: flag1) -> flag1;
-  roundtrip-flag2: func(x: flag2) -> flag2;
-  roundtrip-flag4: func(x: flag4) -> flag4;
-  roundtrip-flag8: func(x: flag8) -> flag8;
-  roundtrip-flag16: func(x: flag16) -> flag16;
-  roundtrip-flag32: func(x: flag32) -> flag32;
-  roundtrip-flag64: func(x: flag64) -> flag64;
+  roundtrip-flag1: func(x: flag1) -> flag1
+  roundtrip-flag2: func(x: flag2) -> flag2
+  roundtrip-flag4: func(x: flag4) -> flag4
+  roundtrip-flag8: func(x: flag8) -> flag8
+  roundtrip-flag16: func(x: flag16) -> flag16
+  roundtrip-flag32: func(x: flag32) -> flag32
+  roundtrip-flag64: func(x: flag64) -> flag64
 }
 
 world the-flags {
-  import flegs;
-  export flegs;
+  import flegs
+  export flegs
 }
diff --git a/crates/component-macro/tests/codegen/floats.wit b/crates/component-macro/tests/codegen/floats.wit
index 690e920aa1b9..6cd720a8dc39 100644
--- a/crates/component-macro/tests/codegen/floats.wit
+++ b/crates/component-macro/tests/codegen/floats.wit
@@ -1,13 +1,13 @@
-package foo:foo;
+package foo:foo
 
 interface floats {
-  float32-param: func(x: float32);
-  float64-param: func(x: float64);
-  float32-result: func() -> float32;
-  float64-result: func() -> float64;
+  float32-param: func(x: float32)
+  float64-param: func(x: float64)
+  float32-result: func() -> float32
+  float64-result: func() -> float64
 }
 
 world the-world {
-  import floats;
-  export floats;
+  import floats
+  export floats
 }
diff --git a/crates/component-macro/tests/codegen/function-new.wit b/crates/component-macro/tests/codegen/function-new.wit
index cba7fe65d1d6..2f4e407566cd 100644
--- a/crates/component-macro/tests/codegen/function-new.wit
+++ b/crates/component-macro/tests/codegen/function-new.wit
@@ -1,4 +1,4 @@
-package foo:foo;
+package foo:foo
 world foo {
-  export new: func();
+  export new: func()
 }
diff --git a/crates/component-macro/tests/codegen/integers.wit b/crates/component-macro/tests/codegen/integers.wit
index ad96a59d2c38..2f5866bb2ae6 100644
--- a/crates/component-macro/tests/codegen/integers.wit
+++ b/crates/component-macro/tests/codegen/integers.wit
@@ -1,14 +1,14 @@
-package foo:foo;
+package foo:foo
 
 interface integers {
-  a1: func(x: u8);
-  a2: func(x: s8);
-  a3: func(x: u16);
-  a4: func(x: s16);
-  a5: func(x: u32);
-  a6: func(x: s32);
-  a7: func(x: u64);
-  a8: func(x: s64);
+  a1: func(x: u8)
+  a2: func(x: s8)
+  a3: func(x: u16)
+  a4: func(x: s16)
+  a5: func(x: u32)
+  a6: func(x: s32)
+  a7: func(x: u64)
+  a8: func(x: s64)
 
   a9: func(
     p1: u8,
@@ -19,22 +19,22 @@ interface integers {
     p6: s32,
     p7: u64,
     p8: s64,
-  );
+  )
 
 
-  r1: func() -> u8;
-  r2: func() -> s8;
-  r3: func() -> u16;
-  r4: func() -> s16;
-  r5: func() -> u32;
-  r6: func() -> s32;
-  r7: func() -> u64;
-  r8: func() -> s64;
+  r1: func() -> u8
+  r2: func() -> s8
+  r3: func() -> u16
+  r4: func() -> s16
+  r5: func() -> u32
+  r6: func() -> s32
+  r7: func() -> u64
+  r8: func() -> s64
 
-  pair-ret: func() -> tuple<s64, u8>;
+  pair-ret: func() -> tuple<s64, u8>
 }
 
 world the-world {
-  import integers;
-  export integers;
+  import integers
+  export integers
 }
diff --git a/crates/component-macro/tests/codegen/lists.wit b/crates/component-macro/tests/codegen/lists.wit
index a6d323fcb5c7..256a1cdf8fcf 100644
--- a/crates/component-macro/tests/codegen/lists.wit
+++ b/crates/component-macro/tests/codegen/lists.wit
@@ -1,33 +1,33 @@
-package foo:foo;
+package foo:foo
 
 interface lists {
-  list-u8-param: func(x: list<u8>);
-  list-u16-param: func(x: list<u16>);
-  list-u32-param: func(x: list<u32>);
-  list-u64-param: func(x: list<u64>);
-  list-s8-param: func(x: list<s8>);
-  list-s16-param: func(x: list<s16>);
-  list-s32-param: func(x: list<s32>);
-  list-s64-param: func(x: list<s64>);
-  list-float32-param: func(x: list<float32>);
-  list-float64-param: func(x: list<float64>);
+  list-u8-param: func(x: list<u8>)
+  list-u16-param: func(x: list<u16>)
+  list-u32-param: func(x: list<u32>)
+  list-u64-param: func(x: list<u64>)
+  list-s8-param: func(x: list<s8>)
+  list-s16-param: func(x: list<s16>)
+  list-s32-param: func(x: list<s32>)
+  list-s64-param: func(x: list<s64>)
+  list-float32-param: func(x: list<float32>)
+  list-float64-param: func(x: list<float64>)
 
-  list-u8-ret: func() -> list<u8>;
-  list-u16-ret: func() -> list<u16>;
-  list-u32-ret: func() -> list<u32>;
-  list-u64-ret: func() -> list<u64>;
-  list-s8-ret: func() -> list<s8>;
-  list-s16-ret: func() -> list<s16>;
-  list-s32-ret: func() -> list<s32>;
-  list-s64-ret: func() -> list<s64>;
-  list-float32-ret: func() -> list<float32>;
-  list-float64-ret: func() -> list<float64>;
+  list-u8-ret: func() -> list<u8>
+  list-u16-ret: func() -> list<u16>
+  list-u32-ret: func() -> list<u32>
+  list-u64-ret: func() -> list<u64>
+  list-s8-ret: func() -> list<s8>
+  list-s16-ret: func() -> list<s16>
+  list-s32-ret: func() -> list<s32>
+  list-s64-ret: func() -> list<s64>
+  list-float32-ret: func() -> list<float32>
+  list-float64-ret: func() -> list<float64>
 
-  tuple-list: func(x: list<tuple<u8, s8>>) -> list<tuple<s64, u32>>;
-  string-list-arg: func(a: list<string>);
-  string-list-ret: func() -> list<string>;
-  tuple-string-list: func(x: list<tuple<u8, string>>) -> list<tuple<string, u8>>;
-  string-list: func(x: list<string>) -> list<string>;
+  tuple-list: func(x: list<tuple<u8, s8>>) -> list<tuple<s64, u32>>
+  string-list-arg: func(a: list<string>)
+  string-list-ret: func() -> list<string>
+  tuple-string-list: func(x: list<tuple<u8, string>>) -> list<tuple<string, u8>>
+  string-list: func(x: list<string>) -> list<string>
 
   record some-record {
     x: string,
@@ -46,8 +46,8 @@ interface lists {
     b: string,
     c: list<u8>,
   }
-  record-list: func(x: list<some-record>) -> list<other-record>;
-  record-list-reverse: func(x: list<other-record>) -> list<some-record>;
+  record-list: func(x: list<some-record>) -> list<other-record>
+  record-list-reverse: func(x: list<other-record>) -> list<some-record>
 
   variant some-variant {
     a(string),
@@ -60,7 +60,7 @@ interface lists {
     b(u32),
     c(string),
   }
-  variant-list: func(x: list<some-variant>) -> list<other-variant>;
+  variant-list: func(x: list<some-variant>) -> list<other-variant>
 
   type load-store-all-sizes = list<tuple<
     string,
@@ -75,11 +75,11 @@ interface lists {
     float32,
     float64,
     char,
-  >>;
-  load-store-everything: func(a: load-store-all-sizes) -> load-store-all-sizes;
+  >>
+  load-store-everything: func(a: load-store-all-sizes) -> load-store-all-sizes
 }
 
 world the-lists {
-  import lists;
-  export lists;
+  import lists
+  export lists
 }
diff --git a/crates/component-macro/tests/codegen/many-arguments.wit b/crates/component-macro/tests/codegen/many-arguments.wit
index 234b74b2022e..cbfc123144fa 100644
--- a/crates/component-macro/tests/codegen/many-arguments.wit
+++ b/crates/component-macro/tests/codegen/many-arguments.wit
@@ -1,4 +1,4 @@
-package foo:foo;
+package foo:foo
 
 interface manyarg {
   many-args: func(
@@ -18,7 +18,7 @@ interface manyarg {
     a14: u64,
     a15: u64,
     a16: u64,
-  );
+  )
 
   record big-struct {
     a1: string,
@@ -43,10 +43,10 @@ interface manyarg {
     a20: string,
   }
 
-  big-argument: func(x: big-struct);
+  big-argument: func(x: big-struct)
 }
 
 world the-world {
-  import manyarg;
-  export manyarg;
+  import manyarg
+  export manyarg
 }
diff --git a/crates/component-macro/tests/codegen/multi-return.wit b/crates/component-macro/tests/codegen/multi-return.wit
index 3076ccf758c9..69951b2c3393 100644
--- a/crates/component-macro/tests/codegen/multi-return.wit
+++ b/crates/component-macro/tests/codegen/multi-return.wit
@@ -1,14 +1,14 @@
-package foo:foo;
+package foo:foo
 
 interface multi-return {
-  mra: func();
-  mrb: func() -> ();
-  mrc: func() -> u32;
-  mrd: func() -> (a: u32);
-  mre: func() -> (a: u32, b: float32);
+  mra: func()
+  mrb: func() -> ()
+  mrc: func() -> u32
+  mrd: func() -> (a: u32)
+  mre: func() -> (a: u32, b: float32)
 }
 
 world the-world {
-  import multi-return;
-  export multi-return;
+  import multi-return
+  export multi-return
 }
diff --git a/crates/component-macro/tests/codegen/multiversion/deps/v1/root.wit b/crates/component-macro/tests/codegen/multiversion/deps/v1/root.wit
deleted file mode 100644
index cdda0a38b4ba..000000000000
--- a/crates/component-macro/tests/codegen/multiversion/deps/v1/root.wit
+++ /dev/null
@@ -1,5 +0,0 @@
-package my:dep@0.1.0;
-
-interface a {
-  x: func();
-}
diff --git a/crates/component-macro/tests/codegen/multiversion/deps/v2/root.wit b/crates/component-macro/tests/codegen/multiversion/deps/v2/root.wit
deleted file mode 100644
index fa8fbeb2df6b..000000000000
--- a/crates/component-macro/tests/codegen/multiversion/deps/v2/root.wit
+++ /dev/null
@@ -1,5 +0,0 @@
-package my:dep@0.2.0;
-
-interface a {
-  x: func();
-}
diff --git a/crates/component-macro/tests/codegen/multiversion/root.wit b/crates/component-macro/tests/codegen/multiversion/root.wit
deleted file mode 100644
index 52225f02beb3..000000000000
--- a/crates/component-macro/tests/codegen/multiversion/root.wit
+++ /dev/null
@@ -1,7 +0,0 @@
-package foo:bar;
-
-world foo {
-  import my:dep/a@0.1.0;
-  import my:dep/a@0.2.0;
-  export my:dep/a@0.2.0;
-}
diff --git a/crates/component-macro/tests/codegen/records.wit b/crates/component-macro/tests/codegen/records.wit
index e47af0cbf61e..f51bb8f28f75 100644
--- a/crates/component-macro/tests/codegen/records.wit
+++ b/crates/component-macro/tests/codegen/records.wit
@@ -1,13 +1,13 @@
-package foo:foo;
+package foo:foo
 
 interface records {
-  tuple-arg: func(x: tuple<char, u32>);
-  tuple-result: func() -> tuple<char, u32>;
+  tuple-arg: func(x: tuple<char, u32>)
+  tuple-result: func() -> tuple<char, u32>
 
   record empty {}
 
-  empty-arg: func(x: empty);
-  empty-result: func() -> empty;
+  empty-arg: func(x: empty)
+  empty-result: func() -> empty
 
   /// A record containing two scalar fields
   /// that both have the same type
@@ -18,8 +18,8 @@ interface records {
       b: u32,
   }
 
-  scalar-arg: func(x: scalars);
-  scalar-result: func() -> scalars;
+  scalar-arg: func(x: scalars)
+  scalar-result: func() -> scalars
 
   /// A record that is really just flags
   /// All of the fields are bool
@@ -35,8 +35,8 @@ interface records {
       i: bool,
   }
 
-  flags-arg: func(x: really-flags);
-  flags-result: func() -> really-flags;
+  flags-arg: func(x: really-flags)
+  flags-result: func() -> really-flags
 
   record aggregates {
       a: scalars,
@@ -46,16 +46,16 @@ interface records {
       e: really-flags,
   }
 
-  aggregate-arg: func(x: aggregates);
-  aggregate-result: func() -> aggregates;
+  aggregate-arg: func(x: aggregates)
+  aggregate-result: func() -> aggregates
 
-  type tuple-typedef = tuple<s32>;
-  type int-typedef = s32;
-  type tuple-typedef2 = tuple<int-typedef>;
-  typedef-inout: func(e: tuple-typedef2) -> s32;
+  type tuple-typedef = tuple<s32>
+  type int-typedef = s32
+  type tuple-typedef2 = tuple<int-typedef>
+  typedef-inout: func(e: tuple-typedef2) -> s32
 }
 
 world the-world {
-  import records;
-  export records;
+  import records
+  export records
 }
diff --git a/crates/component-macro/tests/codegen/rename.wit b/crates/component-macro/tests/codegen/rename.wit
index 0b6dfee5a7ca..8bfc7f36862b 100644
--- a/crates/component-macro/tests/codegen/rename.wit
+++ b/crates/component-macro/tests/codegen/rename.wit
@@ -1,16 +1,16 @@
-package foo:foo;
+package foo:foo
 
 interface red {
-  use green.{thing};
+  use green.{thing}
 
-  foo: func() -> thing;
+  foo: func() -> thing
 }
 
 interface green {
-  type thing = s32;
+  type thing = s32
 }
 
 world neptune {
-  import red;
-  import green;
+  import red
+  import green
 }
diff --git a/crates/component-macro/tests/codegen/resources-export.wit b/crates/component-macro/tests/codegen/resources-export.wit
index da0027991c79..f0e943671c16 100644
--- a/crates/component-macro/tests/codegen/resources-export.wit
+++ b/crates/component-macro/tests/codegen/resources-export.wit
@@ -1,43 +1,43 @@
-package foo:foo;
+package foo:foo
 
 world w {
-  export simple-export;
-  export export-using-import;
+  export simple-export
+  export export-using-import
 
-  export export-using-export1;
-  export export-using-export2;
+  export export-using-export1
+  export export-using-export2
 }
 
 interface simple-export {
   resource a {
-    constructor();
-    static-a: static func() -> u32;
-    method-a: func() -> u32;
+    constructor()
+    static-a: static func() -> u32
+    method-a: func() -> u32
   }
 }
 
 interface export-using-import {
-  use transitive-import.{y};
+  use transitive-import.{y}
   resource a {
-    constructor(y: y);
-    static-a: static func() -> y;
-    method-a: func(y: y) -> y;
+    constructor(y: y)
+    static-a: static func() -> y
+    method-a: func(y: y) -> y
   }
 }
 
 interface transitive-import {
-  resource y;
+  resource y
 }
 
 interface export-using-export1 {
   resource a {
-    constructor();
+    constructor()
   }
 }
 
 interface export-using-export2 {
-  use export-using-export1.{a};
+  use export-using-export1.{a}
   resource b {
-    constructor(a: a);
+    constructor(a: a)
   }
 }
diff --git a/crates/component-macro/tests/codegen/resources-import.wit b/crates/component-macro/tests/codegen/resources-import.wit
index d45916436b4f..bfe0c40deed3 100644
--- a/crates/component-macro/tests/codegen/resources-import.wit
+++ b/crates/component-macro/tests/codegen/resources-import.wit
@@ -1,31 +1,31 @@
-package foo:foo;
+package foo:foo
 
 interface resources {
   resource bar {
-    constructor();
-    static-a: static func() -> u32;
-    method-a: func() -> u32;
+    constructor()
+    static-a: static func() -> u32
+    method-a: func() -> u32
   }
 
-  bar-own-arg: func(x: own<bar>);
-  bar-borrow-arg: func(x: borrow<bar>);
-  bar-result: func() -> own<bar>;
+  bar-own-arg: func(x: own<bar>)
+  bar-borrow-arg: func(x: borrow<bar>)
+  bar-result: func() -> own<bar>
 
-  tuple-own-arg: func(x: tuple<own<bar>, u32>);
-  tuple-borrow-arg: func(x: tuple<own<bar>, u32>);
-  tuple-result: func() -> tuple<own<bar>, u32>;
+  tuple-own-arg: func(x: tuple<own<bar>, u32>)
+  tuple-borrow-arg: func(x: tuple<own<bar>, u32>)
+  tuple-result: func() -> tuple<own<bar>, u32>
 
-  option-own-arg: func(x: option<own<bar>>);
-  option-borrow-arg: func(x: option<borrow<bar>>);
-  option-result: func() -> option<own<bar>>;
+  option-own-arg: func(x: option<own<bar>>)
+  option-borrow-arg: func(x: option<borrow<bar>>)
+  option-result: func() -> option<own<bar>>
 
-  result-own-arg: func(x: result<own<bar>>);
-  result-borrow-arg: func(x: result<borrow<bar>>);
-  result-result: func() -> result<own<bar>>;
+  result-own-arg: func(x: result<own<bar>>)
+  result-borrow-arg: func(x: result<borrow<bar>>)
+  result-result: func() -> result<own<bar>>
 
-  list-own-arg: func(x: list<own<bar>>);
-  list-borrow-arg: func(x: list<borrow<bar>>);
-  list-result: func() -> list<own<bar>>;
+  list-own-arg: func(x: list<own<bar>>)
+  list-borrow-arg: func(x: list<borrow<bar>>)
+  list-result: func() -> list<own<bar>>
 
   record nested-own {
     nested-bar: own<bar>
@@ -35,53 +35,53 @@ interface resources {
     nested-bar: borrow<bar>
   }
 
-  record-own-arg: func(x: nested-own);
-  record-borrow-arg: func(x: nested-borrow);
-  record-result: func() -> nested-own;
+  record-own-arg: func(x: nested-own)
+  record-borrow-arg: func(x: nested-borrow)
+  record-result: func() -> nested-own
 
-  type some-handle = borrow<bar>;
-  func-with-handle-typedef: func(x: some-handle);
+  type some-handle = borrow<bar>
+  func-with-handle-typedef: func(x: some-handle)
 }
 
 world the-world {
-  import resources;
+  import resources
 
   resource world-resource {
-    constructor();
+    constructor()
 
-    foo: func();
-    static-foo: static func();
+    foo: func()
+    static-foo: static func()
   }
 
-  import some-world-func: func() -> world-resource;
-  export some-world-func2: func() -> world-resource;
+  import some-world-func: func() -> world-resource
+  export some-world-func2: func() -> world-resource
 
-  export uses-resource-transitively;
+  export uses-resource-transitively
 
-  import long-use-chain4;
+  import long-use-chain4
 }
 
 interface transitive-interface-with-resource {
-  resource foo;
+  resource foo
 }
 
 interface uses-resource-transitively {
-  use transitive-interface-with-resource.{foo};
+  use transitive-interface-with-resource.{foo}
 
-  handle: func(x: foo);
+  handle: func(x: foo)
 }
 
 interface long-use-chain4 {
-  use long-use-chain3.{a};
+  use long-use-chain3.{a}
 
-  foo: func() -> a;
+  foo: func() -> a
 }
 interface long-use-chain3 {
-  use long-use-chain2.{a};
+  use long-use-chain2.{a}
 }
 interface long-use-chain2 {
-  use long-use-chain1.{a};
+  use long-use-chain1.{a}
 }
 interface long-use-chain1 {
-  resource a;
+  resource a
 }
diff --git a/crates/component-macro/tests/codegen/share-types.wit b/crates/component-macro/tests/codegen/share-types.wit
index 85d2c03712f2..8d36d1b0aa88 100644
--- a/crates/component-macro/tests/codegen/share-types.wit
+++ b/crates/component-macro/tests/codegen/share-types.wit
@@ -1,4 +1,4 @@
-package foo:foo;
+package foo:foo
 
 interface http-types{
   record request {
@@ -11,11 +11,11 @@ interface http-types{
 
 world http-interface {
   export http-handler: interface {
-    use http-types.{request,response};
-    handle-request: func(request: request) -> response;
+    use http-types.{request,response}
+    handle-request: func(request: request) -> response
   }
   import http-fetch: interface {
-    use http-types.{request,response};
-    fetch-request: func(request: request) -> response;
+    use http-types.{request,response}
+    fetch-request: func(request: request) -> response
   }
 }
diff --git a/crates/component-macro/tests/codegen/simple-functions.wit b/crates/component-macro/tests/codegen/simple-functions.wit
index 199fc522fb2d..2593d199e565 100644
--- a/crates/component-macro/tests/codegen/simple-functions.wit
+++ b/crates/component-macro/tests/codegen/simple-functions.wit
@@ -1,17 +1,17 @@
-package foo:foo;
+package foo:foo
 
 interface simple {
-  f1: func();
-  f2: func(a: u32);
-  f3: func(a: u32, b: u32);
+  f1: func()
+  f2: func(a: u32)
+  f3: func(a: u32, b: u32)
 
-  f4: func() -> u32;
-  f5: func() -> tuple<u32, u32>;
+  f4: func() -> u32
+  f5: func() -> tuple<u32, u32>
 
-  f6: func(a: u32, b: u32, c: u32) -> tuple<u32, u32, u32>;
+  f6: func(a: u32, b: u32, c: u32) -> tuple<u32, u32, u32>
 }
 
 world the-world {
-  import simple;
-  export simple;
+  import simple
+  export simple
 }
diff --git a/crates/component-macro/tests/codegen/simple-lists.wit b/crates/component-macro/tests/codegen/simple-lists.wit
index f814cee85ad2..8e082b6e34e7 100644
--- a/crates/component-macro/tests/codegen/simple-lists.wit
+++ b/crates/component-macro/tests/codegen/simple-lists.wit
@@ -1,13 +1,13 @@
-package foo:foo;
+package foo:foo
 
 interface simple-lists {
-  simple-list1: func(l: list<u32>);
-  simple-list2: func() -> list<u32>;
-  simple-list3: func(a: list<u32>, b: list<u32>) -> tuple<list<u32>, list<u32>>;
-  simple-list4: func(l: list<list<u32>>) -> list<list<u32>>;
+  simple-list1: func(l: list<u32>)
+  simple-list2: func() -> list<u32>
+  simple-list3: func(a: list<u32>, b: list<u32>) -> tuple<list<u32>, list<u32>>
+  simple-list4: func(l: list<list<u32>>) -> list<list<u32>>
 }
 
 world my-world {
-  import simple-lists;
-  export simple-lists;
+  import simple-lists
+  export simple-lists
 }
diff --git a/crates/component-macro/tests/codegen/simple-wasi.wit b/crates/component-macro/tests/codegen/simple-wasi.wit
index 2ab07d32d837..60192473d99e 100644
--- a/crates/component-macro/tests/codegen/simple-wasi.wit
+++ b/crates/component-macro/tests/codegen/simple-wasi.wit
@@ -1,4 +1,4 @@
-package foo:foo;
+package foo:foo
 
 interface wasi-filesystem {
   record descriptor-stat {
@@ -7,9 +7,9 @@ interface wasi-filesystem {
   enum errno { e }
 
 
-  create-directory-at: func() -> result<_, errno>;
+  create-directory-at: func() -> result<_, errno>
 
-  stat: func() -> result<descriptor-stat, errno>;
+  stat: func() -> result<descriptor-stat, errno>
 }
 
 interface wall-clock {
@@ -18,6 +18,6 @@ interface wall-clock {
 }
 
 world wasi {
-  import wasi-filesystem;
-  import wall-clock;
+  import wasi-filesystem
+  import wall-clock
 }
diff --git a/crates/component-macro/tests/codegen/small-anonymous.wit b/crates/component-macro/tests/codegen/small-anonymous.wit
index 3a314fbfe4e9..ad9c67287d4e 100644
--- a/crates/component-macro/tests/codegen/small-anonymous.wit
+++ b/crates/component-macro/tests/codegen/small-anonymous.wit
@@ -1,4 +1,4 @@
-package foo:foo;
+package foo:foo
 
 interface anon {
   enum error {
@@ -6,10 +6,10 @@ interface anon {
     failure,
   }
 
-  option-test: func() -> result<option<string>, error>;
+  option-test: func() -> result<option<string>, error>
 }
 
 world the-world {
-  import anon;
-  export anon;
+  import anon
+  export anon
 }
diff --git a/crates/component-macro/tests/codegen/smoke-default.wit b/crates/component-macro/tests/codegen/smoke-default.wit
index 6206a7c8e131..90be0b1e3cdc 100644
--- a/crates/component-macro/tests/codegen/smoke-default.wit
+++ b/crates/component-macro/tests/codegen/smoke-default.wit
@@ -1,5 +1,5 @@
-package foo:foo;
+package foo:foo
 
 world the-world {
-  export y: func();
+  export y: func()
 }
diff --git a/crates/component-macro/tests/codegen/smoke-export.wit b/crates/component-macro/tests/codegen/smoke-export.wit
index a8b7b15e70e6..983f1c35066e 100644
--- a/crates/component-macro/tests/codegen/smoke-export.wit
+++ b/crates/component-macro/tests/codegen/smoke-export.wit
@@ -1,7 +1,7 @@
-package foo:foo;
+package foo:foo
 
 world the-world {
   export the-name: interface {
-    y: func();
+    y: func()
   }
 }
diff --git a/crates/component-macro/tests/codegen/smoke.wit b/crates/component-macro/tests/codegen/smoke.wit
index 14502341f7ca..0476bd988ec1 100644
--- a/crates/component-macro/tests/codegen/smoke.wit
+++ b/crates/component-macro/tests/codegen/smoke.wit
@@ -1,7 +1,7 @@
-package foo:foo;
+package foo:foo
 
 world the-world {
   import imports: interface {
-    y: func();
+    y: func()
   }
 }
diff --git a/crates/component-macro/tests/codegen/strings.wit b/crates/component-macro/tests/codegen/strings.wit
index 6d45a9845bce..650300acfb9d 100644
--- a/crates/component-macro/tests/codegen/strings.wit
+++ b/crates/component-macro/tests/codegen/strings.wit
@@ -1,12 +1,12 @@
-package foo:foo;
+package foo:foo
 
 interface strings {
-  a: func(x: string);
-  b: func() -> string;
-  c: func(a: string, b: string) -> string;
+  a: func(x: string)
+  b: func() -> string
+  c: func(a: string, b: string) -> string
 }
 
 world the-world {
-  import strings;
-  export strings;
+  import strings
+  export strings
 }
diff --git a/crates/component-macro/tests/codegen/use-paths.wit b/crates/component-macro/tests/codegen/use-paths.wit
index 3a16b375d34c..dab6646afac8 100644
--- a/crates/component-macro/tests/codegen/use-paths.wit
+++ b/crates/component-macro/tests/codegen/use-paths.wit
@@ -1,29 +1,29 @@
-package foo:foo;
+package foo:foo
 
 interface a {
   record foo {}
 
-  a: func() -> foo;
+  a: func() -> foo
 }
 
 interface b {
-  use a.{foo};
+  use a.{foo}
 
-  a: func() -> foo;
+  a: func() -> foo
 }
 
 interface c {
-  use b.{foo};
+  use b.{foo}
 
-  a: func() -> foo;
+  a: func() -> foo
 }
 
 world d {
-  import a;
-  import b;
+  import a
+  import b
   import d: interface {
-    use c.{foo};
+    use c.{foo}
 
-    b: func() -> foo;
+    b: func() -> foo
   }
 }
diff --git a/crates/component-macro/tests/codegen/variants.wit b/crates/component-macro/tests/codegen/variants.wit
index 8ba28d40ebdf..a53938cb02ef 100644
--- a/crates/component-macro/tests/codegen/variants.wit
+++ b/crates/component-macro/tests/codegen/variants.wit
@@ -1,12 +1,12 @@
-package foo:foo;
+package foo:foo
 
 interface variants {
   enum e1 {
       a,
   }
 
-  e1-arg: func(x: e1);
-  e1-result: func() -> e1;
+  e1-arg: func(x: e1)
+  e1-result: func() -> e1
 
   record empty {}
 
@@ -19,11 +19,11 @@ interface variants {
       g(u32),
   }
 
-  v1-arg: func(x: v1);
-  v1-result: func() -> v1;
+  v1-arg: func(x: v1)
+  v1-result: func() -> v1
 
-  bool-arg: func(x: bool);
-  bool-result: func() -> bool;
+  bool-arg: func(x: bool)
+  bool-result: func() -> bool
 
   option-arg: func(
     a: option<bool>,
@@ -32,7 +32,7 @@ interface variants {
     d: option<e1>,
     e: option<float32>,
     g: option<option<bool>>,
-  );
+  )
   option-result: func() -> tuple<
     option<bool>,
     option<tuple<>>,
@@ -40,7 +40,7 @@ interface variants {
     option<e1>,
     option<float32>,
     option<option<bool>>,
-  >;
+  >
 
   variant casts1 {
     a(s32),
@@ -86,7 +86,7 @@ interface variants {
     casts4,
     casts5,
     casts6,
-  >;
+  >
 
   result-arg: func(
     a: result,
@@ -95,7 +95,7 @@ interface variants {
     d: result<tuple<>, tuple<>>,
     e: result<u32, v1>,
     f: result<string, list<u8>>,
-  );
+  )
   result-result: func() -> tuple<
     result,
     result<_, e1>,
@@ -103,34 +103,34 @@ interface variants {
     result<tuple<>, tuple<>>,
     result<u32, v1>,
     result<string, list<u8>>,
-  >;
+  >
 
   enum my-errno {
     bad1,
     bad2,
   }
 
-  return-result-sugar: func() -> result<s32, my-errno>;
-  return-result-sugar2: func() -> result<_, my-errno>;
-  return-result-sugar3: func() -> result<my-errno, my-errno>;
-  return-result-sugar4: func() -> result<tuple<s32, u32>, my-errno>;
-  return-option-sugar: func() -> option<s32>;
-  return-option-sugar2: func() -> option<my-errno>;
+  return-result-sugar: func() -> result<s32, my-errno>
+  return-result-sugar2: func() -> result<_, my-errno>
+  return-result-sugar3: func() -> result<my-errno, my-errno>
+  return-result-sugar4: func() -> result<tuple<s32, u32>, my-errno>
+  return-option-sugar: func() -> option<s32>
+  return-option-sugar2: func() -> option<my-errno>
 
-  result-simple: func() -> result<u32, s32>;
+  result-simple: func() -> result<u32, s32>
 
   record is-clone {
     v1: v1,
   }
 
-  is-clone-arg: func(a: is-clone);
-  is-clone-return: func() -> is-clone;
+  is-clone-arg: func(a: is-clone)
+  is-clone-return: func() -> is-clone
 
-  return-named-option: func() -> (a: option<u8>);
-  return-named-result: func() -> (a: result<u8, my-errno>);
+  return-named-option: func() -> (a: option<u8>)
+  return-named-result: func() -> (a: result<u8, my-errno>)
 }
 
 world my-world {
-  import variants;
-  export variants;
+  import variants
+  export variants
 }
diff --git a/crates/component-macro/tests/codegen/worlds-with-types.wit b/crates/component-macro/tests/codegen/worlds-with-types.wit
index 149e392dfc7a..dc4cbddcbabe 100644
--- a/crates/component-macro/tests/codegen/worlds-with-types.wit
+++ b/crates/component-macro/tests/codegen/worlds-with-types.wit
@@ -1,16 +1,16 @@
-package foo:foo;
+package foo:foo
 
 interface i {
-  type t = u16;
+  type t = u16
 }
 
 world foo {
-  use i.{t as u};
+  use i.{t as u}
 
-  type t = u32;
+  type t = u32
 
   record r {
   }
 
-  export f: func() -> tuple<t, u, r>;
+  export f: func() -> tuple<t, u, r>
 }
diff --git a/crates/cranelift-shared/src/lib.rs b/crates/cranelift-shared/src/lib.rs
index 1b72ef884d3f..b508e04a79e6 100644
--- a/crates/cranelift-shared/src/lib.rs
+++ b/crates/cranelift-shared/src/lib.rs
@@ -3,6 +3,7 @@ use cranelift_codegen::{
     ir::{self, ExternalName, UserExternalNameRef},
     settings, FinalizedMachReloc, FinalizedRelocTarget, MachTrap,
 };
+use std::collections::BTreeMap;
 use wasmtime_environ::{FlagValue, FuncIndex, Trap, TrapInformation};
 
 pub mod isa_builder;
@@ -36,16 +37,16 @@ pub enum RelocationTarget {
 /// Converts cranelift_codegen settings to the wasmtime_environ equivalent.
 pub fn clif_flags_to_wasmtime(
     flags: impl IntoIterator<Item = settings::Value>,
-) -> Vec<(&'static str, FlagValue<'static>)> {
+) -> BTreeMap<String, FlagValue> {
     flags
         .into_iter()
-        .map(|val| (val.name, to_flag_value(&val)))
+        .map(|val| (val.name.to_string(), to_flag_value(&val)))
         .collect()
 }
 
-fn to_flag_value(v: &settings::Value) -> FlagValue<'static> {
+fn to_flag_value(v: &settings::Value) -> FlagValue {
     match v.kind() {
-        settings::SettingKind::Enum => FlagValue::Enum(v.as_enum().unwrap()),
+        settings::SettingKind::Enum => FlagValue::Enum(v.as_enum().unwrap().into()),
         settings::SettingKind::Num => FlagValue::Num(v.as_num().unwrap()),
         settings::SettingKind::Bool => FlagValue::Bool(v.as_bool().unwrap()),
         settings::SettingKind::Preset => unreachable!(),
diff --git a/crates/cranelift/Cargo.toml b/crates/cranelift/Cargo.toml
index 1ef91e7f5e7d..e7318e4abc42 100644
--- a/crates/cranelift/Cargo.toml
+++ b/crates/cranelift/Cargo.toml
@@ -15,7 +15,7 @@ anyhow = { workspace = true }
 log = { workspace = true }
 wasmtime-environ = { workspace = true }
 cranelift-wasm = { workspace = true }
-cranelift-codegen = { workspace = true, features = ["default"] }
+cranelift-codegen = { workspace = true }
 cranelift-frontend = { workspace = true }
 cranelift-entity = { workspace = true }
 cranelift-native = { workspace = true }
diff --git a/crates/cranelift/src/compiler.rs b/crates/cranelift/src/compiler.rs
index 7a0f038daddf..9bc954a4cbef 100644
--- a/crates/cranelift/src/compiler.rs
+++ b/crates/cranelift/src/compiler.rs
@@ -23,6 +23,7 @@ use object::write::{Object, StandardSegment, SymbolId};
 use object::{RelocationEncoding, RelocationKind, SectionKind};
 use std::any::Any;
 use std::cmp;
+use std::collections::BTreeMap;
 use std::collections::HashMap;
 use std::convert::TryFrom;
 use std::mem;
@@ -196,7 +197,7 @@ impl wasmtime_environ::Compiler for Compiler {
                 .unwrap()
                 .into(),
             global_type: isa.pointer_type(),
-            flags: MemFlags::trusted().with_readonly(),
+            readonly: true,
         });
         let stack_limit = context.func.create_global_value(ir::GlobalValueData::Load {
             base: interrupts_ptr,
@@ -204,7 +205,7 @@ impl wasmtime_environ::Compiler for Compiler {
                 .unwrap()
                 .into(),
             global_type: isa.pointer_type(),
-            flags: MemFlags::trusted(),
+            readonly: false,
         });
         context.func.stack_limit = Some(stack_limit);
         let FunctionBodyData { validator, body } = input;
@@ -521,11 +522,11 @@ impl wasmtime_environ::Compiler for Compiler {
         self.isa.triple()
     }
 
-    fn flags(&self) -> Vec<(&'static str, FlagValue<'static>)> {
+    fn flags(&self) -> BTreeMap<String, FlagValue> {
         wasmtime_cranelift_shared::clif_flags_to_wasmtime(self.isa.flags().iter())
     }
 
-    fn isa_flags(&self) -> Vec<(&'static str, FlagValue<'static>)> {
+    fn isa_flags(&self) -> BTreeMap<String, FlagValue> {
         wasmtime_cranelift_shared::clif_flags_to_wasmtime(self.isa.isa_flags())
     }
 
diff --git a/crates/cranelift/src/func_environ.rs b/crates/cranelift/src/func_environ.rs
index 2ea9098f040a..39df50fb0b0c 100644
--- a/crates/cranelift/src/func_environ.rs
+++ b/crates/cranelift/src/func_environ.rs
@@ -3,13 +3,11 @@ use cranelift_codegen::cursor::FuncCursor;
 use cranelift_codegen::ir;
 use cranelift_codegen::ir::condcodes::*;
 use cranelift_codegen::ir::immediates::{Imm64, Offset32, Uimm64};
-use cranelift_codegen::ir::pcc::Fact;
 use cranelift_codegen::ir::types::*;
 use cranelift_codegen::ir::{
-    AbiParam, ArgumentPurpose, Function, InstBuilder, MemFlags, Signature, UserFuncName, Value,
+    AbiParam, ArgumentPurpose, Function, InstBuilder, Signature, UserFuncName, Value,
 };
 use cranelift_codegen::isa::{self, CallConv, TargetFrontendConfig, TargetIsa};
-use cranelift_entity::SecondaryMap;
 use cranelift_entity::{EntityRef, PrimaryMap};
 use cranelift_frontend::FunctionBuilder;
 use cranelift_frontend::Variable;
@@ -123,14 +121,6 @@ pub struct FuncEnvironment<'module_environment> {
     /// The Cranelift global holding the vmctx address.
     vmctx: Option<ir::GlobalValue>,
 
-    /// The PCC memory type describing the vmctx layout, if we're
-    /// using PCC.
-    pcc_vmctx_memtype: Option<ir::MemoryType>,
-
-    /// The PCC memory type describing the data for each memory, if
-    /// we're using PCC.
-    pcc_memory_memtypes: SecondaryMap<MemoryIndex, Option<ir::MemoryType>>,
-
     /// Caches of signatures for builtin functions.
     builtin_function_signatures: BuiltinFunctionSignatures,
 
@@ -198,8 +188,6 @@ impl<'module_environment> FuncEnvironment<'module_environment> {
             types,
             heaps: PrimaryMap::default(),
             vmctx: None,
-            pcc_vmctx_memtype: None,
-            pcc_memory_memtypes: SecondaryMap::new(),
             builtin_function_signatures,
             offsets: VMOffsets::new(isa.pointer_bytes(), &translation.module),
             tunables,
@@ -224,68 +212,6 @@ impl<'module_environment> FuncEnvironment<'module_environment> {
     fn vmctx(&mut self, func: &mut Function) -> ir::GlobalValue {
         self.vmctx.unwrap_or_else(|| {
             let vmctx = func.create_global_value(ir::GlobalValueData::VMContext);
-            if self.isa.flags().enable_pcc() {
-                let mut fields = vec![];
-                for (memory_idx, plan) in &self.module.memory_plans {
-                    // For now, we only do PCC on defined, owned (non-shared), static, 32-bit memories (whew!).
-                    if plan.memory.shared || plan.memory.memory64 {
-                        continue;
-                    }
-                    let static_bound_wasm_pages = match &plan.style {
-                        MemoryStyle::Dynamic { .. } => continue,
-                        MemoryStyle::Static { bound } => *bound,
-                    };
-                    let static_bound = static_bound_wasm_pages.checked_mul(0x1_0000).unwrap();
-                    let def_memory_idx = match self.module.defined_memory_index(memory_idx) {
-                        Some(i) => i,
-                        None => continue,
-                    };
-                    let owned_memory_idx = self.module.owned_memory_index(def_memory_idx);
-
-                    let base_field_offset = self
-                        .offsets
-                        .vmctx_vmmemory_definition_base(owned_memory_idx);
-                    // Create a new "blob" memory type to represent the pointed-to memory.
-                    let data_mt = func.create_memory_type(ir::MemoryTypeData::Memory {
-                        size: static_bound
-                            .checked_add(plan.offset_guard_size)
-                            .expect("Memory plan has overflowing size plus guard"),
-                    });
-
-                    self.pcc_memory_memtypes[memory_idx] = Some(data_mt);
-
-                    fields.push(ir::MemoryTypeField {
-                        offset: u64::from(base_field_offset),
-                        ty: self.isa.pointer_type(),
-                        // Read-only field from the PoV of PCC checks:
-                        // don't allow stores to this field. (Even if
-                        // it is a dynamic memory whose base can
-                        // change, that update happens inside the
-                        // runtime, not in generated code.)
-                        readonly: true,
-                        fact: Some(Fact::Mem {
-                            ty: data_mt,
-                            min_offset: 0,
-                            max_offset: 0,
-                        }),
-                    });
-                }
-                let size = fields
-                    .iter()
-                    .map(|field| field.offset + u64::from(self.isa.pointer_type().bytes()))
-                    .max()
-                    .unwrap_or(0);
-
-                let vmctx_memtype =
-                    func.create_memory_type(ir::MemoryTypeData::Struct { size, fields });
-
-                self.pcc_vmctx_memtype = Some(vmctx_memtype);
-                func.global_value_facts[vmctx] = Some(Fact::Mem {
-                    ty: vmctx_memtype,
-                    min_offset: 0,
-                    max_offset: 0,
-                });
-            }
             self.vmctx = Some(vmctx);
             vmctx
         })
@@ -426,7 +352,7 @@ impl<'module_environment> FuncEnvironment<'module_environment> {
                 base: vmctx,
                 offset: Offset32::new(i32::try_from(from_offset).unwrap()),
                 global_type: pointer_type,
-                flags: MemFlags::trusted().with_readonly(),
+                readonly: true,
             });
             (global, 0)
         }
@@ -1271,10 +1197,6 @@ impl<'module_environment> TargetEnvironment for FuncEnvironment<'module_environm
     fn heap_access_spectre_mitigation(&self) -> bool {
         self.isa.flags().enable_heap_access_spectre_mitigation()
     }
-
-    fn proof_carrying_code(&self) -> bool {
-        self.isa.flags().enable_pcc()
-    }
 }
 
 impl<'module_environment> cranelift_wasm::FuncEnvironment for FuncEnvironment<'module_environment> {
@@ -1315,7 +1237,7 @@ impl<'module_environment> cranelift_wasm::FuncEnvironment for FuncEnvironment<'m
                     base: vmctx,
                     offset: Offset32::new(i32::try_from(from_offset).unwrap()),
                     global_type: pointer_type,
-                    flags: MemFlags::trusted().with_readonly(),
+                    readonly: true,
                 });
                 let base_offset = i32::from(self.offsets.vmtable_definition_base());
                 let current_elements_offset =
@@ -1328,7 +1250,7 @@ impl<'module_environment> cranelift_wasm::FuncEnvironment for FuncEnvironment<'m
             base: ptr,
             offset: Offset32::new(base_offset),
             global_type: pointer_type,
-            flags: MemFlags::trusted(),
+            readonly: false,
         });
         let bound_gv = func.create_global_value(ir::GlobalValueData::Load {
             base: ptr,
@@ -1337,7 +1259,7 @@ impl<'module_environment> cranelift_wasm::FuncEnvironment for FuncEnvironment<'m
                 u16::from(self.offsets.size_of_vmtable_definition_current_elements()) * 8,
             )
             .unwrap(),
-            flags: MemFlags::trusted(),
+            readonly: false,
         });
 
         let element_size = u64::from(
@@ -1839,11 +1761,6 @@ impl<'module_environment> cranelift_wasm::FuncEnvironment for FuncEnvironment<'m
                 u64::MAX
             });
 
-        let max_size = self.module.memory_plans[index]
-            .memory
-            .maximum
-            .and_then(|max| max.checked_mul(u64::from(WASM_PAGE_SIZE)));
-
         let (ptr, base_offset, current_length_offset) = {
             let vmctx = self.vmctx(func);
             if let Some(def_index) = self.module.defined_memory_index(index) {
@@ -1857,7 +1774,7 @@ impl<'module_environment> cranelift_wasm::FuncEnvironment for FuncEnvironment<'m
                         base: vmctx,
                         offset: Offset32::new(i32::try_from(from_offset).unwrap()),
                         global_type: pointer_type,
-                        flags: MemFlags::trusted().with_readonly(),
+                        readonly: true,
                     });
                     let base_offset = i32::from(self.offsets.ptr.vmmemory_definition_base());
                     let current_length_offset =
@@ -1880,7 +1797,7 @@ impl<'module_environment> cranelift_wasm::FuncEnvironment for FuncEnvironment<'m
                     base: vmctx,
                     offset: Offset32::new(i32::try_from(from_offset).unwrap()),
                     global_type: pointer_type,
-                    flags: MemFlags::trusted().with_readonly(),
+                    readonly: true,
                 });
                 let base_offset = i32::from(self.offsets.ptr.vmmemory_definition_base());
                 let current_length_offset =
@@ -1902,7 +1819,7 @@ impl<'module_environment> cranelift_wasm::FuncEnvironment for FuncEnvironment<'m
                     base: ptr,
                     offset: Offset32::new(current_length_offset),
                     global_type: pointer_type,
-                    flags: MemFlags::trusted(),
+                    readonly: false,
                 });
                 (
                     offset_guard_size,
@@ -1926,33 +1843,18 @@ impl<'module_environment> cranelift_wasm::FuncEnvironment for FuncEnvironment<'m
             ),
         };
 
-        let mut flags = MemFlags::trusted().with_checked();
-        if readonly_base {
-            flags.set_readonly();
-        }
         let heap_base = func.create_global_value(ir::GlobalValueData::Load {
             base: ptr,
             offset: Offset32::new(base_offset),
             global_type: pointer_type,
-            flags,
+            readonly: readonly_base,
         });
-        let memory_type = self.pcc_memory_memtypes[index];
-        if let Some(ty) = memory_type {
-            func.global_value_facts[heap_base] = Some(Fact::Mem {
-                ty,
-                min_offset: 0,
-                max_offset: 0,
-            });
-        }
-
         Ok(self.heaps.push(HeapData {
             base: heap_base,
             min_size,
-            max_size,
             offset_guard_size,
             style: heap_style,
             index_type: self.memory_index_type(index),
-            memory_type,
         }))
     }
 
diff --git a/crates/environ/Cargo.toml b/crates/environ/Cargo.toml
index 3651744ea14e..1fd84a613fdf 100644
--- a/crates/environ/Cargo.toml
+++ b/crates/environ/Cargo.toml
@@ -28,7 +28,8 @@ wasmprinter = { workspace = true, optional = true }
 wasmtime-component-util = { workspace = true, optional = true }
 
 [dev-dependencies]
-clap = { workspace = true, features = ['default'] }
+atty = "0.2.14"
+clap = { workspace = true }
 env_logger = { workspace = true }
 wat = { workspace = true }
 
diff --git a/crates/environ/examples/factc.rs b/crates/environ/examples/factc.rs
index 6dfb7136e485..171fd6cd962d 100644
--- a/crates/environ/examples/factc.rs
+++ b/crates/environ/examples/factc.rs
@@ -1,6 +1,6 @@
 use anyhow::{bail, Context, Result};
 use clap::Parser;
-use std::io::{IsTerminal, Write};
+use std::io::Write;
 use std::path::PathBuf;
 use wasmparser::{Validator, WasmFeatures};
 use wasmtime_environ::component::*;
@@ -179,7 +179,7 @@ impl Factc {
             wasmprinter::print_bytes(&wasm)
                 .context("failed to convert binary wasm to text")?
                 .into_bytes()
-        } else if self.output.is_none() && std::io::stdout().is_terminal() {
+        } else if self.output.is_none() && atty::is(atty::Stream::Stdout) {
             bail!("cannot print binary wasm output to a terminal unless `-t` flag is passed")
         } else {
             wasm.clone()
diff --git a/crates/environ/fuzz/Cargo.toml b/crates/environ/fuzz/Cargo.toml
index d4a68fee44c7..2c6996b4da46 100644
--- a/crates/environ/fuzz/Cargo.toml
+++ b/crates/environ/fuzz/Cargo.toml
@@ -9,7 +9,7 @@ edition.workspace = true
 cargo-fuzz = true
 
 [dependencies]
-arbitrary = { workspace = true, features = ["derive"] }
+arbitrary = { version = "1.1.0", features = ["derive"] }
 env_logger = { workspace = true }
 libfuzzer-sys = { workspace = true }
 wasmparser = { workspace = true }
diff --git a/crates/environ/src/compilation.rs b/crates/environ/src/compilation.rs
index 3cee62b856ad..eede6d3bff4a 100644
--- a/crates/environ/src/compilation.rs
+++ b/crates/environ/src/compilation.rs
@@ -12,6 +12,7 @@ use object::{Architecture, BinaryFormat, FileFlags};
 use serde_derive::{Deserialize, Serialize};
 use std::any::Any;
 use std::borrow::Cow;
+use std::collections::BTreeMap;
 use std::fmt;
 use std::path;
 use std::sync::Arc;
@@ -347,10 +348,10 @@ pub trait Compiler: Send + Sync {
     }
 
     /// Returns a list of configured settings for this compiler.
-    fn flags(&self) -> Vec<(&'static str, FlagValue<'static>)>;
+    fn flags(&self) -> BTreeMap<String, FlagValue>;
 
     /// Same as [`Compiler::flags`], but ISA-specific (a cranelift-ism)
-    fn isa_flags(&self) -> Vec<(&'static str, FlagValue<'static>)>;
+    fn isa_flags(&self) -> BTreeMap<String, FlagValue>;
 
     /// Get a flag indicating whether branch protection is enabled.
     fn is_branch_protection_enabled(&self) -> bool;
@@ -382,16 +383,16 @@ pub trait Compiler: Send + Sync {
 
 /// Value of a configured setting for a [`Compiler`]
 #[derive(Serialize, Deserialize, Hash, Eq, PartialEq, Debug)]
-pub enum FlagValue<'a> {
+pub enum FlagValue {
     /// Name of the value that has been configured for this setting.
-    Enum(&'a str),
+    Enum(Cow<'static, str>),
     /// The numerical value of the configured settings.
     Num(u8),
     /// Whether the setting is on or off.
     Bool(bool),
 }
 
-impl fmt::Display for FlagValue<'_> {
+impl fmt::Display for FlagValue {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             Self::Enum(v) => v.fmt(f),
diff --git a/crates/environ/src/component/translate.rs b/crates/environ/src/component/translate.rs
index 77e75ed456e9..b054214536a8 100644
--- a/crates/environ/src/component/translate.rs
+++ b/crates/environ/src/component/translate.rs
@@ -281,7 +281,7 @@ impl<'a, 'data> Translator<'a, 'data> {
     /// `component` does not have to be valid and it will be validated during
     /// compilation.
     ///
-    /// The result of this function is a tuple of the final component's
+    /// THe result of this function is a tuple of the final component's
     /// description plus a list of core wasm modules found within the
     /// component. The component's description actually erases internal
     /// components, instances, etc, as much as it can. Instead `Component`
diff --git a/crates/fiber/Cargo.toml b/crates/fiber/Cargo.toml
index 555733050f51..4c221ee1f528 100644
--- a/crates/fiber/Cargo.toml
+++ b/crates/fiber/Cargo.toml
@@ -8,7 +8,6 @@ repository = "https://github.com/bytecodealliance/wasmtime"
 edition.workspace = true
 
 [dependencies]
-anyhow = { workspace = true }
 cfg-if = { workspace = true }
 wasmtime-versioned-export-macros = { workspace = true }
 
diff --git a/crates/fiber/src/lib.rs b/crates/fiber/src/lib.rs
index 5b20157cf7eb..79d7bdaa69e4 100644
--- a/crates/fiber/src/lib.rs
+++ b/crates/fiber/src/lib.rs
@@ -1,4 +1,3 @@
-use anyhow::Error;
 use std::any::Any;
 use std::cell::Cell;
 use std::io;
@@ -19,6 +18,7 @@ cfg_if::cfg_if! {
 }
 
 /// Represents an execution stack to use for a fiber.
+#[derive(Debug)]
 pub struct FiberStack(imp::FiberStack);
 
 impl FiberStack {
@@ -27,11 +27,6 @@ impl FiberStack {
         Ok(Self(imp::FiberStack::new(size)?))
     }
 
-    /// Creates a new fiber stack of the given size.
-    pub fn from_custom(custom: Box<dyn RuntimeFiberStack>) -> io::Result<Self> {
-        Ok(Self(imp::FiberStack::from_custom(custom)?))
-    }
-
     /// Creates a new fiber stack with the given pointer to the bottom of the
     /// stack plus the byte length of the stack.
     ///
@@ -63,23 +58,6 @@ impl FiberStack {
     }
 }
 
-/// A creator of RuntimeFiberStacks.
-pub unsafe trait RuntimeFiberStackCreator: Send + Sync {
-    /// Creates a new RuntimeFiberStack with the specified size, guard pages should be included.
-    ///
-    /// This is useful to plugin previously allocated memory instead of mmap'ing a new stack for
-    /// every instance.
-    fn new_stack(&self, size: usize) -> Result<Box<dyn RuntimeFiberStack>, Error>;
-}
-
-/// A fiber stack backed by custom memory.
-pub unsafe trait RuntimeFiberStack: Send + Sync {
-    /// The top of the allocated stack.
-    fn top(&self) -> *mut u8;
-    /// The valid range of the stack without guard pages.
-    fn range(&self) -> Range<usize>;
-}
-
 pub struct Fiber<'a, Resume, Yield, Return> {
     stack: FiberStack,
     inner: imp::Fiber,
diff --git a/crates/fiber/src/unix.rs b/crates/fiber/src/unix.rs
index 7b6534344ecd..b148ff324bca 100644
--- a/crates/fiber/src/unix.rs
+++ b/crates/fiber/src/unix.rs
@@ -31,22 +31,21 @@
 
 #![allow(unused_macros)]
 
-use crate::{RunResult, RuntimeFiberStack};
+use crate::RunResult;
 use std::cell::Cell;
 use std::io;
 use std::ops::Range;
 use std::ptr;
 
-pub enum FiberStack {
-    Default {
-        // The top of the stack; for stacks allocated by the fiber implementation itself,
-        // the base address of the allocation will be `top.sub(len.unwrap())`
-        top: *mut u8,
-        // The length of the stack
-        len: usize,
-        mmap: bool,
-    },
-    Custom(Box<dyn RuntimeFiberStack>),
+#[derive(Debug)]
+pub struct FiberStack {
+    // The top of the stack; for stacks allocated by the fiber implementation itself,
+    // the base address of the allocation will be `top.sub(len.unwrap())`
+    top: *mut u8,
+    // The length of the stack
+    len: usize,
+    // whether or not this stack was mmap'd
+    mmap: bool,
 }
 
 impl FiberStack {
@@ -76,7 +75,7 @@ impl FiberStack {
                 rustix::mm::MprotectFlags::READ | rustix::mm::MprotectFlags::WRITE,
             )?;
 
-            Ok(Self::Default {
+            Ok(Self {
                 top: mmap.cast::<u8>().add(mmap_len),
                 len: mmap_len,
                 mmap: true,
@@ -85,77 +84,28 @@ impl FiberStack {
     }
 
     pub unsafe fn from_raw_parts(base: *mut u8, len: usize) -> io::Result<Self> {
-        Ok(Self::Default {
+        Ok(Self {
             top: base.add(len),
             len,
             mmap: false,
         })
     }
 
-    pub fn from_custom(custom: Box<dyn RuntimeFiberStack>) -> io::Result<Self> {
-        Ok(Self::Custom(custom))
-    }
-
     pub fn top(&self) -> Option<*mut u8> {
-        Some(match self {
-            FiberStack::Default {
-                top,
-                len: _,
-                mmap: _,
-            } => *top,
-            FiberStack::Custom(r) => {
-                let top = r.top();
-                let page_size = rustix::param::page_size();
-                assert!(
-                    top.align_offset(page_size) == 0,
-                    "expected fiber stack top ({}) to be page aligned ({})",
-                    top as usize,
-                    page_size
-                );
-                top
-            }
-        })
+        Some(self.top)
     }
 
     pub fn range(&self) -> Option<Range<usize>> {
-        Some(match self {
-            FiberStack::Default { top, len, mmap: _ } => {
-                let base = unsafe { top.sub(*len) as usize };
-                base..base + len
-            }
-            FiberStack::Custom(s) => {
-                let range = s.range();
-                let page_size = rustix::param::page_size();
-                let start_ptr = range.start as *const u8;
-                assert!(
-                    start_ptr.align_offset(page_size) == 0,
-                    "expected fiber stack end ({}) to be page aligned ({})",
-                    range.start as usize,
-                    page_size
-                );
-                let end_ptr = range.end as *const u8;
-                assert!(
-                    end_ptr.align_offset(page_size) == 0,
-                    "expected fiber stack start ({}) to be page aligned ({})",
-                    range.end as usize,
-                    page_size
-                );
-                range
-            }
-        })
+        let base = unsafe { self.top.sub(self.len) as usize };
+        Some(base..base + self.len)
     }
 }
 
 impl Drop for FiberStack {
     fn drop(&mut self) {
         unsafe {
-            if let FiberStack::Default {
-                top,
-                len,
-                mmap: true,
-            } = self
-            {
-                let ret = rustix::mm::munmap(top.sub(*len) as _, *len);
+            if self.mmap {
+                let ret = rustix::mm::munmap(self.top.sub(self.len) as _, self.len);
                 debug_assert!(ret.is_ok());
             }
         }
@@ -198,7 +148,7 @@ impl Fiber {
     {
         unsafe {
             let data = Box::into_raw(Box::new(func)).cast();
-            wasmtime_fiber_init(stack.top().unwrap(), fiber_start::<F, A, B, C>, data);
+            wasmtime_fiber_init(stack.top, fiber_start::<F, A, B, C>, data);
         }
 
         Ok(Self)
@@ -210,10 +160,10 @@ impl Fiber {
             // stack, otherwise known as our reserved slot for this information.
             //
             // In the diagram above this is updating address 0xAff8
-            let addr = stack.top().unwrap().cast::<usize>().offset(-1);
+            let addr = stack.top.cast::<usize>().offset(-1);
             addr.write(result as *const _ as usize);
 
-            wasmtime_fiber_switch(stack.top().unwrap());
+            wasmtime_fiber_switch(stack.top);
 
             // null this out to help catch use-after-free
             addr.write(0);
diff --git a/crates/fiber/src/windows.rs b/crates/fiber/src/windows.rs
index d04172704d84..2e09f28b7951 100644
--- a/crates/fiber/src/windows.rs
+++ b/crates/fiber/src/windows.rs
@@ -1,4 +1,4 @@
-use crate::{RunResult, RuntimeFiberStack};
+use crate::RunResult;
 use std::cell::Cell;
 use std::ffi::c_void;
 use std::io;
@@ -19,10 +19,6 @@ impl FiberStack {
         Err(io::Error::from_raw_os_error(ERROR_NOT_SUPPORTED as i32))
     }
 
-    pub fn from_custom(_custom: Box<dyn RuntimeFiberStack>) -> io::Result<Self> {
-        Err(io::Error::from_raw_os_error(ERROR_NOT_SUPPORTED as i32))
-    }
-
     pub fn top(&self) -> Option<*mut u8> {
         None
     }
diff --git a/crates/fuzzing/Cargo.toml b/crates/fuzzing/Cargo.toml
index 4e56f948489e..06390fdacbb4 100644
--- a/crates/fuzzing/Cargo.toml
+++ b/crates/fuzzing/Cargo.toml
@@ -9,7 +9,7 @@ license = "Apache-2.0 WITH LLVM-exception"
 
 [dependencies]
 anyhow = { workspace = true }
-arbitrary = { workspace = true, features = ["derive"] }
+arbitrary = { version = "1.1.0", features = ["derive"] }
 component-test-util = { workspace = true }
 component-fuzz-util = { workspace = true }
 env_logger = { workspace = true }
diff --git a/crates/fuzzing/src/generators/config.rs b/crates/fuzzing/src/generators/config.rs
index a5914ee36b84..5a29e689fc2d 100644
--- a/crates/fuzzing/src/generators/config.rs
+++ b/crates/fuzzing/src/generators/config.rs
@@ -171,10 +171,6 @@ impl Config {
             .allocation_strategy(self.wasmtime.strategy.to_wasmtime())
             .generate_address_map(self.wasmtime.generate_address_map);
 
-        if !self.module_config.config.simd_enabled {
-            cfg.wasm_relaxed_simd(false);
-        }
-
         let compiler_strategy = &self.wasmtime.compiler_strategy;
         let cranelift_strategy = *compiler_strategy == CompilerStrategy::Cranelift;
         cfg.strategy(self.wasmtime.compiler_strategy.to_wasmtime());
@@ -260,7 +256,7 @@ impl Config {
     pub fn configure_store(&self, store: &mut Store<StoreLimits>) {
         store.limiter(|s| s as &mut dyn wasmtime::ResourceLimiter);
         if self.wasmtime.consume_fuel {
-            store.set_fuel(u64::MAX).unwrap();
+            store.add_fuel(u64::max_value()).unwrap();
         }
         if self.wasmtime.epoch_interruption {
             // Without fuzzing of async execution, we can't test the
diff --git a/crates/fuzzing/src/oracles.rs b/crates/fuzzing/src/oracles.rs
index 844654b4e4d2..d154904204b0 100644
--- a/crates/fuzzing/src/oracles.rs
+++ b/crates/fuzzing/src/oracles.rs
@@ -23,7 +23,9 @@ use self::engine::{DiffEngine, DiffInstance};
 use crate::generators::{self, DiffValue, DiffValueType};
 use arbitrary::Arbitrary;
 pub use stacks::check_stacks;
-use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering::SeqCst};
+use std::cell::Cell;
+use std::rc::Rc;
+use std::sync::atomic::{AtomicUsize, Ordering::SeqCst};
 use std::sync::{Arc, Condvar, Mutex};
 use std::time::{Duration, Instant};
 use wasmtime::*;
@@ -60,36 +62,35 @@ pub fn log_wasm(wasm: &[u8]) {
 /// The `T` in `Store<T>` for fuzzing stores, used to limit resource
 /// consumption during fuzzing.
 #[derive(Clone)]
-pub struct StoreLimits(Arc<LimitsState>);
+pub struct StoreLimits(Rc<LimitsState>);
 
 struct LimitsState {
     /// Remaining memory, in bytes, left to allocate
-    remaining_memory: AtomicUsize,
+    remaining_memory: Cell<usize>,
     /// Whether or not an allocation request has been denied
-    oom: AtomicBool,
+    oom: Cell<bool>,
 }
 
 impl StoreLimits {
     /// Creates the default set of limits for all fuzzing stores.
     pub fn new() -> StoreLimits {
-        StoreLimits(Arc::new(LimitsState {
+        StoreLimits(Rc::new(LimitsState {
             // Limits tables/memories within a store to at most 1gb for now to
             // exercise some larger address but not overflow various limits.
-            remaining_memory: AtomicUsize::new(1 << 30),
-            oom: AtomicBool::new(false),
+            remaining_memory: Cell::new(1 << 30),
+            oom: Cell::new(false),
         }))
     }
 
     fn alloc(&mut self, amt: usize) -> bool {
         log::trace!("alloc {amt:#x} bytes");
-        match self
-            .0
-            .remaining_memory
-            .fetch_update(SeqCst, SeqCst, |remaining| remaining.checked_sub(amt))
-        {
-            Ok(_) => true,
-            Err(_) => {
-                self.0.oom.store(true, SeqCst);
+        match self.0.remaining_memory.get().checked_sub(amt) {
+            Some(mem) => {
+                self.0.remaining_memory.set(mem);
+                true
+            }
+            None => {
+                self.0.oom.set(true);
                 log::debug!("OOM hit");
                 false
             }
@@ -97,7 +98,7 @@ impl StoreLimits {
     }
 
     fn is_oom(&self) -> bool {
-        self.0.oom.load(SeqCst)
+        self.0.oom.get()
     }
 }
 
@@ -145,7 +146,7 @@ pub fn instantiate(wasm: &[u8], known_valid: bool, config: &generators::Config,
 
     let mut timeout_state = SignalOnDrop::default();
     match timeout {
-        Timeout::Fuel(fuel) => store.set_fuel(fuel).unwrap(),
+        Timeout::Fuel(fuel) => set_fuel(&mut store, fuel),
 
         // If a timeout is requested then we spawn a helper thread to wait for
         // the requested time and then send us a signal to get interrupted. We
@@ -598,7 +599,7 @@ pub fn table_ops(
     {
         fuzz_config.wasmtime.consume_fuel = true;
         let mut store = fuzz_config.to_store();
-        store.set_fuel(1_000).unwrap();
+        set_fuel(&mut store, 1_000);
 
         let wasm = ops.to_wasm_binary();
         log_wasm(&wasm);
@@ -836,6 +837,20 @@ impl Drop for SignalOnDrop {
     }
 }
 
+/// Set the amount of fuel in a store to a given value
+pub fn set_fuel<T>(store: &mut Store<T>, fuel: u64) {
+    // Determine the amount of fuel already within the store, if any, and
+    // add/consume as appropriate to set the remaining amount to` fuel`.
+    let remaining = store.consume_fuel(0).unwrap();
+    if fuel > remaining {
+        store.add_fuel(fuel - remaining).unwrap();
+    } else {
+        store.consume_fuel(remaining - fuel).unwrap();
+    }
+    // double-check that the store has the expected amount of fuel remaining
+    assert_eq!(store.consume_fuel(0).unwrap(), fuel);
+}
+
 /// Generate and execute a `crate::generators::component_types::TestCase` using the specified `input` to create
 /// arbitrary types and values.
 pub fn dynamic_component_api_target(input: &mut arbitrary::Unstructured) -> arbitrary::Result<()> {
diff --git a/crates/jit/Cargo.toml b/crates/jit/Cargo.toml
index cc36542c066b..13fccaf9f769 100644
--- a/crates/jit/Cargo.toml
+++ b/crates/jit/Cargo.toml
@@ -12,9 +12,7 @@ edition.workspace = true
 
 [dependencies]
 wasmtime-environ = { workspace = true }
-wasmtime-jit-debug = { workspace = true, features = [
-  "perf_jitdump",
-], optional = true }
+wasmtime-jit-debug = { workspace = true, features = ["perf_jitdump"], optional = true }
 wasmtime-runtime = { workspace = true }
 target-lexicon = { workspace = true }
 anyhow = { workspace = true }
@@ -23,10 +21,10 @@ gimli = { workspace = true }
 object = { workspace = true }
 serde = "1.0.188"
 serde_derive = "1.0.188"
-addr2line = { version = "0.21.0", default-features = false, optional = true }
+addr2line = { version = "0.21.0", default-features = false }
 bincode = "1.2.1"
-rustc-demangle = { version = "0.1.16", optional = true }
-cpp_demangle = { version = "0.3.2", optional = true }
+rustc-demangle = "0.1.16"
+cpp_demangle = "0.3.2"
 log = { workspace = true }
 wasmtime-jit-icache-coherence = { workspace = true }
 
@@ -35,11 +33,13 @@ rustix = { workspace = true, features = ['thread'] }
 
 [target.'cfg(target_os = "windows")'.dependencies.windows-sys]
 workspace = true
-features = ["Win32_System_Diagnostics_Debug"]
+features = [
+  "Win32_System_Diagnostics_Debug",
+]
 
 [target.'cfg(all(target_arch = "x86_64", not(target_os = "android")))'.dependencies]
-ittapi = { version = "0.4.0", optional = true }
+ittapi = { version = "0.3.3", optional = true  }
 
 [features]
-profiling = ['dep:wasmtime-jit-debug', 'dep:ittapi']
-demangle = ['dep:rustc-demangle', 'dep:cpp_demangle']
+jitdump = ['wasmtime-jit-debug']
+vtune = ['ittapi']
diff --git a/crates/jit/src/demangling.rs b/crates/jit/src/demangling.rs
index d8116aa967e1..83b07d6f80c4 100644
--- a/crates/jit/src/demangling.rs
+++ b/crates/jit/src/demangling.rs
@@ -4,14 +4,13 @@
 ///
 /// Currently supported: Rust/C/C++ function names.
 pub fn demangle_function_name(writer: &mut impl std::fmt::Write, name: &str) -> std::fmt::Result {
-    #[cfg(feature = "demangle")]
     if let Ok(demangled) = rustc_demangle::try_demangle(name) {
-        return write!(writer, "{}", demangled);
+        write!(writer, "{}", demangled)
     } else if let Ok(demangled) = cpp_demangle::Symbol::new(name) {
-        return write!(writer, "{}", demangled);
+        write!(writer, "{}", demangled)
+    } else {
+        write!(writer, "{}", name)
     }
-
-    write!(writer, "{}", name)
 }
 
 /// Demangles a function name if it's provided, or returns a unified representation based on the
diff --git a/crates/jit/src/instantiate.rs b/crates/jit/src/instantiate.rs
index a991c9a4cbb8..2a3c7bd42619 100644
--- a/crates/jit/src/instantiate.rs
+++ b/crates/jit/src/instantiate.rs
@@ -509,7 +509,6 @@ impl CompiledModule {
     /// Returns the text section of the ELF image for this compiled module.
     ///
     /// This memory should have the read/execute permissions.
-    #[inline]
     pub fn text(&self) -> &[u8] {
         self.code_memory.text()
     }
@@ -576,7 +575,6 @@ impl CompiledModule {
     ///
     /// These trampolines are used for native callers (e.g. `Func::wrap`)
     /// calling Wasm callees.
-    #[inline]
     pub fn native_to_wasm_trampoline(&self, index: DefinedFuncIndex) -> Option<&[u8]> {
         let loc = self.funcs[index].native_to_wasm_trampoline?;
         Some(&self.text()[loc.start as usize..][..loc.length as usize])
@@ -667,7 +665,6 @@ impl CompiledModule {
     ///
     /// Basically this makes a thing which parses debuginfo and can tell you
     /// what filename and line number a wasm pc comes from.
-    #[cfg(feature = "addr2line")]
     pub fn symbolize_context(&self) -> Result<Option<SymbolizeContext<'_>>> {
         use gimli::EndianSlice;
         if !self.meta.has_wasm_debuginfo {
@@ -722,18 +719,15 @@ impl CompiledModule {
     }
 }
 
-#[cfg(feature = "addr2line")]
 type Addr2LineContext<'a> = addr2line::Context<gimli::EndianSlice<'a, gimli::LittleEndian>>;
 
 /// A context which contains dwarf debug information to translate program
 /// counters back to filenames and line numbers.
-#[cfg(feature = "addr2line")]
 pub struct SymbolizeContext<'a> {
     inner: Addr2LineContext<'a>,
     code_section_offset: u64,
 }
 
-#[cfg(feature = "addr2line")]
 impl<'a> SymbolizeContext<'a> {
     /// Returns access to the [`addr2line::Context`] which can be used to query
     /// frame information with.
diff --git a/crates/jit/src/lib.rs b/crates/jit/src/lib.rs
index 677575183705..e3afd3bf4099 100644
--- a/crates/jit/src/lib.rs
+++ b/crates/jit/src/lib.rs
@@ -11,10 +11,9 @@ pub mod profiling;
 mod unwind;
 
 pub use crate::code_memory::CodeMemory;
-#[cfg(feature = "addr2line")]
-pub use crate::instantiate::SymbolizeContext;
 pub use crate::instantiate::{
     subslice_range, CompiledFunctionInfo, CompiledModule, CompiledModuleInfo, ObjectBuilder,
+    SymbolizeContext,
 };
 pub use demangling::*;
 
diff --git a/crates/jit/src/profiling.rs b/crates/jit/src/profiling.rs
index bb05e55069e4..5e24344ac915 100644
--- a/crates/jit/src/profiling.rs
+++ b/crates/jit/src/profiling.rs
@@ -5,7 +5,7 @@ use crate::CodeMemory;
 use anyhow::{bail, Result};
 
 cfg_if::cfg_if! {
-    if #[cfg(all(feature = "profiling", target_os = "linux"))] {
+    if #[cfg(all(feature = "jitdump", target_os = "linux"))] {
         mod jitdump;
         pub use jitdump::new as new_jitdump;
     } else {
@@ -33,7 +33,7 @@ cfg_if::cfg_if! {
 cfg_if::cfg_if! {
     // Note: VTune support is disabled on windows mingw because the ittapi crate doesn't compile
     // there; see also https://github.com/bytecodealliance/wasmtime/pull/4003 for rationale.
-    if #[cfg(all(feature = "profiling", target_arch = "x86_64", not(any(target_os = "android", all(target_os = "windows", target_env = "gnu")))))] {
+    if #[cfg(all(feature = "vtune", target_arch = "x86_64", not(any(target_os = "android", all(target_os = "windows", target_env = "gnu")))))] {
         mod vtune;
         pub use vtune::new as new_vtune;
     } else {
@@ -76,7 +76,7 @@ pub trait ProfilingAgent: Send + Sync + 'static {
             }
             let address = sym.address();
             let size = sym.size();
-            if size == 0 {
+            if address == 0 || size == 0 {
                 continue;
             }
             if let Ok(name) = sym.name() {
diff --git a/crates/misc/component-fuzz-util/Cargo.toml b/crates/misc/component-fuzz-util/Cargo.toml
index dbfe8aba1bad..c1a64c59659f 100644
--- a/crates/misc/component-fuzz-util/Cargo.toml
+++ b/crates/misc/component-fuzz-util/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 
 [dependencies]
 anyhow = { workspace = true }
-arbitrary = { workspace = true, features = ["derive"] }
+arbitrary = { version = "1.1.0", features = ["derive"] }
 proc-macro2 = "1.0"
 quote = "1.0"
 wasmtime-component-util = { workspace = true }
diff --git a/crates/misc/component-test-util/Cargo.toml b/crates/misc/component-test-util/Cargo.toml
index 840a23234b3c..3280a5a6504e 100644
--- a/crates/misc/component-test-util/Cargo.toml
+++ b/crates/misc/component-test-util/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 [dependencies]
 env_logger = { workspace = true }
 anyhow = { workspace = true }
-arbitrary = { workspace = true, features = ["derive"] }
+arbitrary = { version = "1.1.0", features = ["derive"] }
 wasmtime = { workspace = true, features = ["component-model", "async"] }
diff --git a/crates/runtime/Cargo.toml b/crates/runtime/Cargo.toml
index d2f39ac10bb7..50002b88dead 100644
--- a/crates/runtime/Cargo.toml
+++ b/crates/runtime/Cargo.toml
@@ -50,7 +50,6 @@ features = [
 
 [dev-dependencies]
 once_cell = { workspace = true }
-proptest = "1.0.0"
 
 [build-dependencies]
 cc = "1.0"
@@ -58,7 +57,13 @@ wasmtime-versioned-export-macros = { workspace = true }
 
 [features]
 async = ["wasmtime-fiber"]
+
+# Enables support for the pooling instance allocator
 pooling-allocator = []
-component-model = ["wasmtime-environ/component-model", "dep:encoding_rs"]
+
+component-model = [
+  "wasmtime-environ/component-model",
+  "dep:encoding_rs",
+]
+
 wmemcheck = []
-debug-builtins = []
diff --git a/crates/runtime/proptest-regressions/instance/allocator/pooling/memory_pool.txt b/crates/runtime/proptest-regressions/instance/allocator/pooling/memory_pool.txt
deleted file mode 100644
index f95bfcd3875f..000000000000
--- a/crates/runtime/proptest-regressions/instance/allocator/pooling/memory_pool.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Seeds for failure cases proptest has generated in the past. It is
-# automatically read and these particular cases re-run before any
-# novel cases are generated.
-#
-# It is recommended to check this file in to source control so that
-# everyone who runs the test benefits from these saved cases.
-cc 696808084287d5d58b85c60c4720227ab4dd83ada7be6841a67162023aaf4914 # shrinks to c = SlabConstraints { max_memory_bytes: 0, num_memory_slots: 1, num_pkeys_available: 0, guard_bytes: 9223372036854775808 }
-cc cf9f6c36659f7f56ed8ea646e8c699cbf46708cef6911cdd376418ad69ea1388 # shrinks to c = SlabConstraints { max_memory_bytes: 14161452635954640438, num_memory_slots: 0, num_pkeys_available: 0, guard_bytes: 4285291437754911178 }
diff --git a/crates/runtime/src/instance.rs b/crates/runtime/src/instance.rs
index 8035f5db7f4a..a43bf11ad7c4 100644
--- a/crates/runtime/src/instance.rs
+++ b/crates/runtime/src/instance.rs
@@ -350,15 +350,6 @@ impl Instance {
         unsafe { *self.vmctx_plus_offset(self.offsets().vmctx_vmmemory_pointer(index)) }
     }
 
-    /// Return the memories defined within this instance (not imported).
-    pub fn defined_memories<'a>(
-        &'a self,
-    ) -> impl ExactSizeIterator<Item = (DefinedMemoryIndex, &'a Memory)> + 'a {
-        self.memories
-            .iter()
-            .map(|(index, (_alloc_index, memory))| (index, memory))
-    }
-
     /// Return the indexed `VMGlobalDefinition`.
     fn global(&mut self, index: DefinedGlobalIndex) -> &VMGlobalDefinition {
         unsafe { &*self.global_ptr(index) }
@@ -384,49 +375,7 @@ impl Instance {
         }
     }
 
-    /// Get all globals within this instance.
-    ///
-    /// Returns both import and defined globals.
-    ///
-    /// Returns both exported and non-exported globals.
-    ///
-    /// Gives access to the full globals space.
-    pub fn all_globals<'a>(
-        &'a mut self,
-    ) -> impl ExactSizeIterator<Item = (GlobalIndex, ExportGlobal)> + 'a {
-        let module = self.module().clone();
-        module.globals.keys().map(move |idx| {
-            (
-                idx,
-                ExportGlobal {
-                    definition: self.defined_or_imported_global_ptr(idx),
-                    global: self.module().globals[idx],
-                },
-            )
-        })
-    }
-
-    /// Get the globals defined in this instance (not imported).
-    pub fn defined_globals<'a>(
-        &'a mut self,
-    ) -> impl ExactSizeIterator<Item = (DefinedGlobalIndex, ExportGlobal)> + 'a {
-        let module = self.module().clone();
-        module
-            .globals
-            .keys()
-            .skip(module.num_imported_globals)
-            .map(move |global_idx| {
-                let def_idx = module.defined_global_index(global_idx).unwrap();
-                let global = ExportGlobal {
-                    definition: self.global_ptr(def_idx),
-                    global: self.module().globals[global_idx],
-                };
-                (def_idx, global)
-            })
-    }
-
     /// Return a pointer to the interrupts structure
-    #[inline]
     pub fn runtime_limits(&mut self) -> *mut *const VMRuntimeLimits {
         unsafe { self.vmctx_plus_offset_mut(self.offsets().vmctx_runtime_limits()) }
     }
@@ -1373,52 +1322,6 @@ impl InstanceHandle {
         self.instance_mut().get_table_with_lazy_init(index, range)
     }
 
-    /// Get all memories within this instance.
-    ///
-    /// Returns both import and defined memories.
-    ///
-    /// Returns both exported and non-exported memories.
-    ///
-    /// Gives access to the full memories space.
-    pub fn all_memories<'a>(
-        &'a mut self,
-    ) -> impl ExactSizeIterator<Item = (MemoryIndex, ExportMemory)> + 'a {
-        let indices = (0..self.module().memory_plans.len())
-            .map(|i| MemoryIndex::new(i))
-            .collect::<Vec<_>>();
-        indices
-            .into_iter()
-            .map(|i| (i, self.get_exported_memory(i)))
-    }
-
-    /// Return the memories defined in this instance (not imported).
-    pub fn defined_memories<'a>(&'a mut self) -> impl ExactSizeIterator<Item = ExportMemory> + 'a {
-        let num_imported = self.module().num_imported_memories;
-        self.all_memories()
-            .skip(num_imported)
-            .map(|(_i, memory)| memory)
-    }
-
-    /// Get all globals within this instance.
-    ///
-    /// Returns both import and defined globals.
-    ///
-    /// Returns both exported and non-exported globals.
-    ///
-    /// Gives access to the full globals space.
-    pub fn all_globals<'a>(
-        &'a mut self,
-    ) -> impl ExactSizeIterator<Item = (GlobalIndex, ExportGlobal)> + 'a {
-        self.instance_mut().all_globals()
-    }
-
-    /// Get the globals defined in this instance (not imported).
-    pub fn defined_globals<'a>(
-        &'a mut self,
-    ) -> impl ExactSizeIterator<Item = (DefinedGlobalIndex, ExportGlobal)> + 'a {
-        self.instance_mut().defined_globals()
-    }
-
     /// Return a reference to the contained `Instance`.
     #[inline]
     pub(crate) fn instance(&self) -> &Instance {
diff --git a/crates/runtime/src/instance/allocator.rs b/crates/runtime/src/instance/allocator.rs
index 5205d87c3444..35c1201495d6 100644
--- a/crates/runtime/src/instance/allocator.rs
+++ b/crates/runtime/src/instance/allocator.rs
@@ -1,7 +1,6 @@
 use crate::imports::Imports;
 use crate::instance::{Instance, InstanceHandle};
 use crate::memory::Memory;
-use crate::mpk::ProtectionKey;
 use crate::table::Table;
 use crate::{CompiledModuleId, ModuleRuntimeInfo, Store};
 use anyhow::{anyhow, bail, Result};
@@ -60,10 +59,6 @@ pub struct InstanceAllocationRequest<'a> {
 
     /// Indicates '--wmemcheck' flag.
     pub wmemcheck: bool,
-
-    /// Request that the instance's memories be protected by a specific
-    /// protection key.
-    pub pkey: Option<ProtectionKey>,
 }
 
 /// A pointer to a Store. This Option<*mut dyn Store> is wrapped in a struct
@@ -272,24 +267,6 @@ pub unsafe trait InstanceAllocatorImpl {
     /// Primarily present for the pooling allocator to remove mappings of
     /// this module from slots in linear memory.
     fn purge_module(&self, module: CompiledModuleId);
-
-    /// Use the next available protection key.
-    ///
-    /// The pooling allocator can use memory protection keys (MPK) for
-    /// compressing the guard regions protecting against OOB. Each
-    /// pool-allocated store needs its own key.
-    fn next_available_pkey(&self) -> Option<ProtectionKey>;
-
-    /// Restrict access to memory regions protected by `pkey`.
-    ///
-    /// This is useful for the pooling allocator, which can use memory
-    /// protection keys (MPK). Note: this may still allow access to other
-    /// protection keys, such as the default kernel key; see implementations of
-    /// this.
-    fn restrict_to_pkey(&self, pkey: ProtectionKey);
-
-    /// Allow access to memory regions protected by any protection key.
-    fn allow_all_pkeys(&self);
 }
 
 /// A thing that can allocate instances.
diff --git a/crates/runtime/src/instance/allocator/on_demand.rs b/crates/runtime/src/instance/allocator/on_demand.rs
index 5c7965304edd..ad4d951bf57a 100644
--- a/crates/runtime/src/instance/allocator/on_demand.rs
+++ b/crates/runtime/src/instance/allocator/on_demand.rs
@@ -3,7 +3,6 @@ use super::{
 };
 use crate::instance::RuntimeMemoryCreator;
 use crate::memory::{DefaultMemoryCreator, Memory};
-use crate::mpk::ProtectionKey;
 use crate::table::Table;
 use crate::CompiledModuleId;
 use anyhow::Result;
@@ -12,9 +11,6 @@ use wasmtime_environ::{
     DefinedMemoryIndex, DefinedTableIndex, HostPtr, MemoryPlan, Module, TablePlan, VMOffsets,
 };
 
-#[cfg(feature = "async")]
-use wasmtime_fiber::RuntimeFiberStackCreator;
-
 #[cfg(feature = "component-model")]
 use wasmtime_environ::{
     component::{Component, VMComponentOffsets},
@@ -26,29 +22,19 @@ use wasmtime_environ::{
 pub struct OnDemandInstanceAllocator {
     mem_creator: Option<Arc<dyn RuntimeMemoryCreator>>,
     #[cfg(feature = "async")]
-    stack_creator: Option<Arc<dyn RuntimeFiberStackCreator>>,
-    #[cfg(feature = "async")]
     stack_size: usize,
 }
 
 impl OnDemandInstanceAllocator {
     /// Creates a new on-demand instance allocator.
     pub fn new(mem_creator: Option<Arc<dyn RuntimeMemoryCreator>>, stack_size: usize) -> Self {
-        let _ = stack_size; // suppress warnings when async feature is disabled.
+        let _ = stack_size; // suppress unused warnings w/o async feature
         Self {
             mem_creator,
             #[cfg(feature = "async")]
-            stack_creator: None,
-            #[cfg(feature = "async")]
             stack_size,
         }
     }
-
-    /// Set the stack creator.
-    #[cfg(feature = "async")]
-    pub fn set_stack_creator(&mut self, stack_creator: Arc<dyn RuntimeFiberStackCreator>) {
-        self.stack_creator = Some(stack_creator);
-    }
 }
 
 impl Default for OnDemandInstanceAllocator {
@@ -56,8 +42,6 @@ impl Default for OnDemandInstanceAllocator {
         Self {
             mem_creator: None,
             #[cfg(feature = "async")]
-            stack_creator: None,
-            #[cfg(feature = "async")]
             stack_size: 0,
         }
     }
@@ -156,13 +140,8 @@ unsafe impl InstanceAllocatorImpl for OnDemandInstanceAllocator {
         if self.stack_size == 0 {
             anyhow::bail!("fiber stacks are not supported by the allocator")
         }
-        let stack = match &self.stack_creator {
-            Some(stack_creator) => {
-                let stack = stack_creator.new_stack(self.stack_size)?;
-                wasmtime_fiber::FiberStack::from_custom(stack)
-            }
-            None => wasmtime_fiber::FiberStack::new(self.stack_size),
-        }?;
+
+        let stack = wasmtime_fiber::FiberStack::new(self.stack_size)?;
         Ok(stack)
     }
 
@@ -172,25 +151,4 @@ unsafe impl InstanceAllocatorImpl for OnDemandInstanceAllocator {
     }
 
     fn purge_module(&self, _: CompiledModuleId) {}
-
-    fn next_available_pkey(&self) -> Option<ProtectionKey> {
-        // The on-demand allocator cannot use protection keys--it requires
-        // back-to-back allocation of memory slots that this allocator cannot
-        // guarantee.
-        None
-    }
-
-    fn restrict_to_pkey(&self, _: ProtectionKey) {
-        // The on-demand allocator cannot use protection keys; an on-demand
-        // allocator will never hand out protection keys to the stores its
-        // engine creates.
-        unreachable!()
-    }
-
-    fn allow_all_pkeys(&self) {
-        // The on-demand allocator cannot use protection keys; an on-demand
-        // allocator will never hand out protection keys to the stores its
-        // engine creates.
-        unreachable!()
-    }
 }
diff --git a/crates/runtime/src/instance/allocator/pooling.rs b/crates/runtime/src/instance/allocator/pooling.rs
index e0584726fa67..214e66c8c5f5 100644
--- a/crates/runtime/src/instance/allocator/pooling.rs
+++ b/crates/runtime/src/instance/allocator/pooling.rs
@@ -1,62 +1,11 @@
 //! Implements the pooling instance allocator.
 //!
-//! The pooling instance allocator maps memory in advance and allocates
-//! instances, memories, tables, and stacks from a pool of available resources.
-//! Using the pooling instance allocator can speed up module instantiation when
-//! modules can be constrained based on configurable limits
-//! ([`InstanceLimits`]). Each new instance is stored in a "slot"; as instances
-//! are allocated and freed, these slots are either filled or emptied:
+//! The pooling instance allocator maps memory in advance
+//! and allocates instances, memories, tables, and stacks from
+//! a pool of available resources.
 //!
-//! ```text
-//! ┌──────┬──────┬──────┬──────┬──────┐
-//! │Slot 0│Slot 1│Slot 2│Slot 3│......│
-//! └──────┴──────┴──────┴──────┴──────┘
-//! ```
-//!
-//! Note that these slots are a useful abstraction but not exactly how this is
-//! mapped to memory in fact. Each new instance _does_ get associated with a
-//! slot number (see uses of `index` and [`SlotId`] in this module) but the
-//! parts of the instances are stored in separate pools: memories in the
-//! [`MemoryPool`], tables in the [`TablePool`], etc. What ties these various
-//! parts together is the slot number generated by an [`IndexAllocator`] .
-//!
-//! The [`MemoryPool`] protects Wasmtime from out-of-bounds memory accesses by
-//! inserting inaccessible guard regions between memory slots. The
-//! [`MemoryPool`] documentation has a more in-depth chart but one can think of
-//! memories being laid out like the following:
-//!
-//! ```text
-//! ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-//! │Guard│Mem 0│Guard│Mem 1│Guard│Mem 2│.....│Guard│
-//! └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-//! ```
-//!
-//! To complicate matters, each instance can have multiple memories, multiple
-//! tables, etc. You might think these would be stored consecutively in their
-//! respective pools (for instance `n`, table 0 is at table pool slot `n + 0`
-//! and table 1 is at `n + 1`), but for memories this is not the case. With
-//! protection keys enabled, memories do not need interleaved guard regions
-//! because the protection key will signal a fault if the wrong memory is
-//! accessed. Instead, the pooling allocator "stripes" the memories with
-//! different protection keys.
-//!
-//! This concept, dubbed [ColorGuard] in the original paper, relies on careful
-//! calculation of the memory sizes to prevent any "overlapping access": there
-//! are limited protection keys available (15) so the next memory using the same
-//! key must be at least as far away as the guard region we would insert
-//! otherwise. This ends up looking like the following, where a store for
-//! instance 0 (`I0`) "stripes" two memories (`M0` and `M1`) with the same
-//! protection key 1 and far enough apart to signal an OOB access:
-//!
-//! ```text
-//! ┌─────┬─────┬─────┬─────┬────────────────┬─────┬─────┬─────┐
-//! │.....│I0:M1│.....│.....│.<enough slots>.│I0:M2│.....│.....│
-//! ├─────┼─────┼─────┼─────┼────────────────┼─────┼─────┼─────┤
-//! │.....│key 1│key 2│key 3│..<more keys>...│key 1│key 2│.....│
-//! └─────┴─────┴─────┴─────┴────────────────┴─────┴─────┴─────┘
-//! ```
-//!
-//! [ColorGuard]: https://plas2022.github.io/files/pdf/SegueColorGuard.pdf
+//! Using the pooling instance allocator can speed up module instantiation
+//! when modules can be constrained based on configurable limits.
 
 mod index_allocator;
 mod memory_pool;
@@ -78,11 +27,7 @@ cfg_if::cfg_if! {
 use super::{
     InstanceAllocationRequest, InstanceAllocatorImpl, MemoryAllocationIndex, TableAllocationIndex,
 };
-use crate::{
-    instance::Instance,
-    mpk::{self, MpkEnabled, ProtectionKey, ProtectionMask},
-    CompiledModuleId, Memory, Table,
-};
+use crate::{instance::Instance, CompiledModuleId, Memory, Table};
 use anyhow::{bail, Result};
 use memory_pool::MemoryPool;
 use std::{
@@ -217,10 +162,6 @@ pub struct PoolingInstanceAllocatorConfig {
     pub linear_memory_keep_resident: usize,
     /// Same as `linear_memory_keep_resident` but for tables.
     pub table_keep_resident: usize,
-    /// Whether to enable memory protection keys.
-    pub memory_protection_keys: MpkEnabled,
-    /// How many memory protection keys to allocate.
-    pub max_memory_protection_keys: usize,
 }
 
 impl Default for PoolingInstanceAllocatorConfig {
@@ -233,19 +174,15 @@ impl Default for PoolingInstanceAllocatorConfig {
             async_stack_keep_resident: 0,
             linear_memory_keep_resident: 0,
             table_keep_resident: 0,
-            memory_protection_keys: MpkEnabled::Disable,
-            max_memory_protection_keys: 16,
         }
     }
 }
 
 /// Implements the pooling instance allocator.
 ///
-/// This allocator internally maintains pools of instances, memories, tables,
-/// and stacks.
+/// This allocator internally maintains pools of instances, memories, tables, and stacks.
 ///
-/// Note: the resource pools are manually dropped so that the fault handler
-/// terminates correctly.
+/// Note: the resource pools are manually dropped so that the fault handler terminates correctly.
 #[derive(Debug)]
 pub struct PoolingInstanceAllocator {
     limits: InstanceLimits,
@@ -596,18 +533,6 @@ unsafe impl InstanceAllocatorImpl for PoolingInstanceAllocator {
     fn purge_module(&self, module: CompiledModuleId) {
         self.memories.purge_module(module);
     }
-
-    fn next_available_pkey(&self) -> Option<ProtectionKey> {
-        self.memories.next_available_pkey()
-    }
-
-    fn restrict_to_pkey(&self, pkey: ProtectionKey) {
-        mpk::allow(ProtectionMask::zero().or(pkey));
-    }
-
-    fn allow_all_pkeys(&self) {
-        mpk::allow(ProtectionMask::all());
-    }
 }
 
 #[cfg(test)]
diff --git a/crates/runtime/src/instance/allocator/pooling/index_allocator.rs b/crates/runtime/src/instance/allocator/pooling/index_allocator.rs
index 7d35f8e3f757..d4079680be89 100644
--- a/crates/runtime/src/instance/allocator/pooling/index_allocator.rs
+++ b/crates/runtime/src/instance/allocator/pooling/index_allocator.rs
@@ -167,12 +167,6 @@ impl ModuleAffinityIndexAllocator {
         }))
     }
 
-    /// How many slots can this allocator allocate?
-    pub fn len(&self) -> usize {
-        let inner = self.0.lock().unwrap();
-        inner.slot_state.len()
-    }
-
     /// Are zero slots in use right now?
     pub fn is_empty(&self) -> bool {
         let inner = self.0.lock().unwrap();
@@ -305,16 +299,8 @@ impl ModuleAffinityIndexAllocator {
         });
     }
 
-    /// Return the number of empty slots available in this allocator.
-    #[cfg(test)]
-    pub fn num_empty_slots(&self) -> usize {
-        let inner = self.0.lock().unwrap();
-        let total_slots = inner.slot_state.len();
-        (total_slots - inner.last_cold as usize) + inner.unused_warm_slots as usize
-    }
-
-    /// For testing only, we want to be able to assert what is on the single
-    /// freelist, for the policies that keep just one.
+    /// For testing only, we want to be able to assert what is on the
+    /// single freelist, for the policies that keep just one.
     #[cfg(test)]
     #[allow(unused)]
     pub(crate) fn testing_freelist(&self) -> Vec<SlotId> {
@@ -325,8 +311,8 @@ impl ModuleAffinityIndexAllocator {
             .collect()
     }
 
-    /// For testing only, get the list of all modules with at least one slot
-    /// with affinity for that module.
+    /// For testing only, get the list of all modules with at least
+    /// one slot with affinity for that module.
     #[cfg(test)]
     pub(crate) fn testing_module_affinity_list(&self) -> Vec<MemoryInModule> {
         let inner = self.0.lock().unwrap();
@@ -489,9 +475,7 @@ mod test {
     fn test_next_available_allocation_strategy() {
         for size in 0..20 {
             let state = ModuleAffinityIndexAllocator::new(size, 0);
-            assert_eq!(state.num_empty_slots() as u32, size);
             for i in 0..size {
-                assert_eq!(state.num_empty_slots() as u32, size - i);
                 assert_eq!(state.alloc(None).unwrap().index(), i as usize);
             }
             assert!(state.alloc(None).is_none());
@@ -512,9 +496,6 @@ mod test {
         assert_ne!(index1, index2);
 
         state.free(index1);
-        assert_eq!(state.num_empty_slots(), 99);
-
-        // Allocate to the same `index1` slot again.
         let index3 = state.alloc(Some(id1)).unwrap();
         assert_eq!(index3, index1);
         state.free(index3);
@@ -531,14 +512,13 @@ mod test {
         // for id1, and 98 empty. Allocate 100 for id2. The first
         // should be equal to the one we know was previously used for
         // id2. The next 99 are arbitrary.
-        assert_eq!(state.num_empty_slots(), 100);
+
         let mut indices = vec![];
         for _ in 0..100 {
             indices.push(state.alloc(Some(id2)).unwrap());
         }
         assert!(state.alloc(None).is_none());
         assert_eq!(indices[0], index2);
-        assert_eq!(state.num_empty_slots(), 0);
 
         for i in indices {
             state.free(i);
diff --git a/crates/runtime/src/instance/allocator/pooling/memory_pool.rs b/crates/runtime/src/instance/allocator/pooling/memory_pool.rs
index 2b25a6d076ae..45038a21e860 100644
--- a/crates/runtime/src/instance/allocator/pooling/memory_pool.rs
+++ b/crates/runtime/src/instance/allocator/pooling/memory_pool.rs
@@ -1,128 +1,65 @@
-//! Implements a memory pool using a single allocated memory slab.
-//!
-//! The pooling instance allocator maps memory in advance and allocates
-//! instances, memories, tables, and stacks from a pool of available resources.
-//! Using the pooling instance allocator can speed up module instantiation when
-//! modules can be constrained based on configurable limits
-//! ([`InstanceLimits`]). Each new instance is stored in a "slot"; as instances
-//! are allocated and freed, these slots are either filled or emptied:
-//!
-//! ```text
-//! ┌──────┬──────┬──────┬──────┬──────┐
-//! │Slot 0│Slot 1│Slot 2│Slot 3│......│
-//! └──────┴──────┴──────┴──────┴──────┘
-//! ```
-//!
-//! Note that these slots are a useful abstraction but not exactly how this is
-//! mapped to memory in fact. Each new instance _does_ get associated with a
-//! slot number (see uses of `index` and [`SlotId`] in this module) but the
-//! parts of the instances are stored in separate pools: memories in the
-//! [`MemoryPool`], tables in the [`TablePool`], etc. What ties these various
-//! parts together is the slot number generated by an [`IndexAllocator`] .
-//!
-//! The [`MemoryPool`] protects Wasmtime from out-of-bounds memory accesses by
-//! inserting inaccessible guard regions between memory slots. The
-//! [`MemoryPool`] documentation has a more in-depth chart but one can think of
-//! memories being laid out like the following:
-//!
-//! ```text
-//! ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
-//! │Guard│Mem 0│Guard│Mem 1│Guard│Mem 2│.....│Guard│
-//! └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
-//! ```
-//!
-//! To complicate matters, each instance can have multiple memories, multiple
-//! tables, etc. You might think these would be stored consecutively in their
-//! respective pools (for instance `n`, table 0 is at table pool slot `n + 0`
-//! and table 1 is at `n + 1`), but for memories this is not the case. With
-//! protection keys enabled, memories do not need interleaved guard regions
-//! because the protection key will signal a fault if the wrong memory is
-//! accessed. Instead, the pooling allocator "stripes" the memories with
-//! different protection keys.
-//!
-//! This concept, dubbed [ColorGuard] in the original paper, relies on careful
-//! calculation of the memory sizes to prevent any "overlapping access": there
-//! are limited protection keys available (15) so the next memory using the same
-//! key must be at least as far away as the guard region we would insert
-//! otherwise. This ends up looking like the following, where a store for
-//! instance 0 (`I0`) "stripes" two memories (`M0` and `M1`) with the same
-//! protection key 1 and far enough apart to signal an OOB access:
-//!
-//! ```text
-//! ┌─────┬─────┬─────┬─────┬────────────────┬─────┬─────┬─────┐
-//! │.....│I0:M1│.....│.....│.<enough slots>.│I0:M2│.....│.....│
-//! ├─────┼─────┼─────┼─────┼────────────────┼─────┼─────┼─────┤
-//! │.....│key 1│key 2│key 3│..<more keys>...│key 1│key 2│.....│
-//! └─────┴─────┴─────┴─────┴────────────────┴─────┴─────┴─────┘
-//! ```
-//!
-//! [ColorGuard]: https://plas2022.github.io/files/pdf/SegueColorGuard.pdf
-
 use super::{
     index_allocator::{MemoryInModule, ModuleAffinityIndexAllocator, SlotId},
     MemoryAllocationIndex,
 };
-use crate::mpk::{self, ProtectionKey, ProtectionMask};
 use crate::{
-    CompiledModuleId, InstanceAllocationRequest, InstanceLimits, Memory, MemoryImageSlot, Mmap,
-    MpkEnabled, PoolingInstanceAllocatorConfig,
+    CompiledModuleId, InstanceAllocationRequest, Memory, MemoryImageSlot, Mmap,
+    PoolingInstanceAllocatorConfig,
 };
 use anyhow::{anyhow, bail, Context, Result};
 use libc::c_void;
-use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Mutex;
 use wasmtime_environ::{
     DefinedMemoryIndex, MemoryPlan, MemoryStyle, Module, Tunables, WASM_PAGE_SIZE,
 };
 
-/// A set of allocator slots.
-///
-/// The allocated slots can be split by striping them: e.g., with two stripe
-/// colors 0 and 1, we would allocate all even slots using stripe 0 and all odd
-/// slots using stripe 1.
-///
-/// This is helpful for the use of protection keys: (a) if a request comes to
-/// allocate multiple instances, we can allocate them all from the same stripe
-/// and (b) if a store wants to allocate more from the same stripe it can.
-#[derive(Debug)]
-struct Stripe {
-    allocator: ModuleAffinityIndexAllocator,
-    pkey: Option<ProtectionKey>,
-}
-
 /// Represents a pool of WebAssembly linear memories.
 ///
 /// A linear memory is divided into accessible pages and guard pages.
 ///
 /// A diagram for this struct's fields is:
 ///
-/// ```text
-///          layout.max_memory_bytes                 layout.slot_bytes
-///                    |                                   |
-///              <-----+---->                  <-----------+----------->
-/// +-----------+------------+-----------+     +--------+---+-----------+-----------+
-/// | PROT_NONE |            | PROT_NONE | ... |            | PROT_NONE | PROT_NONE |
-/// +-----------+------------+-----------+     +--------+---+-----------+-----------+
-/// |           |<------------------+----------------------------------> <----+---->
-/// \           |                    \                                        |
-///  mapping    |            `layout.num_slots` memories         layout.post_slab_guard_size
+/// ```ignore
+///                       memory_size
+///                           /
+///         max_accessible   /                    memory_and_guard_size
+///                 |       /                               |
+///              <--+--->  /                    <-----------+---------->
+///              <--------+->
+///
+/// +-----------+--------+---+-----------+     +--------+---+-----------+
+/// | PROT_NONE |            | PROT_NONE | ... |            | PROT_NONE |
+/// +-----------+--------+---+-----------+     +--------+---+-----------+
+/// |           |<------------------+---------------------------------->
+/// \           |                    \
+/// mapping     |            `max_total_memories` memories
 ///            /
-///   layout.pre_slab_guard_size
+///    initial_memory_offset
 /// ```
 #[derive(Debug)]
 pub struct MemoryPool {
     mapping: Mmap,
-    /// This memory pool is stripe-aware. If using  memory protection keys, this
-    /// will contain one stripe per available key; otherwise, a single stripe
-    /// with an empty key.
-    stripes: Vec<Stripe>,
+    index_allocator: ModuleAffinityIndexAllocator,
     // If using a copy-on-write allocation scheme, the slot management. We
     // dynamically transfer ownership of a slot to a Memory when in
     // use.
     image_slots: Vec<Mutex<Option<MemoryImageSlot>>>,
-    /// A description of the various memory sizes used in allocating the
-    /// `mapping` slab.
-    layout: SlabLayout,
+    // The size, in bytes, of each linear memory's reservation, not including
+    // any guard region.
+    memory_size: usize,
+    // The size, in bytes, of each linear memory's reservation plus the trailing
+    // guard region allocated for it.
+    memory_and_guard_size: usize,
+    // The maximum size that can become accessible, in bytes, of each linear
+    // memory. Guaranteed to be a whole number of wasm pages.
+    max_accessible: usize,
+    // The size, in bytes, of the offset to the first linear memory in this
+    // pool. This is here to help account for the first region of guard pages,
+    // if desired, before the first linear memory.
+    initial_memory_offset: usize,
+    // The maximum number of memories that can be allocated concurrently, aka
+    // our pool's capacity.
+    max_total_memories: usize,
     // The maximum number of memories that a single core module instance may
     // use.
     //
@@ -137,9 +74,6 @@ pub struct MemoryPool {
     //
     // Only applicable on Linux.
     keep_resident: usize,
-    // Keep track of protection keys handed out to initialized stores; this
-    // allows us to round-robin the assignment of stores to stripes.
-    next_available_pkey: AtomicUsize,
 }
 
 impl MemoryPool {
@@ -153,109 +87,78 @@ impl MemoryPool {
             );
         }
 
-        let pkeys = match config.memory_protection_keys {
-            MpkEnabled::Auto => {
-                if mpk::is_supported() {
-                    mpk::keys(config.max_memory_protection_keys)
-                } else {
-                    &[]
-                }
-            }
-            MpkEnabled::Enable => {
-                if mpk::is_supported() {
-                    mpk::keys(config.max_memory_protection_keys)
-                } else {
-                    bail!("mpk is disabled on this system")
-                }
-            }
-            MpkEnabled::Disable => &[],
-        };
+        // Interpret the larger of the maximal size of memory or the static
+        // memory bound as the size of the virtual address space reservation for
+        // memory itself. Typically `static_memory_bound` is 4G which helps
+        // elide most bounds checks in wasm. If `memory_pages` is larger,
+        // though, then this is a non-moving pooling allocator so create larger
+        // reservations for account for that.
+        let memory_size = config.limits.memory_pages.max(tunables.static_memory_bound)
+            * u64::from(WASM_PAGE_SIZE);
 
-        // This is a tricky bit of global state: when creating a memory pool
-        // that uses memory protection keys, we ensure here that any host code
-        // will have access to all keys (i.e., stripes). It's only when we enter
-        // the WebAssembly guest code (see `StoreInner::call_hook`) that we
-        // enforce which keys/stripes can be accessed. Be forewarned about the
-        // assumptions here:
-        // - we expect this "allow all" configuration to reset the default
-        //   process state (only allow key 0) _before_ any memories are accessed
-        // - and we expect no other code (e.g., host-side code) to modify this
-        //   global MPK configuration
-        if !pkeys.is_empty() {
-            mpk::allow(ProtectionMask::all());
-        }
+        let memory_and_guard_size =
+            usize::try_from(memory_size + tunables.static_memory_offset_guard_size)
+                .map_err(|_| anyhow!("memory reservation size exceeds addressable memory"))?;
 
-        // Create a slab layout and allocate it as a completely inaccessible
-        // region to start--`PROT_NONE`.
-        let constraints = SlabConstraints::new(&config.limits, tunables, pkeys.len())?;
-        let layout = calculate(&constraints)?;
-        log::debug!("creating memory pool: {constraints:?} -> {layout:?}");
-        let mut mapping = Mmap::accessible_reserved(0, layout.total_slab_bytes()?)
-            .context("failed to create memory pool mapping")?;
+        assert!(
+            memory_and_guard_size % crate::page_size() == 0,
+            "memory size {} is not a multiple of system page size",
+            memory_and_guard_size
+        );
 
-        // Then, stripe the memory with the available protection keys. This is
-        // unnecessary if there is only one stripe color.
-        if layout.num_stripes >= 2 {
-            let mut cursor = layout.pre_slab_guard_bytes;
-            let pkeys = &pkeys[..layout.num_stripes];
-            for i in 0..constraints.num_slots {
-                let pkey = &pkeys[i % pkeys.len()];
-                let region = unsafe { mapping.slice_mut(cursor..cursor + layout.slot_bytes) };
-                pkey.protect(region)?;
-                cursor += layout.slot_bytes;
-            }
-            debug_assert_eq!(
-                cursor + layout.post_slab_guard_bytes,
-                layout.total_slab_bytes()?
-            );
-        }
+        let max_total_memories = config.limits.total_memories as usize;
+        let initial_memory_offset = if tunables.guard_before_linear_memory {
+            usize::try_from(tunables.static_memory_offset_guard_size).unwrap()
+        } else {
+            0
+        };
 
-        let image_slots: Vec<_> = std::iter::repeat_with(|| Mutex::new(None))
-            .take(constraints.num_slots)
-            .collect();
+        // The entire allocation here is the size of each memory (with guard
+        // regions) times the total number of memories in the pool.
+        //
+        // Note, though, that guard regions are required to be after each linear
+        // memory. If the `guard_before_linear_memory` setting is specified,
+        // then due to the contiguous layout of linear memories the guard pages
+        // after one memory are also guard pages preceding the next linear
+        // memory. This means that we only need to handle pre-guard-page sizes
+        // specially for the first linear memory, hence the
+        // `initial_memory_offset` variable here. If guards aren't specified
+        // before linear memories this is set to `0`, otherwise it's set to
+        // the same size as guard regions for other memories.
+        let allocation_size = memory_and_guard_size
+            .checked_mul(max_total_memories)
+            .and_then(|c| c.checked_add(initial_memory_offset))
+            .ok_or_else(|| {
+                anyhow!("total size of memory reservation exceeds addressable memory")
+            })?;
 
-        let create_stripe = |i| {
-            let num_slots = constraints.num_slots / layout.num_stripes
-                + usize::from(constraints.num_slots % layout.num_stripes > i);
-            let allocator = ModuleAffinityIndexAllocator::new(
-                num_slots.try_into().unwrap(),
-                config.max_unused_warm_slots,
-            );
-            Stripe {
-                allocator,
-                pkey: pkeys.get(i).cloned(),
-            }
-        };
+        // Create a completely inaccessible region to start
+        let mapping = Mmap::accessible_reserved(0, allocation_size)
+            .context("failed to create memory pool mapping")?;
 
-        debug_assert!(layout.num_stripes > 0);
-        let stripes: Vec<_> = (0..layout.num_stripes)
-            .into_iter()
-            .map(create_stripe)
+        let image_slots: Vec<_> = std::iter::repeat_with(|| Mutex::new(None))
+            .take(max_total_memories)
             .collect();
 
         let pool = Self {
-            stripes,
+            index_allocator: ModuleAffinityIndexAllocator::new(
+                config.limits.total_memories,
+                config.max_unused_warm_slots,
+            ),
             mapping,
             image_slots,
-            layout,
+            memory_size: memory_size.try_into().unwrap(),
+            memory_and_guard_size,
+            initial_memory_offset,
+            max_total_memories,
             memories_per_instance: usize::try_from(config.limits.max_memories_per_module).unwrap(),
+            max_accessible: (config.limits.memory_pages as usize) * (WASM_PAGE_SIZE as usize),
             keep_resident: config.linear_memory_keep_resident,
-            next_available_pkey: AtomicUsize::new(0),
         };
 
         Ok(pool)
     }
 
-    /// Return a protection key that stores can use for requesting new
-    pub fn next_available_pkey(&self) -> Option<ProtectionKey> {
-        let index = self.next_available_pkey.fetch_add(1, Ordering::SeqCst) % self.stripes.len();
-        debug_assert!(
-            self.stripes.len() < 2 || self.stripes[index].pkey.is_some(),
-            "if we are using stripes, we cannot have an empty protection key"
-        );
-        self.stripes[index].pkey.clone()
-    }
-
     /// Validate whether this memory pool supports the given module.
     pub fn validate(&self, module: &Module) -> Result<()> {
         let memories = module.memory_plans.len() - module.num_imported_memories;
@@ -267,7 +170,6 @@ impl MemoryPool {
             );
         }
 
-        let max_memory_pages = self.layout.max_memory_bytes / WASM_PAGE_SIZE as usize;
         for (i, plan) in module
             .memory_plans
             .iter()
@@ -275,7 +177,7 @@ impl MemoryPool {
         {
             match plan.style {
                 MemoryStyle::Static { bound } => {
-                    if u64::try_from(self.layout.pages_to_next_stripe_slot()).unwrap() < bound {
+                    if u64::try_from(self.memory_size).unwrap() < bound {
                         bail!(
                             "memory size allocated per-memory is too small to \
                              satisfy static bound of {bound:#x} pages"
@@ -284,12 +186,13 @@ impl MemoryPool {
                 }
                 MemoryStyle::Dynamic { .. } => {}
             }
-            if plan.memory.minimum > u64::try_from(max_memory_pages).unwrap() {
+            let max = self.max_accessible / (WASM_PAGE_SIZE as usize);
+            if plan.memory.minimum > u64::try_from(max).unwrap() {
                 bail!(
                     "memory index {} has a minimum page size of {} which exceeds the limit of {}",
                     i.as_u32(),
                     plan.memory.minimum,
-                    max_memory_pages,
+                    max,
                 );
             }
         }
@@ -298,7 +201,7 @@ impl MemoryPool {
 
     /// Are zero slots in use right now?
     pub fn is_empty(&self) -> bool {
-        self.stripes.iter().all(|s| s.allocator.is_empty())
+        self.index_allocator.is_empty()
     }
 
     /// Allocate a single memory for the given instance allocation request.
@@ -308,31 +211,21 @@ impl MemoryPool {
         memory_plan: &MemoryPlan,
         memory_index: DefinedMemoryIndex,
     ) -> Result<(MemoryAllocationIndex, Memory)> {
-        let stripe_index = if let Some(pkey) = &request.pkey {
-            pkey.as_stripe()
-        } else {
-            debug_assert!(self.stripes.len() < 2);
-            0
-        };
-
-        let striped_allocation_index = self.stripes[stripe_index]
-            .allocator
+        let allocation_index = self
+            .index_allocator
             .alloc(
                 request
                     .runtime_info
                     .unique_id()
                     .map(|id| MemoryInModule(id, memory_index)),
             )
-            .map(|slot| StripedAllocationIndex(u32::try_from(slot.index()).unwrap()))
+            .map(|slot| MemoryAllocationIndex(u32::try_from(slot.index()).unwrap()))
             .ok_or_else(|| {
                 anyhow!(
-                    "maximum concurrent memory limit of {} reached for stripe {}",
-                    self.stripes[stripe_index].allocator.len(),
-                    stripe_index
+                    "maximum concurrent memory limit of {} reached",
+                    self.max_total_memories
                 )
             })?;
-        let allocation_index =
-            striped_allocation_index.as_unstriped_slot_index(stripe_index, self.stripes.len());
 
         match (|| {
             // Double-check that the runtime requirements of the memory are
@@ -341,15 +234,14 @@ impl MemoryPool {
             // but double-check here to be sure.
             match memory_plan.style {
                 MemoryStyle::Static { bound } => {
-                    let pages_to_next_stripe_slot =
-                        u64::try_from(self.layout.pages_to_next_stripe_slot()).unwrap();
-                    assert!(bound <= pages_to_next_stripe_slot);
+                    let bound = bound * u64::from(WASM_PAGE_SIZE);
+                    assert!(bound <= u64::try_from(self.memory_size).unwrap());
                 }
                 MemoryStyle::Dynamic { .. } => {}
             }
 
             let base_ptr = self.get_base(allocation_index);
-            let base_capacity = self.layout.max_memory_bytes;
+            let base_capacity = self.max_accessible;
 
             let mut slot = self.take_memory_image_slot(allocation_index);
             let image = request.runtime_info.memory_image(memory_index)?;
@@ -375,15 +267,13 @@ impl MemoryPool {
                 base_ptr,
                 base_capacity,
                 slot,
-                self.layout.slot_bytes,
+                self.memory_and_guard_size,
                 unsafe { &mut *request.store.get().unwrap() },
             )
         })() {
             Ok(memory) => Ok((allocation_index, memory)),
             Err(e) => {
-                self.stripes[stripe_index]
-                    .allocator
-                    .free(SlotId(striped_allocation_index.0));
+                self.index_allocator.free(SlotId(allocation_index.0));
                 Err(e)
             }
         }
@@ -407,11 +297,7 @@ impl MemoryPool {
             self.return_memory_image_slot(allocation_index, image);
         }
 
-        let (stripe_index, striped_allocation_index) =
-            StripedAllocationIndex::from_unstriped_slot_index(allocation_index, self.stripes.len());
-        self.stripes[stripe_index]
-            .allocator
-            .free(SlotId(striped_allocation_index.0));
+        self.index_allocator.free(SlotId(allocation_index.0));
     }
 
     /// Purging everything related to `module`.
@@ -437,33 +323,31 @@ impl MemoryPool {
         // associated with a module (not just module and memory). The latter
         // would require care to make sure that its maintenance wouldn't be too
         // expensive for normal allocation/free operations.
-        for stripe in &self.stripes {
-            for i in 0..self.memories_per_instance {
-                use wasmtime_environ::EntityRef;
-                let memory_index = DefinedMemoryIndex::new(i);
-                while let Some(id) = stripe
-                    .allocator
-                    .alloc_affine_and_clear_affinity(module, memory_index)
-                {
-                    // Clear the image from the slot and, if successful, return it back
-                    // to our state. Note that on failure here the whole slot will get
-                    // paved over with an anonymous mapping.
-                    let index = MemoryAllocationIndex(id.0);
-                    let mut slot = self.take_memory_image_slot(index);
-                    if slot.remove_image().is_ok() {
-                        self.return_memory_image_slot(index, slot);
-                    }
-
-                    stripe.allocator.free(id);
+        for i in 0..self.memories_per_instance {
+            use wasmtime_environ::EntityRef;
+            let memory_index = DefinedMemoryIndex::new(i);
+            while let Some(id) = self
+                .index_allocator
+                .alloc_affine_and_clear_affinity(module, memory_index)
+            {
+                // Clear the image from the slot and, if successful, return it back
+                // to our state. Note that on failure here the whole slot will get
+                // paved over with an anonymous mapping.
+                let index = MemoryAllocationIndex(id.0);
+                let mut slot = self.take_memory_image_slot(index);
+                if slot.remove_image().is_ok() {
+                    self.return_memory_image_slot(index, slot);
                 }
+
+                self.index_allocator.free(id);
             }
         }
     }
 
     fn get_base(&self, allocation_index: MemoryAllocationIndex) -> *mut u8 {
-        assert!(allocation_index.index() < self.layout.num_slots);
+        assert!(allocation_index.index() < self.max_total_memories);
         let offset =
-            self.layout.pre_slab_guard_bytes + allocation_index.index() * self.layout.slot_bytes;
+            self.initial_memory_offset + allocation_index.index() * self.memory_and_guard_size;
         unsafe { self.mapping.as_ptr().offset(offset as isize).cast_mut() }
     }
 
@@ -479,7 +363,7 @@ impl MemoryPool {
             MemoryImageSlot::create(
                 self.get_base(allocation_index) as *mut c_void,
                 0,
-                self.layout.max_memory_bytes,
+                self.max_accessible,
             )
         })
     }
@@ -509,254 +393,10 @@ impl Drop for MemoryPool {
     }
 }
 
-/// The index of a memory allocation within an `InstanceAllocator`.
-#[derive(Clone, Copy, Debug, Eq, PartialEq, PartialOrd, Ord)]
-pub struct StripedAllocationIndex(u32);
-
-impl StripedAllocationIndex {
-    fn from_unstriped_slot_index(
-        index: MemoryAllocationIndex,
-        num_stripes: usize,
-    ) -> (usize, Self) {
-        let stripe_index = index.index() % num_stripes;
-        let num_stripes: u32 = num_stripes.try_into().unwrap();
-        let index_within_stripe = Self(index.0 / num_stripes);
-        (stripe_index, index_within_stripe)
-    }
-
-    fn as_unstriped_slot_index(self, stripe: usize, num_stripes: usize) -> MemoryAllocationIndex {
-        let num_stripes: u32 = num_stripes.try_into().unwrap();
-        let stripe: u32 = stripe.try_into().unwrap();
-        MemoryAllocationIndex(self.0 * num_stripes + stripe)
-    }
-}
-
-#[derive(Clone, Debug)]
-struct SlabConstraints {
-    /// Essentially, the `static_memory_bound`: this is an assumption that the
-    /// runtime and JIT compiler make about how much space will be guarded
-    /// between slots.
-    expected_slot_bytes: usize,
-    /// The maximum size of any memory in the pool.
-    max_memory_bytes: usize,
-    num_slots: usize,
-    num_pkeys_available: usize,
-    guard_bytes: usize,
-    guard_before_slots: bool,
-}
-
-impl SlabConstraints {
-    fn new(
-        limits: &InstanceLimits,
-        tunables: &Tunables,
-        num_pkeys_available: usize,
-    ) -> Result<Self> {
-        // The maximum size a memory can grow to in this pool.
-        let max_memory_bytes = limits.memory_pages * u64::from(WASM_PAGE_SIZE);
-
-        // `static_memory_bound` is the configured number of Wasm pages for a
-        // static memory slot (see `Config::static_memory_maximum_size`); even
-        // if the memory never grows to this size (e.g., it has a lower memory
-        // maximum), codegen will assume that this unused memory is mapped
-        // `PROT_NONE`. Typically `static_memory_bound` is 4G which helps elide
-        // most bounds checks. `MemoryPool` must respect this bound, though not
-        // explicitly: if we can achieve the same effect via MPK-protected
-        // stripes, the slot size can be lower than the `static_memory_bound`.
-        let expected_slot_bytes = tunables.static_memory_bound * u64::from(WASM_PAGE_SIZE);
-
-        let constraints = SlabConstraints {
-            max_memory_bytes: max_memory_bytes
-                .try_into()
-                .context("max memory is too large")?,
-            num_slots: limits
-                .total_memories
-                .try_into()
-                .context("too many memories")?,
-            expected_slot_bytes: expected_slot_bytes
-                .try_into()
-                .context("static memory bound is too large")?,
-            num_pkeys_available,
-            guard_bytes: tunables
-                .static_memory_offset_guard_size
-                .try_into()
-                .context("guard region is too large")?,
-            guard_before_slots: tunables.guard_before_linear_memory,
-        };
-        Ok(constraints)
-    }
-}
-
-#[derive(Debug)]
-struct SlabLayout {
-    /// The total number of slots available in the memory pool slab.
-    num_slots: usize,
-    /// The size of each slot in the memory pool; this contains the maximum
-    /// memory size (i.e., from WebAssembly or Wasmtime configuration) plus any
-    /// guard region after the memory to catch OOB access. On these guard
-    /// regions, note that:
-    /// - users can configure how aggressively (or not) to elide bounds checks
-    ///   via `Config::static_memory_guard_size`
-    /// - memory protection keys can compress the size of the guard region by
-    ///   placing slots from a different key (i.e., a stripe) in the guard
-    ///   region; this means the slot itself can be smaller and we can allocate
-    ///   more of them.
-    slot_bytes: usize,
-    // The maximum size that can become accessible, in bytes, for each linear
-    // memory. Guaranteed to be a whole number of wasm pages.
-    max_memory_bytes: usize,
-    /// The total number of bytes to allocate for the memory pool slab.
-    // total_slab_bytes: usize,
-    /// If necessary, the number of bytes to reserve as a guard region at the
-    /// beginning of the slab.
-    pre_slab_guard_bytes: usize,
-    /// Like `pre_slab_guard_bytes`, but at the end of the slab.
-    post_slab_guard_bytes: usize,
-    /// The number of stripes needed in the slab layout.
-    num_stripes: usize,
-}
-
-impl SlabLayout {
-    /// Return the total size of the slab, using the final layout (where `n =
-    /// num_slots`):
-    ///
-    /// ```text
-    /// ┌────────────────────┬──────┬──────┬───┬──────┬─────────────────────┐
-    /// │pre_slab_guard_bytes│slot 1│slot 2│...│slot n│post_slab_guard_bytes│
-    /// └────────────────────┴──────┴──────┴───┴──────┴─────────────────────┘
-    /// ```
-    fn total_slab_bytes(&self) -> Result<usize> {
-        self.slot_bytes
-            .checked_mul(self.num_slots)
-            .and_then(|c| c.checked_add(self.pre_slab_guard_bytes))
-            .and_then(|c| c.checked_add(self.post_slab_guard_bytes))
-            .ok_or_else(|| anyhow!("total size of memory reservation exceeds addressable memory"))
-    }
-
-    /// Returns the number of Wasm pages from the beginning of one slot to the
-    /// next slot in the same stripe--this is the striped equivalent of
-    /// `static_memory_bound`. Recall that between slots of the same stripe we
-    /// will see a slot from every other stripe.
-    ///
-    /// For example, in a 3-stripe pool, this function measures the distance
-    /// from the beginning of slot 1 to slot 4, which are of the same stripe:
-    ///
-    /// ```text
-    /// ┌────────┬──────┬──────┬────────┬───┐
-    /// │*slot 1*│slot 2│slot 3│*slot 4*│...|
-    /// └────────┴──────┴──────┴────────┴───┘
-    /// ```
-    fn pages_to_next_stripe_slot(&self) -> usize {
-        let slot_pages = self.slot_bytes / WASM_PAGE_SIZE as usize;
-        slot_pages * self.num_stripes
-    }
-}
-
-fn calculate(constraints: &SlabConstraints) -> Result<SlabLayout> {
-    let SlabConstraints {
-        max_memory_bytes,
-        num_slots,
-        expected_slot_bytes,
-        num_pkeys_available,
-        guard_bytes,
-        guard_before_slots,
-    } = *constraints;
-
-    // If the user specifies a guard region, we always need to allocate a
-    // `PROT_NONE` region for it before any memory slots. Recall that we can
-    // avoid bounds checks for loads and stores with immediates up to
-    // `guard_bytes`, but we rely on Wasmtime to emit bounds checks for any
-    // accesses greater than this.
-    let pre_slab_guard_bytes = if guard_before_slots { guard_bytes } else { 0 };
-
-    // To calculate the slot size, we start with the default configured size and
-    // attempt to chip away at this via MPK protection. Note here how we begin
-    // to define a slot as "all of the memory and guard region."
-    let slot_bytes = expected_slot_bytes
-        .max(max_memory_bytes)
-        .checked_add(guard_bytes)
-        .unwrap_or(usize::MAX);
-
-    let (num_stripes, slot_bytes) = if guard_bytes == 0 || max_memory_bytes == 0 || num_slots == 0 {
-        // In the uncommon case where the memory/guard regions are empty or we don't need any slots , we
-        // will not need any stripes: we just lay out the slots back-to-back
-        // using a single stripe.
-        (1, slot_bytes)
-    } else if num_pkeys_available < 2 {
-        // If we do not have enough protection keys to stripe the memory, we do
-        // the same. We can't elide any of the guard bytes because we aren't
-        // overlapping guard regions with other stripes...
-        (1, slot_bytes)
-    } else {
-        // ...but if we can create at least two stripes, we can use another
-        // stripe (i.e., a different pkey) as this slot's guard region--this
-        // reduces the guard bytes each slot has to allocate. We must make
-        // sure, though, that if the size of that other stripe(s) does not
-        // fully cover `guard_bytes`, we keep those around to prevent OOB
-        // access.
-
-        // We first calculate the number of stripes we need: we want to
-        // minimize this so that there is less chance of a single store
-        // running out of slots with its stripe--we need at least two,
-        // though. But this is not just an optimization; we need to handle
-        // the case when there are fewer slots than stripes. E.g., if our
-        // pool is configured with only three slots (`num_memory_slots =
-        // 3`), we will run into failures if we attempt to set up more than
-        // three stripes.
-        let needed_num_stripes =
-            slot_bytes / max_memory_bytes + usize::from(slot_bytes % max_memory_bytes != 0) + 1;
-        let num_stripes = num_pkeys_available.min(needed_num_stripes).min(num_slots);
-
-        // Next, we try to reduce the slot size by "overlapping" the
-        // stripes: we can make slot `n` smaller since we know that slot
-        // `n+1` and following are in different stripes and will look just
-        // like `PROT_NONE` memory.
-        let next_slots_overlapping_bytes = max_memory_bytes
-            .checked_mul(num_stripes - 1)
-            .unwrap_or(usize::MAX);
-        let needed_slot_bytes = slot_bytes
-            .checked_sub(next_slots_overlapping_bytes)
-            .unwrap_or(0)
-            .max(max_memory_bytes);
-        (num_stripes, needed_slot_bytes)
-    };
-
-    // The page-aligned slot size; equivalent to `memory_and_guard_size`.
-    let page_alignment = crate::page_size() - 1;
-    let slot_bytes = slot_bytes
-        .checked_add(page_alignment)
-        .and_then(|slot_bytes| Some(slot_bytes & !page_alignment))
-        .ok_or_else(|| anyhow!("slot size is too large"))?;
-
-    // We may need another guard region (like `pre_slab_guard_bytes`) at the end
-    // of our slab. We could be conservative and just create it as large as
-    // `guard_bytes`, but because we know that the last slot already has
-    // `guard_bytes` factored in to its guard region, we can reduce the final
-    // guard region by that much.
-    let post_slab_guard_bytes = guard_bytes
-        .checked_sub(slot_bytes - max_memory_bytes)
-        .unwrap_or(0);
-
-    // Check that we haven't exceeded the slab we can calculate given the limits
-    // of `usize`.
-    let layout = SlabLayout {
-        num_slots,
-        slot_bytes,
-        max_memory_bytes,
-        pre_slab_guard_bytes,
-        post_slab_guard_bytes,
-        num_stripes,
-    };
-    match layout.total_slab_bytes() {
-        Ok(_) => Ok(layout),
-        Err(e) => Err(e),
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
     use crate::{InstanceLimits, PoolingInstanceAllocator};
-    use proptest::prelude::*;
     use wasmtime_environ::WASM_PAGE_SIZE;
 
     #[cfg(target_pointer_width = "64")]
@@ -781,16 +421,16 @@ mod tests {
             },
         )?;
 
-        assert_eq!(pool.layout.slot_bytes, WASM_PAGE_SIZE as usize);
-        assert_eq!(pool.layout.num_slots, 5);
-        assert_eq!(pool.layout.max_memory_bytes, WASM_PAGE_SIZE as usize);
+        assert_eq!(pool.memory_and_guard_size, WASM_PAGE_SIZE as usize);
+        assert_eq!(pool.max_total_memories, 5);
+        assert_eq!(pool.max_accessible, WASM_PAGE_SIZE as usize);
 
         let base = pool.mapping.as_ptr() as usize;
 
         for i in 0..5 {
             let index = MemoryAllocationIndex(i);
             let ptr = pool.get_base(index);
-            assert_eq!(ptr as usize - base, i as usize * pool.layout.slot_bytes);
+            assert_eq!(ptr as usize - base, i as usize * pool.memory_and_guard_size);
         }
 
         Ok(())
@@ -815,185 +455,6 @@ mod tests {
             },
         )
         .unwrap();
-        assert_eq!(pool.memories.layout.max_memory_bytes, 2 * 65536);
-    }
-
-    #[test]
-    #[cfg_attr(miri, ignore)]
-    fn test_pooling_allocator_striping() {
-        if !mpk::is_supported() {
-            println!("skipping `test_pooling_allocator_striping` test; mpk is not supported");
-            return;
-        }
-
-        // Force the use of MPK.
-        let config = PoolingInstanceAllocatorConfig {
-            memory_protection_keys: MpkEnabled::Enable,
-            ..PoolingInstanceAllocatorConfig::default()
-        };
-        let pool = MemoryPool::new(&config, &Tunables::default()).unwrap();
-        assert!(pool.stripes.len() >= 2);
-
-        let max_memory_slots = config.limits.total_memories;
-        dbg!(pool.stripes[0].allocator.num_empty_slots());
-        dbg!(pool.stripes[1].allocator.num_empty_slots());
-        let available_memory_slots: usize = pool
-            .stripes
-            .iter()
-            .map(|s| s.allocator.num_empty_slots())
-            .sum();
-        assert_eq!(max_memory_slots, available_memory_slots.try_into().unwrap());
-    }
-
-    #[test]
-    fn check_known_layout_calculations() {
-        for num_pkeys_available in 0..16 {
-            for num_memory_slots in [0, 1, 10, 64] {
-                for expected_slot_bytes in [0, 1 << 30 /* 1GB */, 4 << 30 /* 4GB */] {
-                    for max_memory_bytes in
-                        [0, 1 * WASM_PAGE_SIZE as usize, 10 * WASM_PAGE_SIZE as usize]
-                    {
-                        for guard_bytes in [0, 2 << 30 /* 2GB */] {
-                            for guard_before_slots in [true, false] {
-                                let constraints = SlabConstraints {
-                                    max_memory_bytes,
-                                    num_slots: num_memory_slots,
-                                    expected_slot_bytes,
-                                    num_pkeys_available,
-                                    guard_bytes,
-                                    guard_before_slots,
-                                };
-                                let layout = calculate(&constraints);
-                                assert_slab_layout_invariants(constraints, layout.unwrap());
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    proptest! {
-        #[test]
-        #[cfg_attr(miri, ignore)]
-        fn check_random_layout_calculations(c in constraints()) {
-            if let Ok(l) = calculate(&c) {
-                assert_slab_layout_invariants(c, l);
-            }
-        }
-    }
-
-    fn constraints() -> impl Strategy<Value = SlabConstraints> {
-        (
-            any::<usize>(),
-            any::<usize>(),
-            any::<usize>(),
-            any::<usize>(),
-            any::<usize>(),
-            any::<bool>(),
-        )
-            .prop_map(
-                |(
-                    max_memory_bytes,
-                    num_memory_slots,
-                    expected_slot_bytes,
-                    num_pkeys_available,
-                    guard_bytes,
-                    guard_before_slots,
-                )| {
-                    SlabConstraints {
-                        max_memory_bytes,
-                        num_slots: num_memory_slots,
-                        expected_slot_bytes,
-                        num_pkeys_available,
-                        guard_bytes,
-                        guard_before_slots,
-                    }
-                },
-            )
-    }
-
-    fn assert_slab_layout_invariants(c: SlabConstraints, s: SlabLayout) {
-        // Check that all the sizes add up.
-        assert_eq!(
-            s.total_slab_bytes().unwrap(),
-            s.pre_slab_guard_bytes + s.slot_bytes * c.num_slots + s.post_slab_guard_bytes,
-            "the slab size does not add up: {c:?} => {s:?}"
-        );
-        assert!(
-            s.slot_bytes >= s.max_memory_bytes,
-            "slot is not big enough: {c:?} => {s:?}"
-        );
-
-        // Check that the various memory values are page-aligned.
-        assert!(
-            is_aligned(s.slot_bytes),
-            "slot is not page-aligned: {c:?} => {s:?}",
-        );
-        assert!(
-            is_aligned(s.max_memory_bytes),
-            "slot guard region is not page-aligned: {c:?} => {s:?}",
-        );
-        assert!(
-            is_aligned(s.pre_slab_guard_bytes),
-            "pre-slab guard region is not page-aligned: {c:?} => {s:?}"
-        );
-        assert!(
-            is_aligned(s.post_slab_guard_bytes),
-            "post-slab guard region is not page-aligned: {c:?} => {s:?}"
-        );
-        assert!(
-            is_aligned(s.total_slab_bytes().unwrap()),
-            "slab is not page-aligned: {c:?} => {s:?}"
-        );
-
-        // Check that we use no more or less stripes than needed.
-        assert!(s.num_stripes >= 1, "not enough stripes: {c:?} => {s:?}");
-        if c.num_pkeys_available == 0 || c.num_slots == 0 {
-            assert_eq!(
-                s.num_stripes, 1,
-                "expected at least one stripe: {c:?} => {s:?}"
-            );
-        } else {
-            assert!(
-                s.num_stripes <= c.num_pkeys_available,
-                "layout has more stripes than available pkeys: {c:?} => {s:?}"
-            );
-            assert!(
-                s.num_stripes <= c.num_slots,
-                "layout has more stripes than memory slots: {c:?} => {s:?}"
-            );
-        }
-
-        // Check that we use the minimum number of stripes/protection keys.
-        // - if the next MPK-protected slot is bigger or the same as the
-        //   required guard region, we only need two stripes
-        // - if the next slot is smaller than the guard region, we only need
-        //   enough stripes to add up to at least that guard region size.
-        if c.num_pkeys_available > 1 && c.max_memory_bytes > 0 {
-            assert!(
-                s.num_stripes <= (c.guard_bytes / c.max_memory_bytes) + 2,
-                "calculated more stripes than needed: {c:?} => {s:?}"
-            );
-        }
-
-        // Check that the memory-striping will not allow OOB access.
-        // - we may have reduced the slot size from `expected_slot_bytes` to
-        //   `slot_bytes` assuming MPK striping; we check that the expectation
-        //   still holds
-        // - the last slot won't have MPK striping after it; we check that the
-        //   `post_slab_guard_bytes` accounts for this
-        assert!(
-            s.slot_bytes * s.num_stripes >= c.expected_slot_bytes + c.guard_bytes,
-            "slot may allow OOB access: {c:?} => {s:?}"
-        );
-        assert!(
-            s.slot_bytes + s.post_slab_guard_bytes >= c.expected_slot_bytes,
-            "last slot may allow OOB access: {c:?} => {s:?}"
-        );
-    }
-
-    fn is_aligned(bytes: usize) -> bool {
-        bytes % crate::page_size() == 0
+        assert_eq!(pool.memories.memory_size, 2 * 65536);
     }
 }
diff --git a/crates/runtime/src/instance/allocator/pooling/stack_pool.rs b/crates/runtime/src/instance/allocator/pooling/stack_pool.rs
index edb169f348da..8265cfcf94a7 100644
--- a/crates/runtime/src/instance/allocator/pooling/stack_pool.rs
+++ b/crates/runtime/src/instance/allocator/pooling/stack_pool.rs
@@ -213,7 +213,7 @@ mod tests {
 
         assert_eq!(pool.index_allocator.testing_freelist(), []);
 
-        assert!(pool.allocate().is_err(), "allocation should fail");
+        pool.allocate().unwrap_err();
 
         for stack in stacks {
             unsafe {
diff --git a/crates/runtime/src/instance/allocator/pooling/table_pool.rs b/crates/runtime/src/instance/allocator/pooling/table_pool.rs
index 558cb548e966..81938cb0491d 100644
--- a/crates/runtime/src/instance/allocator/pooling/table_pool.rs
+++ b/crates/runtime/src/instance/allocator/pooling/table_pool.rs
@@ -3,10 +3,9 @@ use super::{
     index_allocator::{SimpleIndexAllocator, SlotId},
     round_up_to_pow2, TableAllocationIndex,
 };
-use crate::{InstanceAllocationRequest, Mmap, PoolingInstanceAllocatorConfig, SendSyncPtr, Table};
+use crate::{InstanceAllocationRequest, Mmap, PoolingInstanceAllocatorConfig, Table};
 use anyhow::{anyhow, bail, Context, Result};
 use std::mem;
-use std::ptr::NonNull;
 use wasmtime_environ::{Module, TablePlan};
 
 /// Represents a pool of WebAssembly tables.
@@ -134,14 +133,11 @@ impl TablePool {
                 self.table_elements * mem::size_of::<*mut u8>(),
             )?;
 
-            let ptr = NonNull::new(std::ptr::slice_from_raw_parts_mut(
-                base.cast(),
-                self.table_elements,
-            ))
-            .unwrap();
-            Table::new_static(table_plan, SendSyncPtr::new(ptr), unsafe {
-                &mut *request.store.get().unwrap()
-            })
+            Table::new_static(
+                table_plan,
+                unsafe { std::slice::from_raw_parts_mut(base.cast(), self.table_elements) },
+                unsafe { &mut *request.store.get().unwrap() },
+            )
         })() {
             Ok(table) => Ok((allocation_index, table)),
             Err(e) => {
diff --git a/crates/runtime/src/lib.rs b/crates/runtime/src/lib.rs
index ebf3fe37cb79..ed2c4415ded6 100644
--- a/crates/runtime/src/lib.rs
+++ b/crates/runtime/src/lib.rs
@@ -29,10 +29,8 @@ mod table;
 mod traphandlers;
 mod vmcontext;
 
-#[cfg(feature = "debug-builtins")]
 pub mod debug_builtins;
 pub mod libcalls;
-pub mod mpk;
 
 pub use wasmtime_jit_debug::gdb_jit_int::GdbJitImageRegistration;
 
@@ -52,7 +50,6 @@ pub use crate::memory::{
 };
 pub use crate::mmap::Mmap;
 pub use crate::mmap_vec::MmapVec;
-pub use crate::mpk::MpkEnabled;
 pub use crate::store_box::*;
 pub use crate::table::{Table, TableElement};
 pub use crate::traphandlers::*;
diff --git a/crates/runtime/src/memory.rs b/crates/runtime/src/memory.rs
index ecdeda3f1897..84d568859d0a 100644
--- a/crates/runtime/src/memory.rs
+++ b/crates/runtime/src/memory.rs
@@ -565,7 +565,6 @@ impl SharedMemory {
     /// Implementation of `memory.atomic.notify` for this shared memory.
     pub fn atomic_notify(&self, addr_index: u64, count: u32) -> Result<u32, Trap> {
         validate_atomic_addr(&self.0.def.0, addr_index, 4, 4)?;
-        log::trace!("memory.atomic.notify(addr={addr_index:#x}, count={count})");
         Ok(self.0.spot.unpark(addr_index, count))
     }
 
@@ -577,18 +576,13 @@ impl SharedMemory {
         timeout: Option<Instant>,
     ) -> Result<WaitResult, Trap> {
         let addr = validate_atomic_addr(&self.0.def.0, addr_index, 4, 4)?;
-        log::trace!(
-            "memory.atomic.wait32(addr={addr_index:#x}, expected={expected}, timeout={timeout:?})"
-        );
-
         // SAFETY: `addr_index` was validated by `validate_atomic_addr` above.
         assert!(std::mem::size_of::<AtomicU32>() == 4);
         assert!(std::mem::align_of::<AtomicU32>() <= 4);
         let atomic = unsafe { &*(addr as *const AtomicU32) };
 
-        // We want the sequential consistency of `SeqCst` to ensure that the
-        // `load` sees the value that the `notify` will/would see. All WASM
-        // atomic operations are also `SeqCst`.
+        // We want the sequential consistency of `SeqCst` to ensure that the `load` sees the value that the `notify` will/would see.
+        // All WASM atomic operations are also `SeqCst`.
         let validate = || atomic.load(Ordering::SeqCst) == expected;
 
         Ok(self.0.spot.park(addr_index, validate, timeout))
@@ -602,10 +596,6 @@ impl SharedMemory {
         timeout: Option<Instant>,
     ) -> Result<WaitResult, Trap> {
         let addr = validate_atomic_addr(&self.0.def.0, addr_index, 8, 8)?;
-        log::trace!(
-            "memory.atomic.wait64(addr={addr_index:#x}, expected={expected}, timeout={timeout:?})"
-        );
-
         // SAFETY: `addr_index` was validated by `validate_atomic_addr` above.
         assert!(std::mem::size_of::<AtomicU64>() == 8);
         assert!(std::mem::align_of::<AtomicU64>() <= 8);
diff --git a/crates/runtime/src/mmap.rs b/crates/runtime/src/mmap.rs
index 4f9f4c64d4e5..1c077890c35b 100644
--- a/crates/runtime/src/mmap.rs
+++ b/crates/runtime/src/mmap.rs
@@ -122,7 +122,6 @@ impl Mmap {
     /// # Panics
     ///
     /// Panics of the `range` provided is outside of the limits of this mmap.
-    #[inline]
     pub unsafe fn slice(&self, range: Range<usize>) -> &[u8] {
         assert!(range.start <= range.end);
         assert!(range.end <= self.len());
diff --git a/crates/runtime/src/mmap_vec.rs b/crates/runtime/src/mmap_vec.rs
index c7822ffe9b4e..68d0e49f2c2b 100644
--- a/crates/runtime/src/mmap_vec.rs
+++ b/crates/runtime/src/mmap_vec.rs
@@ -127,7 +127,6 @@ impl MmapVec {
 impl Deref for MmapVec {
     type Target = [u8];
 
-    #[inline]
     fn deref(&self) -> &[u8] {
         // SAFETY: this mmap owns its own range of the underlying mmap so it
         // should be all good-to-read.
diff --git a/crates/runtime/src/mpk/disabled.rs b/crates/runtime/src/mpk/disabled.rs
deleted file mode 100644
index 7f6de55bc3ea..000000000000
--- a/crates/runtime/src/mpk/disabled.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-//! Noop implementations of MPK primitives for environments that do not support
-//! the feature.
-
-#![allow(missing_docs)]
-
-use anyhow::Result;
-
-pub fn is_supported() -> bool {
-    false
-}
-pub fn keys(_: usize) -> &'static [ProtectionKey] {
-    &[]
-}
-pub fn allow(_: ProtectionMask) {}
-
-#[derive(Clone, Copy, Debug)]
-pub enum ProtectionKey {}
-impl ProtectionKey {
-    pub fn protect(&self, _: &mut [u8]) -> Result<()> {
-        match *self {}
-    }
-    pub fn as_stripe(&self) -> usize {
-        match *self {}
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-pub struct ProtectionMask;
-impl ProtectionMask {
-    pub fn all() -> Self {
-        Self
-    }
-    pub fn zero() -> Self {
-        Self
-    }
-    pub fn or(self, _: ProtectionKey) -> Self {
-        Self
-    }
-}
diff --git a/crates/runtime/src/mpk/enabled.rs b/crates/runtime/src/mpk/enabled.rs
deleted file mode 100644
index f8a045d3a814..000000000000
--- a/crates/runtime/src/mpk/enabled.rs
+++ /dev/null
@@ -1,201 +0,0 @@
-//!
-
-use super::{pkru, sys};
-use anyhow::{Context, Result};
-use std::sync::OnceLock;
-
-/// Check if the MPK feature is supported.
-pub fn is_supported() -> bool {
-    cfg!(target_os = "linux") && cfg!(target_arch = "x86_64") && pkru::has_cpuid_bit_set()
-}
-
-/// Allocate up to `max` protection keys.
-///
-/// This asks the kernel for all available keys up to `max` in a thread-safe way
-/// (we can expect 1-15; 0 is kernel-reserved). This avoids interference when
-/// multiple threads try to allocate keys at the same time (e.g., during
-/// testing). It also ensures that a single copy of the keys is reserved for the
-/// lifetime of the process. Because of this, `max` is only a hint to
-/// allocation: it only is effective on the first invocation of this function.
-///
-/// TODO: this is not the best-possible design. This creates global state that
-/// would prevent any other code in the process from using protection keys; the
-/// `KEYS` are never deallocated from the system with `pkey_dealloc`.
-pub fn keys(max: usize) -> &'static [ProtectionKey] {
-    let keys = KEYS.get_or_init(|| {
-        let mut allocated = vec![];
-        if is_supported() {
-            while allocated.len() < max {
-                if let Ok(key_id) = sys::pkey_alloc(0, 0) {
-                    debug_assert!(key_id < 16);
-                    // UNSAFETY: here we unsafely assume that the
-                    // system-allocated pkey will exist forever.
-                    allocated.push(ProtectionKey {
-                        id: key_id,
-                        stripe: allocated.len().try_into().unwrap(),
-                    });
-                } else {
-                    break;
-                }
-            }
-        }
-        allocated
-    });
-    &keys[..keys.len().min(max)]
-}
-static KEYS: OnceLock<Vec<ProtectionKey>> = OnceLock::new();
-
-/// Only allow access to pages marked by the keys set in `mask`.
-///
-/// Any accesses to pages marked by another key will result in a `SIGSEGV`
-/// fault.
-pub fn allow(mask: ProtectionMask) {
-    let previous = pkru::read();
-    pkru::write(mask.0);
-    log::trace!("PKRU change: {:#034b} => {:#034b}", previous, pkru::read());
-}
-
-/// An MPK protection key.
-///
-/// The expected usage is:
-/// - receive system-allocated keys from [`keys`]
-/// - mark some regions of memory as accessible with [`ProtectionKey::protect`]
-/// - [`allow`] or disallow access to the memory regions using a
-///   [`ProtectionMask`]; any accesses to unmarked pages result in a fault
-/// - drop the key
-#[derive(Clone, Copy, Debug)]
-pub struct ProtectionKey {
-    id: u32,
-    stripe: u32,
-}
-
-impl ProtectionKey {
-    /// Mark a page as protected by this [`ProtectionKey`].
-    ///
-    /// This "colors" the pages of `region` via a kernel `pkey_mprotect` call to
-    /// only allow reads and writes when this [`ProtectionKey`] is activated
-    /// (see [`allow`]).
-    ///
-    /// # Errors
-    ///
-    /// This will fail if the region is not page aligned or for some unknown
-    /// kernel reason.
-    pub fn protect(&self, region: &mut [u8]) -> Result<()> {
-        let addr = region.as_mut_ptr() as usize;
-        let len = region.len();
-        let prot = sys::PROT_NONE;
-        sys::pkey_mprotect(addr, len, prot, self.id).with_context(|| {
-            format!(
-                "failed to mark region with pkey (addr = {addr:#x}, len = {len}, prot = {prot:#b})"
-            )
-        })
-    }
-
-    /// Convert the [`ProtectionKey`] to its 0-based index; this is useful for
-    /// determining which allocation "stripe" a key belongs to.
-    ///
-    /// This function assumes that the kernel has allocated key 0 for itself.
-    pub fn as_stripe(&self) -> usize {
-        self.stripe as usize
-    }
-}
-
-/// A bit field indicating which protection keys should be allowed and disabled.
-///
-/// The internal representation makes it easy to use [`ProtectionMask`] directly
-/// with the PKRU register. When bits `n` and `n+1` are set, it means the
-/// protection key is *not* allowed (see the PKRU write and access disabled
-/// bits).
-pub struct ProtectionMask(u32);
-impl ProtectionMask {
-    /// Allow access from all protection keys.
-    #[inline]
-    pub fn all() -> Self {
-        Self(pkru::ALLOW_ACCESS)
-    }
-
-    /// Only allow access to memory protected with protection key 0; note that
-    /// this does not mean "none" but rather allows access from the default
-    /// kernel protection key.
-    #[inline]
-    pub fn zero() -> Self {
-        Self(pkru::DISABLE_ACCESS ^ 0b11)
-    }
-
-    /// Include `pkey` as another allowed protection key in the mask.
-    #[inline]
-    pub fn or(self, pkey: ProtectionKey) -> Self {
-        let mask = pkru::DISABLE_ACCESS ^ 0b11 << (pkey.id * 2);
-        Self(self.0 & mask)
-    }
-}
-
-/// Helper macro for skipping tests on systems that do not have MPK enabled
-/// (e.g., older architecture, disabled by kernel, etc.)
-#[cfg(test)]
-macro_rules! skip_if_mpk_unavailable {
-    () => {
-        if !crate::mpk::is_supported() {
-            println!("> mpk is not supported: ignoring test");
-            return;
-        }
-    };
-}
-/// Necessary for inter-module access.
-#[cfg(test)]
-pub(crate) use skip_if_mpk_unavailable;
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn check_is_supported() {
-        println!("is pku supported = {}", is_supported());
-    }
-
-    #[test]
-    fn check_initialized_keys() {
-        if is_supported() {
-            assert!(!keys(15).is_empty())
-        }
-    }
-
-    #[test]
-    fn check_invalid_mark() {
-        skip_if_mpk_unavailable!();
-        let pkey = keys(15)[0];
-        let unaligned_region = unsafe {
-            let addr = 1 as *mut u8; // this is not page-aligned!
-            let len = 1;
-            std::slice::from_raw_parts_mut(addr, len)
-        };
-        let result = pkey.protect(unaligned_region);
-        assert!(result.is_err());
-        assert_eq!(
-            result.unwrap_err().to_string(),
-            "failed to mark region with pkey (addr = 0x1, len = 1, prot = 0b0)"
-        );
-    }
-
-    #[test]
-    fn check_masking() {
-        skip_if_mpk_unavailable!();
-        let original = pkru::read();
-
-        allow(ProtectionMask::all());
-        assert_eq!(0, pkru::read());
-
-        allow(ProtectionMask::all().or(ProtectionKey { id: 5, stripe: 0 }));
-        assert_eq!(0, pkru::read());
-
-        allow(ProtectionMask::zero());
-        assert_eq!(0b11111111_11111111_11111111_11111100, pkru::read());
-
-        allow(ProtectionMask::zero().or(ProtectionKey { id: 5, stripe: 0 }));
-        assert_eq!(0b11111111_11111111_11110011_11111100, pkru::read());
-
-        // Reset the PKRU state to what we originally observed.
-        pkru::write(original);
-    }
-}
diff --git a/crates/runtime/src/mpk/mod.rs b/crates/runtime/src/mpk/mod.rs
deleted file mode 100644
index bfffe24118f7..000000000000
--- a/crates/runtime/src/mpk/mod.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-//! Memory Protection Keys (MPK) implementation for use in striped memory
-//! allocation.
-//!
-//! MPK is an x86 feature available on relatively recent versions of Intel and
-//! AMD CPUs. In Linux, this feature is named `pku` (protection keys userspace)
-//! and consists of three new system calls: `pkey_alloc`, `pkey_free`, and
-//! `pkey_mprotect` (see the [Linux documentation]). This crate provides an
-//! abstraction, [`ProtectionKey`], that the [pooling allocator] applies to
-//! contiguous memory allocations, allowing it to avoid guard pages in some
-//! cases and more efficiently use memory. This technique was first presented in
-//! a 2022 paper: [Segue and ColorGuard: Optimizing SFI Performance and
-//! Scalability on Modern x86][colorguard].
-//!
-//! [pooling allocator]: crate::PoolingInstanceAllocator
-//! [Linux documentation]:
-//!     https://www.kernel.org/doc/html/latest/core-api/protection-keys.html
-//! [colorguard]: https://plas2022.github.io/files/pdf/SegueColorGuard.pdf
-//!
-//! On x86_64 Linux systems, this module implements the various parts necessary
-//! to use MPK in Wasmtime:
-//! - [`is_supported`] indicates whether the feature is available at runtime
-//! - [`ProtectionKey`] provides access to the kernel-allocated protection keys
-//!   (see [`keys`])
-//! - [`allow`] sets the CPU state to prevent access to regions outside the
-//!   [`ProtectionMask`]
-//! - the `sys` module bridges the gap to Linux's `pkey_*` system calls
-//! - the `pkru` module controls the x86 `PKRU` register (and other CPU state)
-//!
-//! On any other kind of machine, this module exposes noop implementations of
-//! the public interface.
-
-cfg_if::cfg_if! {
-    if #[cfg(all(target_arch = "x86_64", target_os = "linux", not(miri)))] {
-        mod enabled;
-        mod pkru;
-        mod sys;
-        pub use enabled::{allow, is_supported, keys, ProtectionKey, ProtectionMask};
-    } else {
-        mod disabled;
-        pub use disabled::{allow, is_supported, keys, ProtectionKey, ProtectionMask};
-    }
-}
-
-/// Describe the tri-state configuration of memory protection keys (MPK).
-#[derive(Clone, Copy, Debug)]
-pub enum MpkEnabled {
-    /// Use MPK if supported by the current system; fall back to guard regions
-    /// otherwise.
-    Auto,
-    /// Use MPK or fail if not supported.
-    Enable,
-    /// Do not use MPK.
-    Disable,
-}
diff --git a/crates/runtime/src/mpk/pkru.rs b/crates/runtime/src/mpk/pkru.rs
deleted file mode 100644
index 99dee74fa0f7..000000000000
--- a/crates/runtime/src/mpk/pkru.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-//! Control access to the x86 `PKRU` register.
-//!
-//! As documented in the Intel Software Development Manual, vol 3a, section 2.7,
-//! the 32 bits of the `PKRU` register laid out as follows (note the
-//! little-endianness):
-//!
-//! ```text
-//! ┌───┬───┬───┬───┬───┬───┐
-//! │...│AD2│WD1│AD1│WD0│AD0│
-//! └───┴───┴───┴───┴───┴───┘
-//! ```
-//!
-//! - `ADn = 1` means "access disable key `n`"--no reads or writes allowed to
-//!   pages marked with key `n`.
-//! - `WDn = 1` means "write disable key `n`"--only reads are prevented to pages
-//!   marked with key `n`
-//! - it is unclear what it means to have both `ADn` and `WDn` set
-//!
-//! Note that this only handles the user-mode `PKRU` register; there is an
-//! equivalent supervisor-mode MSR, `IA32_PKRS`.
-
-use core::arch::asm;
-
-/// This `PKRU` register mask allows access to any pages marked with any
-/// key--in other words, reading and writing is permitted to all pages.
-pub const ALLOW_ACCESS: u32 = 0;
-
-/// This `PKRU` register mask disables access to any page marked with any
-/// key--in other words, no reading or writing to all pages.
-pub const DISABLE_ACCESS: u32 = 0b11111111_11111111_11111111_11111111;
-
-/// Read the value of the `PKRU` register.
-pub fn read() -> u32 {
-    // ECX must be 0 to prevent a general protection exception (#GP).
-    let ecx: u32 = 0;
-    let pkru: u32;
-    unsafe {
-        asm!("rdpkru", in("ecx") ecx, out("eax") pkru, out("edx") _,
-            options(nomem, nostack, preserves_flags));
-    }
-    return pkru;
-}
-
-/// Write a value to the `PKRU` register.
-pub fn write(pkru: u32) {
-    // Both ECX and EDX must be 0 to prevent a general protection exception
-    // (#GP).
-    let ecx: u32 = 0;
-    let edx: u32 = 0;
-    unsafe {
-        asm!("wrpkru", in("eax") pkru, in("ecx") ecx, in("edx") edx,
-            options(nomem, nostack, preserves_flags));
-    }
-}
-
-/// Check the `ECX.PKU` flag (bit 3) of the `07h` `CPUID` leaf; see the
-/// Intel Software Development Manual, vol 3a, section 2.7.
-pub fn has_cpuid_bit_set() -> bool {
-    let result = unsafe { std::arch::x86_64::__cpuid(0x07) };
-    (result.ecx & 0b100) != 0
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::mpk::enabled::skip_if_mpk_unavailable;
-
-    #[test]
-    #[ignore = "cannot be run with other tests that munge the PKRU register"]
-    fn check_read() {
-        skip_if_mpk_unavailable!();
-        assert_eq!(read(), DISABLE_ACCESS ^ 1);
-        // By default, the Linux kernel only allows a process to access key 0,
-        // the default kernel key.
-    }
-
-    #[test]
-    fn check_roundtrip() {
-        skip_if_mpk_unavailable!();
-        let pkru = read();
-        // Allow access to pages marked with any key.
-        write(ALLOW_ACCESS);
-        assert_eq!(read(), ALLOW_ACCESS);
-        // Restore the original value.
-        write(pkru);
-        assert_eq!(read(), pkru);
-    }
-}
diff --git a/crates/runtime/src/mpk/sys.rs b/crates/runtime/src/mpk/sys.rs
deleted file mode 100644
index 671ea4eb9a25..000000000000
--- a/crates/runtime/src/mpk/sys.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-//! Expose the `pkey_*` Linux system calls. See the kernel documentation for
-//! more information:
-//! - [`pkeys`] overview
-//! - [`pkey_alloc`] (with `pkey_free`)
-//! - [`pkey_mprotect`]
-//! - `pkey_set` is implemented directly in assembly.
-//!
-//! [`pkey_alloc`]: https://man7.org/linux/man-pages/man2/pkey_alloc.2.html
-//! [`pkey_mprotect`]: https://man7.org/linux/man-pages/man2/pkey_mprotect.2.html
-//! [`pkeys`]: https://man7.org/linux/man-pages/man7/pkeys.7.html
-
-use crate::page_size;
-use anyhow::Result;
-use std::io::Error;
-
-/// Protection mask disallowing reads and writes of pkey-protected memory (see
-/// `prot` in [`pkey_mprotect`]); in Wasmtime we expect all MPK-protected memory
-/// to start as `PROT_NONE`.
-pub const PROT_NONE: u32 = libc::PROT_NONE as u32; // == 0b0000;
-
-/// Allocate a new protection key in the Linux kernel ([docs]); returns the
-/// key ID.
-///
-/// [docs]: https://man7.org/linux/man-pages/man2/pkey_alloc.2.html
-///
-/// Each process has its own separate pkey index; e.g., if process `m`
-/// allocates key 1, process `n` can as well.
-pub fn pkey_alloc(flags: u32, access_rights: u32) -> Result<u32> {
-    assert_eq!(flags, 0); // reserved for future use--must be 0.
-    let result = unsafe { libc::syscall(libc::SYS_pkey_alloc, flags, access_rights) };
-    if result >= 0 {
-        Ok(result
-            .try_into()
-            .expect("only pkey IDs between 0 and 15 are expected"))
-    } else {
-        debug_assert_eq!(result, -1); // only this error result is expected.
-        Err(Error::last_os_error().into())
-    }
-}
-
-/// Free a kernel protection key ([docs]).
-///
-/// [docs]: https://man7.org/linux/man-pages/man2/pkey_alloc.2.html
-#[allow(dead_code)]
-pub fn pkey_free(key: u32) -> Result<()> {
-    let result = unsafe { libc::syscall(libc::SYS_pkey_free, key) };
-    if result == 0 {
-        Ok(())
-    } else {
-        debug_assert_eq!(result, -1); // only this error result is expected.
-        Err(Error::last_os_error().into())
-    }
-}
-
-/// Change the access protections for a page-aligned memory region ([docs]).
-///
-/// [docs]: https://man7.org/linux/man-pages/man2/pkey_mprotect.2.html
-pub fn pkey_mprotect(addr: usize, len: usize, prot: u32, key: u32) -> Result<()> {
-    let page_size = page_size();
-    if addr % page_size != 0 {
-        log::warn!(
-            "memory must be page-aligned for MPK (addr = {addr:#x}, page size = {page_size}"
-        );
-    }
-    let result = unsafe { libc::syscall(libc::SYS_pkey_mprotect, addr, len, prot, key) };
-    if result == 0 {
-        Ok(())
-    } else {
-        debug_assert_eq!(result, -1); // only this error result is expected.
-        Err(Error::last_os_error().into())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[ignore = "cannot be run when keys() has already allocated all keys"]
-    #[test]
-    fn check_allocate_and_free() {
-        let key = pkey_alloc(0, 0).unwrap();
-        assert_eq!(key, 1);
-        // It may seem strange to assert the key ID here, but we already
-        // make some assumptions:
-        //  1. we are running on Linux with `pku` enabled
-        //  2. Linux will allocate key 0 for itself
-        //  3. we are running this test in non-MPK mode and no one else is
-        //     using pkeys
-        // If these assumptions are incorrect, this test can be removed.
-        pkey_free(key).unwrap()
-    }
-
-    #[test]
-    fn check_invalid_free() {
-        let result = pkey_free(42);
-        assert!(result.is_err());
-        assert_eq!(
-            result.unwrap_err().to_string(),
-            "Invalid argument (os error 22)"
-        );
-    }
-
-    #[test]
-    #[should_panic]
-    fn check_invalid_alloc_flags() {
-        let _ = pkey_alloc(42, 0);
-    }
-
-    #[test]
-    fn check_invalid_alloc_rights() {
-        assert!(pkey_alloc(0, 42).is_err());
-    }
-}
diff --git a/crates/runtime/src/send_sync_ptr.rs b/crates/runtime/src/send_sync_ptr.rs
index 5b6d05d4f4c0..ce9d8b422ed5 100644
--- a/crates/runtime/src/send_sync_ptr.rs
+++ b/crates/runtime/src/send_sync_ptr.rs
@@ -39,13 +39,6 @@ impl<T: ?Sized> SendSyncPtr<T> {
     }
 }
 
-impl<T> SendSyncPtr<[T]> {
-    /// Returns the slice's length component of the pointer.
-    pub fn len(&self) -> usize {
-        self.0.len()
-    }
-}
-
 impl<T: ?Sized, U> From<U> for SendSyncPtr<T>
 where
     U: Into<NonNull<T>>,
diff --git a/crates/runtime/src/table.rs b/crates/runtime/src/table.rs
index 2e5fcf3f4359..a978bc8924e5 100644
--- a/crates/runtime/src/table.rs
+++ b/crates/runtime/src/table.rs
@@ -153,7 +153,7 @@ pub enum Table {
     Static {
         /// Where data for this table is stored. The length of this list is the
         /// maximum size of the table.
-        data: SendSyncPtr<[TableValue]>,
+        data: &'static mut [TableValue],
         /// The current size of the table.
         size: u32,
         /// The type of this table.
@@ -200,7 +200,7 @@ impl Table {
     /// Create a new static (immovable) table instance for the specified table plan.
     pub fn new_static(
         plan: &TablePlan,
-        data: SendSyncPtr<[TableValue]>,
+        data: &'static mut [TableValue],
         store: &mut dyn Store,
     ) -> Result<Self> {
         Self::limit_new(plan, store)?;
@@ -215,10 +215,7 @@ impl Table {
             );
         }
         let data = match plan.table.maximum {
-            Some(max) if (max as usize) < data.len() => {
-                let ptr = data.as_non_null();
-                SendSyncPtr::new(NonNull::slice_from_raw_parts(ptr.cast(), max as usize))
-            }
+            Some(max) if (max as usize) < data.len() => &mut data[..max as usize],
             _ => data,
         };
 
@@ -386,11 +383,9 @@ impl Table {
         // First resize the storage and then fill with the init value
         match self {
             Table::Static { size, data, .. } => {
-                unsafe {
-                    debug_assert!(data.as_ref()[*size as usize..new_size as usize]
-                        .iter()
-                        .all(|x| x.is_none()));
-                }
+                debug_assert!(data[*size as usize..new_size as usize]
+                    .iter()
+                    .all(|x| x.is_none()));
                 *size = new_size;
             }
             Table::Dynamic { elements, .. } => {
@@ -477,7 +472,7 @@ impl Table {
     pub fn vmtable(&mut self) -> VMTableDefinition {
         match self {
             Table::Static { data, size, .. } => VMTableDefinition {
-                base: data.as_ptr().cast(),
+                base: data.as_mut_ptr().cast(),
                 current_elements: *size,
             },
             Table::Dynamic { elements, .. } => VMTableDefinition {
@@ -497,14 +492,14 @@ impl Table {
 
     fn elements(&self) -> &[TableValue] {
         match self {
-            Table::Static { data, size, .. } => unsafe { &data.as_ref()[..*size as usize] },
+            Table::Static { data, size, .. } => &data[..*size as usize],
             Table::Dynamic { elements, .. } => &elements[..],
         }
     }
 
     fn elements_mut(&mut self) -> &mut [TableValue] {
         match self {
-            Table::Static { data, size, .. } => unsafe { &mut data.as_mut()[..*size as usize] },
+            Table::Static { data, size, .. } => &mut data[..*size as usize],
             Table::Dynamic { elements, .. } => &mut elements[..],
         }
     }
@@ -595,7 +590,7 @@ impl Drop for Table {
 impl Default for Table {
     fn default() -> Self {
         Table::Static {
-            data: SendSyncPtr::new(NonNull::from(&mut [])),
+            data: &mut [],
             size: 0,
             ty: TableElementType::Func,
         }
diff --git a/crates/runtime/src/trampolines/riscv64.rs b/crates/runtime/src/trampolines/riscv64.rs
index b43afcbf4518..e3b06863b217 100644
--- a/crates/runtime/src/trampolines/riscv64.rs
+++ b/crates/runtime/src/trampolines/riscv64.rs
@@ -17,9 +17,7 @@ macro_rules! wasm_to_libcall_trampoline {
                     sd ra, 32(t0)
 
                     // Tail call to the actual implementation of this libcall.
-                .Lhi_{0}:
-                    auipc t0, %pcrel_hi({0})
-                    jalr x0, %pcrel_lo(.Lhi_{0})(t0)
+                    j {}
 
                     .cfi_endproc
                 ",
diff --git a/crates/runtime/src/traphandlers/macos.rs b/crates/runtime/src/traphandlers/macos.rs
index 9cbe059bd9a2..493d4b5dbcaf 100644
--- a/crates/runtime/src/traphandlers/macos.rs
+++ b/crates/runtime/src/traphandlers/macos.rs
@@ -167,9 +167,6 @@ static mut WASMTIME_PORT: mach_port_name_t = MACH_PORT_NULL;
 static mut CHILD_OF_FORKED_PROCESS: bool = false;
 
 pub unsafe fn platform_init() {
-    if cfg!(miri) {
-        return;
-    }
     // Mach ports do not currently work across forks, so configure Wasmtime to
     // panic in `lazy_per_thread_init` if the child attempts to invoke
     // WebAssembly.
@@ -468,9 +465,6 @@ unsafe extern "C" fn unwind(
 /// exception handlers to get registered.
 #[cold]
 pub fn lazy_per_thread_init() {
-    if cfg!(miri) {
-        return;
-    }
     unsafe {
         assert!(
             !CHILD_OF_FORKED_PROCESS,
diff --git a/crates/test-programs/Cargo.toml b/crates/test-programs/Cargo.toml
index f195b3d591d1..4808b8e462e7 100644
--- a/crates/test-programs/Cargo.toml
+++ b/crates/test-programs/Cargo.toml
@@ -2,17 +2,46 @@
 name = "test-programs"
 version = "0.0.0"
 authors = ["The Wasmtime Project Developers"]
+readme = "README.md"
 edition.workspace = true
 publish = false
 license = "Apache-2.0 WITH LLVM-exception"
 
+[build-dependencies]
+cfg-if = { workspace = true }
+cargo_metadata = "0.15.3"
+wit-component = { workspace = true }
+heck = { workspace = true }
+
 [dependencies]
 anyhow = { workspace = true }
-wasi = "0.11.0"
-wit-bindgen = { workspace = true, features = ['default'] }
-libc = { workspace = true }
-getrandom = "0.2.9"
-futures = { workspace = true, default-features = false, features = ['alloc'] }
-url = { workspace = true }
-sha2 = "0.10.2"
-base64 = "0.21.0"
+http = { version = "0.2.9" }
+http-body = "1.0.0-rc.2"
+http-body-util = "0.1.0-rc.2"
+hyper = { version = "1.0.0-rc.3", features = ["full"] }
+is-terminal = { workspace = true }
+tokio = { workspace = true, features = ["net", "rt-multi-thread", "macros"] }
+tracing = { workspace = true }
+
+[dev-dependencies]
+anyhow = { workspace = true }
+tempfile = { workspace = true }
+test-log = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+lazy_static = "1"
+wasmtime = { workspace = true, features = ['cranelift', 'component-model'] }
+
+wasi-common = { workspace = true }
+wasi-cap-std-sync = { workspace = true }
+wasmtime-wasi = { workspace = true, default-features = true, features = [
+    "tokio",
+] }
+cap-std = { workspace = true }
+cap-rand = { workspace = true }
+tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
+
+wasmtime-wasi-http = { workspace = true, features = ["sync"] }
+
+[features]
+test_programs = []
diff --git a/crates/test-programs/README.md b/crates/test-programs/README.md
new file mode 100644
index 000000000000..31f3c1bfadb6
--- /dev/null
+++ b/crates/test-programs/README.md
@@ -0,0 +1,7 @@
+This is the `test-programs` crate, which builds and runs whole programs
+compiled to wasm32-wasi.
+
+To actually run these tests, the test-programs feature must be enabled, e.g.:
+```
+cargo test --features test-programs/test_programs --package test-programs
+```
diff --git a/crates/test-programs/artifacts/Cargo.toml b/crates/test-programs/artifacts/Cargo.toml
deleted file mode 100644
index 4c1e69d49128..000000000000
--- a/crates/test-programs/artifacts/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "test-programs-artifacts"
-version = "0.0.0"
-authors = ["The Wasmtime Project Developers"]
-edition.workspace = true
-publish = false
-license = "Apache-2.0 WITH LLVM-exception"
-
-[build-dependencies]
-heck = { workspace = true }
-wit-component = { workspace = true }
-cargo_metadata = "0.15.3"
diff --git a/crates/test-programs/artifacts/build.rs b/crates/test-programs/artifacts/build.rs
deleted file mode 100644
index eb446fd0ba0d..000000000000
--- a/crates/test-programs/artifacts/build.rs
+++ /dev/null
@@ -1,174 +0,0 @@
-use heck::*;
-use std::collections::BTreeMap;
-use std::env;
-use std::fs;
-use std::path::{Path, PathBuf};
-use std::process::Command;
-use wit_component::ComponentEncoder;
-
-fn main() {
-    build_and_generate_tests();
-}
-
-fn build_and_generate_tests() {
-    let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
-
-    let reactor_adapter = build_adapter(&out_dir, "reactor", &[]);
-    let command_adapter = build_adapter(
-        &out_dir,
-        "command",
-        &["--no-default-features", "--features=command"],
-    );
-
-    println!("cargo:rerun-if-changed=../src");
-
-    // Build the test programs:
-    let mut cmd = cargo();
-    cmd.arg("build")
-        .arg("--target=wasm32-wasi")
-        .arg("--package=test-programs")
-        .env("CARGO_TARGET_DIR", &out_dir)
-        .env("CARGO_PROFILE_DEV_DEBUG", "1")
-        .env("RUSTFLAGS", rustflags())
-        .env_remove("CARGO_ENCODED_RUSTFLAGS");
-    eprintln!("running: {cmd:?}");
-    let status = cmd.status().unwrap();
-    assert!(status.success());
-
-    let meta = cargo_metadata::MetadataCommand::new().exec().unwrap();
-    let targets = meta
-        .packages
-        .iter()
-        .find(|p| p.name == "test-programs")
-        .unwrap()
-        .targets
-        .iter()
-        .filter(move |t| t.kind == &["bin"])
-        .map(|t| &t.name)
-        .collect::<Vec<_>>();
-
-    let mut generated_code = String::new();
-
-    let mut kinds = BTreeMap::new();
-
-    for target in targets {
-        let camel = target.to_shouty_snake_case();
-        let wasm = out_dir
-            .join("wasm32-wasi")
-            .join("debug")
-            .join(format!("{target}.wasm"));
-
-        generated_code += &format!("pub const {camel}: &'static str = {wasm:?};\n");
-
-        let adapter = match target.as_str() {
-            "reactor" => &reactor_adapter,
-            _ => &command_adapter,
-        };
-        let path = compile_component(&wasm, adapter);
-        generated_code += &format!("pub const {camel}_COMPONENT: &'static str = {path:?};\n");
-
-        // Bucket, based on the name of the test, into a "kind" which generates
-        // a `foreach_*` macro below.
-        let kind = match target.as_str() {
-            s if s.starts_with("http_") => "http",
-            s if s.starts_with("preview1_") => "preview1",
-            s if s.starts_with("preview2_") => "preview2",
-            s if s.starts_with("cli_") => "cli",
-            s if s.starts_with("api_") => "api",
-            // If you're reading this because you hit this panic, either add it
-            // to a test suite above or add a new "suite". The purpose of the
-            // categorization above is to have a static assertion that tests
-            // added are actually run somewhere, so as long as you're also
-            // adding test code somewhere that's ok.
-            other => {
-                panic!("don't know how to classify test name `{other}` to a kind")
-            }
-        };
-        if !kind.is_empty() {
-            kinds.entry(kind).or_insert(Vec::new()).push(target);
-        }
-    }
-
-    for (kind, targets) in kinds {
-        generated_code += &format!("#[macro_export]");
-        generated_code += &format!("macro_rules! foreach_{kind} {{\n");
-        generated_code += &format!("    ($mac:ident) => {{\n");
-        for target in targets {
-            generated_code += &format!("$mac!({target});\n")
-        }
-        generated_code += &format!("    }}\n");
-        generated_code += &format!("}}\n");
-    }
-
-    std::fs::write(out_dir.join("gen.rs"), generated_code).unwrap();
-}
-
-// Build the WASI Preview 1 adapter, and get the binary:
-fn build_adapter(out_dir: &PathBuf, name: &str, features: &[&str]) -> Vec<u8> {
-    println!("cargo:rerun-if-changed=../../wasi-preview1-component-adapter");
-    let mut cmd = cargo();
-    cmd.arg("build")
-        .arg("--release")
-        .arg("--package=wasi-preview1-component-adapter")
-        .arg("--target=wasm32-unknown-unknown")
-        .env("CARGO_TARGET_DIR", out_dir)
-        .env("RUSTFLAGS", rustflags())
-        .env_remove("CARGO_ENCODED_RUSTFLAGS");
-    for f in features {
-        cmd.arg(f);
-    }
-    eprintln!("running: {cmd:?}");
-    let status = cmd.status().unwrap();
-    assert!(status.success());
-
-    let adapter = out_dir.join(format!("wasi_snapshot_preview1.{name}.wasm"));
-    std::fs::copy(
-        out_dir
-            .join("wasm32-unknown-unknown")
-            .join("release")
-            .join("wasi_snapshot_preview1.wasm"),
-        &adapter,
-    )
-    .unwrap();
-    println!("wasi {name} adapter: {:?}", &adapter);
-    fs::read(&adapter).unwrap()
-}
-
-fn rustflags() -> &'static str {
-    match option_env!("RUSTFLAGS") {
-        // If we're in CI which is denying warnings then deny warnings to code
-        // built here too to keep the tree warning-free.
-        Some(s) if s.contains("-D warnings") => "-D warnings",
-        _ => "",
-    }
-}
-
-// Compile a component, return the path of the binary:
-fn compile_component(wasm: &Path, adapter: &[u8]) -> PathBuf {
-    println!("creating a component from {wasm:?}");
-    let module = fs::read(wasm).expect("read wasm module");
-    let component = ComponentEncoder::default()
-        .module(module.as_slice())
-        .unwrap()
-        .validate(true)
-        .adapter("wasi_snapshot_preview1", adapter)
-        .unwrap()
-        .encode()
-        .expect("module can be translated to a component");
-    let out_dir = wasm.parent().unwrap();
-    let stem = wasm.file_stem().unwrap().to_str().unwrap();
-    let component_path = out_dir.join(format!("{stem}.component.wasm"));
-    fs::write(&component_path, component).expect("write component to disk");
-    component_path
-}
-
-fn cargo() -> Command {
-    // Miri configures its own sysroot which we don't want to use, so remove
-    // miri's own wrappers around rustc to ensure that we're using the real
-    // rustc to build these programs.
-    let mut cargo = Command::new("cargo");
-    if std::env::var("CARGO_CFG_MIRI").is_ok() {
-        cargo.env_remove("RUSTC").env_remove("RUSTC_WRAPPER");
-    }
-    cargo
-}
diff --git a/crates/test-programs/artifacts/src/lib.rs b/crates/test-programs/artifacts/src/lib.rs
deleted file mode 100644
index e312491e9883..000000000000
--- a/crates/test-programs/artifacts/src/lib.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-include!(concat!(env!("OUT_DIR"), "/gen.rs"));
-
-use std::io::IsTerminal;
-
-/// The wasi-tests binaries use these environment variables to determine their
-/// expected behavior.
-/// Used by all of the tests/ which execute the wasi-tests binaries.
-pub fn wasi_tests_environment() -> &'static [(&'static str, &'static str)] {
-    #[cfg(windows)]
-    {
-        &[
-            ("ERRNO_MODE_WINDOWS", "1"),
-            // Windows does not support dangling links or symlinks in the filesystem.
-            ("NO_DANGLING_FILESYSTEM", "1"),
-            // Windows does not support renaming a directory to an empty directory -
-            // empty directory must be deleted.
-            ("NO_RENAME_DIR_TO_EMPTY_DIR", "1"),
-            // cap-std-sync does not support the sync family of fdflags
-            ("NO_FDFLAGS_SYNC_SUPPORT", "1"),
-        ]
-    }
-    #[cfg(all(unix, not(target_os = "macos")))]
-    {
-        &[
-            ("ERRNO_MODE_UNIX", "1"),
-            // cap-std-sync does not support the sync family of fdflags
-            ("NO_FDFLAGS_SYNC_SUPPORT", "1"),
-        ]
-    }
-    #[cfg(target_os = "macos")]
-    {
-        &[
-            ("ERRNO_MODE_MACOS", "1"),
-            // cap-std-sync does not support the sync family of fdflags
-            ("NO_FDFLAGS_SYNC_SUPPORT", "1"),
-        ]
-    }
-}
-
-pub fn stdio_is_terminal() -> bool {
-    std::io::stdin().is_terminal()
-        && std::io::stdout().is_terminal()
-        && std::io::stderr().is_terminal()
-}
diff --git a/crates/test-programs/build.rs b/crates/test-programs/build.rs
new file mode 100644
index 000000000000..4062b02fea13
--- /dev/null
+++ b/crates/test-programs/build.rs
@@ -0,0 +1,263 @@
+#![cfg_attr(not(feature = "test_programs"), allow(dead_code))]
+
+use heck::ToSnakeCase;
+use std::env;
+use std::fs;
+use std::path::PathBuf;
+use std::process::Command;
+use wit_component::ComponentEncoder;
+
+// NB: this is set to `false` when a breaking change to WIT is made since the
+// wasi-http WIT is currently a submodule and can't be updated atomically with
+// the rest of Wasmtime.
+const BUILD_WASI_HTTP_TESTS: bool = true;
+
+fn main() {
+    #[cfg(feature = "test_programs")]
+    build_and_generate_tests();
+}
+
+fn build_and_generate_tests() {
+    let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
+
+    let reactor_adapter = build_adapter(&out_dir, "reactor", &[]);
+    let command_adapter = build_adapter(
+        &out_dir,
+        "command",
+        &["--no-default-features", "--features=command"],
+    );
+
+    println!("cargo:rerun-if-changed=./wasi-tests");
+    println!("cargo:rerun-if-changed=./command-tests");
+    println!("cargo:rerun-if-changed=./reactor-tests");
+    println!("cargo:rerun-if-changed=./wasi-sockets-tests");
+    if BUILD_WASI_HTTP_TESTS {
+        println!("cargo:rerun-if-changed=./wasi-http-tests");
+    } else {
+        println!("cargo:rustc-cfg=skip_wasi_http_tests");
+    }
+
+    // Build the test programs:
+    let mut cmd = Command::new("cargo");
+    cmd.arg("build")
+        .arg("--target=wasm32-wasi")
+        .arg("--package=wasi-tests")
+        .arg("--package=command-tests")
+        .arg("--package=reactor-tests")
+        .arg("--package=wasi-sockets-tests")
+        .env("CARGO_TARGET_DIR", &out_dir)
+        .env("CARGO_PROFILE_DEV_DEBUG", "1")
+        .env_remove("CARGO_ENCODED_RUSTFLAGS");
+    if BUILD_WASI_HTTP_TESTS {
+        cmd.arg("--package=wasi-http-tests");
+    }
+    let status = cmd.status().unwrap();
+    assert!(status.success());
+
+    let meta = cargo_metadata::MetadataCommand::new().exec().unwrap();
+
+    modules_rs(&meta, "wasi-tests", "bin", &out_dir);
+    components_rs(&meta, "wasi-tests", "bin", &command_adapter, &out_dir);
+
+    if BUILD_WASI_HTTP_TESTS {
+        modules_rs(&meta, "wasi-http-tests", "bin", &out_dir);
+        components_rs(&meta, "wasi-http-tests", "bin", &command_adapter, &out_dir);
+    }
+
+    components_rs(&meta, "command-tests", "bin", &command_adapter, &out_dir);
+    components_rs(&meta, "reactor-tests", "cdylib", &reactor_adapter, &out_dir);
+
+    components_rs(
+        &meta,
+        "wasi-sockets-tests",
+        "bin",
+        &command_adapter,
+        &out_dir,
+    );
+}
+
+// Creates an `${out_dir}/${package}_modules.rs` file that exposes a `get_module(&str) -> Module`,
+// and contains a `use self::{module} as _;` for each module that ensures that the user defines
+// a symbol (ideally a #[test]) corresponding to each module.
+fn modules_rs(meta: &cargo_metadata::Metadata, package: &str, kind: &str, out_dir: &PathBuf) {
+    let modules = targets_in_package(meta, package, kind)
+        .into_iter()
+        .map(|stem| {
+            (
+                stem.clone(),
+                out_dir
+                    .join("wasm32-wasi")
+                    .join("debug")
+                    .join(format!("{stem}.wasm"))
+                    .as_os_str()
+                    .to_str()
+                    .unwrap()
+                    .to_string(),
+            )
+        })
+        .collect::<Vec<_>>();
+
+    let mut decls = String::new();
+    let mut cases = String::new();
+    let mut uses = String::new();
+    for (stem, file) in modules {
+        let global = format!("{}_MODULE", stem.to_uppercase());
+        // Load the module from disk only once, in case it is used many times:
+        decls += &format!(
+            "
+            lazy_static::lazy_static!{{
+                static ref {global}: wasmtime::Module = {{
+                    wasmtime::Module::from_file(&ENGINE, {file:?}).unwrap()
+                }};
+            }}
+        "
+        );
+        // Match the stem str literal to the module. Cloning is just a ref count incr.
+        cases += &format!("{stem:?} => {global}.clone(),\n");
+        // Statically ensure that the user defines a function (ideally a #[test]) for each stem.
+        uses += &format!("#[allow(unused_imports)] use self::{stem} as _;\n");
+    }
+
+    std::fs::write(
+        out_dir.join(&format!("{}_modules.rs", package.to_snake_case())),
+        format!(
+            "
+        {decls}
+        pub fn get_module(s: &str) -> wasmtime::Module {{
+            match s {{
+                {cases}
+                _ => panic!(\"no such module: {{}}\", s),
+            }}
+        }}
+        {uses}
+        "
+        ),
+    )
+    .unwrap();
+}
+
+// Build the WASI Preview 1 adapter, and get the binary:
+fn build_adapter(out_dir: &PathBuf, name: &str, features: &[&str]) -> Vec<u8> {
+    println!("cargo:rerun-if-changed=../wasi-preview1-component-adapter");
+    let mut cmd = Command::new("cargo");
+    cmd.arg("build")
+        .arg("--release")
+        .arg("--package=wasi-preview1-component-adapter")
+        .arg("--target=wasm32-unknown-unknown")
+        .env("CARGO_TARGET_DIR", out_dir)
+        .env_remove("CARGO_ENCODED_RUSTFLAGS");
+    for f in features {
+        cmd.arg(f);
+    }
+    let status = cmd.status().unwrap();
+    assert!(status.success());
+
+    let adapter = out_dir.join(format!("wasi_snapshot_preview1.{name}.wasm"));
+    std::fs::copy(
+        out_dir
+            .join("wasm32-unknown-unknown")
+            .join("release")
+            .join("wasi_snapshot_preview1.wasm"),
+        &adapter,
+    )
+    .unwrap();
+    println!("wasi {name} adapter: {:?}", &adapter);
+    fs::read(&adapter).unwrap()
+}
+
+// Builds components out of modules, and creates an `${out_dir}/${package}_component.rs` file that
+// exposes a `get_component(&str) -> Component`
+// and a contains a `use self::{component} as _;` for each module that ensures that the user defines
+// a symbol (ideally a #[test]) corresponding to each component.
+fn components_rs(
+    meta: &cargo_metadata::Metadata,
+    package: &str,
+    kind: &str,
+    adapter: &[u8],
+    out_dir: &PathBuf,
+) {
+    let mut decls = String::new();
+    let mut cases = String::new();
+    let mut uses = String::new();
+    for target_name in targets_in_package(&meta, package, kind) {
+        let stem = target_name.to_snake_case();
+        let file = compile_component(&stem, out_dir, adapter);
+
+        let global = format!("{}_COMPONENT", stem.to_uppercase());
+        decls += &format!(
+            "
+            lazy_static::lazy_static!{{
+                static ref {global}: wasmtime::component::Component = {{
+                    wasmtime::component::Component::from_file(&ENGINE, {file:?}).unwrap()
+                }};
+            }}
+        "
+        );
+        cases += &format!("{stem:?} => {global}.clone(),\n");
+        uses += &format!("#[allow(unused_imports)] use self::{stem} as _;\n");
+    }
+
+    std::fs::write(
+        out_dir.join(&format!("{}_components.rs", package.to_snake_case())),
+        format!(
+            "
+        {decls}
+        pub fn get_component(s: &str) -> wasmtime::component::Component {{
+            match s {{
+                {cases}
+                _ => panic!(\"no such component: {{}}\", s),
+            }}
+        }}
+        {uses}
+        "
+        ),
+    )
+    .unwrap();
+}
+
+// Compile a component, return the path of the binary:
+fn compile_component(stem: &str, out_dir: &PathBuf, adapter: &[u8]) -> PathBuf {
+    let file = out_dir
+        .join("wasm32-wasi")
+        .join("debug")
+        .join(format!("{stem}.wasm"));
+    let module = fs::read(&file).expect("read wasm module");
+    let component = ComponentEncoder::default()
+        .module(module.as_slice())
+        .unwrap()
+        .validate(true)
+        .adapter("wasi_snapshot_preview1", adapter)
+        .unwrap()
+        .encode()
+        .expect(&format!(
+            "module {:?} can be translated to a component",
+            file
+        ));
+    let component_path = out_dir.join(format!("{}.component.wasm", &stem));
+    fs::write(&component_path, component).expect("write component to disk");
+    component_path
+}
+
+// Get all targets in a given package with a given kind
+// kind is "bin" for test program crates that expose a `fn main`, and
+// "cdylib" for crates that implement a reactor.
+fn targets_in_package<'a>(
+    meta: &'a cargo_metadata::Metadata,
+    package: &'a str,
+    kind: &'a str,
+) -> Vec<String> {
+    let targets = meta
+        .packages
+        .iter()
+        .find(|p| p.name == package)
+        .unwrap()
+        .targets
+        .iter()
+        .filter(move |t| t.kind == &[kind])
+        .map(|t| t.name.to_snake_case())
+        .collect::<Vec<_>>();
+    if targets.is_empty() {
+        panic!("no targets for package {package:?} of kind {kind:?}")
+    }
+    targets
+}
diff --git a/crates/test-programs/command-tests/Cargo.toml b/crates/test-programs/command-tests/Cargo.toml
new file mode 100644
index 000000000000..a93cc2f0d598
--- /dev/null
+++ b/crates/test-programs/command-tests/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "command-tests"
+version = "0.0.0"
+edition = "2021"
+publish = false
+
+[dependencies]
+anyhow = { workspace = true }
+getrandom = "0.2.8"
+wit-bindgen = { workspace = true, default-features = true }
+
+# FIXME: building cap-std and rustix currently requires a nightly rust, so we
+# are not including it in the test suite.
+# The poll_stdin and file_dir_sync tests contain commented-out uses of these
+# crates. They should be re-enabled once these crates can build for
+# wasm32-wasi on stable rust.
+# rustix = { workspace = true }
+# cap-std = { workspace = true }
diff --git a/crates/test-programs/src/bin/cli_args.rs b/crates/test-programs/command-tests/src/bin/args.rs
similarity index 65%
rename from crates/test-programs/src/bin/cli_args.rs
rename to crates/test-programs/command-tests/src/bin/args.rs
index e152e452ee3f..8403f7de5901 100644
--- a/crates/test-programs/src/bin/cli_args.rs
+++ b/crates/test-programs/command-tests/src/bin/args.rs
@@ -1,5 +1,5 @@
 fn main() {
-    let args = std::env::args().skip(1).collect::<Vec<_>>();
+    let args = std::env::args().collect::<Vec<_>>();
     assert_eq!(
         args,
         ["hello", "this", "", "is an argument", "with 🚩 emoji"]
diff --git a/crates/test-programs/src/bin/cli_default_clocks.rs b/crates/test-programs/command-tests/src/bin/default_clocks.rs
similarity index 100%
rename from crates/test-programs/src/bin/cli_default_clocks.rs
rename to crates/test-programs/command-tests/src/bin/default_clocks.rs
diff --git a/crates/test-programs/src/bin/cli_directory_list.rs b/crates/test-programs/command-tests/src/bin/directory_list.rs
similarity index 100%
rename from crates/test-programs/src/bin/cli_directory_list.rs
rename to crates/test-programs/command-tests/src/bin/directory_list.rs
diff --git a/crates/test-programs/src/bin/cli_env.rs b/crates/test-programs/command-tests/src/bin/env.rs
similarity index 100%
rename from crates/test-programs/src/bin/cli_env.rs
rename to crates/test-programs/command-tests/src/bin/env.rs
diff --git a/crates/test-programs/src/bin/cli_exit_default.rs b/crates/test-programs/command-tests/src/bin/exit_default.rs
similarity index 100%
rename from crates/test-programs/src/bin/cli_exit_default.rs
rename to crates/test-programs/command-tests/src/bin/exit_default.rs
diff --git a/crates/test-programs/src/bin/cli_exit_failure.rs b/crates/test-programs/command-tests/src/bin/exit_failure.rs
similarity index 100%
rename from crates/test-programs/src/bin/cli_exit_failure.rs
rename to crates/test-programs/command-tests/src/bin/exit_failure.rs
diff --git a/crates/test-programs/src/bin/cli_exit_panic.rs b/crates/test-programs/command-tests/src/bin/exit_panic.rs
similarity index 100%
rename from crates/test-programs/src/bin/cli_exit_panic.rs
rename to crates/test-programs/command-tests/src/bin/exit_panic.rs
diff --git a/crates/test-programs/src/bin/cli_exit_success.rs b/crates/test-programs/command-tests/src/bin/exit_success.rs
similarity index 100%
rename from crates/test-programs/src/bin/cli_exit_success.rs
rename to crates/test-programs/command-tests/src/bin/exit_success.rs
diff --git a/crates/test-programs/src/bin/cli_export_cabi_realloc.rs b/crates/test-programs/command-tests/src/bin/export_cabi_realloc.rs
similarity index 100%
rename from crates/test-programs/src/bin/cli_export_cabi_realloc.rs
rename to crates/test-programs/command-tests/src/bin/export_cabi_realloc.rs
diff --git a/crates/test-programs/src/bin/cli_file_append.rs b/crates/test-programs/command-tests/src/bin/file_append.rs
similarity index 100%
rename from crates/test-programs/src/bin/cli_file_append.rs
rename to crates/test-programs/command-tests/src/bin/file_append.rs
diff --git a/crates/test-programs/src/bin/cli_file_dir_sync.rs b/crates/test-programs/command-tests/src/bin/file_dir_sync.rs
similarity index 100%
rename from crates/test-programs/src/bin/cli_file_dir_sync.rs
rename to crates/test-programs/command-tests/src/bin/file_dir_sync.rs
diff --git a/crates/test-programs/src/bin/cli_file_read.rs b/crates/test-programs/command-tests/src/bin/file_read.rs
similarity index 100%
rename from crates/test-programs/src/bin/cli_file_read.rs
rename to crates/test-programs/command-tests/src/bin/file_read.rs
diff --git a/crates/test-programs/src/bin/cli_hello_stdout.rs b/crates/test-programs/command-tests/src/bin/hello_stdout.rs
similarity index 100%
rename from crates/test-programs/src/bin/cli_hello_stdout.rs
rename to crates/test-programs/command-tests/src/bin/hello_stdout.rs
diff --git a/crates/test-programs/command-tests/src/bin/panic.rs b/crates/test-programs/command-tests/src/bin/panic.rs
new file mode 100644
index 000000000000..bf9d3b49e41e
--- /dev/null
+++ b/crates/test-programs/command-tests/src/bin/panic.rs
@@ -0,0 +1,3 @@
+fn main() {
+    panic!("idk!!!");
+}
diff --git a/crates/test-programs/command-tests/src/bin/poll_stdin.rs b/crates/test-programs/command-tests/src/bin/poll_stdin.rs
new file mode 100644
index 000000000000..71315db750ea
--- /dev/null
+++ b/crates/test-programs/command-tests/src/bin/poll_stdin.rs
@@ -0,0 +1,14 @@
+/* FIXME once rustix can build on stable rust, rewrite
+use rustix::io::{PollFd, PollFlags};
+
+fn main() {
+    let stdin = std::io::stdin();
+    let mut pollfds = vec![PollFd::new(&stdin, PollFlags::IN)];
+    let num = rustix::io::poll(&mut pollfds, -1).unwrap();
+    assert_eq!(num, 1);
+    assert_eq!(pollfds[0].revents(), PollFlags::IN);
+}
+*/
+fn main() {
+    println!("FIXME: this test does nothing for now");
+}
diff --git a/crates/test-programs/src/bin/preview2_random.rs b/crates/test-programs/command-tests/src/bin/random.rs
similarity index 100%
rename from crates/test-programs/src/bin/preview2_random.rs
rename to crates/test-programs/command-tests/src/bin/random.rs
diff --git a/crates/test-programs/src/bin/api_read_only.rs b/crates/test-programs/command-tests/src/bin/read_only.rs
similarity index 100%
rename from crates/test-programs/src/bin/api_read_only.rs
rename to crates/test-programs/command-tests/src/bin/read_only.rs
diff --git a/crates/test-programs/src/bin/cli_stdin.rs b/crates/test-programs/command-tests/src/bin/stdin.rs
similarity index 100%
rename from crates/test-programs/src/bin/cli_stdin.rs
rename to crates/test-programs/command-tests/src/bin/stdin.rs
diff --git a/crates/test-programs/command-tests/src/bin/stream_pollable_lifetimes.rs b/crates/test-programs/command-tests/src/bin/stream_pollable_lifetimes.rs
new file mode 100644
index 000000000000..ebd8071957d1
--- /dev/null
+++ b/crates/test-programs/command-tests/src/bin/stream_pollable_lifetimes.rs
@@ -0,0 +1,28 @@
+use command_tests::wasi::cli::environment;
+use command_tests::wasi::cli::stdin;
+use command_tests::wasi::io::streams;
+use command_tests::wasi::poll::poll;
+
+fn main() {
+    let args = environment::get_arguments();
+
+    if args == &["correct"] {
+        let stdin: streams::InputStream = stdin::get_stdin();
+        let stdin_pollable = streams::subscribe_to_input_stream(stdin);
+        let ready = poll::poll_oneoff(&[stdin_pollable]);
+        assert_eq!(ready, &[true]);
+        poll::drop_pollable(stdin_pollable);
+        streams::drop_input_stream(stdin);
+    } else if args == &["trap"] {
+        let stdin: streams::InputStream = stdin::get_stdin();
+        let stdin_pollable = streams::subscribe_to_input_stream(stdin);
+        let ready = poll::poll_oneoff(&[stdin_pollable]);
+        assert_eq!(ready, &[true]);
+        streams::drop_input_stream(stdin);
+        unreachable!(
+            "execution should have trapped in line above when stream dropped before pollable"
+        );
+    } else {
+        panic!("bad value for args: expected `[\"correct\"]` or `[\"trap\"]`, got {args:?}")
+    }
+}
diff --git a/crates/test-programs/src/bin/api_time.rs b/crates/test-programs/command-tests/src/bin/time.rs
similarity index 100%
rename from crates/test-programs/src/bin/api_time.rs
rename to crates/test-programs/command-tests/src/bin/time.rs
diff --git a/crates/test-programs/command-tests/src/lib.rs b/crates/test-programs/command-tests/src/lib.rs
new file mode 100644
index 000000000000..13a414db4af1
--- /dev/null
+++ b/crates/test-programs/command-tests/src/lib.rs
@@ -0,0 +1 @@
+wit_bindgen::generate!("test-command" in "../../wasi/wit");
diff --git a/crates/test-programs/reactor-tests/Cargo.toml b/crates/test-programs/reactor-tests/Cargo.toml
new file mode 100644
index 000000000000..28a645a9401e
--- /dev/null
+++ b/crates/test-programs/reactor-tests/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "reactor-tests"
+version = "0.1.0"
+edition = "2021"
+publish = false
+
+[lib]
+crate-type=["cdylib"]
+
+[dependencies]
+wit-bindgen = { workspace = true, features = ["macros", "realloc"] }
diff --git a/crates/test-programs/src/bin/api_reactor.rs b/crates/test-programs/reactor-tests/src/lib.rs
similarity index 70%
rename from crates/test-programs/src/bin/api_reactor.rs
rename to crates/test-programs/reactor-tests/src/lib.rs
index 5b700e9d2d1d..c3219d37fc4c 100644
--- a/crates/test-programs/src/bin/api_reactor.rs
+++ b/crates/test-programs/reactor-tests/src/lib.rs
@@ -1,16 +1,27 @@
 wit_bindgen::generate!({
     world: "test-reactor",
-    path: "../wasi/wit",
+    path: "../../wasi/wit",
     exports: {
         world: T,
     }
 });
 
 struct T;
-use crate::wasi::io::poll;
+use wasi::io::streams;
+use wasi::poll::poll;
 
 static mut STATE: Vec<String> = Vec::new();
 
+struct DropPollable {
+    pollable: poll::Pollable,
+}
+
+impl Drop for DropPollable {
+    fn drop(&mut self) {
+        poll::drop_pollable(self.pollable);
+    }
+}
+
 impl Guest for T {
     fn add_strings(ss: Vec<String>) -> u32 {
         for s in ss {
@@ -29,32 +40,34 @@ impl Guest for T {
     }
 
     fn write_strings_to(o: OutputStream) -> Result<(), ()> {
-        let pollable = o.subscribe();
+        let sub = DropPollable {
+            pollable: streams::subscribe_to_output_stream(o),
+        };
         unsafe {
             for s in STATE.iter() {
                 let mut out = s.as_bytes();
                 while !out.is_empty() {
-                    poll::poll_list(&[&pollable]);
-                    let n = match o.check_write() {
+                    poll::poll_oneoff(&[sub.pollable]);
+                    let n = match streams::check_write(o) {
                         Ok(n) => n,
                         Err(_) => return Err(()),
                     };
 
                     let len = (n as usize).min(out.len());
-                    match o.write(&out[..len]) {
+                    match streams::write(o, &out[..len]) {
                         Ok(_) => out = &out[len..],
                         Err(_) => return Err(()),
                     }
                 }
             }
 
-            match o.flush() {
+            match streams::flush(o) {
                 Ok(_) => {}
                 Err(_) => return Err(()),
             }
 
-            poll::poll_list(&[&pollable]);
-            match o.check_write() {
+            poll::poll_oneoff(&[sub.pollable]);
+            match streams::check_write(o) {
                 Ok(_) => {}
                 Err(_) => return Err(()),
             }
@@ -66,7 +79,3 @@ impl Guest for T {
         format!("{stat:?}")
     }
 }
-
-// Technically this should not be here for a reactor, but given the current
-// framework for tests it's required since this file is built as a `bin`
-fn main() {}
diff --git a/crates/test-programs/src/bin/api_proxy.rs b/crates/test-programs/src/bin/api_proxy.rs
deleted file mode 100644
index 6798d4e30fe2..000000000000
--- a/crates/test-programs/src/bin/api_proxy.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-pub mod bindings {
-    use super::T;
-
-    wit_bindgen::generate!({
-        path: "../wasi-http/wit",
-        world: "wasi:http/proxy",
-        exports: {
-            "wasi:http/incoming-handler": T,
-        },
-    });
-}
-
-use bindings::wasi::http::types::{IncomingRequest, ResponseOutparam};
-
-struct T;
-
-impl bindings::exports::wasi::http::incoming_handler::Guest for T {
-    fn handle(_request: IncomingRequest, outparam: ResponseOutparam) {
-        let hdrs = bindings::wasi::http::types::Headers::new(&[]);
-        let resp = bindings::wasi::http::types::OutgoingResponse::new(200, &hdrs);
-        let body = resp.write().expect("outgoing response");
-
-        bindings::wasi::http::types::ResponseOutparam::set(outparam, Ok(resp));
-
-        let out = body.write().expect("outgoing stream");
-        out.blocking_write_and_flush(b"hello, world!")
-            .expect("writing response");
-
-        drop(out);
-        bindings::wasi::http::types::OutgoingBody::finish(body, None);
-    }
-}
-
-// Technically this should not be here for a proxy, but given the current
-// framework for tests it's required since this file is built as a `bin`
-fn main() {}
diff --git a/crates/test-programs/src/bin/api_proxy_streaming.rs b/crates/test-programs/src/bin/api_proxy_streaming.rs
deleted file mode 100644
index f4978ac177cb..000000000000
--- a/crates/test-programs/src/bin/api_proxy_streaming.rs
+++ /dev/null
@@ -1,370 +0,0 @@
-use anyhow::{bail, Result};
-use bindings::wasi::http::types::{
-    Fields, IncomingRequest, Method, OutgoingBody, OutgoingRequest, OutgoingResponse,
-    ResponseOutparam, Scheme,
-};
-use futures::{stream, SinkExt, StreamExt, TryStreamExt};
-use url::Url;
-
-mod bindings {
-    use super::Handler;
-
-    wit_bindgen::generate!({
-        path: "../wasi-http/wit",
-        world: "wasi:http/proxy",
-        exports: {
-            "wasi:http/incoming-handler": Handler,
-        },
-    });
-}
-
-const MAX_CONCURRENCY: usize = 16;
-
-struct Handler;
-
-impl bindings::exports::wasi::http::incoming_handler::Guest for Handler {
-    fn handle(request: IncomingRequest, response_out: ResponseOutparam) {
-        executor::run(async move {
-            handle_request(request, response_out).await;
-        })
-    }
-}
-
-async fn handle_request(request: IncomingRequest, response_out: ResponseOutparam) {
-    let headers = request.headers().entries();
-
-    match (request.method(), request.path_with_query().as_deref()) {
-        (Method::Get, Some("/hash-all")) => {
-            let urls = headers.iter().filter_map(|(k, v)| {
-                (k == "url")
-                    .then_some(v)
-                    .and_then(|v| std::str::from_utf8(v).ok())
-                    .and_then(|v| Url::parse(v).ok())
-            });
-
-            let results = urls.map(|url| async move {
-                let result = hash(&url).await;
-                (url, result)
-            });
-
-            let mut results = stream::iter(results).buffer_unordered(MAX_CONCURRENCY);
-
-            let response = OutgoingResponse::new(
-                200,
-                &Fields::new(&[("content-type".to_string(), b"text/plain".to_vec())]),
-            );
-
-            let mut body =
-                executor::outgoing_body(response.write().expect("response should be writable"));
-
-            ResponseOutparam::set(response_out, Ok(response));
-
-            while let Some((url, result)) = results.next().await {
-                let payload = match result {
-                    Ok(hash) => format!("{url}: {hash}\n"),
-                    Err(e) => format!("{url}: {e:?}\n"),
-                }
-                .into_bytes();
-
-                if let Err(e) = body.send(payload).await {
-                    eprintln!("Error sending payload: {e}");
-                }
-            }
-        }
-
-        (Method::Post, Some("/echo")) => {
-            let response = OutgoingResponse::new(
-                200,
-                &Fields::new(
-                    &headers
-                        .into_iter()
-                        .filter_map(|(k, v)| (k == "content-type").then_some((k, v)))
-                        .collect::<Vec<_>>(),
-                ),
-            );
-
-            let mut body =
-                executor::outgoing_body(response.write().expect("response should be writable"));
-
-            ResponseOutparam::set(response_out, Ok(response));
-
-            let mut stream =
-                executor::incoming_body(request.consume().expect("request should be readable"));
-
-            while let Some(chunk) = stream.next().await {
-                match chunk {
-                    Ok(chunk) => {
-                        if let Err(e) = body.send(chunk).await {
-                            eprintln!("Error sending body: {e}");
-                            break;
-                        }
-                    }
-                    Err(e) => {
-                        eprintln!("Error receiving body: {e}");
-                        break;
-                    }
-                }
-            }
-        }
-
-        _ => {
-            let response = OutgoingResponse::new(405, &Fields::new(&[]));
-
-            let body = response.write().expect("response should be writable");
-
-            ResponseOutparam::set(response_out, Ok(response));
-
-            OutgoingBody::finish(body, None);
-        }
-    }
-}
-
-async fn hash(url: &Url) -> Result<String> {
-    let request = OutgoingRequest::new(
-        &Method::Get,
-        Some(url.path()),
-        Some(&match url.scheme() {
-            "http" => Scheme::Http,
-            "https" => Scheme::Https,
-            scheme => Scheme::Other(scheme.into()),
-        }),
-        Some(&format!(
-            "{}{}",
-            url.host_str().unwrap_or(""),
-            if let Some(port) = url.port() {
-                format!(":{port}")
-            } else {
-                String::new()
-            }
-        )),
-        &Fields::new(&[]),
-    );
-
-    let response = executor::outgoing_request_send(request).await?;
-
-    let status = response.status();
-
-    if !(200..300).contains(&status) {
-        bail!("unexpected status: {status}");
-    }
-
-    let mut body =
-        executor::incoming_body(response.consume().expect("response should be readable"));
-
-    use sha2::Digest;
-    let mut hasher = sha2::Sha256::new();
-    while let Some(chunk) = body.try_next().await? {
-        hasher.update(&chunk);
-    }
-
-    use base64::Engine;
-    Ok(base64::engine::general_purpose::STANDARD_NO_PAD.encode(hasher.finalize()))
-}
-
-// Technically this should not be here for a proxy, but given the current
-// framework for tests it's required since this file is built as a `bin`
-fn main() {}
-
-mod executor {
-    use super::bindings::wasi::{
-        http::{
-            outgoing_handler,
-            types::{
-                self, IncomingBody, IncomingResponse, InputStream, OutgoingBody, OutgoingRequest,
-                OutputStream,
-            },
-        },
-        io::{self, streams::StreamError},
-    };
-    use anyhow::{anyhow, Error, Result};
-    use futures::{future, sink, stream, Sink, Stream};
-    use std::{
-        cell::RefCell,
-        future::Future,
-        mem,
-        rc::Rc,
-        sync::{Arc, Mutex},
-        task::{Context, Poll, Wake, Waker},
-    };
-
-    const READ_SIZE: u64 = 16 * 1024;
-
-    static WAKERS: Mutex<Vec<(io::poll::Pollable, Waker)>> = Mutex::new(Vec::new());
-
-    pub fn run<T>(future: impl Future<Output = T>) -> T {
-        futures::pin_mut!(future);
-
-        struct DummyWaker;
-
-        impl Wake for DummyWaker {
-            fn wake(self: Arc<Self>) {}
-        }
-
-        let waker = Arc::new(DummyWaker).into();
-
-        loop {
-            match future.as_mut().poll(&mut Context::from_waker(&waker)) {
-                Poll::Pending => {
-                    let mut new_wakers = Vec::new();
-
-                    let wakers = mem::take::<Vec<_>>(&mut WAKERS.lock().unwrap());
-
-                    assert!(!wakers.is_empty());
-
-                    let pollables = wakers
-                        .iter()
-                        .map(|(pollable, _)| pollable)
-                        .collect::<Vec<_>>();
-
-                    let mut ready = vec![false; wakers.len()];
-
-                    for index in io::poll::poll_list(&pollables) {
-                        ready[usize::try_from(index).unwrap()] = true;
-                    }
-
-                    for (ready, (pollable, waker)) in ready.into_iter().zip(wakers) {
-                        if ready {
-                            waker.wake()
-                        } else {
-                            new_wakers.push((pollable, waker));
-                        }
-                    }
-
-                    *WAKERS.lock().unwrap() = new_wakers;
-                }
-                Poll::Ready(result) => break result,
-            }
-        }
-    }
-
-    pub fn outgoing_body(body: OutgoingBody) -> impl Sink<Vec<u8>, Error = Error> {
-        struct Outgoing(Option<(OutputStream, OutgoingBody)>);
-
-        impl Drop for Outgoing {
-            fn drop(&mut self) {
-                if let Some((stream, body)) = self.0.take() {
-                    drop(stream);
-                    OutgoingBody::finish(body, None);
-                }
-            }
-        }
-
-        let stream = body.write().expect("response body should be writable");
-        let pair = Rc::new(RefCell::new(Outgoing(Some((stream, body)))));
-
-        sink::unfold((), {
-            move |(), chunk: Vec<u8>| {
-                future::poll_fn({
-                    let mut offset = 0;
-                    let mut flushing = false;
-                    let pair = pair.clone();
-
-                    move |context| {
-                        let pair = pair.borrow();
-                        let (stream, _) = &pair.0.as_ref().unwrap();
-
-                        loop {
-                            match stream.check_write() {
-                                Ok(0) => {
-                                    WAKERS
-                                        .lock()
-                                        .unwrap()
-                                        .push((stream.subscribe(), context.waker().clone()));
-
-                                    break Poll::Pending;
-                                }
-                                Ok(count) => {
-                                    if offset == chunk.len() {
-                                        if flushing {
-                                            break Poll::Ready(Ok(()));
-                                        } else {
-                                            stream.flush().expect("stream should be flushable");
-                                            flushing = true;
-                                        }
-                                    } else {
-                                        let count = usize::try_from(count)
-                                            .unwrap()
-                                            .min(chunk.len() - offset);
-
-                                        match stream.write(&chunk[offset..][..count]) {
-                                            Ok(()) => {
-                                                offset += count;
-                                            }
-                                            Err(_) => break Poll::Ready(Err(anyhow!("I/O error"))),
-                                        }
-                                    }
-                                }
-                                Err(_) => break Poll::Ready(Err(anyhow!("I/O error"))),
-                            }
-                        }
-                    }
-                })
-            }
-        })
-    }
-
-    pub fn outgoing_request_send(
-        request: OutgoingRequest,
-    ) -> impl Future<Output = Result<IncomingResponse, types::Error>> {
-        future::poll_fn({
-            let response = outgoing_handler::handle(request, None);
-
-            move |context| match &response {
-                Ok(response) => {
-                    if let Some(response) = response.get() {
-                        Poll::Ready(response.unwrap())
-                    } else {
-                        WAKERS
-                            .lock()
-                            .unwrap()
-                            .push((response.subscribe(), context.waker().clone()));
-                        Poll::Pending
-                    }
-                }
-                Err(error) => Poll::Ready(Err(error.clone())),
-            }
-        })
-    }
-
-    pub fn incoming_body(body: IncomingBody) -> impl Stream<Item = Result<Vec<u8>>> {
-        struct Incoming(Option<(InputStream, IncomingBody)>);
-
-        impl Drop for Incoming {
-            fn drop(&mut self) {
-                if let Some((stream, body)) = self.0.take() {
-                    drop(stream);
-                    IncomingBody::finish(body);
-                }
-            }
-        }
-
-        stream::poll_fn({
-            let stream = body.stream().expect("response body should be readable");
-            let pair = Incoming(Some((stream, body)));
-
-            move |context| {
-                if let Some((stream, _)) = &pair.0 {
-                    match stream.read(READ_SIZE) {
-                        Ok(buffer) => {
-                            if buffer.is_empty() {
-                                WAKERS
-                                    .lock()
-                                    .unwrap()
-                                    .push((stream.subscribe(), context.waker().clone()));
-                                Poll::Pending
-                            } else {
-                                Poll::Ready(Some(Ok(buffer)))
-                            }
-                        }
-                        Err(StreamError::Closed) => Poll::Ready(None),
-                        Err(StreamError::LastOperationFailed(error)) => {
-                            Poll::Ready(Some(Err(anyhow!("{}", error.to_debug_string()))))
-                        }
-                    }
-                } else {
-                    Poll::Ready(None)
-                }
-            }
-        })
-    }
-}
diff --git a/crates/test-programs/src/bin/cli_splice_stdin.rs b/crates/test-programs/src/bin/cli_splice_stdin.rs
deleted file mode 100644
index 66e14b4f42ef..000000000000
--- a/crates/test-programs/src/bin/cli_splice_stdin.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use test_programs::wasi::cli::{stdin, stdout};
-use test_programs::wasi::io::streams::StreamError;
-
-fn main() {
-    println!("before splice");
-    let stdout = stdout::get_stdout();
-    let stdin = stdin::get_stdin();
-
-    let mut spliced = 0;
-    loop {
-        match stdout.blocking_splice(&stdin, 4096) {
-            Ok(n) => spliced += n as usize,
-            Err(StreamError::Closed) => break,
-            Err(StreamError::LastOperationFailed(f)) => {
-                panic!("stream failure: {}", f.to_debug_string())
-            }
-        }
-    }
-    let _ = stdin;
-    stdout.blocking_flush().unwrap();
-    let _ = stdout;
-
-    println!("\ncompleted splicing {spliced} bytes");
-}
diff --git a/crates/test-programs/src/bin/http_outbound_request_invalid_dnsname.rs b/crates/test-programs/src/bin/http_outbound_request_invalid_dnsname.rs
deleted file mode 100644
index 100f57d6d022..000000000000
--- a/crates/test-programs/src/bin/http_outbound_request_invalid_dnsname.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use test_programs::wasi::http::types::{Method, Scheme};
-
-fn main() {
-    let res = test_programs::http::request(
-        Method::Get,
-        Scheme::Http,
-        "some.invalid.dnsname:3000",
-        "/",
-        None,
-        None,
-    );
-
-    let error = res.unwrap_err().to_string();
-    assert!(
-        error.starts_with("Error::InvalidUrl(\""),
-        "bad error: {error}"
-    );
-}
diff --git a/crates/test-programs/src/bin/http_outbound_request_invalid_version.rs b/crates/test-programs/src/bin/http_outbound_request_invalid_version.rs
deleted file mode 100644
index 59c652fc2b9a..000000000000
--- a/crates/test-programs/src/bin/http_outbound_request_invalid_version.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use test_programs::wasi::http::types::{Method, Scheme};
-
-fn main() {
-    let addr = std::env::var("HTTP_SERVER").unwrap();
-    let res =
-        test_programs::http::request(Method::Connect, Scheme::Http, &addr, "/", None, Some(&[]));
-
-    let error = res.unwrap_err().to_string();
-    if !error.starts_with("Error::ProtocolError(\"") {
-        panic!(
-            r#"assertion failed: `(left == right)`
-      left: `"{error}"`,
-      right: `"Error::ProtocolError(\"invalid HTTP version parsed\")"`
-            or `"Error::ProtocolError(\"operation was canceled\")"`)"#
-        )
-    }
-}
diff --git a/crates/test-programs/src/bin/http_outbound_request_post.rs b/crates/test-programs/src/bin/http_outbound_request_post.rs
deleted file mode 100644
index 3831f0a274a5..000000000000
--- a/crates/test-programs/src/bin/http_outbound_request_post.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use anyhow::Context;
-use test_programs::wasi::http::types::{Method, Scheme};
-
-fn main() {
-    let addr = std::env::var("HTTP_SERVER").unwrap();
-    let res = test_programs::http::request(
-        Method::Post,
-        Scheme::Http,
-        &addr,
-        "/post",
-        Some(b"{\"foo\": \"bar\"}"),
-        None,
-    )
-    .context("/post")
-    .unwrap();
-
-    println!("/post: {res:?}");
-    assert_eq!(res.status, 200);
-    let method = res.header("x-wasmtime-test-method").unwrap();
-    assert_eq!(std::str::from_utf8(method).unwrap(), "POST");
-    assert_eq!(res.body, b"{\"foo\": \"bar\"}", "invalid body returned");
-}
diff --git a/crates/test-programs/src/bin/http_outbound_request_put.rs b/crates/test-programs/src/bin/http_outbound_request_put.rs
deleted file mode 100644
index ae01967c1df5..000000000000
--- a/crates/test-programs/src/bin/http_outbound_request_put.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use anyhow::Context;
-use test_programs::wasi::http::types::{Method, Scheme};
-
-fn main() {
-    let addr = std::env::var("HTTP_SERVER").unwrap();
-    let res =
-        test_programs::http::request(Method::Put, Scheme::Http, &addr, "/put", Some(&[]), None)
-            .context("/put")
-            .unwrap();
-
-    println!("/put: {res:?}");
-    assert_eq!(res.status, 200);
-    let method = res.header("x-wasmtime-test-method").unwrap();
-    assert_eq!(std::str::from_utf8(method).unwrap(), "PUT");
-    assert_eq!(res.body, b"");
-}
diff --git a/crates/test-programs/src/bin/http_outbound_request_response_build.rs b/crates/test-programs/src/bin/http_outbound_request_response_build.rs
deleted file mode 100644
index b377b4a47955..000000000000
--- a/crates/test-programs/src/bin/http_outbound_request_response_build.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use test_programs::wasi::http::types as http_types;
-
-fn main() {
-    println!("Called _start");
-    {
-        let headers = http_types::Headers::new(&[(
-            "Content-Type".to_string(),
-            "application/json".to_string().into_bytes(),
-        )]);
-        let request = http_types::OutgoingRequest::new(
-            &http_types::Method::Get,
-            None,
-            Some(&http_types::Scheme::Https),
-            Some("www.example.com"),
-            &headers,
-        );
-        let outgoing_body = request.write().unwrap();
-        let request_body = outgoing_body.write().unwrap();
-        request_body
-            .blocking_write_and_flush("request-body".as_bytes())
-            .unwrap();
-    }
-    {
-        let headers = http_types::Headers::new(&[(
-            "Content-Type".to_string(),
-            "application/text".to_string().into_bytes(),
-        )]);
-        let response = http_types::OutgoingResponse::new(200, &headers);
-        let outgoing_body = response.write().unwrap();
-        let response_body = outgoing_body.write().unwrap();
-        response_body
-            .blocking_write_and_flush("response-body".as_bytes())
-            .unwrap();
-    }
-    println!("Done");
-}
diff --git a/crates/test-programs/src/bin/preview2_ip_name_lookup.rs b/crates/test-programs/src/bin/preview2_ip_name_lookup.rs
deleted file mode 100644
index 219ebba459f2..000000000000
--- a/crates/test-programs/src/bin/preview2_ip_name_lookup.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use test_programs::wasi::clocks::*;
-use test_programs::wasi::io::*;
-use test_programs::wasi::sockets::*;
-
-fn main() {
-    let network = instance_network::instance_network();
-
-    let addresses =
-        ip_name_lookup::resolve_addresses(&network, "example.com", None, false).unwrap();
-    let pollable = addresses.subscribe();
-    poll::poll_one(&pollable);
-    assert!(addresses.resolve_next_address().is_ok());
-
-    let result = ip_name_lookup::resolve_addresses(&network, "a.b<&>", None, false);
-    assert!(matches!(result, Err(network::ErrorCode::InvalidArgument)));
-
-    // Try resolving a valid address and ensure that it eventually terminates.
-    // To help prevent this test from being flaky this additionally times out
-    // the resolution and allows errors.
-    let addresses = ip_name_lookup::resolve_addresses(&network, "github.com", None, false).unwrap();
-    let lookup = addresses.subscribe();
-    let timeout = monotonic_clock::subscribe(1_000_000_000, false);
-    let ready = poll::poll_list(&[&lookup, &timeout]);
-    assert!(ready.len() > 0);
-    match ready[0] {
-        0 => loop {
-            match addresses.resolve_next_address() {
-                Ok(Some(_)) => {}
-                Ok(None) => break,
-                Err(_) => break,
-            }
-        },
-        1 => {}
-        _ => unreachable!(),
-    }
-}
diff --git a/crates/test-programs/src/bin/preview2_sleep.rs b/crates/test-programs/src/bin/preview2_sleep.rs
deleted file mode 100644
index a5f4d76a3f5c..000000000000
--- a/crates/test-programs/src/bin/preview2_sleep.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use test_programs::wasi::{clocks::monotonic_clock, io::poll};
-
-fn main() {
-    sleep_10ms();
-    sleep_0ms();
-    sleep_backwards_in_time();
-}
-
-fn sleep_10ms() {
-    let dur = 10_000_000;
-    let p = monotonic_clock::subscribe(monotonic_clock::now() + dur, true);
-    poll::poll_one(&p);
-    let p = monotonic_clock::subscribe(dur, false);
-    poll::poll_one(&p);
-}
-
-fn sleep_0ms() {
-    let p = monotonic_clock::subscribe(monotonic_clock::now(), true);
-    poll::poll_one(&p);
-    let p = monotonic_clock::subscribe(0, false);
-    poll::poll_one(&p);
-}
-
-fn sleep_backwards_in_time() {
-    let p = monotonic_clock::subscribe(monotonic_clock::now() - 1, true);
-    poll::poll_one(&p);
-}
diff --git a/crates/test-programs/src/bin/preview2_stream_pollable_correct.rs b/crates/test-programs/src/bin/preview2_stream_pollable_correct.rs
deleted file mode 100644
index dfb15573470e..000000000000
--- a/crates/test-programs/src/bin/preview2_stream_pollable_correct.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use test_programs::wasi::cli::stdin;
-use test_programs::wasi::io::poll;
-use test_programs::wasi::io::streams;
-
-fn main() {
-    let stdin: streams::InputStream = stdin::get_stdin();
-    let stdin_pollable = stdin.subscribe();
-    let ready = poll::poll_list(&[&stdin_pollable]);
-    assert_eq!(ready, &[0]);
-    drop(stdin_pollable);
-    drop(stdin);
-}
diff --git a/crates/test-programs/src/bin/preview2_stream_pollable_traps.rs b/crates/test-programs/src/bin/preview2_stream_pollable_traps.rs
deleted file mode 100644
index 13331fb02ee6..000000000000
--- a/crates/test-programs/src/bin/preview2_stream_pollable_traps.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use test_programs::wasi::cli::stdin;
-use test_programs::wasi::io::poll;
-use test_programs::wasi::io::streams;
-
-fn main() {
-    let stdin: streams::InputStream = stdin::get_stdin();
-    let stdin_pollable = stdin.subscribe();
-    let ready = poll::poll_list(&[&stdin_pollable]);
-    assert_eq!(ready, &[0]);
-    drop(stdin);
-    unreachable!("execution should have trapped in line above when stream dropped before pollable");
-}
diff --git a/crates/test-programs/src/bin/preview2_tcp_bind.rs b/crates/test-programs/src/bin/preview2_tcp_bind.rs
deleted file mode 100644
index 0dadd114b5d6..000000000000
--- a/crates/test-programs/src/bin/preview2_tcp_bind.rs
+++ /dev/null
@@ -1,156 +0,0 @@
-use test_programs::wasi::sockets::network::{
-    ErrorCode, IpAddress, IpAddressFamily, IpSocketAddress, Network,
-};
-use test_programs::wasi::sockets::tcp::TcpSocket;
-
-/// Bind a socket and let the system determine a port.
-fn test_tcp_bind_ephemeral_port(net: &Network, ip: IpAddress) {
-    let bind_addr = IpSocketAddress::new(ip, 0);
-
-    let sock = TcpSocket::new(ip.family()).unwrap();
-    sock.blocking_bind(net, bind_addr).unwrap();
-
-    let bound_addr = sock.local_address().unwrap();
-
-    assert_eq!(bind_addr.ip(), bound_addr.ip());
-    assert_ne!(bind_addr.port(), bound_addr.port());
-}
-
-/// Bind a socket on a specified port.
-fn test_tcp_bind_specific_port(net: &Network, ip: IpAddress) {
-    const PORT: u16 = 54321;
-
-    let bind_addr = IpSocketAddress::new(ip, PORT);
-
-    let sock = TcpSocket::new(ip.family()).unwrap();
-    match sock.blocking_bind(net, bind_addr) {
-        Ok(()) => {
-            let bound_addr = sock.local_address().unwrap();
-
-            assert_eq!(bind_addr.ip(), bound_addr.ip());
-            assert_eq!(bind_addr.port(), bound_addr.port());
-        }
-        Err(ErrorCode::AddressInUse) => {}
-        Err(e) => panic!("error: {e}"),
-    }
-}
-
-/// Two sockets may not be actively bound to the same address at the same time.
-fn test_tcp_bind_addrinuse(net: &Network, ip: IpAddress) {
-    let bind_addr = IpSocketAddress::new(ip, 0);
-
-    let sock1 = TcpSocket::new(ip.family()).unwrap();
-    sock1.blocking_bind(net, bind_addr).unwrap();
-    sock1.blocking_listen().unwrap();
-
-    let bound_addr = sock1.local_address().unwrap();
-
-    let sock2 = TcpSocket::new(ip.family()).unwrap();
-    assert_eq!(
-        sock2.blocking_bind(net, bound_addr),
-        Err(ErrorCode::AddressInUse)
-    );
-}
-
-// Try binding to an address that is not configured on the system.
-fn test_tcp_bind_addrnotavail(net: &Network, ip: IpAddress) {
-    let bind_addr = IpSocketAddress::new(ip, 0);
-
-    let sock = TcpSocket::new(ip.family()).unwrap();
-
-    assert_eq!(
-        sock.blocking_bind(net, bind_addr),
-        Err(ErrorCode::AddressNotBindable)
-    );
-}
-
-/// Bind should validate the address family.
-fn test_tcp_bind_wrong_family(net: &Network, family: IpAddressFamily) {
-    let wrong_ip = match family {
-        IpAddressFamily::Ipv4 => IpAddress::IPV6_LOOPBACK,
-        IpAddressFamily::Ipv6 => IpAddress::IPV4_LOOPBACK,
-    };
-
-    let sock = TcpSocket::new(family).unwrap();
-    let result = sock.blocking_bind(net, IpSocketAddress::new(wrong_ip, 0));
-
-    assert!(matches!(result, Err(ErrorCode::InvalidArgument)));
-}
-
-/// Bind only works on unicast addresses.
-fn test_tcp_bind_non_unicast(net: &Network) {
-    let ipv4_broadcast = IpSocketAddress::new(IpAddress::IPV4_BROADCAST, 0);
-    let ipv4_multicast = IpSocketAddress::new(IpAddress::Ipv4((224, 254, 0, 0)), 0);
-    let ipv6_multicast = IpSocketAddress::new(IpAddress::Ipv6((0xff00, 0, 0, 0, 0, 0, 0, 0)), 0);
-
-    let sock_v4 = TcpSocket::new(IpAddressFamily::Ipv4).unwrap();
-    let sock_v6 = TcpSocket::new(IpAddressFamily::Ipv6).unwrap();
-
-    assert!(matches!(
-        sock_v4.blocking_bind(net, ipv4_broadcast),
-        Err(ErrorCode::InvalidArgument)
-    ));
-    assert!(matches!(
-        sock_v4.blocking_bind(net, ipv4_multicast),
-        Err(ErrorCode::InvalidArgument)
-    ));
-    assert!(matches!(
-        sock_v6.blocking_bind(net, ipv6_multicast),
-        Err(ErrorCode::InvalidArgument)
-    ));
-}
-
-fn test_tcp_bind_dual_stack(net: &Network) {
-    let sock = TcpSocket::new(IpAddressFamily::Ipv6).unwrap();
-    let addr = IpSocketAddress::new(IpAddress::IPV4_MAPPED_LOOPBACK, 0);
-
-    // Even on platforms that don't support dualstack sockets,
-    // setting ipv6_only to true (disabling dualstack mode) should work.
-    sock.set_ipv6_only(true).unwrap();
-
-    // Binding an IPv4-mapped-IPv6 address on a ipv6-only socket should fail:
-    assert!(matches!(
-        sock.blocking_bind(net, addr),
-        Err(ErrorCode::InvalidArgument)
-    ));
-
-    sock.set_ipv6_only(false).unwrap();
-
-    sock.blocking_bind(net, addr).unwrap();
-
-    let bound_addr = sock.local_address().unwrap();
-
-    assert_eq!(bound_addr.family(), IpAddressFamily::Ipv6);
-}
-
-fn main() {
-    const RESERVED_IPV4_ADDRESS: IpAddress = IpAddress::Ipv4((192, 0, 2, 0)); // Reserved for documentation and examples.
-    const RESERVED_IPV6_ADDRESS: IpAddress = IpAddress::Ipv6((0x2001, 0x0db8, 0, 0, 0, 0, 0, 0)); // Reserved for documentation and examples.
-
-    let net = Network::default();
-
-    test_tcp_bind_ephemeral_port(&net, IpAddress::IPV4_LOOPBACK);
-    test_tcp_bind_ephemeral_port(&net, IpAddress::IPV6_LOOPBACK);
-    test_tcp_bind_ephemeral_port(&net, IpAddress::IPV4_UNSPECIFIED);
-    test_tcp_bind_ephemeral_port(&net, IpAddress::IPV6_UNSPECIFIED);
-
-    test_tcp_bind_specific_port(&net, IpAddress::IPV4_LOOPBACK);
-    test_tcp_bind_specific_port(&net, IpAddress::IPV6_LOOPBACK);
-    test_tcp_bind_specific_port(&net, IpAddress::IPV4_UNSPECIFIED);
-    test_tcp_bind_specific_port(&net, IpAddress::IPV6_UNSPECIFIED);
-
-    test_tcp_bind_addrinuse(&net, IpAddress::IPV4_LOOPBACK);
-    test_tcp_bind_addrinuse(&net, IpAddress::IPV6_LOOPBACK);
-    test_tcp_bind_addrinuse(&net, IpAddress::IPV4_UNSPECIFIED);
-    test_tcp_bind_addrinuse(&net, IpAddress::IPV6_UNSPECIFIED);
-
-    test_tcp_bind_addrnotavail(&net, RESERVED_IPV4_ADDRESS);
-    test_tcp_bind_addrnotavail(&net, RESERVED_IPV6_ADDRESS);
-
-    test_tcp_bind_wrong_family(&net, IpAddressFamily::Ipv4);
-    test_tcp_bind_wrong_family(&net, IpAddressFamily::Ipv6);
-
-    test_tcp_bind_non_unicast(&net);
-
-    test_tcp_bind_dual_stack(&net);
-}
diff --git a/crates/test-programs/src/bin/preview2_tcp_connect.rs b/crates/test-programs/src/bin/preview2_tcp_connect.rs
deleted file mode 100644
index 58d5a84c4d7c..000000000000
--- a/crates/test-programs/src/bin/preview2_tcp_connect.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-use test_programs::wasi::sockets::network::{
-    ErrorCode, IpAddress, IpAddressFamily, IpSocketAddress, Network,
-};
-use test_programs::wasi::sockets::tcp::TcpSocket;
-
-const SOME_PORT: u16 = 47; // If the tests pass, this will never actually be connected to.
-
-/// `0.0.0.0` / `::` is not a valid remote address in WASI.
-fn test_tcp_connect_unspec(net: &Network, family: IpAddressFamily) {
-    let addr = IpSocketAddress::new(IpAddress::new_unspecified(family), SOME_PORT);
-    let sock = TcpSocket::new(family).unwrap();
-
-    assert!(matches!(
-        sock.blocking_connect(net, addr),
-        Err(ErrorCode::InvalidArgument)
-    ));
-}
-
-/// 0 is not a valid remote port.
-fn test_tcp_connect_port_0(net: &Network, family: IpAddressFamily) {
-    let addr = IpSocketAddress::new(IpAddress::new_loopback(family), 0);
-    let sock = TcpSocket::new(family).unwrap();
-
-    assert!(matches!(
-        sock.blocking_connect(net, addr),
-        Err(ErrorCode::InvalidArgument)
-    ));
-}
-
-/// Bind should validate the address family.
-fn test_tcp_connect_wrong_family(net: &Network, family: IpAddressFamily) {
-    let wrong_ip = match family {
-        IpAddressFamily::Ipv4 => IpAddress::IPV6_LOOPBACK,
-        IpAddressFamily::Ipv6 => IpAddress::IPV4_LOOPBACK,
-    };
-    let remote_addr = IpSocketAddress::new(wrong_ip, SOME_PORT);
-
-    let sock = TcpSocket::new(family).unwrap();
-
-    assert!(matches!(
-        sock.blocking_connect(net, remote_addr),
-        Err(ErrorCode::InvalidArgument)
-    ));
-}
-
-/// Can only connect to unicast addresses.
-fn test_tcp_connect_non_unicast(net: &Network) {
-    let ipv4_broadcast = IpSocketAddress::new(IpAddress::IPV4_BROADCAST, SOME_PORT);
-    let ipv4_multicast = IpSocketAddress::new(IpAddress::Ipv4((224, 254, 0, 0)), SOME_PORT);
-    let ipv6_multicast =
-        IpSocketAddress::new(IpAddress::Ipv6((0xff00, 0, 0, 0, 0, 0, 0, 0)), SOME_PORT);
-
-    let sock_v4 = TcpSocket::new(IpAddressFamily::Ipv4).unwrap();
-    let sock_v6 = TcpSocket::new(IpAddressFamily::Ipv6).unwrap();
-
-    assert!(matches!(
-        sock_v4.blocking_connect(net, ipv4_broadcast),
-        Err(ErrorCode::InvalidArgument)
-    ));
-    assert!(matches!(
-        sock_v4.blocking_connect(net, ipv4_multicast),
-        Err(ErrorCode::InvalidArgument)
-    ));
-    assert!(matches!(
-        sock_v6.blocking_connect(net, ipv6_multicast),
-        Err(ErrorCode::InvalidArgument)
-    ));
-}
-
-fn test_tcp_connect_dual_stack(net: &Network) {
-    // Set-up:
-    let v4_listener = TcpSocket::new(IpAddressFamily::Ipv4).unwrap();
-    v4_listener
-        .blocking_bind(&net, IpSocketAddress::new(IpAddress::IPV4_LOOPBACK, 0))
-        .unwrap();
-    v4_listener.blocking_listen().unwrap();
-
-    let v4_listener_addr = v4_listener.local_address().unwrap();
-    let v6_listener_addr =
-        IpSocketAddress::new(IpAddress::IPV4_MAPPED_LOOPBACK, v4_listener_addr.port());
-
-    let v6_client = TcpSocket::new(IpAddressFamily::Ipv6).unwrap();
-
-    // Tests:
-
-    // Even on platforms that don't support dualstack sockets,
-    // setting ipv6_only to true (disabling dualstack mode) should work.
-    v6_client.set_ipv6_only(true).unwrap();
-
-    // Connecting to an IPv4-mapped-IPv6 address on an ipv6-only socket should fail:
-    assert!(matches!(
-        v6_client.blocking_connect(net, v6_listener_addr),
-        Err(ErrorCode::InvalidArgument)
-    ));
-
-    v6_client.set_ipv6_only(false).unwrap();
-
-    v6_client.blocking_connect(net, v6_listener_addr).unwrap();
-
-    let connected_addr = v6_client.local_address().unwrap();
-
-    assert_eq!(connected_addr.family(), IpAddressFamily::Ipv6);
-}
-
-fn main() {
-    let net = Network::default();
-
-    test_tcp_connect_unspec(&net, IpAddressFamily::Ipv4);
-    test_tcp_connect_unspec(&net, IpAddressFamily::Ipv6);
-
-    test_tcp_connect_port_0(&net, IpAddressFamily::Ipv4);
-    test_tcp_connect_port_0(&net, IpAddressFamily::Ipv6);
-
-    test_tcp_connect_wrong_family(&net, IpAddressFamily::Ipv4);
-    test_tcp_connect_wrong_family(&net, IpAddressFamily::Ipv6);
-
-    test_tcp_connect_non_unicast(&net);
-
-    test_tcp_connect_dual_stack(&net);
-}
diff --git a/crates/test-programs/src/bin/preview2_tcp_sample_application.rs b/crates/test-programs/src/bin/preview2_tcp_sample_application.rs
deleted file mode 100644
index a2b648106e5d..000000000000
--- a/crates/test-programs/src/bin/preview2_tcp_sample_application.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use test_programs::wasi::sockets::network::{
-    IpAddressFamily, IpSocketAddress, Ipv4SocketAddress, Ipv6SocketAddress, Network,
-};
-use test_programs::wasi::sockets::tcp::TcpSocket;
-
-fn test_sample_application(family: IpAddressFamily, bind_address: IpSocketAddress) {
-    let first_message = b"Hello, world!";
-    let second_message = b"Greetings, planet!";
-
-    let net = Network::default();
-    let listener = TcpSocket::new(family).unwrap();
-
-    listener.blocking_bind(&net, bind_address).unwrap();
-    listener.set_listen_backlog_size(32).unwrap();
-    listener.blocking_listen().unwrap();
-
-    let addr = listener.local_address().unwrap();
-
-    {
-        let client = TcpSocket::new(family).unwrap();
-        let (_client_input, client_output) = client.blocking_connect(&net, addr).unwrap();
-
-        client_output.blocking_write_util(&[]).unwrap();
-        client_output.blocking_write_util(first_message).unwrap();
-    }
-
-    {
-        let (_accepted, input, _output) = listener.blocking_accept().unwrap();
-
-        let empty_data = input.read(0).unwrap();
-        assert!(empty_data.is_empty());
-
-        let data = input.blocking_read(first_message.len() as u64).unwrap();
-
-        // Check that we sent and recieved our message!
-        assert_eq!(data, first_message); // Not guaranteed to work but should work in practice.
-    }
-
-    // Another client
-    {
-        let client = TcpSocket::new(family).unwrap();
-        let (_client_input, client_output) = client.blocking_connect(&net, addr).unwrap();
-
-        client_output.blocking_write_util(second_message).unwrap();
-    }
-
-    {
-        let (_accepted, input, _output) = listener.blocking_accept().unwrap();
-        let data = input.blocking_read(second_message.len() as u64).unwrap();
-
-        // Check that we sent and recieved our message!
-        assert_eq!(data, second_message); // Not guaranteed to work but should work in practice.
-    }
-}
-
-fn main() {
-    test_sample_application(
-        IpAddressFamily::Ipv4,
-        IpSocketAddress::Ipv4(Ipv4SocketAddress {
-            port: 0,                 // use any free port
-            address: (127, 0, 0, 1), // localhost
-        }),
-    );
-    test_sample_application(
-        IpAddressFamily::Ipv6,
-        IpSocketAddress::Ipv6(Ipv6SocketAddress {
-            port: 0,                           // use any free port
-            address: (0, 0, 0, 0, 0, 0, 0, 1), // localhost
-            flow_info: 0,
-            scope_id: 0,
-        }),
-    );
-}
diff --git a/crates/test-programs/src/bin/preview2_tcp_sockopts.rs b/crates/test-programs/src/bin/preview2_tcp_sockopts.rs
deleted file mode 100644
index 2170ed420b00..000000000000
--- a/crates/test-programs/src/bin/preview2_tcp_sockopts.rs
+++ /dev/null
@@ -1,190 +0,0 @@
-use test_programs::wasi::sockets::network::{
-    ErrorCode, IpAddress, IpAddressFamily, IpSocketAddress, Network,
-};
-use test_programs::wasi::sockets::tcp::TcpSocket;
-
-fn test_tcp_sockopt_defaults(family: IpAddressFamily) {
-    let sock = TcpSocket::new(family).unwrap();
-
-    assert_eq!(sock.address_family(), family);
-
-    if family == IpAddressFamily::Ipv6 {
-        sock.ipv6_only().unwrap(); // Only verify that it has a default value at all, but either value is valid.
-    }
-
-    sock.keep_alive().unwrap(); // Only verify that it has a default value at all, but either value is valid.
-    assert_eq!(sock.no_delay().unwrap(), false);
-    assert!(sock.unicast_hop_limit().unwrap() > 0);
-    assert!(sock.receive_buffer_size().unwrap() > 0);
-    assert!(sock.send_buffer_size().unwrap() > 0);
-}
-
-fn test_tcp_sockopt_input_ranges(family: IpAddressFamily) {
-    let sock = TcpSocket::new(family).unwrap();
-
-    if family == IpAddressFamily::Ipv6 {
-        assert!(matches!(sock.set_ipv6_only(true), Ok(_)));
-        assert!(matches!(sock.set_ipv6_only(false), Ok(_)));
-    }
-
-    assert!(matches!(sock.set_listen_backlog_size(0), Ok(_))); // Unsupported sizes should be silently capped.
-    assert!(matches!(sock.set_listen_backlog_size(u64::MAX), Ok(_))); // Unsupported sizes should be silently capped.
-
-    assert!(matches!(sock.set_keep_alive(true), Ok(_)));
-    assert!(matches!(sock.set_keep_alive(false), Ok(_)));
-
-    assert!(matches!(sock.set_no_delay(true), Ok(_)));
-    assert!(matches!(sock.set_no_delay(false), Ok(_)));
-
-    assert!(matches!(
-        sock.set_unicast_hop_limit(0),
-        Err(ErrorCode::InvalidArgument)
-    ));
-    assert!(matches!(sock.set_unicast_hop_limit(1), Ok(_)));
-    assert!(matches!(sock.set_unicast_hop_limit(u8::MAX), Ok(_)));
-
-    assert!(matches!(sock.set_receive_buffer_size(0), Ok(_))); // Unsupported sizes should be silently capped.
-    assert!(matches!(sock.set_receive_buffer_size(u64::MAX), Ok(_))); // Unsupported sizes should be silently capped.
-    assert!(matches!(sock.set_send_buffer_size(0), Ok(_))); // Unsupported sizes should be silently capped.
-    assert!(matches!(sock.set_send_buffer_size(u64::MAX), Ok(_))); // Unsupported sizes should be silently capped.
-}
-
-fn test_tcp_sockopt_readback(family: IpAddressFamily) {
-    let sock = TcpSocket::new(family).unwrap();
-
-    if family == IpAddressFamily::Ipv6 {
-        sock.set_ipv6_only(true).unwrap();
-        assert_eq!(sock.ipv6_only().unwrap(), true);
-        sock.set_ipv6_only(false).unwrap();
-        assert_eq!(sock.ipv6_only().unwrap(), false);
-    }
-
-    sock.set_keep_alive(true).unwrap();
-    assert_eq!(sock.keep_alive().unwrap(), true);
-    sock.set_keep_alive(false).unwrap();
-    assert_eq!(sock.keep_alive().unwrap(), false);
-
-    sock.set_no_delay(true).unwrap();
-    assert_eq!(sock.no_delay().unwrap(), true);
-    sock.set_no_delay(false).unwrap();
-    assert_eq!(sock.no_delay().unwrap(), false);
-
-    sock.set_unicast_hop_limit(42).unwrap();
-    assert_eq!(sock.unicast_hop_limit().unwrap(), 42);
-
-    sock.set_receive_buffer_size(0x10000).unwrap();
-    assert_eq!(sock.receive_buffer_size().unwrap(), 0x10000);
-
-    sock.set_send_buffer_size(0x10000).unwrap();
-    assert_eq!(sock.send_buffer_size().unwrap(), 0x10000);
-}
-
-fn test_tcp_sockopt_inheritance(net: &Network, family: IpAddressFamily) {
-    let bind_addr = IpSocketAddress::new(IpAddress::new_loopback(family), 0);
-    let listener = TcpSocket::new(family).unwrap();
-
-    let default_ipv6_only = listener.ipv6_only().unwrap_or(false);
-    let default_keep_alive = listener.keep_alive().unwrap();
-
-    // Configure options on listener:
-    {
-        if family == IpAddressFamily::Ipv6 {
-            listener.set_ipv6_only(!default_ipv6_only).unwrap();
-        }
-
-        listener.set_keep_alive(!default_keep_alive).unwrap();
-        listener.set_no_delay(true).unwrap();
-        listener.set_unicast_hop_limit(42).unwrap();
-        listener.set_receive_buffer_size(0x10000).unwrap();
-        listener.set_send_buffer_size(0x10000).unwrap();
-    }
-
-    listener.blocking_bind(&net, bind_addr).unwrap();
-    listener.blocking_listen().unwrap();
-    let bound_addr = listener.local_address().unwrap();
-    let client = TcpSocket::new(family).unwrap();
-    client.blocking_connect(&net, bound_addr).unwrap();
-    let (accepted_client, _, _) = listener.blocking_accept().unwrap();
-
-    // Verify options on accepted socket:
-    {
-        if family == IpAddressFamily::Ipv6 {
-            assert_eq!(accepted_client.ipv6_only().unwrap(), !default_ipv6_only);
-        }
-
-        assert_eq!(accepted_client.keep_alive().unwrap(), !default_keep_alive);
-        assert_eq!(accepted_client.no_delay().unwrap(), true);
-        assert_eq!(accepted_client.unicast_hop_limit().unwrap(), 42);
-        assert_eq!(accepted_client.receive_buffer_size().unwrap(), 0x10000);
-        assert_eq!(accepted_client.send_buffer_size().unwrap(), 0x10000);
-    }
-
-    // Update options on listener to something else:
-    {
-        listener.set_keep_alive(default_keep_alive).unwrap();
-        listener.set_no_delay(false).unwrap();
-        listener.set_unicast_hop_limit(43).unwrap();
-        listener.set_receive_buffer_size(0x20000).unwrap();
-        listener.set_send_buffer_size(0x20000).unwrap();
-    }
-
-    // Verify that the already accepted socket was not affected:
-    {
-        assert_eq!(accepted_client.keep_alive().unwrap(), !default_keep_alive);
-        assert_eq!(accepted_client.no_delay().unwrap(), true);
-        assert_eq!(accepted_client.unicast_hop_limit().unwrap(), 42);
-        assert_eq!(accepted_client.receive_buffer_size().unwrap(), 0x10000);
-        assert_eq!(accepted_client.send_buffer_size().unwrap(), 0x10000);
-    }
-}
-
-fn test_tcp_sockopt_after_listen(net: &Network, family: IpAddressFamily) {
-    let bind_addr = IpSocketAddress::new(IpAddress::new_loopback(family), 0);
-    let listener = TcpSocket::new(family).unwrap();
-    listener.blocking_bind(&net, bind_addr).unwrap();
-    listener.blocking_listen().unwrap();
-    let bound_addr = listener.local_address().unwrap();
-
-    let default_keep_alive = listener.keep_alive().unwrap();
-
-    // Update options while the socket is already listening:
-    {
-        listener.set_keep_alive(!default_keep_alive).unwrap();
-        listener.set_no_delay(true).unwrap();
-        listener.set_unicast_hop_limit(42).unwrap();
-        listener.set_receive_buffer_size(0x10000).unwrap();
-        listener.set_send_buffer_size(0x10000).unwrap();
-    }
-
-    let client = TcpSocket::new(family).unwrap();
-    client.blocking_connect(&net, bound_addr).unwrap();
-    let (accepted_client, _, _) = listener.blocking_accept().unwrap();
-
-    // Verify options on accepted socket:
-    {
-        assert_eq!(accepted_client.keep_alive().unwrap(), !default_keep_alive);
-        assert_eq!(accepted_client.no_delay().unwrap(), true);
-        assert_eq!(accepted_client.unicast_hop_limit().unwrap(), 42);
-        assert_eq!(accepted_client.receive_buffer_size().unwrap(), 0x10000);
-        assert_eq!(accepted_client.send_buffer_size().unwrap(), 0x10000);
-    }
-}
-
-fn main() {
-    let net = Network::default();
-
-    test_tcp_sockopt_defaults(IpAddressFamily::Ipv4);
-    test_tcp_sockopt_defaults(IpAddressFamily::Ipv6);
-
-    test_tcp_sockopt_input_ranges(IpAddressFamily::Ipv4);
-    test_tcp_sockopt_input_ranges(IpAddressFamily::Ipv6);
-
-    test_tcp_sockopt_readback(IpAddressFamily::Ipv4);
-    test_tcp_sockopt_readback(IpAddressFamily::Ipv6);
-
-    test_tcp_sockopt_inheritance(&net, IpAddressFamily::Ipv4);
-    test_tcp_sockopt_inheritance(&net, IpAddressFamily::Ipv6);
-
-    test_tcp_sockopt_after_listen(&net, IpAddressFamily::Ipv4);
-    test_tcp_sockopt_after_listen(&net, IpAddressFamily::Ipv6);
-}
diff --git a/crates/test-programs/src/bin/preview2_tcp_states.rs b/crates/test-programs/src/bin/preview2_tcp_states.rs
deleted file mode 100644
index 6bf6cbdabbc5..000000000000
--- a/crates/test-programs/src/bin/preview2_tcp_states.rs
+++ /dev/null
@@ -1,265 +0,0 @@
-use test_programs::wasi::sockets::network::{
-    ErrorCode, IpAddress, IpAddressFamily, IpSocketAddress, Network,
-};
-use test_programs::wasi::sockets::tcp::{ShutdownType, TcpSocket};
-
-fn test_tcp_unbound_state_invariants(family: IpAddressFamily) {
-    let sock = TcpSocket::new(family).unwrap();
-
-    // Skipping: tcp::start_bind
-    assert!(matches!(sock.finish_bind(), Err(ErrorCode::NotInProgress)));
-    // Skipping: tcp::start_connect
-    assert!(matches!(
-        sock.finish_connect(),
-        Err(ErrorCode::NotInProgress)
-    ));
-    assert!(matches!(
-        sock.start_listen(),
-        Err(ErrorCode::InvalidState) // Unlike POSIX, trying to listen without an explicit bind should fail in WASI.
-    ));
-    assert!(matches!(
-        sock.finish_listen(),
-        Err(ErrorCode::NotInProgress)
-    ));
-    assert!(matches!(sock.accept(), Err(ErrorCode::InvalidState)));
-    assert!(matches!(
-        sock.shutdown(ShutdownType::Both),
-        Err(ErrorCode::InvalidState)
-    ));
-
-    assert!(matches!(sock.local_address(), Err(ErrorCode::InvalidState)));
-    assert!(matches!(
-        sock.remote_address(),
-        Err(ErrorCode::InvalidState)
-    ));
-    assert_eq!(sock.address_family(), family);
-
-    if family == IpAddressFamily::Ipv6 {
-        assert!(matches!(sock.ipv6_only(), Ok(_)));
-
-        // Even on platforms that don't support dualstack sockets,
-        // setting ipv6_only to true (disabling dualstack mode) should work.
-        assert!(matches!(sock.set_ipv6_only(true), Ok(_)));
-    } else {
-        assert!(matches!(sock.ipv6_only(), Err(ErrorCode::NotSupported)));
-        assert!(matches!(
-            sock.set_ipv6_only(true),
-            Err(ErrorCode::NotSupported)
-        ));
-    }
-
-    assert!(matches!(sock.set_listen_backlog_size(32), Ok(_)));
-    assert!(matches!(sock.keep_alive(), Ok(_)));
-    assert!(matches!(sock.set_keep_alive(false), Ok(_)));
-    assert!(matches!(sock.no_delay(), Ok(_)));
-    assert!(matches!(sock.set_no_delay(false), Ok(_)));
-    assert!(matches!(sock.unicast_hop_limit(), Ok(_)));
-    assert!(matches!(sock.set_unicast_hop_limit(255), Ok(_)));
-    assert!(matches!(sock.receive_buffer_size(), Ok(_)));
-    assert!(matches!(sock.set_receive_buffer_size(16000), Ok(_)));
-    assert!(matches!(sock.send_buffer_size(), Ok(_)));
-    assert!(matches!(sock.set_send_buffer_size(16000), Ok(_)));
-}
-
-fn test_tcp_bound_state_invariants(net: &Network, family: IpAddressFamily) {
-    let bind_address = IpSocketAddress::new(IpAddress::new_loopback(family), 0);
-    let sock = TcpSocket::new(family).unwrap();
-    sock.blocking_bind(net, bind_address).unwrap();
-
-    assert!(matches!(
-        sock.start_bind(net, bind_address),
-        Err(ErrorCode::InvalidState)
-    ));
-    assert!(matches!(sock.finish_bind(), Err(ErrorCode::NotInProgress)));
-    // Skipping: tcp::start_connect
-    assert!(matches!(
-        sock.finish_connect(),
-        Err(ErrorCode::NotInProgress)
-    ));
-    // Skipping: tcp::start_listen
-    assert!(matches!(
-        sock.finish_listen(),
-        Err(ErrorCode::NotInProgress)
-    ));
-    assert!(matches!(sock.accept(), Err(ErrorCode::InvalidState)));
-    assert!(matches!(
-        sock.shutdown(ShutdownType::Both),
-        Err(ErrorCode::InvalidState)
-    ));
-
-    assert!(matches!(sock.local_address(), Ok(_)));
-    assert!(matches!(
-        sock.remote_address(),
-        Err(ErrorCode::InvalidState)
-    ));
-    assert_eq!(sock.address_family(), family);
-
-    if family == IpAddressFamily::Ipv6 {
-        assert!(matches!(sock.ipv6_only(), Ok(_)));
-        assert!(matches!(
-            sock.set_ipv6_only(true),
-            Err(ErrorCode::InvalidState)
-        ));
-    } else {
-        assert!(matches!(sock.ipv6_only(), Err(ErrorCode::NotSupported)));
-        assert!(matches!(
-            sock.set_ipv6_only(true),
-            Err(ErrorCode::NotSupported)
-        ));
-    }
-
-    assert!(matches!(sock.set_listen_backlog_size(32), Ok(_)));
-    assert!(matches!(sock.keep_alive(), Ok(_)));
-    assert!(matches!(sock.set_keep_alive(false), Ok(_)));
-    assert!(matches!(sock.no_delay(), Ok(_)));
-    assert!(matches!(sock.set_no_delay(false), Ok(_)));
-    assert!(matches!(sock.unicast_hop_limit(), Ok(_)));
-    assert!(matches!(sock.set_unicast_hop_limit(255), Ok(_)));
-    assert!(matches!(sock.receive_buffer_size(), Ok(_)));
-    assert!(matches!(sock.set_receive_buffer_size(16000), Ok(_)));
-    assert!(matches!(sock.send_buffer_size(), Ok(_)));
-    assert!(matches!(sock.set_send_buffer_size(16000), Ok(_)));
-}
-
-fn test_tcp_listening_state_invariants(net: &Network, family: IpAddressFamily) {
-    let bind_address = IpSocketAddress::new(IpAddress::new_loopback(family), 0);
-    let sock = TcpSocket::new(family).unwrap();
-    sock.blocking_bind(net, bind_address).unwrap();
-    sock.blocking_listen().unwrap();
-
-    assert!(matches!(
-        sock.start_bind(net, bind_address),
-        Err(ErrorCode::InvalidState)
-    ));
-    assert!(matches!(sock.finish_bind(), Err(ErrorCode::NotInProgress)));
-    assert!(matches!(
-        sock.start_connect(net, bind_address), // Actual address shouldn't matter
-        Err(ErrorCode::InvalidState)
-    ));
-    assert!(matches!(
-        sock.finish_connect(),
-        Err(ErrorCode::NotInProgress)
-    ));
-    assert!(matches!(sock.start_listen(), Err(ErrorCode::InvalidState)));
-    assert!(matches!(
-        sock.finish_listen(),
-        Err(ErrorCode::NotInProgress)
-    ));
-    // Skipping: tcp::accept
-    assert!(matches!(
-        sock.shutdown(ShutdownType::Both),
-        Err(ErrorCode::InvalidState)
-    ));
-
-    assert!(matches!(sock.local_address(), Ok(_)));
-    assert!(matches!(
-        sock.remote_address(),
-        Err(ErrorCode::InvalidState)
-    ));
-    assert_eq!(sock.address_family(), family);
-
-    if family == IpAddressFamily::Ipv6 {
-        assert!(matches!(sock.ipv6_only(), Ok(_)));
-        assert!(matches!(
-            sock.set_ipv6_only(true),
-            Err(ErrorCode::InvalidState)
-        ));
-    } else {
-        assert!(matches!(sock.ipv6_only(), Err(ErrorCode::NotSupported)));
-        assert!(matches!(
-            sock.set_ipv6_only(true),
-            Err(ErrorCode::NotSupported)
-        ));
-    }
-
-    assert!(matches!(
-        sock.set_listen_backlog_size(32),
-        Ok(_) | Err(ErrorCode::NotSupported)
-    ));
-    assert!(matches!(sock.keep_alive(), Ok(_)));
-    assert!(matches!(sock.set_keep_alive(false), Ok(_)));
-    assert!(matches!(sock.no_delay(), Ok(_)));
-    assert!(matches!(sock.set_no_delay(false), Ok(_)));
-    assert!(matches!(sock.unicast_hop_limit(), Ok(_)));
-    assert!(matches!(sock.set_unicast_hop_limit(255), Ok(_)));
-    assert!(matches!(sock.receive_buffer_size(), Ok(_)));
-    assert!(matches!(sock.set_receive_buffer_size(16000), Ok(_)));
-    assert!(matches!(sock.send_buffer_size(), Ok(_)));
-    assert!(matches!(sock.set_send_buffer_size(16000), Ok(_)));
-}
-
-fn test_tcp_connected_state_invariants(net: &Network, family: IpAddressFamily) {
-    let bind_address = IpSocketAddress::new(IpAddress::new_loopback(family), 0);
-    let sock_listener = TcpSocket::new(family).unwrap();
-    sock_listener.blocking_bind(net, bind_address).unwrap();
-    sock_listener.blocking_listen().unwrap();
-    let addr_listener = sock_listener.local_address().unwrap();
-    let sock = TcpSocket::new(family).unwrap();
-    let (_input, _output) = sock.blocking_connect(net, addr_listener).unwrap();
-
-    assert!(matches!(
-        sock.start_bind(net, bind_address),
-        Err(ErrorCode::InvalidState)
-    ));
-    assert!(matches!(sock.finish_bind(), Err(ErrorCode::NotInProgress)));
-    assert!(matches!(
-        sock.start_connect(net, addr_listener),
-        Err(ErrorCode::InvalidState)
-    ));
-    assert!(matches!(
-        sock.finish_connect(),
-        Err(ErrorCode::NotInProgress)
-    ));
-    assert!(matches!(sock.start_listen(), Err(ErrorCode::InvalidState)));
-    assert!(matches!(
-        sock.finish_listen(),
-        Err(ErrorCode::NotInProgress)
-    ));
-    assert!(matches!(sock.accept(), Err(ErrorCode::InvalidState)));
-    // Skipping: tcp::shutdown
-
-    assert!(matches!(sock.local_address(), Ok(_)));
-    assert!(matches!(sock.remote_address(), Ok(_)));
-    assert_eq!(sock.address_family(), family);
-
-    if family == IpAddressFamily::Ipv6 {
-        assert!(matches!(sock.ipv6_only(), Ok(_)));
-        assert!(matches!(
-            sock.set_ipv6_only(true),
-            Err(ErrorCode::InvalidState)
-        ));
-    } else {
-        assert!(matches!(sock.ipv6_only(), Err(ErrorCode::NotSupported)));
-        assert!(matches!(
-            sock.set_ipv6_only(true),
-            Err(ErrorCode::NotSupported)
-        ));
-    }
-
-    assert!(matches!(sock.keep_alive(), Ok(_)));
-    assert!(matches!(sock.set_keep_alive(false), Ok(_)));
-    assert!(matches!(sock.no_delay(), Ok(_)));
-    assert!(matches!(sock.set_no_delay(false), Ok(_)));
-    assert!(matches!(sock.unicast_hop_limit(), Ok(_)));
-    assert!(matches!(sock.set_unicast_hop_limit(255), Ok(_)));
-    assert!(matches!(sock.receive_buffer_size(), Ok(_)));
-    assert!(matches!(sock.set_receive_buffer_size(16000), Ok(_)));
-    assert!(matches!(sock.send_buffer_size(), Ok(_)));
-    assert!(matches!(sock.set_send_buffer_size(16000), Ok(_)));
-}
-
-fn main() {
-    let net = Network::default();
-
-    test_tcp_unbound_state_invariants(IpAddressFamily::Ipv4);
-    test_tcp_unbound_state_invariants(IpAddressFamily::Ipv6);
-
-    test_tcp_bound_state_invariants(&net, IpAddressFamily::Ipv4);
-    test_tcp_bound_state_invariants(&net, IpAddressFamily::Ipv6);
-
-    test_tcp_listening_state_invariants(&net, IpAddressFamily::Ipv4);
-    test_tcp_listening_state_invariants(&net, IpAddressFamily::Ipv6);
-
-    test_tcp_connected_state_invariants(&net, IpAddressFamily::Ipv4);
-    test_tcp_connected_state_invariants(&net, IpAddressFamily::Ipv6);
-}
diff --git a/crates/test-programs/src/bin/preview2_udp_sample_application.rs b/crates/test-programs/src/bin/preview2_udp_sample_application.rs
deleted file mode 100644
index 41da701e685e..000000000000
--- a/crates/test-programs/src/bin/preview2_udp_sample_application.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-use test_programs::wasi::sockets::network::{
-    IpAddress, IpAddressFamily, IpSocketAddress, Ipv4SocketAddress, Ipv6SocketAddress, Network,
-};
-use test_programs::wasi::sockets::udp::{OutgoingDatagram, UdpSocket};
-
-fn test_sample_application(family: IpAddressFamily, bind_address: IpSocketAddress) {
-    let unspecified_addr = IpSocketAddress::new(IpAddress::new_unspecified(family), 0);
-
-    let first_message = &[];
-    let second_message = b"Hello, world!";
-    let third_message = b"Greetings, planet!";
-
-    let net = Network::default();
-
-    let server = UdpSocket::new(family).unwrap();
-
-    server.blocking_bind(&net, bind_address).unwrap();
-    let (server_incoming, _) = server.stream(None).unwrap();
-    let addr = server.local_address().unwrap();
-
-    let client_addr = {
-        let client = UdpSocket::new(family).unwrap();
-        client.blocking_bind(&net, unspecified_addr).unwrap();
-        let (_, client_outgoing) = client.stream(Some(addr)).unwrap();
-
-        let datagrams = [
-            OutgoingDatagram {
-                data: first_message.to_vec(),
-                remote_address: None,
-            },
-            OutgoingDatagram {
-                data: second_message.to_vec(),
-                remote_address: Some(addr),
-            },
-        ];
-        client_outgoing.blocking_send(&datagrams).unwrap();
-
-        client.local_address().unwrap()
-    };
-
-    {
-        // Check that we've received our sent messages.
-        let datagrams = server_incoming.blocking_receive(2..100).unwrap();
-        assert_eq!(datagrams.len(), 2);
-
-        assert_eq!(datagrams[0].data, first_message);
-        assert_eq!(datagrams[0].remote_address, client_addr);
-
-        assert_eq!(datagrams[1].data, second_message);
-        assert_eq!(datagrams[1].remote_address, client_addr);
-    }
-
-    // Another client
-    {
-        let client = UdpSocket::new(family).unwrap();
-        client.blocking_bind(&net, unspecified_addr).unwrap();
-        let (_, client_outgoing) = client.stream(None).unwrap();
-
-        let datagrams = [OutgoingDatagram {
-            data: third_message.to_vec(),
-            remote_address: Some(addr),
-        }];
-        client_outgoing.blocking_send(&datagrams).unwrap();
-    }
-
-    {
-        // Check that we sent and received our message!
-        let datagrams = server_incoming.blocking_receive(1..100).unwrap();
-        assert_eq!(datagrams.len(), 1);
-
-        assert_eq!(datagrams[0].data, third_message);
-    }
-}
-
-fn main() {
-    test_sample_application(
-        IpAddressFamily::Ipv4,
-        IpSocketAddress::Ipv4(Ipv4SocketAddress {
-            port: 0,                 // use any free port
-            address: (127, 0, 0, 1), // localhost
-        }),
-    );
-    test_sample_application(
-        IpAddressFamily::Ipv6,
-        IpSocketAddress::Ipv6(Ipv6SocketAddress {
-            port: 0,                           // use any free port
-            address: (0, 0, 0, 0, 0, 0, 0, 1), // localhost
-            flow_info: 0,
-            scope_id: 0,
-        }),
-    );
-}
diff --git a/crates/test-programs/src/http.rs b/crates/test-programs/src/http.rs
deleted file mode 100644
index e87347cb5405..000000000000
--- a/crates/test-programs/src/http.rs
+++ /dev/null
@@ -1,161 +0,0 @@
-use crate::wasi::http::{outgoing_handler, types as http_types};
-use crate::wasi::io::poll;
-use crate::wasi::io::streams;
-use anyhow::{anyhow, Result};
-use std::fmt;
-
-pub struct Response {
-    pub status: http_types::StatusCode,
-    pub headers: Vec<(String, Vec<u8>)>,
-    pub body: Vec<u8>,
-}
-impl fmt::Debug for Response {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let mut out = f.debug_struct("Response");
-        out.field("status", &self.status)
-            .field("headers", &self.headers);
-        if let Ok(body) = std::str::from_utf8(&self.body) {
-            out.field("body", &body);
-        } else {
-            out.field("body", &self.body);
-        }
-        out.finish()
-    }
-}
-
-impl Response {
-    pub fn header(&self, name: &str) -> Option<&Vec<u8>> {
-        self.headers
-            .iter()
-            .find_map(|(k, v)| if k == name { Some(v) } else { None })
-    }
-}
-
-pub fn request(
-    method: http_types::Method,
-    scheme: http_types::Scheme,
-    authority: &str,
-    path_with_query: &str,
-    body: Option<&[u8]>,
-    additional_headers: Option<&[(String, Vec<u8>)]>,
-) -> Result<Response> {
-    fn header_val(v: &str) -> Vec<u8> {
-        v.to_string().into_bytes()
-    }
-    let headers = http_types::Headers::new(
-        &[
-            &[
-                ("User-agent".to_string(), header_val("WASI-HTTP/0.0.1")),
-                ("Content-type".to_string(), header_val("application/json")),
-            ],
-            additional_headers.unwrap_or(&[]),
-        ]
-        .concat(),
-    );
-
-    let request = http_types::OutgoingRequest::new(
-        &method,
-        Some(path_with_query),
-        Some(&scheme),
-        Some(authority),
-        &headers,
-    );
-
-    let outgoing_body = request
-        .write()
-        .map_err(|_| anyhow!("outgoing request write failed"))?;
-
-    if let Some(mut buf) = body {
-        let request_body = outgoing_body
-            .write()
-            .map_err(|_| anyhow!("outgoing request write failed"))?;
-
-        let pollable = request_body.subscribe();
-        while !buf.is_empty() {
-            poll::poll_list(&[&pollable]);
-
-            let permit = match request_body.check_write() {
-                Ok(n) => n,
-                Err(_) => anyhow::bail!("output stream error"),
-            };
-
-            let len = buf.len().min(permit as usize);
-            let (chunk, rest) = buf.split_at(len);
-            buf = rest;
-
-            match request_body.write(chunk) {
-                Err(_) => anyhow::bail!("output stream error"),
-                _ => {}
-            }
-        }
-
-        match request_body.flush() {
-            Err(_) => anyhow::bail!("output stream error"),
-            _ => {}
-        }
-
-        poll::poll_list(&[&pollable]);
-
-        match request_body.check_write() {
-            Ok(_) => {}
-            Err(_) => anyhow::bail!("output stream error"),
-        };
-    }
-
-    let future_response = outgoing_handler::handle(request, None)?;
-
-    http_types::OutgoingBody::finish(outgoing_body, None);
-
-    let incoming_response = match future_response.get() {
-        Some(result) => result.map_err(|_| anyhow!("incoming response errored"))?,
-        None => {
-            let pollable = future_response.subscribe();
-            let _ = poll::poll_list(&[&pollable]);
-            future_response
-                .get()
-                .expect("incoming response available")
-                .map_err(|_| anyhow!("incoming response errored"))?
-        }
-    }
-    // TODO: maybe anything that appears in the Result<_, E> position should impl
-    // Error? anyway, just use its Debug here:
-    .map_err(|e| anyhow!("{e:?}"))?;
-
-    drop(future_response);
-
-    let status = incoming_response.status();
-
-    let headers_handle = incoming_response.headers();
-    let headers = headers_handle.entries();
-    drop(headers_handle);
-
-    let incoming_body = incoming_response
-        .consume()
-        .map_err(|()| anyhow!("incoming response has no body stream"))?;
-
-    drop(incoming_response);
-
-    let input_stream = incoming_body.stream().unwrap();
-    let input_stream_pollable = input_stream.subscribe();
-
-    let mut body = Vec::new();
-    loop {
-        poll::poll_list(&[&input_stream_pollable]);
-
-        let mut body_chunk = match input_stream.read(1024 * 1024) {
-            Ok(c) => c,
-            Err(streams::StreamError::Closed) => break,
-            Err(e) => Err(anyhow!("input_stream read failed: {e:?}"))?,
-        };
-
-        if !body_chunk.is_empty() {
-            body.append(&mut body_chunk);
-        }
-    }
-
-    Ok(Response {
-        status,
-        headers,
-        body,
-    })
-}
diff --git a/crates/test-programs/src/http_server.rs b/crates/test-programs/src/http_server.rs
new file mode 100644
index 000000000000..ff4c0d9cd475
--- /dev/null
+++ b/crates/test-programs/src/http_server.rs
@@ -0,0 +1,234 @@
+use anyhow::Context;
+use http_body_util::{combinators::BoxBody, BodyExt, Full};
+use hyper::{body::Bytes, service::service_fn, Request, Response};
+use std::{
+    future::Future,
+    net::{SocketAddr, TcpListener},
+    sync::{mpsc, OnceLock},
+    time::Duration,
+};
+
+const DEFAULT_TIMEOUT: Duration = Duration::from_secs(50);
+
+async fn test(
+    mut req: Request<hyper::body::Incoming>,
+) -> http::Result<Response<BoxBody<Bytes, std::convert::Infallible>>> {
+    tracing::debug!("preparing mocked response",);
+    let method = req.method().to_string();
+    let body = req.body_mut().collect().await.unwrap();
+    let buf = body.to_bytes();
+    tracing::trace!("hyper request body size {:?}", buf.len());
+
+    Response::builder()
+        .status(http::StatusCode::OK)
+        .header("x-wasmtime-test-method", method)
+        .header("x-wasmtime-test-uri", req.uri().to_string())
+        .body(Full::<Bytes>::from(buf).boxed())
+}
+
+struct ServerHttp1 {
+    receiver: mpsc::Receiver<anyhow::Result<()>>,
+}
+
+impl ServerHttp1 {
+    fn new() -> Self {
+        tracing::debug!("initializing http1 server");
+        static CELL_HTTP1: OnceLock<TcpListener> = OnceLock::new();
+        let listener = CELL_HTTP1.get_or_init(|| {
+            let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
+            tracing::debug!("preparing tcp listener at localhost:3000");
+            TcpListener::bind(addr).unwrap()
+        });
+        let (sender, receiver) = mpsc::channel::<anyhow::Result<()>>();
+        std::thread::spawn(move || {
+            tracing::debug!("dedicated thread to start listening");
+            match tokio::runtime::Builder::new_current_thread()
+                .enable_all()
+                .build()
+            {
+                Ok(rt) => {
+                    tracing::debug!("using tokio runtime");
+                    sender
+                        .send(rt.block_on(async move {
+                            tracing::debug!("preparing to accept connection");
+                            let (stream, _) = listener.accept().map_err(anyhow::Error::from)?;
+                            tracing::trace!("tcp stream {:?}", stream);
+
+                            let mut builder = hyper::server::conn::http1::Builder::new();
+                            let http = builder.keep_alive(false).pipeline_flush(true);
+                            let io = tokio::net::TcpStream::from_std(stream)
+                                .map_err(anyhow::Error::from)?;
+
+                            tracing::debug!("preparing to bind connection to service");
+                            let conn = http.serve_connection(io, service_fn(test)).await;
+                            tracing::trace!("connection result {:?}", conn);
+                            conn.map_err(anyhow::Error::from)
+                        }))
+                        .expect("value sent from http1 server dedicated thread");
+                }
+                Err(e) => {
+                    tracing::debug!("unable to start tokio runtime");
+                    sender.send(Err(anyhow::Error::from(e))).unwrap()
+                }
+            };
+        });
+        Self { receiver }
+    }
+
+    fn shutdown(self) -> anyhow::Result<()> {
+        tracing::debug!("shutting down http1 server");
+        self.receiver
+            .recv_timeout(DEFAULT_TIMEOUT)
+            .context("value received from http1 server dedicated thread")?
+    }
+}
+
+#[derive(Clone)]
+/// An Executor that uses the tokio runtime.
+pub struct TokioExecutor;
+
+impl<F> hyper::rt::Executor<F> for TokioExecutor
+where
+    F: Future + Send + 'static,
+    F::Output: Send + 'static,
+{
+    fn execute(&self, fut: F) {
+        tokio::task::spawn(fut);
+    }
+}
+
+struct ServerHttp2 {
+    receiver: mpsc::Receiver<anyhow::Result<()>>,
+}
+
+impl ServerHttp2 {
+    fn new() -> Self {
+        tracing::debug!("initializing http2 server");
+        static CELL_HTTP2: OnceLock<TcpListener> = OnceLock::new();
+        let listener = CELL_HTTP2.get_or_init(|| {
+            let addr = SocketAddr::from(([127, 0, 0, 1], 3001));
+            tracing::debug!("preparing tcp listener at localhost:3001");
+            TcpListener::bind(addr).unwrap()
+        });
+        let (sender, receiver) = mpsc::channel::<anyhow::Result<()>>();
+        std::thread::spawn(move || {
+            tracing::debug!("dedicated thread to start listening");
+            match tokio::runtime::Builder::new_current_thread()
+                .enable_all()
+                .build()
+            {
+                Ok(rt) => {
+                    tracing::debug!("using tokio runtime");
+                    sender
+                        .send(rt.block_on(async move {
+                            tracing::debug!("preparing to accept incoming connection");
+                            let (stream, _) = listener.accept().map_err(anyhow::Error::from)?;
+                            tracing::trace!("tcp stream {:?}", stream);
+
+                            let mut builder =
+                                hyper::server::conn::http2::Builder::new(TokioExecutor);
+                            let http = builder.max_concurrent_streams(20);
+                            let io = tokio::net::TcpStream::from_std(stream)
+                                .map_err(anyhow::Error::from)?;
+
+                            tracing::debug!("preparing to bind connection to service");
+                            let conn = http.serve_connection(io, service_fn(test)).await;
+                            tracing::trace!("connection result {:?}", conn);
+                            if let Err(e) = &conn {
+                                let message = e.to_string();
+                                if message.contains("connection closed before reading preface")
+                                    || message.contains("unspecific protocol error detected")
+                                {
+                                    return Ok(());
+                                }
+                            }
+                            conn.map_err(anyhow::Error::from)
+                        }))
+                        .expect("value sent from http2 server dedicated thread");
+                }
+                Err(e) => {
+                    tracing::debug!("unable to start tokio runtime");
+                    sender.send(Err(anyhow::Error::from(e))).unwrap()
+                }
+            };
+        });
+        Self { receiver }
+    }
+
+    fn shutdown(self) -> anyhow::Result<()> {
+        tracing::debug!("shutting down http2 server");
+        self.receiver
+            .recv_timeout(DEFAULT_TIMEOUT)
+            .context("value received from http2 server dedicated thread")?
+    }
+}
+
+pub async fn setup_http1(f: impl Future<Output = anyhow::Result<()>>) -> anyhow::Result<()> {
+    tracing::debug!("preparing http1 server asynchronously");
+    let server = ServerHttp1::new();
+
+    tracing::debug!("running inner function (future)");
+    let result = f.await;
+
+    if let Err(err) = server.shutdown() {
+        tracing::error!("[host/server] failure {:?}", err);
+    }
+    result
+}
+
+pub fn setup_http1_sync<F>(f: F) -> anyhow::Result<()>
+where
+    F: FnOnce() -> anyhow::Result<()> + Send + 'static,
+{
+    tracing::debug!("preparing http1 server synchronously");
+    let server = ServerHttp1::new();
+
+    let (tx, rx) = mpsc::channel::<anyhow::Result<()>>();
+    tracing::debug!("running inner function in a dedicated thread");
+    std::thread::spawn(move || {
+        let _ = tx.send(f());
+    });
+    let result = rx
+        .recv_timeout(DEFAULT_TIMEOUT)
+        .context("value received from request dedicated thread");
+
+    if let Err(err) = server.shutdown() {
+        tracing::error!("[host/server] failure {:?}", err);
+    }
+    result?
+}
+
+pub async fn setup_http2(f: impl Future<Output = anyhow::Result<()>>) -> anyhow::Result<()> {
+    tracing::debug!("preparing http2 server asynchronously");
+    let server = ServerHttp2::new();
+
+    tracing::debug!("running inner function (future)");
+    let result = f.await;
+
+    if let Err(err) = server.shutdown() {
+        tracing::error!("[host/server] Failure: {:?}", err);
+    }
+    result
+}
+
+pub fn setup_http2_sync<F>(f: F) -> anyhow::Result<()>
+where
+    F: FnOnce() -> anyhow::Result<()> + Send + 'static,
+{
+    tracing::debug!("preparing http2 server synchronously");
+    let server = ServerHttp2::new();
+
+    let (tx, rx) = mpsc::channel::<anyhow::Result<()>>();
+    tracing::debug!("running inner function in a dedicated thread");
+    std::thread::spawn(move || {
+        let _ = tx.send(f());
+    });
+    let result = rx
+        .recv_timeout(DEFAULT_TIMEOUT)
+        .context("value received from request dedicated thread");
+
+    if let Err(err) = server.shutdown() {
+        tracing::error!("[host/server] failure {:?}", err);
+    }
+    result?
+}
diff --git a/crates/test-programs/src/lib.rs b/crates/test-programs/src/lib.rs
index 25ed50efbba3..cd3b710703c1 100644
--- a/crates/test-programs/src/lib.rs
+++ b/crates/test-programs/src/lib.rs
@@ -1,5 +1,47 @@
-pub mod http;
-pub mod preview1;
-pub mod sockets;
+///! This crate exists to build crates for wasm32-wasi in build.rs, and execute
+///! these wasm programs in harnesses defined under tests/.
 
-wit_bindgen::generate!("test-command" in "../wasi/wit");
+#[cfg(all(feature = "test_programs", not(skip_wasi_http_tests)))]
+pub mod http_server;
+
+/// The wasi-tests binaries use these environment variables to determine their
+/// expected behavior.
+/// Used by all of the tests/ which execute the wasi-tests binaries.
+pub fn wasi_tests_environment() -> &'static [(&'static str, &'static str)] {
+    #[cfg(windows)]
+    {
+        &[
+            ("ERRNO_MODE_WINDOWS", "1"),
+            // Windows does not support dangling links or symlinks in the filesystem.
+            ("NO_DANGLING_FILESYSTEM", "1"),
+            // Windows does not support renaming a directory to an empty directory -
+            // empty directory must be deleted.
+            ("NO_RENAME_DIR_TO_EMPTY_DIR", "1"),
+            // cap-std-sync does not support the sync family of fdflags
+            ("NO_FDFLAGS_SYNC_SUPPORT", "1"),
+        ]
+    }
+    #[cfg(all(unix, not(target_os = "macos")))]
+    {
+        &[
+            ("ERRNO_MODE_UNIX", "1"),
+            // cap-std-sync does not support the sync family of fdflags
+            ("NO_FDFLAGS_SYNC_SUPPORT", "1"),
+        ]
+    }
+    #[cfg(target_os = "macos")]
+    {
+        &[
+            ("ERRNO_MODE_MACOS", "1"),
+            // cap-std-sync does not support the sync family of fdflags
+            ("NO_FDFLAGS_SYNC_SUPPORT", "1"),
+        ]
+    }
+}
+
+pub fn stdio_is_terminal() -> bool {
+    use is_terminal::is_terminal;
+    is_terminal(&std::io::stdin())
+        && is_terminal(&std::io::stdout())
+        && is_terminal(&std::io::stderr())
+}
diff --git a/crates/test-programs/src/sockets.rs b/crates/test-programs/src/sockets.rs
deleted file mode 100644
index 3033582b6066..000000000000
--- a/crates/test-programs/src/sockets.rs
+++ /dev/null
@@ -1,309 +0,0 @@
-use crate::wasi::clocks::monotonic_clock;
-use crate::wasi::io::poll::{self, Pollable};
-use crate::wasi::io::streams::{InputStream, OutputStream, StreamError};
-use crate::wasi::sockets::instance_network;
-use crate::wasi::sockets::network::{
-    ErrorCode, IpAddress, IpAddressFamily, IpSocketAddress, Ipv4SocketAddress, Ipv6SocketAddress,
-    Network,
-};
-use crate::wasi::sockets::tcp::TcpSocket;
-use crate::wasi::sockets::udp::{
-    IncomingDatagram, IncomingDatagramStream, OutgoingDatagram, OutgoingDatagramStream, UdpSocket,
-};
-use crate::wasi::sockets::{tcp_create_socket, udp_create_socket};
-use std::ops::Range;
-
-const TIMEOUT_NS: u64 = 1_000_000_000;
-
-impl Pollable {
-    pub fn wait(&self) {
-        poll::poll_one(self);
-    }
-
-    pub fn wait_until(&self, timeout: &Pollable) -> Result<(), ErrorCode> {
-        let ready = poll::poll_list(&[self, timeout]);
-        assert!(ready.len() > 0);
-        match ready[0] {
-            0 => Ok(()),
-            1 => Err(ErrorCode::Timeout),
-            _ => unreachable!(),
-        }
-    }
-}
-
-impl OutputStream {
-    pub fn blocking_write_util(&self, mut bytes: &[u8]) -> Result<(), StreamError> {
-        let pollable = self.subscribe();
-
-        while !bytes.is_empty() {
-            pollable.wait();
-
-            let permit = self.check_write()?;
-
-            let len = bytes.len().min(permit as usize);
-            let (chunk, rest) = bytes.split_at(len);
-
-            self.write(chunk)?;
-
-            self.blocking_flush()?;
-
-            bytes = rest;
-        }
-        Ok(())
-    }
-}
-
-impl Network {
-    pub fn default() -> Network {
-        instance_network::instance_network()
-    }
-}
-
-impl TcpSocket {
-    pub fn new(address_family: IpAddressFamily) -> Result<TcpSocket, ErrorCode> {
-        tcp_create_socket::create_tcp_socket(address_family)
-    }
-
-    pub fn blocking_bind(
-        &self,
-        network: &Network,
-        local_address: IpSocketAddress,
-    ) -> Result<(), ErrorCode> {
-        let sub = self.subscribe();
-
-        self.start_bind(&network, local_address)?;
-
-        loop {
-            match self.finish_bind() {
-                Err(ErrorCode::WouldBlock) => sub.wait(),
-                result => return result,
-            }
-        }
-    }
-
-    pub fn blocking_listen(&self) -> Result<(), ErrorCode> {
-        let sub = self.subscribe();
-
-        self.start_listen()?;
-
-        loop {
-            match self.finish_listen() {
-                Err(ErrorCode::WouldBlock) => sub.wait(),
-                result => return result,
-            }
-        }
-    }
-
-    pub fn blocking_connect(
-        &self,
-        network: &Network,
-        remote_address: IpSocketAddress,
-    ) -> Result<(InputStream, OutputStream), ErrorCode> {
-        let sub = self.subscribe();
-
-        self.start_connect(&network, remote_address)?;
-
-        loop {
-            match self.finish_connect() {
-                Err(ErrorCode::WouldBlock) => sub.wait(),
-                result => return result,
-            }
-        }
-    }
-
-    pub fn blocking_accept(&self) -> Result<(TcpSocket, InputStream, OutputStream), ErrorCode> {
-        let sub = self.subscribe();
-
-        loop {
-            match self.accept() {
-                Err(ErrorCode::WouldBlock) => sub.wait(),
-                result => return result,
-            }
-        }
-    }
-}
-
-impl UdpSocket {
-    pub fn new(address_family: IpAddressFamily) -> Result<UdpSocket, ErrorCode> {
-        udp_create_socket::create_udp_socket(address_family)
-    }
-
-    pub fn blocking_bind(
-        &self,
-        network: &Network,
-        local_address: IpSocketAddress,
-    ) -> Result<(), ErrorCode> {
-        let sub = self.subscribe();
-
-        self.start_bind(&network, local_address)?;
-
-        loop {
-            match self.finish_bind() {
-                Err(ErrorCode::WouldBlock) => sub.wait(),
-                result => return result,
-            }
-        }
-    }
-}
-
-impl OutgoingDatagramStream {
-    fn blocking_check_send(&self, timeout: &Pollable) -> Result<u64, ErrorCode> {
-        let sub = self.subscribe();
-
-        loop {
-            match self.check_send() {
-                Ok(0) => sub.wait_until(timeout)?,
-                result => return result,
-            }
-        }
-    }
-
-    pub fn blocking_send(&self, mut datagrams: &[OutgoingDatagram]) -> Result<(), ErrorCode> {
-        let timeout = monotonic_clock::subscribe(TIMEOUT_NS, false);
-
-        while !datagrams.is_empty() {
-            let permit = self.blocking_check_send(&timeout)?;
-            let chunk_len = datagrams.len().min(permit as usize);
-            match self.send(&datagrams[..chunk_len]) {
-                Ok(0) => {}
-                Ok(packets_sent) => {
-                    let packets_sent = packets_sent as usize;
-                    datagrams = &datagrams[packets_sent..];
-                }
-                Err(err) => return Err(err),
-            }
-        }
-
-        Ok(())
-    }
-}
-
-impl IncomingDatagramStream {
-    pub fn blocking_receive(&self, count: Range<u64>) -> Result<Vec<IncomingDatagram>, ErrorCode> {
-        let timeout = monotonic_clock::subscribe(TIMEOUT_NS, false);
-        let pollable = self.subscribe();
-        let mut datagrams = vec![];
-
-        loop {
-            match self.receive(count.end - datagrams.len() as u64) {
-                Ok(mut chunk) => {
-                    datagrams.append(&mut chunk);
-
-                    if datagrams.len() >= count.start as usize {
-                        return Ok(datagrams);
-                    } else {
-                        pollable.wait_until(&timeout)?;
-                    }
-                }
-                Err(err) => return Err(err),
-            }
-        }
-    }
-}
-
-impl IpAddress {
-    pub const IPV4_BROADCAST: IpAddress = IpAddress::Ipv4((255, 255, 255, 255));
-
-    pub const IPV4_LOOPBACK: IpAddress = IpAddress::Ipv4((127, 0, 0, 1));
-    pub const IPV6_LOOPBACK: IpAddress = IpAddress::Ipv6((0, 0, 0, 0, 0, 0, 0, 1));
-
-    pub const IPV4_UNSPECIFIED: IpAddress = IpAddress::Ipv4((0, 0, 0, 0));
-    pub const IPV6_UNSPECIFIED: IpAddress = IpAddress::Ipv6((0, 0, 0, 0, 0, 0, 0, 0));
-
-    pub const IPV4_MAPPED_LOOPBACK: IpAddress =
-        IpAddress::Ipv6((0, 0, 0, 0, 0, 0xFFFF, 0x7F00, 0x0001));
-
-    pub const fn new_loopback(family: IpAddressFamily) -> IpAddress {
-        match family {
-            IpAddressFamily::Ipv4 => Self::IPV4_LOOPBACK,
-            IpAddressFamily::Ipv6 => Self::IPV6_LOOPBACK,
-        }
-    }
-
-    pub const fn new_unspecified(family: IpAddressFamily) -> IpAddress {
-        match family {
-            IpAddressFamily::Ipv4 => Self::IPV4_UNSPECIFIED,
-            IpAddressFamily::Ipv6 => Self::IPV6_UNSPECIFIED,
-        }
-    }
-
-    pub const fn family(&self) -> IpAddressFamily {
-        match self {
-            IpAddress::Ipv4(_) => IpAddressFamily::Ipv4,
-            IpAddress::Ipv6(_) => IpAddressFamily::Ipv6,
-        }
-    }
-}
-
-impl PartialEq for IpAddress {
-    fn eq(&self, other: &Self) -> bool {
-        match (self, other) {
-            (Self::Ipv4(left), Self::Ipv4(right)) => left == right,
-            (Self::Ipv6(left), Self::Ipv6(right)) => left == right,
-            _ => false,
-        }
-    }
-}
-
-impl IpSocketAddress {
-    pub const fn new(ip: IpAddress, port: u16) -> IpSocketAddress {
-        match ip {
-            IpAddress::Ipv4(addr) => IpSocketAddress::Ipv4(Ipv4SocketAddress {
-                port: port,
-                address: addr,
-            }),
-            IpAddress::Ipv6(addr) => IpSocketAddress::Ipv6(Ipv6SocketAddress {
-                port: port,
-                address: addr,
-                flow_info: 0,
-                scope_id: 0,
-            }),
-        }
-    }
-
-    pub const fn ip(&self) -> IpAddress {
-        match self {
-            IpSocketAddress::Ipv4(addr) => IpAddress::Ipv4(addr.address),
-            IpSocketAddress::Ipv6(addr) => IpAddress::Ipv6(addr.address),
-        }
-    }
-
-    pub const fn port(&self) -> u16 {
-        match self {
-            IpSocketAddress::Ipv4(addr) => addr.port,
-            IpSocketAddress::Ipv6(addr) => addr.port,
-        }
-    }
-
-    pub const fn family(&self) -> IpAddressFamily {
-        match self {
-            IpSocketAddress::Ipv4(_) => IpAddressFamily::Ipv4,
-            IpSocketAddress::Ipv6(_) => IpAddressFamily::Ipv6,
-        }
-    }
-}
-
-impl PartialEq for Ipv4SocketAddress {
-    fn eq(&self, other: &Self) -> bool {
-        self.port == other.port && self.address == other.address
-    }
-}
-
-impl PartialEq for Ipv6SocketAddress {
-    fn eq(&self, other: &Self) -> bool {
-        self.port == other.port
-            && self.flow_info == other.flow_info
-            && self.address == other.address
-            && self.scope_id == other.scope_id
-    }
-}
-
-impl PartialEq for IpSocketAddress {
-    fn eq(&self, other: &Self) -> bool {
-        match (self, other) {
-            (Self::Ipv4(l0), Self::Ipv4(r0)) => l0 == r0,
-            (Self::Ipv6(l0), Self::Ipv6(r0)) => l0 == r0,
-            _ => false,
-        }
-    }
-}
diff --git a/crates/test-programs/tests/command.rs b/crates/test-programs/tests/command.rs
new file mode 100644
index 000000000000..574380420348
--- /dev/null
+++ b/crates/test-programs/tests/command.rs
@@ -0,0 +1,510 @@
+use anyhow::Result;
+use cap_std::{ambient_authority, fs::Dir, time::Duration};
+use std::{io::Write, sync::Mutex};
+use wasmtime::{
+    component::{Component, Linker},
+    Config, Engine, Store,
+};
+use wasmtime_wasi::preview2::{
+    command::{add_to_linker, Command},
+    pipe::MemoryInputPipe,
+    DirPerms, FilePerms, HostMonotonicClock, HostWallClock, IsATTY, Table, WasiCtx, WasiCtxBuilder,
+    WasiView,
+};
+
+lazy_static::lazy_static! {
+    static ref ENGINE: Engine = {
+        let mut config = Config::new();
+        config.wasm_backtrace_details(wasmtime::WasmBacktraceDetails::Enable);
+        config.wasm_component_model(true);
+        config.async_support(true);
+
+        let engine = Engine::new(&config).unwrap();
+        engine
+    };
+}
+// uses ENGINE, creates a fn get_component(&str) -> Component
+include!(concat!(env!("OUT_DIR"), "/command_tests_components.rs"));
+
+struct CommandCtx {
+    table: Table,
+    wasi: WasiCtx,
+}
+
+impl WasiView for CommandCtx {
+    fn table(&self) -> &Table {
+        &self.table
+    }
+    fn table_mut(&mut self) -> &mut Table {
+        &mut self.table
+    }
+    fn ctx(&self) -> &WasiCtx {
+        &self.wasi
+    }
+    fn ctx_mut(&mut self) -> &mut WasiCtx {
+        &mut self.wasi
+    }
+}
+
+async fn instantiate(
+    component: Component,
+    ctx: CommandCtx,
+) -> Result<(Store<CommandCtx>, Command)> {
+    let mut linker = Linker::new(&ENGINE);
+    add_to_linker(&mut linker)?;
+
+    let mut store = Store::new(&ENGINE, ctx);
+
+    let (command, _instance) = Command::instantiate_async(&mut store, &component, &linker).await?;
+    Ok((store, command))
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn hello_stdout() -> Result<()> {
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new()
+        .args(&["gussie", "sparky", "willa"])
+        .build(&mut table)?;
+    let (mut store, command) =
+        instantiate(get_component("hello_stdout"), CommandCtx { table, wasi }).await?;
+    command
+        .wasi_cli_run()
+        .call_run(&mut store)
+        .await?
+        .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn panic() -> Result<()> {
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new()
+        .args(&[
+            "diesel",
+            "the",
+            "cat",
+            "scratched",
+            "me",
+            "real",
+            "good",
+            "yesterday",
+        ])
+        .build(&mut table)?;
+    let (mut store, command) =
+        instantiate(get_component("panic"), CommandCtx { table, wasi }).await?;
+    let r = command.wasi_cli_run().call_run(&mut store).await;
+    assert!(r.is_err());
+    println!("{:?}", r);
+    Ok(())
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn args() -> Result<()> {
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new()
+        .args(&["hello", "this", "", "is an argument", "with 🚩 emoji"])
+        .build(&mut table)?;
+    let (mut store, command) =
+        instantiate(get_component("args"), CommandCtx { table, wasi }).await?;
+    command
+        .wasi_cli_run()
+        .call_run(&mut store)
+        .await?
+        .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn random() -> Result<()> {
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new().build(&mut table)?;
+    let (mut store, command) =
+        instantiate(get_component("random"), CommandCtx { table, wasi }).await?;
+
+    command
+        .wasi_cli_run()
+        .call_run(&mut store)
+        .await?
+        .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn time() -> Result<()> {
+    struct FakeWallClock;
+
+    impl HostWallClock for FakeWallClock {
+        fn resolution(&self) -> Duration {
+            Duration::from_secs(1)
+        }
+
+        fn now(&self) -> Duration {
+            Duration::new(1431648000, 100)
+        }
+    }
+
+    struct FakeMonotonicClock {
+        now: Mutex<u64>,
+    }
+
+    impl HostMonotonicClock for FakeMonotonicClock {
+        fn resolution(&self) -> u64 {
+            1_000_000_000
+        }
+
+        fn now(&self) -> u64 {
+            let mut now = self.now.lock().unwrap();
+            let then = *now;
+            *now += 42 * 1_000_000_000;
+            then
+        }
+    }
+
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new()
+        .monotonic_clock(FakeMonotonicClock { now: Mutex::new(0) })
+        .wall_clock(FakeWallClock)
+        .build(&mut table)?;
+
+    let (mut store, command) =
+        instantiate(get_component("time"), CommandCtx { table, wasi }).await?;
+
+    command
+        .wasi_cli_run()
+        .call_run(&mut store)
+        .await?
+        .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn stdin() -> Result<()> {
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new()
+        .stdin(
+            MemoryInputPipe::new("So rested he by the Tumtum tree".into()),
+            IsATTY::No,
+        )
+        .build(&mut table)?;
+
+    let (mut store, command) =
+        instantiate(get_component("stdin"), CommandCtx { table, wasi }).await?;
+
+    command
+        .wasi_cli_run()
+        .call_run(&mut store)
+        .await?
+        .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn poll_stdin() -> Result<()> {
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new()
+        .stdin(
+            MemoryInputPipe::new("So rested he by the Tumtum tree".into()),
+            IsATTY::No,
+        )
+        .build(&mut table)?;
+
+    let (mut store, command) =
+        instantiate(get_component("poll_stdin"), CommandCtx { table, wasi }).await?;
+
+    command
+        .wasi_cli_run()
+        .call_run(&mut store)
+        .await?
+        .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn env() -> Result<()> {
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new()
+        .env("frabjous", "day")
+        .env("callooh", "callay")
+        .build(&mut table)?;
+
+    let (mut store, command) =
+        instantiate(get_component("env"), CommandCtx { table, wasi }).await?;
+
+    command
+        .wasi_cli_run()
+        .call_run(&mut store)
+        .await?
+        .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn file_read() -> Result<()> {
+    let dir = tempfile::tempdir()?;
+
+    std::fs::File::create(dir.path().join("bar.txt"))?.write_all(b"And stood awhile in thought")?;
+
+    let open_dir = Dir::open_ambient_dir(dir.path(), ambient_authority())?;
+
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new()
+        .preopened_dir(open_dir, DirPerms::all(), FilePerms::all(), "/")
+        .build(&mut table)?;
+
+    let (mut store, command) =
+        instantiate(get_component("file_read"), CommandCtx { table, wasi }).await?;
+
+    command
+        .wasi_cli_run()
+        .call_run(&mut store)
+        .await?
+        .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn file_append() -> Result<()> {
+    let dir = tempfile::tempdir()?;
+
+    std::fs::File::create(dir.path().join("bar.txt"))?
+        .write_all(b"'Twas brillig, and the slithy toves.\n")?;
+
+    let open_dir = Dir::open_ambient_dir(dir.path(), ambient_authority())?;
+
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new()
+        .preopened_dir(open_dir, DirPerms::all(), FilePerms::all(), "/")
+        .build(&mut table)?;
+
+    let (mut store, command) =
+        instantiate(get_component("file_append"), CommandCtx { table, wasi }).await?;
+    command
+        .wasi_cli_run()
+        .call_run(&mut store)
+        .await?
+        .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))?;
+
+    let contents = std::fs::read(dir.path().join("bar.txt"))?;
+    assert_eq!(
+        std::str::from_utf8(&contents).unwrap(),
+        "'Twas brillig, and the slithy toves.\n\
+               Did gyre and gimble in the wabe;\n\
+               All mimsy were the borogoves,\n\
+               And the mome raths outgrabe.\n"
+    );
+    Ok(())
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn file_dir_sync() -> Result<()> {
+    let dir = tempfile::tempdir()?;
+
+    std::fs::File::create(dir.path().join("bar.txt"))?
+        .write_all(b"'Twas brillig, and the slithy toves.\n")?;
+
+    let open_dir = Dir::open_ambient_dir(dir.path(), ambient_authority())?;
+
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new()
+        .preopened_dir(open_dir, DirPerms::all(), FilePerms::all(), "/")
+        .build(&mut table)?;
+
+    let (mut store, command) =
+        instantiate(get_component("file_dir_sync"), CommandCtx { table, wasi }).await?;
+
+    command
+        .wasi_cli_run()
+        .call_run(&mut store)
+        .await?
+        .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn exit_success() -> Result<()> {
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new().build(&mut table)?;
+
+    let (mut store, command) =
+        instantiate(get_component("exit_success"), CommandCtx { table, wasi }).await?;
+
+    let r = command.wasi_cli_run().call_run(&mut store).await;
+    let err = r.unwrap_err();
+    let status = err
+        .downcast_ref::<wasmtime_wasi::preview2::I32Exit>()
+        .unwrap();
+    assert_eq!(status.0, 0);
+    Ok(())
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn exit_default() -> Result<()> {
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new().build(&mut table)?;
+
+    let (mut store, command) =
+        instantiate(get_component("exit_default"), CommandCtx { table, wasi }).await?;
+
+    let r = command.wasi_cli_run().call_run(&mut store).await?;
+    assert!(r.is_ok());
+    Ok(())
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn exit_failure() -> Result<()> {
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new().build(&mut table)?;
+
+    let (mut store, command) =
+        instantiate(get_component("exit_failure"), CommandCtx { table, wasi }).await?;
+
+    let r = command.wasi_cli_run().call_run(&mut store).await;
+    let err = r.unwrap_err();
+    let status = err
+        .downcast_ref::<wasmtime_wasi::preview2::I32Exit>()
+        .unwrap();
+    assert_eq!(status.0, 1);
+    Ok(())
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn exit_panic() -> Result<()> {
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new().build(&mut table)?;
+
+    let (mut store, command) =
+        instantiate(get_component("exit_panic"), CommandCtx { table, wasi }).await?;
+
+    let r = command.wasi_cli_run().call_run(&mut store).await;
+    let err = r.unwrap_err();
+    // The panic should trap.
+    assert!(err
+        .downcast_ref::<wasmtime_wasi::preview2::I32Exit>()
+        .is_none());
+    Ok(())
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn directory_list() -> Result<()> {
+    let dir = tempfile::tempdir()?;
+
+    std::fs::File::create(dir.path().join("foo.txt"))?;
+    std::fs::File::create(dir.path().join("bar.txt"))?;
+    std::fs::File::create(dir.path().join("baz.txt"))?;
+    std::fs::create_dir(dir.path().join("sub"))?;
+    std::fs::File::create(dir.path().join("sub").join("wow.txt"))?;
+    std::fs::File::create(dir.path().join("sub").join("yay.txt"))?;
+
+    let open_dir = Dir::open_ambient_dir(dir.path(), ambient_authority())?;
+
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new()
+        .inherit_stdout()
+        .inherit_stderr()
+        .preopened_dir(open_dir, DirPerms::all(), FilePerms::all(), "/")
+        .build(&mut table)?;
+
+    let (mut store, command) =
+        instantiate(get_component("directory_list"), CommandCtx { table, wasi }).await?;
+
+    command
+        .wasi_cli_run()
+        .call_run(&mut store)
+        .await?
+        .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn default_clocks() -> Result<()> {
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new().build(&mut table)?;
+
+    let (mut store, command) =
+        instantiate(get_component("default_clocks"), CommandCtx { table, wasi }).await?;
+
+    command
+        .wasi_cli_run()
+        .call_run(&mut store)
+        .await?
+        .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn export_cabi_realloc() -> Result<()> {
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new().build(&mut table)?;
+    let (mut store, command) = instantiate(
+        get_component("export_cabi_realloc"),
+        CommandCtx { table, wasi },
+    )
+    .await?;
+
+    command
+        .wasi_cli_run()
+        .call_run(&mut store)
+        .await?
+        .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn read_only() -> Result<()> {
+    let dir = tempfile::tempdir()?;
+
+    std::fs::File::create(dir.path().join("bar.txt"))?.write_all(b"And stood awhile in thought")?;
+    std::fs::create_dir(dir.path().join("sub"))?;
+
+    let mut table = Table::new();
+    let open_dir = Dir::open_ambient_dir(dir.path(), ambient_authority())?;
+    let wasi = WasiCtxBuilder::new()
+        .preopened_dir(open_dir, DirPerms::READ, FilePerms::READ, "/")
+        .build(&mut table)?;
+
+    let (mut store, command) =
+        instantiate(get_component("read_only"), CommandCtx { table, wasi }).await?;
+
+    command
+        .wasi_cli_run()
+        .call_run(&mut store)
+        .await?
+        .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn stream_pollable_lifetimes() -> Result<()> {
+    // Test program has two modes, dispatching based on argument.
+    {
+        // Correct execution: should succeed
+        let mut table = Table::new();
+        let wasi = WasiCtxBuilder::new()
+            .args(&["correct"])
+            .stdin(MemoryInputPipe::new(" ".into()), IsATTY::No)
+            .build(&mut table)?;
+
+        let (mut store, command) = instantiate(
+            get_component("stream_pollable_lifetimes"),
+            CommandCtx { table, wasi },
+        )
+        .await?;
+
+        command
+            .wasi_cli_run()
+            .call_run(&mut store)
+            .await?
+            .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))?;
+    }
+    {
+        // Incorrect execution: should trap with a TableError::HasChildren
+        let mut table = Table::new();
+        let wasi = WasiCtxBuilder::new()
+            .args(&["trap"])
+            .stdin(MemoryInputPipe::new(" ".into()), IsATTY::No)
+            .build(&mut table)?;
+
+        let (mut store, command) = instantiate(
+            get_component("stream_pollable_lifetimes"),
+            CommandCtx { table, wasi },
+        )
+        .await?;
+
+        let trap = command
+            .wasi_cli_run()
+            .call_run(&mut store)
+            .await
+            .err()
+            .expect("should trap");
+        use wasmtime_wasi::preview2::TableError;
+        assert!(matches!(trap.downcast_ref(), Some(TableError::HasChildren)));
+    }
+    Ok(())
+}
diff --git a/crates/test-programs/tests/reactor.rs b/crates/test-programs/tests/reactor.rs
new file mode 100644
index 000000000000..555c756d086d
--- /dev/null
+++ b/crates/test-programs/tests/reactor.rs
@@ -0,0 +1,140 @@
+use anyhow::Result;
+use wasmtime::{
+    component::{Component, Linker},
+    Config, Engine, Store,
+};
+use wasmtime_wasi::preview2::bindings::clocks::wall_clock;
+use wasmtime_wasi::preview2::bindings::filesystem::types as filesystem;
+use wasmtime_wasi::preview2::{self, Table, WasiCtx, WasiCtxBuilder, WasiView};
+
+lazy_static::lazy_static! {
+    static ref ENGINE: Engine = {
+        let mut config = Config::new();
+        config.wasm_backtrace_details(wasmtime::WasmBacktraceDetails::Enable);
+        config.wasm_component_model(true);
+        config.async_support(true);
+
+        let engine = Engine::new(&config).unwrap();
+        engine
+    };
+}
+
+// uses ENGINE, creates a fn get_component(&str) -> Component
+include!(concat!(env!("OUT_DIR"), "/reactor_tests_components.rs"));
+
+wasmtime::component::bindgen!({
+    path: "../wasi/wit",
+    world: "test-reactor",
+    async: true,
+    with: {
+       "wasi:io/streams": preview2::bindings::io::streams,
+       "wasi:filesystem/types": preview2::bindings::filesystem::types,
+       "wasi:filesystem/preopens": preview2::bindings::filesystem::preopens,
+       "wasi:cli/environment": preview2::bindings::cli::environment,
+       "wasi:cli/exit": preview2::bindings::cli::exit,
+       "wasi:cli/stdin": preview2::bindings::cli::stdin,
+       "wasi:cli/stdout": preview2::bindings::cli::stdout,
+       "wasi:cli/stderr": preview2::bindings::cli::stderr,
+       "wasi:cli/terminal_input": preview2::bindings::cli::terminal_input,
+       "wasi:cli/terminal_output": preview2::bindings::cli::terminal_output,
+       "wasi:cli/terminal_stdin": preview2::bindings::cli::terminal_stdin,
+       "wasi:cli/terminal_stdout": preview2::bindings::cli::terminal_stdout,
+       "wasi:cli/terminal_stderr": preview2::bindings::cli::terminal_stderr,
+    },
+    ownership: Borrowing {
+        duplicate_if_necessary: false
+    }
+});
+
+struct ReactorCtx {
+    table: Table,
+    wasi: WasiCtx,
+}
+
+impl WasiView for ReactorCtx {
+    fn table(&self) -> &Table {
+        &self.table
+    }
+    fn table_mut(&mut self) -> &mut Table {
+        &mut self.table
+    }
+    fn ctx(&self) -> &WasiCtx {
+        &self.wasi
+    }
+    fn ctx_mut(&mut self) -> &mut WasiCtx {
+        &mut self.wasi
+    }
+}
+
+async fn instantiate(
+    component: Component,
+    wasi_ctx: ReactorCtx,
+) -> Result<(Store<ReactorCtx>, TestReactor)> {
+    let mut linker = Linker::new(&ENGINE);
+    preview2::command::add_to_linker(&mut linker)?;
+
+    let mut store = Store::new(&ENGINE, wasi_ctx);
+    let (testreactor, _instance) =
+        TestReactor::instantiate_async(&mut store, &component, &linker).await?;
+    Ok((store, testreactor))
+}
+
+#[test_log::test(tokio::test)]
+async fn reactor_tests() -> Result<()> {
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new()
+        .env("GOOD_DOG", "gussie")
+        .build(&mut table)?;
+
+    let (mut store, reactor) =
+        instantiate(get_component("reactor_tests"), ReactorCtx { table, wasi }).await?;
+
+    // Show that integration with the WASI context is working - the guest will
+    // interpolate $GOOD_DOG to gussie here using the environment:
+    let r = reactor
+        .call_add_strings(&mut store, &["hello", "$GOOD_DOG"])
+        .await?;
+    assert_eq!(r, 2);
+
+    let contents = reactor.call_get_strings(&mut store).await?;
+    assert_eq!(contents, &["hello", "gussie"]);
+
+    // Show that we can pass in a resource type whose impls are defined in the
+    // `host` and `wasi-common` crate.
+    // Note, this works because of the add_to_linker invocations using the
+    // `host` crate for `streams`, not because of `with` in the bindgen macro.
+    let writepipe = preview2::pipe::MemoryOutputPipe::new(4096);
+    let table_ix = preview2::TableStreamExt::push_output_stream(
+        store.data_mut().table_mut(),
+        Box::new(writepipe.clone()),
+    )?;
+    let r = reactor.call_write_strings_to(&mut store, table_ix).await?;
+    assert_eq!(r, Ok(()));
+
+    assert_eq!(writepipe.contents().as_ref(), b"hellogussie");
+
+    // Show that the `with` invocation in the macro means we get to re-use the
+    // type definitions from inside the `host` crate for these structures:
+    let ds = filesystem::DescriptorStat {
+        data_access_timestamp: wall_clock::Datetime {
+            nanoseconds: 123,
+            seconds: 45,
+        },
+        data_modification_timestamp: wall_clock::Datetime {
+            nanoseconds: 789,
+            seconds: 10,
+        },
+        link_count: 0,
+        size: 0,
+        status_change_timestamp: wall_clock::Datetime {
+            nanoseconds: 0,
+            seconds: 1,
+        },
+        type_: filesystem::DescriptorType::Unknown,
+    };
+    let expected = format!("{ds:?}");
+    let got = reactor.call_pass_an_imported_record(&mut store, ds).await?;
+    assert_eq!(expected, got);
+
+    Ok(())
+}
diff --git a/crates/test-programs/tests/wasi-cap-std-sync.rs b/crates/test-programs/tests/wasi-cap-std-sync.rs
new file mode 100644
index 000000000000..317e427a77ba
--- /dev/null
+++ b/crates/test-programs/tests/wasi-cap-std-sync.rs
@@ -0,0 +1,297 @@
+#![cfg(feature = "test_programs")]
+use anyhow::Result;
+use tempfile::TempDir;
+use wasi_common::pipe::WritePipe;
+use wasmtime::{Config, Engine, Linker, Store};
+
+lazy_static::lazy_static! {
+    static ref ENGINE: Engine = {
+        let mut config = Config::new();
+        config.wasm_backtrace_details(wasmtime::WasmBacktraceDetails::Enable);
+        config.wasm_component_model(false);
+        config.async_support(false);
+
+        let engine = Engine::new(&config).unwrap();
+        engine
+    };
+}
+// uses ENGINE, creates a fn get_module(&str) -> Module
+include!(concat!(env!("OUT_DIR"), "/wasi_tests_modules.rs"));
+
+pub fn prepare_workspace(exe_name: &str) -> Result<TempDir> {
+    let prefix = format!("wasi_cap_std_sync_{}_", exe_name);
+    let tempdir = tempfile::Builder::new().prefix(&prefix).tempdir()?;
+    Ok(tempdir)
+}
+
+use wasmtime_wasi::sync::{add_to_linker, WasiCtxBuilder};
+fn run(name: &str, inherit_stdio: bool) -> Result<()> {
+    let workspace = prepare_workspace(name)?;
+    let stdout = WritePipe::new_in_memory();
+    let stderr = WritePipe::new_in_memory();
+    let r = {
+        let mut linker = Linker::new(&ENGINE);
+        add_to_linker(&mut linker, |cx| cx)?;
+
+        // Create our wasi context.
+        // Additionally register any preopened directories if we have them.
+        let mut builder = WasiCtxBuilder::new();
+
+        if inherit_stdio {
+            builder.inherit_stdio();
+        } else {
+            builder
+                .stdout(Box::new(stdout.clone()))
+                .stderr(Box::new(stderr.clone()));
+        }
+        builder.arg(name)?.arg(".")?;
+        println!("preopen: {:?}", workspace);
+        let preopen_dir =
+            cap_std::fs::Dir::open_ambient_dir(workspace.path(), cap_std::ambient_authority())?;
+        builder.preopened_dir(preopen_dir, ".")?;
+        for (var, val) in test_programs::wasi_tests_environment() {
+            builder.env(var, val)?;
+        }
+
+        let mut store = Store::new(&ENGINE, builder.build());
+        let instance = linker.instantiate(&mut store, &get_module(name))?;
+        let start = instance.get_typed_func::<(), ()>(&mut store, "_start")?;
+        start.call(&mut store, ())?;
+        Ok(())
+    };
+
+    r.map_err(move |trap: anyhow::Error| {
+        let stdout = stdout
+            .try_into_inner()
+            .expect("sole ref to stdout")
+            .into_inner();
+        if !stdout.is_empty() {
+            println!("guest stdout:\n{}\n===", String::from_utf8_lossy(&stdout));
+        }
+        let stderr = stderr
+            .try_into_inner()
+            .expect("sole ref to stderr")
+            .into_inner();
+        if !stderr.is_empty() {
+            println!("guest stderr:\n{}\n===", String::from_utf8_lossy(&stderr));
+        }
+        trap.context(format!(
+            "error while testing wasi-tests {} with cap-std-sync",
+            name
+        ))
+    })?;
+    Ok(())
+}
+
+// Below here is mechanical: there should be one test for every binary in
+// wasi-tests. The only differences should be should_panic annotations for
+// tests which fail.
+#[test_log::test]
+fn big_random_buf() {
+    run("big_random_buf", true).unwrap()
+}
+#[test_log::test]
+fn clock_time_get() {
+    run("clock_time_get", true).unwrap()
+}
+#[test_log::test]
+fn close_preopen() {
+    run("close_preopen", true).unwrap()
+}
+#[test_log::test]
+fn dangling_fd() {
+    run("dangling_fd", true).unwrap()
+}
+#[test_log::test]
+fn dangling_symlink() {
+    run("dangling_symlink", true).unwrap()
+}
+#[test_log::test]
+fn directory_seek() {
+    run("directory_seek", true).unwrap()
+}
+#[test_log::test]
+fn dir_fd_op_failures() {
+    run("dir_fd_op_failures", true).unwrap()
+}
+#[test_log::test]
+fn fd_advise() {
+    run("fd_advise", true).unwrap()
+}
+#[test_log::test]
+fn fd_filestat_get() {
+    run("fd_filestat_get", true).unwrap()
+}
+#[test_log::test]
+fn fd_filestat_set() {
+    run("fd_filestat_set", true).unwrap()
+}
+#[test_log::test]
+fn fd_flags_set() {
+    run("fd_flags_set", true).unwrap()
+}
+#[test_log::test]
+fn fd_readdir() {
+    run("fd_readdir", true).unwrap()
+}
+#[test_log::test]
+fn file_allocate() {
+    run("file_allocate", true).unwrap()
+}
+#[test_log::test]
+fn file_pread_pwrite() {
+    run("file_pread_pwrite", true).unwrap()
+}
+#[test_log::test]
+fn file_seek_tell() {
+    run("file_seek_tell", true).unwrap()
+}
+#[test_log::test]
+fn file_truncation() {
+    run("file_truncation", true).unwrap()
+}
+#[test_log::test]
+fn file_unbuffered_write() {
+    run("file_unbuffered_write", true).unwrap()
+}
+#[test_log::test]
+#[cfg_attr(windows, should_panic)]
+fn interesting_paths() {
+    run("interesting_paths", true).unwrap()
+}
+#[test_log::test]
+fn regular_file_isatty() {
+    run("regular_file_isatty", true).unwrap()
+}
+#[test_log::test]
+fn nofollow_errors() {
+    run("nofollow_errors", true).unwrap()
+}
+#[test_log::test]
+fn overwrite_preopen() {
+    run("overwrite_preopen", true).unwrap()
+}
+#[test_log::test]
+fn path_exists() {
+    run("path_exists", true).unwrap()
+}
+#[test_log::test]
+fn path_filestat() {
+    run("path_filestat", true).unwrap()
+}
+#[test_log::test]
+fn path_link() {
+    run("path_link", true).unwrap()
+}
+#[test_log::test]
+fn path_open_create_existing() {
+    run("path_open_create_existing", true).unwrap()
+}
+#[test_log::test]
+fn path_open_read_write() {
+    run("path_open_read_write", true).unwrap()
+}
+#[test_log::test]
+fn path_open_dirfd_not_dir() {
+    run("path_open_dirfd_not_dir", true).unwrap()
+}
+#[test_log::test]
+fn path_open_missing() {
+    run("path_open_missing", true).unwrap()
+}
+#[test_log::test]
+fn path_open_nonblock() {
+    run("path_open_nonblock", true).unwrap()
+}
+#[test_log::test]
+fn path_rename_dir_trailing_slashes() {
+    run("path_rename_dir_trailing_slashes", true).unwrap()
+}
+#[test_log::test]
+#[should_panic]
+fn path_rename_file_trailing_slashes() {
+    run("path_rename_file_trailing_slashes", false).unwrap()
+}
+#[test_log::test]
+fn path_rename() {
+    run("path_rename", true).unwrap()
+}
+#[test_log::test]
+fn path_symlink_trailing_slashes() {
+    run("path_symlink_trailing_slashes", true).unwrap()
+}
+#[test_log::test]
+fn poll_oneoff_files() {
+    run("poll_oneoff_files", false).unwrap()
+}
+#[test_log::test]
+fn poll_oneoff_stdio() {
+    run("poll_oneoff_stdio", true).unwrap()
+}
+#[test_log::test]
+fn readlink() {
+    run("readlink", true).unwrap()
+}
+#[test_log::test]
+#[should_panic]
+fn remove_directory_trailing_slashes() {
+    run("remove_directory_trailing_slashes", false).unwrap()
+}
+#[test_log::test]
+fn remove_nonempty_directory() {
+    run("remove_nonempty_directory", true).unwrap()
+}
+#[test_log::test]
+fn renumber() {
+    run("renumber", true).unwrap()
+}
+#[test_log::test]
+fn sched_yield() {
+    run("sched_yield", true).unwrap()
+}
+#[test_log::test]
+#[should_panic]
+fn sleep() {
+    run("sleep", true).unwrap()
+}
+#[test_log::test]
+fn stdio() {
+    run("stdio", true).unwrap()
+}
+#[test_log::test]
+fn stdio_isatty() {
+    if test_programs::stdio_is_terminal() {
+        // Inherit stdio, which is a terminal in the test runner's environment:
+        run("stdio_isatty", true).unwrap()
+    }
+}
+#[test_log::test]
+fn stdio_not_isatty() {
+    // Don't inherit stdio, test asserts each is not tty:
+    run("stdio_not_isatty", false).unwrap()
+}
+
+#[test_log::test]
+fn symlink_create() {
+    run("symlink_create", true).unwrap()
+}
+#[test_log::test]
+fn symlink_filestat() {
+    run("symlink_filestat", true).unwrap()
+}
+#[test_log::test]
+fn symlink_loop() {
+    run("symlink_loop", true).unwrap()
+}
+#[test_log::test]
+fn unlink_file_trailing_slashes() {
+    run("unlink_file_trailing_slashes", true).unwrap()
+}
+#[test_log::test]
+fn path_open_preopen() {
+    run("path_open_preopen", true).unwrap()
+}
+#[test_log::test]
+fn unicode_output() {
+    run("unicode_output", true).unwrap()
+}
diff --git a/crates/test-programs/tests/wasi-http-components-sync.rs b/crates/test-programs/tests/wasi-http-components-sync.rs
new file mode 100644
index 000000000000..f525d5b44724
--- /dev/null
+++ b/crates/test-programs/tests/wasi-http-components-sync.rs
@@ -0,0 +1,180 @@
+#![cfg(all(feature = "test_programs", not(skip_wasi_http_tests)))]
+use wasmtime::{
+    component::{Component, Linker},
+    Config, Engine, Store,
+};
+use wasmtime_wasi::preview2::{
+    command::sync::{add_to_linker, Command},
+    pipe::MemoryOutputPipe,
+    IsATTY, Table, WasiCtx, WasiCtxBuilder, WasiView,
+};
+use wasmtime_wasi_http::{WasiHttpCtx, WasiHttpView};
+
+use test_programs::http_server::{setup_http1_sync, setup_http2_sync};
+
+lazy_static::lazy_static! {
+    static ref ENGINE: Engine = {
+        let mut config = Config::new();
+        config.wasm_backtrace_details(wasmtime::WasmBacktraceDetails::Enable);
+        config.wasm_component_model(true);
+        let engine = Engine::new(&config).unwrap();
+        engine
+    };
+}
+// uses ENGINE, creates a fn get_module(&str) -> Module
+include!(concat!(env!("OUT_DIR"), "/wasi_http_tests_components.rs"));
+
+struct Ctx {
+    table: Table,
+    wasi: WasiCtx,
+    http: WasiHttpCtx,
+}
+
+impl WasiView for Ctx {
+    fn table(&self) -> &Table {
+        &self.table
+    }
+    fn table_mut(&mut self) -> &mut Table {
+        &mut self.table
+    }
+    fn ctx(&self) -> &WasiCtx {
+        &self.wasi
+    }
+    fn ctx_mut(&mut self) -> &mut WasiCtx {
+        &mut self.wasi
+    }
+}
+
+impl WasiHttpView for Ctx {
+    fn http_ctx(&self) -> &WasiHttpCtx {
+        &self.http
+    }
+    fn http_ctx_mut(&mut self) -> &mut WasiHttpCtx {
+        &mut self.http
+    }
+}
+
+fn instantiate_component(
+    component: Component,
+    ctx: Ctx,
+) -> Result<(Store<Ctx>, Command), anyhow::Error> {
+    let mut linker = Linker::new(&ENGINE);
+    add_to_linker(&mut linker)?;
+    wasmtime_wasi_http::proxy::sync::add_to_linker(&mut linker)?;
+
+    let mut store = Store::new(&ENGINE, ctx);
+
+    let (command, _instance) = Command::instantiate(&mut store, &component, &linker)?;
+    Ok((store, command))
+}
+
+fn run(name: &str) -> anyhow::Result<()> {
+    let stdout = MemoryOutputPipe::new(4096);
+    let stderr = MemoryOutputPipe::new(4096);
+    let r = {
+        let mut table = Table::new();
+        let component = get_component(name);
+
+        // Create our wasi context.
+        let mut builder = WasiCtxBuilder::new();
+        builder.stdout(stdout.clone(), IsATTY::No);
+        builder.stderr(stderr.clone(), IsATTY::No);
+        builder.arg(name);
+        for (var, val) in test_programs::wasi_tests_environment() {
+            builder.env(var, val);
+        }
+        let wasi = builder.build(&mut table)?;
+        let http = WasiHttpCtx::new();
+
+        let (mut store, command) = instantiate_component(component, Ctx { table, wasi, http })?;
+        command
+            .wasi_cli_run()
+            .call_run(&mut store)?
+            .map_err(|()| anyhow::anyhow!("run returned a failure"))?;
+        Ok(())
+    };
+    r.map_err(move |trap: anyhow::Error| {
+        let stdout = stdout.try_into_inner().expect("single ref to stdout");
+        if !stdout.is_empty() {
+            println!("[guest] stdout:\n{}\n===", String::from_utf8_lossy(&stdout));
+        }
+        let stderr = stderr.try_into_inner().expect("single ref to stderr");
+        if !stderr.is_empty() {
+            println!("[guest] stderr:\n{}\n===", String::from_utf8_lossy(&stderr));
+        }
+        trap.context(format!(
+            "error while testing wasi-tests {} with http-components-sync",
+            name
+        ))
+    })?;
+    Ok(())
+}
+
+#[test_log::test]
+#[cfg_attr(
+    windows,
+    ignore = "test is currently flaky in ci and needs to be debugged"
+)]
+fn outbound_request_get() {
+    setup_http1_sync(|| run("outbound_request_get")).unwrap();
+}
+
+#[test_log::test]
+#[cfg_attr(
+    windows,
+    ignore = "test is currently flaky in ci and needs to be debugged"
+)]
+fn outbound_request_post() {
+    setup_http1_sync(|| run("outbound_request_post")).unwrap();
+}
+
+#[test_log::test]
+#[cfg_attr(
+    windows,
+    ignore = "test is currently flaky in ci and needs to be debugged"
+)]
+fn outbound_request_large_post() {
+    setup_http1_sync(|| run("outbound_request_large_post")).unwrap();
+}
+
+#[test_log::test]
+#[cfg_attr(
+    windows,
+    ignore = "test is currently flaky in ci and needs to be debugged"
+)]
+fn outbound_request_put() {
+    setup_http1_sync(|| run("outbound_request_put")).unwrap();
+}
+
+#[test_log::test]
+#[cfg_attr(
+    windows,
+    ignore = "test is currently flaky in ci and needs to be debugged"
+)]
+fn outbound_request_invalid_version() {
+    setup_http2_sync(|| run("outbound_request_invalid_version")).unwrap();
+}
+
+#[test_log::test]
+fn outbound_request_unknown_method() {
+    run("outbound_request_unknown_method").unwrap();
+}
+
+#[test_log::test]
+fn outbound_request_unsupported_scheme() {
+    run("outbound_request_unsupported_scheme").unwrap();
+}
+
+#[test_log::test]
+fn outbound_request_invalid_port() {
+    run("outbound_request_invalid_port").unwrap();
+}
+
+#[test_log::test]
+#[cfg_attr(
+    windows,
+    ignore = "test is currently flaky in ci and needs to be debugged"
+)]
+fn outbound_request_invalid_dnsname() {
+    run("outbound_request_invalid_dnsname").unwrap();
+}
diff --git a/crates/test-programs/tests/wasi-http-components.rs b/crates/test-programs/tests/wasi-http-components.rs
new file mode 100644
index 000000000000..1f05411d0178
--- /dev/null
+++ b/crates/test-programs/tests/wasi-http-components.rs
@@ -0,0 +1,187 @@
+#![cfg(all(feature = "test_programs", not(skip_wasi_http_tests)))]
+use wasmtime::{
+    component::{Component, Linker},
+    Config, Engine, Store,
+};
+use wasmtime_wasi::preview2::{
+    command::{add_to_linker, Command},
+    pipe::MemoryOutputPipe,
+    IsATTY, Table, WasiCtx, WasiCtxBuilder, WasiView,
+};
+use wasmtime_wasi_http::{WasiHttpCtx, WasiHttpView};
+
+use test_programs::http_server::{setup_http1, setup_http2};
+
+lazy_static::lazy_static! {
+    static ref ENGINE: Engine = {
+        let mut config = Config::new();
+        config.wasm_backtrace_details(wasmtime::WasmBacktraceDetails::Enable);
+        config.wasm_component_model(true);
+        config.async_support(true);
+        let engine = Engine::new(&config).unwrap();
+        engine
+    };
+}
+// uses ENGINE, creates a fn get_module(&str) -> Module
+include!(concat!(env!("OUT_DIR"), "/wasi_http_tests_components.rs"));
+
+struct Ctx {
+    table: Table,
+    wasi: WasiCtx,
+    http: WasiHttpCtx,
+}
+
+impl WasiView for Ctx {
+    fn table(&self) -> &Table {
+        &self.table
+    }
+    fn table_mut(&mut self) -> &mut Table {
+        &mut self.table
+    }
+    fn ctx(&self) -> &WasiCtx {
+        &self.wasi
+    }
+    fn ctx_mut(&mut self) -> &mut WasiCtx {
+        &mut self.wasi
+    }
+}
+
+impl WasiHttpView for Ctx {
+    fn http_ctx(&self) -> &WasiHttpCtx {
+        &self.http
+    }
+    fn http_ctx_mut(&mut self) -> &mut WasiHttpCtx {
+        &mut self.http
+    }
+}
+
+async fn instantiate_component(
+    component: Component,
+    ctx: Ctx,
+) -> Result<(Store<Ctx>, Command), anyhow::Error> {
+    let mut linker = Linker::new(&ENGINE);
+    add_to_linker(&mut linker)?;
+    wasmtime_wasi_http::proxy::add_to_linker(&mut linker)?;
+
+    let mut store = Store::new(&ENGINE, ctx);
+
+    let (command, _instance) = Command::instantiate_async(&mut store, &component, &linker).await?;
+    Ok((store, command))
+}
+
+async fn run(name: &str) -> anyhow::Result<()> {
+    let stdout = MemoryOutputPipe::new(4096);
+    let stderr = MemoryOutputPipe::new(4096);
+    let r = {
+        let mut table = Table::new();
+        let component = get_component(name);
+
+        // Create our wasi context.
+        let mut builder = WasiCtxBuilder::new();
+        builder.stdout(stdout.clone(), IsATTY::No);
+        builder.stderr(stderr.clone(), IsATTY::No);
+        builder.arg(name);
+        for (var, val) in test_programs::wasi_tests_environment() {
+            builder.env(var, val);
+        }
+        let wasi = builder.build(&mut table)?;
+        let http = WasiHttpCtx::new();
+
+        let (mut store, command) =
+            instantiate_component(component, Ctx { table, wasi, http }).await?;
+        command
+            .wasi_cli_run()
+            .call_run(&mut store)
+            .await?
+            .map_err(|()| anyhow::anyhow!("run returned a failure"))?;
+        Ok(())
+    };
+    r.map_err(move |trap: anyhow::Error| {
+        let stdout = stdout.try_into_inner().expect("single ref to stdout");
+        if !stdout.is_empty() {
+            println!("[guest] stdout:\n{}\n===", String::from_utf8_lossy(&stdout));
+        }
+        let stderr = stderr.try_into_inner().expect("single ref to stderr");
+        if !stderr.is_empty() {
+            println!("[guest] stderr:\n{}\n===", String::from_utf8_lossy(&stderr));
+        }
+        trap.context(format!(
+            "error while testing wasi-tests {} with http-components",
+            name
+        ))
+    })?;
+    Ok(())
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[cfg_attr(
+    windows,
+    ignore = "test is currently flaky in ci and needs to be debugged"
+)]
+async fn outbound_request_get() {
+    setup_http1(run("outbound_request_get")).await.unwrap();
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[cfg_attr(
+    windows,
+    ignore = "test is currently flaky in ci and needs to be debugged"
+)]
+async fn outbound_request_post() {
+    setup_http1(run("outbound_request_post")).await.unwrap();
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[cfg_attr(
+    windows,
+    ignore = "test is currently flaky in ci and needs to be debugged"
+)]
+async fn outbound_request_large_post() {
+    setup_http1(run("outbound_request_large_post"))
+        .await
+        .unwrap();
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[cfg_attr(
+    windows,
+    ignore = "test is currently flaky in ci and needs to be debugged"
+)]
+async fn outbound_request_put() {
+    setup_http1(run("outbound_request_put")).await.unwrap();
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[cfg_attr(
+    windows,
+    ignore = "test is currently flaky in ci and needs to be debugged"
+)]
+async fn outbound_request_invalid_version() {
+    setup_http2(run("outbound_request_invalid_version"))
+        .await
+        .unwrap();
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn outbound_request_unknown_method() {
+    run("outbound_request_unknown_method").await.unwrap();
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn outbound_request_unsupported_scheme() {
+    run("outbound_request_unsupported_scheme").await.unwrap();
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn outbound_request_invalid_port() {
+    run("outbound_request_invalid_port").await.unwrap();
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[cfg_attr(
+    windows,
+    ignore = "test is currently flaky in ci and needs to be debugged"
+)]
+async fn outbound_request_invalid_dnsname() {
+    run("outbound_request_invalid_dnsname").await.unwrap();
+}
diff --git a/crates/test-programs/tests/wasi-http-modules.rs b/crates/test-programs/tests/wasi-http-modules.rs
new file mode 100644
index 000000000000..e73251d5a1f8
--- /dev/null
+++ b/crates/test-programs/tests/wasi-http-modules.rs
@@ -0,0 +1,196 @@
+#![cfg(all(feature = "test_programs", not(skip_wasi_http_tests)))]
+use wasmtime::{Config, Engine, Func, Linker, Module, Store};
+use wasmtime_wasi::preview2::{
+    pipe::MemoryOutputPipe,
+    preview1::{WasiPreview1Adapter, WasiPreview1View},
+    IsATTY, Table, WasiCtx, WasiCtxBuilder, WasiView,
+};
+use wasmtime_wasi_http::{WasiHttpCtx, WasiHttpView};
+
+use test_programs::http_server::{setup_http1, setup_http2};
+
+lazy_static::lazy_static! {
+    static ref ENGINE: Engine = {
+        let mut config = Config::new();
+        config.wasm_backtrace_details(wasmtime::WasmBacktraceDetails::Enable);
+        config.wasm_component_model(true);
+        config.async_support(true);
+
+        let engine = Engine::new(&config).unwrap();
+        engine
+    };
+}
+// uses ENGINE, creates a fn get_module(&str) -> Module
+include!(concat!(env!("OUT_DIR"), "/wasi_http_tests_modules.rs"));
+
+struct Ctx {
+    table: Table,
+    wasi: WasiCtx,
+    adapter: WasiPreview1Adapter,
+    http: WasiHttpCtx,
+}
+
+impl WasiView for Ctx {
+    fn table(&self) -> &Table {
+        &self.table
+    }
+    fn table_mut(&mut self) -> &mut Table {
+        &mut self.table
+    }
+    fn ctx(&self) -> &WasiCtx {
+        &self.wasi
+    }
+    fn ctx_mut(&mut self) -> &mut WasiCtx {
+        &mut self.wasi
+    }
+}
+impl WasiPreview1View for Ctx {
+    fn adapter(&self) -> &WasiPreview1Adapter {
+        &self.adapter
+    }
+    fn adapter_mut(&mut self) -> &mut WasiPreview1Adapter {
+        &mut self.adapter
+    }
+}
+impl WasiHttpView for Ctx {
+    fn http_ctx(&self) -> &WasiHttpCtx {
+        &self.http
+    }
+    fn http_ctx_mut(&mut self) -> &mut WasiHttpCtx {
+        &mut self.http
+    }
+}
+
+async fn instantiate_module(module: Module, ctx: Ctx) -> Result<(Store<Ctx>, Func), anyhow::Error> {
+    let mut linker = Linker::new(&ENGINE);
+    wasmtime_wasi_http::add_to_linker(&mut linker)?;
+    wasmtime_wasi::preview2::preview1::add_to_linker_async(&mut linker)?;
+
+    let mut store = Store::new(&ENGINE, ctx);
+
+    let instance = linker.instantiate_async(&mut store, &module).await?;
+    let command = instance.get_func(&mut store, "_start").unwrap();
+    Ok((store, command))
+}
+
+async fn run(name: &str) -> anyhow::Result<()> {
+    let stdout = MemoryOutputPipe::new(4096);
+    let stderr = MemoryOutputPipe::new(4096);
+    let r = {
+        let mut table = Table::new();
+        let module = get_module(name);
+
+        // Create our wasi context.
+        let mut builder = WasiCtxBuilder::new();
+        builder.stdout(stdout.clone(), IsATTY::No);
+        builder.stderr(stderr.clone(), IsATTY::No);
+        builder.arg(name);
+        for (var, val) in test_programs::wasi_tests_environment() {
+            builder.env(var, val);
+        }
+        let wasi = builder.build(&mut table)?;
+        let http = WasiHttpCtx::new();
+
+        let adapter = WasiPreview1Adapter::new();
+
+        let (mut store, command) = instantiate_module(
+            module,
+            Ctx {
+                table,
+                wasi,
+                http,
+                adapter,
+            },
+        )
+        .await?;
+        command.call_async(&mut store, &[], &mut []).await
+    };
+    r.map_err(move |trap: anyhow::Error| {
+        let stdout = stdout.try_into_inner().expect("single ref to stdout");
+        if !stdout.is_empty() {
+            println!("[guest] stdout:\n{}\n===", String::from_utf8_lossy(&stdout));
+        }
+        let stderr = stderr.try_into_inner().expect("single ref to stderr");
+        if !stderr.is_empty() {
+            println!("[guest] stderr:\n{}\n===", String::from_utf8_lossy(&stderr));
+        }
+        trap.context(format!(
+            "error while testing wasi-tests {} with http-modules",
+            name
+        ))
+    })?;
+    Ok(())
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[cfg_attr(
+    windows,
+    ignore = "test is currently flaky in ci and needs to be debugged"
+)]
+async fn outbound_request_get() {
+    setup_http1(run("outbound_request_get")).await.unwrap();
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[cfg_attr(
+    windows,
+    ignore = "test is currently flaky in ci and needs to be debugged"
+)]
+async fn outbound_request_post() {
+    setup_http1(run("outbound_request_post")).await.unwrap();
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[cfg_attr(
+    windows,
+    ignore = "test is currently flaky in ci and needs to be debugged"
+)]
+async fn outbound_request_large_post() {
+    setup_http1(run("outbound_request_large_post"))
+        .await
+        .unwrap();
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[cfg_attr(
+    windows,
+    ignore = "test is currently flaky in ci and needs to be debugged"
+)]
+async fn outbound_request_put() {
+    setup_http1(run("outbound_request_put")).await.unwrap();
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[cfg_attr(
+    windows,
+    ignore = "test is currently flaky in ci and needs to be debugged"
+)]
+async fn outbound_request_invalid_version() {
+    setup_http2(run("outbound_request_invalid_version"))
+        .await
+        .unwrap();
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn outbound_request_unknown_method() {
+    run("outbound_request_unknown_method").await.unwrap();
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn outbound_request_unsupported_scheme() {
+    run("outbound_request_unsupported_scheme").await.unwrap();
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn outbound_request_invalid_port() {
+    run("outbound_request_invalid_port").await.unwrap();
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[cfg_attr(
+    windows,
+    ignore = "test is currently flaky in ci and needs to be debugged"
+)]
+async fn outbound_request_invalid_dnsname() {
+    run("outbound_request_invalid_dnsname").await.unwrap();
+}
diff --git a/crates/test-programs/tests/wasi-preview1-host-in-preview2.rs b/crates/test-programs/tests/wasi-preview1-host-in-preview2.rs
new file mode 100644
index 000000000000..836d473f75e6
--- /dev/null
+++ b/crates/test-programs/tests/wasi-preview1-host-in-preview2.rs
@@ -0,0 +1,341 @@
+#![cfg(feature = "test_programs")]
+use anyhow::Result;
+use tempfile::TempDir;
+use wasmtime::{Config, Engine, Linker, Store};
+use wasmtime_wasi::preview2::{
+    pipe::MemoryOutputPipe,
+    preview1::{add_to_linker_async, WasiPreview1Adapter, WasiPreview1View},
+    DirPerms, FilePerms, IsATTY, Table, WasiCtx, WasiCtxBuilder, WasiView,
+};
+
+lazy_static::lazy_static! {
+    static ref ENGINE: Engine = {
+        let mut config = Config::new();
+        config.wasm_backtrace_details(wasmtime::WasmBacktraceDetails::Enable);
+        config.wasm_component_model(true);
+        config.async_support(true);
+
+        let engine = Engine::new(&config).unwrap();
+        engine
+    };
+}
+// uses ENGINE, creates a fn get_module(&str) -> Module
+include!(concat!(env!("OUT_DIR"), "/wasi_tests_modules.rs"));
+
+pub fn prepare_workspace(exe_name: &str) -> Result<TempDir> {
+    let prefix = format!("wasi_components_{}_", exe_name);
+    let tempdir = tempfile::Builder::new().prefix(&prefix).tempdir()?;
+    Ok(tempdir)
+}
+
+async fn run(name: &str, inherit_stdio: bool) -> Result<()> {
+    let workspace = prepare_workspace(name)?;
+    let stdout = MemoryOutputPipe::new(4096);
+    let stderr = MemoryOutputPipe::new(4096);
+    let r = {
+        let mut linker = Linker::new(&ENGINE);
+        add_to_linker_async(&mut linker)?;
+
+        // Create our wasi context.
+        // Additionally register any preopened directories if we have them.
+        let mut builder = WasiCtxBuilder::new();
+
+        if inherit_stdio {
+            builder.inherit_stdio();
+        } else {
+            builder
+                .stdout(stdout.clone(), IsATTY::No)
+                .stderr(stderr.clone(), IsATTY::No);
+        }
+        builder.args(&[name, "."]);
+        println!("preopen: {:?}", workspace);
+        let preopen_dir =
+            cap_std::fs::Dir::open_ambient_dir(workspace.path(), cap_std::ambient_authority())?;
+        builder.preopened_dir(preopen_dir, DirPerms::all(), FilePerms::all(), ".");
+        for (var, val) in test_programs::wasi_tests_environment() {
+            builder.env(var, val);
+        }
+
+        let mut table = Table::new();
+        let wasi = builder.build(&mut table)?;
+        struct Ctx {
+            wasi: WasiCtx,
+            table: Table,
+            adapter: WasiPreview1Adapter,
+        }
+        impl WasiView for Ctx {
+            fn ctx(&self) -> &WasiCtx {
+                &self.wasi
+            }
+            fn ctx_mut(&mut self) -> &mut WasiCtx {
+                &mut self.wasi
+            }
+            fn table(&self) -> &Table {
+                &self.table
+            }
+            fn table_mut(&mut self) -> &mut Table {
+                &mut self.table
+            }
+        }
+        impl WasiPreview1View for Ctx {
+            fn adapter(&self) -> &WasiPreview1Adapter {
+                &self.adapter
+            }
+            fn adapter_mut(&mut self) -> &mut WasiPreview1Adapter {
+                &mut self.adapter
+            }
+        }
+
+        let adapter = WasiPreview1Adapter::new();
+        let ctx = Ctx {
+            wasi,
+            table,
+            adapter,
+        };
+        let mut store = Store::new(&ENGINE, ctx);
+        let instance = linker
+            .instantiate_async(&mut store, &get_module(name))
+            .await?;
+        let start = instance.get_typed_func::<(), ()>(&mut store, "_start")?;
+        start.call_async(&mut store, ()).await?;
+        Ok(())
+    };
+
+    r.map_err(move |trap: anyhow::Error| {
+        let stdout = stdout.try_into_inner().expect("sole ref to stdout");
+        if !stdout.is_empty() {
+            println!("guest stdout:\n{}\n===", String::from_utf8_lossy(&stdout));
+        }
+        let stderr = stderr.try_into_inner().expect("sole ref to stderr");
+        if !stderr.is_empty() {
+            println!("guest stderr:\n{}\n===", String::from_utf8_lossy(&stderr));
+        }
+        trap.context(format!(
+            "error while testing wasi-tests {} with cap-std-sync",
+            name
+        ))
+    })?;
+    Ok(())
+}
+
+// Below here is mechanical: there should be one test for every binary in
+// wasi-tests. The only differences should be should_panic annotations for
+// tests which fail.
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn big_random_buf() {
+    run("big_random_buf", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn clock_time_get() {
+    run("clock_time_get", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn close_preopen() {
+    run("close_preopen", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn dangling_fd() {
+    run("dangling_fd", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn dangling_symlink() {
+    run("dangling_symlink", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn directory_seek() {
+    run("directory_seek", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn dir_fd_op_failures() {
+    run("dir_fd_op_failures", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn fd_advise() {
+    run("fd_advise", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn fd_filestat_get() {
+    run("fd_filestat_get", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn fd_filestat_set() {
+    run("fd_filestat_set", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn fd_flags_set() {
+    run("fd_flags_set", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn fd_readdir() {
+    run("fd_readdir", true).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn file_allocate() {
+    run("file_allocate", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn file_pread_pwrite() {
+    run("file_pread_pwrite", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn file_seek_tell() {
+    run("file_seek_tell", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn file_truncation() {
+    run("file_truncation", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn file_unbuffered_write() {
+    run("file_unbuffered_write", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[cfg_attr(windows, should_panic)]
+async fn interesting_paths() {
+    run("interesting_paths", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn regular_file_isatty() {
+    run("regular_file_isatty", true).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn nofollow_errors() {
+    run("nofollow_errors", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn overwrite_preopen() {
+    run("overwrite_preopen", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_exists() {
+    run("path_exists", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_filestat() {
+    run("path_filestat", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_link() {
+    run("path_link", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_open_create_existing() {
+    run("path_open_create_existing", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_open_read_write() {
+    run("path_open_read_write", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_open_dirfd_not_dir() {
+    run("path_open_dirfd_not_dir", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_open_missing() {
+    run("path_open_missing", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_open_nonblock() {
+    run("path_open_nonblock", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_rename_dir_trailing_slashes() {
+    run("path_rename_dir_trailing_slashes", false)
+        .await
+        .unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[should_panic]
+async fn path_rename_file_trailing_slashes() {
+    run("path_rename_file_trailing_slashes", false)
+        .await
+        .unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_rename() {
+    run("path_rename", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_symlink_trailing_slashes() {
+    run("path_symlink_trailing_slashes", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[should_panic]
+async fn poll_oneoff_files() {
+    run("poll_oneoff_files", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+// This is a known bug with the preview 2 implementation:
+#[should_panic]
+async fn poll_oneoff_stdio() {
+    run("poll_oneoff_stdio", true).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn readlink() {
+    run("readlink", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[should_panic]
+async fn remove_directory_trailing_slashes() {
+    run("remove_directory_trailing_slashes", false)
+        .await
+        .unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn remove_nonempty_directory() {
+    run("remove_nonempty_directory", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn renumber() {
+    run("renumber", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn sched_yield() {
+    run("sched_yield", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[should_panic]
+async fn sleep() {
+    run("sleep", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn stdio() {
+    run("stdio", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn stdio_isatty() {
+    // If the test process is setup such that stdio is a terminal:
+    if test_programs::stdio_is_terminal() {
+        // Inherit stdio, test asserts each is a tty:
+        run("stdio_isatty", true).await.unwrap()
+    }
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn stdio_not_isatty() {
+    // Don't inherit stdio, test asserts each is not tty:
+    run("stdio_not_isatty", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn symlink_create() {
+    run("symlink_create", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn symlink_filestat() {
+    run("symlink_filestat", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn symlink_loop() {
+    run("symlink_loop", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn unlink_file_trailing_slashes() {
+    run("unlink_file_trailing_slashes", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_open_preopen() {
+    run("path_open_preopen", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn unicode_output() {
+    run("unicode_output", true).await.unwrap()
+}
diff --git a/crates/test-programs/tests/wasi-preview2-components-sync.rs b/crates/test-programs/tests/wasi-preview2-components-sync.rs
new file mode 100644
index 000000000000..5e095923e163
--- /dev/null
+++ b/crates/test-programs/tests/wasi-preview2-components-sync.rs
@@ -0,0 +1,318 @@
+#![cfg(feature = "test_programs")]
+use anyhow::Result;
+use tempfile::TempDir;
+use wasmtime::{component::Linker, Config, Engine, Store};
+use wasmtime_wasi::preview2::{
+    command::sync::{add_to_linker, Command},
+    pipe::MemoryOutputPipe,
+    DirPerms, FilePerms, IsATTY, Table, WasiCtx, WasiCtxBuilder, WasiView,
+};
+
+lazy_static::lazy_static! {
+    static ref ENGINE: Engine = {
+        let mut config = Config::new();
+        config.wasm_backtrace_details(wasmtime::WasmBacktraceDetails::Enable);
+        config.wasm_component_model(true);
+        config.async_support(false);
+
+        let engine = Engine::new(&config).unwrap();
+        engine
+    };
+}
+// uses ENGINE, creates a fn get_component(&str) -> Component
+include!(concat!(env!("OUT_DIR"), "/wasi_tests_components.rs"));
+
+pub fn prepare_workspace(exe_name: &str) -> Result<TempDir> {
+    let prefix = format!("wasi_components_{}_", exe_name);
+    let tempdir = tempfile::Builder::new().prefix(&prefix).tempdir()?;
+    Ok(tempdir)
+}
+
+fn run(name: &str, inherit_stdio: bool) -> Result<()> {
+    let workspace = prepare_workspace(name)?;
+    let stdout = MemoryOutputPipe::new(4096);
+    let stderr = MemoryOutputPipe::new(4096);
+    let r = {
+        let mut linker = Linker::new(&ENGINE);
+        add_to_linker(&mut linker)?;
+
+        // Create our wasi context.
+        // Additionally register any preopened directories if we have them.
+        let mut builder = WasiCtxBuilder::new();
+
+        if inherit_stdio {
+            builder.inherit_stdio();
+        } else {
+            builder
+                .stdout(stdout.clone(), IsATTY::No)
+                .stderr(stderr.clone(), IsATTY::No);
+        }
+        builder.args(&[name, "."]);
+        println!("preopen: {:?}", workspace);
+        let preopen_dir =
+            cap_std::fs::Dir::open_ambient_dir(workspace.path(), cap_std::ambient_authority())?;
+        builder.preopened_dir(preopen_dir, DirPerms::all(), FilePerms::all(), ".");
+        for (var, val) in test_programs::wasi_tests_environment() {
+            builder.env(var, val);
+        }
+
+        let mut table = Table::new();
+        let wasi = builder.build(&mut table)?;
+        struct Ctx {
+            wasi: WasiCtx,
+            table: Table,
+        }
+        impl WasiView for Ctx {
+            fn ctx(&self) -> &WasiCtx {
+                &self.wasi
+            }
+            fn ctx_mut(&mut self) -> &mut WasiCtx {
+                &mut self.wasi
+            }
+            fn table(&self) -> &Table {
+                &self.table
+            }
+            fn table_mut(&mut self) -> &mut Table {
+                &mut self.table
+            }
+        }
+
+        let ctx = Ctx { wasi, table };
+        let mut store = Store::new(&ENGINE, ctx);
+        let (command, _instance) = Command::instantiate(&mut store, &get_component(name), &linker)?;
+        command
+            .wasi_cli_run()
+            .call_run(&mut store)?
+            .map_err(|()| anyhow::anyhow!("run returned a failure"))?;
+        Ok(())
+    };
+
+    r.map_err(move |trap: anyhow::Error| {
+        let stdout = stdout.try_into_inner().expect("single ref to stdout");
+        if !stdout.is_empty() {
+            println!("guest stdout:\n{}\n===", String::from_utf8_lossy(&stdout));
+        }
+        let stderr = stderr.try_into_inner().expect("single ref to stderr");
+        if !stderr.is_empty() {
+            println!("guest stderr:\n{}\n===", String::from_utf8_lossy(&stderr));
+        }
+        trap.context(format!(
+            "error while testing wasi-tests {} with cap-std-sync",
+            name
+        ))
+    })?;
+    Ok(())
+}
+
+// Below here is mechanical: there should be one test for every binary in
+// wasi-tests. The only differences should be should_panic annotations for
+// tests which fail.
+#[test_log::test]
+fn big_random_buf() {
+    run("big_random_buf", false).unwrap()
+}
+#[test_log::test]
+fn clock_time_get() {
+    run("clock_time_get", false).unwrap()
+}
+#[test_log::test]
+fn close_preopen() {
+    run("close_preopen", false).unwrap()
+}
+#[test_log::test]
+fn dangling_fd() {
+    run("dangling_fd", false).unwrap()
+}
+#[test_log::test]
+fn dangling_symlink() {
+    run("dangling_symlink", false).unwrap()
+}
+#[test_log::test]
+fn directory_seek() {
+    run("directory_seek", false).unwrap()
+}
+#[test_log::test]
+fn dir_fd_op_failures() {
+    run("dir_fd_op_failures", false).unwrap()
+}
+#[test_log::test]
+fn fd_advise() {
+    run("fd_advise", false).unwrap()
+}
+#[test_log::test]
+fn fd_filestat_get() {
+    run("fd_filestat_get", false).unwrap()
+}
+#[test_log::test]
+fn fd_filestat_set() {
+    run("fd_filestat_set", false).unwrap()
+}
+#[test_log::test]
+fn fd_flags_set() {
+    run("fd_flags_set", false).unwrap()
+}
+#[test_log::test]
+fn fd_readdir() {
+    run("fd_readdir", false).unwrap()
+}
+#[test_log::test]
+fn file_allocate() {
+    run("file_allocate", false).unwrap()
+}
+#[test_log::test]
+fn file_pread_pwrite() {
+    run("file_pread_pwrite", false).unwrap()
+}
+#[test_log::test]
+fn file_seek_tell() {
+    run("file_seek_tell", false).unwrap()
+}
+#[test_log::test]
+fn file_truncation() {
+    run("file_truncation", false).unwrap()
+}
+#[test_log::test]
+fn file_unbuffered_write() {
+    run("file_unbuffered_write", false).unwrap()
+}
+#[test_log::test]
+#[cfg_attr(windows, should_panic)]
+fn interesting_paths() {
+    run("interesting_paths", false).unwrap()
+}
+#[test_log::test]
+fn regular_file_isatty() {
+    run("regular_file_isatty", false).unwrap()
+}
+#[test_log::test]
+fn nofollow_errors() {
+    run("nofollow_errors", false).unwrap()
+}
+#[test_log::test]
+fn overwrite_preopen() {
+    run("overwrite_preopen", false).unwrap()
+}
+#[test_log::test]
+fn path_exists() {
+    run("path_exists", false).unwrap()
+}
+#[test_log::test]
+fn path_filestat() {
+    run("path_filestat", false).unwrap()
+}
+#[test_log::test]
+fn path_link() {
+    run("path_link", false).unwrap()
+}
+#[test_log::test]
+fn path_open_create_existing() {
+    run("path_open_create_existing", false).unwrap()
+}
+#[test_log::test]
+fn path_open_read_write() {
+    run("path_open_read_write", false).unwrap()
+}
+#[test_log::test]
+fn path_open_dirfd_not_dir() {
+    run("path_open_dirfd_not_dir", false).unwrap()
+}
+#[test_log::test]
+fn path_open_missing() {
+    run("path_open_missing", false).unwrap()
+}
+#[test_log::test]
+fn path_open_nonblock() {
+    run("path_open_nonblock", false).unwrap()
+}
+#[test_log::test]
+fn path_rename_dir_trailing_slashes() {
+    run("path_rename_dir_trailing_slashes", false).unwrap()
+}
+#[test_log::test]
+#[should_panic]
+fn path_rename_file_trailing_slashes() {
+    run("path_rename_file_trailing_slashes", false).unwrap()
+}
+#[test_log::test]
+fn path_rename() {
+    run("path_rename", false).unwrap()
+}
+#[test_log::test]
+fn path_symlink_trailing_slashes() {
+    run("path_symlink_trailing_slashes", false).unwrap()
+}
+#[test_log::test]
+fn poll_oneoff_files() {
+    run("poll_oneoff_files", false).unwrap()
+}
+
+#[test_log::test]
+fn poll_oneoff_stdio() {
+    run("poll_oneoff_stdio", true).unwrap()
+}
+#[test_log::test]
+fn readlink() {
+    run("readlink", false).unwrap()
+}
+#[test_log::test]
+#[should_panic]
+fn remove_directory_trailing_slashes() {
+    run("remove_directory_trailing_slashes", false).unwrap()
+}
+#[test_log::test]
+fn remove_nonempty_directory() {
+    run("remove_nonempty_directory", false).unwrap()
+}
+#[test_log::test]
+fn renumber() {
+    run("renumber", false).unwrap()
+}
+#[test_log::test]
+fn sched_yield() {
+    run("sched_yield", false).unwrap()
+}
+#[test_log::test]
+fn sleep() {
+    run("sleep", false).unwrap()
+}
+#[test_log::test]
+fn stdio() {
+    run("stdio", false).unwrap()
+}
+#[test_log::test]
+fn stdio_isatty() {
+    // If the test process is setup such that stdio is a terminal:
+    if test_programs::stdio_is_terminal() {
+        // Inherit stdio, test asserts each is a tty:
+        run("stdio_isatty", true).unwrap()
+    }
+}
+#[test_log::test]
+fn stdio_not_isatty() {
+    // Don't inherit stdio, test asserts not isatty:
+    run("stdio_not_isatty", false).unwrap()
+}
+#[test_log::test]
+fn symlink_create() {
+    run("symlink_create", false).unwrap()
+}
+#[test_log::test]
+fn symlink_filestat() {
+    run("symlink_filestat", false).unwrap()
+}
+#[test_log::test]
+fn symlink_loop() {
+    run("symlink_loop", false).unwrap()
+}
+#[test_log::test]
+fn unlink_file_trailing_slashes() {
+    run("unlink_file_trailing_slashes", false).unwrap()
+}
+#[test_log::test]
+fn path_open_preopen() {
+    run("path_open_preopen", false).unwrap()
+}
+#[test_log::test]
+fn unicode_output() {
+    run("unicode_output", true).unwrap()
+}
diff --git a/crates/test-programs/tests/wasi-preview2-components.rs b/crates/test-programs/tests/wasi-preview2-components.rs
new file mode 100644
index 000000000000..7834562b687b
--- /dev/null
+++ b/crates/test-programs/tests/wasi-preview2-components.rs
@@ -0,0 +1,326 @@
+#![cfg(feature = "test_programs")]
+use anyhow::Result;
+use tempfile::TempDir;
+use wasmtime::{component::Linker, Config, Engine, Store};
+use wasmtime_wasi::preview2::{
+    command::{add_to_linker, Command},
+    pipe::MemoryOutputPipe,
+    DirPerms, FilePerms, IsATTY, Table, WasiCtx, WasiCtxBuilder, WasiView,
+};
+
+lazy_static::lazy_static! {
+    static ref ENGINE: Engine = {
+        let mut config = Config::new();
+        config.wasm_backtrace_details(wasmtime::WasmBacktraceDetails::Enable);
+        config.wasm_component_model(true);
+        config.async_support(true);
+
+        let engine = Engine::new(&config).unwrap();
+        engine
+    };
+}
+// uses ENGINE, creates a fn get_component(&str) -> Component
+include!(concat!(env!("OUT_DIR"), "/wasi_tests_components.rs"));
+
+pub fn prepare_workspace(exe_name: &str) -> Result<TempDir> {
+    let prefix = format!("wasi_components_{}_", exe_name);
+    let tempdir = tempfile::Builder::new().prefix(&prefix).tempdir()?;
+    Ok(tempdir)
+}
+
+async fn run(name: &str, inherit_stdio: bool) -> Result<()> {
+    let workspace = prepare_workspace(name)?;
+    let stdout = MemoryOutputPipe::new(4096);
+    let stderr = MemoryOutputPipe::new(4096);
+    let r = {
+        let mut linker = Linker::new(&ENGINE);
+        add_to_linker(&mut linker)?;
+
+        // Create our wasi context.
+        // Additionally register any preopened directories if we have them.
+        let mut builder = WasiCtxBuilder::new();
+
+        if inherit_stdio {
+            builder.inherit_stdio();
+        } else {
+            builder
+                .stdout(stdout.clone(), IsATTY::No)
+                .stderr(stderr.clone(), IsATTY::No);
+        }
+        builder.args(&[name, "."]);
+        println!("preopen: {:?}", workspace);
+        let preopen_dir =
+            cap_std::fs::Dir::open_ambient_dir(workspace.path(), cap_std::ambient_authority())?;
+        builder.preopened_dir(preopen_dir, DirPerms::all(), FilePerms::all(), ".");
+        for (var, val) in test_programs::wasi_tests_environment() {
+            builder.env(var, val);
+        }
+
+        let mut table = Table::new();
+        let wasi = builder.build(&mut table)?;
+        struct Ctx {
+            wasi: WasiCtx,
+            table: Table,
+        }
+        impl WasiView for Ctx {
+            fn ctx(&self) -> &WasiCtx {
+                &self.wasi
+            }
+            fn ctx_mut(&mut self) -> &mut WasiCtx {
+                &mut self.wasi
+            }
+            fn table(&self) -> &Table {
+                &self.table
+            }
+            fn table_mut(&mut self) -> &mut Table {
+                &mut self.table
+            }
+        }
+
+        let ctx = Ctx { wasi, table };
+        let mut store = Store::new(&ENGINE, ctx);
+        let (command, _instance) =
+            Command::instantiate_async(&mut store, &get_component(name), &linker).await?;
+        command
+            .wasi_cli_run()
+            .call_run(&mut store)
+            .await?
+            .map_err(|()| anyhow::anyhow!("run returned a failure"))?;
+        Ok(())
+    };
+
+    r.map_err(move |trap: anyhow::Error| {
+        let stdout = stdout.try_into_inner().expect("single ref to stdout");
+        if !stdout.is_empty() {
+            println!("guest stdout:\n{}\n===", String::from_utf8_lossy(&stdout));
+        }
+        let stderr = stderr.try_into_inner().expect("single ref to stderr");
+        if !stderr.is_empty() {
+            println!("guest stderr:\n{}\n===", String::from_utf8_lossy(&stderr));
+        }
+        trap.context(format!(
+            "error while testing wasi-tests {} with cap-std-sync",
+            name
+        ))
+    })?;
+    Ok(())
+}
+
+// Below here is mechanical: there should be one test for every binary in
+// wasi-tests. The only differences should be should_panic annotations for
+// tests which fail.
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn big_random_buf() {
+    run("big_random_buf", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn clock_time_get() {
+    run("clock_time_get", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn close_preopen() {
+    run("close_preopen", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn dangling_fd() {
+    run("dangling_fd", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn dangling_symlink() {
+    run("dangling_symlink", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn directory_seek() {
+    run("directory_seek", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn dir_fd_op_failures() {
+    run("dir_fd_op_failures", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn fd_advise() {
+    run("fd_advise", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn fd_filestat_get() {
+    run("fd_filestat_get", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn fd_filestat_set() {
+    run("fd_filestat_set", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn fd_flags_set() {
+    run("fd_flags_set", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn fd_readdir() {
+    run("fd_readdir", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn file_allocate() {
+    run("file_allocate", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn file_pread_pwrite() {
+    run("file_pread_pwrite", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn file_seek_tell() {
+    run("file_seek_tell", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn file_truncation() {
+    run("file_truncation", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn file_unbuffered_write() {
+    run("file_unbuffered_write", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[cfg_attr(windows, should_panic)]
+async fn interesting_paths() {
+    run("interesting_paths", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn regular_file_isatty() {
+    run("regular_file_isatty", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn nofollow_errors() {
+    run("nofollow_errors", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn overwrite_preopen() {
+    run("overwrite_preopen", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_exists() {
+    run("path_exists", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_filestat() {
+    run("path_filestat", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_link() {
+    run("path_link", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_open_create_existing() {
+    run("path_open_create_existing", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_open_read_write() {
+    run("path_open_read_write", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_open_dirfd_not_dir() {
+    run("path_open_dirfd_not_dir", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_open_missing() {
+    run("path_open_missing", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_open_nonblock() {
+    run("path_open_nonblock", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_rename_dir_trailing_slashes() {
+    run("path_rename_dir_trailing_slashes", false)
+        .await
+        .unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[should_panic]
+async fn path_rename_file_trailing_slashes() {
+    run("path_rename_file_trailing_slashes", false)
+        .await
+        .unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_rename() {
+    run("path_rename", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_symlink_trailing_slashes() {
+    run("path_symlink_trailing_slashes", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn poll_oneoff_files() {
+    run("poll_oneoff_files", false).await.unwrap()
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn poll_oneoff_stdio() {
+    run("poll_oneoff_stdio", true).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn readlink() {
+    run("readlink", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+#[should_panic]
+async fn remove_directory_trailing_slashes() {
+    run("remove_directory_trailing_slashes", false)
+        .await
+        .unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn remove_nonempty_directory() {
+    run("remove_nonempty_directory", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn renumber() {
+    run("renumber", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn sched_yield() {
+    run("sched_yield", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn sleep() {
+    run("sleep", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn stdio() {
+    run("stdio", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn stdio_isatty() {
+    // If the test process is setup such that stdio is a terminal:
+    if test_programs::stdio_is_terminal() {
+        // Inherit stdio, test asserts each is not tty:
+        run("stdio_isatty", true).await.unwrap()
+    }
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn stdio_not_isatty() {
+    // Don't inherit stdio, test asserts each is not tty:
+    run("stdio_not_isatty", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn symlink_create() {
+    run("symlink_create", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn symlink_filestat() {
+    run("symlink_filestat", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn symlink_loop() {
+    run("symlink_loop", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn unlink_file_trailing_slashes() {
+    run("unlink_file_trailing_slashes", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn path_open_preopen() {
+    run("path_open_preopen", false).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn unicode_output() {
+    run("unicode_output", true).await.unwrap()
+}
diff --git a/crates/test-programs/tests/wasi-sockets.rs b/crates/test-programs/tests/wasi-sockets.rs
new file mode 100644
index 000000000000..c16e9d4fadf7
--- /dev/null
+++ b/crates/test-programs/tests/wasi-sockets.rs
@@ -0,0 +1,76 @@
+#![cfg(all(feature = "test_programs", not(skip_wasi_sockets_tests)))]
+use cap_std::ambient_authority;
+use wasmtime::component::Linker;
+use wasmtime::{Config, Engine, Store};
+use wasmtime_wasi::preview2::{self, command::Command, Table, WasiCtx, WasiCtxBuilder, WasiView};
+
+lazy_static::lazy_static! {
+    static ref ENGINE: Engine = {
+        let mut config = Config::new();
+        config.wasm_backtrace_details(wasmtime::WasmBacktraceDetails::Enable);
+        config.wasm_component_model(true);
+        config.async_support(true);
+
+        let engine = Engine::new(&config).unwrap();
+        engine
+    };
+}
+// uses ENGINE, creates a fn get_component(&str) -> Component
+include!(concat!(
+    env!("OUT_DIR"),
+    "/wasi_sockets_tests_components.rs"
+));
+
+struct SocketsCtx {
+    table: Table,
+    wasi: WasiCtx,
+}
+
+impl WasiView for SocketsCtx {
+    fn table(&self) -> &Table {
+        &self.table
+    }
+    fn table_mut(&mut self) -> &mut Table {
+        &mut self.table
+    }
+    fn ctx(&self) -> &WasiCtx {
+        &self.wasi
+    }
+    fn ctx_mut(&mut self) -> &mut WasiCtx {
+        &mut self.wasi
+    }
+}
+
+async fn run(name: &str) -> anyhow::Result<()> {
+    let component = get_component(name);
+    let mut linker = Linker::new(&ENGINE);
+
+    preview2::command::add_to_linker(&mut linker)?;
+
+    // Create our wasi context.
+    let mut table = Table::new();
+    let wasi = WasiCtxBuilder::new()
+        .inherit_stdio()
+        .inherit_network(ambient_authority())
+        .arg(name)
+        .build(&mut table)?;
+
+    let mut store = Store::new(&ENGINE, SocketsCtx { table, wasi });
+
+    let (command, _instance) = Command::instantiate_async(&mut store, &component, &linker).await?;
+    command
+        .wasi_cli_run()
+        .call_run(&mut store)
+        .await?
+        .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn tcp_v4() {
+    run("tcp_v4").await.unwrap();
+}
+
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn tcp_v6() {
+    run("tcp_v6").await.unwrap();
+}
diff --git a/crates/wasi-common/tests/all/async_.rs b/crates/test-programs/tests/wasi-tokio.rs
similarity index 50%
rename from crates/wasi-common/tests/all/async_.rs
rename to crates/test-programs/tests/wasi-tokio.rs
index 54c63d143067..49280d2abefc 100644
--- a/crates/wasi-common/tests/all/async_.rs
+++ b/crates/test-programs/tests/wasi-tokio.rs
@@ -1,8 +1,23 @@
-use super::*;
-use test_programs_artifacts::*;
+#![cfg(feature = "test_programs")]
+use anyhow::Result;
+use tempfile::TempDir;
+use wasi_common::pipe::WritePipe;
+use wasmtime::{Config, Engine, Linker, Store};
 use wasmtime_wasi::tokio::{add_to_linker, WasiCtxBuilder};
 
-foreach_preview1!(assert_test_exists);
+lazy_static::lazy_static! {
+    static ref ENGINE: Engine = {
+        let mut config = Config::new();
+        config.wasm_backtrace_details(wasmtime::WasmBacktraceDetails::Enable);
+        config.wasm_component_model(false);
+        config.async_support(true);
+
+        let engine = Engine::new(&config).unwrap();
+        engine
+    };
+}
+// uses ENGINE, creates a fn get_module(&str) -> Module
+include!(concat!(env!("OUT_DIR"), "/wasi_tests_modules.rs"));
 
 pub fn prepare_workspace(exe_name: &str) -> Result<TempDir> {
     let prefix = format!("wasi_tokio_{}_", exe_name);
@@ -10,17 +25,12 @@ pub fn prepare_workspace(exe_name: &str) -> Result<TempDir> {
     Ok(tempdir)
 }
 
-async fn run(path: &str, inherit_stdio: bool) -> Result<()> {
-    let path = Path::new(path);
-    let name = path.file_stem().unwrap().to_str().unwrap();
+async fn run(name: &str, inherit_stdio: bool) -> Result<()> {
     let workspace = prepare_workspace(name)?;
     let stdout = WritePipe::new_in_memory();
     let stderr = WritePipe::new_in_memory();
     let r = {
-        let mut config = Config::new();
-        config.async_support(true);
-        let engine = Engine::new(&config)?;
-        let mut linker = Linker::new(&engine);
+        let mut linker = Linker::new(&ENGINE);
         add_to_linker(&mut linker, |cx| cx)?;
 
         // Create our wasi context.
@@ -39,13 +49,14 @@ async fn run(path: &str, inherit_stdio: bool) -> Result<()> {
         let preopen_dir =
             cap_std::fs::Dir::open_ambient_dir(workspace.path(), cap_std::ambient_authority())?;
         builder.preopened_dir(preopen_dir, ".")?;
-        for (var, val) in test_programs_artifacts::wasi_tests_environment() {
+        for (var, val) in test_programs::wasi_tests_environment() {
             builder.env(var, val)?;
         }
 
-        let mut store = Store::new(&engine, builder.build());
-        let module = Module::from_file(&engine, path)?;
-        let instance = linker.instantiate_async(&mut store, &module).await?;
+        let mut store = Store::new(&ENGINE, builder.build());
+        let instance = linker
+            .instantiate_async(&mut store, &get_module(name))
+            .await?;
         let start = instance.get_typed_func::<(), ()>(&mut store, "_start")?;
         start.call_async(&mut store, ()).await?;
         Ok(())
@@ -78,216 +89,215 @@ async fn run(path: &str, inherit_stdio: bool) -> Result<()> {
 // wasi-tests. The only differences should be should_panic annotations for
 // tests which fail.
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_big_random_buf() {
-    run(PREVIEW1_BIG_RANDOM_BUF, true).await.unwrap()
+async fn big_random_buf() {
+    run("big_random_buf", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_clock_time_get() {
-    run(PREVIEW1_CLOCK_TIME_GET, true).await.unwrap()
+async fn clock_time_get() {
+    run("clock_time_get", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_close_preopen() {
-    run(PREVIEW1_CLOSE_PREOPEN, true).await.unwrap()
+async fn close_preopen() {
+    run("close_preopen", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_dangling_fd() {
-    run(PREVIEW1_DANGLING_FD, true).await.unwrap()
+async fn dangling_fd() {
+    run("dangling_fd", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_dangling_symlink() {
-    run(PREVIEW1_DANGLING_SYMLINK, true).await.unwrap()
+async fn dangling_symlink() {
+    run("dangling_symlink", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_directory_seek() {
-    run(PREVIEW1_DIRECTORY_SEEK, true).await.unwrap()
+async fn directory_seek() {
+    run("directory_seek", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_dir_fd_op_failures() {
-    run(PREVIEW1_DIR_FD_OP_FAILURES, true).await.unwrap()
+async fn dir_fd_op_failures() {
+    run("dir_fd_op_failures", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_fd_advise() {
-    run(PREVIEW1_FD_ADVISE, true).await.unwrap()
+async fn fd_advise() {
+    run("fd_advise", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_fd_filestat_get() {
-    run(PREVIEW1_FD_FILESTAT_GET, true).await.unwrap()
+async fn fd_filestat_get() {
+    run("fd_filestat_get", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_fd_filestat_set() {
-    run(PREVIEW1_FD_FILESTAT_SET, true).await.unwrap()
+async fn fd_filestat_set() {
+    run("fd_filestat_set", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_fd_flags_set() {
-    run(PREVIEW1_FD_FLAGS_SET, true).await.unwrap()
+async fn fd_flags_set() {
+    run("fd_flags_set", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_fd_readdir() {
-    run(PREVIEW1_FD_READDIR, true).await.unwrap()
+async fn fd_readdir() {
+    run("fd_readdir", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_file_allocate() {
-    run(PREVIEW1_FILE_ALLOCATE, true).await.unwrap()
+async fn file_allocate() {
+    run("file_allocate", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_file_pread_pwrite() {
-    run(PREVIEW1_FILE_PREAD_PWRITE, true).await.unwrap()
+async fn file_pread_pwrite() {
+    run("file_pread_pwrite", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_file_seek_tell() {
-    run(PREVIEW1_FILE_SEEK_TELL, true).await.unwrap()
+async fn file_seek_tell() {
+    run("file_seek_tell", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_file_truncation() {
-    run(PREVIEW1_FILE_TRUNCATION, true).await.unwrap()
+async fn file_truncation() {
+    run("file_truncation", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_file_unbuffered_write() {
-    run(PREVIEW1_FILE_UNBUFFERED_WRITE, true).await.unwrap()
+async fn file_unbuffered_write() {
+    run("file_unbuffered_write", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
 #[cfg_attr(windows, should_panic)]
-async fn preview1_interesting_paths() {
-    run(PREVIEW1_INTERESTING_PATHS, true).await.unwrap()
+async fn interesting_paths() {
+    run("interesting_paths", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_regular_file_isatty() {
-    run(PREVIEW1_REGULAR_FILE_ISATTY, false).await.unwrap()
+async fn regular_file_isatty() {
+    run("regular_file_isatty", false).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_nofollow_errors() {
-    run(PREVIEW1_NOFOLLOW_ERRORS, true).await.unwrap()
+async fn nofollow_errors() {
+    run("nofollow_errors", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_overwrite_preopen() {
-    run(PREVIEW1_OVERWRITE_PREOPEN, true).await.unwrap()
+async fn overwrite_preopen() {
+    run("overwrite_preopen", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_exists() {
-    run(PREVIEW1_PATH_EXISTS, true).await.unwrap()
+async fn path_exists() {
+    run("path_exists", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_filestat() {
-    run(PREVIEW1_PATH_FILESTAT, true).await.unwrap()
+async fn path_filestat() {
+    run("path_filestat", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_link() {
-    run(PREVIEW1_PATH_LINK, true).await.unwrap()
+async fn path_link() {
+    run("path_link", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_open_create_existing() {
-    run(PREVIEW1_PATH_OPEN_CREATE_EXISTING, true).await.unwrap()
+async fn path_open_create_existing() {
+    run("path_open_create_existing", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_open_read_write() {
-    run(PREVIEW1_PATH_OPEN_READ_WRITE, true).await.unwrap()
+async fn path_open_read_write() {
+    run("path_open_read_write", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_open_dirfd_not_dir() {
-    run(PREVIEW1_PATH_OPEN_DIRFD_NOT_DIR, true).await.unwrap()
+async fn path_open_dirfd_not_dir() {
+    run("path_open_dirfd_not_dir", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_open_missing() {
-    run(PREVIEW1_PATH_OPEN_MISSING, true).await.unwrap()
+async fn path_open_missing() {
+    run("path_open_missing", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_open_nonblock() {
-    run(PREVIEW1_PATH_OPEN_NONBLOCK, true).await.unwrap()
+async fn path_open_nonblock() {
+    run("path_open_nonblock", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_rename_dir_trailing_slashes() {
-    run(PREVIEW1_PATH_RENAME_DIR_TRAILING_SLASHES, true)
-        .await
-        .unwrap()
+async fn path_rename_dir_trailing_slashes() {
+    run("path_rename_dir_trailing_slashes", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
 #[should_panic]
-async fn preview1_path_rename_file_trailing_slashes() {
-    run(PREVIEW1_PATH_RENAME_FILE_TRAILING_SLASHES, false)
+async fn path_rename_file_trailing_slashes() {
+    run("path_rename_file_trailing_slashes", false)
         .await
         .unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_rename() {
-    run(PREVIEW1_PATH_RENAME, true).await.unwrap()
+async fn path_rename() {
+    run("path_rename", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_symlink_trailing_slashes() {
-    run(PREVIEW1_PATH_SYMLINK_TRAILING_SLASHES, true)
-        .await
-        .unwrap()
+async fn path_symlink_trailing_slashes() {
+    run("path_symlink_trailing_slashes", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_poll_oneoff_files() {
-    run(PREVIEW1_POLL_ONEOFF_FILES, false).await.unwrap()
+async fn poll_oneoff_files() {
+    run("poll_oneoff_files", false).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_poll_oneoff_stdio() {
-    run(PREVIEW1_POLL_ONEOFF_STDIO, true).await.unwrap()
+async fn poll_oneoff_stdio() {
+    run("poll_oneoff_stdio", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_readlink() {
-    run(PREVIEW1_READLINK, true).await.unwrap()
+async fn readlink() {
+    run("readlink", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
 #[should_panic]
-async fn preview1_remove_directory_trailing_slashes() {
-    run(PREVIEW1_REMOVE_DIRECTORY_TRAILING_SLASHES, false)
+async fn remove_directory_trailing_slashes() {
+    run("remove_directory_trailing_slashes", false)
         .await
         .unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_remove_nonempty_directory() {
-    run(PREVIEW1_REMOVE_NONEMPTY_DIRECTORY, true).await.unwrap()
+async fn remove_nonempty_directory() {
+    run("remove_nonempty_directory", true).await.unwrap()
+}
+#[test_log::test(tokio::test(flavor = "multi_thread"))]
+async fn renumber() {
+    run("renumber", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_renumber() {
-    run(PREVIEW1_RENUMBER, true).await.unwrap()
+async fn sched_yield() {
+    run("sched_yield", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_sched_yield() {
-    run(PREVIEW1_SCHED_YIELD, true).await.unwrap()
+#[should_panic]
+async fn sleep() {
+    run("sleep", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_stdio() {
-    run(PREVIEW1_STDIO, true).await.unwrap()
+async fn stdio() {
+    run("stdio", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_stdio_isatty() {
+async fn stdio_isatty() {
     // Only a valid test if the host executable's stdio is a terminal:
-    if test_programs_artifacts::stdio_is_terminal() {
+    if test_programs::stdio_is_terminal() {
         // Inherit stdio, test asserts it is a tty:
-        run(PREVIEW1_STDIO_ISATTY, true).await.unwrap()
+        run("stdio_isatty", true).await.unwrap()
     }
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_stdio_not_isatty() {
+async fn stdio_not_isatty() {
     // Don't inherit stdio, test asserts each is not tty:
-    run(PREVIEW1_STDIO_NOT_ISATTY, false).await.unwrap()
+    run("stdio_not_isatty", false).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_symlink_create() {
-    run(PREVIEW1_SYMLINK_CREATE, true).await.unwrap()
+async fn symlink_create() {
+    run("symlink_create", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_symlink_filestat() {
-    run(PREVIEW1_SYMLINK_FILESTAT, true).await.unwrap()
+async fn symlink_filestat() {
+    run("symlink_filestat", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_symlink_loop() {
-    run(PREVIEW1_SYMLINK_LOOP, true).await.unwrap()
+async fn symlink_loop() {
+    run("symlink_loop", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_unlink_file_trailing_slashes() {
-    run(PREVIEW1_UNLINK_FILE_TRAILING_SLASHES, true)
-        .await
-        .unwrap()
+async fn unlink_file_trailing_slashes() {
+    run("unlink_file_trailing_slashes", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_open_preopen() {
-    run(PREVIEW1_PATH_OPEN_PREOPEN, true).await.unwrap()
+async fn path_open_preopen() {
+    run("path_open_preopen", true).await.unwrap()
 }
 #[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_unicode_output() {
-    run(PREVIEW1_UNICODE_OUTPUT, true).await.unwrap()
+async fn unicode_output() {
+    run("unicode_output", true).await.unwrap()
 }
diff --git a/crates/test-programs/wasi-http-tests/Cargo.toml b/crates/test-programs/wasi-http-tests/Cargo.toml
new file mode 100644
index 000000000000..a648458bedd2
--- /dev/null
+++ b/crates/test-programs/wasi-http-tests/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "wasi-http-tests"
+version = "0.0.0"
+readme = "README.md"
+edition = "2021"
+publish = false
+
+[dependencies]
+anyhow = { workspace = true }
+tokio = { workspace = true, features = ["macros", "rt"] }
+wit-bindgen = { workspace = true, default-features = false, features = [
+    "macros",
+] }
diff --git a/crates/test-programs/src/bin/http_outbound_request_get.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_get.rs
similarity index 57%
rename from crates/test-programs/src/bin/http_outbound_request_get.rs
rename to crates/test-programs/wasi-http-tests/src/bin/outbound_request_get.rs
index 49eb88d63779..0172ebba0c62 100644
--- a/crates/test-programs/src/bin/http_outbound_request_get.rs
+++ b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_get.rs
@@ -1,27 +1,31 @@
 use anyhow::Context;
-use test_programs::wasi::http::types::{Method, Scheme};
+use wasi_http_tests::bindings::wasi::http::types::{Method, Scheme};
 
 fn main() {
-    let addr = std::env::var("HTTP_SERVER").unwrap();
-    let res = test_programs::http::request(
+    wasi_http_tests::in_tokio(async { run().await })
+}
+
+async fn run() {
+    let res = wasi_http_tests::request(
         Method::Get,
         Scheme::Http,
-        &addr,
+        "localhost:3000",
         "/get?some=arg&goes=here",
         None,
         None,
     )
-    .context("/get")
+    .await
+    .context("localhost:3000 /get")
     .unwrap();
 
-    println!("{addr} /get: {res:?}");
+    println!("localhost:3000 /get: {res:?}");
     assert_eq!(res.status, 200);
     let method = res.header("x-wasmtime-test-method").unwrap();
     assert_eq!(std::str::from_utf8(method).unwrap(), "GET");
     let uri = res.header("x-wasmtime-test-uri").unwrap();
     assert_eq!(
         std::str::from_utf8(uri).unwrap(),
-        format!("http://{addr}/get?some=arg&goes=here")
+        "http://localhost:3000/get?some=arg&goes=here"
     );
     assert_eq!(res.body, b"");
 }
diff --git a/crates/test-programs/wasi-http-tests/src/bin/outbound_request_invalid_dnsname.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_invalid_dnsname.rs
new file mode 100644
index 000000000000..7c3ba5909b8f
--- /dev/null
+++ b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_invalid_dnsname.rs
@@ -0,0 +1,20 @@
+use wasi_http_tests::bindings::wasi::http::types::{Method, Scheme};
+
+fn main() {
+    wasi_http_tests::in_tokio(async { run().await })
+}
+
+async fn run() {
+    let res = wasi_http_tests::request(
+        Method::Get,
+        Scheme::Http,
+        "some.invalid.dnsname:3000",
+        "/",
+        None,
+        None,
+    )
+    .await;
+
+    let error = res.unwrap_err();
+    assert_eq!(error.to_string(), "Error::InvalidUrl(\"invalid dnsname\")");
+}
diff --git a/crates/test-programs/src/bin/http_outbound_request_invalid_port.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_invalid_port.rs
similarity index 56%
rename from crates/test-programs/src/bin/http_outbound_request_invalid_port.rs
rename to crates/test-programs/wasi-http-tests/src/bin/outbound_request_invalid_port.rs
index cb189eb931b4..88750fc3712b 100644
--- a/crates/test-programs/src/bin/http_outbound_request_invalid_port.rs
+++ b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_invalid_port.rs
@@ -1,14 +1,19 @@
-use test_programs::wasi::http::types::{Method, Scheme};
+use wasi_http_tests::bindings::wasi::http::types::{Method, Scheme};
 
 fn main() {
-    let res = test_programs::http::request(
+    wasi_http_tests::in_tokio(async { run().await })
+}
+
+async fn run() {
+    let res = wasi_http_tests::request(
         Method::Get,
         Scheme::Http,
         "localhost:99999",
         "/",
         None,
         None,
-    );
+    )
+    .await;
 
     let error = res.unwrap_err();
     assert_eq!(
diff --git a/crates/test-programs/wasi-http-tests/src/bin/outbound_request_invalid_version.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_invalid_version.rs
new file mode 100644
index 000000000000..cadabda4dec1
--- /dev/null
+++ b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_invalid_version.rs
@@ -0,0 +1,29 @@
+use wasi_http_tests::bindings::wasi::http::types::{Method, Scheme};
+
+fn main() {
+    wasi_http_tests::in_tokio(async { run().await })
+}
+
+async fn run() {
+    let res = wasi_http_tests::request(
+        Method::Connect,
+        Scheme::Http,
+        "localhost:3001",
+        "/",
+        None,
+        Some(&[]),
+    )
+    .await;
+
+    let error = res.unwrap_err().to_string();
+    if error.ne("Error::ProtocolError(\"invalid HTTP version parsed\")")
+        && error.ne("Error::ProtocolError(\"operation was canceled\")")
+    {
+        panic!(
+            r#"assertion failed: `(left == right)`
+      left: `"{error}"`,
+      right: `"Error::ProtocolError(\"invalid HTTP version parsed\")"`
+            or `"Error::ProtocolError(\"operation was canceled\")"`)"#
+        )
+    }
+}
diff --git a/crates/test-programs/src/bin/http_outbound_request_large_post.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_large_post.rs
similarity index 64%
rename from crates/test-programs/src/bin/http_outbound_request_large_post.rs
rename to crates/test-programs/wasi-http-tests/src/bin/outbound_request_large_post.rs
index 111cba139723..9f4bacef8f73 100644
--- a/crates/test-programs/src/bin/http_outbound_request_large_post.rs
+++ b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_large_post.rs
@@ -1,25 +1,29 @@
 use anyhow::Context;
 use std::io::{self, Read};
-use test_programs::wasi::http::types::{Method, Scheme};
+use wasi_http_tests::bindings::wasi::http::types::{Method, Scheme};
 
 fn main() {
+    wasi_http_tests::in_tokio(async { run().await })
+}
+
+async fn run() {
     // TODO: ensure more than 700 bytes is allowed without error
     const LEN: usize = 700;
     let mut buffer = [0; LEN];
-    let addr = std::env::var("HTTP_SERVER").unwrap();
     io::repeat(0b001).read_exact(&mut buffer).unwrap();
-    let res = test_programs::http::request(
+    let res = wasi_http_tests::request(
         Method::Post,
         Scheme::Http,
-        &addr,
+        "localhost:3000",
         "/post",
         Some(&buffer),
         None,
     )
-    .context("/post large")
+    .await
+    .context("localhost:3000 /post large")
     .unwrap();
 
-    println!("/post large: {}", res.status);
+    println!("localhost:3000 /post large: {res:?}");
     assert_eq!(res.status, 200);
     let method = res.header("x-wasmtime-test-method").unwrap();
     assert_eq!(std::str::from_utf8(method).unwrap(), "POST");
diff --git a/crates/test-programs/wasi-http-tests/src/bin/outbound_request_post.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_post.rs
new file mode 100644
index 000000000000..69a03d754ee9
--- /dev/null
+++ b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_post.rs
@@ -0,0 +1,26 @@
+use anyhow::Context;
+use wasi_http_tests::bindings::wasi::http::types::{Method, Scheme};
+
+fn main() {
+    wasi_http_tests::in_tokio(async { run().await })
+}
+
+async fn run() {
+    let res = wasi_http_tests::request(
+        Method::Post,
+        Scheme::Http,
+        "localhost:3000",
+        "/post",
+        Some(b"{\"foo\": \"bar\"}"),
+        None,
+    )
+    .await
+    .context("localhost:3000 /post")
+    .unwrap();
+
+    println!("localhost:3000 /post: {res:?}");
+    assert_eq!(res.status, 200);
+    let method = res.header("x-wasmtime-test-method").unwrap();
+    assert_eq!(std::str::from_utf8(method).unwrap(), "POST");
+    assert_eq!(res.body, b"{\"foo\": \"bar\"}");
+}
diff --git a/crates/test-programs/wasi-http-tests/src/bin/outbound_request_put.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_put.rs
new file mode 100644
index 000000000000..93bb7a053950
--- /dev/null
+++ b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_put.rs
@@ -0,0 +1,26 @@
+use anyhow::Context;
+use wasi_http_tests::bindings::wasi::http::types::{Method, Scheme};
+
+fn main() {
+    wasi_http_tests::in_tokio(async { run().await })
+}
+
+async fn run() {
+    let res = wasi_http_tests::request(
+        Method::Put,
+        Scheme::Http,
+        "localhost:3000",
+        "/put",
+        Some(&[]),
+        None,
+    )
+    .await
+    .context("localhost:3000 /put")
+    .unwrap();
+
+    println!("localhost:3000 /put: {res:?}");
+    assert_eq!(res.status, 200);
+    let method = res.header("x-wasmtime-test-method").unwrap();
+    assert_eq!(std::str::from_utf8(method).unwrap(), "PUT");
+    assert_eq!(res.body, b"");
+}
diff --git a/crates/test-programs/src/bin/http_outbound_request_unknown_method.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_unknown_method.rs
similarity index 58%
rename from crates/test-programs/src/bin/http_outbound_request_unknown_method.rs
rename to crates/test-programs/wasi-http-tests/src/bin/outbound_request_unknown_method.rs
index 6211bf0c8b99..a2ab5e48dc02 100644
--- a/crates/test-programs/src/bin/http_outbound_request_unknown_method.rs
+++ b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_unknown_method.rs
@@ -1,14 +1,19 @@
-use test_programs::wasi::http::types::{Method, Scheme};
+use wasi_http_tests::bindings::wasi::http::types::{Method, Scheme};
 
 fn main() {
-    let res = test_programs::http::request(
+    wasi_http_tests::in_tokio(async { run().await })
+}
+
+async fn run() {
+    let res = wasi_http_tests::request(
         Method::Other("OTHER".to_owned()),
         Scheme::Http,
         "localhost:3000",
         "/",
         None,
         None,
-    );
+    )
+    .await;
 
     let error = res.unwrap_err();
     assert_eq!(
diff --git a/crates/test-programs/src/bin/http_outbound_request_unsupported_scheme.rs b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_unsupported_scheme.rs
similarity index 58%
rename from crates/test-programs/src/bin/http_outbound_request_unsupported_scheme.rs
rename to crates/test-programs/wasi-http-tests/src/bin/outbound_request_unsupported_scheme.rs
index 262cb11e62f0..482550627e8d 100644
--- a/crates/test-programs/src/bin/http_outbound_request_unsupported_scheme.rs
+++ b/crates/test-programs/wasi-http-tests/src/bin/outbound_request_unsupported_scheme.rs
@@ -1,14 +1,19 @@
-use test_programs::wasi::http::types::{Method, Scheme};
+use wasi_http_tests::bindings::wasi::http::types::{Method, Scheme};
 
 fn main() {
-    let res = test_programs::http::request(
+    wasi_http_tests::in_tokio(async { run().await })
+}
+
+async fn run() {
+    let res = wasi_http_tests::request(
         Method::Get,
         Scheme::Other("WS".to_owned()),
         "localhost:3000",
         "/",
         None,
         None,
-    );
+    )
+    .await;
 
     let error = res.unwrap_err();
     assert_eq!(
diff --git a/crates/test-programs/wasi-http-tests/src/lib.rs b/crates/test-programs/wasi-http-tests/src/lib.rs
new file mode 100644
index 000000000000..e1d9fb76dd6c
--- /dev/null
+++ b/crates/test-programs/wasi-http-tests/src/lib.rs
@@ -0,0 +1,197 @@
+pub mod bindings {
+    wit_bindgen::generate!({
+        path: "../../wasi-http/wit",
+        world: "wasmtime:wasi/command-extended",
+        // macro_call_prefix: "::wasi_http_tests::bindings::",
+        // macro_export,
+    });
+}
+
+use anyhow::{anyhow, Result};
+use std::fmt;
+use std::sync::OnceLock;
+
+use bindings::wasi::http::{outgoing_handler, types as http_types};
+use bindings::wasi::io::streams;
+use bindings::wasi::poll::poll;
+
+pub struct Response {
+    pub status: http_types::StatusCode,
+    pub headers: Vec<(String, Vec<u8>)>,
+    pub body: Vec<u8>,
+}
+impl fmt::Debug for Response {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let mut out = f.debug_struct("Response");
+        out.field("status", &self.status)
+            .field("headers", &self.headers);
+        if let Ok(body) = std::str::from_utf8(&self.body) {
+            out.field("body", &body);
+        } else {
+            out.field("body", &self.body);
+        }
+        out.finish()
+    }
+}
+
+impl Response {
+    pub fn header(&self, name: &str) -> Option<&Vec<u8>> {
+        self.headers
+            .iter()
+            .find_map(|(k, v)| if k == name { Some(v) } else { None })
+    }
+}
+
+struct DropPollable {
+    pollable: poll::Pollable,
+}
+
+impl Drop for DropPollable {
+    fn drop(&mut self) {
+        poll::drop_pollable(self.pollable);
+    }
+}
+
+pub async fn request(
+    method: http_types::Method,
+    scheme: http_types::Scheme,
+    authority: &str,
+    path_with_query: &str,
+    body: Option<&[u8]>,
+    additional_headers: Option<&[(String, String)]>,
+) -> Result<Response> {
+    let headers = http_types::new_fields(
+        &[
+            &[
+                ("User-agent".to_string(), "WASI-HTTP/0.0.1".to_string()),
+                ("Content-type".to_string(), "application/json".to_string()),
+            ],
+            additional_headers.unwrap_or(&[]),
+        ]
+        .concat(),
+    );
+
+    let request = http_types::new_outgoing_request(
+        &method,
+        Some(path_with_query),
+        Some(&scheme),
+        Some(authority),
+        headers,
+    );
+
+    let request_body = http_types::outgoing_request_write(request)
+        .map_err(|_| anyhow!("outgoing request write failed"))?;
+
+    if let Some(mut buf) = body {
+        let sub = DropPollable {
+            pollable: streams::subscribe_to_output_stream(request_body),
+        };
+        while !buf.is_empty() {
+            poll::poll_oneoff(&[sub.pollable]);
+
+            let permit = match streams::check_write(request_body) {
+                Ok(n) => n,
+                Err(_) => anyhow::bail!("output stream error"),
+            };
+
+            let len = buf.len().min(permit as usize);
+            let (chunk, rest) = buf.split_at(len);
+            buf = rest;
+
+            match streams::write(request_body, chunk) {
+                Err(_) => anyhow::bail!("output stream error"),
+                _ => {}
+            }
+        }
+
+        match streams::flush(request_body) {
+            Err(_) => anyhow::bail!("output stream error"),
+            _ => {}
+        }
+
+        poll::poll_oneoff(&[sub.pollable]);
+
+        match streams::check_write(request_body) {
+            Ok(_) => {}
+            Err(_) => anyhow::bail!("output stream error"),
+        };
+    }
+
+    let future_response = outgoing_handler::handle(request, None);
+
+    let incoming_response = match http_types::future_incoming_response_get(future_response) {
+        Some(result) => result,
+        None => {
+            let pollable = http_types::listen_to_future_incoming_response(future_response);
+            let _ = poll::poll_oneoff(&[pollable]);
+            http_types::future_incoming_response_get(future_response)
+                .expect("incoming response available")
+        }
+    }
+    // TODO: maybe anything that appears in the Result<_, E> position should impl
+    // Error? anyway, just use its Debug here:
+    .map_err(|e| anyhow!("{e:?}"))?;
+
+    // TODO: The current implementation requires this drop after the request is sent.
+    // The ownership semantics are unclear in wasi-http we should clarify exactly what is
+    // supposed to happen here.
+    streams::drop_output_stream(request_body);
+
+    http_types::drop_outgoing_request(request);
+
+    http_types::drop_future_incoming_response(future_response);
+
+    let status = http_types::incoming_response_status(incoming_response);
+
+    let headers_handle = http_types::incoming_response_headers(incoming_response);
+    let headers = http_types::fields_entries(headers_handle);
+    http_types::drop_fields(headers_handle);
+
+    let body_stream = http_types::incoming_response_consume(incoming_response)
+        .map_err(|()| anyhow!("incoming response has no body stream"))?;
+    let input_stream_pollable = streams::subscribe_to_input_stream(body_stream);
+
+    let mut body = Vec::new();
+    let mut eof = streams::StreamStatus::Open;
+    while eof != streams::StreamStatus::Ended {
+        let (mut body_chunk, stream_status) =
+            streams::read(body_stream, u64::MAX).map_err(|_| anyhow!("body_stream read failed"))?;
+        eof = if body_chunk.is_empty() {
+            streams::StreamStatus::Ended
+        } else {
+            stream_status
+        };
+        body.append(&mut body_chunk);
+    }
+
+    poll::drop_pollable(input_stream_pollable);
+    streams::drop_input_stream(body_stream);
+    http_types::drop_incoming_response(incoming_response);
+
+    Ok(Response {
+        status,
+        headers,
+        body,
+    })
+}
+
+static RUNTIME: OnceLock<tokio::runtime::Runtime> = OnceLock::new();
+
+pub fn in_tokio<F: std::future::Future>(f: F) -> F::Output {
+    match tokio::runtime::Handle::try_current() {
+        Ok(h) => {
+            let _enter = h.enter();
+            h.block_on(f)
+        }
+        Err(_) => {
+            let runtime = RUNTIME.get_or_init(|| {
+                tokio::runtime::Builder::new_current_thread()
+                    .enable_all()
+                    .build()
+                    .unwrap()
+            });
+            let _enter = runtime.enter();
+            runtime.block_on(f)
+        }
+    }
+}
diff --git a/crates/test-programs/wasi-sockets-tests/Cargo.toml b/crates/test-programs/wasi-sockets-tests/Cargo.toml
new file mode 100644
index 000000000000..3dcc85370173
--- /dev/null
+++ b/crates/test-programs/wasi-sockets-tests/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "wasi-sockets-tests"
+version = "0.0.0"
+readme = "README.md"
+edition = "2021"
+publish = false
+
+[dependencies]
+anyhow = { workspace = true }
+wit-bindgen = { workspace = true, default-features = false, features = ["macros"] }
diff --git a/crates/test-programs/wasi-sockets-tests/src/bin/tcp_v4.rs b/crates/test-programs/wasi-sockets-tests/src/bin/tcp_v4.rs
new file mode 100644
index 000000000000..2388cb074afe
--- /dev/null
+++ b/crates/test-programs/wasi-sockets-tests/src/bin/tcp_v4.rs
@@ -0,0 +1,27 @@
+//! A simple TCP testcase, using IPv4.
+
+use wasi::sockets::network::{IpAddressFamily, IpSocketAddress, Ipv4SocketAddress};
+use wasi::sockets::{instance_network, tcp, tcp_create_socket};
+use wasi_sockets_tests::*;
+
+fn main() {
+    let net = instance_network::instance_network();
+
+    let sock = tcp_create_socket::create_tcp_socket(IpAddressFamily::Ipv4).unwrap();
+
+    let addr = IpSocketAddress::Ipv4(Ipv4SocketAddress {
+        port: 0,                 // use any free port
+        address: (127, 0, 0, 1), // localhost
+    });
+
+    let sub = tcp::subscribe(sock);
+
+    tcp::start_bind(sock, net, addr).unwrap();
+
+    wait(sub);
+    wasi::poll::poll::drop_pollable(sub);
+
+    tcp::finish_bind(sock).unwrap();
+
+    example_body(net, sock, IpAddressFamily::Ipv4)
+}
diff --git a/crates/test-programs/wasi-sockets-tests/src/bin/tcp_v6.rs b/crates/test-programs/wasi-sockets-tests/src/bin/tcp_v6.rs
new file mode 100644
index 000000000000..b5ff8358cc09
--- /dev/null
+++ b/crates/test-programs/wasi-sockets-tests/src/bin/tcp_v6.rs
@@ -0,0 +1,29 @@
+//! Like v4.rs, but with IPv6.
+
+use wasi::sockets::network::{IpAddressFamily, IpSocketAddress, Ipv6SocketAddress};
+use wasi::sockets::{instance_network, tcp, tcp_create_socket};
+use wasi_sockets_tests::*;
+
+fn main() {
+    let net = instance_network::instance_network();
+
+    let sock = tcp_create_socket::create_tcp_socket(IpAddressFamily::Ipv6).unwrap();
+
+    let addr = IpSocketAddress::Ipv6(Ipv6SocketAddress {
+        port: 0,                           // use any free port
+        address: (0, 0, 0, 0, 0, 0, 0, 1), // localhost
+        flow_info: 0,
+        scope_id: 0,
+    });
+
+    let sub = tcp::subscribe(sock);
+
+    tcp::start_bind(sock, net, addr).unwrap();
+
+    wait(sub);
+    wasi::poll::poll::drop_pollable(sub);
+
+    tcp::finish_bind(sock).unwrap();
+
+    example_body(net, sock, IpAddressFamily::Ipv6)
+}
diff --git a/crates/test-programs/wasi-sockets-tests/src/lib.rs b/crates/test-programs/wasi-sockets-tests/src/lib.rs
new file mode 100644
index 000000000000..fb06654c313a
--- /dev/null
+++ b/crates/test-programs/wasi-sockets-tests/src/lib.rs
@@ -0,0 +1,143 @@
+wit_bindgen::generate!("test-command-with-sockets" in "../../wasi/wit");
+
+use wasi::io::streams;
+use wasi::poll::poll;
+use wasi::sockets::{network, tcp, tcp_create_socket};
+
+pub fn wait(sub: poll::Pollable) {
+    loop {
+        let wait = poll::poll_oneoff(&[sub]);
+        if wait[0] {
+            break;
+        }
+    }
+}
+
+pub struct DropPollable {
+    pub pollable: poll::Pollable,
+}
+
+impl Drop for DropPollable {
+    fn drop(&mut self) {
+        poll::drop_pollable(self.pollable);
+    }
+}
+
+pub fn write(output: streams::OutputStream, mut bytes: &[u8]) -> (usize, streams::StreamStatus) {
+    let total = bytes.len();
+    let mut written = 0;
+
+    let s = DropPollable {
+        pollable: streams::subscribe_to_output_stream(output),
+    };
+
+    while !bytes.is_empty() {
+        poll::poll_oneoff(&[s.pollable]);
+
+        let permit = match streams::check_write(output) {
+            Ok(n) => n,
+            Err(_) => return (written, streams::StreamStatus::Ended),
+        };
+
+        let len = bytes.len().min(permit as usize);
+        let (chunk, rest) = bytes.split_at(len);
+
+        match streams::write(output, chunk) {
+            Ok(()) => {}
+            Err(_) => return (written, streams::StreamStatus::Ended),
+        }
+
+        match streams::blocking_flush(output) {
+            Ok(()) => {}
+            Err(_) => return (written, streams::StreamStatus::Ended),
+        }
+
+        bytes = rest;
+        written += len;
+    }
+
+    (total, streams::StreamStatus::Open)
+}
+
+pub fn example_body(net: tcp::Network, sock: tcp::TcpSocket, family: network::IpAddressFamily) {
+    let first_message = b"Hello, world!";
+    let second_message = b"Greetings, planet!";
+
+    let sub = tcp::subscribe(sock);
+
+    tcp::start_listen(sock).unwrap();
+    wait(sub);
+    tcp::finish_listen(sock).unwrap();
+
+    let addr = tcp::local_address(sock).unwrap();
+
+    let client = tcp_create_socket::create_tcp_socket(family).unwrap();
+    let client_sub = tcp::subscribe(client);
+
+    tcp::start_connect(client, net, addr).unwrap();
+    wait(client_sub);
+    let (client_input, client_output) = tcp::finish_connect(client).unwrap();
+
+    let (n, status) = write(client_output, &[]);
+    assert_eq!(n, 0);
+    assert_eq!(status, streams::StreamStatus::Open);
+
+    let (n, status) = write(client_output, first_message);
+    assert_eq!(n, first_message.len());
+    assert_eq!(status, streams::StreamStatus::Open);
+
+    streams::drop_input_stream(client_input);
+    streams::drop_output_stream(client_output);
+    poll::drop_pollable(client_sub);
+    tcp::drop_tcp_socket(client);
+
+    wait(sub);
+    let (accepted, input, output) = tcp::accept(sock).unwrap();
+
+    let (empty_data, status) = streams::read(input, 0).unwrap();
+    assert!(empty_data.is_empty());
+    assert_eq!(status, streams::StreamStatus::Open);
+
+    let (data, status) = streams::blocking_read(input, first_message.len() as u64).unwrap();
+    assert_eq!(status, streams::StreamStatus::Open);
+
+    streams::drop_input_stream(input);
+    streams::drop_output_stream(output);
+    tcp::drop_tcp_socket(accepted);
+
+    // Check that we sent and recieved our message!
+    assert_eq!(data, first_message); // Not guaranteed to work but should work in practice.
+
+    // Another client
+    let client = tcp_create_socket::create_tcp_socket(family).unwrap();
+    let client_sub = tcp::subscribe(client);
+
+    tcp::start_connect(client, net, addr).unwrap();
+    wait(client_sub);
+    let (client_input, client_output) = tcp::finish_connect(client).unwrap();
+
+    let (n, status) = write(client_output, second_message);
+    assert_eq!(n, second_message.len());
+    assert_eq!(status, streams::StreamStatus::Open);
+
+    streams::drop_input_stream(client_input);
+    streams::drop_output_stream(client_output);
+    poll::drop_pollable(client_sub);
+    tcp::drop_tcp_socket(client);
+
+    wait(sub);
+    let (accepted, input, output) = tcp::accept(sock).unwrap();
+    let (data, status) = streams::blocking_read(input, second_message.len() as u64).unwrap();
+    assert_eq!(status, streams::StreamStatus::Open);
+
+    streams::drop_input_stream(input);
+    streams::drop_output_stream(output);
+    tcp::drop_tcp_socket(accepted);
+
+    // Check that we sent and recieved our message!
+    assert_eq!(data, second_message); // Not guaranteed to work but should work in practice.
+
+    poll::drop_pollable(sub);
+    tcp::drop_tcp_socket(sock);
+    network::drop_network(net);
+}
diff --git a/crates/test-programs/wasi-tests/Cargo.toml b/crates/test-programs/wasi-tests/Cargo.toml
new file mode 100644
index 000000000000..bf72d58ea313
--- /dev/null
+++ b/crates/test-programs/wasi-tests/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "wasi-tests"
+version = "0.0.0"
+readme = "README.md"
+edition = "2021"
+publish = false
+
+[dependencies]
+libc = "0.2.65"
+wasi = "0.11.0"
+once_cell = "1.12"
+wit-bindgen = { workspace = true, default-features = false, features = [
+    "macros",
+] }
diff --git a/crates/test-programs/wasi-tests/README.md b/crates/test-programs/wasi-tests/README.md
new file mode 100644
index 000000000000..f281fa1a8edc
--- /dev/null
+++ b/crates/test-programs/wasi-tests/README.md
@@ -0,0 +1,3 @@
+This is the `wasi-tests` crate, which contains source code for the system-level WASI tests.
+
+Building these tests requires that the `wasm32-wasi` target be installed.
diff --git a/crates/test-programs/src/bin/preview1_big_random_buf.rs b/crates/test-programs/wasi-tests/src/bin/big_random_buf.rs
similarity index 100%
rename from crates/test-programs/src/bin/preview1_big_random_buf.rs
rename to crates/test-programs/wasi-tests/src/bin/big_random_buf.rs
diff --git a/crates/test-programs/src/bin/preview1_clock_time_get.rs b/crates/test-programs/wasi-tests/src/bin/clock_time_get.rs
similarity index 100%
rename from crates/test-programs/src/bin/preview1_clock_time_get.rs
rename to crates/test-programs/wasi-tests/src/bin/clock_time_get.rs
diff --git a/crates/test-programs/src/bin/preview1_close_preopen.rs b/crates/test-programs/wasi-tests/src/bin/close_preopen.rs
similarity index 94%
rename from crates/test-programs/src/bin/preview1_close_preopen.rs
rename to crates/test-programs/wasi-tests/src/bin/close_preopen.rs
index 9412d234bb6f..2d8f3a344fe3 100644
--- a/crates/test-programs/src/bin/preview1_close_preopen.rs
+++ b/crates/test-programs/wasi-tests/src/bin/close_preopen.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, open_scratch_directory};
+use wasi_tests::{assert_errno, open_scratch_directory};
 
 unsafe fn test_close_preopen(dir_fd: wasi::Fd) {
     let pre_fd: wasi::Fd = (libc::STDERR_FILENO + 1) as wasi::Fd;
diff --git a/crates/test-programs/src/bin/preview1_dangling_fd.rs b/crates/test-programs/wasi-tests/src/bin/dangling_fd.rs
similarity index 94%
rename from crates/test-programs/src/bin/preview1_dangling_fd.rs
rename to crates/test-programs/wasi-tests/src/bin/dangling_fd.rs
index f47caef37dcd..3d29c4fc7e5a 100644
--- a/crates/test-programs/src/bin/preview1_dangling_fd.rs
+++ b/crates/test-programs/wasi-tests/src/bin/dangling_fd.rs
@@ -1,8 +1,8 @@
 use std::{env, process};
-use test_programs::preview1::{config, open_scratch_directory};
+use wasi_tests::{open_scratch_directory, TESTCONFIG};
 
 unsafe fn test_dangling_fd(dir_fd: wasi::Fd) {
-    if config().support_dangling_filesystem() {
+    if TESTCONFIG.support_dangling_filesystem() {
         // Create a file, open it, delete it without closing the handle,
         // and then try creating it again
         let fd = wasi::path_open(dir_fd, 0, "file", wasi::OFLAGS_CREAT, 0, 0, 0).unwrap();
diff --git a/crates/test-programs/src/bin/preview1_dangling_symlink.rs b/crates/test-programs/wasi-tests/src/bin/dangling_symlink.rs
similarity index 91%
rename from crates/test-programs/src/bin/preview1_dangling_symlink.rs
rename to crates/test-programs/wasi-tests/src/bin/dangling_symlink.rs
index 8b3fc9bc8a5c..f7538fc979f2 100644
--- a/crates/test-programs/src/bin/preview1_dangling_symlink.rs
+++ b/crates/test-programs/wasi-tests/src/bin/dangling_symlink.rs
@@ -1,8 +1,8 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, config, open_scratch_directory};
+use wasi_tests::{assert_errno, open_scratch_directory, TESTCONFIG};
 
 unsafe fn test_dangling_symlink(dir_fd: wasi::Fd) {
-    if config().support_dangling_filesystem() {
+    if TESTCONFIG.support_dangling_filesystem() {
         // First create a dangling symlink.
         wasi::path_symlink("target", dir_fd, "symlink").expect("creating a symlink");
 
diff --git a/crates/test-programs/src/bin/preview1_dir_fd_op_failures.rs b/crates/test-programs/wasi-tests/src/bin/dir_fd_op_failures.rs
similarity index 98%
rename from crates/test-programs/src/bin/preview1_dir_fd_op_failures.rs
rename to crates/test-programs/wasi-tests/src/bin/dir_fd_op_failures.rs
index 77a84f4104a3..bb081c6960f1 100644
--- a/crates/test-programs/src/bin/preview1_dir_fd_op_failures.rs
+++ b/crates/test-programs/wasi-tests/src/bin/dir_fd_op_failures.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::open_scratch_directory;
+use wasi_tests::open_scratch_directory;
 
 unsafe fn test_fd_dir_ops(dir_fd: wasi::Fd) {
     let stat = wasi::fd_filestat_get(dir_fd).expect("failed to fdstat");
diff --git a/crates/test-programs/src/bin/preview1_directory_seek.rs b/crates/test-programs/wasi-tests/src/bin/directory_seek.rs
similarity index 95%
rename from crates/test-programs/src/bin/preview1_directory_seek.rs
rename to crates/test-programs/wasi-tests/src/bin/directory_seek.rs
index c7fe6ed9f44a..dc4fd52fb52f 100644
--- a/crates/test-programs/src/bin/preview1_directory_seek.rs
+++ b/crates/test-programs/wasi-tests/src/bin/directory_seek.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, open_scratch_directory};
+use wasi_tests::{assert_errno, open_scratch_directory};
 
 unsafe fn test_directory_seek(dir_fd: wasi::Fd) {
     // Create a directory in the scratch directory.
diff --git a/crates/test-programs/src/bin/preview1_fd_advise.rs b/crates/test-programs/wasi-tests/src/bin/fd_advise.rs
similarity index 97%
rename from crates/test-programs/src/bin/preview1_fd_advise.rs
rename to crates/test-programs/wasi-tests/src/bin/fd_advise.rs
index 89c045782487..78a048db0f9e 100644
--- a/crates/test-programs/src/bin/preview1_fd_advise.rs
+++ b/crates/test-programs/wasi-tests/src/bin/fd_advise.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::open_scratch_directory;
+use wasi_tests::open_scratch_directory;
 
 unsafe fn test_fd_advise(dir_fd: wasi::Fd) {
     // Create a file in the scratch directory.
diff --git a/crates/test-programs/src/bin/preview1_fd_filestat_get.rs b/crates/test-programs/wasi-tests/src/bin/fd_filestat_get.rs
similarity index 100%
rename from crates/test-programs/src/bin/preview1_fd_filestat_get.rs
rename to crates/test-programs/wasi-tests/src/bin/fd_filestat_get.rs
diff --git a/crates/test-programs/src/bin/preview1_fd_filestat_set.rs b/crates/test-programs/wasi-tests/src/bin/fd_filestat_set.rs
similarity index 97%
rename from crates/test-programs/src/bin/preview1_fd_filestat_set.rs
rename to crates/test-programs/wasi-tests/src/bin/fd_filestat_set.rs
index b72dec0afe67..de358dfff23e 100644
--- a/crates/test-programs/src/bin/preview1_fd_filestat_set.rs
+++ b/crates/test-programs/wasi-tests/src/bin/fd_filestat_set.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::open_scratch_directory;
+use wasi_tests::open_scratch_directory;
 
 unsafe fn test_fd_filestat_set(dir_fd: wasi::Fd) {
     // Create a file in the scratch directory.
diff --git a/crates/test-programs/src/bin/preview1_fd_flags_set.rs b/crates/test-programs/wasi-tests/src/bin/fd_flags_set.rs
similarity index 98%
rename from crates/test-programs/src/bin/preview1_fd_flags_set.rs
rename to crates/test-programs/wasi-tests/src/bin/fd_flags_set.rs
index d465990bd6fc..9a21fc465f42 100644
--- a/crates/test-programs/src/bin/preview1_fd_flags_set.rs
+++ b/crates/test-programs/wasi-tests/src/bin/fd_flags_set.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::open_scratch_directory;
+use wasi_tests::open_scratch_directory;
 
 unsafe fn test_fd_fdstat_set_flags(dir_fd: wasi::Fd) {
     const FILE_NAME: &str = "file";
diff --git a/crates/test-programs/src/bin/preview1_fd_readdir.rs b/crates/test-programs/wasi-tests/src/bin/fd_readdir.rs
similarity index 99%
rename from crates/test-programs/src/bin/preview1_fd_readdir.rs
rename to crates/test-programs/wasi-tests/src/bin/fd_readdir.rs
index 187610c73342..3045f166b0c6 100644
--- a/crates/test-programs/src/bin/preview1_fd_readdir.rs
+++ b/crates/test-programs/wasi-tests/src/bin/fd_readdir.rs
@@ -1,5 +1,5 @@
 use std::{env, mem, process, slice, str};
-use test_programs::preview1::open_scratch_directory;
+use wasi_tests::open_scratch_directory;
 
 const BUF_LEN: usize = 256;
 
diff --git a/crates/test-programs/src/bin/preview1_file_allocate.rs b/crates/test-programs/wasi-tests/src/bin/file_allocate.rs
similarity index 96%
rename from crates/test-programs/src/bin/preview1_file_allocate.rs
rename to crates/test-programs/wasi-tests/src/bin/file_allocate.rs
index a46f6ef46f72..356563015b30 100644
--- a/crates/test-programs/src/bin/preview1_file_allocate.rs
+++ b/crates/test-programs/wasi-tests/src/bin/file_allocate.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::open_scratch_directory;
+use wasi_tests::open_scratch_directory;
 
 unsafe fn test_file_allocate(dir_fd: wasi::Fd) {
     // Create a file in the scratch directory.
diff --git a/crates/test-programs/src/bin/preview1_file_pread_pwrite.rs b/crates/test-programs/wasi-tests/src/bin/file_pread_pwrite.rs
similarity index 98%
rename from crates/test-programs/src/bin/preview1_file_pread_pwrite.rs
rename to crates/test-programs/wasi-tests/src/bin/file_pread_pwrite.rs
index ef55362d0288..918fec842bf1 100644
--- a/crates/test-programs/src/bin/preview1_file_pread_pwrite.rs
+++ b/crates/test-programs/wasi-tests/src/bin/file_pread_pwrite.rs
@@ -1,6 +1,6 @@
 use std::convert::TryInto;
 use std::{env, process};
-use test_programs::preview1::open_scratch_directory;
+use wasi_tests::open_scratch_directory;
 
 unsafe fn test_file_pread_pwrite(dir_fd: wasi::Fd) {
     // Create a file in the scratch directory.
diff --git a/crates/test-programs/src/bin/preview1_file_seek_tell.rs b/crates/test-programs/wasi-tests/src/bin/file_seek_tell.rs
similarity index 97%
rename from crates/test-programs/src/bin/preview1_file_seek_tell.rs
rename to crates/test-programs/wasi-tests/src/bin/file_seek_tell.rs
index 70bd6e9b9498..a54fe14ab05c 100644
--- a/crates/test-programs/src/bin/preview1_file_seek_tell.rs
+++ b/crates/test-programs/wasi-tests/src/bin/file_seek_tell.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, open_scratch_directory};
+use wasi_tests::{assert_errno, open_scratch_directory};
 
 unsafe fn test_file_seek_tell(dir_fd: wasi::Fd) {
     // Create a file in the scratch directory.
diff --git a/crates/test-programs/src/bin/preview1_file_truncation.rs b/crates/test-programs/wasi-tests/src/bin/file_truncation.rs
similarity index 97%
rename from crates/test-programs/src/bin/preview1_file_truncation.rs
rename to crates/test-programs/wasi-tests/src/bin/file_truncation.rs
index 73fa8c2e0b79..35f511448ac7 100644
--- a/crates/test-programs/src/bin/preview1_file_truncation.rs
+++ b/crates/test-programs/wasi-tests/src/bin/file_truncation.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::open_scratch_directory;
+use wasi_tests::open_scratch_directory;
 
 unsafe fn test_file_truncation(dir_fd: wasi::Fd) {
     const FILENAME: &str = "test.txt";
diff --git a/crates/test-programs/src/bin/preview1_file_unbuffered_write.rs b/crates/test-programs/wasi-tests/src/bin/file_unbuffered_write.rs
similarity index 97%
rename from crates/test-programs/src/bin/preview1_file_unbuffered_write.rs
rename to crates/test-programs/wasi-tests/src/bin/file_unbuffered_write.rs
index 289e755ee573..8056834fb347 100644
--- a/crates/test-programs/src/bin/preview1_file_unbuffered_write.rs
+++ b/crates/test-programs/wasi-tests/src/bin/file_unbuffered_write.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::open_scratch_directory;
+use wasi_tests::open_scratch_directory;
 
 unsafe fn test_file_unbuffered_write(dir_fd: wasi::Fd) {
     // Create and open file for reading
diff --git a/crates/test-programs/src/bin/preview1_interesting_paths.rs b/crates/test-programs/wasi-tests/src/bin/interesting_paths.rs
similarity index 97%
rename from crates/test-programs/src/bin/preview1_interesting_paths.rs
rename to crates/test-programs/wasi-tests/src/bin/interesting_paths.rs
index 264388233249..16954c92fd4f 100644
--- a/crates/test-programs/src/bin/preview1_interesting_paths.rs
+++ b/crates/test-programs/wasi-tests/src/bin/interesting_paths.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, create_file, open_scratch_directory};
+use wasi_tests::{assert_errno, create_file, open_scratch_directory};
 
 unsafe fn test_interesting_paths(dir_fd: wasi::Fd, arg: &str) {
     // Create a directory in the scratch directory.
diff --git a/crates/test-programs/src/bin/preview1_nofollow_errors.rs b/crates/test-programs/wasi-tests/src/bin/nofollow_errors.rs
similarity index 98%
rename from crates/test-programs/src/bin/preview1_nofollow_errors.rs
rename to crates/test-programs/wasi-tests/src/bin/nofollow_errors.rs
index b0d1b078c181..86c6f385896b 100644
--- a/crates/test-programs/src/bin/preview1_nofollow_errors.rs
+++ b/crates/test-programs/wasi-tests/src/bin/nofollow_errors.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, open_scratch_directory};
+use wasi_tests::{assert_errno, open_scratch_directory};
 
 unsafe fn test_nofollow_errors(dir_fd: wasi::Fd) {
     // Create a directory for the symlink to point to.
diff --git a/crates/test-programs/src/bin/preview1_overwrite_preopen.rs b/crates/test-programs/wasi-tests/src/bin/overwrite_preopen.rs
similarity index 95%
rename from crates/test-programs/src/bin/preview1_overwrite_preopen.rs
rename to crates/test-programs/wasi-tests/src/bin/overwrite_preopen.rs
index 29da29b9eea3..0721d18ab1bd 100644
--- a/crates/test-programs/src/bin/preview1_overwrite_preopen.rs
+++ b/crates/test-programs/wasi-tests/src/bin/overwrite_preopen.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, open_scratch_directory};
+use wasi_tests::{assert_errno, open_scratch_directory};
 
 unsafe fn test_overwrite_preopen(dir_fd: wasi::Fd) {
     let pre_fd: wasi::Fd = (libc::STDERR_FILENO + 1) as wasi::Fd;
diff --git a/crates/test-programs/src/bin/preview1_path_exists.rs b/crates/test-programs/wasi-tests/src/bin/path_exists.rs
similarity index 97%
rename from crates/test-programs/src/bin/preview1_path_exists.rs
rename to crates/test-programs/wasi-tests/src/bin/path_exists.rs
index 2dda3236328b..c4d7a04667cf 100644
--- a/crates/test-programs/src/bin/preview1_path_exists.rs
+++ b/crates/test-programs/wasi-tests/src/bin/path_exists.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{create_file, open_scratch_directory};
+use wasi_tests::{create_file, open_scratch_directory};
 
 unsafe fn test_path_exists(dir_fd: wasi::Fd) {
     // Create a temporary directory
diff --git a/crates/test-programs/src/bin/preview1_path_filestat.rs b/crates/test-programs/wasi-tests/src/bin/path_filestat.rs
similarity index 94%
rename from crates/test-programs/src/bin/preview1_path_filestat.rs
rename to crates/test-programs/wasi-tests/src/bin/path_filestat.rs
index 9901dba3546e..2c4b63a93e8c 100644
--- a/crates/test-programs/src/bin/preview1_path_filestat.rs
+++ b/crates/test-programs/wasi-tests/src/bin/path_filestat.rs
@@ -1,8 +1,8 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, config, open_scratch_directory};
+use wasi_tests::{assert_errno, open_scratch_directory, TESTCONFIG};
 
 unsafe fn test_path_filestat(dir_fd: wasi::Fd) {
-    let fdflags = if config().support_fdflags_sync() {
+    let fdflags = if TESTCONFIG.support_fdflags_sync() {
         wasi::FDFLAGS_APPEND | wasi::FDFLAGS_SYNC
     } else {
         wasi::FDFLAGS_APPEND
@@ -31,7 +31,7 @@ unsafe fn test_path_filestat(dir_fd: wasi::Fd) {
         wasi::FDFLAGS_APPEND,
         "file should have the APPEND fdflag used to create the file"
     );
-    if config().support_fdflags_sync() {
+    if TESTCONFIG.support_fdflags_sync() {
         assert_eq!(
             fdstat.fs_flags & wasi::FDFLAGS_SYNC,
             wasi::FDFLAGS_SYNC,
@@ -39,7 +39,7 @@ unsafe fn test_path_filestat(dir_fd: wasi::Fd) {
         );
     }
 
-    if !config().support_fdflags_sync() {
+    if !TESTCONFIG.support_fdflags_sync() {
         assert_errno!(
             wasi::path_open(
                 dir_fd,
diff --git a/crates/test-programs/src/bin/preview1_path_link.rs b/crates/test-programs/wasi-tests/src/bin/path_link.rs
similarity index 98%
rename from crates/test-programs/src/bin/preview1_path_link.rs
rename to crates/test-programs/wasi-tests/src/bin/path_link.rs
index b087e0740003..161d865df568 100644
--- a/crates/test-programs/src/bin/preview1_path_link.rs
+++ b/crates/test-programs/wasi-tests/src/bin/path_link.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, config, create_file, open_scratch_directory};
+use wasi_tests::{assert_errno, create_file, open_scratch_directory, TESTCONFIG};
 
 unsafe fn create_or_open(dir_fd: wasi::Fd, name: &str, flags: wasi::Oflags) -> wasi::Fd {
     let file_fd = wasi::path_open(dir_fd, 0, name, flags, 0, 0, 0)
@@ -136,7 +136,7 @@ unsafe fn test_path_link(dir_fd: wasi::Fd) {
         wasi::ERRNO_NOENT
     );
 
-    if config().support_dangling_filesystem() {
+    if TESTCONFIG.support_dangling_filesystem() {
         // Create a link to a dangling symlink
         wasi::path_symlink("target", dir_fd, "symlink").expect("creating a dangling symlink");
 
diff --git a/crates/test-programs/src/bin/preview1_path_open_create_existing.rs b/crates/test-programs/wasi-tests/src/bin/path_open_create_existing.rs
similarity index 92%
rename from crates/test-programs/src/bin/preview1_path_open_create_existing.rs
rename to crates/test-programs/wasi-tests/src/bin/path_open_create_existing.rs
index ed4f4f748c6b..5c4cca201689 100644
--- a/crates/test-programs/src/bin/preview1_path_open_create_existing.rs
+++ b/crates/test-programs/wasi-tests/src/bin/path_open_create_existing.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, create_file, open_scratch_directory};
+use wasi_tests::{assert_errno, create_file, open_scratch_directory};
 
 unsafe fn test_path_open_create_existing(dir_fd: wasi::Fd) {
     create_file(dir_fd, "file");
diff --git a/crates/test-programs/src/bin/preview1_path_open_dirfd_not_dir.rs b/crates/test-programs/wasi-tests/src/bin/path_open_dirfd_not_dir.rs
similarity index 93%
rename from crates/test-programs/src/bin/preview1_path_open_dirfd_not_dir.rs
rename to crates/test-programs/wasi-tests/src/bin/path_open_dirfd_not_dir.rs
index b95404df5c0f..74a0d57d2580 100644
--- a/crates/test-programs/src/bin/preview1_path_open_dirfd_not_dir.rs
+++ b/crates/test-programs/wasi-tests/src/bin/path_open_dirfd_not_dir.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, open_scratch_directory};
+use wasi_tests::{assert_errno, open_scratch_directory};
 
 unsafe fn test_dirfd_not_dir(dir_fd: wasi::Fd) {
     // Open a file.
diff --git a/crates/test-programs/src/bin/preview1_path_open_missing.rs b/crates/test-programs/wasi-tests/src/bin/path_open_missing.rs
similarity index 92%
rename from crates/test-programs/src/bin/preview1_path_open_missing.rs
rename to crates/test-programs/wasi-tests/src/bin/path_open_missing.rs
index 221c71eb6b76..3f56f8d75dc4 100644
--- a/crates/test-programs/src/bin/preview1_path_open_missing.rs
+++ b/crates/test-programs/wasi-tests/src/bin/path_open_missing.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, open_scratch_directory};
+use wasi_tests::{assert_errno, open_scratch_directory};
 
 unsafe fn test_path_open_missing(dir_fd: wasi::Fd) {
     assert_errno!(
diff --git a/crates/test-programs/src/bin/preview1_path_open_nonblock.rs b/crates/test-programs/wasi-tests/src/bin/path_open_nonblock.rs
similarity index 93%
rename from crates/test-programs/src/bin/preview1_path_open_nonblock.rs
rename to crates/test-programs/wasi-tests/src/bin/path_open_nonblock.rs
index f3a14905b7fb..3ca99418117b 100644
--- a/crates/test-programs/src/bin/preview1_path_open_nonblock.rs
+++ b/crates/test-programs/wasi-tests/src/bin/path_open_nonblock.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::open_scratch_directory;
+use wasi_tests::open_scratch_directory;
 
 unsafe fn try_path_open(dir_fd: wasi::Fd) {
     let _fd =
diff --git a/crates/test-programs/src/bin/preview1_path_open_preopen.rs b/crates/test-programs/wasi-tests/src/bin/path_open_preopen.rs
similarity index 98%
rename from crates/test-programs/src/bin/preview1_path_open_preopen.rs
rename to crates/test-programs/wasi-tests/src/bin/path_open_preopen.rs
index 218446bd8a51..cb8e07490f6d 100644
--- a/crates/test-programs/src/bin/preview1_path_open_preopen.rs
+++ b/crates/test-programs/wasi-tests/src/bin/path_open_preopen.rs
@@ -64,7 +64,7 @@ unsafe fn path_open_preopen() {
     )
     .expect("open with O_DIRECTORY and read right");
 
-    if !test_programs::preview1::config().errno_expect_windows() {
+    if !wasi_tests::TESTCONFIG.errno_expect_windows() {
         // Open OFLAGS_DIRECTORY and read/write rights should fail with isdir:
         let err = wasi::path_open(
             FIRST_PREOPEN,
diff --git a/crates/test-programs/src/bin/preview1_path_open_read_write.rs b/crates/test-programs/wasi-tests/src/bin/path_open_read_write.rs
similarity index 98%
rename from crates/test-programs/src/bin/preview1_path_open_read_write.rs
rename to crates/test-programs/wasi-tests/src/bin/path_open_read_write.rs
index 3d19daffcbd9..0278fbf6d4f1 100644
--- a/crates/test-programs/src/bin/preview1_path_open_read_write.rs
+++ b/crates/test-programs/wasi-tests/src/bin/path_open_read_write.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, create_file, open_scratch_directory};
+use wasi_tests::{assert_errno, create_file, open_scratch_directory};
 
 unsafe fn test_path_open_read_write(dir_fd: wasi::Fd) {
     create_file(dir_fd, "file");
diff --git a/crates/test-programs/src/bin/preview1_path_rename.rs b/crates/test-programs/wasi-tests/src/bin/path_rename.rs
similarity index 97%
rename from crates/test-programs/src/bin/preview1_path_rename.rs
rename to crates/test-programs/wasi-tests/src/bin/path_rename.rs
index a7191bc2c486..325a8a390cde 100644
--- a/crates/test-programs/src/bin/preview1_path_rename.rs
+++ b/crates/test-programs/wasi-tests/src/bin/path_rename.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, config, create_file, open_scratch_directory};
+use wasi_tests::{assert_errno, create_file, open_scratch_directory, TESTCONFIG};
 
 unsafe fn test_path_rename(dir_fd: wasi::Fd) {
     // First, try renaming a dir to nonexistent path
@@ -31,7 +31,7 @@ unsafe fn test_path_rename(dir_fd: wasi::Fd) {
     // and its fairly important that it is atomic.
     // But, we haven't found a way to emulate it on windows. So, sometimes this
     // behavior is just hosed. Sorry.
-    if config().support_rename_dir_to_empty_dir() {
+    if TESTCONFIG.support_rename_dir_to_empty_dir() {
         // Now, try renaming renaming a dir to existing empty dir
         wasi::path_create_directory(dir_fd, "source").expect("creating a directory");
         wasi::path_create_directory(dir_fd, "target").expect("creating a directory");
@@ -78,7 +78,7 @@ unsafe fn test_path_rename(dir_fd: wasi::Fd) {
     // This is technically a different property, but the root of these divergent behaviors is in
     // the semantics that windows gives us around renaming directories. So, it lives under the same
     // flag.
-    if config().support_rename_dir_to_empty_dir() {
+    if TESTCONFIG.support_rename_dir_to_empty_dir() {
         // Try renaming dir to a file
         assert_errno!(
             wasi::path_rename(dir_fd, "source", dir_fd, "target/file")
diff --git a/crates/test-programs/src/bin/preview1_path_rename_dir_trailing_slashes.rs b/crates/test-programs/wasi-tests/src/bin/path_rename_dir_trailing_slashes.rs
similarity index 96%
rename from crates/test-programs/src/bin/preview1_path_rename_dir_trailing_slashes.rs
rename to crates/test-programs/wasi-tests/src/bin/path_rename_dir_trailing_slashes.rs
index 2e6a2316e7b3..7c27d9cbb079 100644
--- a/crates/test-programs/src/bin/preview1_path_rename_dir_trailing_slashes.rs
+++ b/crates/test-programs/wasi-tests/src/bin/path_rename_dir_trailing_slashes.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::open_scratch_directory;
+use wasi_tests::open_scratch_directory;
 
 unsafe fn test_path_rename_trailing_slashes(dir_fd: wasi::Fd) {
     // Test renaming a directory with a trailing slash in the name.
diff --git a/crates/test-programs/src/bin/preview1_path_rename_file_trailing_slashes.rs b/crates/test-programs/wasi-tests/src/bin/path_rename_file_trailing_slashes.rs
similarity index 95%
rename from crates/test-programs/src/bin/preview1_path_rename_file_trailing_slashes.rs
rename to crates/test-programs/wasi-tests/src/bin/path_rename_file_trailing_slashes.rs
index 2602195558d4..853b1d407176 100644
--- a/crates/test-programs/src/bin/preview1_path_rename_file_trailing_slashes.rs
+++ b/crates/test-programs/wasi-tests/src/bin/path_rename_file_trailing_slashes.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, create_file, open_scratch_directory};
+use wasi_tests::{assert_errno, create_file, open_scratch_directory};
 
 unsafe fn test_path_rename_trailing_slashes(dir_fd: wasi::Fd) {
     // Test renaming a file with a trailing slash in the name.
diff --git a/crates/test-programs/src/bin/preview1_path_symlink_trailing_slashes.rs b/crates/test-programs/wasi-tests/src/bin/path_symlink_trailing_slashes.rs
similarity index 95%
rename from crates/test-programs/src/bin/preview1_path_symlink_trailing_slashes.rs
rename to crates/test-programs/wasi-tests/src/bin/path_symlink_trailing_slashes.rs
index fc66430f7573..f27ced633ede 100644
--- a/crates/test-programs/src/bin/preview1_path_symlink_trailing_slashes.rs
+++ b/crates/test-programs/wasi-tests/src/bin/path_symlink_trailing_slashes.rs
@@ -1,8 +1,8 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, config, create_file, open_scratch_directory};
+use wasi_tests::{assert_errno, create_file, open_scratch_directory, TESTCONFIG};
 
 unsafe fn test_path_symlink_trailing_slashes(dir_fd: wasi::Fd) {
-    if config().support_dangling_filesystem() {
+    if TESTCONFIG.support_dangling_filesystem() {
         // Dangling symlink: Link destination shouldn't end with a slash.
         assert_errno!(
             wasi::path_symlink("source", dir_fd, "target/")
diff --git a/crates/test-programs/src/bin/preview1_poll_oneoff_files.rs b/crates/test-programs/wasi-tests/src/bin/poll_oneoff_files.rs
similarity index 95%
rename from crates/test-programs/src/bin/preview1_poll_oneoff_files.rs
rename to crates/test-programs/wasi-tests/src/bin/poll_oneoff_files.rs
index d1dfccaef7da..03539ea35de5 100644
--- a/crates/test-programs/src/bin/preview1_poll_oneoff_files.rs
+++ b/crates/test-programs/wasi-tests/src/bin/poll_oneoff_files.rs
@@ -1,5 +1,5 @@
 use std::{env, mem::MaybeUninit, process};
-use test_programs::preview1::{assert_errno, open_scratch_directory};
+use wasi_tests::{assert_errno, open_scratch_directory};
 
 const CLOCK_ID: wasi::Userdata = 0x0123_45678;
 
@@ -153,29 +153,23 @@ unsafe fn test_fd_readwrite(readable_fd: wasi::Fd, writable_fd: wasi::Fd, error_
     ];
     let out = poll_oneoff_with_retry(&r#in).unwrap();
     assert_eq!(out.len(), 2, "should return 2 events, got: {:?}", out);
-
-    let (read, write) = if out[0].userdata == 1 {
-        (&out[0], &out[1])
-    } else {
-        (&out[1], &out[0])
-    };
     assert_eq!(
-        read.userdata, 1,
+        out[0].userdata, 1,
         "the event.userdata should contain fd userdata specified by the user"
     );
-    assert_errno!(read.error, error_code);
+    assert_errno!(out[0].error, error_code);
     assert_eq!(
-        read.type_,
+        out[0].type_,
         wasi::EVENTTYPE_FD_READ,
         "the event.type_ should equal FD_READ"
     );
     assert_eq!(
-        write.userdata, 2,
+        out[1].userdata, 2,
         "the event.userdata should contain fd userdata specified by the user"
     );
-    assert_errno!(write.error, error_code);
+    assert_errno!(out[1].error, error_code);
     assert_eq!(
-        write.type_,
+        out[1].type_,
         wasi::EVENTTYPE_FD_WRITE,
         "the event.type_ should equal FD_WRITE"
     );
diff --git a/crates/test-programs/src/bin/preview1_poll_oneoff_stdio.rs b/crates/test-programs/wasi-tests/src/bin/poll_oneoff_stdio.rs
similarity index 98%
rename from crates/test-programs/src/bin/preview1_poll_oneoff_stdio.rs
rename to crates/test-programs/wasi-tests/src/bin/poll_oneoff_stdio.rs
index bb3216b579a8..2ddc00475281 100644
--- a/crates/test-programs/src/bin/preview1_poll_oneoff_stdio.rs
+++ b/crates/test-programs/wasi-tests/src/bin/poll_oneoff_stdio.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 use std::mem::MaybeUninit;
-use test_programs::preview1::{assert_errno, STDERR_FD, STDIN_FD, STDOUT_FD};
+use wasi_tests::{assert_errno, STDERR_FD, STDIN_FD, STDOUT_FD};
 
 const TIMEOUT: u64 = 200_000_000u64; // 200 milliseconds, required to satisfy slow execution in CI
 const CLOCK_ID: wasi::Userdata = 0x0123_45678;
diff --git a/crates/test-programs/wasi-tests/src/bin/read_empty_file.rs.disabled b/crates/test-programs/wasi-tests/src/bin/read_empty_file.rs.disabled
new file mode 100644
index 000000000000..510466eaefe0
--- /dev/null
+++ b/crates/test-programs/wasi-tests/src/bin/read_empty_file.rs.disabled
@@ -0,0 +1,5 @@
+fn main() {
+    let mut file = std::fs::File::open("").unwrap();
+    let mut buffer = Vec::new();
+    std::io::Read::read_to_end(&mut file, &mut buffer).unwrap();
+}
diff --git a/crates/test-programs/src/bin/preview1_readlink.rs b/crates/test-programs/wasi-tests/src/bin/readlink.rs
similarity index 97%
rename from crates/test-programs/src/bin/preview1_readlink.rs
rename to crates/test-programs/wasi-tests/src/bin/readlink.rs
index 747f2e7ebb9b..f6bcc309587b 100644
--- a/crates/test-programs/src/bin/preview1_readlink.rs
+++ b/crates/test-programs/wasi-tests/src/bin/readlink.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{create_file, open_scratch_directory};
+use wasi_tests::{create_file, open_scratch_directory};
 
 unsafe fn test_readlink(dir_fd: wasi::Fd) {
     // Create a file in the scratch directory.
diff --git a/crates/test-programs/src/bin/preview1_regular_file_isatty.rs b/crates/test-programs/wasi-tests/src/bin/regular_file_isatty.rs
similarity index 95%
rename from crates/test-programs/src/bin/preview1_regular_file_isatty.rs
rename to crates/test-programs/wasi-tests/src/bin/regular_file_isatty.rs
index c0098c8ed2fc..6a8c821becf7 100644
--- a/crates/test-programs/src/bin/preview1_regular_file_isatty.rs
+++ b/crates/test-programs/wasi-tests/src/bin/regular_file_isatty.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::open_scratch_directory;
+use wasi_tests::open_scratch_directory;
 
 unsafe fn test_file_isatty(dir_fd: wasi::Fd) {
     // Create a file in the scratch directory and test if it's a tty.
diff --git a/crates/test-programs/src/bin/preview1_remove_directory_trailing_slashes.rs b/crates/test-programs/wasi-tests/src/bin/remove_directory_trailing_slashes.rs
similarity index 95%
rename from crates/test-programs/src/bin/preview1_remove_directory_trailing_slashes.rs
rename to crates/test-programs/wasi-tests/src/bin/remove_directory_trailing_slashes.rs
index c9e73b930fbf..9628c7ad5c77 100644
--- a/crates/test-programs/src/bin/preview1_remove_directory_trailing_slashes.rs
+++ b/crates/test-programs/wasi-tests/src/bin/remove_directory_trailing_slashes.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, create_file, open_scratch_directory};
+use wasi_tests::{assert_errno, create_file, open_scratch_directory};
 
 unsafe fn test_remove_directory_trailing_slashes(dir_fd: wasi::Fd) {
     // Create a directory in the scratch directory.
diff --git a/crates/test-programs/src/bin/preview1_remove_nonempty_directory.rs b/crates/test-programs/wasi-tests/src/bin/remove_nonempty_directory.rs
similarity index 95%
rename from crates/test-programs/src/bin/preview1_remove_nonempty_directory.rs
rename to crates/test-programs/wasi-tests/src/bin/remove_nonempty_directory.rs
index 701ab5270012..6732ba537e77 100644
--- a/crates/test-programs/src/bin/preview1_remove_nonempty_directory.rs
+++ b/crates/test-programs/wasi-tests/src/bin/remove_nonempty_directory.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, open_scratch_directory};
+use wasi_tests::{assert_errno, open_scratch_directory};
 
 unsafe fn test_remove_nonempty_directory(dir_fd: wasi::Fd) {
     // Create a directory in the scratch directory.
diff --git a/crates/test-programs/src/bin/preview1_renumber.rs b/crates/test-programs/wasi-tests/src/bin/renumber.rs
similarity index 97%
rename from crates/test-programs/src/bin/preview1_renumber.rs
rename to crates/test-programs/wasi-tests/src/bin/renumber.rs
index 0e90540f5c7d..1a50f02ade12 100644
--- a/crates/test-programs/src/bin/preview1_renumber.rs
+++ b/crates/test-programs/wasi-tests/src/bin/renumber.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, open_scratch_directory};
+use wasi_tests::{assert_errno, open_scratch_directory};
 
 unsafe fn test_renumber(dir_fd: wasi::Fd) {
     let pre_fd: wasi::Fd = (libc::STDERR_FILENO + 1) as wasi::Fd;
diff --git a/crates/test-programs/src/bin/preview1_sched_yield.rs b/crates/test-programs/wasi-tests/src/bin/sched_yield.rs
similarity index 100%
rename from crates/test-programs/src/bin/preview1_sched_yield.rs
rename to crates/test-programs/wasi-tests/src/bin/sched_yield.rs
diff --git a/crates/test-programs/wasi-tests/src/bin/sleep.rs b/crates/test-programs/wasi-tests/src/bin/sleep.rs
new file mode 100644
index 000000000000..a80f11bbff6a
--- /dev/null
+++ b/crates/test-programs/wasi-tests/src/bin/sleep.rs
@@ -0,0 +1,16 @@
+use crate::wasi::{clocks::monotonic_clock, poll::poll};
+
+wit_bindgen::generate!({
+    path: "../../wasi/wit",
+    world: "wasmtime:wasi/command-extended",
+});
+
+fn main() {
+    // Sleep ten milliseconds.  Note that we call the relevant host functions directly rather than go through
+    // libstd, since we want to ensure we're calling `monotonic_clock::subscribe` with an `absolute` parameter of
+    // `true`, which libstd won't necessarily do (but which e.g. CPython _will_ do).
+    poll::poll_oneoff(&[monotonic_clock::subscribe(
+        monotonic_clock::now() + 10_000_000,
+        true,
+    )]);
+}
diff --git a/crates/test-programs/src/bin/preview1_stdio.rs b/crates/test-programs/wasi-tests/src/bin/stdio.rs
similarity index 82%
rename from crates/test-programs/src/bin/preview1_stdio.rs
rename to crates/test-programs/wasi-tests/src/bin/stdio.rs
index 49d5d430c960..31b0a25b9b39 100644
--- a/crates/test-programs/src/bin/preview1_stdio.rs
+++ b/crates/test-programs/wasi-tests/src/bin/stdio.rs
@@ -1,4 +1,4 @@
-use test_programs::preview1::{STDERR_FD, STDIN_FD, STDOUT_FD};
+use wasi_tests::{STDERR_FD, STDIN_FD, STDOUT_FD};
 
 unsafe fn test_stdio() {
     for fd in &[STDIN_FD, STDOUT_FD, STDERR_FD] {
diff --git a/crates/test-programs/src/bin/preview1_stdio_isatty.rs b/crates/test-programs/wasi-tests/src/bin/stdio_isatty.rs
similarity index 100%
rename from crates/test-programs/src/bin/preview1_stdio_isatty.rs
rename to crates/test-programs/wasi-tests/src/bin/stdio_isatty.rs
diff --git a/crates/test-programs/src/bin/preview1_stdio_not_isatty.rs b/crates/test-programs/wasi-tests/src/bin/stdio_not_isatty.rs
similarity index 100%
rename from crates/test-programs/src/bin/preview1_stdio_not_isatty.rs
rename to crates/test-programs/wasi-tests/src/bin/stdio_not_isatty.rs
diff --git a/crates/test-programs/src/bin/preview1_symlink_create.rs b/crates/test-programs/wasi-tests/src/bin/symlink_create.rs
similarity index 98%
rename from crates/test-programs/src/bin/preview1_symlink_create.rs
rename to crates/test-programs/wasi-tests/src/bin/symlink_create.rs
index fcebfc9c9a65..2553f34fcd01 100644
--- a/crates/test-programs/src/bin/preview1_symlink_create.rs
+++ b/crates/test-programs/wasi-tests/src/bin/symlink_create.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::open_scratch_directory;
+use wasi_tests::open_scratch_directory;
 
 unsafe fn create_symlink_to_file(dir_fd: wasi::Fd) {
     // Create a directory for the symlink to point to.
diff --git a/crates/test-programs/src/bin/preview1_symlink_filestat.rs b/crates/test-programs/wasi-tests/src/bin/symlink_filestat.rs
similarity index 98%
rename from crates/test-programs/src/bin/preview1_symlink_filestat.rs
rename to crates/test-programs/wasi-tests/src/bin/symlink_filestat.rs
index 377c68e9398e..cad9dcd6c034 100644
--- a/crates/test-programs/src/bin/preview1_symlink_filestat.rs
+++ b/crates/test-programs/wasi-tests/src/bin/symlink_filestat.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::open_scratch_directory;
+use wasi_tests::open_scratch_directory;
 
 unsafe fn test_path_filestat(dir_fd: wasi::Fd) {
     // Create a file in the scratch directory.
diff --git a/crates/test-programs/src/bin/preview1_symlink_loop.rs b/crates/test-programs/wasi-tests/src/bin/symlink_loop.rs
similarity index 89%
rename from crates/test-programs/src/bin/preview1_symlink_loop.rs
rename to crates/test-programs/wasi-tests/src/bin/symlink_loop.rs
index 1e21bbded227..1c3226adb775 100644
--- a/crates/test-programs/src/bin/preview1_symlink_loop.rs
+++ b/crates/test-programs/wasi-tests/src/bin/symlink_loop.rs
@@ -1,8 +1,8 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, config, open_scratch_directory};
+use wasi_tests::{assert_errno, open_scratch_directory, TESTCONFIG};
 
 unsafe fn test_symlink_loop(dir_fd: wasi::Fd) {
-    if config().support_dangling_filesystem() {
+    if TESTCONFIG.support_dangling_filesystem() {
         // Create a self-referencing symlink.
         wasi::path_symlink("symlink", dir_fd, "symlink").expect("creating a symlink");
 
diff --git a/crates/test-programs/src/bin/preview1_unicode_output.rs b/crates/test-programs/wasi-tests/src/bin/unicode_output.rs
similarity index 90%
rename from crates/test-programs/src/bin/preview1_unicode_output.rs
rename to crates/test-programs/wasi-tests/src/bin/unicode_output.rs
index 7e88dc27c79a..211f7905fe06 100644
--- a/crates/test-programs/src/bin/preview1_unicode_output.rs
+++ b/crates/test-programs/wasi-tests/src/bin/unicode_output.rs
@@ -1,4 +1,4 @@
-use test_programs::preview1::STDOUT_FD;
+use wasi_tests::STDOUT_FD;
 fn main() {
     let text = "مرحبا بكم\n";
 
diff --git a/crates/test-programs/src/bin/preview1_unlink_file_trailing_slashes.rs b/crates/test-programs/wasi-tests/src/bin/unlink_file_trailing_slashes.rs
similarity index 95%
rename from crates/test-programs/src/bin/preview1_unlink_file_trailing_slashes.rs
rename to crates/test-programs/wasi-tests/src/bin/unlink_file_trailing_slashes.rs
index 59ca9bb831a0..2417b5efa01b 100644
--- a/crates/test-programs/src/bin/preview1_unlink_file_trailing_slashes.rs
+++ b/crates/test-programs/wasi-tests/src/bin/unlink_file_trailing_slashes.rs
@@ -1,5 +1,5 @@
 use std::{env, process};
-use test_programs::preview1::{assert_errno, create_file, open_scratch_directory};
+use wasi_tests::{assert_errno, create_file, open_scratch_directory};
 
 unsafe fn test_unlink_file_trailing_slashes(dir_fd: wasi::Fd) {
     // Create a directory in the scratch directory.
diff --git a/crates/test-programs/wasi-tests/src/config.rs b/crates/test-programs/wasi-tests/src/config.rs
new file mode 100644
index 000000000000..2c8e0c0f6832
--- /dev/null
+++ b/crates/test-programs/wasi-tests/src/config.rs
@@ -0,0 +1,63 @@
+pub struct TestConfig {
+    errno_mode: ErrnoMode,
+    no_dangling_filesystem: bool,
+    no_rename_dir_to_empty_dir: bool,
+    no_fdflags_sync_support: bool,
+}
+
+enum ErrnoMode {
+    Unix,
+    MacOS,
+    Windows,
+    Permissive,
+}
+
+impl TestConfig {
+    pub fn from_env() -> Self {
+        let errno_mode = if std::env::var("ERRNO_MODE_UNIX").is_ok() {
+            ErrnoMode::Unix
+        } else if std::env::var("ERRNO_MODE_MACOS").is_ok() {
+            ErrnoMode::MacOS
+        } else if std::env::var("ERRNO_MODE_WINDOWS").is_ok() {
+            ErrnoMode::Windows
+        } else {
+            ErrnoMode::Permissive
+        };
+        let no_dangling_filesystem = std::env::var("NO_DANGLING_FILESYSTEM").is_ok();
+        let no_rename_dir_to_empty_dir = std::env::var("NO_RENAME_DIR_TO_EMPTY_DIR").is_ok();
+        let no_fdflags_sync_support = std::env::var("NO_FDFLAGS_SYNC_SUPPORT").is_ok();
+        TestConfig {
+            errno_mode,
+            no_dangling_filesystem,
+            no_rename_dir_to_empty_dir,
+            no_fdflags_sync_support,
+        }
+    }
+    pub fn errno_expect_unix(&self) -> bool {
+        match self.errno_mode {
+            ErrnoMode::Unix | ErrnoMode::MacOS => true,
+            _ => false,
+        }
+    }
+    pub fn errno_expect_macos(&self) -> bool {
+        match self.errno_mode {
+            ErrnoMode::MacOS => true,
+            _ => false,
+        }
+    }
+    pub fn errno_expect_windows(&self) -> bool {
+        match self.errno_mode {
+            ErrnoMode::Windows => true,
+            _ => false,
+        }
+    }
+    pub fn support_dangling_filesystem(&self) -> bool {
+        !self.no_dangling_filesystem
+    }
+    pub fn support_rename_dir_to_empty_dir(&self) -> bool {
+        !self.no_rename_dir_to_empty_dir
+    }
+    pub fn support_fdflags_sync(&self) -> bool {
+        !self.no_fdflags_sync_support
+    }
+}
diff --git a/crates/test-programs/src/preview1.rs b/crates/test-programs/wasi-tests/src/lib.rs
similarity index 59%
rename from crates/test-programs/src/preview1.rs
rename to crates/test-programs/wasi-tests/src/lib.rs
index 6f646bb4e047..3a701ad86335 100644
--- a/crates/test-programs/src/preview1.rs
+++ b/crates/test-programs/wasi-tests/src/lib.rs
@@ -1,9 +1,7 @@
-use std::sync::OnceLock;
+pub mod config;
+use once_cell::sync::Lazy;
 
-pub fn config() -> &'static TestConfig {
-    static TESTCONFIG: OnceLock<TestConfig> = OnceLock::new();
-    TESTCONFIG.get_or_init(TestConfig::from_env)
-}
+pub static TESTCONFIG: Lazy<config::TestConfig> = Lazy::new(config::TestConfig::from_env);
 
 // The `wasi` crate version 0.9.0 and beyond, doesn't
 // seem to define these constants, so we do it ourselves.
@@ -45,15 +43,11 @@ pub unsafe fn create_file(dir_fd: wasi::Fd, filename: &str) {
     wasi::fd_close(file_fd).expect("closing a file");
 }
 
-// Small workaround to get the crate's `assert_errno`, through the
-// `#[macro_export]` attribute below, also available from this module.
-pub use crate::assert_errno;
-
 #[macro_export]
 macro_rules! assert_errno {
     ($s:expr, windows => $i:expr, $( $rest:tt )+) => {
         let e = $s;
-        if $crate::preview1::config().errno_expect_windows() {
+        if $crate::TESTCONFIG.errno_expect_windows() {
             assert_errno!(e, $i);
         } else {
             assert_errno!(e, $($rest)+, $i);
@@ -61,7 +55,7 @@ macro_rules! assert_errno {
     };
     ($s:expr, macos => $i:expr, $( $rest:tt )+) => {
         let e = $s;
-        if $crate::preview1::config().errno_expect_macos() {
+        if $crate::TESTCONFIG.errno_expect_macos() {
             assert_errno!(e, $i);
         } else {
             assert_errno!(e, $($rest)+, $i);
@@ -69,7 +63,7 @@ macro_rules! assert_errno {
     };
     ($s:expr, unix => $i:expr, $( $rest:tt )+) => {
         let e = $s;
-        if $crate::preview1::config().errno_expect_unix() {
+        if $crate::TESTCONFIG.errno_expect_unix() {
             assert_errno!(e, $i);
         } else {
             assert_errno!(e, $($rest)+, $i);
@@ -113,67 +107,3 @@ macro_rules! assert_errno {
         }
     };
 }
-
-pub struct TestConfig {
-    errno_mode: ErrnoMode,
-    no_dangling_filesystem: bool,
-    no_rename_dir_to_empty_dir: bool,
-    no_fdflags_sync_support: bool,
-}
-
-enum ErrnoMode {
-    Unix,
-    MacOS,
-    Windows,
-    Permissive,
-}
-
-impl TestConfig {
-    pub fn from_env() -> Self {
-        let errno_mode = if std::env::var("ERRNO_MODE_UNIX").is_ok() {
-            ErrnoMode::Unix
-        } else if std::env::var("ERRNO_MODE_MACOS").is_ok() {
-            ErrnoMode::MacOS
-        } else if std::env::var("ERRNO_MODE_WINDOWS").is_ok() {
-            ErrnoMode::Windows
-        } else {
-            ErrnoMode::Permissive
-        };
-        let no_dangling_filesystem = std::env::var("NO_DANGLING_FILESYSTEM").is_ok();
-        let no_rename_dir_to_empty_dir = std::env::var("NO_RENAME_DIR_TO_EMPTY_DIR").is_ok();
-        let no_fdflags_sync_support = std::env::var("NO_FDFLAGS_SYNC_SUPPORT").is_ok();
-        TestConfig {
-            errno_mode,
-            no_dangling_filesystem,
-            no_rename_dir_to_empty_dir,
-            no_fdflags_sync_support,
-        }
-    }
-    pub fn errno_expect_unix(&self) -> bool {
-        match self.errno_mode {
-            ErrnoMode::Unix | ErrnoMode::MacOS => true,
-            _ => false,
-        }
-    }
-    pub fn errno_expect_macos(&self) -> bool {
-        match self.errno_mode {
-            ErrnoMode::MacOS => true,
-            _ => false,
-        }
-    }
-    pub fn errno_expect_windows(&self) -> bool {
-        match self.errno_mode {
-            ErrnoMode::Windows => true,
-            _ => false,
-        }
-    }
-    pub fn support_dangling_filesystem(&self) -> bool {
-        !self.no_dangling_filesystem
-    }
-    pub fn support_rename_dir_to_empty_dir(&self) -> bool {
-        !self.no_rename_dir_to_empty_dir
-    }
-    pub fn support_fdflags_sync(&self) -> bool {
-        !self.no_fdflags_sync_support
-    }
-}
diff --git a/crates/wasi-common/Cargo.toml b/crates/wasi-common/Cargo.toml
index dbce4a957906..3382912e63f2 100644
--- a/crates/wasi-common/Cargo.toml
+++ b/crates/wasi-common/Cargo.toml
@@ -41,15 +41,6 @@ features = [
     "Win32_Networking_WinSock",
 ]
 
-[dev-dependencies]
-tempfile = { workspace = true }
-test-log = { workspace = true }
-tracing-subscriber = { workspace = true }
-wasmtime = { workspace = true, features = ['cranelift', 'async'] }
-wasmtime-wasi = { path = '../wasi', features = ['sync', 'tokio'] }
-test-programs-artifacts = { workspace = true }
-tokio = { workspace = true, features = ['macros', 'rt-multi-thread'] }
-
 [features]
 default = ["trace_log"]
 # This feature enables the `tracing` logs in the calls to target the `log`
diff --git a/crates/wasi-common/cap-std-sync/Cargo.toml b/crates/wasi-common/cap-std-sync/Cargo.toml
index f9811bbb51f6..f0fe058eac32 100644
--- a/crates/wasi-common/cap-std-sync/Cargo.toml
+++ b/crates/wasi-common/cap-std-sync/Cargo.toml
@@ -23,6 +23,7 @@ fs-set-times = { workspace = true }
 system-interface = { workspace = true, features = ["cap_std_impls"] }
 tracing = { workspace = true }
 io-lifetimes = { workspace = true }
+is-terminal = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]
 rustix = { workspace = true, features = ["fs", "event"] }
diff --git a/crates/wasi-common/cap-std-sync/src/file.rs b/crates/wasi-common/cap-std-sync/src/file.rs
index e986c173404d..20a95e94425a 100644
--- a/crates/wasi-common/cap-std-sync/src/file.rs
+++ b/crates/wasi-common/cap-std-sync/src/file.rs
@@ -1,9 +1,10 @@
 use cap_fs_ext::MetadataExt;
 use fs_set_times::{SetTimes, SystemTimeSpec};
 use io_lifetimes::AsFilelike;
+use is_terminal::IsTerminal;
 use std::any::Any;
 use std::convert::TryInto;
-use std::io::{self, IsTerminal};
+use std::io;
 use system_interface::{
     fs::{FileIoExt, GetSetFdFlags},
     io::{IoExt, ReadReady},
@@ -127,10 +128,7 @@ impl WasiFile for File {
         Ok(self.0.num_ready_bytes()?)
     }
     fn isatty(&self) -> bool {
-        #[cfg(unix)]
-        return self.0.as_fd().is_terminal();
-        #[cfg(windows)]
-        return self.0.as_handle().is_terminal();
+        self.0.is_terminal()
     }
 }
 
diff --git a/crates/wasi-common/cap-std-sync/src/sched/windows.rs b/crates/wasi-common/cap-std-sync/src/sched/windows.rs
index d67d30d922d1..e3eeb930523e 100644
--- a/crates/wasi-common/cap-std-sync/src/sched/windows.rs
+++ b/crates/wasi-common/cap-std-sync/src/sched/windows.rs
@@ -9,6 +9,7 @@
 // taken the time to improve it. See bug #2880.
 
 use once_cell::sync::Lazy;
+use std::ops::Deref;
 use std::sync::mpsc::{self, Receiver, RecvTimeoutError, Sender, TryRecvError};
 use std::sync::Mutex;
 use std::thread;
@@ -49,7 +50,7 @@ pub async fn poll_oneoff_<'a>(
     for s in poll.rw_subscriptions() {
         match s {
             Subscription::Read(r) => {
-                if file_is_stdin(r.file) {
+                if file_is_stdin(r.file.deref()) {
                     stdin_read_subs.push(r);
                 } else if r.file.pollable().is_some() {
                     immediate_reads.push(r);
diff --git a/crates/wasi-common/cap-std-sync/src/stdio.rs b/crates/wasi-common/cap-std-sync/src/stdio.rs
index b2723d076c98..e60ddc034ebf 100644
--- a/crates/wasi-common/cap-std-sync/src/stdio.rs
+++ b/crates/wasi-common/cap-std-sync/src/stdio.rs
@@ -1,8 +1,10 @@
 use crate::file::convert_systimespec;
 use fs_set_times::SetTimes;
+use is_terminal::IsTerminal;
 use std::any::Any;
 use std::convert::TryInto;
-use std::io::{self, IsTerminal, Read, Write};
+use std::io;
+use std::io::{Read, Write};
 use system_interface::io::ReadReady;
 
 #[cfg(windows)]
@@ -75,10 +77,7 @@ impl WasiFile for Stdin {
         Ok(self.0.num_ready_bytes()?)
     }
     fn isatty(&self) -> bool {
-        #[cfg(unix)]
-        return self.0.as_fd().is_terminal();
-        #[cfg(windows)]
-        return self.0.as_handle().is_terminal();
+        self.0.is_terminal()
     }
 }
 #[cfg(windows)]
diff --git a/crates/wasi-common/tests/all/main.rs b/crates/wasi-common/tests/all/main.rs
deleted file mode 100644
index 5324e8656e7d..000000000000
--- a/crates/wasi-common/tests/all/main.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use anyhow::Result;
-use std::path::Path;
-use tempfile::TempDir;
-use wasi_common::pipe::WritePipe;
-use wasmtime::{Config, Engine, Linker, Module, Store};
-
-pub fn prepare_workspace(exe_name: &str) -> Result<TempDir> {
-    let prefix = format!("wasi_cap_std_sync_{}_", exe_name);
-    let tempdir = tempfile::Builder::new().prefix(&prefix).tempdir()?;
-    Ok(tempdir)
-}
-
-macro_rules! assert_test_exists {
-    ($name:ident) => {
-        #[allow(unused_imports)]
-        use self::$name as _;
-    };
-}
-
-mod async_;
-mod sync;
diff --git a/crates/wasi-common/tests/all/sync.rs b/crates/wasi-common/tests/all/sync.rs
deleted file mode 100644
index 42e0b8459530..000000000000
--- a/crates/wasi-common/tests/all/sync.rs
+++ /dev/null
@@ -1,275 +0,0 @@
-use super::*;
-use test_programs_artifacts::*;
-use wasmtime_wasi::sync::{add_to_linker, WasiCtxBuilder};
-
-foreach_preview1!(assert_test_exists);
-
-fn run(path: &str, inherit_stdio: bool) -> Result<()> {
-    let path = Path::new(path);
-    let name = path.file_stem().unwrap().to_str().unwrap();
-    let workspace = prepare_workspace(name)?;
-    let stdout = WritePipe::new_in_memory();
-    let stderr = WritePipe::new_in_memory();
-    let r = {
-        let engine = Engine::default();
-        let mut linker = Linker::new(&engine);
-        add_to_linker(&mut linker, |cx| cx)?;
-
-        // Create our wasi context.
-        // Additionally register any preopened directories if we have them.
-        let mut builder = WasiCtxBuilder::new();
-
-        if inherit_stdio {
-            builder.inherit_stdio();
-        } else {
-            builder
-                .stdout(Box::new(stdout.clone()))
-                .stderr(Box::new(stderr.clone()));
-        }
-        builder.arg(name)?.arg(".")?;
-        println!("preopen: {:?}", workspace);
-        let preopen_dir =
-            cap_std::fs::Dir::open_ambient_dir(workspace.path(), cap_std::ambient_authority())?;
-        builder.preopened_dir(preopen_dir, ".")?;
-        for (var, val) in test_programs_artifacts::wasi_tests_environment() {
-            builder.env(var, val)?;
-        }
-
-        let mut store = Store::new(&engine, builder.build());
-        let module = Module::from_file(&engine, path)?;
-        let instance = linker.instantiate(&mut store, &module)?;
-        let start = instance.get_typed_func::<(), ()>(&mut store, "_start")?;
-        start.call(&mut store, ())?;
-        Ok(())
-    };
-
-    r.map_err(move |trap: anyhow::Error| {
-        let stdout = stdout
-            .try_into_inner()
-            .expect("sole ref to stdout")
-            .into_inner();
-        if !stdout.is_empty() {
-            println!("guest stdout:\n{}\n===", String::from_utf8_lossy(&stdout));
-        }
-        let stderr = stderr
-            .try_into_inner()
-            .expect("sole ref to stderr")
-            .into_inner();
-        if !stderr.is_empty() {
-            println!("guest stderr:\n{}\n===", String::from_utf8_lossy(&stderr));
-        }
-        trap.context(format!(
-            "error while testing wasi-tests {} with cap-std-sync",
-            name
-        ))
-    })?;
-    Ok(())
-}
-
-// Below here is mechanical: there should be one test for every binary in
-// wasi-tests. The only differences should be should_panic annotations for
-// tests which fail.
-#[test_log::test]
-fn preview1_big_random_buf() {
-    run(PREVIEW1_BIG_RANDOM_BUF, true).unwrap()
-}
-#[test_log::test]
-fn preview1_clock_time_get() {
-    run(PREVIEW1_CLOCK_TIME_GET, true).unwrap()
-}
-#[test_log::test]
-fn preview1_close_preopen() {
-    run(PREVIEW1_CLOSE_PREOPEN, true).unwrap()
-}
-#[test_log::test]
-fn preview1_dangling_fd() {
-    run(PREVIEW1_DANGLING_FD, true).unwrap()
-}
-#[test_log::test]
-fn preview1_dangling_symlink() {
-    run(PREVIEW1_DANGLING_SYMLINK, true).unwrap()
-}
-#[test_log::test]
-fn preview1_directory_seek() {
-    run(PREVIEW1_DIRECTORY_SEEK, true).unwrap()
-}
-#[test_log::test]
-fn preview1_dir_fd_op_failures() {
-    run(PREVIEW1_DIR_FD_OP_FAILURES, true).unwrap()
-}
-#[test_log::test]
-fn preview1_fd_advise() {
-    run(PREVIEW1_FD_ADVISE, true).unwrap()
-}
-#[test_log::test]
-fn preview1_fd_filestat_get() {
-    run(PREVIEW1_FD_FILESTAT_GET, true).unwrap()
-}
-#[test_log::test]
-fn preview1_fd_filestat_set() {
-    run(PREVIEW1_FD_FILESTAT_SET, true).unwrap()
-}
-#[test_log::test]
-fn preview1_fd_flags_set() {
-    run(PREVIEW1_FD_FLAGS_SET, true).unwrap()
-}
-#[test_log::test]
-fn preview1_fd_readdir() {
-    run(PREVIEW1_FD_READDIR, true).unwrap()
-}
-#[test_log::test]
-fn preview1_file_allocate() {
-    run(PREVIEW1_FILE_ALLOCATE, true).unwrap()
-}
-#[test_log::test]
-fn preview1_file_pread_pwrite() {
-    run(PREVIEW1_FILE_PREAD_PWRITE, true).unwrap()
-}
-#[test_log::test]
-fn preview1_file_seek_tell() {
-    run(PREVIEW1_FILE_SEEK_TELL, true).unwrap()
-}
-#[test_log::test]
-fn preview1_file_truncation() {
-    run(PREVIEW1_FILE_TRUNCATION, true).unwrap()
-}
-#[test_log::test]
-fn preview1_file_unbuffered_write() {
-    run(PREVIEW1_FILE_UNBUFFERED_WRITE, true).unwrap()
-}
-#[test_log::test]
-#[cfg_attr(windows, should_panic)]
-fn preview1_interesting_paths() {
-    run(PREVIEW1_INTERESTING_PATHS, true).unwrap()
-}
-#[test_log::test]
-fn preview1_regular_file_isatty() {
-    run(PREVIEW1_REGULAR_FILE_ISATTY, true).unwrap()
-}
-#[test_log::test]
-fn preview1_nofollow_errors() {
-    run(PREVIEW1_NOFOLLOW_ERRORS, true).unwrap()
-}
-#[test_log::test]
-fn preview1_overwrite_preopen() {
-    run(PREVIEW1_OVERWRITE_PREOPEN, true).unwrap()
-}
-#[test_log::test]
-fn preview1_path_exists() {
-    run(PREVIEW1_PATH_EXISTS, true).unwrap()
-}
-#[test_log::test]
-fn preview1_path_filestat() {
-    run(PREVIEW1_PATH_FILESTAT, true).unwrap()
-}
-#[test_log::test]
-fn preview1_path_link() {
-    run(PREVIEW1_PATH_LINK, true).unwrap()
-}
-#[test_log::test]
-fn preview1_path_open_create_existing() {
-    run(PREVIEW1_PATH_OPEN_CREATE_EXISTING, true).unwrap()
-}
-#[test_log::test]
-fn preview1_path_open_read_write() {
-    run(PREVIEW1_PATH_OPEN_READ_WRITE, true).unwrap()
-}
-#[test_log::test]
-fn preview1_path_open_dirfd_not_dir() {
-    run(PREVIEW1_PATH_OPEN_DIRFD_NOT_DIR, true).unwrap()
-}
-#[test_log::test]
-fn preview1_path_open_missing() {
-    run(PREVIEW1_PATH_OPEN_MISSING, true).unwrap()
-}
-#[test_log::test]
-fn preview1_path_open_nonblock() {
-    run(PREVIEW1_PATH_OPEN_NONBLOCK, true).unwrap()
-}
-#[test_log::test]
-fn preview1_path_rename_dir_trailing_slashes() {
-    run(PREVIEW1_PATH_RENAME_DIR_TRAILING_SLASHES, true).unwrap()
-}
-#[test_log::test]
-#[should_panic]
-fn preview1_path_rename_file_trailing_slashes() {
-    run(PREVIEW1_PATH_RENAME_FILE_TRAILING_SLASHES, false).unwrap()
-}
-#[test_log::test]
-fn preview1_path_rename() {
-    run(PREVIEW1_PATH_RENAME, true).unwrap()
-}
-#[test_log::test]
-fn preview1_path_symlink_trailing_slashes() {
-    run(PREVIEW1_PATH_SYMLINK_TRAILING_SLASHES, true).unwrap()
-}
-#[test_log::test]
-fn preview1_poll_oneoff_files() {
-    run(PREVIEW1_POLL_ONEOFF_FILES, false).unwrap()
-}
-#[test_log::test]
-fn preview1_poll_oneoff_stdio() {
-    run(PREVIEW1_POLL_ONEOFF_STDIO, true).unwrap()
-}
-#[test_log::test]
-fn preview1_readlink() {
-    run(PREVIEW1_READLINK, true).unwrap()
-}
-#[test_log::test]
-#[should_panic]
-fn preview1_remove_directory_trailing_slashes() {
-    run(PREVIEW1_REMOVE_DIRECTORY_TRAILING_SLASHES, false).unwrap()
-}
-#[test_log::test]
-fn preview1_remove_nonempty_directory() {
-    run(PREVIEW1_REMOVE_NONEMPTY_DIRECTORY, true).unwrap()
-}
-#[test_log::test]
-fn preview1_renumber() {
-    run(PREVIEW1_RENUMBER, true).unwrap()
-}
-#[test_log::test]
-fn preview1_sched_yield() {
-    run(PREVIEW1_SCHED_YIELD, true).unwrap()
-}
-#[test_log::test]
-fn preview1_stdio() {
-    run(PREVIEW1_STDIO, true).unwrap()
-}
-#[test_log::test]
-fn preview1_stdio_isatty() {
-    if test_programs_artifacts::stdio_is_terminal() {
-        // Inherit stdio, which is a terminal in the test runner's environment:
-        run(PREVIEW1_STDIO_ISATTY, true).unwrap()
-    }
-}
-#[test_log::test]
-fn preview1_stdio_not_isatty() {
-    // Don't inherit stdio, test asserts each is not tty:
-    run(PREVIEW1_STDIO_NOT_ISATTY, false).unwrap()
-}
-
-#[test_log::test]
-fn preview1_symlink_create() {
-    run(PREVIEW1_SYMLINK_CREATE, true).unwrap()
-}
-#[test_log::test]
-fn preview1_symlink_filestat() {
-    run(PREVIEW1_SYMLINK_FILESTAT, true).unwrap()
-}
-#[test_log::test]
-fn preview1_symlink_loop() {
-    run(PREVIEW1_SYMLINK_LOOP, true).unwrap()
-}
-#[test_log::test]
-fn preview1_unlink_file_trailing_slashes() {
-    run(PREVIEW1_UNLINK_FILE_TRAILING_SLASHES, true).unwrap()
-}
-#[test_log::test]
-fn preview1_path_open_preopen() {
-    run(PREVIEW1_PATH_OPEN_PREOPEN, true).unwrap()
-}
-#[test_log::test]
-fn preview1_unicode_output() {
-    run(PREVIEW1_UNICODE_OUTPUT, true).unwrap()
-}
diff --git a/crates/wasi-http/Cargo.toml b/crates/wasi-http/Cargo.toml
index 39388f2e91a3..3ebbea483adc 100644
--- a/crates/wasi-http/Cargo.toml
+++ b/crates/wasi-http/Cargo.toml
@@ -12,15 +12,16 @@ anyhow = { workspace = true }
 async-trait = { workspace = true }
 bytes = { workspace = true }
 futures = { workspace = true, default-features = false }
-hyper = { workspace = true, features = ["full"] }
-tokio = { workspace = true, features = [
+hyper = { version = "=1.0.0-rc.3", features = ["full"] }
+tokio = { version = "1", default-features = false, features = [
     "net",
     "rt-multi-thread",
     "time",
 ] }
-http = { workspace = true }
-http-body = { workspace = true }
-http-body-util = { workspace = true }
+http = { version = "0.2.9" }
+http-body = "1.0.0-rc.2"
+http-body-util = "0.1.0-rc.2"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 wasmtime-wasi = { workspace = true, default-features = false, features = [
     "preview2",
@@ -33,16 +34,6 @@ tokio-rustls = { version = "0.24.0" }
 rustls = { version = "0.21.6" }
 webpki-roots = { version = "0.25.2" }
 
-[dev-dependencies]
-test-programs-artifacts = { workspace = true }
-test-log = { workspace = true }
-tracing-subscriber = { workspace = true }
-wasmtime = { workspace = true, features = ['cranelift'] }
-tokio = { workspace = true, features = ['macros'] }
-futures = { workspace = true, default-features = false, features = ['alloc'] }
-sha2 = "0.10.2"
-base64 = "0.21.0"
-
 [features]
 default = ["sync"]
 sync = ["wasmtime-wasi/sync"]
diff --git a/crates/wasi-http/src/body.rs b/crates/wasi-http/src/body.rs
deleted file mode 100644
index 30d217d57980..000000000000
--- a/crates/wasi-http/src/body.rs
+++ /dev/null
@@ -1,522 +0,0 @@
-use crate::{bindings::http::types, types::FieldMap};
-use anyhow::anyhow;
-use bytes::Bytes;
-use http_body_util::combinators::BoxBody;
-use std::future::Future;
-use std::{
-    pin::Pin,
-    sync::{Arc, Mutex},
-    time::Duration,
-};
-use tokio::sync::{mpsc, oneshot};
-use wasmtime_wasi::preview2::{
-    self, AbortOnDropJoinHandle, HostInputStream, HostOutputStream, StreamError, Subscribe,
-};
-
-pub type HyperIncomingBody = BoxBody<Bytes, anyhow::Error>;
-
-/// Holds onto the things needed to construct a [`HostIncomingBody`] until we are ready to build
-/// one. The HostIncomingBody spawns a task that starts consuming the incoming body, and we don't
-/// want to do that unless the user asks to consume the body.
-pub struct HostIncomingBodyBuilder {
-    pub body: HyperIncomingBody,
-    pub between_bytes_timeout: Duration,
-}
-
-impl HostIncomingBodyBuilder {
-    /// Consume the state held in the [`HostIncomingBodyBuilder`] to spawn a task that will drive the
-    /// streaming body to completion. Data segments will be communicated out over the
-    /// [`HostIncomingBodyStream`], and a [`HostFutureTrailers`] gives a way to block on/retrieve
-    /// the trailers.
-    pub fn build(mut self) -> HostIncomingBody {
-        let (body_writer, body_receiver) = mpsc::channel(1);
-        let (trailer_writer, trailers) = oneshot::channel();
-
-        let worker = preview2::spawn(async move {
-            loop {
-                let frame = match tokio::time::timeout(
-                    self.between_bytes_timeout,
-                    http_body_util::BodyExt::frame(&mut self.body),
-                )
-                .await
-                {
-                    Ok(None) => break,
-
-                    Ok(Some(Ok(frame))) => frame,
-
-                    Ok(Some(Err(e))) => {
-                        match body_writer.send(Err(e)).await {
-                            Ok(_) => {}
-                            // If the body read end has dropped, then we report this error with the
-                            // trailers. unwrap and rewrap Err because the Ok side of these two Results
-                            // are different.
-                            Err(e) => {
-                                let _ = trailer_writer.send(Err(e.0.unwrap_err()));
-                            }
-                        }
-                        break;
-                    }
-
-                    Err(_) => {
-                        match body_writer
-                            .send(Err(types::Error::TimeoutError(
-                                "data frame timed out".to_string(),
-                            )
-                            .into()))
-                            .await
-                        {
-                            Ok(_) => {}
-                            Err(e) => {
-                                let _ = trailer_writer.send(Err(e.0.unwrap_err()));
-                            }
-                        }
-                        break;
-                    }
-                };
-
-                if frame.is_trailers() {
-                    // We know we're not going to write any more data frames at this point, so we
-                    // explicitly drop the body_writer so that anything waiting on the read end returns
-                    // immediately.
-                    drop(body_writer);
-
-                    let trailers = frame.into_trailers().unwrap();
-
-                    // TODO: this will fail in two cases:
-                    // 1. we've already used the channel once, which should be imposible,
-                    // 2. the read end is closed.
-                    // I'm not sure how to differentiate between these two cases, or really
-                    // if we need to do anything to handle either.
-                    let _ = trailer_writer.send(Ok(trailers));
-
-                    break;
-                }
-
-                assert!(frame.is_data(), "frame wasn't data");
-
-                let data = frame.into_data().unwrap();
-
-                // If the receiver no longer exists, thats ok - in that case we want to keep the
-                // loop running to relieve backpressure, so we get to the trailers.
-                let _ = body_writer.send(Ok(data)).await;
-            }
-        });
-
-        HostIncomingBody {
-            worker,
-            stream: Some(HostIncomingBodyStream::new(body_receiver)),
-            trailers,
-        }
-    }
-}
-
-pub struct HostIncomingBody {
-    pub worker: AbortOnDropJoinHandle<()>,
-    pub stream: Option<HostIncomingBodyStream>,
-    pub trailers: oneshot::Receiver<Result<hyper::HeaderMap, anyhow::Error>>,
-}
-
-impl HostIncomingBody {
-    pub fn into_future_trailers(self) -> HostFutureTrailers {
-        HostFutureTrailers {
-            _worker: self.worker,
-            state: HostFutureTrailersState::Waiting(self.trailers),
-        }
-    }
-}
-
-pub struct HostIncomingBodyStream {
-    pub open: bool,
-    pub receiver: mpsc::Receiver<Result<Bytes, anyhow::Error>>,
-    pub buffer: Bytes,
-    pub error: Option<anyhow::Error>,
-}
-
-impl HostIncomingBodyStream {
-    fn new(receiver: mpsc::Receiver<Result<Bytes, anyhow::Error>>) -> Self {
-        Self {
-            open: true,
-            receiver,
-            buffer: Bytes::new(),
-            error: None,
-        }
-    }
-}
-
-#[async_trait::async_trait]
-impl HostInputStream for HostIncomingBodyStream {
-    fn read(&mut self, size: usize) -> Result<Bytes, StreamError> {
-        use mpsc::error::TryRecvError;
-
-        if !self.buffer.is_empty() {
-            let len = size.min(self.buffer.len());
-            let chunk = self.buffer.split_to(len);
-            return Ok(chunk);
-        }
-
-        if let Some(e) = self.error.take() {
-            return Err(StreamError::LastOperationFailed(e));
-        }
-
-        if !self.open {
-            return Err(StreamError::Closed);
-        }
-
-        match self.receiver.try_recv() {
-            Ok(Ok(mut bytes)) => {
-                let len = bytes.len().min(size);
-                let chunk = bytes.split_to(len);
-                if !bytes.is_empty() {
-                    self.buffer = bytes;
-                }
-
-                return Ok(chunk);
-            }
-
-            Ok(Err(e)) => {
-                self.open = false;
-                return Err(StreamError::LastOperationFailed(e));
-            }
-
-            Err(TryRecvError::Empty) => {
-                return Ok(Bytes::new());
-            }
-
-            Err(TryRecvError::Disconnected) => {
-                self.open = false;
-                return Err(StreamError::Closed);
-            }
-        }
-    }
-}
-
-#[async_trait::async_trait]
-impl Subscribe for HostIncomingBodyStream {
-    async fn ready(&mut self) {
-        if !self.buffer.is_empty() {
-            return;
-        }
-
-        if !self.open {
-            return;
-        }
-
-        match self.receiver.recv().await {
-            Some(Ok(bytes)) => self.buffer = bytes,
-
-            Some(Err(e)) => {
-                self.error = Some(e);
-                self.open = false;
-            }
-
-            None => self.open = false,
-        }
-    }
-}
-
-pub struct HostFutureTrailers {
-    _worker: AbortOnDropJoinHandle<()>,
-    pub state: HostFutureTrailersState,
-}
-
-pub enum HostFutureTrailersState {
-    Waiting(oneshot::Receiver<Result<hyper::HeaderMap, anyhow::Error>>),
-    Done(Result<Option<FieldMap>, types::Error>),
-}
-
-#[async_trait::async_trait]
-impl Subscribe for HostFutureTrailers {
-    async fn ready(&mut self) {
-        if let HostFutureTrailersState::Waiting(rx) = &mut self.state {
-            let result = match rx.await {
-                Ok(Ok(headers)) => {
-                    if headers.is_empty() {
-                        Ok(None)
-                    } else {
-                        Ok(Some(headers))
-                    }
-                }
-                Ok(Err(e)) => Err(types::Error::ProtocolError(format!("hyper error: {e:?}"))),
-                Err(_) => Err(types::Error::ProtocolError(
-                    "stream hung up before trailers were received".to_string(),
-                )),
-            };
-            self.state = HostFutureTrailersState::Done(result);
-        }
-    }
-}
-
-pub type HyperOutgoingBody = BoxBody<Bytes, anyhow::Error>;
-
-pub enum FinishMessage {
-    Finished,
-    Trailers(hyper::HeaderMap),
-    Abort,
-}
-
-pub struct HostOutgoingBody {
-    pub body_output_stream: Option<Box<dyn HostOutputStream>>,
-    pub finish_sender: Option<tokio::sync::oneshot::Sender<FinishMessage>>,
-}
-
-impl HostOutgoingBody {
-    pub fn new() -> (Self, HyperOutgoingBody) {
-        use http_body_util::BodyExt;
-        use hyper::body::{Body, Frame};
-        use std::task::{Context, Poll};
-        use tokio::sync::oneshot::error::RecvError;
-        struct BodyImpl {
-            body_receiver: mpsc::Receiver<Bytes>,
-            finish_receiver: Option<oneshot::Receiver<FinishMessage>>,
-        }
-        impl Body for BodyImpl {
-            type Data = Bytes;
-            type Error = anyhow::Error;
-            fn poll_frame(
-                mut self: Pin<&mut Self>,
-                cx: &mut Context<'_>,
-            ) -> Poll<Option<Result<Frame<Self::Data>, Self::Error>>> {
-                match self.as_mut().body_receiver.poll_recv(cx) {
-                    Poll::Pending => Poll::Pending,
-                    Poll::Ready(Some(frame)) => Poll::Ready(Some(Ok(Frame::data(frame)))),
-
-                    // This means that the `body_sender` end of the channel has been dropped.
-                    Poll::Ready(None) => {
-                        if let Some(mut finish_receiver) = self.as_mut().finish_receiver.take() {
-                            match Pin::new(&mut finish_receiver).poll(cx) {
-                                Poll::Pending => {
-                                    self.as_mut().finish_receiver = Some(finish_receiver);
-                                    Poll::Pending
-                                }
-                                Poll::Ready(Ok(message)) => match message {
-                                    FinishMessage::Finished => Poll::Ready(None),
-                                    FinishMessage::Trailers(trailers) => {
-                                        Poll::Ready(Some(Ok(Frame::trailers(trailers))))
-                                    }
-                                    FinishMessage::Abort => Poll::Ready(Some(Err(
-                                        anyhow::anyhow!("response corrupted"),
-                                    ))),
-                                },
-                                Poll::Ready(Err(RecvError { .. })) => Poll::Ready(None),
-                            }
-                        } else {
-                            Poll::Ready(None)
-                        }
-                    }
-                }
-            }
-        }
-
-        let (body_sender, body_receiver) = mpsc::channel(1);
-        let (finish_sender, finish_receiver) = oneshot::channel();
-        let body_impl = BodyImpl {
-            body_receiver,
-            finish_receiver: Some(finish_receiver),
-        }
-        .boxed();
-        (
-            Self {
-                // TODO: this capacity constant is arbitrary, and should be configurable
-                body_output_stream: Some(Box::new(BodyWriteStream::new(1024 * 1024, body_sender))),
-                finish_sender: Some(finish_sender),
-            },
-            body_impl,
-        )
-    }
-}
-
-// copied in from preview2::write_stream
-
-#[derive(Debug)]
-struct WorkerState {
-    alive: bool,
-    items: std::collections::VecDeque<Bytes>,
-    write_budget: usize,
-    flush_pending: bool,
-    error: Option<anyhow::Error>,
-}
-
-impl WorkerState {
-    fn check_error(&mut self) -> Result<(), StreamError> {
-        if let Some(e) = self.error.take() {
-            return Err(StreamError::LastOperationFailed(e));
-        }
-        if !self.alive {
-            return Err(StreamError::Closed);
-        }
-        Ok(())
-    }
-}
-
-struct Worker {
-    state: Mutex<WorkerState>,
-    new_work: tokio::sync::Notify,
-    write_ready_changed: tokio::sync::Notify,
-}
-
-enum Job {
-    Flush,
-    Write(Bytes),
-}
-
-impl Worker {
-    fn new(write_budget: usize) -> Self {
-        Self {
-            state: Mutex::new(WorkerState {
-                alive: true,
-                items: std::collections::VecDeque::new(),
-                write_budget,
-                flush_pending: false,
-                error: None,
-            }),
-            new_work: tokio::sync::Notify::new(),
-            write_ready_changed: tokio::sync::Notify::new(),
-        }
-    }
-    async fn ready(&self) {
-        loop {
-            {
-                let state = self.state();
-                if state.error.is_some()
-                    || !state.alive
-                    || (!state.flush_pending && state.write_budget > 0)
-                {
-                    return;
-                }
-            }
-            self.write_ready_changed.notified().await;
-        }
-    }
-    fn check_write(&self) -> Result<usize, StreamError> {
-        let mut state = self.state();
-        if let Err(e) = state.check_error() {
-            return Err(e);
-        }
-
-        if state.flush_pending || state.write_budget == 0 {
-            return Ok(0);
-        }
-
-        Ok(state.write_budget)
-    }
-    fn state(&self) -> std::sync::MutexGuard<WorkerState> {
-        self.state.lock().unwrap()
-    }
-    fn pop(&self) -> Option<Job> {
-        let mut state = self.state();
-        if state.items.is_empty() {
-            if state.flush_pending {
-                return Some(Job::Flush);
-            }
-        } else if let Some(bytes) = state.items.pop_front() {
-            return Some(Job::Write(bytes));
-        }
-
-        None
-    }
-    fn report_error(&self, e: std::io::Error) {
-        {
-            let mut state = self.state();
-            state.alive = false;
-            state.error = Some(e.into());
-            state.flush_pending = false;
-        }
-        self.write_ready_changed.notify_one();
-    }
-
-    async fn work(&self, writer: mpsc::Sender<Bytes>) {
-        loop {
-            while let Some(job) = self.pop() {
-                match job {
-                    Job::Flush => {
-                        self.state().flush_pending = false;
-                    }
-
-                    Job::Write(bytes) => {
-                        tracing::debug!("worker writing: {bytes:?}");
-                        let len = bytes.len();
-                        match writer.send(bytes).await {
-                            Err(_) => {
-                                self.report_error(std::io::Error::new(
-                                    std::io::ErrorKind::BrokenPipe,
-                                    "Outgoing stream body reader has dropped",
-                                ));
-                                return;
-                            }
-                            Ok(_) => {
-                                self.state().write_budget += len;
-                            }
-                        }
-                    }
-                }
-
-                self.write_ready_changed.notify_one();
-            }
-
-            self.new_work.notified().await;
-        }
-    }
-}
-
-/// Provides a [`HostOutputStream`] impl from a [`tokio::sync::mpsc::Sender`].
-pub struct BodyWriteStream {
-    worker: Arc<Worker>,
-    _join_handle: preview2::AbortOnDropJoinHandle<()>,
-}
-
-impl BodyWriteStream {
-    /// Create a [`BodyWriteStream`].
-    pub fn new(write_budget: usize, writer: mpsc::Sender<Bytes>) -> Self {
-        let worker = Arc::new(Worker::new(write_budget));
-
-        let w = Arc::clone(&worker);
-        let join_handle = preview2::spawn(async move { w.work(writer).await });
-
-        BodyWriteStream {
-            worker,
-            _join_handle: join_handle,
-        }
-    }
-}
-
-#[async_trait::async_trait]
-impl HostOutputStream for BodyWriteStream {
-    fn write(&mut self, bytes: Bytes) -> Result<(), StreamError> {
-        let mut state = self.worker.state();
-        state.check_error()?;
-        if state.flush_pending {
-            return Err(StreamError::Trap(anyhow!(
-                "write not permitted while flush pending"
-            )));
-        }
-        match state.write_budget.checked_sub(bytes.len()) {
-            Some(remaining_budget) => {
-                state.write_budget = remaining_budget;
-                state.items.push_back(bytes);
-            }
-            None => return Err(StreamError::Trap(anyhow!("write exceeded budget"))),
-        }
-        drop(state);
-        self.worker.new_work.notify_one();
-        Ok(())
-    }
-    fn flush(&mut self) -> Result<(), StreamError> {
-        let mut state = self.worker.state();
-        state.check_error()?;
-
-        state.flush_pending = true;
-        self.worker.new_work.notify_one();
-
-        Ok(())
-    }
-
-    fn check_write(&mut self) -> Result<usize, StreamError> {
-        self.worker.check_write()
-    }
-}
-#[async_trait::async_trait]
-impl Subscribe for BodyWriteStream {
-    async fn ready(&mut self) {
-        self.worker.ready().await
-    }
-}
diff --git a/crates/wasi-http/src/component_impl.rs b/crates/wasi-http/src/component_impl.rs
new file mode 100644
index 000000000000..b33e1e07b9f2
--- /dev/null
+++ b/crates/wasi-http/src/component_impl.rs
@@ -0,0 +1,1853 @@
+use crate::bindings::http::{
+    outgoing_handler,
+    types::{Error, Host, Method, RequestOptions, Scheme},
+};
+use crate::WasiHttpView;
+use anyhow::anyhow;
+use std::str;
+use std::vec::Vec;
+use wasmtime::{AsContext, AsContextMut, Caller, Extern, Memory};
+use wasmtime_wasi::preview2::bindings::{io, poll};
+
+const MEMORY: &str = "memory";
+
+#[derive(Debug, thiserror::Error)]
+enum HttpError {
+    #[error("Memory not found")]
+    MemoryNotFound,
+    #[error("Memory access error")]
+    MemoryAccessError(#[from] wasmtime::MemoryAccessError),
+    #[error("Buffer too small")]
+    BufferTooSmall,
+    #[error("UTF-8 error")]
+    Utf8Error(#[from] std::str::Utf8Error),
+}
+
+fn memory_get<T>(caller: &mut Caller<'_, T>) -> Result<Memory, HttpError> {
+    if let Some(Extern::Memory(mem)) = caller.get_export(MEMORY) {
+        Ok(mem)
+    } else {
+        Err(HttpError::MemoryNotFound)
+    }
+}
+
+/// Get a slice of length `len` from `memory`, starting at `offset`.
+/// This will return an `HttpError::BufferTooSmall` if the size of the
+/// requested slice is larger than the memory size.
+fn slice_from_memory(
+    memory: &Memory,
+    mut ctx: impl AsContextMut,
+    offset: u32,
+    len: u32,
+) -> Result<Vec<u8>, HttpError> {
+    let required_memory_size = offset.checked_add(len).ok_or(HttpError::BufferTooSmall)? as usize;
+
+    if required_memory_size > memory.data_size(&mut ctx) {
+        return Err(HttpError::BufferTooSmall);
+    }
+
+    let mut buf = vec![0u8; len as usize];
+    memory.read(&mut ctx, offset as usize, buf.as_mut_slice())?;
+    Ok(buf)
+}
+
+fn u32_from_memory(memory: &Memory, ctx: impl AsContextMut, ptr: u32) -> Result<u32, HttpError> {
+    let slice = slice_from_memory(memory, ctx, ptr, 4)?;
+    let mut dst = [0u8; 4];
+    dst.clone_from_slice(&slice[0..4]);
+    Ok(u32::from_le_bytes(dst))
+}
+
+/// Read a string of byte length `len` from `memory`, starting at `offset`.
+fn string_from_memory(
+    memory: &Memory,
+    ctx: impl AsContextMut,
+    offset: u32,
+    len: u32,
+) -> Result<String, HttpError> {
+    let slice = slice_from_memory(memory, ctx, offset, len)?;
+    Ok(std::str::from_utf8(&slice)?.to_string())
+}
+
+fn read_option_string(
+    memory: &Memory,
+    ctx: impl AsContextMut,
+    is_some: i32,
+    ptr: u32,
+    len: u32,
+) -> Result<Option<String>, HttpError> {
+    if is_some == 1 {
+        Ok(Some(string_from_memory(&memory, ctx, ptr, len)?))
+    } else {
+        Ok(None)
+    }
+}
+
+async fn allocate_guest_pointer<T: Send>(
+    caller: &mut Caller<'_, T>,
+    size: u32,
+) -> anyhow::Result<u32> {
+    let realloc = caller
+        .get_export("cabi_realloc")
+        .ok_or_else(|| anyhow!("missing required export cabi_realloc"))?;
+    let func = realloc
+        .into_func()
+        .ok_or_else(|| anyhow!("cabi_realloc must be a func"))?;
+    let typed = func.typed::<(u32, u32, u32, u32), u32>(caller.as_context())?;
+    Ok(typed
+        .call_async(caller.as_context_mut(), (0, 0, 4, size))
+        .await?)
+}
+
+fn u32_array_to_u8(arr: &[u32]) -> Vec<u8> {
+    let mut result = std::vec::Vec::new();
+    for val in arr.iter() {
+        let bytes = val.to_le_bytes();
+        for b in bytes.iter() {
+            result.push(*b);
+        }
+    }
+    result
+}
+
+pub fn add_component_to_linker<T: WasiHttpView>(
+    linker: &mut wasmtime::Linker<T>,
+    get_cx: impl Fn(&mut T) -> &mut T + Send + Sync + Copy + 'static,
+) -> anyhow::Result<()> {
+    linker.func_wrap8_async(
+        "wasi:http/outgoing-handler",
+        "handle",
+        move |mut caller: Caller<'_, T>,
+              request: u32,
+              has_options: i32,
+              has_timeout: i32,
+              timeout_ms: u32,
+              has_first_byte_timeout: i32,
+              first_byte_timeout_ms: u32,
+              has_between_bytes_timeout: i32,
+              between_bytes_timeout_ms: u32| {
+            Box::new(async move {
+                let options = if has_options == 1 {
+                    Some(RequestOptions {
+                        connect_timeout_ms: if has_timeout == 1 {
+                            Some(timeout_ms)
+                        } else {
+                            None
+                        },
+                        first_byte_timeout_ms: if has_first_byte_timeout == 1 {
+                            Some(first_byte_timeout_ms)
+                        } else {
+                            None
+                        },
+                        between_bytes_timeout_ms: if has_between_bytes_timeout == 1 {
+                            Some(between_bytes_timeout_ms)
+                        } else {
+                            None
+                        },
+                    })
+                } else {
+                    None
+                };
+
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!("[module='wasi:http/outgoing-handler' function='handle'] call request={:?} options={:?}", request, options);
+                let result = outgoing_handler::Host::handle(ctx, request, options).await;
+                tracing::trace!(
+                    "[module='wasi:http/outgoing-handler' function='handle'] return result={:?}",
+                    result
+                );
+                result
+            })
+        },
+    )?;
+    linker.func_wrap14_async(
+        "wasi:http/types",
+        "new-outgoing-request",
+        move |mut caller: Caller<'_, T>,
+              method: i32,
+              method_ptr: i32,
+              method_len: i32,
+              path_is_some: i32,
+              path_ptr: u32,
+              path_len: u32,
+              scheme_is_some: i32,
+              scheme: i32,
+              scheme_ptr: i32,
+              scheme_len: i32,
+              authority_is_some: i32,
+              authority_ptr: u32,
+              authority_len: u32,
+              headers: u32| {
+            Box::new(async move {
+                let memory = memory_get(&mut caller)?;
+                let path = read_option_string(
+                    &memory,
+                    caller.as_context_mut(),
+                    path_is_some,
+                    path_ptr,
+                    path_len,
+                )?;
+                let authority = read_option_string(
+                    &memory,
+                    caller.as_context_mut(),
+                    authority_is_some,
+                    authority_ptr,
+                    authority_len,
+                )?;
+
+                let mut s = Some(Scheme::Https);
+                if scheme_is_some == 1 {
+                    s = Some(match scheme {
+                        0 => Scheme::Http,
+                        1 => Scheme::Https,
+                        _ => {
+                            let value = string_from_memory(
+                                &memory,
+                                caller.as_context_mut(),
+                                scheme_ptr.try_into()?,
+                                scheme_len.try_into()?,
+                            )?;
+                            Scheme::Other(value)
+                        }
+                    });
+                }
+                let m = match method {
+                    0 => Method::Get,
+                    1 => Method::Head,
+                    2 => Method::Post,
+                    3 => Method::Put,
+                    4 => Method::Delete,
+                    5 => Method::Connect,
+                    6 => Method::Options,
+                    7 => Method::Trace,
+                    8 => Method::Patch,
+                    _ => {
+                        let value = string_from_memory(
+                            &memory,
+                            caller.as_context_mut(),
+                            method_ptr.try_into()?,
+                            method_len.try_into()?,
+                        )?;
+                        Method::Other(value)
+                    }
+                };
+
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='new-outgoing-request'] call method={:?} path={:?} scheme={:?} authority={:?} headers={:?}",
+                    m,
+                    path,
+                    s,
+                    authority,
+                    headers
+                );
+                let result =
+                    Host::new_outgoing_request(ctx, m, path, s, authority, headers).await;
+                tracing::trace!(
+                    "[module='wasi:http/types' function='new-outgoing-request'] return result={:?}",
+                    result
+                );
+                result
+            })
+        },
+    )?;
+    linker.func_wrap1_async(
+        "wasi:http/types",
+        "incoming-response-status",
+        move |mut caller: Caller<'_, T>, id: u32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='incoming-response-status'] call id={:?}",
+                    id
+                );
+                let result = Ok(u32::from(Host::incoming_response_status(ctx, id).await?));
+                tracing::trace!(
+                    "[module='wasi:http/types' function='incoming-response-status'] return result={:?}",
+                    result
+                );
+                result
+            })
+        },
+    )?;
+    linker.func_wrap1_async(
+        "wasi:http/types",
+        "drop-future-incoming-response",
+        move |mut caller: Caller<'_, T>, id: u32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='drop-future-incoming-response'] call id={:?}",
+                    id
+                );
+                let result = Host::drop_future_incoming_response(ctx, id).await;
+                tracing::trace!(
+                    "[module='wasi:http/types' function='drop-future-incoming-response'] return result={:?}",
+                    result
+                );
+                result
+            })
+        },
+    )?;
+    linker.func_wrap2_async(
+        "wasi:http/types",
+        "future-incoming-response-get",
+        move |mut caller: Caller<'_, T>, future: u32, ptr: i32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='future-incoming-response-get'] call future={:?}",
+                    future
+                );
+                let result = Host::future_incoming_response_get(ctx, future).await;
+                tracing::trace!(
+                    "[module='wasi:http/types' function='future-incoming-response-get'] return result={:?}",
+                    result
+                );
+                let response = result?;
+
+                let memory = memory_get(&mut caller)?;
+
+                // First == is_some
+                // Second == is_err
+                // Third == {ok: is_err = false, tag: is_err = true}
+                // Fourth == string ptr
+                // Fifth == string len
+                let result: [u32; 5] = match response {
+                    Some(inner) => match inner {
+                        Ok(value) => [1, 0, value, 0, 0],
+                        Err(error) => {
+                            let (tag, err_string) = match error {
+                                Error::InvalidUrl(e) => (0u32, e),
+                                Error::TimeoutError(e) => (1u32, e),
+                                Error::ProtocolError(e) => (2u32, e),
+                                Error::UnexpectedError(e) => (3u32, e),
+                            };
+                            let bytes = err_string.as_bytes();
+                            let len = bytes.len().try_into().unwrap();
+                            let ptr = allocate_guest_pointer(&mut caller, len).await?;
+                            memory.write(caller.as_context_mut(), ptr as _, bytes)?;
+                            [1, 1, tag, ptr, len]
+                        }
+                    },
+                    None => [0, 0, 0, 0, 0],
+                };
+                let raw = u32_array_to_u8(&result);
+
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+                Ok(())
+            })
+        },
+    )?;
+    linker.func_wrap1_async(
+        "wasi:http/types",
+        "listen-to-future-incoming-response",
+        move |mut caller: Caller<'_, T>, future: u32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='listen-to-future-incoming-response'] call future={:?}",
+                    future
+                );
+                let result = Host::listen_to_future_incoming_response(ctx, future).await;
+                tracing::trace!(
+                    "[module='wasi:http/types' function='listen-to-future-incoming-response'] return result={:?}",
+                    result
+                );
+                result
+            })
+        },
+    )?;
+    linker.func_wrap2_async(
+        "wasi:http/types",
+        "incoming-response-consume",
+        move |mut caller: Caller<'_, T>, response: u32, ptr: i32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                    tracing::trace!(
+                        "[module='wasi:http/types' function='incoming-response-consume'] call response={:?}",
+                        response
+                    );
+                    let result = Host::incoming_response_consume(ctx, response).await;
+                    tracing::trace!(
+                        "[module='wasi:http/types' function='incoming-response-consume'] return result={:?}",
+                        result
+                    );
+                    let stream = result?.unwrap_or(0);
+
+                let memory = memory_get(&mut caller).unwrap();
+
+                // First == is_some
+                // Second == stream_id
+                let result: [u32; 2] = [0, stream];
+                let raw = u32_array_to_u8(&result);
+
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+                Ok(())
+            })
+        },
+    )?;
+    linker.func_wrap1_async(
+        "wasi:poll/poll",
+        "drop-pollable",
+        move |mut caller: Caller<'_, T>, id: u32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:poll/poll' function='drop-pollable'] call id={:?}",
+                    id
+                );
+                let result = poll::poll::Host::drop_pollable(ctx, id);
+                tracing::trace!(
+                    "[module='wasi:poll/poll' function='drop-pollable'] return result={:?}",
+                    result
+                );
+                result
+            })
+        },
+    )?;
+    linker.func_wrap3_async(
+        "wasi:poll/poll",
+        "poll-oneoff",
+        move |mut caller: Caller<'_, T>, base_ptr: u32, len: u32, out_ptr: u32| {
+            Box::new(async move {
+                let memory = memory_get(&mut caller)?;
+
+                let mut vec = Vec::new();
+                let mut i = 0;
+                while i < len {
+                    let ptr = base_ptr + i * 4;
+                    let pollable_ptr = u32_from_memory(&memory, caller.as_context_mut(), ptr)?;
+                    vec.push(pollable_ptr);
+                    i = i + 1;
+                }
+
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:poll/poll' function='poll-oneoff'] call in={:?}",
+                    vec
+                );
+                let result = poll::poll::Host::poll_oneoff(ctx, vec).await;
+                tracing::trace!(
+                    "[module='wasi:poll/poll' function='poll-oneoff'] return result={:?}",
+                    result
+                );
+                let result = result?;
+
+                let result_len = result.len();
+                let result_ptr =
+                    allocate_guest_pointer(&mut caller, (4 * result_len).try_into()?).await?;
+                let mut ptr = result_ptr;
+                for item in result.iter() {
+                    let completion: u32 = match item {
+                        true => 1,
+                        false => 0,
+                    };
+                    memory.write(caller.as_context_mut(), ptr as _, &completion.to_be_bytes())?;
+
+                    ptr = ptr + 4;
+                }
+
+                let result: [u32; 2] = [result_ptr, result_len.try_into()?];
+                let raw = u32_array_to_u8(&result);
+                memory.write(caller.as_context_mut(), out_ptr as _, &raw)?;
+                Ok(())
+            })
+        },
+    )?;
+    linker.func_wrap1_async(
+        "wasi:io/streams",
+        "drop-input-stream",
+        move |mut caller: Caller<'_, T>, id: u32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='drop-input-stream'] call id={:?}",
+                    id
+                );
+                let result = io::streams::Host::drop_input_stream(ctx, id);
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='drop-input-stream'] return result={:?}",
+                    result
+                );
+                result
+            })
+        },
+    )?;
+    linker.func_wrap1_async(
+        "wasi:io/streams",
+        "drop-output-stream",
+        move |mut caller: Caller<'_, T>, id: u32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='drop-output-stream'] call id={:?}",
+                    id
+                );
+                let result = io::streams::Host::drop_output_stream(ctx, id);
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='drop-output-stream'] return result={:?}",
+                    result
+                );
+                result
+            })
+        },
+    )?;
+    linker.func_wrap3_async(
+        "wasi:io/streams",
+        "read",
+        move |mut caller: Caller<'_, T>, stream: u32, len: u64, ptr: u32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='read'] call this={:?} len={:?}",
+                    stream,
+                    len
+                );
+                let result = io::streams::Host::read(ctx, stream, len).await;
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='read'] return result={:?}",
+                    result
+                );
+                let (bytes, status) = result?.map_err(|_| anyhow!("read failed"))?;
+
+                let done = match status {
+                    io::streams::StreamStatus::Open => 0,
+                    io::streams::StreamStatus::Ended => 1,
+                };
+                let body_len: u32 = bytes.len().try_into()?;
+                let out_ptr = allocate_guest_pointer(&mut caller, body_len).await?;
+
+                // First == is_err
+                // Second == {ok: is_err = false, tag: is_err = true}
+                // Third == bytes length
+                // Fourth == enum status
+                let result: [u32; 4] = [0, out_ptr, body_len, done];
+                let raw = u32_array_to_u8(&result);
+
+                let memory = memory_get(&mut caller)?;
+                memory.write(caller.as_context_mut(), out_ptr as _, &bytes)?;
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+                Ok(())
+            })
+        },
+    )?;
+    linker.func_wrap3_async(
+        "wasi:io/streams",
+        "blocking-read",
+        move |mut caller: Caller<'_, T>, stream: u32, len: u64, ptr: u32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='blocking-read'] call this={:?} len={:?}",
+                    stream,
+                    len
+                );
+                let result = io::streams::Host::blocking_read(ctx, stream, len).await;
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='blocking-read'] return result={:?}",
+                    result
+                );
+                let (bytes, status) = result?.map_err(|_| anyhow!("read failed"))?;
+
+                let done = match status {
+                    io::streams::StreamStatus::Open => 0,
+                    io::streams::StreamStatus::Ended => 1,
+                };
+                let body_len: u32 = bytes.len().try_into()?;
+                let out_ptr = allocate_guest_pointer(&mut caller, body_len).await?;
+
+                // First == is_err
+                // Second == {ok: is_err = false, tag: is_err = true}
+                // Third == bytes length
+                // Fourth == enum status
+                let result: [u32; 4] = [0, out_ptr, body_len, done];
+                let raw = u32_array_to_u8(&result);
+
+                let memory = memory_get(&mut caller)?;
+                memory.write(caller.as_context_mut(), out_ptr as _, &bytes)?;
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+                Ok(())
+            })
+        },
+    )?;
+    linker.func_wrap1_async(
+        "wasi:io/streams",
+        "subscribe-to-input-stream",
+        move |mut caller: Caller<'_, T>, stream: u32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='subscribe-to-input-stream'] call stream={:?}",
+                    stream
+                );
+                let result = io::streams::Host::subscribe_to_input_stream(ctx, stream);
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='subscribe-to-input-stream'] return result={:?}",
+                    result
+                );
+                result
+            })
+        },
+    )?;
+    linker.func_wrap1_async(
+        "wasi:io/streams",
+        "subscribe-to-output-stream",
+        move |mut caller: Caller<'_, T>, stream: u32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='subscribe-to-output-stream'] call stream={:?}",
+                    stream
+                );
+                let result = io::streams::Host::subscribe_to_output_stream(ctx, stream);
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='subscribe-to-output-stream'] return result={:?}",
+                    result
+                );
+                result
+            })
+        },
+    )?;
+    linker.func_wrap2_async(
+        "wasi:io/streams",
+        "check-write",
+        move |mut caller: Caller<'_, T>, stream: u32, ptr: u32| {
+            Box::new(async move {
+                let memory = memory_get(&mut caller)?;
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='check-write'] call stream={:?}",
+                    stream,
+                );
+                let result = io::streams::Host::check_write(ctx, stream);
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='check-write'] return result={:?}",
+                    result
+                );
+
+                let result: [u32; 3] = match result {
+                    // 0 == outer result tag (success)
+                    // 1 == result value (u64 upper 32 bits)
+                    // 2 == result value (u64 lower 32 bits)
+                    Ok(len) => [0, (len >> 32) as u32, len as u32],
+
+                    // 0 == outer result tag (failure)
+                    // 1 == result value (unused)
+                    // 2 == result value (error type)
+                    Err(_) => todo!("how do we extract runtime error cases?"),
+                };
+
+                let raw = u32_array_to_u8(&result);
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+
+                Ok(())
+            })
+        },
+    )?;
+    linker.func_wrap2_async(
+        "wasi:io/streams",
+        "flush",
+        move |mut caller: Caller<'_, T>, stream: u32, ptr: u32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='flush'] call stream={:?}",
+                    stream
+                );
+                let result = io::streams::Host::flush(ctx, stream);
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='flush'] return result={:?}",
+                    result
+                );
+
+                let result: [u32; 2] = match result {
+                    // 0 == outer result tag
+                    // 1 == unused
+                    Ok(_) => [0, 0],
+
+                    // 0 == outer result tag
+                    // 1 == inner result tag
+                    Err(_) => todo!("how do we extract runtime error cases?"),
+                };
+
+                let raw = u32_array_to_u8(&result);
+                let memory = memory_get(&mut caller)?;
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+
+                Ok(())
+            })
+        },
+    )?;
+    linker.func_wrap2_async(
+        "wasi:io/streams",
+        "blocking-flush",
+        move |mut caller: Caller<'_, T>, stream: u32, ptr: u32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='blocking-flush'] call stream={:?}",
+                    stream
+                );
+                let result = io::streams::Host::blocking_flush(ctx, stream).await;
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='blocking-flush'] return result={:?}",
+                    result
+                );
+
+                let result: [u32; 2] = match result {
+                    // 0 == outer result tag
+                    // 1 == unused
+                    Ok(_) => [0, 0],
+
+                    // 0 == outer result tag
+                    // 1 == inner result tag
+                    Err(_) => todo!("how do we extract runtime error cases?"),
+                };
+
+                let raw = u32_array_to_u8(&result);
+                let memory = memory_get(&mut caller)?;
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+
+                Ok(())
+            })
+        },
+    )?;
+    linker.func_wrap4_async(
+        "wasi:io/streams",
+        "write",
+        move |mut caller: Caller<'_, T>, stream: u32, body_ptr: u32, body_len: u32, ptr: u32| {
+            Box::new(async move {
+                let memory = memory_get(&mut caller)?;
+                let body = slice_from_memory(&memory, caller.as_context_mut(), body_ptr, body_len)?;
+
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='write'] call stream={:?} body={:?}",
+                    stream,
+                    body
+                );
+                let result = io::streams::Host::write(ctx, stream, body.into()).await;
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='write'] return result={:?}",
+                    result
+                );
+                result?;
+
+                // First == is_err
+                // Second == {ok: is_err = false, tag: is_err = true}
+                let result: [u32; 2] = [0, 0];
+                let raw = u32_array_to_u8(&result);
+
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+
+                Ok(())
+            })
+        },
+    )?;
+    linker.func_wrap4_async(
+        "wasi:io/streams",
+        "blocking-write-and-flush",
+        move |mut caller: Caller<'_, T>, stream: u32, body_ptr: u32, body_len: u32, ptr: u32| {
+            Box::new(async move {
+                let memory = memory_get(&mut caller)?;
+                let body = slice_from_memory(&memory, caller.as_context_mut(), body_ptr, body_len)?;
+
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='blocking-write-and-flush'] call stream={:?} body={:?}",
+                    stream,
+                    body
+                );
+                let result = io::streams::Host::blocking_write_and_flush(ctx, stream, body.into()).await;
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='blocking-write-and-flush'] return result={:?}",
+                    result
+                );
+                result?;
+
+                // First == is_err
+                // Second == {ok: is_err = false, tag: is_err = true}
+                let result: [u32; 2] = [0, 0];
+                let raw = u32_array_to_u8(&result);
+
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+
+                Ok(())
+            })
+        },
+    )?;
+    linker.func_wrap1_async(
+        "wasi:http/types",
+        "drop-fields",
+        move |mut caller: Caller<'_, T>, id: u32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='drop-fields'] call id={:?}",
+                    id
+                );
+                let result = Host::drop_fields(ctx, id).await;
+                tracing::trace!(
+                    "[module='wasi:http/types' function='drop-fields'] return result={:?}",
+                    result
+                );
+                result
+            })
+        },
+    )?;
+    linker.func_wrap2_async(
+        "wasi:http/types",
+        "outgoing-request-write",
+        move |mut caller: Caller<'_, T>, request: u32, ptr: u32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='outgoing-request-write'] call request={:?}",
+                    request
+                );
+                let result = Host::outgoing_request_write(ctx, request).await;
+                tracing::trace!(
+                    "[module='wasi:http/types' function='outgoing-request-write'] return result={:?}",
+                    result
+                );
+                let stream = result?
+                    .map_err(|_| anyhow!("no outgoing stream present"))?;
+
+                let memory = memory_get(&mut caller)?;
+                // First == is_some
+                // Second == stream_id
+                let result: [u32; 2] = [0, stream];
+                let raw = u32_array_to_u8(&result);
+
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+                Ok(())
+            })
+        },
+    )?;
+    linker.func_wrap1_async(
+        "wasi:http/types",
+        "drop-outgoing-request",
+        move |mut caller: Caller<'_, T>, id: u32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='drop-outgoing-request'] call id={:?}",
+                    id
+                );
+                let result = Host::drop_outgoing_request(ctx, id).await;
+                tracing::trace!(
+                    "[module='wasi:http/types' function='drop-outgoing-request'] return result={:?}",
+                    result
+                );
+                result
+            })
+        },
+    )?;
+    linker.func_wrap1_async(
+        "wasi:http/types",
+        "drop-incoming-response",
+        move |mut caller: Caller<'_, T>, id: u32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='drop-incoming-response'] call id={:?}",
+                    id
+                );
+                let result = Host::drop_incoming_response(ctx, id).await;
+                tracing::trace!(
+                    "[module='wasi:http/types' function='drop-incoming-response'] return result={:?}",
+                    result
+                );
+                result
+            })
+        },
+    )?;
+    linker.func_wrap2_async(
+        "wasi:http/types",
+        "new-fields",
+        move |mut caller: Caller<'_, T>, base_ptr: u32, len: u32| {
+            Box::new(async move {
+                let memory = memory_get(&mut caller)?;
+
+                let mut vec = Vec::new();
+                let mut i = 0;
+                // TODO: read this more efficiently as a single block.
+                while i < len {
+                    let ptr = base_ptr + i * 16;
+                    let name_ptr = u32_from_memory(&memory, caller.as_context_mut(), ptr)?;
+                    let name_len = u32_from_memory(&memory, caller.as_context_mut(), ptr + 4)?;
+                    let value_ptr = u32_from_memory(&memory, caller.as_context_mut(), ptr + 8)?;
+                    let value_len = u32_from_memory(&memory, caller.as_context_mut(), ptr + 12)?;
+
+                    let name =
+                        string_from_memory(&memory, caller.as_context_mut(), name_ptr, name_len)?;
+                    let value =
+                        string_from_memory(&memory, caller.as_context_mut(), value_ptr, value_len)?;
+
+                    vec.push((name, value));
+                    i = i + 1;
+                }
+
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='new-fields'] call entries={:?}",
+                    vec
+                );
+                let result = Host::new_fields(ctx, vec).await;
+                tracing::trace!(
+                    "[module='wasi:http/types' function='new-fields'] return result={:?}",
+                    result
+                );
+                result
+            })
+        },
+    )?;
+    linker.func_wrap2_async(
+        "wasi:http/types",
+        "fields-entries",
+        move |mut caller: Caller<'_, T>, fields: u32, out_ptr: u32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='fields-entries'] call fields={:?}",
+                    fields
+                );
+                let result = Host::fields_entries(ctx, fields).await;
+                tracing::trace!(
+                    "[module='wasi:http/types' function='fields-entries'] return result={:?}",
+                    result
+                );
+                let entries = result?;
+
+                let header_len = entries.len();
+                let tuple_ptr =
+                    allocate_guest_pointer(&mut caller, (16 * header_len).try_into()?).await?;
+                let mut ptr = tuple_ptr;
+                for item in entries.iter() {
+                    let name = &item.0;
+                    let value = &item.1;
+                    let name_len: u32 = name.len().try_into()?;
+                    let value_len: u32 = value.len().try_into()?;
+
+                    let name_ptr = allocate_guest_pointer(&mut caller, name_len).await?;
+                    let value_ptr = allocate_guest_pointer(&mut caller, value_len).await?;
+
+                    let memory = memory_get(&mut caller)?;
+                    memory.write(caller.as_context_mut(), name_ptr as _, &name.as_bytes())?;
+                    memory.write(caller.as_context_mut(), value_ptr as _, value)?;
+
+                    let pair: [u32; 4] = [name_ptr, name_len, value_ptr, value_len];
+                    let raw_pair = u32_array_to_u8(&pair);
+                    memory.write(caller.as_context_mut(), ptr as _, &raw_pair)?;
+
+                    ptr = ptr + 16;
+                }
+
+                let memory = memory_get(&mut caller)?;
+                let result: [u32; 2] = [tuple_ptr, header_len.try_into()?];
+                let raw = u32_array_to_u8(&result);
+                memory.write(caller.as_context_mut(), out_ptr as _, &raw)?;
+                Ok(())
+            })
+        },
+    )?;
+    linker.func_wrap1_async(
+        "wasi:http/types",
+        "incoming-response-headers",
+        move |mut caller: Caller<'_, T>, handle: u32| {
+            Box::new(async move {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='incoming-response-headers'] call handle={:?}",
+                    handle
+                );
+                let result = Host::incoming_response_headers(ctx, handle).await;
+                tracing::trace!(
+                    "[module='wasi:http/types' function='incoming-response-headers'] return result={:?}",
+                    result
+                );
+                result
+            })
+        },
+    )?;
+    Ok(())
+}
+
+pub mod sync {
+    use super::{
+        memory_get, read_option_string, string_from_memory, u32_array_to_u8, u32_from_memory,
+    };
+    use crate::bindings::sync::http::{
+        outgoing_handler,
+        types::{Error, Host, Method, RequestOptions, Scheme},
+    };
+    use crate::WasiHttpView;
+    use anyhow::anyhow;
+    use wasmtime::{AsContext, AsContextMut, Caller};
+    use wasmtime_wasi::preview2::bindings::sync_io::{io, poll};
+
+    fn allocate_guest_pointer<T: Send>(
+        caller: &mut Caller<'_, T>,
+        size: u32,
+    ) -> anyhow::Result<u32> {
+        let realloc = caller
+            .get_export("cabi_realloc")
+            .ok_or_else(|| anyhow!("missing required export cabi_realloc"))?;
+        let func = realloc
+            .into_func()
+            .ok_or_else(|| anyhow!("cabi_realloc must be a func"))?;
+        let typed = func.typed::<(u32, u32, u32, u32), u32>(caller.as_context())?;
+        Ok(typed.call(caller.as_context_mut(), (0, 0, 4, size))?)
+    }
+
+    pub fn add_component_to_linker<T: WasiHttpView>(
+        linker: &mut wasmtime::Linker<T>,
+        get_cx: impl Fn(&mut T) -> &mut T + Send + Sync + Copy + 'static,
+    ) -> anyhow::Result<()> {
+        linker.func_wrap(
+            "wasi:http/outgoing-handler",
+            "handle",
+            move |mut caller: Caller<'_, T>,
+                  request: u32,
+                  has_options: i32,
+                  has_timeout: i32,
+                  timeout_ms: u32,
+                  has_first_byte_timeout: i32,
+                  first_byte_timeout_ms: u32,
+                  has_between_bytes_timeout: i32,
+                  between_bytes_timeout_ms: u32|
+                  -> anyhow::Result<u32> {
+                let options = if has_options == 1 {
+                    Some(RequestOptions {
+                        connect_timeout_ms: if has_timeout == 1 {
+                            Some(timeout_ms)
+                        } else {
+                            None
+                        },
+                        first_byte_timeout_ms: if has_first_byte_timeout == 1 {
+                            Some(first_byte_timeout_ms)
+                        } else {
+                            None
+                        },
+                        between_bytes_timeout_ms: if has_between_bytes_timeout == 1 {
+                            Some(between_bytes_timeout_ms)
+                        } else {
+                            None
+                        },
+                    })
+                } else {
+                    None
+                };
+
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!("[module='wasi:http/outgoing-handler' function='handle'] call request={:?} options={:?}", request, options);
+                let result = outgoing_handler::Host::handle(ctx, request, options);
+                tracing::trace!(
+                    "[module='wasi:http/outgoing-handler' function='handle'] return result={:?}",
+                    result
+                );
+                result
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:http/types",
+            "new-outgoing-request",
+            move |mut caller: Caller<'_, T>,
+                  method: i32,
+                  method_ptr: i32,
+                  method_len: i32,
+                  path_is_some: i32,
+                  path_ptr: u32,
+                  path_len: u32,
+                  scheme_is_some: i32,
+                  scheme: i32,
+                  scheme_ptr: i32,
+                  scheme_len: i32,
+                  authority_is_some: i32,
+                  authority_ptr: u32,
+                  authority_len: u32,
+                  headers: u32|
+                  -> anyhow::Result<u32> {
+                let memory = memory_get(&mut caller)?;
+                let path = read_option_string(
+                    &memory,
+                    caller.as_context_mut(),
+                    path_is_some,
+                    path_ptr,
+                    path_len,
+                )?;
+                let authority = read_option_string(
+                    &memory,
+                    caller.as_context_mut(),
+                    authority_is_some,
+                    authority_ptr,
+                    authority_len,
+                )?;
+
+                let mut s = Some(Scheme::Https);
+                if scheme_is_some == 1 {
+                    s = Some(match scheme {
+                        0 => Scheme::Http,
+                        1 => Scheme::Https,
+                        _ => {
+                            let value = string_from_memory(
+                                &memory,
+                                caller.as_context_mut(),
+                                scheme_ptr.try_into()?,
+                                scheme_len.try_into()?,
+                            )?;
+                            Scheme::Other(value)
+                        }
+                    });
+                }
+                let m = match method {
+                    0 => Method::Get,
+                    1 => Method::Head,
+                    2 => Method::Post,
+                    3 => Method::Put,
+                    4 => Method::Delete,
+                    5 => Method::Connect,
+                    6 => Method::Options,
+                    7 => Method::Trace,
+                    8 => Method::Patch,
+                    _ => {
+                        let value = string_from_memory(
+                            &memory,
+                            caller.as_context_mut(),
+                            method_ptr.try_into()?,
+                            method_len.try_into()?,
+                        )?;
+                        Method::Other(value)
+                    }
+                };
+
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='new-outgoing-request'] call method={:?} path={:?} scheme={:?} authority={:?} headers={:?}",
+                    m,
+                    path,
+                    s,
+                    authority,
+                    headers
+                );
+                let result =
+                    Host::new_outgoing_request(ctx, m, path, s, authority, headers);
+                tracing::trace!(
+                    "[module='wasi:http/types' function='new-outgoing-request'] return result={:?}",
+                    result
+                );
+                result
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:http/types",
+            "incoming-response-status",
+            move |mut caller: Caller<'_, T>, id: u32| -> anyhow::Result<u32> {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='incoming-response-status'] call id={:?}",
+                    id
+                );
+                let result = Ok(u32::from(Host::incoming_response_status(ctx, id)?));
+                tracing::trace!(
+                    "[module='wasi:http/types' function='incoming-response-status'] return result={:?}",
+                    result
+                );
+                result
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:http/types",
+            "drop-future-incoming-response",
+            move |mut caller: Caller<'_, T>, id: u32| -> anyhow::Result<()> {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='drop-future-incoming-response'] call id={:?}",
+                    id
+                );
+                let result = Host::drop_future_incoming_response(ctx, id);
+                tracing::trace!(
+                    "[module='wasi:http/types' function='drop-future-incoming-response'] return result={:?}",
+                    result
+                );
+                result
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:http/types",
+            "future-incoming-response-get",
+            move |mut caller: Caller<'_, T>, future: u32, ptr: i32| -> anyhow::Result<()> {
+                let ctx = get_cx(caller.data_mut());
+
+                tracing::trace!(
+                    "[module='wasi:http/types' function='future-incoming-response-get'] call future={:?}",
+                    future
+                );
+                let result = Host::future_incoming_response_get(ctx, future);
+                tracing::trace!(
+                    "[module='wasi:http/types' function='future-incoming-response-get'] return result={:?}",
+                    result
+                );
+                let response = result?;
+
+                let memory = memory_get(&mut caller)?;
+
+                // First == is_some
+                // Second == is_err
+                // Third == {ok: is_err = false, tag: is_err = true}
+                // Fourth == string ptr
+                // Fifth == string len
+                let result: [u32; 5] = match response {
+                    Some(inner) => match inner {
+                        Ok(value) => [1, 0, value, 0, 0],
+                        Err(error) => {
+                            let (tag, err_string) = match error {
+                                Error::InvalidUrl(e) => (0u32, e),
+                                Error::TimeoutError(e) => (1u32, e),
+                                Error::ProtocolError(e) => (2u32, e),
+                                Error::UnexpectedError(e) => (3u32, e),
+                            };
+                            let bytes = err_string.as_bytes();
+                            let len = bytes.len().try_into().unwrap();
+                            let ptr = allocate_guest_pointer(&mut caller, len)?;
+                            memory.write(caller.as_context_mut(), ptr as _, bytes)?;
+                            [1, 1, tag, ptr, len]
+                        }
+                    },
+                    None => [0, 0, 0, 0, 0],
+                };
+                let raw = u32_array_to_u8(&result);
+
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+                Ok(())
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:http/types",
+            "listen-to-future-incoming-response",
+            move |mut caller: Caller<'_, T>, future: u32| -> anyhow::Result<u32> {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='listen-to-future-incoming-response'] call future={:?}",
+                    future
+                );
+                let result = Host::listen_to_future_incoming_response(ctx, future);
+                tracing::trace!(
+                    "[module='wasi:http/types' function='listen-to-future-incoming-response'] return result={:?}",
+                    result
+                );
+                result
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:http/types",
+            "incoming-response-consume",
+            move |mut caller: Caller<'_, T>, response: u32, ptr: i32| -> anyhow::Result<()> {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='incoming-response-consume'] call response={:?}",
+                    response
+                );
+                let result = Host::incoming_response_consume(ctx, response);
+                tracing::trace!(
+                    "[module='wasi:http/types' function='incoming-response-consume'] return result={:?}",
+                    result
+                );
+                let stream = result?.unwrap_or(0);
+
+                let memory = memory_get(&mut caller).unwrap();
+
+                // First == is_some
+                // Second == stream_id
+                let result: [u32; 2] = [0, stream];
+                let raw = u32_array_to_u8(&result);
+
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+                Ok(())
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:poll/poll",
+            "drop-pollable",
+            move |mut caller: Caller<'_, T>, id: u32| -> anyhow::Result<()> {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:poll/poll' function='drop-pollable'] call id={:?}",
+                    id
+                );
+                let result = poll::poll::Host::drop_pollable(ctx, id);
+                tracing::trace!(
+                    "[module='wasi:poll/poll' function='drop-pollable'] return result={:?}",
+                    result
+                );
+                result
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:poll/poll",
+            "poll-oneoff",
+            move |mut caller: Caller<'_, T>,
+                  base_ptr: u32,
+                  len: u32,
+                  out_ptr: u32|
+                  -> anyhow::Result<()> {
+                let memory = memory_get(&mut caller)?;
+
+                let mut vec = Vec::new();
+                let mut i = 0;
+                while i < len {
+                    let ptr = base_ptr + i * 4;
+                    let pollable_ptr = u32_from_memory(&memory, caller.as_context_mut(), ptr)?;
+                    vec.push(pollable_ptr);
+                    i = i + 1;
+                }
+
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:poll/poll' function='poll-oneoff'] call in={:?}",
+                    vec
+                );
+                let result = poll::poll::Host::poll_oneoff(ctx, vec);
+                tracing::trace!(
+                    "[module='wasi:poll/poll' function='poll-oneoff'] return result={:?}",
+                    result
+                );
+                let result = result?;
+
+                let result_len = result.len();
+                let result_ptr = allocate_guest_pointer(&mut caller, (4 * result_len).try_into()?)?;
+                let mut ptr = result_ptr;
+                for item in result.iter() {
+                    let completion: u32 = match item {
+                        true => 1,
+                        false => 0,
+                    };
+                    memory.write(caller.as_context_mut(), ptr as _, &completion.to_be_bytes())?;
+
+                    ptr = ptr + 4;
+                }
+
+                let result: [u32; 2] = [result_ptr, result_len.try_into()?];
+                let raw = u32_array_to_u8(&result);
+                memory.write(caller.as_context_mut(), out_ptr as _, &raw)?;
+                Ok(())
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:io/streams",
+            "drop-input-stream",
+            move |mut caller: Caller<'_, T>, id: u32| -> anyhow::Result<()> {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='drop-input-stream'] call id={:?}",
+                    id
+                );
+                let result = io::streams::Host::drop_input_stream(ctx, id);
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='drop-input-stream'] return result={:?}",
+                    result
+                );
+                result
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:io/streams",
+            "drop-output-stream",
+            move |mut caller: Caller<'_, T>, id: u32| -> anyhow::Result<()> {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='drop-output-stream'] call id={:?}",
+                    id
+                );
+                let result = io::streams::Host::drop_output_stream(ctx, id);
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='drop-output-stream'] return result={:?}",
+                    result
+                );
+                result
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:io/streams",
+            "read",
+            move |mut caller: Caller<'_, T>,
+                  stream: u32,
+                  len: u64,
+                  ptr: u32|
+                  -> anyhow::Result<()> {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='read'] call this={:?} len={:?}",
+                    stream,
+                    len
+                );
+                let result = io::streams::Host::read(ctx, stream, len);
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='read'] return result={:?}",
+                    result
+                );
+                let (bytes, status) = result?.map_err(|_| anyhow!("read failed"))?;
+
+                let done = match status {
+                    io::streams::StreamStatus::Open => 0,
+                    io::streams::StreamStatus::Ended => 1,
+                };
+                let body_len: u32 = bytes.len().try_into()?;
+                let out_ptr = allocate_guest_pointer(&mut caller, body_len)?;
+
+                // First == is_err
+                // Second == {ok: is_err = false, tag: is_err = true}
+                // Third == bytes length
+                // Fourth == enum status
+                let result: [u32; 4] = [0, out_ptr, body_len, done];
+                let raw = u32_array_to_u8(&result);
+
+                let memory = memory_get(&mut caller)?;
+                memory.write(caller.as_context_mut(), out_ptr as _, &bytes)?;
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+                Ok(())
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:io/streams",
+            "blocking-read",
+            move |mut caller: Caller<'_, T>,
+                  stream: u32,
+                  len: u64,
+                  ptr: u32|
+                  -> anyhow::Result<()> {
+                let ctx = get_cx(caller.data_mut());
+
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='blocking-read'] call this={:?} len={:?}",
+                    stream,
+                    len
+                );
+                let result = io::streams::Host::blocking_read(ctx, stream, len);
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='blocking-read'] return result={:?}",
+                    result
+                );
+                let (bytes, status) = result?.map_err(|_| anyhow!("read failed"))?;
+
+                let done = match status {
+                    io::streams::StreamStatus::Open => 0,
+                    io::streams::StreamStatus::Ended => 1,
+                };
+                let body_len: u32 = bytes.len().try_into()?;
+                let out_ptr = allocate_guest_pointer(&mut caller, body_len)?;
+
+                // First == is_err
+                // Second == {ok: is_err = false, tag: is_err = true}
+                // Third == bytes length
+                // Fourth == enum status
+                let result: [u32; 4] = [0, out_ptr, body_len, done];
+                let raw = u32_array_to_u8(&result);
+
+                let memory = memory_get(&mut caller)?;
+                memory.write(caller.as_context_mut(), out_ptr as _, &bytes)?;
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+                Ok(())
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:io/streams",
+            "subscribe-to-input-stream",
+            move |mut caller: Caller<'_, T>, stream: u32| -> anyhow::Result<u32> {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='subscribe-to-input-stream'] call stream={:?}",
+                    stream
+                );
+                let result = io::streams::Host::subscribe_to_input_stream(ctx, stream)?;
+                // TODO: necessary until this PR has been merged:
+                // https://github.com/bytecodealliance/wasmtime/pull/6877
+                let oneoff_result = poll::poll::Host::poll_oneoff(ctx, vec![result])?;
+                tracing::trace!(
+                    "[module='wasi:poll/poll' function='poll-oneoff'] return result={:?}",
+                    oneoff_result
+                );
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='subscribe-to-input-stream'] return result=Ok({:?})",
+                    result
+                );
+                Ok(result)
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:io/streams",
+            "subscribe-to-output-stream",
+            move |mut caller: Caller<'_, T>, stream: u32| -> anyhow::Result<u32> {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='subscribe-to-output-stream'] call stream={:?}",
+                    stream
+                );
+                let result = io::streams::Host::subscribe_to_output_stream(ctx, stream)?;
+                // TODO: necessary until this PR has been merged:
+                // https://github.com/bytecodealliance/wasmtime/pull/6877
+                let oneoff_result = poll::poll::Host::poll_oneoff(ctx, vec![result])?;
+                tracing::trace!(
+                    "[module='wasi:poll/poll' function='poll-oneoff'] return result={:?}",
+                    oneoff_result
+                );
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='subscribe-to-output-stream'] return result=Ok({:?})",
+                    result
+                );
+                Ok(result)
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:io/streams",
+            "write",
+            move |mut caller: Caller<'_, T>,
+                  stream: u32,
+                  body_ptr: u32,
+                  body_len: u32,
+                  ptr: u32|
+                  -> anyhow::Result<()> {
+                let memory = memory_get(&mut caller)?;
+                let body =
+                    string_from_memory(&memory, caller.as_context_mut(), body_ptr, body_len)?;
+
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='write'] call stream={:?} body={:?}",
+                    stream,
+                    body
+                );
+                let result = io::streams::Host::write(ctx, stream, body.into());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='write'] return result={:?}",
+                    result
+                );
+                result?;
+
+                // First == is_err
+                // Second == {ok: is_err = false, tag: is_err = true}
+                let result: [u32; 2] = [0, 0];
+                let raw = u32_array_to_u8(&result);
+
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+
+                Ok(())
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:io/streams",
+            "blocking-write-and-flush",
+            move |mut caller: Caller<'_, T>,
+                  stream: u32,
+                  body_ptr: u32,
+                  body_len: u32,
+                  ptr: u32|
+                  -> anyhow::Result<()> {
+                let memory = memory_get(&mut caller)?;
+                let body =
+                    string_from_memory(&memory, caller.as_context_mut(), body_ptr, body_len)?;
+
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='blocking-write-and-flush'] call stream={:?} body={:?}",
+                    stream,
+                    body
+                );
+                let result = io::streams::Host::blocking_write_and_flush(ctx, stream, body.into());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='blocking-write-and-flush'] return result={:?}",
+                    result
+                );
+                result?;
+
+                // First == is_err
+                // Second == {ok: is_err = false, tag: is_err = true}
+                let result: [u32; 2] = [0, 0];
+                let raw = u32_array_to_u8(&result);
+
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+
+                Ok(())
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:io/streams",
+            "check-write",
+            move |mut caller: Caller<'_, T>, stream: u32, ptr: u32| {
+                let memory = memory_get(&mut caller)?;
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='check-write'] call stream={:?}",
+                    stream
+                );
+                let result = io::streams::Host::check_write(ctx, stream);
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='check-write'] return result={:?}",
+                    result
+                );
+
+                let result: [u32; 3] = match result {
+                    // 0 == outer result tag (success)
+                    // 1 == result value (u64 upper 32 bits)
+                    // 2 == result value (u64 lower 32 bits)
+                    Ok(len) => [0, (len >> 32) as u32, len as u32],
+
+                    // 0 == outer result tag (failure)
+                    // 1 == result value (unused)
+                    // 2 == result value (error type)
+                    Err(_) => todo!("how do we extract runtime error cases?"),
+                };
+
+                let raw = u32_array_to_u8(&result);
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+
+                Ok(())
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:io/streams",
+            "flush",
+            move |mut caller: Caller<'_, T>, stream: u32, ptr: u32| {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='flush'] call stream={:?}",
+                    stream
+                );
+                let result = io::streams::Host::flush(ctx, stream);
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='flush'] return result={:?}",
+                    result
+                );
+
+                let result: [u32; 2] = match result {
+                    // 0 == outer result tag
+                    // 1 == unused
+                    Ok(_) => [0, 0],
+
+                    // 0 == outer result tag
+                    // 1 == inner result tag
+                    Err(_) => todo!("how do we extract runtime error cases?"),
+                };
+
+                let raw = u32_array_to_u8(&result);
+                let memory = memory_get(&mut caller)?;
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+
+                Ok(())
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:io/streams",
+            "blocking-flush",
+            move |mut caller: Caller<'_, T>, stream: u32, ptr: u32| {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='blocking-flush'] call stream={:?}",
+                    stream
+                );
+                let result = io::streams::Host::blocking_flush(ctx, stream);
+                tracing::trace!(
+                    "[module='wasi:io/streams' function='blocking-flush'] return result={:?}",
+                    result
+                );
+
+                let result: [u32; 2] = match result {
+                    // 0 == outer result tag
+                    // 1 == unused
+                    Ok(_) => [0, 0],
+
+                    // 0 == outer result tag
+                    // 1 == inner result tag
+                    Err(_) => todo!("how do we extract runtime error cases?"),
+                };
+
+                let raw = u32_array_to_u8(&result);
+                let memory = memory_get(&mut caller)?;
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+
+                Ok(())
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:http/types",
+            "drop-fields",
+            move |mut caller: Caller<'_, T>, id: u32| -> anyhow::Result<()> {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='drop-fields'] call id={:?}",
+                    id
+                );
+                let result = Host::drop_fields(ctx, id);
+                tracing::trace!(
+                    "[module='wasi:http/types' function='drop-fields'] return result={:?}",
+                    result
+                );
+                result
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:http/types",
+            "outgoing-request-write",
+            move |mut caller: Caller<'_, T>, request: u32, ptr: u32| -> anyhow::Result<()> {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='outgoing-request-write'] call request={:?}",
+                    request
+                );
+                let result = Host::outgoing_request_write(ctx, request);
+                tracing::trace!(
+                    "[module='wasi:http/types' function='outgoing-request-write'] return result={:?}",
+                    result
+                );
+                let stream = result?
+                    .map_err(|_| anyhow!("no outgoing stream present"))?;
+
+                let memory = memory_get(&mut caller)?;
+                // First == is_some
+                // Second == stream_id
+                let result: [u32; 2] = [0, stream];
+                let raw = u32_array_to_u8(&result);
+
+                memory.write(caller.as_context_mut(), ptr as _, &raw)?;
+                Ok(())
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:http/types",
+            "drop-outgoing-request",
+            move |mut caller: Caller<'_, T>, id: u32| -> anyhow::Result<()> {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='drop-outgoing-request'] call id={:?}",
+                    id
+                );
+                let result = Host::drop_outgoing_request(ctx, id);
+                tracing::trace!(
+                    "[module='wasi:http/types' function='drop-outgoing-request'] return result={:?}",
+                    result
+                );
+                result
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:http/types",
+            "drop-incoming-response",
+            move |mut caller: Caller<'_, T>, id: u32| -> anyhow::Result<()> {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='drop-incoming-response'] call id={:?}",
+                    id
+                );
+                let result = Host::drop_incoming_response(ctx, id);
+                tracing::trace!(
+                    "[module='wasi:http/types' function='drop-incoming-response'] return result={:?}",
+                    result
+                );
+                result
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:http/types",
+            "new-fields",
+            move |mut caller: Caller<'_, T>, base_ptr: u32, len: u32| -> anyhow::Result<u32> {
+                let memory = memory_get(&mut caller)?;
+
+                let mut vec = Vec::new();
+                let mut i = 0;
+                // TODO: read this more efficiently as a single block.
+                while i < len {
+                    let ptr = base_ptr + i * 16;
+                    let name_ptr = u32_from_memory(&memory, caller.as_context_mut(), ptr)?;
+                    let name_len = u32_from_memory(&memory, caller.as_context_mut(), ptr + 4)?;
+                    let value_ptr = u32_from_memory(&memory, caller.as_context_mut(), ptr + 8)?;
+                    let value_len = u32_from_memory(&memory, caller.as_context_mut(), ptr + 12)?;
+
+                    let name =
+                        string_from_memory(&memory, caller.as_context_mut(), name_ptr, name_len)?;
+                    let value =
+                        string_from_memory(&memory, caller.as_context_mut(), value_ptr, value_len)?;
+
+                    vec.push((name, value));
+                    i = i + 1;
+                }
+
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='new-fields'] call entries={:?}",
+                    vec
+                );
+                let result = Host::new_fields(ctx, vec);
+                tracing::trace!(
+                    "[module='wasi:http/types' function='new-fields'] return result={:?}",
+                    result
+                );
+                result
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:http/types",
+            "fields-entries",
+            move |mut caller: Caller<'_, T>, fields: u32, out_ptr: u32| -> anyhow::Result<()> {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='fields-entries'] call fields={:?}",
+                    fields
+                );
+                let result = Host::fields_entries(ctx, fields);
+                tracing::trace!(
+                    "[module='wasi:http/types' function='fields-entries'] return result={:?}",
+                    result
+                );
+                let entries = result?;
+
+                let header_len = entries.len();
+                let tuple_ptr = allocate_guest_pointer(&mut caller, (16 * header_len).try_into()?)?;
+                let mut ptr = tuple_ptr;
+                for item in entries.iter() {
+                    let name = &item.0;
+                    let value = &item.1;
+                    let name_len: u32 = name.len().try_into()?;
+                    let value_len: u32 = value.len().try_into()?;
+
+                    let name_ptr = allocate_guest_pointer(&mut caller, name_len)?;
+                    let value_ptr = allocate_guest_pointer(&mut caller, value_len)?;
+
+                    let memory = memory_get(&mut caller)?;
+                    memory.write(caller.as_context_mut(), name_ptr as _, &name.as_bytes())?;
+                    memory.write(caller.as_context_mut(), value_ptr as _, value)?;
+
+                    let pair: [u32; 4] = [name_ptr, name_len, value_ptr, value_len];
+                    let raw_pair = u32_array_to_u8(&pair);
+                    memory.write(caller.as_context_mut(), ptr as _, &raw_pair)?;
+
+                    ptr = ptr + 16;
+                }
+
+                let memory = memory_get(&mut caller)?;
+                let result: [u32; 2] = [tuple_ptr, header_len.try_into()?];
+                let raw = u32_array_to_u8(&result);
+                memory.write(caller.as_context_mut(), out_ptr as _, &raw)?;
+                Ok(())
+            },
+        )?;
+        linker.func_wrap(
+            "wasi:http/types",
+            "incoming-response-headers",
+            move |mut caller: Caller<'_, T>, handle: u32| -> anyhow::Result<u32> {
+                let ctx = get_cx(caller.data_mut());
+                tracing::trace!(
+                    "[module='wasi:http/types' function='incoming-response-headers'] call handle={:?}",
+                    handle
+                );
+                let result = Host::incoming_response_headers(ctx, handle);
+                tracing::trace!(
+                    "[module='wasi:http/types' function='incoming-response-headers'] return result={:?}",
+                    result
+                );
+                result
+            },
+        )?;
+        Ok(())
+    }
+}
diff --git a/crates/wasi-http/src/http_impl.rs b/crates/wasi-http/src/http_impl.rs
index d9e25a4ce490..e181ef143e0d 100644
--- a/crates/wasi-http/src/http_impl.rs
+++ b/crates/wasi-http/src/http_impl.rs
@@ -1,44 +1,122 @@
-use crate::bindings::http::{
-    outgoing_handler,
-    types::{RequestOptions, Scheme},
+use crate::bindings::http::types::{
+    FutureIncomingResponse, OutgoingRequest, RequestOptions, Scheme,
 };
-use crate::types::{self, HostFutureIncomingResponse, OutgoingRequest};
+use crate::types::{ActiveFields, ActiveFuture, ActiveResponse, HttpResponse, TableHttpExt};
 use crate::WasiHttpView;
-use bytes::Bytes;
-use http_body_util::{BodyExt, Empty};
-use hyper::Method;
+use anyhow::Context;
+use bytes::{Bytes, BytesMut};
+use http_body_util::{BodyExt, Empty, Full};
+use hyper::{Method, Request};
+#[cfg(not(any(target_arch = "riscv64", target_arch = "s390x")))]
+use std::sync::Arc;
 use std::time::Duration;
-use types::HostOutgoingRequest;
-use wasmtime::component::Resource;
+use tokio::net::TcpStream;
+use tokio::time::timeout;
+#[cfg(not(any(target_arch = "riscv64", target_arch = "s390x")))]
+use tokio_rustls::rustls::{self, OwnedTrustAnchor};
+use wasmtime_wasi::preview2::{StreamState, TableStreamExt};
 
-impl<T: WasiHttpView> outgoing_handler::Host for T {
-    fn handle(
+#[async_trait::async_trait]
+impl<T: WasiHttpView> crate::bindings::http::outgoing_handler::Host for T {
+    async fn handle(
         &mut self,
-        request_id: Resource<HostOutgoingRequest>,
+        request_id: OutgoingRequest,
         options: Option<RequestOptions>,
-    ) -> wasmtime::Result<Result<Resource<HostFutureIncomingResponse>, outgoing_handler::Error>>
-    {
-        let connect_timeout = Duration::from_millis(
-            options
-                .and_then(|opts| opts.connect_timeout_ms)
-                .unwrap_or(600 * 1000) as u64,
-        );
+    ) -> wasmtime::Result<FutureIncomingResponse> {
+        let future = ActiveFuture::new(request_id, options);
+        let future_id = self
+            .table_mut()
+            .push_future(Box::new(future))
+            .context("[handle] pushing future")?;
+        Ok(future_id)
+    }
+}
 
-        let first_byte_timeout = Duration::from_millis(
-            options
-                .and_then(|opts| opts.first_byte_timeout_ms)
-                .unwrap_or(600 * 1000) as u64,
-        );
+#[cfg(feature = "sync")]
+pub mod sync {
+    use crate::bindings::http::outgoing_handler::{
+        Host as AsyncHost, RequestOptions as AsyncRequestOptions,
+    };
+    use crate::bindings::sync::http::types::{
+        FutureIncomingResponse, OutgoingRequest, RequestOptions,
+    };
+    use crate::WasiHttpView;
+    use wasmtime_wasi::preview2::in_tokio;
+
+    // same boilerplate everywhere, converting between two identical types with different
+    // definition sites. one day wasmtime-wit-bindgen will make all this unnecessary
+    impl From<RequestOptions> for AsyncRequestOptions {
+        fn from(other: RequestOptions) -> Self {
+            Self {
+                connect_timeout_ms: other.connect_timeout_ms,
+                first_byte_timeout_ms: other.first_byte_timeout_ms,
+                between_bytes_timeout_ms: other.between_bytes_timeout_ms,
+            }
+        }
+    }
+
+    impl<T: WasiHttpView> crate::bindings::sync::http::outgoing_handler::Host for T {
+        fn handle(
+            &mut self,
+            request_id: OutgoingRequest,
+            options: Option<RequestOptions>,
+        ) -> wasmtime::Result<FutureIncomingResponse> {
+            in_tokio(async { AsyncHost::handle(self, request_id, options.map(|v| v.into())).await })
+        }
+    }
+}
+
+fn port_for_scheme(scheme: &Option<Scheme>) -> &str {
+    match scheme {
+        Some(s) => match s {
+            Scheme::Http => ":80",
+            Scheme::Https => ":443",
+            // This should never happen.
+            _ => panic!("unsupported scheme!"),
+        },
+        None => ":443",
+    }
+}
+
+#[async_trait::async_trait]
+pub trait WasiHttpViewExt {
+    async fn handle_async(
+        &mut self,
+        request_id: OutgoingRequest,
+        options: Option<RequestOptions>,
+    ) -> wasmtime::Result<FutureIncomingResponse, crate::bindings::http::types::Error>;
+}
 
-        let between_bytes_timeout = Duration::from_millis(
-            options
-                .and_then(|opts| opts.between_bytes_timeout_ms)
-                .unwrap_or(600 * 1000) as u64,
+#[async_trait::async_trait]
+impl<T: WasiHttpView> WasiHttpViewExt for T {
+    async fn handle_async(
+        &mut self,
+        request_id: OutgoingRequest,
+        options: Option<RequestOptions>,
+    ) -> wasmtime::Result<FutureIncomingResponse, crate::bindings::http::types::Error> {
+        tracing::debug!("preparing outgoing request");
+        let opts = options.unwrap_or(
+            // TODO: Configurable defaults here?
+            RequestOptions {
+                connect_timeout_ms: Some(600 * 1000),
+                first_byte_timeout_ms: Some(600 * 1000),
+                between_bytes_timeout_ms: Some(600 * 1000),
+            },
         );
+        let connect_timeout =
+            Duration::from_millis(opts.connect_timeout_ms.unwrap_or(600 * 1000).into());
+        let first_bytes_timeout =
+            Duration::from_millis(opts.first_byte_timeout_ms.unwrap_or(600 * 1000).into());
+        let between_bytes_timeout =
+            Duration::from_millis(opts.between_bytes_timeout_ms.unwrap_or(600 * 1000).into());
 
-        let req = self.table().delete(request_id)?;
+        let request = self
+            .table()
+            .get_request(request_id)
+            .context("[handle_async] getting request")?;
+        tracing::debug!("http request retrieved from table");
 
-        let method = match req.method {
+        let method = match request.method() {
             crate::bindings::http::types::Method::Get => Method::GET,
             crate::bindings::http::types::Method::Head => Method::HEAD,
             crate::bindings::http::types::Method::Post => Method::POST,
@@ -48,53 +126,214 @@ impl<T: WasiHttpView> outgoing_handler::Host for T {
             crate::bindings::http::types::Method::Options => Method::OPTIONS,
             crate::bindings::http::types::Method::Trace => Method::TRACE,
             crate::bindings::http::types::Method::Patch => Method::PATCH,
-            crate::bindings::http::types::Method::Other(method) => {
-                return Ok(Err(outgoing_handler::Error::InvalidUrl(format!(
-                    "unknown method {method}"
-                ))));
+            crate::bindings::http::types::Method::Other(s) => {
+                return Err(crate::bindings::http::types::Error::InvalidUrl(format!(
+                    "unknown method {}",
+                    s
+                ))
+                .into());
             }
         };
 
-        let (use_tls, scheme, port) = match req.scheme.unwrap_or(Scheme::Https) {
-            Scheme::Http => (false, "http://", 80),
-            Scheme::Https => (true, "https://", 443),
-            Scheme::Other(scheme) => {
-                return Ok(Err(outgoing_handler::Error::InvalidUrl(format!(
-                    "unsupported scheme {scheme}"
-                ))))
+        let scheme = match request.scheme().as_ref().unwrap_or(&Scheme::Https) {
+            Scheme::Http => "http://",
+            Scheme::Https => "https://",
+            Scheme::Other(s) => {
+                return Err(crate::bindings::http::types::Error::InvalidUrl(format!(
+                    "unsupported scheme {}",
+                    s
+                ))
+                .into());
             }
         };
 
-        let authority = if req.authority.find(':').is_some() {
-            req.authority.clone()
+        // Largely adapted from https://hyper.rs/guides/1/client/basic/
+        let authority = match request.authority().find(":") {
+            Some(_) => request.authority().to_owned(),
+            None => request.authority().to_owned() + port_for_scheme(request.scheme()),
+        };
+        let tcp_stream = TcpStream::connect(authority.clone()).await?;
+        let mut sender = if scheme == "https://" {
+            tracing::debug!("initiating client connection client with TLS");
+            #[cfg(not(any(target_arch = "riscv64", target_arch = "s390x")))]
+            {
+                //TODO: uncomment this code and make the tls implementation a feature decision.
+                //let connector = tokio_native_tls::native_tls::TlsConnector::builder().build()?;
+                //let connector = tokio_native_tls::TlsConnector::from(connector);
+                //let host = authority.split(":").next().unwrap_or(&authority);
+                //let stream = connector.connect(&host, stream).await?;
+
+                // derived from https://github.com/tokio-rs/tls/blob/master/tokio-rustls/examples/client/src/main.rs
+                let mut root_cert_store = rustls::RootCertStore::empty();
+                root_cert_store.add_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.iter().map(
+                    |ta| {
+                        OwnedTrustAnchor::from_subject_spki_name_constraints(
+                            ta.subject,
+                            ta.spki,
+                            ta.name_constraints,
+                        )
+                    },
+                ));
+                let config = rustls::ClientConfig::builder()
+                    .with_safe_defaults()
+                    .with_root_certificates(root_cert_store)
+                    .with_no_client_auth();
+                let connector = tokio_rustls::TlsConnector::from(Arc::new(config));
+                let mut parts = authority.split(":");
+                let host = parts.next().unwrap_or(&authority);
+                let domain = rustls::ServerName::try_from(host)?;
+                let stream = connector.connect(domain, tcp_stream).await.map_err(|e| {
+                    crate::bindings::http::types::Error::ProtocolError(e.to_string())
+                })?;
+
+                let t = timeout(
+                    connect_timeout,
+                    hyper::client::conn::http1::handshake(stream),
+                )
+                .await?;
+                let (s, conn) = t?;
+                tokio::task::spawn(async move {
+                    if let Err(err) = conn.await {
+                        tracing::debug!("[host/client] Connection failed: {:?}", err);
+                    }
+                });
+                s
+            }
+            #[cfg(any(target_arch = "riscv64", target_arch = "s390x"))]
+            return Err(crate::bindings::http::types::Error::UnexpectedError(
+                "unsupported architecture for SSL".to_string(),
+            ));
         } else {
-            format!("{}:{port}", req.authority)
+            tracing::debug!("initiating client connection without TLS");
+            let t = timeout(
+                connect_timeout,
+                hyper::client::conn::http1::handshake(tcp_stream),
+            )
+            .await?;
+            let (s, conn) = t?;
+            tokio::task::spawn(async move {
+                if let Err(err) = conn.await {
+                    tracing::debug!("[host/client] Connection failed: {:?}", err);
+                }
+            });
+            s
         };
 
-        let mut builder = hyper::Request::builder()
+        let url = scheme.to_owned() + &request.authority() + &request.path_with_query();
+
+        tracing::debug!("request to url {:?}", &url);
+        let mut call = Request::builder()
             .method(method)
-            .uri(format!("{scheme}{authority}{}", req.path_with_query))
-            .header(hyper::header::HOST, &authority);
+            .uri(url)
+            .header(hyper::header::HOST, request.authority());
 
-        for (k, v) in req.headers.iter() {
-            builder = builder.header(k, v);
+        if let Some(headers) = request.headers() {
+            for (key, val) in self
+                .table()
+                .get_fields(headers)
+                .context("[handle_async] getting request headers")?
+                .iter()
+            {
+                for item in val {
+                    call = call.header(key, item.clone());
+                }
+            }
         }
 
-        let body = req.body.unwrap_or_else(|| {
-            Empty::<Bytes>::new()
-                .map_err(|_| anyhow::anyhow!("empty error"))
-                .boxed()
-        });
-
-        let request = builder.body(body).map_err(types::http_protocol_error)?;
-
-        Ok(Ok(self.send_request(OutgoingRequest {
-            use_tls,
-            authority,
-            request,
-            connect_timeout,
-            first_byte_timeout,
-            between_bytes_timeout,
-        })?))
+        let mut response = ActiveResponse::new();
+        let body = match request.body() {
+            Some(id) => {
+                let table = self.table_mut();
+                let stream = table
+                    .get_stream(id)
+                    .context("[handle_async] getting stream")?;
+                let input_stream = table
+                    .get_input_stream_mut(stream.incoming())
+                    .context("[handle_async] getting mutable input stream")?;
+                let mut bytes = BytesMut::new();
+                let mut eof = StreamState::Open;
+                while eof != StreamState::Closed {
+                    let (chunk, state) = input_stream.read(4096)?;
+                    eof = if chunk.is_empty() {
+                        StreamState::Closed
+                    } else {
+                        state
+                    };
+                    bytes.extend_from_slice(&chunk[..]);
+                }
+                Full::<Bytes>::new(bytes.freeze()).boxed()
+            }
+            None => Empty::<Bytes>::new().boxed(),
+        };
+        let request = call.body(body)?;
+        tracing::trace!("hyper request {:?}", request);
+        let t = timeout(first_bytes_timeout, sender.send_request(request)).await?;
+        let mut res = t?;
+        tracing::trace!("hyper response {:?}", res);
+        response.status = res.status().as_u16();
+
+        let mut map = ActiveFields::new();
+        for (key, value) in res.headers().iter() {
+            let mut vec = Vec::new();
+            vec.push(value.as_bytes().to_vec());
+            map.insert(key.as_str().to_string(), vec);
+        }
+        let headers = self
+            .table_mut()
+            .push_fields(Box::new(map))
+            .context("[handle_async] pushing response headers")?;
+        response.set_headers(headers);
+
+        let mut buf: Vec<u8> = Vec::new();
+        while let Some(next) = timeout(between_bytes_timeout, res.frame()).await? {
+            let frame = next?;
+            tracing::debug!("response body next frame");
+            if let Some(chunk) = frame.data_ref() {
+                tracing::trace!("response body chunk size {:?}", chunk.len());
+                buf.extend_from_slice(chunk);
+            }
+            if let Some(trailers) = frame.trailers_ref() {
+                tracing::debug!("response trailers present");
+                let mut map = ActiveFields::new();
+                for (name, value) in trailers.iter() {
+                    let key = name.to_string();
+                    match map.get_mut(&key) {
+                        Some(vec) => vec.push(value.as_bytes().to_vec()),
+                        None => {
+                            let mut vec = Vec::new();
+                            vec.push(value.as_bytes().to_vec());
+                            map.insert(key, vec);
+                        }
+                    };
+                }
+                let trailers = self
+                    .table_mut()
+                    .push_fields(Box::new(map))
+                    .context("[handle_async] pushing response trailers")?;
+                response.set_trailers(trailers);
+                tracing::debug!("http trailers saved to table");
+            }
+        }
+
+        let response_id = self
+            .table_mut()
+            .push_response(Box::new(response))
+            .context("[handle_async] pushing response")?;
+        tracing::trace!("response body {:?}", std::str::from_utf8(&buf[..]).unwrap());
+        let (stream_id, stream) = self
+            .table_mut()
+            .push_stream(Bytes::from(buf), response_id)
+            .await
+            .context("[handle_async] pushing stream")?;
+        let response = self
+            .table_mut()
+            .get_response_mut(response_id)
+            .context("[handle_async] getting mutable response")?;
+        response.set_body(stream_id);
+        tracing::debug!("http response saved to table with id {:?}", response_id);
+
+        self.http_ctx_mut().streams.insert(stream_id, stream);
+
+        Ok(response_id)
     }
 }
diff --git a/crates/wasi-http/src/incoming_handler.rs b/crates/wasi-http/src/incoming_handler.rs
new file mode 100644
index 000000000000..e65a88e27d53
--- /dev/null
+++ b/crates/wasi-http/src/incoming_handler.rs
@@ -0,0 +1,31 @@
+use crate::bindings::http::types::{IncomingRequest, ResponseOutparam};
+use crate::WasiHttpView;
+
+#[async_trait::async_trait]
+impl<T: WasiHttpView> crate::bindings::http::incoming_handler::Host for T {
+    async fn handle(
+        &mut self,
+        _request: IncomingRequest,
+        _response_out: ResponseOutparam,
+    ) -> wasmtime::Result<()> {
+        anyhow::bail!("unimplemented: [incoming_handler] handle")
+    }
+}
+
+#[cfg(feature = "sync")]
+pub mod sync {
+    use crate::bindings::http::incoming_handler::Host as AsyncHost;
+    use crate::bindings::sync::http::types::{IncomingRequest, ResponseOutparam};
+    use crate::WasiHttpView;
+    use wasmtime_wasi::preview2::in_tokio;
+
+    impl<T: WasiHttpView> crate::bindings::sync::http::incoming_handler::Host for T {
+        fn handle(
+            &mut self,
+            request: IncomingRequest,
+            response_out: ResponseOutparam,
+        ) -> wasmtime::Result<()> {
+            in_tokio(async { AsyncHost::handle(self, request, response_out).await })
+        }
+    }
+}
diff --git a/crates/wasi-http/src/lib.rs b/crates/wasi-http/src/lib.rs
index 2a194684ffed..7a99a0b79a8f 100644
--- a/crates/wasi-http/src/lib.rs
+++ b/crates/wasi-http/src/lib.rs
@@ -1,39 +1,87 @@
+pub use crate::http_impl::WasiHttpViewExt;
 pub use crate::types::{WasiHttpCtx, WasiHttpView};
+use core::fmt::Formatter;
+use std::fmt::{self, Display};
 
-pub mod body;
+pub mod component_impl;
 pub mod http_impl;
+pub mod incoming_handler;
 pub mod proxy;
 pub mod types;
 pub mod types_impl;
 
 pub mod bindings {
-    wasmtime::component::bindgen!({
-        path: "wit",
-        interfaces: "
-            import wasi:http/incoming-handler@0.2.0-rc-2023-11-05;
-            import wasi:http/outgoing-handler@0.2.0-rc-2023-11-05;
-            import wasi:http/types@0.2.0-rc-2023-11-05;
-        ",
-        tracing: true,
-        async: false,
-        with: {
-            "wasi:io/streams": wasmtime_wasi::preview2::bindings::io::streams,
-            "wasi:io/poll": wasmtime_wasi::preview2::bindings::io::poll,
-
-            "wasi:http/types/outgoing-body": super::body::HostOutgoingBody,
-            "wasi:http/types/future-incoming-response": super::types::HostFutureIncomingResponse,
-            "wasi:http/types/outgoing-response": super::types::HostOutgoingResponse,
-            "wasi:http/types/future-trailers": super::body::HostFutureTrailers,
-            "wasi:http/types/incoming-body": super::body::HostIncomingBody,
-            "wasi:http/types/incoming-response": super::types::HostIncomingResponse,
-            "wasi:http/types/response-outparam": super::types::HostResponseOutparam,
-            "wasi:http/types/outgoing-request": super::types::HostOutgoingRequest,
-            "wasi:http/types/incoming-request": super::types::HostIncomingRequest,
-            "wasi:http/types/fields": super::types::HostFields,
+    #[cfg(feature = "sync")]
+    pub mod sync {
+        pub(crate) mod _internal {
+            wasmtime::component::bindgen!({
+                path: "wit",
+                interfaces: "
+                    import wasi:http/incoming-handler
+                    import wasi:http/outgoing-handler
+                    import wasi:http/types
+                ",
+                tracing: true,
+                with: {
+                    "wasi:io/streams": wasmtime_wasi::preview2::bindings::sync_io::io::streams,
+                    "wasi:poll/poll": wasmtime_wasi::preview2::bindings::sync_io::poll::poll,
+                }
+            });
         }
-    });
+        pub use self::_internal::wasi::http;
+    }
+
+    pub(crate) mod _internal_rest {
+        wasmtime::component::bindgen!({
+            path: "wit",
+            interfaces: "
+                import wasi:http/incoming-handler
+                import wasi:http/outgoing-handler
+                import wasi:http/types
+            ",
+            tracing: true,
+            async: true,
+            with: {
+                "wasi:io/streams": wasmtime_wasi::preview2::bindings::io::streams,
+                "wasi:poll/poll": wasmtime_wasi::preview2::bindings::poll::poll,
+            }
+        });
+    }
+
+    pub use self::_internal_rest::wasi::http;
+}
+
+pub fn add_to_linker<T: WasiHttpView>(linker: &mut wasmtime::Linker<T>) -> anyhow::Result<()> {
+    crate::component_impl::add_component_to_linker::<T>(linker, |t| t)
+}
+
+pub mod sync {
+    use crate::types::WasiHttpView;
 
-    pub use wasi::http;
+    pub fn add_to_linker<T: WasiHttpView>(linker: &mut wasmtime::Linker<T>) -> anyhow::Result<()> {
+        crate::component_impl::sync::add_component_to_linker::<T>(linker, |t| t)
+    }
+}
+
+impl std::error::Error for crate::bindings::http::types::Error {}
+
+impl Display for crate::bindings::http::types::Error {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match self {
+            crate::bindings::http::types::Error::InvalidUrl(m) => {
+                write!(f, "[InvalidUrl] {}", m)
+            }
+            crate::bindings::http::types::Error::ProtocolError(m) => {
+                write!(f, "[ProtocolError] {}", m)
+            }
+            crate::bindings::http::types::Error::TimeoutError(m) => {
+                write!(f, "[TimeoutError] {}", m)
+            }
+            crate::bindings::http::types::Error::UnexpectedError(m) => {
+                write!(f, "[UnexpectedError] {}", m)
+            }
+        }
+    }
 }
 
 impl From<wasmtime_wasi::preview2::TableError> for crate::bindings::http::types::Error {
diff --git a/crates/wasi-http/src/proxy.rs b/crates/wasi-http/src/proxy.rs
index 155a55fd11fd..8cd78d700265 100644
--- a/crates/wasi-http/src/proxy.rs
+++ b/crates/wasi-http/src/proxy.rs
@@ -16,25 +16,22 @@ wasmtime::component::bindgen!({
         "wasi:http/outgoing-handler": bindings::http::outgoing_handler,
         "wasi:http/types": bindings::http::types,
         "wasi:io/streams": preview2::bindings::io::streams,
-        "wasi:io/poll": preview2::bindings::io::poll,
+        "wasi:poll/poll": preview2::bindings::poll::poll,
         "wasi:random/random": preview2::bindings::random::random,
     },
 });
 
 pub fn add_to_linker<T>(l: &mut wasmtime::component::Linker<T>) -> anyhow::Result<()>
 where
-    T: WasiHttpView + preview2::WasiView + bindings::http::types::Host,
+    T: WasiHttpView + bindings::http::types::Host,
 {
-    // TODO: this shouldn't be required, but the adapter unconditionally pulls in all of these
-    // dependencies.
-    preview2::command::add_to_linker(l)?;
-
+    bindings::http::incoming_handler::add_to_linker(l, |t| t)?;
     bindings::http::outgoing_handler::add_to_linker(l, |t| t)?;
     bindings::http::types::add_to_linker(l, |t| t)?;
-
     Ok(())
 }
 
+#[cfg(feature = "sync")]
 pub mod sync {
     use crate::{bindings, WasiHttpView};
     use wasmtime_wasi::preview2;
@@ -50,37 +47,22 @@ pub mod sync {
             "wasi:clocks/monotonic-clock": preview2::bindings::clocks::monotonic_clock,
             "wasi:clocks/timezone": preview2::bindings::clocks::timezone,
             "wasi:clocks/wall-clock": preview2::bindings::clocks::wall_clock,
-            "wasi:http/incoming-handler": bindings::http::incoming_handler,
-            "wasi:http/outgoing-handler": bindings::http::outgoing_handler,
-            "wasi:http/types": bindings::http::types,
-            "wasi:io/streams": preview2::bindings::io::streams,
-            "wasi:poll/poll": preview2::bindings::poll::poll,
+            "wasi:http/incoming-handler": bindings::sync::http::incoming_handler,
+            "wasi:http/outgoing-handler": bindings::sync::http::outgoing_handler,
+            "wasi:http/types": bindings::sync::http::types,
+            "wasi:io/streams": preview2::bindings::sync_io::io::streams,
+            "wasi:poll/poll": preview2::bindings::sync_io::poll::poll,
             "wasi:random/random": preview2::bindings::random::random,
         },
     });
 
     pub fn add_to_linker<T>(l: &mut wasmtime::component::Linker<T>) -> anyhow::Result<()>
     where
-        T: WasiHttpView + preview2::WasiView + bindings::http::types::Host,
-    {
-        // TODO: this shouldn't be required, but the adapter unconditionally pulls in all of these
-        // dependencies.
-        preview2::command::sync::add_to_linker(l)?;
-
-        add_only_http_to_linker(l)?;
-
-        Ok(())
-    }
-
-    #[doc(hidden)]
-    // TODO: This is temporary solution until the preview2 command functions can be removed
-    pub fn add_only_http_to_linker<T>(l: &mut wasmtime::component::Linker<T>) -> anyhow::Result<()>
-    where
-        T: WasiHttpView + preview2::WasiView + bindings::http::types::Host,
+        T: WasiHttpView + bindings::sync::http::types::Host,
     {
-        bindings::http::outgoing_handler::add_to_linker(l, |t| t)?;
-        bindings::http::types::add_to_linker(l, |t| t)?;
-
+        bindings::sync::http::incoming_handler::add_to_linker(l, |t| t)?;
+        bindings::sync::http::outgoing_handler::add_to_linker(l, |t| t)?;
+        bindings::sync::http::types::add_to_linker(l, |t| t)?;
         Ok(())
     }
 }
diff --git a/crates/wasi-http/src/types.rs b/crates/wasi-http/src/types.rs
index 76530811ccec..050a83470947 100644
--- a/crates/wasi-http/src/types.rs
+++ b/crates/wasi-http/src/types.rs
@@ -1,308 +1,449 @@
 //! Implements the base structure (i.e. [WasiHttpCtx]) that will provide the
 //! implementation of the wasi-http API.
 
-use crate::{
-    bindings::http::types::{self, Method, Scheme},
-    body::{HostIncomingBodyBuilder, HyperIncomingBody, HyperOutgoingBody},
+use crate::bindings::http::types::{
+    IncomingStream, Method, OutgoingRequest, OutgoingStream, RequestOptions, Scheme,
 };
-use anyhow::Context;
-use http_body_util::BodyExt;
+use bytes::Bytes;
 use std::any::Any;
-use std::time::Duration;
-use tokio::net::TcpStream;
-use tokio::time::timeout;
-use wasmtime::component::Resource;
-use wasmtime_wasi::preview2::{self, AbortOnDropJoinHandle, Subscribe, Table};
+use std::collections::HashMap;
+use std::ops::{Deref, DerefMut};
+use wasmtime_wasi::preview2::{
+    pipe::{AsyncReadStream, AsyncWriteStream},
+    HostInputStream, HostOutputStream, Table, TableError, TableStreamExt, WasiView,
+};
+
+const MAX_BUF_SIZE: usize = 65_536;
 
 /// Capture the state necessary for use in the wasi-http API implementation.
-pub struct WasiHttpCtx;
+pub struct WasiHttpCtx {
+    pub streams: HashMap<u32, Stream>,
+}
+
+impl WasiHttpCtx {
+    /// Make a new context from the default state.
+    pub fn new() -> Self {
+        Self {
+            streams: HashMap::new(),
+        }
+    }
+}
+
+pub trait WasiHttpView: WasiView {
+    fn http_ctx(&self) -> &WasiHttpCtx;
+    fn http_ctx_mut(&mut self) -> &mut WasiHttpCtx;
+}
+
+pub type FieldsMap = HashMap<String, Vec<Vec<u8>>>;
 
-pub struct OutgoingRequest {
-    pub use_tls: bool,
+#[derive(Clone, Debug)]
+pub struct ActiveRequest {
+    pub active: bool,
+    pub method: Method,
+    pub scheme: Option<Scheme>,
+    pub path_with_query: String,
     pub authority: String,
-    pub request: hyper::Request<HyperOutgoingBody>,
-    pub connect_timeout: Duration,
-    pub first_byte_timeout: Duration,
-    pub between_bytes_timeout: Duration,
+    pub headers: Option<u32>,
+    pub body: Option<u32>,
 }
 
-pub trait WasiHttpView: Send {
-    fn ctx(&mut self) -> &mut WasiHttpCtx;
-    fn table(&mut self) -> &mut Table;
+pub trait HttpRequest: Send + Sync {
+    fn new() -> Self
+    where
+        Self: Sized;
+
+    fn as_any(&self) -> &dyn Any;
+
+    fn method(&self) -> &Method;
+    fn scheme(&self) -> &Option<Scheme>;
+    fn path_with_query(&self) -> &str;
+    fn authority(&self) -> &str;
+    fn headers(&self) -> Option<u32>;
+    fn set_headers(&mut self, headers: u32);
+    fn body(&self) -> Option<u32>;
+    fn set_body(&mut self, body: u32);
+}
 
-    fn new_incoming_request(
-        &mut self,
-        req: hyper::Request<HyperIncomingBody>,
-    ) -> wasmtime::Result<Resource<HostIncomingRequest>> {
-        let (parts, body) = req.into_parts();
-        let body = HostIncomingBodyBuilder {
-            body,
-            // TODO: this needs to be plumbed through
-            between_bytes_timeout: std::time::Duration::from_millis(600 * 1000),
-        };
-        Ok(self.table().push(HostIncomingRequest {
-            parts,
-            body: Some(body),
-        })?)
-    }
-
-    fn new_response_outparam(
-        &mut self,
-        result: tokio::sync::oneshot::Sender<
-            Result<hyper::Response<HyperOutgoingBody>, types::Error>,
-        >,
-    ) -> wasmtime::Result<Resource<HostResponseOutparam>> {
-        let id = self.table().push(HostResponseOutparam { result })?;
-        Ok(id)
+impl HttpRequest for ActiveRequest {
+    fn new() -> Self {
+        Self {
+            active: false,
+            method: Method::Get,
+            scheme: Some(Scheme::Http),
+            path_with_query: "".to_string(),
+            authority: "".to_string(),
+            headers: None,
+            body: None,
+        }
     }
 
-    fn send_request(
-        &mut self,
-        request: OutgoingRequest,
-    ) -> wasmtime::Result<Resource<HostFutureIncomingResponse>>
-    where
-        Self: Sized,
-    {
-        default_send_request(self, request)
+    fn as_any(&self) -> &dyn Any {
+        self
     }
-}
 
-pub fn default_send_request(
-    view: &mut dyn WasiHttpView,
-    OutgoingRequest {
-        use_tls,
-        authority,
-        request,
-        connect_timeout,
-        first_byte_timeout,
-        between_bytes_timeout,
-    }: OutgoingRequest,
-) -> wasmtime::Result<Resource<HostFutureIncomingResponse>> {
-    let handle = preview2::spawn(async move {
-        let tcp_stream = TcpStream::connect(authority.clone())
-            .await
-            .map_err(invalid_url)?;
-
-        let (mut sender, worker) = if use_tls {
-            #[cfg(any(target_arch = "riscv64", target_arch = "s390x"))]
-            {
-                anyhow::bail!(crate::bindings::http::types::Error::UnexpectedError(
-                    "unsupported architecture for SSL".to_string(),
-                ));
-            }
-
-            #[cfg(not(any(target_arch = "riscv64", target_arch = "s390x")))]
-            {
-                use tokio_rustls::rustls::OwnedTrustAnchor;
-
-                // derived from https://github.com/tokio-rs/tls/blob/master/tokio-rustls/examples/client/src/main.rs
-                let mut root_cert_store = rustls::RootCertStore::empty();
-                root_cert_store.add_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.iter().map(
-                    |ta| {
-                        OwnedTrustAnchor::from_subject_spki_name_constraints(
-                            ta.subject,
-                            ta.spki,
-                            ta.name_constraints,
-                        )
-                    },
-                ));
-                let config = rustls::ClientConfig::builder()
-                    .with_safe_defaults()
-                    .with_root_certificates(root_cert_store)
-                    .with_no_client_auth();
-                let connector = tokio_rustls::TlsConnector::from(std::sync::Arc::new(config));
-                let mut parts = authority.split(":");
-                let host = parts.next().unwrap_or(&authority);
-                let domain = rustls::ServerName::try_from(host)?;
-                let stream = connector.connect(domain, tcp_stream).await.map_err(|e| {
-                    crate::bindings::http::types::Error::ProtocolError(e.to_string())
-                })?;
-
-                let (sender, conn) = timeout(
-                    connect_timeout,
-                    hyper::client::conn::http1::handshake(stream),
-                )
-                .await
-                .map_err(|_| timeout_error("connection"))??;
-
-                let worker = preview2::spawn(async move {
-                    conn.await.context("hyper connection failed")?;
-                    Ok::<_, anyhow::Error>(())
-                });
-
-                (sender, worker)
-            }
-        } else {
-            let (sender, conn) = timeout(
-                connect_timeout,
-                // TODO: we should plumb the builder through the http context, and use it here
-                hyper::client::conn::http1::handshake(tcp_stream),
-            )
-            .await
-            .map_err(|_| timeout_error("connection"))??;
-
-            let worker = preview2::spawn(async move {
-                conn.await.context("hyper connection failed")?;
-                Ok::<_, anyhow::Error>(())
-            });
-
-            (sender, worker)
-        };
-
-        let resp = timeout(first_byte_timeout, sender.send_request(request))
-            .await
-            .map_err(|_| timeout_error("first byte"))?
-            .map_err(hyper_protocol_error)?
-            .map(|body| body.map_err(|e| anyhow::anyhow!(e)).boxed());
-
-        Ok(IncomingResponseInternal {
-            resp,
-            worker,
-            between_bytes_timeout,
-        })
-    });
-
-    let fut = view.table().push(HostFutureIncomingResponse::new(handle))?;
-
-    Ok(fut)
-}
+    fn method(&self) -> &Method {
+        &self.method
+    }
 
-pub fn timeout_error(kind: &str) -> anyhow::Error {
-    anyhow::anyhow!(crate::bindings::http::types::Error::TimeoutError(format!(
-        "{kind} timed out"
-    )))
-}
+    fn scheme(&self) -> &Option<Scheme> {
+        &self.scheme
+    }
+
+    fn path_with_query(&self) -> &str {
+        &self.path_with_query
+    }
+
+    fn authority(&self) -> &str {
+        &self.authority
+    }
+
+    fn headers(&self) -> Option<u32> {
+        self.headers
+    }
+
+    fn set_headers(&mut self, headers: u32) {
+        self.headers = Some(headers);
+    }
+
+    fn body(&self) -> Option<u32> {
+        self.body
+    }
 
-pub fn http_protocol_error(e: http::Error) -> anyhow::Error {
-    anyhow::anyhow!(crate::bindings::http::types::Error::ProtocolError(
-        e.to_string()
-    ))
+    fn set_body(&mut self, body: u32) {
+        self.body = Some(body);
+    }
 }
 
-pub fn hyper_protocol_error(e: hyper::Error) -> anyhow::Error {
-    anyhow::anyhow!(crate::bindings::http::types::Error::ProtocolError(
-        e.to_string()
-    ))
+#[derive(Clone, Debug)]
+pub struct ActiveResponse {
+    pub active: bool,
+    pub status: u16,
+    pub headers: Option<u32>,
+    pub body: Option<u32>,
+    pub trailers: Option<u32>,
 }
 
-fn invalid_url(e: std::io::Error) -> anyhow::Error {
-    // TODO: DNS errors show up as a Custom io error, what subset of errors should we consider for
-    // InvalidUrl here?
-    anyhow::anyhow!(crate::bindings::http::types::Error::InvalidUrl(
-        e.to_string()
-    ))
+pub trait HttpResponse: Send + Sync {
+    fn new() -> Self
+    where
+        Self: Sized;
+
+    fn as_any(&self) -> &dyn Any;
+
+    fn status(&self) -> u16;
+    fn headers(&self) -> Option<u32>;
+    fn set_headers(&mut self, headers: u32);
+    fn body(&self) -> Option<u32>;
+    fn set_body(&mut self, body: u32);
+    fn trailers(&self) -> Option<u32>;
+    fn set_trailers(&mut self, trailers: u32);
 }
 
-pub struct HostIncomingRequest {
-    pub parts: http::request::Parts,
-    pub body: Option<HostIncomingBodyBuilder>,
+impl HttpResponse for ActiveResponse {
+    fn new() -> Self {
+        Self {
+            active: false,
+            status: 0,
+            headers: None,
+            body: None,
+            trailers: None,
+        }
+    }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+
+    fn status(&self) -> u16 {
+        self.status
+    }
+
+    fn headers(&self) -> Option<u32> {
+        self.headers
+    }
+
+    fn set_headers(&mut self, headers: u32) {
+        self.headers = Some(headers);
+    }
+
+    fn body(&self) -> Option<u32> {
+        self.body
+    }
+
+    fn set_body(&mut self, body: u32) {
+        self.body = Some(body);
+    }
+
+    fn trailers(&self) -> Option<u32> {
+        self.trailers
+    }
+
+    fn set_trailers(&mut self, trailers: u32) {
+        self.trailers = Some(trailers);
+    }
 }
 
-pub struct HostResponseOutparam {
-    pub result:
-        tokio::sync::oneshot::Sender<Result<hyper::Response<HyperOutgoingBody>, types::Error>>,
+#[derive(Clone, Debug)]
+pub struct ActiveFuture {
+    request_id: OutgoingRequest,
+    options: Option<RequestOptions>,
+    response_id: Option<u32>,
+    pollable_id: Option<u32>,
 }
 
-pub struct HostOutgoingRequest {
-    pub method: Method,
-    pub scheme: Option<Scheme>,
-    pub path_with_query: String,
-    pub authority: String,
-    pub headers: FieldMap,
-    pub body: Option<HyperOutgoingBody>,
+impl ActiveFuture {
+    pub fn new(request_id: OutgoingRequest, options: Option<RequestOptions>) -> Self {
+        Self {
+            request_id,
+            options,
+            response_id: None,
+            pollable_id: None,
+        }
+    }
+
+    pub fn request_id(&self) -> u32 {
+        self.request_id
+    }
+
+    pub fn options(&self) -> Option<RequestOptions> {
+        self.options
+    }
+
+    pub fn response_id(&self) -> Option<u32> {
+        self.response_id
+    }
+
+    pub fn set_response_id(&mut self, response_id: u32) {
+        self.response_id = Some(response_id);
+    }
+
+    pub fn pollable_id(&self) -> Option<u32> {
+        self.pollable_id
+    }
+
+    pub fn set_pollable_id(&mut self, pollable_id: u32) {
+        self.pollable_id = Some(pollable_id);
+    }
 }
 
-pub struct HostIncomingResponse {
-    pub status: u16,
-    pub headers: FieldMap,
-    pub body: Option<HostIncomingBodyBuilder>,
-    pub worker: AbortOnDropJoinHandle<anyhow::Result<()>>,
+#[derive(Clone, Debug)]
+pub struct ActiveFields(HashMap<String, Vec<Vec<u8>>>);
+
+impl ActiveFields {
+    pub fn new() -> Self {
+        Self(FieldsMap::new())
+    }
 }
 
-pub struct HostOutgoingResponse {
-    pub status: u16,
-    pub headers: FieldMap,
-    pub body: Option<HyperOutgoingBody>,
+pub trait HttpFields: Send + Sync {
+    fn as_any(&self) -> &dyn Any;
 }
 
-impl TryFrom<HostOutgoingResponse> for hyper::Response<HyperOutgoingBody> {
-    type Error = http::Error;
+impl HttpFields for ActiveFields {
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+}
 
-    fn try_from(
-        resp: HostOutgoingResponse,
-    ) -> Result<hyper::Response<HyperOutgoingBody>, Self::Error> {
-        use http_body_util::Empty;
+impl Deref for ActiveFields {
+    type Target = FieldsMap;
+    fn deref(&self) -> &FieldsMap {
+        &self.0
+    }
+}
 
-        let mut builder = hyper::Response::builder().status(resp.status);
+impl DerefMut for ActiveFields {
+    fn deref_mut(&mut self) -> &mut FieldsMap {
+        &mut self.0
+    }
+}
 
-        *builder.headers_mut().unwrap() = resp.headers;
+#[derive(Clone, Debug)]
+pub struct Stream {
+    input_id: u32,
+    output_id: u32,
+    parent_id: u32,
+}
 
-        match resp.body {
-            Some(body) => builder.body(body),
-            None => builder.body(
-                Empty::<bytes::Bytes>::new()
-                    .map_err(|_| anyhow::anyhow!("empty error"))
-                    .boxed(),
-            ),
+impl Stream {
+    pub fn new(input_id: u32, output_id: u32, parent_id: u32) -> Self {
+        Self {
+            input_id,
+            output_id,
+            parent_id,
         }
     }
-}
 
-pub type FieldMap = hyper::HeaderMap;
+    pub fn incoming(&self) -> IncomingStream {
+        self.input_id
+    }
 
-pub enum HostFields {
-    Ref {
-        parent: u32,
+    pub fn outgoing(&self) -> OutgoingStream {
+        self.output_id
+    }
 
-        // NOTE: there's not failure in the result here because we assume that HostFields will
-        // always be registered as a child of the entry with the `parent` id. This ensures that the
-        // entry will always exist while this `HostFields::Ref` entry exists in the table, thus we
-        // don't need to account for failure when fetching the fields ref from the parent.
-        get_fields: for<'a> fn(elem: &'a mut (dyn Any + 'static)) -> &'a mut FieldMap,
-    },
-    Owned {
-        fields: FieldMap,
-    },
+    pub fn parent_id(&self) -> u32 {
+        self.parent_id
+    }
 }
 
-pub struct IncomingResponseInternal {
-    pub resp: hyper::Response<HyperIncomingBody>,
-    pub worker: AbortOnDropJoinHandle<anyhow::Result<()>>,
-    pub between_bytes_timeout: std::time::Duration,
+#[async_trait::async_trait]
+pub trait TableHttpExt {
+    fn push_request(&mut self, request: Box<dyn HttpRequest>) -> Result<u32, TableError>;
+    fn get_request(&self, id: u32) -> Result<&(dyn HttpRequest), TableError>;
+    fn get_request_mut(&mut self, id: u32) -> Result<&mut Box<dyn HttpRequest>, TableError>;
+    fn delete_request(&mut self, id: u32) -> Result<(), TableError>;
+
+    fn push_response(&mut self, response: Box<dyn HttpResponse>) -> Result<u32, TableError>;
+    fn get_response(&self, id: u32) -> Result<&dyn HttpResponse, TableError>;
+    fn get_response_mut(&mut self, id: u32) -> Result<&mut Box<dyn HttpResponse>, TableError>;
+    fn delete_response(&mut self, id: u32) -> Result<(), TableError>;
+
+    fn push_future(&mut self, future: Box<ActiveFuture>) -> Result<u32, TableError>;
+    fn get_future(&self, id: u32) -> Result<&ActiveFuture, TableError>;
+    fn get_future_mut(&mut self, id: u32) -> Result<&mut Box<ActiveFuture>, TableError>;
+    fn delete_future(&mut self, id: u32) -> Result<(), TableError>;
+
+    fn push_fields(&mut self, fields: Box<ActiveFields>) -> Result<u32, TableError>;
+    fn get_fields(&self, id: u32) -> Result<&ActiveFields, TableError>;
+    fn get_fields_mut(&mut self, id: u32) -> Result<&mut Box<ActiveFields>, TableError>;
+    fn delete_fields(&mut self, id: u32) -> Result<(), TableError>;
+
+    async fn push_stream(
+        &mut self,
+        content: Bytes,
+        parent: u32,
+    ) -> Result<(u32, Stream), TableError>;
+    fn get_stream(&self, id: u32) -> Result<&Stream, TableError>;
+    fn get_stream_mut(&mut self, id: u32) -> Result<&mut Box<Stream>, TableError>;
+    fn delete_stream(&mut self, id: u32) -> Result<(), TableError>;
 }
 
-type FutureIncomingResponseHandle = AbortOnDropJoinHandle<anyhow::Result<IncomingResponseInternal>>;
+#[async_trait::async_trait]
+impl TableHttpExt for Table {
+    fn push_request(&mut self, request: Box<dyn HttpRequest>) -> Result<u32, TableError> {
+        self.push(Box::new(request))
+    }
+    fn get_request(&self, id: u32) -> Result<&dyn HttpRequest, TableError> {
+        self.get::<Box<dyn HttpRequest>>(id).map(|f| f.as_ref())
+    }
+    fn get_request_mut(&mut self, id: u32) -> Result<&mut Box<dyn HttpRequest>, TableError> {
+        self.get_mut::<Box<dyn HttpRequest>>(id)
+    }
+    fn delete_request(&mut self, id: u32) -> Result<(), TableError> {
+        self.delete::<Box<dyn HttpRequest>>(id).map(|_old| ())
+    }
 
-pub enum HostFutureIncomingResponse {
-    Pending(FutureIncomingResponseHandle),
-    Ready(anyhow::Result<IncomingResponseInternal>),
-    Consumed,
-}
+    fn push_response(&mut self, response: Box<dyn HttpResponse>) -> Result<u32, TableError> {
+        self.push(Box::new(response))
+    }
+    fn get_response(&self, id: u32) -> Result<&dyn HttpResponse, TableError> {
+        self.get::<Box<dyn HttpResponse>>(id).map(|f| f.as_ref())
+    }
+    fn get_response_mut(&mut self, id: u32) -> Result<&mut Box<dyn HttpResponse>, TableError> {
+        self.get_mut::<Box<dyn HttpResponse>>(id)
+    }
+    fn delete_response(&mut self, id: u32) -> Result<(), TableError> {
+        self.delete::<Box<dyn HttpResponse>>(id).map(|_old| ())
+    }
 
-impl HostFutureIncomingResponse {
-    pub fn new(handle: FutureIncomingResponseHandle) -> Self {
-        Self::Pending(handle)
+    fn push_future(&mut self, future: Box<ActiveFuture>) -> Result<u32, TableError> {
+        self.push(Box::new(future))
+    }
+    fn get_future(&self, id: u32) -> Result<&ActiveFuture, TableError> {
+        self.get::<Box<ActiveFuture>>(id).map(|f| f.as_ref())
+    }
+    fn get_future_mut(&mut self, id: u32) -> Result<&mut Box<ActiveFuture>, TableError> {
+        self.get_mut::<Box<ActiveFuture>>(id)
+    }
+    fn delete_future(&mut self, id: u32) -> Result<(), TableError> {
+        self.delete::<Box<ActiveFuture>>(id).map(|_old| ())
     }
 
-    pub fn is_ready(&self) -> bool {
-        matches!(self, Self::Ready(_))
+    fn push_fields(&mut self, fields: Box<ActiveFields>) -> Result<u32, TableError> {
+        self.push(Box::new(fields))
+    }
+    fn get_fields(&self, id: u32) -> Result<&ActiveFields, TableError> {
+        self.get::<Box<ActiveFields>>(id).map(|f| f.as_ref())
+    }
+    fn get_fields_mut(&mut self, id: u32) -> Result<&mut Box<ActiveFields>, TableError> {
+        self.get_mut::<Box<ActiveFields>>(id)
+    }
+    fn delete_fields(&mut self, id: u32) -> Result<(), TableError> {
+        self.delete::<Box<ActiveFields>>(id).map(|_old| ())
     }
 
-    pub fn unwrap_ready(self) -> anyhow::Result<IncomingResponseInternal> {
-        match self {
-            Self::Ready(res) => res,
-            Self::Pending(_) | Self::Consumed => {
-                panic!("unwrap_ready called on a pending HostFutureIncomingResponse")
-            }
+    async fn push_stream(
+        &mut self,
+        mut content: Bytes,
+        parent: u32,
+    ) -> Result<(u32, Stream), TableError> {
+        tracing::debug!("preparing http body stream");
+        let (a, b) = tokio::io::duplex(MAX_BUF_SIZE);
+        let (_, write_stream) = tokio::io::split(a);
+        let (read_stream, _) = tokio::io::split(b);
+        let input_stream = AsyncReadStream::new(read_stream);
+        // TODO: more informed budget here
+        let mut output_stream = AsyncWriteStream::new(4096, write_stream);
+
+        while !content.is_empty() {
+            let permit = output_stream
+                .write_ready()
+                .await
+                .map_err(|_| TableError::NotPresent)?;
+
+            let len = content.len().min(permit);
+            let chunk = content.split_to(len);
+
+            output_stream
+                .write(chunk)
+                .map_err(|_| TableError::NotPresent)?;
         }
+        output_stream.flush().map_err(|_| TableError::NotPresent)?;
+        let _readiness = tokio::time::timeout(
+            std::time::Duration::from_millis(10),
+            output_stream.write_ready(),
+        )
+        .await;
+
+        let input_stream = Box::new(input_stream);
+        let output_id = self.push_output_stream(Box::new(output_stream))?;
+        let input_id = self.push_input_stream(input_stream)?;
+        let stream = Stream::new(input_id, output_id, parent);
+        let cloned_stream = stream.clone();
+        let stream_id = self.push(Box::new(Box::new(stream)))?;
+        tracing::trace!(
+            "http body stream details ( id: {:?}, input: {:?}, output: {:?} )",
+            stream_id,
+            input_id,
+            output_id
+        );
+        Ok((stream_id, cloned_stream))
+    }
+    fn get_stream(&self, id: u32) -> Result<&Stream, TableError> {
+        self.get::<Box<Stream>>(id).map(|f| f.as_ref())
+    }
+    fn get_stream_mut(&mut self, id: u32) -> Result<&mut Box<Stream>, TableError> {
+        self.get_mut::<Box<Stream>>(id)
+    }
+    fn delete_stream(&mut self, id: u32) -> Result<(), TableError> {
+        let stream = self.get_stream_mut(id)?;
+        let input_stream = stream.incoming();
+        let output_stream = stream.outgoing();
+        self.delete::<Box<Stream>>(id).map(|_old| ())?;
+        self.delete::<Box<dyn HostInputStream>>(input_stream)
+            .map(|_old| ())?;
+        self.delete::<Box<dyn HostOutputStream>>(output_stream)
+            .map(|_old| ())
     }
 }
 
-#[async_trait::async_trait]
-impl Subscribe for HostFutureIncomingResponse {
-    async fn ready(&mut self) {
-        if let Self::Pending(handle) = self {
-            *self = Self::Ready(handle.await);
-        }
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn instantiate() {
+        WasiHttpCtx::new();
     }
 }
diff --git a/crates/wasi-http/src/types_impl.rs b/crates/wasi-http/src/types_impl.rs
index dbaa54969fdd..c044cd1bdde9 100644
--- a/crates/wasi-http/src/types_impl.rs
+++ b/crates/wasi-http/src/types_impl.rs
@@ -1,611 +1,699 @@
-use crate::bindings::http::types::{Error, Headers, Method, Scheme, StatusCode, Trailers};
-use crate::body::{FinishMessage, HostFutureTrailers, HostFutureTrailersState};
-use crate::types::{HostIncomingRequest, HostOutgoingResponse};
-use crate::WasiHttpView;
-use crate::{
-    body::{HostIncomingBody, HostIncomingBodyBuilder, HostOutgoingBody},
-    types::{
-        FieldMap, HostFields, HostFutureIncomingResponse, HostIncomingResponse,
-        HostOutgoingRequest, HostResponseOutparam,
-    },
-};
-use anyhow::Context;
-use std::any::Any;
-use wasmtime::component::Resource;
-use wasmtime_wasi::preview2::{
-    bindings::io::streams::{InputStream, OutputStream},
-    Pollable, Table,
+use crate::bindings::http::types::{
+    Error, Fields, FutureIncomingResponse, Headers, IncomingRequest, IncomingResponse,
+    IncomingStream, Method, OutgoingRequest, OutgoingResponse, OutgoingStream, ResponseOutparam,
+    Scheme, StatusCode, Trailers,
 };
-
-impl<T: WasiHttpView> crate::bindings::http::types::Host for T {}
-
-fn get_fields_mut<'a>(
-    table: &'a mut Table,
-    id: &Resource<HostFields>,
-) -> wasmtime::Result<&'a mut FieldMap> {
-    let fields = table.get(&id)?;
-    if let HostFields::Ref { parent, get_fields } = *fields {
-        let entry = table.get_any_mut(parent)?;
-        return Ok(get_fields(entry));
-    }
-
-    match table.get_mut(&id)? {
-        HostFields::Owned { fields } => Ok(fields),
-        // NB: ideally the `if let` above would go here instead. That makes
-        // the borrow-checker unhappy. Unclear why. If you, dear reader, can
-        // refactor this to remove the `unreachable!` please do.
-        HostFields::Ref { .. } => unreachable!(),
+use crate::http_impl::WasiHttpViewExt;
+use crate::types::{ActiveFields, ActiveRequest, HttpRequest, TableHttpExt};
+use crate::WasiHttpView;
+use anyhow::{anyhow, bail, Context};
+use bytes::Bytes;
+use wasmtime_wasi::preview2::{bindings::poll::poll::Pollable, HostPollable, TablePollableExt};
+
+#[async_trait::async_trait]
+impl<T: WasiHttpView + WasiHttpViewExt> crate::bindings::http::types::Host for T {
+    async fn drop_fields(&mut self, fields: Fields) -> wasmtime::Result<()> {
+        self.table_mut()
+            .delete_fields(fields)
+            .context("[drop_fields] deleting fields")?;
+        Ok(())
     }
-}
-
-impl<T: WasiHttpView> crate::bindings::http::types::HostFields for T {
-    fn new(&mut self, entries: Vec<(String, Vec<u8>)>) -> wasmtime::Result<Resource<HostFields>> {
-        let mut map = hyper::HeaderMap::new();
-
-        for (header, value) in entries {
-            let header = hyper::header::HeaderName::from_bytes(header.as_bytes())?;
-            let value = hyper::header::HeaderValue::from_bytes(&value)?;
-            map.append(header, value);
+    async fn new_fields(&mut self, entries: Vec<(String, String)>) -> wasmtime::Result<Fields> {
+        let mut map = ActiveFields::new();
+        for (key, value) in entries {
+            map.insert(key, vec![value.clone().into_bytes()]);
         }
 
         let id = self
-            .table()
-            .push(HostFields::Owned { fields: map })
+            .table_mut()
+            .push_fields(Box::new(map))
             .context("[new_fields] pushing fields")?;
-
         Ok(id)
     }
-
-    fn drop(&mut self, fields: Resource<HostFields>) -> wasmtime::Result<()> {
-        self.table()
-            .delete(fields)
-            .context("[drop_fields] deleting fields")?;
-        Ok(())
-    }
-
-    fn get(
-        &mut self,
-        fields: Resource<HostFields>,
-        name: String,
-    ) -> wasmtime::Result<Vec<Vec<u8>>> {
-        let res = get_fields_mut(self.table(), &fields)
+    async fn fields_get(&mut self, fields: Fields, name: String) -> wasmtime::Result<Vec<Vec<u8>>> {
+        let res = self
+            .table_mut()
+            .get_fields(fields)
             .context("[fields_get] getting fields")?
-            .get_all(hyper::header::HeaderName::from_bytes(name.as_bytes())?)
-            .into_iter()
-            .map(|val| val.as_bytes().to_owned())
-            .collect();
+            .get(&name)
+            .ok_or_else(|| anyhow!("key not found: {name}"))?
+            .clone();
         Ok(res)
     }
-
-    fn set(
+    async fn fields_set(
         &mut self,
-        fields: Resource<HostFields>,
+        fields: Fields,
         name: String,
-        values: Vec<Vec<u8>>,
+        value: Vec<Vec<u8>>,
     ) -> wasmtime::Result<()> {
-        let m = get_fields_mut(self.table(), &fields)?;
-
-        let header = hyper::header::HeaderName::from_bytes(name.as_bytes())?;
-
-        m.remove(&header);
-        for value in values {
-            let value = hyper::header::HeaderValue::from_bytes(&value)?;
-            m.append(&header, value);
+        match self.table_mut().get_fields_mut(fields) {
+            Ok(m) => {
+                m.insert(name, value.clone());
+                Ok(())
+            }
+            Err(_) => bail!("fields not found"),
         }
-
-        Ok(())
     }
-
-    fn delete(&mut self, fields: Resource<HostFields>, name: String) -> wasmtime::Result<()> {
-        let m = get_fields_mut(self.table(), &fields)?;
-        let header = hyper::header::HeaderName::from_bytes(name.as_bytes())?;
-        m.remove(header);
+    async fn fields_delete(&mut self, fields: Fields, name: String) -> wasmtime::Result<()> {
+        match self.table_mut().get_fields_mut(fields) {
+            Ok(m) => m.remove(&name),
+            Err(_) => None,
+        };
         Ok(())
     }
-
-    fn append(
+    async fn fields_append(
         &mut self,
-        fields: Resource<HostFields>,
+        fields: Fields,
         name: String,
         value: Vec<u8>,
     ) -> wasmtime::Result<()> {
-        let m = get_fields_mut(self.table(), &fields)
+        let m = self
+            .table_mut()
+            .get_fields_mut(fields)
             .context("[fields_append] getting mutable fields")?;
-        let header = hyper::header::HeaderName::from_bytes(name.as_bytes())?;
-        let value = hyper::header::HeaderValue::from_bytes(&value)?;
-        m.append(header, value);
+        match m.get_mut(&name) {
+            Some(v) => v.push(value),
+            None => {
+                let mut vec = std::vec::Vec::new();
+                vec.push(value);
+                m.insert(name, vec);
+            }
+        };
         Ok(())
     }
-
-    fn entries(
-        &mut self,
-        fields: Resource<HostFields>,
-    ) -> wasmtime::Result<Vec<(String, Vec<u8>)>> {
-        let fields = get_fields_mut(self.table(), &fields)?;
-        let result = fields
-            .iter()
-            .map(|(name, value)| (name.as_str().to_owned(), value.as_bytes().to_owned()))
-            .collect();
+    async fn fields_entries(&mut self, fields: Fields) -> wasmtime::Result<Vec<(String, Vec<u8>)>> {
+        let field_map = match self.table().get_fields(fields) {
+            Ok(m) => m.iter(),
+            Err(_) => bail!("fields not found."),
+        };
+        let mut result = Vec::new();
+        for (name, value) in field_map {
+            result.push((name.clone(), value[0].clone()));
+        }
         Ok(result)
     }
-
-    fn clone(&mut self, fields: Resource<HostFields>) -> wasmtime::Result<Resource<HostFields>> {
-        let fields = get_fields_mut(self.table(), &fields)
-            .context("[fields_clone] getting fields")?
-            .clone();
-
-        let id = self
-            .table()
-            .push(HostFields::Owned { fields })
+    async fn fields_clone(&mut self, fields: Fields) -> wasmtime::Result<Fields> {
+        let table = self.table_mut();
+        let m = table
+            .get_fields(fields)
+            .context("[fields_clone] getting fields")?;
+        let id = table
+            .push_fields(Box::new(m.clone()))
             .context("[fields_clone] pushing fields")?;
-
         Ok(id)
     }
-}
-
-impl<T: WasiHttpView> crate::bindings::http::types::HostIncomingRequest for T {
-    fn method(&mut self, id: Resource<HostIncomingRequest>) -> wasmtime::Result<Method> {
-        let method = self.table().get(&id)?.parts.method.as_ref();
-
-        if method == hyper::Method::GET {
-            Ok(Method::Get)
-        } else if method == hyper::Method::HEAD {
-            Ok(Method::Head)
-        } else if method == hyper::Method::POST {
-            Ok(Method::Post)
-        } else if method == hyper::Method::PUT {
-            Ok(Method::Put)
-        } else if method == hyper::Method::DELETE {
-            Ok(Method::Delete)
-        } else if method == hyper::Method::CONNECT {
-            Ok(Method::Connect)
-        } else if method == hyper::Method::OPTIONS {
-            Ok(Method::Options)
-        } else if method == hyper::Method::TRACE {
-            Ok(Method::Trace)
-        } else if method == hyper::Method::PATCH {
-            Ok(Method::Patch)
-        } else {
-            Ok(Method::Other(method.to_owned()))
+    async fn finish_incoming_stream(
+        &mut self,
+        stream_id: IncomingStream,
+    ) -> wasmtime::Result<Option<Trailers>> {
+        for (_, stream) in self.http_ctx().streams.iter() {
+            if stream_id == stream.incoming() {
+                let response = self
+                    .table()
+                    .get_response(stream.parent_id())
+                    .context("[finish_incoming_stream] get trailers from response")?;
+                return Ok(response.trailers());
+            }
         }
+        bail!("unknown stream!")
     }
-    fn path_with_query(
+    async fn finish_outgoing_stream(
         &mut self,
-        id: Resource<HostIncomingRequest>,
-    ) -> wasmtime::Result<Option<String>> {
-        let req = self.table().get(&id)?;
-        Ok(req
-            .parts
-            .uri
-            .path_and_query()
-            .map(|path_and_query| path_and_query.as_str().to_owned()))
-    }
-    fn scheme(&mut self, id: Resource<HostIncomingRequest>) -> wasmtime::Result<Option<Scheme>> {
-        let req = self.table().get(&id)?;
-        Ok(req.parts.uri.scheme().map(|scheme| {
-            if scheme == &http::uri::Scheme::HTTP {
-                return Scheme::Http;
-            }
-
-            if scheme == &http::uri::Scheme::HTTPS {
-                return Scheme::Https;
-            }
-
-            Scheme::Other(req.parts.uri.scheme_str().unwrap().to_owned())
-        }))
+        _s: OutgoingStream,
+        _trailers: Option<Trailers>,
+    ) -> wasmtime::Result<()> {
+        bail!("unimplemented: finish_outgoing_stream")
     }
-    fn authority(&mut self, id: Resource<HostIncomingRequest>) -> wasmtime::Result<Option<String>> {
-        let req = self.table().get(&id)?;
-        Ok(req
-            .parts
-            .uri
-            .authority()
-            .map(|auth| auth.as_str().to_owned()))
+    async fn drop_incoming_request(&mut self, _request: IncomingRequest) -> wasmtime::Result<()> {
+        bail!("unimplemented: drop_incoming_request")
     }
-
-    fn headers(
-        &mut self,
-        id: Resource<HostIncomingRequest>,
-    ) -> wasmtime::Result<Resource<Headers>> {
-        let _ = self.table().get(&id)?;
-
-        fn get_fields(elem: &mut dyn Any) -> &mut FieldMap {
-            &mut elem
-                .downcast_mut::<HostIncomingRequest>()
-                .unwrap()
-                .parts
-                .headers
+    async fn drop_outgoing_request(&mut self, request: OutgoingRequest) -> wasmtime::Result<()> {
+        let r = self
+            .table_mut()
+            .get_request(request)
+            .context("[drop_outgoing_request] getting fields")?;
+
+        // Cleanup dependent resources
+        let body = r.body();
+        let headers = r.headers();
+        if let Some(b) = body {
+            self.table_mut().delete_stream(b).ok();
+        }
+        if let Some(h) = headers {
+            self.table_mut().delete_fields(h).ok();
         }
 
-        let headers = self.table().push_child(
-            HostFields::Ref {
-                parent: id.rep(),
-                get_fields,
-            },
-            &id,
-        )?;
+        self.table_mut()
+            .delete_request(request)
+            .context("[drop_outgoing_request] deleting request")?;
 
-        Ok(headers)
+        Ok(())
     }
-
-    fn consume(
+    async fn incoming_request_method(
         &mut self,
-        id: Resource<HostIncomingRequest>,
-    ) -> wasmtime::Result<Result<Resource<HostIncomingBody>, ()>> {
-        let req = self.table().get_mut(&id)?;
-        match req.body.take() {
-            Some(builder) => {
-                let id = self.table().push(builder.build())?;
-                Ok(Ok(id))
-            }
-
-            None => Ok(Err(())),
-        }
+        _request: IncomingRequest,
+    ) -> wasmtime::Result<Method> {
+        bail!("unimplemented: incoming_request_method")
     }
-
-    fn drop(&mut self, id: Resource<HostIncomingRequest>) -> wasmtime::Result<()> {
-        let _ = self.table().delete(id)?;
-        Ok(())
+    async fn incoming_request_path_with_query(
+        &mut self,
+        _request: IncomingRequest,
+    ) -> wasmtime::Result<Option<String>> {
+        bail!("unimplemented: incoming_request_path")
     }
-}
-
-impl<T: WasiHttpView> crate::bindings::http::types::HostOutgoingRequest for T {
-    fn new(
+    async fn incoming_request_scheme(
+        &mut self,
+        _request: IncomingRequest,
+    ) -> wasmtime::Result<Option<Scheme>> {
+        bail!("unimplemented: incoming_request_scheme")
+    }
+    async fn incoming_request_authority(
+        &mut self,
+        _request: IncomingRequest,
+    ) -> wasmtime::Result<Option<String>> {
+        bail!("unimplemented: incoming_request_authority")
+    }
+    async fn incoming_request_headers(
+        &mut self,
+        _request: IncomingRequest,
+    ) -> wasmtime::Result<Headers> {
+        bail!("unimplemented: incoming_request_headers")
+    }
+    async fn incoming_request_consume(
+        &mut self,
+        _request: IncomingRequest,
+    ) -> wasmtime::Result<Result<IncomingStream, ()>> {
+        bail!("unimplemented: incoming_request_consume")
+    }
+    async fn new_outgoing_request(
         &mut self,
         method: Method,
         path_with_query: Option<String>,
         scheme: Option<Scheme>,
         authority: Option<String>,
-        headers: Resource<Headers>,
-    ) -> wasmtime::Result<Resource<HostOutgoingRequest>> {
-        let headers = get_fields_mut(self.table(), &headers)?.clone();
-        self.table()
-            .push(HostOutgoingRequest {
-                path_with_query: path_with_query.unwrap_or("".to_string()),
-                authority: authority.unwrap_or("".to_string()),
-                method,
-                headers,
-                scheme,
-                body: None,
-            })
-            .context("[new_outgoing_request] pushing request")
+        headers: Headers,
+    ) -> wasmtime::Result<OutgoingRequest> {
+        let mut req = ActiveRequest::new();
+        req.path_with_query = path_with_query.unwrap_or("".to_string());
+        req.authority = authority.unwrap_or("".to_string());
+        req.method = method;
+        req.headers = Some(headers);
+        req.scheme = scheme;
+        let id = self
+            .table_mut()
+            .push_request(Box::new(req))
+            .context("[new_outgoing_request] pushing request")?;
+        Ok(id)
     }
-
-    fn write(
+    async fn outgoing_request_write(
         &mut self,
-        request: Resource<HostOutgoingRequest>,
-    ) -> wasmtime::Result<Result<Resource<HostOutgoingBody>, ()>> {
+        request: OutgoingRequest,
+    ) -> wasmtime::Result<Result<OutgoingStream, ()>> {
         let req = self
             .table()
-            .get_mut(&request)
+            .get_request(request)
             .context("[outgoing_request_write] getting request")?;
-
-        if req.body.is_some() {
-            return Ok(Err(()));
-        }
-
-        let (host_body, hyper_body) = HostOutgoingBody::new();
-
-        req.body = Some(hyper_body);
-
-        // The output stream will necessarily outlive the request, because we could be still
-        // writing to the stream after `outgoing-handler.handle` is called.
-        let outgoing_body = self.table().push(host_body)?;
-
-        Ok(Ok(outgoing_body))
-    }
-
-    fn drop(&mut self, request: Resource<HostOutgoingRequest>) -> wasmtime::Result<()> {
-        let _ = self.table().delete(request)?;
-        Ok(())
-    }
-}
-
-impl<T: WasiHttpView> crate::bindings::http::types::HostResponseOutparam for T {
-    fn drop(&mut self, id: Resource<HostResponseOutparam>) -> wasmtime::Result<()> {
-        let _ = self.table().delete(id)?;
-        Ok(())
+        let stream_id = if let Some(stream_id) = req.body() {
+            stream_id
+        } else {
+            let (new, stream) = self
+                .table_mut()
+                .push_stream(Bytes::new(), request)
+                .await
+                .expect("[outgoing_request_write] valid output stream");
+            self.http_ctx_mut().streams.insert(new, stream);
+            let req = self
+                .table_mut()
+                .get_request_mut(request)
+                .expect("[outgoing_request_write] request to be found");
+            req.set_body(new);
+            new
+        };
+        let stream = self
+            .table()
+            .get_stream(stream_id)
+            .context("[outgoing_request_write] getting stream")?;
+        Ok(Ok(stream.outgoing()))
     }
-    fn set(
+    async fn drop_response_outparam(
         &mut self,
-        id: Resource<HostResponseOutparam>,
-        resp: Result<Resource<HostOutgoingResponse>, Error>,
+        _response: ResponseOutparam,
     ) -> wasmtime::Result<()> {
-        let val = match resp {
-            Ok(resp) => Ok(self.table().delete(resp)?.try_into()?),
-            Err(e) => Err(e),
-        };
-
-        self.table()
-            .delete(id)?
-            .result
-            .send(val)
-            .map_err(|_| anyhow::anyhow!("failed to initialize response"))
+        bail!("unimplemented: drop_response_outparam")
     }
-}
-
-impl<T: WasiHttpView> crate::bindings::http::types::HostIncomingResponse for T {
-    fn drop(&mut self, response: Resource<HostIncomingResponse>) -> wasmtime::Result<()> {
-        let _ = self
+    async fn set_response_outparam(
+        &mut self,
+        _outparam: ResponseOutparam,
+        _response: Result<OutgoingResponse, Error>,
+    ) -> wasmtime::Result<Result<(), ()>> {
+        bail!("unimplemented: set_response_outparam")
+    }
+    async fn drop_incoming_response(&mut self, response: IncomingResponse) -> wasmtime::Result<()> {
+        let r = self
             .table()
-            .delete(response)
+            .get_response(response)
+            .context("[drop_incoming_response] getting response")?;
+
+        // Cleanup dependent resources
+        let body = r.body();
+        let headers = r.headers();
+        if let Some(id) = body {
+            let stream = self
+                .table()
+                .get_stream(id)
+                .context("[drop_incoming_response] getting stream")?;
+            let incoming_id = stream.incoming();
+            if let Some(trailers) = self.finish_incoming_stream(incoming_id).await? {
+                self.table_mut()
+                    .delete_fields(trailers)
+                    .context("[drop_incoming_response] deleting trailers")
+                    .unwrap_or_else(|_| ());
+            }
+            self.table_mut().delete_stream(id).ok();
+        }
+        if let Some(h) = headers {
+            self.table_mut().delete_fields(h).ok();
+        }
+
+        self.table_mut()
+            .delete_response(response)
             .context("[drop_incoming_response] deleting response")?;
         Ok(())
     }
-
-    fn status(&mut self, response: Resource<HostIncomingResponse>) -> wasmtime::Result<StatusCode> {
+    async fn drop_outgoing_response(
+        &mut self,
+        _response: OutgoingResponse,
+    ) -> wasmtime::Result<()> {
+        bail!("unimplemented: drop_outgoing_response")
+    }
+    async fn incoming_response_status(
+        &mut self,
+        response: IncomingResponse,
+    ) -> wasmtime::Result<StatusCode> {
         let r = self
             .table()
-            .get(&response)
+            .get_response(response)
             .context("[incoming_response_status] getting response")?;
-        Ok(r.status)
+        Ok(r.status())
     }
-
-    fn headers(
+    async fn incoming_response_headers(
         &mut self,
-        response: Resource<HostIncomingResponse>,
-    ) -> wasmtime::Result<Resource<Headers>> {
-        let _ = self
+        response: IncomingResponse,
+    ) -> wasmtime::Result<Headers> {
+        let r = self
             .table()
-            .get(&response)
+            .get_response(response)
             .context("[incoming_response_headers] getting response")?;
-
-        fn get_fields(elem: &mut dyn Any) -> &mut FieldMap {
-            &mut elem.downcast_mut::<HostIncomingResponse>().unwrap().headers
-        }
-
-        let id = self.table().push_child(
-            HostFields::Ref {
-                parent: response.rep(),
-                get_fields,
-            },
-            &response,
-        )?;
-
-        Ok(id)
+        Ok(r.headers().unwrap_or(0 as Headers))
     }
-
-    fn consume(
+    async fn incoming_response_consume(
         &mut self,
-        response: Resource<HostIncomingResponse>,
-    ) -> wasmtime::Result<Result<Resource<HostIncomingBody>, ()>> {
-        let table = self.table();
+        response: IncomingResponse,
+    ) -> wasmtime::Result<Result<IncomingStream, ()>> {
+        let table = self.table_mut();
         let r = table
-            .get_mut(&response)
+            .get_response(response)
             .context("[incoming_response_consume] getting response")?;
-
-        match r.body.take() {
-            Some(builder) => {
-                let id = self.table().push(builder.build())?;
-                Ok(Ok(id))
-            }
-
-            None => Ok(Err(())),
-        }
-    }
-}
-
-impl<T: WasiHttpView> crate::bindings::http::types::HostFutureTrailers for T {
-    fn drop(&mut self, id: Resource<HostFutureTrailers>) -> wasmtime::Result<()> {
-        let _ = self
-            .table()
-            .delete(id)
-            .context("[drop future-trailers] deleting future-trailers")?;
-        Ok(())
-    }
-
-    fn subscribe(
-        &mut self,
-        index: Resource<HostFutureTrailers>,
-    ) -> wasmtime::Result<Resource<Pollable>> {
-        wasmtime_wasi::preview2::subscribe(self.table(), index)
+        Ok(Ok(r
+            .body()
+            .map(|id| {
+                table
+                    .get_stream(id)
+                    .map(|stream| stream.incoming())
+                    .expect("[incoming_response_consume] response body stream")
+            })
+            .unwrap_or(0 as IncomingStream)))
     }
-
-    fn get(
+    async fn new_outgoing_response(
         &mut self,
-        id: Resource<HostFutureTrailers>,
-    ) -> wasmtime::Result<Option<Result<Option<Resource<Trailers>>, Error>>> {
-        let trailers = self.table().get_mut(&id)?;
-        match &trailers.state {
-            HostFutureTrailersState::Waiting(_) => return Ok(None),
-            HostFutureTrailersState::Done(Err(e)) => return Ok(Some(Err(e.clone()))),
-            HostFutureTrailersState::Done(Ok(None)) => return Ok(Some(Ok(None))),
-            HostFutureTrailersState::Done(Ok(Some(_))) => {}
-        }
-
-        fn get_fields(elem: &mut dyn Any) -> &mut FieldMap {
-            let trailers = elem.downcast_mut::<HostFutureTrailers>().unwrap();
-            match &mut trailers.state {
-                HostFutureTrailersState::Done(Ok(Some(e))) => e,
-                _ => unreachable!(),
-            }
-        }
-
-        let hdrs = self.table().push_child(
-            HostFields::Ref {
-                parent: id.rep(),
-                get_fields,
-            },
-            &id,
-        )?;
-
-        Ok(Some(Ok(Some(hdrs))))
+        _status_code: StatusCode,
+        _headers: Headers,
+    ) -> wasmtime::Result<OutgoingResponse> {
+        bail!("unimplemented: new_outgoing_response")
     }
-}
-
-impl<T: WasiHttpView> crate::bindings::http::types::HostIncomingBody for T {
-    fn stream(
+    async fn outgoing_response_write(
         &mut self,
-        id: Resource<HostIncomingBody>,
-    ) -> wasmtime::Result<Result<Resource<InputStream>, ()>> {
-        let body = self.table().get_mut(&id)?;
-
-        if let Some(stream) = body.stream.take() {
-            let stream = InputStream::Host(Box::new(stream));
-            let stream = self.table().push_child(stream, &id)?;
-            return Ok(Ok(stream));
-        }
-
-        Ok(Err(()))
+        _response: OutgoingResponse,
+    ) -> wasmtime::Result<Result<OutgoingStream, ()>> {
+        bail!("unimplemented: outgoing_response_write")
     }
-
-    fn finish(
+    async fn drop_future_incoming_response(
         &mut self,
-        id: Resource<HostIncomingBody>,
-    ) -> wasmtime::Result<Resource<HostFutureTrailers>> {
-        let body = self.table().delete(id)?;
-        let trailers = self.table().push(body.into_future_trailers())?;
-        Ok(trailers)
-    }
-
-    fn drop(&mut self, id: Resource<HostIncomingBody>) -> wasmtime::Result<()> {
-        let _ = self.table().delete(id)?;
+        future: FutureIncomingResponse,
+    ) -> wasmtime::Result<()> {
+        self.table_mut()
+            .delete_future(future)
+            .context("[drop_future_incoming_response] deleting future")?;
         Ok(())
     }
-}
-
-impl<T: WasiHttpView> crate::bindings::http::types::HostOutgoingResponse for T {
-    fn new(
+    async fn future_incoming_response_get(
         &mut self,
-        status: StatusCode,
-        headers: Resource<Headers>,
-    ) -> wasmtime::Result<Resource<HostOutgoingResponse>> {
-        let fields = get_fields_mut(self.table(), &headers)?.clone();
-
-        let id = self.table().push(HostOutgoingResponse {
-            status,
-            headers: fields,
-            body: None,
-        })?;
-
-        Ok(id)
+        future: FutureIncomingResponse,
+    ) -> wasmtime::Result<Option<Result<IncomingResponse, Error>>> {
+        let f = self
+            .table()
+            .get_future(future)
+            .context("[future_incoming_response_get] getting future")?;
+        Ok(match f.pollable_id() {
+            Some(_) => {
+                let result = match f.response_id() {
+                    Some(id) => Ok(id),
+                    None => {
+                        let response = self.handle_async(f.request_id(), f.options()).await;
+                        match response {
+                            Ok(id) => {
+                                tracing::debug!(
+                                    "including response id to future incoming response"
+                                );
+                                let future_mut = self.table_mut().get_future_mut(future)?;
+                                future_mut.set_response_id(id);
+                                tracing::trace!(
+                                    "future incoming response details {:?}",
+                                    *future_mut
+                                );
+                            }
+                            _ => {}
+                        }
+                        response
+                    }
+                };
+                Some(result)
+            }
+            None => None,
+        })
     }
-
-    fn write(
+    async fn listen_to_future_incoming_response(
         &mut self,
-        id: Resource<HostOutgoingResponse>,
-    ) -> wasmtime::Result<Result<Resource<HostOutgoingBody>, ()>> {
-        let resp = self.table().get_mut(&id)?;
+        future: FutureIncomingResponse,
+    ) -> wasmtime::Result<Pollable> {
+        let f = self
+            .table()
+            .get_future(future)
+            .context("[listen_to_future_incoming_response] getting future")?;
+        Ok(match f.pollable_id() {
+            Some(pollable_id) => pollable_id,
+            None => {
+                tracing::debug!("including pollable id to future incoming response");
+                let pollable =
+                    HostPollable::Closure(Box::new(|| Box::pin(futures::future::ready(Ok(())))));
+                let pollable_id = self
+                    .table_mut()
+                    .push_host_pollable(pollable)
+                    .context("[listen_to_future_incoming_response] pushing host pollable")?;
+                let f = self
+                    .table_mut()
+                    .get_future_mut(future)
+                    .context("[listen_to_future_incoming_response] getting future")?;
+                f.set_pollable_id(pollable_id);
+                tracing::trace!("future incoming response details {:?}", *f);
+                pollable_id
+            }
+        })
+    }
+}
 
-        if resp.body.is_some() {
-            return Ok(Err(()));
+#[cfg(feature = "sync")]
+pub mod sync {
+    use crate::bindings::http::types::{
+        Error as AsyncError, Host as AsyncHost, Method as AsyncMethod, Scheme as AsyncScheme,
+    };
+    use crate::bindings::sync::http::types::{
+        Error, Fields, FutureIncomingResponse, Headers, IncomingRequest, IncomingResponse,
+        IncomingStream, Method, OutgoingRequest, OutgoingResponse, OutgoingStream,
+        ResponseOutparam, Scheme, StatusCode, Trailers,
+    };
+    use crate::http_impl::WasiHttpViewExt;
+    use crate::WasiHttpView;
+    use wasmtime_wasi::preview2::{bindings::poll::poll::Pollable, in_tokio};
+
+    // same boilerplate everywhere, converting between two identical types with different
+    // definition sites. one day wasmtime-wit-bindgen will make all this unnecessary
+    impl From<AsyncError> for Error {
+        fn from(other: AsyncError) -> Self {
+            match other {
+                AsyncError::InvalidUrl(v) => Self::InvalidUrl(v),
+                AsyncError::ProtocolError(v) => Self::ProtocolError(v),
+                AsyncError::TimeoutError(v) => Self::TimeoutError(v),
+                AsyncError::UnexpectedError(v) => Self::UnexpectedError(v),
+            }
         }
-
-        let (host, body) = HostOutgoingBody::new();
-
-        resp.body.replace(body);
-
-        let id = self.table().push(host)?;
-
-        Ok(Ok(id))
     }
 
-    fn drop(&mut self, id: Resource<HostOutgoingResponse>) -> wasmtime::Result<()> {
-        let _ = self.table().delete(id)?;
-        Ok(())
+    impl From<Error> for AsyncError {
+        fn from(other: Error) -> Self {
+            match other {
+                Error::InvalidUrl(v) => Self::InvalidUrl(v),
+                Error::ProtocolError(v) => Self::ProtocolError(v),
+                Error::TimeoutError(v) => Self::TimeoutError(v),
+                Error::UnexpectedError(v) => Self::UnexpectedError(v),
+            }
+        }
     }
-}
 
-impl<T: WasiHttpView> crate::bindings::http::types::HostFutureIncomingResponse for T {
-    fn drop(&mut self, id: Resource<HostFutureIncomingResponse>) -> wasmtime::Result<()> {
-        let _ = self.table().delete(id)?;
-        Ok(())
+    impl From<AsyncMethod> for Method {
+        fn from(other: AsyncMethod) -> Self {
+            match other {
+                AsyncMethod::Connect => Self::Connect,
+                AsyncMethod::Delete => Self::Delete,
+                AsyncMethod::Get => Self::Get,
+                AsyncMethod::Head => Self::Head,
+                AsyncMethod::Options => Self::Options,
+                AsyncMethod::Patch => Self::Patch,
+                AsyncMethod::Post => Self::Post,
+                AsyncMethod::Put => Self::Put,
+                AsyncMethod::Trace => Self::Trace,
+                AsyncMethod::Other(v) => Self::Other(v),
+            }
+        }
     }
 
-    fn get(
-        &mut self,
-        id: Resource<HostFutureIncomingResponse>,
-    ) -> wasmtime::Result<Option<Result<Result<Resource<HostIncomingResponse>, Error>, ()>>> {
-        let resp = self.table().get_mut(&id)?;
-
-        match resp {
-            HostFutureIncomingResponse::Pending(_) => return Ok(None),
-            HostFutureIncomingResponse::Consumed => return Ok(Some(Err(()))),
-            HostFutureIncomingResponse::Ready(_) => {}
+    impl From<Method> for AsyncMethod {
+        fn from(other: Method) -> Self {
+            match other {
+                Method::Connect => Self::Connect,
+                Method::Delete => Self::Delete,
+                Method::Get => Self::Get,
+                Method::Head => Self::Head,
+                Method::Options => Self::Options,
+                Method::Patch => Self::Patch,
+                Method::Post => Self::Post,
+                Method::Put => Self::Put,
+                Method::Trace => Self::Trace,
+                Method::Other(v) => Self::Other(v),
+            }
         }
-
-        let resp =
-            match std::mem::replace(resp, HostFutureIncomingResponse::Consumed).unwrap_ready() {
-                Err(e) => {
-                    // Trapping if it's not possible to downcast to an wasi-http error
-                    let e = e.downcast::<Error>()?;
-                    return Ok(Some(Ok(Err(e))));
-                }
-
-                Ok(resp) => resp,
-            };
-
-        let (parts, body) = resp.resp.into_parts();
-
-        let resp = self.table().push(HostIncomingResponse {
-            status: parts.status.as_u16(),
-            headers: FieldMap::from(parts.headers),
-            body: Some(HostIncomingBodyBuilder {
-                body,
-                between_bytes_timeout: resp.between_bytes_timeout,
-            }),
-            worker: resp.worker,
-        })?;
-
-        Ok(Some(Ok(Ok(resp))))
-    }
-    fn subscribe(
-        &mut self,
-        id: Resource<HostFutureIncomingResponse>,
-    ) -> wasmtime::Result<Resource<Pollable>> {
-        wasmtime_wasi::preview2::subscribe(self.table(), id)
     }
-}
 
-impl<T: WasiHttpView> crate::bindings::http::types::HostOutgoingBody for T {
-    fn write(
-        &mut self,
-        id: Resource<HostOutgoingBody>,
-    ) -> wasmtime::Result<Result<Resource<OutputStream>, ()>> {
-        let body = self.table().get_mut(&id)?;
-        if let Some(stream) = body.body_output_stream.take() {
-            let id = self.table().push_child(stream, &id)?;
-            Ok(Ok(id))
-        } else {
-            Ok(Err(()))
+    impl From<AsyncScheme> for Scheme {
+        fn from(other: AsyncScheme) -> Self {
+            match other {
+                AsyncScheme::Http => Self::Http,
+                AsyncScheme::Https => Self::Https,
+                AsyncScheme::Other(v) => Self::Other(v),
+            }
         }
     }
 
-    fn finish(
-        &mut self,
-        id: Resource<HostOutgoingBody>,
-        ts: Option<Resource<Trailers>>,
-    ) -> wasmtime::Result<()> {
-        let mut body = self.table().delete(id)?;
-
-        let sender = body
-            .finish_sender
-            .take()
-            .expect("outgoing-body trailer_sender consumed by a non-owning function");
-
-        let message = if let Some(ts) = ts {
-            FinishMessage::Trailers(get_fields_mut(self.table(), &ts)?.clone().into())
-        } else {
-            FinishMessage::Finished
-        };
-
-        // Ignoring failure: receiver died sending body, but we can't report that here.
-        let _ = sender.send(message.into());
-
-        Ok(())
+    impl From<Scheme> for AsyncScheme {
+        fn from(other: Scheme) -> Self {
+            match other {
+                Scheme::Http => Self::Http,
+                Scheme::Https => Self::Https,
+                Scheme::Other(v) => Self::Other(v),
+            }
+        }
     }
 
-    fn drop(&mut self, id: Resource<HostOutgoingBody>) -> wasmtime::Result<()> {
-        let mut body = self.table().delete(id)?;
-
-        let sender = body
-            .finish_sender
-            .take()
-            .expect("outgoing-body trailer_sender consumed by a non-owning function");
-
-        // Ignoring failure: receiver died sending body, but we can't report that here.
-        let _ = sender.send(FinishMessage::Abort);
-
-        Ok(())
+    impl<T: WasiHttpView + WasiHttpViewExt> crate::bindings::sync::http::types::Host for T {
+        fn drop_fields(&mut self, fields: Fields) -> wasmtime::Result<()> {
+            in_tokio(async { AsyncHost::drop_fields(self, fields).await })
+        }
+        fn new_fields(&mut self, entries: Vec<(String, String)>) -> wasmtime::Result<Fields> {
+            in_tokio(async { AsyncHost::new_fields(self, entries).await })
+        }
+        fn fields_get(&mut self, fields: Fields, name: String) -> wasmtime::Result<Vec<Vec<u8>>> {
+            in_tokio(async { AsyncHost::fields_get(self, fields, name).await })
+        }
+        fn fields_set(
+            &mut self,
+            fields: Fields,
+            name: String,
+            value: Vec<Vec<u8>>,
+        ) -> wasmtime::Result<()> {
+            in_tokio(async { AsyncHost::fields_set(self, fields, name, value).await })
+        }
+        fn fields_delete(&mut self, fields: Fields, name: String) -> wasmtime::Result<()> {
+            in_tokio(async { AsyncHost::fields_delete(self, fields, name).await })
+        }
+        fn fields_append(
+            &mut self,
+            fields: Fields,
+            name: String,
+            value: Vec<u8>,
+        ) -> wasmtime::Result<()> {
+            in_tokio(async { AsyncHost::fields_append(self, fields, name, value).await })
+        }
+        fn fields_entries(&mut self, fields: Fields) -> wasmtime::Result<Vec<(String, Vec<u8>)>> {
+            in_tokio(async { AsyncHost::fields_entries(self, fields).await })
+        }
+        fn fields_clone(&mut self, fields: Fields) -> wasmtime::Result<Fields> {
+            in_tokio(async { AsyncHost::fields_clone(self, fields).await })
+        }
+        fn finish_incoming_stream(
+            &mut self,
+            stream_id: IncomingStream,
+        ) -> wasmtime::Result<Option<Trailers>> {
+            in_tokio(async { AsyncHost::finish_incoming_stream(self, stream_id).await })
+        }
+        fn finish_outgoing_stream(
+            &mut self,
+            stream: OutgoingStream,
+            trailers: Option<Trailers>,
+        ) -> wasmtime::Result<()> {
+            in_tokio(async { AsyncHost::finish_outgoing_stream(self, stream, trailers).await })
+        }
+        fn drop_incoming_request(&mut self, request: IncomingRequest) -> wasmtime::Result<()> {
+            in_tokio(async { AsyncHost::drop_incoming_request(self, request).await })
+        }
+        fn drop_outgoing_request(&mut self, request: OutgoingRequest) -> wasmtime::Result<()> {
+            in_tokio(async { AsyncHost::drop_outgoing_request(self, request).await })
+        }
+        fn incoming_request_method(
+            &mut self,
+            request: IncomingRequest,
+        ) -> wasmtime::Result<Method> {
+            in_tokio(async { AsyncHost::incoming_request_method(self, request).await })
+                .map(Method::from)
+        }
+        fn incoming_request_path_with_query(
+            &mut self,
+            request: IncomingRequest,
+        ) -> wasmtime::Result<Option<String>> {
+            in_tokio(async { AsyncHost::incoming_request_path_with_query(self, request).await })
+        }
+        fn incoming_request_scheme(
+            &mut self,
+            request: IncomingRequest,
+        ) -> wasmtime::Result<Option<Scheme>> {
+            Ok(
+                in_tokio(async { AsyncHost::incoming_request_scheme(self, request).await })?
+                    .map(Scheme::from),
+            )
+        }
+        fn incoming_request_authority(
+            &mut self,
+            request: IncomingRequest,
+        ) -> wasmtime::Result<Option<String>> {
+            in_tokio(async { AsyncHost::incoming_request_authority(self, request).await })
+        }
+        fn incoming_request_headers(
+            &mut self,
+            request: IncomingRequest,
+        ) -> wasmtime::Result<Headers> {
+            in_tokio(async { AsyncHost::incoming_request_headers(self, request).await })
+        }
+        fn incoming_request_consume(
+            &mut self,
+            request: IncomingRequest,
+        ) -> wasmtime::Result<Result<IncomingStream, ()>> {
+            in_tokio(async { AsyncHost::incoming_request_consume(self, request).await })
+        }
+        fn new_outgoing_request(
+            &mut self,
+            method: Method,
+            path_with_query: Option<String>,
+            scheme: Option<Scheme>,
+            authority: Option<String>,
+            headers: Headers,
+        ) -> wasmtime::Result<OutgoingRequest> {
+            in_tokio(async {
+                AsyncHost::new_outgoing_request(
+                    self,
+                    method.into(),
+                    path_with_query,
+                    scheme.map(AsyncScheme::from),
+                    authority,
+                    headers,
+                )
+                .await
+            })
+        }
+        fn outgoing_request_write(
+            &mut self,
+            request: OutgoingRequest,
+        ) -> wasmtime::Result<Result<OutgoingStream, ()>> {
+            in_tokio(async { AsyncHost::outgoing_request_write(self, request).await })
+        }
+        fn drop_response_outparam(&mut self, response: ResponseOutparam) -> wasmtime::Result<()> {
+            in_tokio(async { AsyncHost::drop_response_outparam(self, response).await })
+        }
+        fn set_response_outparam(
+            &mut self,
+            outparam: ResponseOutparam,
+            response: Result<OutgoingResponse, Error>,
+        ) -> wasmtime::Result<Result<(), ()>> {
+            in_tokio(async {
+                AsyncHost::set_response_outparam(self, outparam, response.map_err(AsyncError::from))
+                    .await
+            })
+        }
+        fn drop_incoming_response(&mut self, response: IncomingResponse) -> wasmtime::Result<()> {
+            in_tokio(async { AsyncHost::drop_incoming_response(self, response).await })
+        }
+        fn drop_outgoing_response(&mut self, response: OutgoingResponse) -> wasmtime::Result<()> {
+            in_tokio(async { AsyncHost::drop_outgoing_response(self, response).await })
+        }
+        fn incoming_response_status(
+            &mut self,
+            response: IncomingResponse,
+        ) -> wasmtime::Result<StatusCode> {
+            in_tokio(async { AsyncHost::incoming_response_status(self, response).await })
+        }
+        fn incoming_response_headers(
+            &mut self,
+            response: IncomingResponse,
+        ) -> wasmtime::Result<Headers> {
+            in_tokio(async { AsyncHost::incoming_response_headers(self, response).await })
+        }
+        fn incoming_response_consume(
+            &mut self,
+            response: IncomingResponse,
+        ) -> wasmtime::Result<Result<IncomingStream, ()>> {
+            in_tokio(async { AsyncHost::incoming_response_consume(self, response).await })
+        }
+        fn new_outgoing_response(
+            &mut self,
+            status_code: StatusCode,
+            headers: Headers,
+        ) -> wasmtime::Result<OutgoingResponse> {
+            in_tokio(async { AsyncHost::new_outgoing_response(self, status_code, headers).await })
+        }
+        fn outgoing_response_write(
+            &mut self,
+            response: OutgoingResponse,
+        ) -> wasmtime::Result<Result<OutgoingStream, ()>> {
+            in_tokio(async { AsyncHost::outgoing_response_write(self, response).await })
+        }
+        fn drop_future_incoming_response(
+            &mut self,
+            future: FutureIncomingResponse,
+        ) -> wasmtime::Result<()> {
+            in_tokio(async { AsyncHost::drop_future_incoming_response(self, future).await })
+        }
+        fn future_incoming_response_get(
+            &mut self,
+            future: FutureIncomingResponse,
+        ) -> wasmtime::Result<Option<Result<IncomingResponse, Error>>> {
+            Ok(
+                in_tokio(async { AsyncHost::future_incoming_response_get(self, future).await })?
+                    .map(|v| v.map_err(Error::from)),
+            )
+        }
+        fn listen_to_future_incoming_response(
+            &mut self,
+            future: FutureIncomingResponse,
+        ) -> wasmtime::Result<Pollable> {
+            in_tokio(async { AsyncHost::listen_to_future_incoming_response(self, future).await })
+        }
     }
 }
diff --git a/crates/wasi-http/tests/all/async_.rs b/crates/wasi-http/tests/all/async_.rs
deleted file mode 100644
index 128c1f25fce9..000000000000
--- a/crates/wasi-http/tests/all/async_.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use super::*;
-use test_programs_artifacts::*;
-use wasmtime_wasi::preview2::command::Command;
-
-foreach_http!(assert_test_exists);
-
-async fn run(path: &str, server: &Server) -> Result<()> {
-    let mut config = Config::new();
-    config.wasm_backtrace_details(wasmtime::WasmBacktraceDetails::Enable);
-    config.wasm_component_model(true);
-    config.async_support(true);
-    let engine = Engine::new(&config)?;
-    let component = Component::from_file(&engine, path)?;
-    let mut store = store(&engine, server);
-    let mut linker = Linker::new(&engine);
-    wasmtime_wasi_http::proxy::add_to_linker(&mut linker)?;
-    let (command, _instance) = Command::instantiate_async(&mut store, &component, &linker).await?;
-    let result = command.wasi_cli_run().call_run(&mut store).await?;
-    result.map_err(|()| anyhow::anyhow!("run returned an error"))
-}
-
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn http_outbound_request_get() -> Result<()> {
-    let server = Server::http1()?;
-    run(HTTP_OUTBOUND_REQUEST_GET_COMPONENT, &server).await
-}
-
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn http_outbound_request_post() -> Result<()> {
-    let server = Server::http1()?;
-    run(HTTP_OUTBOUND_REQUEST_POST_COMPONENT, &server).await
-}
-
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn http_outbound_request_large_post() -> Result<()> {
-    let server = Server::http1()?;
-    run(HTTP_OUTBOUND_REQUEST_LARGE_POST_COMPONENT, &server).await
-}
-
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn http_outbound_request_put() -> Result<()> {
-    let server = Server::http1()?;
-    run(HTTP_OUTBOUND_REQUEST_PUT_COMPONENT, &server).await
-}
-
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn http_outbound_request_invalid_version() -> Result<()> {
-    let server = Server::http2()?;
-    run(HTTP_OUTBOUND_REQUEST_INVALID_VERSION_COMPONENT, &server).await
-}
-
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn http_outbound_request_unknown_method() -> Result<()> {
-    let server = Server::http1()?;
-    run(HTTP_OUTBOUND_REQUEST_UNKNOWN_METHOD_COMPONENT, &server).await
-}
-
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn http_outbound_request_unsupported_scheme() -> Result<()> {
-    let server = Server::http1()?;
-    run(HTTP_OUTBOUND_REQUEST_UNSUPPORTED_SCHEME_COMPONENT, &server).await
-}
-
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn http_outbound_request_invalid_port() -> Result<()> {
-    let server = Server::http1()?;
-    run(HTTP_OUTBOUND_REQUEST_INVALID_PORT_COMPONENT, &server).await
-}
-
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn http_outbound_request_invalid_dnsname() -> Result<()> {
-    let server = Server::http1()?;
-    run(HTTP_OUTBOUND_REQUEST_INVALID_DNSNAME_COMPONENT, &server).await
-}
-
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn http_outbound_request_response_build() -> Result<()> {
-    let server = Server::http1()?;
-    run(HTTP_OUTBOUND_REQUEST_RESPONSE_BUILD_COMPONENT, &server).await
-}
diff --git a/crates/wasi-http/tests/all/http_server.rs b/crates/wasi-http/tests/all/http_server.rs
deleted file mode 100644
index d22fe5b201bc..000000000000
--- a/crates/wasi-http/tests/all/http_server.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-use anyhow::{Context, Result};
-use http_body_util::{combinators::BoxBody, BodyExt, Full};
-use hyper::{body::Bytes, service::service_fn, Request, Response};
-use std::{
-    future::Future,
-    net::{SocketAddr, TcpStream},
-    thread::JoinHandle,
-};
-use tokio::net::TcpListener;
-
-async fn test(
-    mut req: Request<hyper::body::Incoming>,
-) -> http::Result<Response<BoxBody<Bytes, std::convert::Infallible>>> {
-    tracing::debug!("preparing mocked response",);
-    let method = req.method().to_string();
-    let body = req.body_mut().collect().await.unwrap();
-    let buf = body.to_bytes();
-    tracing::trace!("hyper request body size {:?}", buf.len());
-
-    Response::builder()
-        .status(http::StatusCode::OK)
-        .header("x-wasmtime-test-method", method)
-        .header("x-wasmtime-test-uri", req.uri().to_string())
-        .body(Full::<Bytes>::from(buf).boxed())
-}
-
-pub struct Server {
-    addr: SocketAddr,
-    worker: Option<JoinHandle<Result<()>>>,
-}
-
-impl Server {
-    fn new<F>(run: impl FnOnce(tokio::net::TcpStream) -> F + Send + Sync + 'static) -> Result<Self>
-    where
-        F: Future<Output = Result<()>>,
-    {
-        let thread = std::thread::spawn(|| -> Result<_> {
-            let rt = tokio::runtime::Builder::new_current_thread()
-                .enable_all()
-                .build()
-                .context("failed to start tokio runtime")?;
-            let listener = rt.block_on(async move {
-                let addr = SocketAddr::from(([127, 0, 0, 1], 0));
-                TcpListener::bind(addr).await.context("failed to bind")
-            })?;
-            Ok((rt, listener))
-        });
-        let (rt, listener) = thread.join().unwrap()?;
-        let addr = listener.local_addr().context("failed to get local addr")?;
-        let worker = std::thread::spawn(move || {
-            tracing::debug!("dedicated thread to start listening");
-            rt.block_on(async move {
-                tracing::debug!("preparing to accept connection");
-                let (stream, _) = listener.accept().await.map_err(anyhow::Error::from)?;
-                run(stream).await
-            })
-        });
-        Ok(Self {
-            worker: Some(worker),
-            addr,
-        })
-    }
-
-    pub fn http1() -> Result<Self> {
-        tracing::debug!("initializing http1 server");
-        Self::new(|io| async move {
-            let mut builder = hyper::server::conn::http1::Builder::new();
-            let http = builder.keep_alive(false).pipeline_flush(true);
-
-            tracing::debug!("preparing to bind connection to service");
-            let conn = http.serve_connection(io, service_fn(test)).await;
-            tracing::trace!("connection result {:?}", conn);
-            conn?;
-            Ok(())
-        })
-    }
-
-    pub fn http2() -> Result<Self> {
-        tracing::debug!("initializing http2 server");
-        Self::new(|io| async move {
-            let mut builder = hyper::server::conn::http2::Builder::new(TokioExecutor);
-            let http = builder.max_concurrent_streams(20);
-
-            tracing::debug!("preparing to bind connection to service");
-            let conn = http.serve_connection(io, service_fn(test)).await;
-            tracing::trace!("connection result {:?}", conn);
-            if let Err(e) = &conn {
-                let message = e.to_string();
-                if message.contains("connection closed before reading preface")
-                    || message.contains("unspecific protocol error detected")
-                {
-                    return Ok(());
-                }
-            }
-            conn?;
-            Ok(())
-        })
-    }
-
-    pub fn addr(&self) -> String {
-        format!("localhost:{}", self.addr.port())
-    }
-}
-
-impl Drop for Server {
-    fn drop(&mut self) {
-        tracing::debug!("shutting down http1 server");
-        // Force a connection to happen in case one hasn't happened already.
-        let _ = TcpStream::connect(&self.addr);
-
-        // If the worker fails with an error, report it here but don't panic.
-        // Some tests don't make a connection so the error will be that the tcp
-        // stream created above is closed immediately afterwards. Let the test
-        // independently decide if it failed or not, and this should be in the
-        // logs to assist with debugging if necessary.
-        let worker = self.worker.take().unwrap();
-        if let Err(e) = worker.join().unwrap() {
-            eprintln!("worker failed with error {e:?}");
-        }
-    }
-}
-
-#[derive(Clone)]
-/// An Executor that uses the tokio runtime.
-struct TokioExecutor;
-
-impl<F> hyper::rt::Executor<F> for TokioExecutor
-where
-    F: Future + Send + 'static,
-    F::Output: Send + 'static,
-{
-    fn execute(&self, fut: F) {
-        tokio::task::spawn(fut);
-    }
-}
diff --git a/crates/wasi-http/tests/all/main.rs b/crates/wasi-http/tests/all/main.rs
deleted file mode 100644
index f9c68da0a9b7..000000000000
--- a/crates/wasi-http/tests/all/main.rs
+++ /dev/null
@@ -1,414 +0,0 @@
-use crate::http_server::Server;
-use anyhow::{anyhow, Context, Result};
-use futures::{channel::oneshot, future, stream, FutureExt};
-use http_body::Frame;
-use http_body_util::{combinators::BoxBody, Collected, StreamBody};
-use hyper::{body::Bytes, server::conn::http1, service::service_fn, Method, StatusCode};
-use sha2::{Digest, Sha256};
-use std::{collections::HashMap, iter, net::Ipv4Addr, str, sync::Arc};
-use tokio::task;
-use wasmtime::{
-    component::{Component, Linker, Resource},
-    Config, Engine, Store,
-};
-use wasmtime_wasi::preview2::{
-    self, pipe::MemoryOutputPipe, Table, WasiCtx, WasiCtxBuilder, WasiView,
-};
-use wasmtime_wasi_http::{
-    bindings::http::types::Error,
-    body::HyperIncomingBody,
-    types::{self, HostFutureIncomingResponse, IncomingResponseInternal, OutgoingRequest},
-    WasiHttpCtx, WasiHttpView,
-};
-
-mod http_server;
-
-type RequestSender = Arc<
-    dyn Fn(&mut Ctx, OutgoingRequest) -> wasmtime::Result<Resource<HostFutureIncomingResponse>>
-        + Send
-        + Sync,
->;
-
-struct Ctx {
-    table: Table,
-    wasi: WasiCtx,
-    http: WasiHttpCtx,
-    stdout: MemoryOutputPipe,
-    stderr: MemoryOutputPipe,
-    send_request: Option<RequestSender>,
-}
-
-impl WasiView for Ctx {
-    fn table(&self) -> &Table {
-        &self.table
-    }
-    fn table_mut(&mut self) -> &mut Table {
-        &mut self.table
-    }
-    fn ctx(&self) -> &WasiCtx {
-        &self.wasi
-    }
-    fn ctx_mut(&mut self) -> &mut WasiCtx {
-        &mut self.wasi
-    }
-}
-
-impl WasiHttpView for Ctx {
-    fn ctx(&mut self) -> &mut WasiHttpCtx {
-        &mut self.http
-    }
-
-    fn table(&mut self) -> &mut Table {
-        &mut self.table
-    }
-
-    fn send_request(
-        &mut self,
-        request: OutgoingRequest,
-    ) -> wasmtime::Result<Resource<HostFutureIncomingResponse>> {
-        if let Some(send_request) = self.send_request.clone() {
-            send_request(self, request)
-        } else {
-            types::default_send_request(self, request)
-        }
-    }
-}
-
-fn store(engine: &Engine, server: &Server) -> Store<Ctx> {
-    let stdout = MemoryOutputPipe::new(4096);
-    let stderr = MemoryOutputPipe::new(4096);
-
-    // Create our wasi context.
-    let mut builder = WasiCtxBuilder::new();
-    builder.stdout(stdout.clone());
-    builder.stderr(stderr.clone());
-    builder.env("HTTP_SERVER", server.addr().to_string());
-    let ctx = Ctx {
-        table: Table::new(),
-        wasi: builder.build(),
-        http: WasiHttpCtx {},
-        stderr,
-        stdout,
-        send_request: None,
-    };
-
-    Store::new(&engine, ctx)
-}
-
-impl Drop for Ctx {
-    fn drop(&mut self) {
-        let stdout = self.stdout.contents();
-        if !stdout.is_empty() {
-            println!("[guest] stdout:\n{}\n===", String::from_utf8_lossy(&stdout));
-        }
-        let stderr = self.stderr.contents();
-        if !stderr.is_empty() {
-            println!("[guest] stderr:\n{}\n===", String::from_utf8_lossy(&stderr));
-        }
-    }
-}
-
-// Assert that each of `sync` and `async` below are testing everything through
-// assertion of the existence of the test function itself.
-macro_rules! assert_test_exists {
-    ($name:ident) => {
-        #[allow(unused_imports)]
-        use self::$name as _;
-    };
-}
-
-mod async_;
-mod sync;
-
-async fn run_wasi_http(
-    component_filename: &str,
-    req: hyper::Request<HyperIncomingBody>,
-    send_request: Option<RequestSender>,
-) -> anyhow::Result<Result<hyper::Response<Collected<Bytes>>, Error>> {
-    let stdout = MemoryOutputPipe::new(4096);
-    let stderr = MemoryOutputPipe::new(4096);
-    let table = Table::new();
-
-    let mut config = Config::new();
-    config.wasm_backtrace_details(wasmtime::WasmBacktraceDetails::Enable);
-    config.wasm_component_model(true);
-    config.async_support(true);
-    let engine = Engine::new(&config)?;
-    let component = Component::from_file(&engine, component_filename)?;
-
-    // Create our wasi context.
-    let mut builder = WasiCtxBuilder::new();
-    builder.stdout(stdout.clone());
-    builder.stderr(stderr.clone());
-    let wasi = builder.build();
-    let http = WasiHttpCtx;
-    let ctx = Ctx {
-        table,
-        wasi,
-        http,
-        stderr,
-        stdout,
-        send_request,
-    };
-    let mut store = Store::new(&engine, ctx);
-
-    let mut linker = Linker::new(&engine);
-    wasmtime_wasi_http::proxy::add_to_linker(&mut linker)?;
-    let (proxy, _) =
-        wasmtime_wasi_http::proxy::Proxy::instantiate_async(&mut store, &component, &linker)
-            .await?;
-
-    let req = store.data_mut().new_incoming_request(req)?;
-
-    let (sender, receiver) = tokio::sync::oneshot::channel();
-    let out = store.data_mut().new_response_outparam(sender)?;
-
-    let handle = preview2::spawn(async move {
-        proxy
-            .wasi_http_incoming_handler()
-            .call_handle(&mut store, req, out)
-            .await?;
-
-        Ok::<_, anyhow::Error>(())
-    });
-
-    let resp = match receiver.await {
-        Ok(Ok(resp)) => {
-            use http_body_util::BodyExt;
-            let (parts, body) = resp.into_parts();
-            let collected = BodyExt::collect(body).await?;
-            Ok(hyper::Response::from_parts(parts, collected))
-        }
-
-        Ok(Err(e)) => Err(e),
-
-        // This happens if the wasm never calls `set-response-outparam`
-        Err(e) => panic!("Failed to receive a response: {e:?}"),
-    };
-
-    // Now that the response has been processed, we can wait on the wasm to finish without
-    // deadlocking.
-    handle.await.context("Component execution")?;
-
-    Ok(resp)
-}
-
-#[test_log::test(tokio::test)]
-async fn wasi_http_proxy_tests() -> anyhow::Result<()> {
-    let req = hyper::Request::builder()
-        .method(http::Method::GET)
-        .body(body::empty())?;
-
-    let resp = run_wasi_http(test_programs_artifacts::API_PROXY_COMPONENT, req, None).await?;
-
-    match resp {
-        Ok(resp) => println!("response: {resp:?}"),
-        Err(e) => panic!("Error given in response: {e:?}"),
-    };
-
-    Ok(())
-}
-
-#[test_log::test(tokio::test)]
-async fn wasi_http_hash_all() -> Result<()> {
-    do_wasi_http_hash_all(false).await
-}
-
-#[test_log::test(tokio::test)]
-async fn wasi_http_hash_all_with_override() -> Result<()> {
-    do_wasi_http_hash_all(true).await
-}
-
-async fn do_wasi_http_hash_all(override_send_request: bool) -> Result<()> {
-    let bodies = Arc::new(
-        [
-            ("/a", "’Twas brillig, and the slithy toves"),
-            ("/b", "Did gyre and gimble in the wabe:"),
-            ("/c", "All mimsy were the borogoves,"),
-            ("/d", "And the mome raths outgrabe."),
-        ]
-        .into_iter()
-        .collect::<HashMap<_, _>>(),
-    );
-
-    let listener = tokio::net::TcpListener::bind((Ipv4Addr::new(127, 0, 0, 1), 0)).await?;
-
-    let prefix = format!("http://{}", listener.local_addr()?);
-
-    let (_tx, rx) = oneshot::channel::<()>();
-
-    let handle = {
-        let bodies = bodies.clone();
-
-        move |request: http::request::Parts| {
-            if let (Method::GET, Some(body)) = (request.method, bodies.get(request.uri.path())) {
-                Ok::<_, anyhow::Error>(hyper::Response::new(body::full(Bytes::copy_from_slice(
-                    body.as_bytes(),
-                ))))
-            } else {
-                Ok(hyper::Response::builder()
-                    .status(StatusCode::METHOD_NOT_ALLOWED)
-                    .body(body::empty())?)
-            }
-        }
-    };
-
-    let send_request = if override_send_request {
-        Some(Arc::new(
-            move |view: &mut Ctx,
-                  OutgoingRequest {
-                      request,
-                      between_bytes_timeout,
-                      ..
-                  }| {
-                Ok(view.table().push(HostFutureIncomingResponse::Ready(
-                    handle(request.into_parts().0).map(|resp| IncomingResponseInternal {
-                        resp,
-                        worker: preview2::spawn(future::ready(Ok(()))),
-                        between_bytes_timeout,
-                    }),
-                ))?)
-            },
-        ) as RequestSender)
-    } else {
-        let server = async move {
-            loop {
-                let (stream, _) = listener.accept().await?;
-                let handle = handle.clone();
-                task::spawn(async move {
-                    if let Err(e) = http1::Builder::new()
-                        .keep_alive(true)
-                        .serve_connection(
-                            stream,
-                            service_fn(move |request| {
-                                let handle = handle.clone();
-                                async move { handle(request.into_parts().0) }
-                            }),
-                        )
-                        .await
-                    {
-                        eprintln!("error serving connection: {e:?}");
-                    }
-                });
-
-                // Help rustc with type inference:
-                if false {
-                    return Ok::<_, anyhow::Error>(());
-                }
-            }
-        }
-        .then(|result| {
-            if let Err(e) = result {
-                eprintln!("error listening for connections: {e:?}");
-            }
-            future::ready(())
-        })
-        .boxed();
-
-        task::spawn(async move {
-            drop(future::select(server, rx).await);
-        });
-
-        None
-    };
-
-    let mut request = hyper::Request::get("/hash-all");
-    for path in bodies.keys() {
-        request = request.header("url", format!("{prefix}{path}"));
-    }
-    let request = request.body(body::empty())?;
-
-    let response = run_wasi_http(
-        test_programs_artifacts::API_PROXY_STREAMING_COMPONENT,
-        request,
-        send_request,
-    )
-    .await??;
-
-    assert_eq!(StatusCode::OK, response.status());
-    let body = response.into_body().to_bytes();
-    let body = str::from_utf8(&body)?;
-    for line in body.lines() {
-        let (url, hash) = line
-            .split_once(": ")
-            .ok_or_else(|| anyhow!("expected string of form `<url>: <sha-256>`; got {line}"))?;
-
-        let path = url
-            .strip_prefix(&prefix)
-            .ok_or_else(|| anyhow!("expected string with prefix {prefix}; got {url}"))?;
-
-        let mut hasher = Sha256::new();
-        hasher.update(
-            bodies
-                .get(path)
-                .ok_or_else(|| anyhow!("unexpected path: {path}"))?,
-        );
-
-        use base64::Engine;
-        assert_eq!(
-            hash,
-            base64::engine::general_purpose::STANDARD_NO_PAD.encode(hasher.finalize())
-        );
-    }
-
-    Ok(())
-}
-
-#[test_log::test(tokio::test)]
-async fn wasi_http_echo() -> Result<()> {
-    let body = {
-        // A sorta-random-ish megabyte
-        let mut n = 0_u8;
-        iter::repeat_with(move || {
-            n = n.wrapping_add(251);
-            n
-        })
-        .take(1024 * 1024)
-        .collect::<Vec<_>>()
-    };
-
-    let request = hyper::Request::post("/echo")
-        .header("content-type", "application/octet-stream")
-        .body(BoxBody::new(StreamBody::new(stream::iter(
-            body.chunks(16 * 1024)
-                .map(|chunk| Ok::<_, anyhow::Error>(Frame::data(Bytes::copy_from_slice(chunk))))
-                .collect::<Vec<_>>(),
-        ))))?;
-
-    let response = run_wasi_http(
-        test_programs_artifacts::API_PROXY_STREAMING_COMPONENT,
-        request,
-        None,
-    )
-    .await??;
-
-    assert_eq!(StatusCode::OK, response.status());
-    assert_eq!(
-        response.headers()["content-type"],
-        "application/octet-stream"
-    );
-    let received = Vec::from(response.into_body().to_bytes());
-    if body != received {
-        panic!(
-            "body content mismatch (expected length {}; actual length {})",
-            body.len(),
-            received.len()
-        );
-    }
-
-    Ok(())
-}
-
-mod body {
-    use http_body_util::{combinators::BoxBody, BodyExt, Empty, Full};
-    use hyper::body::Bytes;
-    use wasmtime_wasi_http::body::HyperIncomingBody;
-
-    pub fn full(bytes: Bytes) -> HyperIncomingBody {
-        BoxBody::new(Full::new(bytes).map_err(|_| unreachable!()))
-    }
-
-    pub fn empty() -> HyperIncomingBody {
-        BoxBody::new(Empty::new().map_err(|_| unreachable!()))
-    }
-}
diff --git a/crates/wasi-http/tests/all/sync.rs b/crates/wasi-http/tests/all/sync.rs
deleted file mode 100644
index 729b1e427a38..000000000000
--- a/crates/wasi-http/tests/all/sync.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use super::*;
-use test_programs_artifacts::*;
-use wasmtime_wasi::preview2::command::sync::Command;
-
-foreach_http!(assert_test_exists);
-
-fn run(path: &str, server: &Server) -> Result<()> {
-    let mut config = Config::new();
-    config.wasm_backtrace_details(wasmtime::WasmBacktraceDetails::Enable);
-    config.wasm_component_model(true);
-    let engine = Engine::new(&config)?;
-    let component = Component::from_file(&engine, path)?;
-    let mut store = store(&engine, server);
-    let mut linker = Linker::new(&engine);
-    wasmtime_wasi_http::proxy::sync::add_to_linker(&mut linker)?;
-    let (command, _instance) = Command::instantiate(&mut store, &component, &linker)?;
-    let result = command.wasi_cli_run().call_run(&mut store)?;
-    result.map_err(|()| anyhow::anyhow!("run returned an error"))
-}
-
-#[test_log::test]
-fn http_outbound_request_get() -> Result<()> {
-    let server = Server::http1()?;
-    run(HTTP_OUTBOUND_REQUEST_GET_COMPONENT, &server)
-}
-
-#[test_log::test]
-fn http_outbound_request_post() -> Result<()> {
-    let server = Server::http1()?;
-    run(HTTP_OUTBOUND_REQUEST_POST_COMPONENT, &server)
-}
-
-#[test_log::test]
-fn http_outbound_request_large_post() -> Result<()> {
-    let server = Server::http1()?;
-    run(HTTP_OUTBOUND_REQUEST_LARGE_POST_COMPONENT, &server)
-}
-
-#[test_log::test]
-fn http_outbound_request_put() -> Result<()> {
-    let server = Server::http1()?;
-    run(HTTP_OUTBOUND_REQUEST_PUT_COMPONENT, &server)
-}
-
-#[test_log::test]
-fn http_outbound_request_invalid_version() -> Result<()> {
-    let server = Server::http2()?;
-    run(HTTP_OUTBOUND_REQUEST_INVALID_VERSION_COMPONENT, &server)
-}
-
-#[test_log::test]
-fn http_outbound_request_unknown_method() -> Result<()> {
-    let server = Server::http1()?;
-    run(HTTP_OUTBOUND_REQUEST_UNKNOWN_METHOD_COMPONENT, &server)
-}
-
-#[test_log::test]
-fn http_outbound_request_unsupported_scheme() -> Result<()> {
-    let server = Server::http1()?;
-    run(HTTP_OUTBOUND_REQUEST_UNSUPPORTED_SCHEME_COMPONENT, &server)
-}
-
-#[test_log::test]
-fn http_outbound_request_invalid_port() -> Result<()> {
-    let server = Server::http1()?;
-    run(HTTP_OUTBOUND_REQUEST_INVALID_PORT_COMPONENT, &server)
-}
-
-#[test_log::test]
-fn http_outbound_request_invalid_dnsname() -> Result<()> {
-    let server = Server::http1()?;
-    run(HTTP_OUTBOUND_REQUEST_INVALID_DNSNAME_COMPONENT, &server)
-}
-
-#[test_log::test]
-fn http_outbound_request_response_build() -> Result<()> {
-    let server = Server::http1()?;
-    run(HTTP_OUTBOUND_REQUEST_RESPONSE_BUILD_COMPONENT, &server)
-}
diff --git a/crates/wasi-http/wit/command-extended.wit b/crates/wasi-http/wit/command-extended.wit
index 00cee3aafb39..314e26dfce1b 100644
--- a/crates/wasi-http/wit/command-extended.wit
+++ b/crates/wasi-http/wit/command-extended.wit
@@ -1,6 +1,37 @@
 // All of the same imports and exports available in the wasi:cli/command world
 // with addition of HTTP proxy related imports:
 world command-extended {
-  include wasi:cli/command@0.2.0-rc-2023-11-05;
-  import wasi:http/outgoing-handler@0.2.0-rc-2023-11-05;
+  import wasi:clocks/wall-clock
+  import wasi:clocks/monotonic-clock
+  import wasi:clocks/timezone
+  import wasi:filesystem/types
+  import wasi:filesystem/preopens
+  import wasi:sockets/instance-network
+  import wasi:sockets/ip-name-lookup
+  import wasi:sockets/network
+  import wasi:sockets/tcp-create-socket
+  import wasi:sockets/tcp
+  import wasi:sockets/udp-create-socket
+  import wasi:sockets/udp
+  import wasi:random/random
+  import wasi:random/insecure
+  import wasi:random/insecure-seed
+  import wasi:poll/poll
+  import wasi:io/streams
+  import wasi:cli/environment
+  import wasi:cli/exit
+  import wasi:cli/stdin
+  import wasi:cli/stdout
+  import wasi:cli/stderr
+  import wasi:cli/terminal-input
+  import wasi:cli/terminal-output
+  import wasi:cli/terminal-stdin
+  import wasi:cli/terminal-stdout
+  import wasi:cli/terminal-stderr
+
+  // We should replace all others with `include self.command`
+  // as soon as the unioning of worlds is available:
+  // https://github.com/WebAssembly/component-model/issues/169
+  import wasi:logging/logging
+  import wasi:http/outgoing-handler
 }
diff --git a/crates/wasi-http/wit/deps/cli/command.wit b/crates/wasi-http/wit/deps/cli/command.wit
index 07925c0377b3..d28f5f6282a4 100644
--- a/crates/wasi-http/wit/deps/cli/command.wit
+++ b/crates/wasi-http/wit/deps/cli/command.wit
@@ -1,7 +1,7 @@
-package wasi:cli@0.2.0-rc-2023-11-05;
+package wasi:cli
 
 world command {
-  include reactor;
+  include reactor
 
-  export run;
+  export run
 }
diff --git a/crates/wasi-http/wit/deps/cli/environment.wit b/crates/wasi-http/wit/deps/cli/environment.wit
index 70065233e81b..36790fe714d2 100644
--- a/crates/wasi-http/wit/deps/cli/environment.wit
+++ b/crates/wasi-http/wit/deps/cli/environment.wit
@@ -7,12 +7,12 @@ interface environment {
   /// Morally, these are a value import, but until value imports are available
   /// in the component model, this import function should return the same
   /// values each time it is called.
-  get-environment: func() -> list<tuple<string, string>>;
+  get-environment: func() -> list<tuple<string, string>>
 
   /// Get the POSIX-style arguments to the program.
-  get-arguments: func() -> list<string>;
+  get-arguments: func() -> list<string>
 
   /// Return a path that programs should use as their initial current working
   /// directory, interpreting `.` as shorthand for this.
-  initial-cwd: func() -> option<string>;
+  initial-cwd: func() -> option<string>
 }
diff --git a/crates/wasi-http/wit/deps/cli/exit.wit b/crates/wasi-http/wit/deps/cli/exit.wit
index d0c2b82ae2c7..4831d50789af 100644
--- a/crates/wasi-http/wit/deps/cli/exit.wit
+++ b/crates/wasi-http/wit/deps/cli/exit.wit
@@ -1,4 +1,4 @@
 interface exit {
   /// Exit the current instance and any linked instances.
-  exit: func(status: result);
+  exit: func(status: result)
 }
diff --git a/crates/wasi-http/wit/deps/cli/reactor.wit b/crates/wasi-http/wit/deps/cli/reactor.wit
index 4b829834c25b..46e3186e5636 100644
--- a/crates/wasi-http/wit/deps/cli/reactor.wit
+++ b/crates/wasi-http/wit/deps/cli/reactor.wit
@@ -1,32 +1,33 @@
-package wasi:cli@0.2.0-rc-2023-11-05;
+package wasi:cli
 
 world reactor {
-  import wasi:clocks/wall-clock@0.2.0-rc-2023-11-05;
-  import wasi:clocks/monotonic-clock@0.2.0-rc-2023-11-05;
-  import wasi:clocks/timezone@0.2.0-rc-2023-11-05;
-  import wasi:filesystem/types@0.2.0-rc-2023-11-05;
-  import wasi:filesystem/preopens@0.2.0-rc-2023-11-05;
-  import wasi:sockets/instance-network@0.2.0-rc-2023-11-05;
-  import wasi:sockets/ip-name-lookup@0.2.0-rc-2023-11-05;
-  import wasi:sockets/network@0.2.0-rc-2023-11-05;
-  import wasi:sockets/tcp-create-socket@0.2.0-rc-2023-11-05;
-  import wasi:sockets/tcp@0.2.0-rc-2023-11-05;
-  import wasi:sockets/udp-create-socket@0.2.0-rc-2023-11-05;
-  import wasi:sockets/udp@0.2.0-rc-2023-11-05;
-  import wasi:random/random@0.2.0-rc-2023-11-05;
-  import wasi:random/insecure@0.2.0-rc-2023-11-05;
-  import wasi:random/insecure-seed@0.2.0-rc-2023-11-05;
-  import wasi:io/poll@0.2.0-rc-2023-11-05;
-  import wasi:io/streams@0.2.0-rc-2023-11-05;
+  import wasi:clocks/wall-clock
+  import wasi:clocks/monotonic-clock
+  import wasi:clocks/timezone
+  import wasi:filesystem/types
+  import wasi:filesystem/preopens
+  import wasi:sockets/instance-network
+  import wasi:sockets/ip-name-lookup
+  import wasi:sockets/network
+  import wasi:sockets/tcp-create-socket
+  import wasi:sockets/tcp
+  import wasi:sockets/udp-create-socket
+  import wasi:sockets/udp
+  import wasi:random/random
+  import wasi:random/insecure
+  import wasi:random/insecure-seed
+  import wasi:poll/poll
+  import wasi:io/streams
 
-  import environment;
-  import exit;
-  import stdin;
-  import stdout;
-  import stderr;
-  import terminal-input;
-  import terminal-output;
-  import terminal-stdin;
-  import terminal-stdout;
-  import terminal-stderr;
+  import environment
+  import exit
+  import stdin
+  import stdout
+  import stderr
+  import terminal-input
+  import terminal-output
+  import terminal-stdin
+  import terminal-stdout
+  import terminal-stderr
 }
+
diff --git a/crates/wasi-http/wit/deps/cli/run.wit b/crates/wasi-http/wit/deps/cli/run.wit
index a70ee8c038f2..45a1ca533f0e 100644
--- a/crates/wasi-http/wit/deps/cli/run.wit
+++ b/crates/wasi-http/wit/deps/cli/run.wit
@@ -1,4 +1,4 @@
 interface run {
   /// Run the program.
-  run: func() -> result;
+  run: func() -> result
 }
diff --git a/crates/wasi-http/wit/deps/cli/stdio.wit b/crates/wasi-http/wit/deps/cli/stdio.wit
index 6058260cf1b6..6c9d4a41a6f9 100644
--- a/crates/wasi-http/wit/deps/cli/stdio.wit
+++ b/crates/wasi-http/wit/deps/cli/stdio.wit
@@ -1,17 +1,17 @@
 interface stdin {
-  use wasi:io/streams@0.2.0-rc-2023-11-05.{input-stream};
+  use wasi:io/streams.{input-stream}
 
-  get-stdin: func() -> input-stream;
+  get-stdin: func() -> input-stream
 }
 
 interface stdout {
-  use wasi:io/streams@0.2.0-rc-2023-11-05.{output-stream};
+  use wasi:io/streams.{output-stream}
 
-  get-stdout: func() -> output-stream;
+  get-stdout: func() -> output-stream
 }
 
 interface stderr {
-  use wasi:io/streams@0.2.0-rc-2023-11-05.{output-stream};
+  use wasi:io/streams.{output-stream}
 
-  get-stderr: func() -> output-stream;
+  get-stderr: func() -> output-stream
 }
diff --git a/crates/wasi-http/wit/deps/cli/terminal.wit b/crates/wasi-http/wit/deps/cli/terminal.wit
index 47495769b31f..f32e74437484 100644
--- a/crates/wasi-http/wit/deps/cli/terminal.wit
+++ b/crates/wasi-http/wit/deps/cli/terminal.wit
@@ -1,47 +1,59 @@
 interface terminal-input {
     /// The input side of a terminal.
-    resource terminal-input;
+    ///
+    /// This [represents a resource](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources).
+    type terminal-input = u32
 
     // In the future, this may include functions for disabling echoing,
     // disabling input buffering so that keyboard events are sent through
     // immediately, querying supported features, and so on.
+
+    /// Dispose of the specified terminal-input after which it may no longer
+    /// be used.
+    drop-terminal-input: func(this: terminal-input)
 }
 
 interface terminal-output {
     /// The output side of a terminal.
-    resource terminal-output;
+    ///
+    /// This [represents a resource](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources).
+    type terminal-output = u32
 
     // In the future, this may include functions for querying the terminal
     // size, being notified of terminal size changes, querying supported
     // features, and so on.
+
+    /// Dispose of the specified terminal-output, after which it may no longer
+    /// be used.
+    drop-terminal-output: func(this: terminal-output)
 }
 
 /// An interface providing an optional `terminal-input` for stdin as a
 /// link-time authority.
 interface terminal-stdin {
-    use terminal-input.{terminal-input};
+    use terminal-input.{terminal-input}
 
     /// If stdin is connected to a terminal, return a `terminal-input` handle
     /// allowing further interaction with it.
-    get-terminal-stdin: func() -> option<terminal-input>;
+    get-terminal-stdin: func() -> option<terminal-input>
 }
 
 /// An interface providing an optional `terminal-output` for stdout as a
 /// link-time authority.
 interface terminal-stdout {
-    use terminal-output.{terminal-output};
+    use terminal-output.{terminal-output}
 
     /// If stdout is connected to a terminal, return a `terminal-output` handle
     /// allowing further interaction with it.
-    get-terminal-stdout: func() -> option<terminal-output>;
+    get-terminal-stdout: func() -> option<terminal-output>
 }
 
 /// An interface providing an optional `terminal-output` for stderr as a
 /// link-time authority.
 interface terminal-stderr {
-    use terminal-output.{terminal-output};
+    use terminal-output.{terminal-output}
 
     /// If stderr is connected to a terminal, return a `terminal-output` handle
     /// allowing further interaction with it.
-    get-terminal-stderr: func() -> option<terminal-output>;
+    get-terminal-stderr: func() -> option<terminal-output>
 }
diff --git a/crates/wasi-http/wit/deps/clocks/monotonic-clock.wit b/crates/wasi-http/wit/deps/clocks/monotonic-clock.wit
index a3f7fe25c65b..50eb4de111af 100644
--- a/crates/wasi-http/wit/deps/clocks/monotonic-clock.wit
+++ b/crates/wasi-http/wit/deps/clocks/monotonic-clock.wit
@@ -1,3 +1,5 @@
+package wasi:clocks
+
 /// WASI Monotonic Clock is a clock API intended to let users measure elapsed
 /// time.
 ///
@@ -9,24 +11,24 @@
 ///
 /// It is intended for measuring elapsed time.
 interface monotonic-clock {
-    use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable};
+    use wasi:poll/poll.{pollable}
 
     /// A timestamp in nanoseconds.
-    type instant = u64;
+    type instant = u64
 
     /// Read the current value of the clock.
     ///
     /// The clock is monotonic, therefore calling this function repeatedly will
     /// produce a sequence of non-decreasing values.
-    now: func() -> instant;
+    now: func() -> instant
 
     /// Query the resolution of the clock.
-    resolution: func() -> instant;
+    resolution: func() -> instant
 
     /// Create a `pollable` which will resolve once the specified time has been
     /// reached.
     subscribe: func(
         when: instant,
         absolute: bool
-    ) -> pollable;
+    ) -> pollable
 }
diff --git a/crates/wasi-http/wit/deps/clocks/timezone.wit b/crates/wasi-http/wit/deps/clocks/timezone.wit
index e717e7b8dda9..2b6855668e1d 100644
--- a/crates/wasi-http/wit/deps/clocks/timezone.wit
+++ b/crates/wasi-http/wit/deps/clocks/timezone.wit
@@ -1,5 +1,16 @@
+package wasi:clocks
+
 interface timezone {
-    use wall-clock.{datetime};
+    use wall-clock.{datetime}
+
+    /// A timezone.
+    ///
+    /// In timezones that recognize daylight saving time, also known as daylight
+    /// time and summer time, the information returned from the functions varies
+    /// over time to reflect these adjustments.
+    ///
+    /// This [represents a resource](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources).
+    type timezone = u32
 
     /// Return information needed to display the given `datetime`. This includes
     /// the UTC offset, the time zone name, and a flag indicating whether
@@ -8,10 +19,14 @@ interface timezone {
     /// If the timezone cannot be determined for the given `datetime`, return a
     /// `timezone-display` for `UTC` with a `utc-offset` of 0 and no daylight
     /// saving time.
-    display: func(when: datetime) -> timezone-display;
+    display: func(this: timezone, when: datetime) -> timezone-display
 
     /// The same as `display`, but only return the UTC offset.
-    utc-offset: func(when: datetime) -> s32;
+    utc-offset: func(this: timezone, when: datetime) -> s32
+
+    /// Dispose of the specified input-stream, after which it may no longer
+    /// be used.
+    drop-timezone: func(this: timezone)
 
     /// Information useful for displaying the timezone of a specific `datetime`.
     ///
diff --git a/crates/wasi-http/wit/deps/clocks/wall-clock.wit b/crates/wasi-http/wit/deps/clocks/wall-clock.wit
index c39564967a7e..6137724f60b1 100644
--- a/crates/wasi-http/wit/deps/clocks/wall-clock.wit
+++ b/crates/wasi-http/wit/deps/clocks/wall-clock.wit
@@ -1,3 +1,5 @@
+package wasi:clocks
+
 /// WASI Wall Clock is a clock API intended to let users query the current
 /// time. The name "wall" makes an analogy to a "clock on the wall", which
 /// is not necessarily monotonic as it may be reset.
@@ -32,10 +34,10 @@ interface wall-clock {
     ///
     /// [POSIX's Seconds Since the Epoch]: https://pubs.opengroup.org/onlinepubs/9699919799/xrat/V4_xbd_chap04.html#tag_21_04_16
     /// [Unix Time]: https://en.wikipedia.org/wiki/Unix_time
-    now: func() -> datetime;
+    now: func() -> datetime
 
     /// Query the resolution of the clock.
     ///
     /// The nanoseconds field of the output is always less than 1000000000.
-    resolution: func() -> datetime;
+    resolution: func() -> datetime
 }
diff --git a/crates/wasi-http/wit/deps/clocks/world.wit b/crates/wasi-http/wit/deps/clocks/world.wit
deleted file mode 100644
index a53d025b85b0..000000000000
--- a/crates/wasi-http/wit/deps/clocks/world.wit
+++ /dev/null
@@ -1,7 +0,0 @@
-package wasi:clocks@0.2.0-rc-2023-11-05;
-
-world imports {
-    import monotonic-clock;
-    import wall-clock;
-    import timezone;
-}
diff --git a/crates/wasi-http/wit/deps/filesystem/preopens.wit b/crates/wasi-http/wit/deps/filesystem/preopens.wit
index 3f787ac3fead..f45661b8a849 100644
--- a/crates/wasi-http/wit/deps/filesystem/preopens.wit
+++ b/crates/wasi-http/wit/deps/filesystem/preopens.wit
@@ -1,6 +1,6 @@
 interface preopens {
-    use types.{descriptor};
+    use types.{descriptor}
 
     /// Return the set of preopened directories, and their path.
-    get-directories: func() -> list<tuple<descriptor, string>>;
+    get-directories: func() -> list<tuple<descriptor, string>>
 }
diff --git a/crates/wasi-http/wit/deps/filesystem/types.wit b/crates/wasi-http/wit/deps/filesystem/types.wit
index 37700332bd6b..e72a742de6c8 100644
--- a/crates/wasi-http/wit/deps/filesystem/types.wit
+++ b/crates/wasi-http/wit/deps/filesystem/types.wit
@@ -17,17 +17,12 @@
 /// `..` and symbolic link steps, reaches a directory outside of the base
 /// directory, or reaches a symlink to an absolute or rooted path in the
 /// underlying filesystem, the function fails with `error-code::not-permitted`.
-///
-/// For more information about WASI path resolution and sandboxing, see
-/// [WASI filesystem path resolution].
-///
-/// [WASI filesystem path resolution]: https://github.com/WebAssembly/wasi-filesystem/blob/main/path-resolution.md
 interface types {
-    use wasi:io/streams@0.2.0-rc-2023-11-05.{input-stream, output-stream, error};
-    use wasi:clocks/wall-clock@0.2.0-rc-2023-11-05.{datetime};
+    use wasi:io/streams.{input-stream, output-stream}
+    use wasi:clocks/wall-clock.{datetime}
 
     /// File size or length of a region within a file.
-    type filesize = u64;
+    type filesize = u64
 
     /// The type of a filesystem object referenced by a descriptor.
     ///
@@ -107,20 +102,11 @@ interface types {
         /// length in bytes of the pathname contained in the symbolic link.
         size: filesize,
         /// Last data access timestamp.
-        ///
-        /// If the `option` is none, the platform doesn't maintain an access
-        /// timestamp for this file.
-        data-access-timestamp: option<datetime>,
+        data-access-timestamp: datetime,
         /// Last data modification timestamp.
-        ///
-        /// If the `option` is none, the platform doesn't maintain a
-        /// modification timestamp for this file.
-        data-modification-timestamp: option<datetime>,
-        /// Last file status-change timestamp.
-        ///
-        /// If the `option` is none, the platform doesn't maintain a
-        /// status-change timestamp for this file.
-        status-change-timestamp: option<datetime>,
+        data-modification-timestamp: datetime,
+        /// Last file status change timestamp.
+        status-change-timestamp: datetime,
     }
 
     /// Flags determining the method of how paths are resolved.
@@ -166,7 +152,7 @@ interface types {
     }
 
     /// Number of hard links to an inode.
-    type link-count = u64;
+    type link-count = u64
 
     /// When setting a timestamp, this gives the value to set it to.
     variant new-timestamp {
@@ -291,6 +277,13 @@ interface types {
         no-reuse,
     }
 
+    /// A descriptor is a reference to a filesystem object, which may be a file,
+    /// directory, named pipe, special file, or other object on which filesystem
+    /// calls may be made.
+    ///
+    /// This [represents a resource](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources).
+    type descriptor = u32
+
     /// A 128-bit hash value, split into parts because wasm doesn't have a
     /// 128-bit integer type.
     record metadata-hash-value {
@@ -300,412 +293,532 @@ interface types {
        upper: u64,
     }
 
-    /// A descriptor is a reference to a filesystem object, which may be a file,
-    /// directory, named pipe, special file, or other object on which filesystem
-    /// calls may be made.
-    resource descriptor {
-        /// Return a stream for reading from a file, if available.
-        ///
-        /// May fail with an error-code describing why the file cannot be read.
-        ///
-        /// Multiple read, write, and append streams may be active on the same open
-        /// file and they do not interfere with each other.
-        ///
-        /// Note: This allows using `read-stream`, which is similar to `read` in POSIX.
-        read-via-stream: func(
-            /// The offset within the file at which to start reading.
-            offset: filesize,
-        ) -> result<input-stream, error-code>;
-
-        /// Return a stream for writing to a file, if available.
-        ///
-        /// May fail with an error-code describing why the file cannot be written.
-        ///
-        /// Note: This allows using `write-stream`, which is similar to `write` in
-        /// POSIX.
-        write-via-stream: func(
-            /// The offset within the file at which to start writing.
-            offset: filesize,
-        ) -> result<output-stream, error-code>;
-
-        /// Return a stream for appending to a file, if available.
-        ///
-        /// May fail with an error-code describing why the file cannot be appended.
-        ///
-        /// Note: This allows using `write-stream`, which is similar to `write` with
-        /// `O_APPEND` in in POSIX.
-        append-via-stream: func() -> result<output-stream, error-code>;
+    /// Return a stream for reading from a file, if available.
+    ///
+    /// May fail with an error-code describing why the file cannot be read.
+    ///
+    /// Multiple read, write, and append streams may be active on the same open
+    /// file and they do not interfere with each other.
+    ///
+    /// Note: This allows using `read-stream`, which is similar to `read` in POSIX.
+    read-via-stream: func(
+        this: descriptor,
+        /// The offset within the file at which to start reading.
+        offset: filesize,
+    ) -> result<input-stream, error-code>
+
+    /// Return a stream for writing to a file, if available.
+    ///
+    /// May fail with an error-code describing why the file cannot be written.
+    ///
+    /// Note: This allows using `write-stream`, which is similar to `write` in
+    /// POSIX.
+    write-via-stream: func(
+        this: descriptor,
+        /// The offset within the file at which to start writing.
+        offset: filesize,
+    ) -> result<output-stream, error-code>
+
+    /// Return a stream for appending to a file, if available.
+    ///
+    /// May fail with an error-code describing why the file cannot be appended.
+    ///
+    /// Note: This allows using `write-stream`, which is similar to `write` with
+    /// `O_APPEND` in in POSIX.
+    append-via-stream: func(
+        this: descriptor,
+    ) -> result<output-stream, error-code>
 
-        /// Provide file advisory information on a descriptor.
-        ///
-        /// This is similar to `posix_fadvise` in POSIX.
-        advise: func(
-            /// The offset within the file to which the advisory applies.
-            offset: filesize,
-            /// The length of the region to which the advisory applies.
-            length: filesize,
-            /// The advice.
-            advice: advice
-        ) -> result<_, error-code>;
-
-        /// Synchronize the data of a file to disk.
-        ///
-        /// This function succeeds with no effect if the file descriptor is not
-        /// opened for writing.
-        ///
-        /// Note: This is similar to `fdatasync` in POSIX.
-        sync-data: func() -> result<_, error-code>;
+    /// Provide file advisory information on a descriptor.
+    ///
+    /// This is similar to `posix_fadvise` in POSIX.
+    advise: func(
+        this: descriptor,
+        /// The offset within the file to which the advisory applies.
+        offset: filesize,
+        /// The length of the region to which the advisory applies.
+        length: filesize,
+        /// The advice.
+        advice: advice
+    ) -> result<_, error-code>
+
+    /// Synchronize the data of a file to disk.
+    ///
+    /// This function succeeds with no effect if the file descriptor is not
+    /// opened for writing.
+    ///
+    /// Note: This is similar to `fdatasync` in POSIX.
+    sync-data: func(this: descriptor) -> result<_, error-code>
 
-        /// Get flags associated with a descriptor.
-        ///
-        /// Note: This returns similar flags to `fcntl(fd, F_GETFL)` in POSIX.
-        ///
-        /// Note: This returns the value that was the `fs_flags` value returned
-        /// from `fdstat_get` in earlier versions of WASI.
-        get-flags: func() -> result<descriptor-flags, error-code>;
+    /// Get flags associated with a descriptor.
+    ///
+    /// Note: This returns similar flags to `fcntl(fd, F_GETFL)` in POSIX.
+    ///
+    /// Note: This returns the value that was the `fs_flags` value returned
+    /// from `fdstat_get` in earlier versions of WASI.
+    get-flags: func(this: descriptor) -> result<descriptor-flags, error-code>
 
-        /// Get the dynamic type of a descriptor.
-        ///
-        /// Note: This returns the same value as the `type` field of the `fd-stat`
-        /// returned by `stat`, `stat-at` and similar.
-        ///
-        /// Note: This returns similar flags to the `st_mode & S_IFMT` value provided
-        /// by `fstat` in POSIX.
-        ///
-        /// Note: This returns the value that was the `fs_filetype` value returned
-        /// from `fdstat_get` in earlier versions of WASI.
-        get-type: func() -> result<descriptor-type, error-code>;
+    /// Get the dynamic type of a descriptor.
+    ///
+    /// Note: This returns the same value as the `type` field of the `fd-stat`
+    /// returned by `stat`, `stat-at` and similar.
+    ///
+    /// Note: This returns similar flags to the `st_mode & S_IFMT` value provided
+    /// by `fstat` in POSIX.
+    ///
+    /// Note: This returns the value that was the `fs_filetype` value returned
+    /// from `fdstat_get` in earlier versions of WASI.
+    get-type: func(this: descriptor) -> result<descriptor-type, error-code>
 
-        /// Adjust the size of an open file. If this increases the file's size, the
-        /// extra bytes are filled with zeros.
-        ///
-        /// Note: This was called `fd_filestat_set_size` in earlier versions of WASI.
-        set-size: func(size: filesize) -> result<_, error-code>;
+    /// Adjust the size of an open file. If this increases the file's size, the
+    /// extra bytes are filled with zeros.
+    ///
+    /// Note: This was called `fd_filestat_set_size` in earlier versions of WASI.
+    set-size: func(this: descriptor, size: filesize) -> result<_, error-code>
 
-        /// Adjust the timestamps of an open file or directory.
-        ///
-        /// Note: This is similar to `futimens` in POSIX.
-        ///
-        /// Note: This was called `fd_filestat_set_times` in earlier versions of WASI.
-        set-times: func(
-            /// The desired values of the data access timestamp.
-            data-access-timestamp: new-timestamp,
-            /// The desired values of the data modification timestamp.
-            data-modification-timestamp: new-timestamp,
-        ) -> result<_, error-code>;
-
-        /// Read from a descriptor, without using and updating the descriptor's offset.
-        ///
-        /// This function returns a list of bytes containing the data that was
-        /// read, along with a bool which, when true, indicates that the end of the
-        /// file was reached. The returned list will contain up to `length` bytes; it
-        /// may return fewer than requested, if the end of the file is reached or
-        /// if the I/O operation is interrupted.
-        ///
-        /// In the future, this may change to return a `stream<u8, error-code>`.
-        ///
-        /// Note: This is similar to `pread` in POSIX.
-        read: func(
-            /// The maximum number of bytes to read.
-            length: filesize,
-            /// The offset within the file at which to read.
-            offset: filesize,
-        ) -> result<tuple<list<u8>, bool>, error-code>;
-
-        /// Write to a descriptor, without using and updating the descriptor's offset.
-        ///
-        /// It is valid to write past the end of a file; the file is extended to the
-        /// extent of the write, with bytes between the previous end and the start of
-        /// the write set to zero.
-        ///
-        /// In the future, this may change to take a `stream<u8, error-code>`.
-        ///
-        /// Note: This is similar to `pwrite` in POSIX.
-        write: func(
-            /// Data to write
-            buffer: list<u8>,
-            /// The offset within the file at which to write.
-            offset: filesize,
-        ) -> result<filesize, error-code>;
-
-        /// Read directory entries from a directory.
-        ///
-        /// On filesystems where directories contain entries referring to themselves
-        /// and their parents, often named `.` and `..` respectively, these entries
-        /// are omitted.
-        ///
-        /// This always returns a new stream which starts at the beginning of the
-        /// directory. Multiple streams may be active on the same directory, and they
-        /// do not interfere with each other.
-        read-directory: func() -> result<directory-entry-stream, error-code>;
+    /// Adjust the timestamps of an open file or directory.
+    ///
+    /// Note: This is similar to `futimens` in POSIX.
+    ///
+    /// Note: This was called `fd_filestat_set_times` in earlier versions of WASI.
+    set-times: func(
+        this: descriptor,
+        /// The desired values of the data access timestamp.
+        data-access-timestamp: new-timestamp,
+        /// The desired values of the data modification timestamp.
+        data-modification-timestamp: new-timestamp,
+    ) -> result<_, error-code>
+
+    /// Read from a descriptor, without using and updating the descriptor's offset.
+    ///
+    /// This function returns a list of bytes containing the data that was
+    /// read, along with a bool which, when true, indicates that the end of the
+    /// file was reached. The returned list will contain up to `length` bytes; it
+    /// may return fewer than requested, if the end of the file is reached or
+    /// if the I/O operation is interrupted.
+    ///
+    /// In the future, this may change to return a `stream<u8, error-code>`.
+    ///
+    /// Note: This is similar to `pread` in POSIX.
+    read: func(
+        this: descriptor,
+        /// The maximum number of bytes to read.
+        length: filesize,
+        /// The offset within the file at which to read.
+        offset: filesize,
+    ) -> result<tuple<list<u8>, bool>, error-code>
+
+    /// Write to a descriptor, without using and updating the descriptor's offset.
+    ///
+    /// It is valid to write past the end of a file; the file is extended to the
+    /// extent of the write, with bytes between the previous end and the start of
+    /// the write set to zero.
+    ///
+    /// In the future, this may change to take a `stream<u8, error-code>`.
+    ///
+    /// Note: This is similar to `pwrite` in POSIX.
+    write: func(
+        this: descriptor,
+        /// Data to write
+        buffer: list<u8>,
+        /// The offset within the file at which to write.
+        offset: filesize,
+    ) -> result<filesize, error-code>
+
+    /// Read directory entries from a directory.
+    ///
+    /// On filesystems where directories contain entries referring to themselves
+    /// and their parents, often named `.` and `..` respectively, these entries
+    /// are omitted.
+    ///
+    /// This always returns a new stream which starts at the beginning of the
+    /// directory. Multiple streams may be active on the same directory, and they
+    /// do not interfere with each other.
+    read-directory: func(
+        this: descriptor
+    ) -> result<directory-entry-stream, error-code>
+
+    /// Synchronize the data and metadata of a file to disk.
+    ///
+    /// This function succeeds with no effect if the file descriptor is not
+    /// opened for writing.
+    ///
+    /// Note: This is similar to `fsync` in POSIX.
+    sync: func(this: descriptor) -> result<_, error-code>
 
-        /// Synchronize the data and metadata of a file to disk.
-        ///
-        /// This function succeeds with no effect if the file descriptor is not
-        /// opened for writing.
-        ///
-        /// Note: This is similar to `fsync` in POSIX.
-        sync: func() -> result<_, error-code>;
+    /// Create a directory.
+    ///
+    /// Note: This is similar to `mkdirat` in POSIX.
+    create-directory-at: func(
+        this: descriptor,
+        /// The relative path at which to create the directory.
+        path: string,
+    ) -> result<_, error-code>
+
+    /// Return the attributes of an open file or directory.
+    ///
+    /// Note: This is similar to `fstat` in POSIX, except that it does not return
+    /// device and inode information. For testing whether two descriptors refer to
+    /// the same underlying filesystem object, use `is-same-object`. To obtain
+    /// additional data that can be used do determine whether a file has been
+    /// modified, use `metadata-hash`.
+    ///
+    /// Note: This was called `fd_filestat_get` in earlier versions of WASI.
+    stat: func(this: descriptor) -> result<descriptor-stat, error-code>
 
-        /// Create a directory.
-        ///
-        /// Note: This is similar to `mkdirat` in POSIX.
-        create-directory-at: func(
-            /// The relative path at which to create the directory.
-            path: string,
-        ) -> result<_, error-code>;
+    /// Return the attributes of a file or directory.
+    ///
+    /// Note: This is similar to `fstatat` in POSIX, except that it does not
+    /// return device and inode information. See the `stat` description for a
+    /// discussion of alternatives.
+    ///
+    /// Note: This was called `path_filestat_get` in earlier versions of WASI.
+    stat-at: func(
+        this: descriptor,
+        /// Flags determining the method of how the path is resolved.
+        path-flags: path-flags,
+        /// The relative path of the file or directory to inspect.
+        path: string,
+    ) -> result<descriptor-stat, error-code>
+
+    /// Adjust the timestamps of a file or directory.
+    ///
+    /// Note: This is similar to `utimensat` in POSIX.
+    ///
+    /// Note: This was called `path_filestat_set_times` in earlier versions of
+    /// WASI.
+    set-times-at: func(
+        this: descriptor,
+        /// Flags determining the method of how the path is resolved.
+        path-flags: path-flags,
+        /// The relative path of the file or directory to operate on.
+        path: string,
+        /// The desired values of the data access timestamp.
+        data-access-timestamp: new-timestamp,
+        /// The desired values of the data modification timestamp.
+        data-modification-timestamp: new-timestamp,
+    ) -> result<_, error-code>
+
+    /// Create a hard link.
+    ///
+    /// Note: This is similar to `linkat` in POSIX.
+    link-at: func(
+        this: descriptor,
+        /// Flags determining the method of how the path is resolved.
+        old-path-flags: path-flags,
+        /// The relative source path from which to link.
+        old-path: string,
+        /// The base directory for `new-path`.
+        new-descriptor: descriptor,
+        /// The relative destination path at which to create the hard link.
+        new-path: string,
+    ) -> result<_, error-code>
+
+    /// Open a file or directory.
+    ///
+    /// The returned descriptor is not guaranteed to be the lowest-numbered
+    /// descriptor not currently open/ it is randomized to prevent applications
+    /// from depending on making assumptions about indexes, since this is
+    /// error-prone in multi-threaded contexts. The returned descriptor is
+    /// guaranteed to be less than 2**31.
+    ///
+    /// If `flags` contains `descriptor-flags::mutate-directory`, and the base
+    /// descriptor doesn't have `descriptor-flags::mutate-directory` set,
+    /// `open-at` fails with `error-code::read-only`.
+    ///
+    /// If `flags` contains `write` or `mutate-directory`, or `open-flags`
+    /// contains `truncate` or `create`, and the base descriptor doesn't have
+    /// `descriptor-flags::mutate-directory` set, `open-at` fails with
+    /// `error-code::read-only`.
+    ///
+    /// Note: This is similar to `openat` in POSIX.
+    open-at: func(
+        this: descriptor,
+        /// Flags determining the method of how the path is resolved.
+        path-flags: path-flags,
+        /// The relative path of the object to open.
+        path: string,
+        /// The method by which to open the file.
+        open-flags: open-flags,
+        /// Flags to use for the resulting descriptor.
+        %flags: descriptor-flags,
+        /// Permissions to use when creating a new file.
+        modes: modes
+    ) -> result<descriptor, error-code>
+
+    /// Read the contents of a symbolic link.
+    ///
+    /// If the contents contain an absolute or rooted path in the underlying
+    /// filesystem, this function fails with `error-code::not-permitted`.
+    ///
+    /// Note: This is similar to `readlinkat` in POSIX.
+    readlink-at: func(
+        this: descriptor,
+        /// The relative path of the symbolic link from which to read.
+        path: string,
+    ) -> result<string, error-code>
+
+    /// Remove a directory.
+    ///
+    /// Return `error-code::not-empty` if the directory is not empty.
+    ///
+    /// Note: This is similar to `unlinkat(fd, path, AT_REMOVEDIR)` in POSIX.
+    remove-directory-at: func(
+        this: descriptor,
+        /// The relative path to a directory to remove.
+        path: string,
+    ) -> result<_, error-code>
+
+    /// Rename a filesystem object.
+    ///
+    /// Note: This is similar to `renameat` in POSIX.
+    rename-at: func(
+        this: descriptor,
+        /// The relative source path of the file or directory to rename.
+        old-path: string,
+        /// The base directory for `new-path`.
+        new-descriptor: descriptor,
+        /// The relative destination path to which to rename the file or directory.
+        new-path: string,
+    ) -> result<_, error-code>
+
+    /// Create a symbolic link (also known as a "symlink").
+    ///
+    /// If `old-path` starts with `/`, the function fails with
+    /// `error-code::not-permitted`.
+    ///
+    /// Note: This is similar to `symlinkat` in POSIX.
+    symlink-at: func(
+        this: descriptor,
+        /// The contents of the symbolic link.
+        old-path: string,
+        /// The relative destination path at which to create the symbolic link.
+        new-path: string,
+    ) -> result<_, error-code>
+
+    /// Check accessibility of a filesystem path.
+    ///
+    /// Check whether the given filesystem path names an object which is
+    /// readable, writable, or executable, or whether it exists.
+    ///
+    /// This does not a guarantee that subsequent accesses will succeed, as
+    /// filesystem permissions may be modified asynchronously by external
+    /// entities.
+    ///
+    /// Note: This is similar to `faccessat` with the `AT_EACCESS` flag in POSIX.
+    access-at: func(
+        this: descriptor,
+        /// Flags determining the method of how the path is resolved.
+        path-flags: path-flags,
+        /// The relative path to check.
+        path: string,
+        /// The type of check to perform.
+        %type: access-type
+    ) -> result<_, error-code>
+
+    /// Unlink a filesystem object that is not a directory.
+    ///
+    /// Return `error-code::is-directory` if the path refers to a directory.
+    /// Note: This is similar to `unlinkat(fd, path, 0)` in POSIX.
+    unlink-file-at: func(
+        this: descriptor,
+        /// The relative path to a file to unlink.
+        path: string,
+    ) -> result<_, error-code>
+
+    /// Change the permissions of a filesystem object that is not a directory.
+    ///
+    /// Note that the ultimate meanings of these permissions is
+    /// filesystem-specific.
+    ///
+    /// Note: This is similar to `fchmodat` in POSIX.
+    change-file-permissions-at: func(
+        this: descriptor,
+        /// Flags determining the method of how the path is resolved.
+        path-flags: path-flags,
+        /// The relative path to operate on.
+        path: string,
+        /// The new permissions for the filesystem object.
+        modes: modes,
+    ) -> result<_, error-code>
+
+    /// Change the permissions of a directory.
+    ///
+    /// Note that the ultimate meanings of these permissions is
+    /// filesystem-specific.
+    ///
+    /// Unlike in POSIX, the `executable` flag is not reinterpreted as a "search"
+    /// flag. `read` on a directory implies readability and searchability, and
+    /// `execute` is not valid for directories.
+    ///
+    /// Note: This is similar to `fchmodat` in POSIX.
+    change-directory-permissions-at: func(
+        this: descriptor,
+        /// Flags determining the method of how the path is resolved.
+        path-flags: path-flags,
+        /// The relative path to operate on.
+        path: string,
+        /// The new permissions for the directory.
+        modes: modes,
+    ) -> result<_, error-code>
+
+    /// Request a shared advisory lock for an open file.
+    ///
+    /// This requests a *shared* lock; more than one shared lock can be held for
+    /// a file at the same time.
+    ///
+    /// If the open file has an exclusive lock, this function downgrades the lock
+    /// to a shared lock. If it has a shared lock, this function has no effect.
+    ///
+    /// This requests an *advisory* lock, meaning that the file could be accessed
+    /// by other programs that don't hold the lock.
+    ///
+    /// It is unspecified how shared locks interact with locks acquired by
+    /// non-WASI programs.
+    ///
+    /// This function blocks until the lock can be acquired.
+    ///
+    /// Not all filesystems support locking; on filesystems which don't support
+    /// locking, this function returns `error-code::unsupported`.
+    ///
+    /// Note: This is similar to `flock(fd, LOCK_SH)` in Unix.
+    lock-shared: func(this: descriptor) -> result<_, error-code>
 
-        /// Return the attributes of an open file or directory.
-        ///
-        /// Note: This is similar to `fstat` in POSIX, except that it does not return
-        /// device and inode information. For testing whether two descriptors refer to
-        /// the same underlying filesystem object, use `is-same-object`. To obtain
-        /// additional data that can be used do determine whether a file has been
-        /// modified, use `metadata-hash`.
-        ///
-        /// Note: This was called `fd_filestat_get` in earlier versions of WASI.
-        stat: func() -> result<descriptor-stat, error-code>;
+    /// Request an exclusive advisory lock for an open file.
+    ///
+    /// This requests an *exclusive* lock; no other locks may be held for the
+    /// file while an exclusive lock is held.
+    ///
+    /// If the open file has a shared lock and there are no exclusive locks held
+    /// for the file, this function upgrades the lock to an exclusive lock. If the
+    /// open file already has an exclusive lock, this function has no effect.
+    ///
+    /// This requests an *advisory* lock, meaning that the file could be accessed
+    /// by other programs that don't hold the lock.
+    ///
+    /// It is unspecified whether this function succeeds if the file descriptor
+    /// is not opened for writing. It is unspecified how exclusive locks interact
+    /// with locks acquired by non-WASI programs.
+    ///
+    /// This function blocks until the lock can be acquired.
+    ///
+    /// Not all filesystems support locking; on filesystems which don't support
+    /// locking, this function returns `error-code::unsupported`.
+    ///
+    /// Note: This is similar to `flock(fd, LOCK_EX)` in Unix.
+    lock-exclusive: func(this: descriptor) -> result<_, error-code>
 
-        /// Return the attributes of a file or directory.
-        ///
-        /// Note: This is similar to `fstatat` in POSIX, except that it does not
-        /// return device and inode information. See the `stat` description for a
-        /// discussion of alternatives.
-        ///
-        /// Note: This was called `path_filestat_get` in earlier versions of WASI.
-        stat-at: func(
-            /// Flags determining the method of how the path is resolved.
-            path-flags: path-flags,
-            /// The relative path of the file or directory to inspect.
-            path: string,
-        ) -> result<descriptor-stat, error-code>;
-
-        /// Adjust the timestamps of a file or directory.
-        ///
-        /// Note: This is similar to `utimensat` in POSIX.
-        ///
-        /// Note: This was called `path_filestat_set_times` in earlier versions of
-        /// WASI.
-        set-times-at: func(
-            /// Flags determining the method of how the path is resolved.
-            path-flags: path-flags,
-            /// The relative path of the file or directory to operate on.
-            path: string,
-            /// The desired values of the data access timestamp.
-            data-access-timestamp: new-timestamp,
-            /// The desired values of the data modification timestamp.
-            data-modification-timestamp: new-timestamp,
-        ) -> result<_, error-code>;
-
-        /// Create a hard link.
-        ///
-        /// Note: This is similar to `linkat` in POSIX.
-        link-at: func(
-            /// Flags determining the method of how the path is resolved.
-            old-path-flags: path-flags,
-            /// The relative source path from which to link.
-            old-path: string,
-            /// The base directory for `new-path`.
-            new-descriptor: borrow<descriptor>,
-            /// The relative destination path at which to create the hard link.
-            new-path: string,
-        ) -> result<_, error-code>;
-
-        /// Open a file or directory.
-        ///
-        /// The returned descriptor is not guaranteed to be the lowest-numbered
-        /// descriptor not currently open/ it is randomized to prevent applications
-        /// from depending on making assumptions about indexes, since this is
-        /// error-prone in multi-threaded contexts. The returned descriptor is
-        /// guaranteed to be less than 2**31.
-        ///
-        /// If `flags` contains `descriptor-flags::mutate-directory`, and the base
-        /// descriptor doesn't have `descriptor-flags::mutate-directory` set,
-        /// `open-at` fails with `error-code::read-only`.
-        ///
-        /// If `flags` contains `write` or `mutate-directory`, or `open-flags`
-        /// contains `truncate` or `create`, and the base descriptor doesn't have
-        /// `descriptor-flags::mutate-directory` set, `open-at` fails with
-        /// `error-code::read-only`.
-        ///
-        /// Note: This is similar to `openat` in POSIX.
-        open-at: func(
-            /// Flags determining the method of how the path is resolved.
-            path-flags: path-flags,
-            /// The relative path of the object to open.
-            path: string,
-            /// The method by which to open the file.
-            open-flags: open-flags,
-            /// Flags to use for the resulting descriptor.
-            %flags: descriptor-flags,
-            /// Permissions to use when creating a new file.
-            modes: modes
-        ) -> result<descriptor, error-code>;
-
-        /// Read the contents of a symbolic link.
-        ///
-        /// If the contents contain an absolute or rooted path in the underlying
-        /// filesystem, this function fails with `error-code::not-permitted`.
-        ///
-        /// Note: This is similar to `readlinkat` in POSIX.
-        readlink-at: func(
-            /// The relative path of the symbolic link from which to read.
-            path: string,
-        ) -> result<string, error-code>;
+    /// Request a shared advisory lock for an open file.
+    ///
+    /// This requests a *shared* lock; more than one shared lock can be held for
+    /// a file at the same time.
+    ///
+    /// If the open file has an exclusive lock, this function downgrades the lock
+    /// to a shared lock. If it has a shared lock, this function has no effect.
+    ///
+    /// This requests an *advisory* lock, meaning that the file could be accessed
+    /// by other programs that don't hold the lock.
+    ///
+    /// It is unspecified how shared locks interact with locks acquired by
+    /// non-WASI programs.
+    ///
+    /// This function returns `error-code::would-block` if the lock cannot be
+    /// acquired.
+    ///
+    /// Not all filesystems support locking; on filesystems which don't support
+    /// locking, this function returns `error-code::unsupported`.
+    ///
+    /// Note: This is similar to `flock(fd, LOCK_SH | LOCK_NB)` in Unix.
+    try-lock-shared: func(this: descriptor) -> result<_, error-code>
 
-        /// Remove a directory.
-        ///
-        /// Return `error-code::not-empty` if the directory is not empty.
-        ///
-        /// Note: This is similar to `unlinkat(fd, path, AT_REMOVEDIR)` in POSIX.
-        remove-directory-at: func(
-            /// The relative path to a directory to remove.
-            path: string,
-        ) -> result<_, error-code>;
+    /// Request an exclusive advisory lock for an open file.
+    ///
+    /// This requests an *exclusive* lock; no other locks may be held for the
+    /// file while an exclusive lock is held.
+    ///
+    /// If the open file has a shared lock and there are no exclusive locks held
+    /// for the file, this function upgrades the lock to an exclusive lock. If the
+    /// open file already has an exclusive lock, this function has no effect.
+    ///
+    /// This requests an *advisory* lock, meaning that the file could be accessed
+    /// by other programs that don't hold the lock.
+    ///
+    /// It is unspecified whether this function succeeds if the file descriptor
+    /// is not opened for writing. It is unspecified how exclusive locks interact
+    /// with locks acquired by non-WASI programs.
+    ///
+    /// This function returns `error-code::would-block` if the lock cannot be
+    /// acquired.
+    ///
+    /// Not all filesystems support locking; on filesystems which don't support
+    /// locking, this function returns `error-code::unsupported`.
+    ///
+    /// Note: This is similar to `flock(fd, LOCK_EX | LOCK_NB)` in Unix.
+    try-lock-exclusive: func(this: descriptor) -> result<_, error-code>
 
-        /// Rename a filesystem object.
-        ///
-        /// Note: This is similar to `renameat` in POSIX.
-        rename-at: func(
-            /// The relative source path of the file or directory to rename.
-            old-path: string,
-            /// The base directory for `new-path`.
-            new-descriptor: borrow<descriptor>,
-            /// The relative destination path to which to rename the file or directory.
-            new-path: string,
-        ) -> result<_, error-code>;
-
-        /// Create a symbolic link (also known as a "symlink").
-        ///
-        /// If `old-path` starts with `/`, the function fails with
-        /// `error-code::not-permitted`.
-        ///
-        /// Note: This is similar to `symlinkat` in POSIX.
-        symlink-at: func(
-            /// The contents of the symbolic link.
-            old-path: string,
-            /// The relative destination path at which to create the symbolic link.
-            new-path: string,
-        ) -> result<_, error-code>;
-
-        /// Check accessibility of a filesystem path.
-        ///
-        /// Check whether the given filesystem path names an object which is
-        /// readable, writable, or executable, or whether it exists.
-        ///
-        /// This does not a guarantee that subsequent accesses will succeed, as
-        /// filesystem permissions may be modified asynchronously by external
-        /// entities.
-        ///
-        /// Note: This is similar to `faccessat` with the `AT_EACCESS` flag in POSIX.
-        access-at: func(
-            /// Flags determining the method of how the path is resolved.
-            path-flags: path-flags,
-            /// The relative path to check.
-            path: string,
-            /// The type of check to perform.
-            %type: access-type
-        ) -> result<_, error-code>;
-
-        /// Unlink a filesystem object that is not a directory.
-        ///
-        /// Return `error-code::is-directory` if the path refers to a directory.
-        /// Note: This is similar to `unlinkat(fd, path, 0)` in POSIX.
-        unlink-file-at: func(
-            /// The relative path to a file to unlink.
-            path: string,
-        ) -> result<_, error-code>;
-
-        /// Change the permissions of a filesystem object that is not a directory.
-        ///
-        /// Note that the ultimate meanings of these permissions is
-        /// filesystem-specific.
-        ///
-        /// Note: This is similar to `fchmodat` in POSIX.
-        change-file-permissions-at: func(
-            /// Flags determining the method of how the path is resolved.
-            path-flags: path-flags,
-            /// The relative path to operate on.
-            path: string,
-            /// The new permissions for the filesystem object.
-            modes: modes,
-        ) -> result<_, error-code>;
-
-        /// Change the permissions of a directory.
-        ///
-        /// Note that the ultimate meanings of these permissions is
-        /// filesystem-specific.
-        ///
-        /// Unlike in POSIX, the `executable` flag is not reinterpreted as a "search"
-        /// flag. `read` on a directory implies readability and searchability, and
-        /// `execute` is not valid for directories.
-        ///
-        /// Note: This is similar to `fchmodat` in POSIX.
-        change-directory-permissions-at: func(
-            /// Flags determining the method of how the path is resolved.
-            path-flags: path-flags,
-            /// The relative path to operate on.
-            path: string,
-            /// The new permissions for the directory.
-            modes: modes,
-        ) -> result<_, error-code>;
-
-        /// Test whether two descriptors refer to the same filesystem object.
-        ///
-        /// In POSIX, this corresponds to testing whether the two descriptors have the
-        /// same device (`st_dev`) and inode (`st_ino` or `d_ino`) numbers.
-        /// wasi-filesystem does not expose device and inode numbers, so this function
-        /// may be used instead.
-        is-same-object: func(other: borrow<descriptor>) -> bool;
-
-        /// Return a hash of the metadata associated with a filesystem object referred
-        /// to by a descriptor.
-        ///
-        /// This returns a hash of the last-modification timestamp and file size, and
-        /// may also include the inode number, device number, birth timestamp, and
-        /// other metadata fields that may change when the file is modified or
-        /// replaced. It may also include a secret value chosen by the
-        /// implementation and not otherwise exposed.
-        ///
-        /// Implementations are encourated to provide the following properties:
-        ///
-        ///  - If the file is not modified or replaced, the computed hash value should
-        ///    usually not change.
-        ///  - If the object is modified or replaced, the computed hash value should
-        ///    usually change.
-        ///  - The inputs to the hash should not be easily computable from the
-        ///    computed hash.
-        ///
-        /// However, none of these is required.
-        metadata-hash: func() -> result<metadata-hash-value, error-code>;
+    /// Release a shared or exclusive lock on an open file.
+    ///
+    /// Note: This is similar to `flock(fd, LOCK_UN)` in Unix.
+    unlock: func(this: descriptor) -> result<_, error-code>
 
-        /// Return a hash of the metadata associated with a filesystem object referred
-        /// to by a directory descriptor and a relative path.
-        ///
-        /// This performs the same hash computation as `metadata-hash`.
-        metadata-hash-at: func(
-            /// Flags determining the method of how the path is resolved.
-            path-flags: path-flags,
-            /// The relative path of the file or directory to inspect.
-            path: string,
-        ) -> result<metadata-hash-value, error-code>;
-    }
+    /// Dispose of the specified `descriptor`, after which it may no longer
+    /// be used.
+    drop-descriptor: func(this: descriptor)
 
     /// A stream of directory entries.
-    resource directory-entry-stream {
-        /// Read a single directory entry from a `directory-entry-stream`.
-        read-directory-entry: func() -> result<option<directory-entry>, error-code>;
-    }
+    ///
+    /// This [represents a stream of `dir-entry`](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Streams).
+    type directory-entry-stream = u32
+
+    /// Read a single directory entry from a `directory-entry-stream`.
+    read-directory-entry: func(
+        this: directory-entry-stream
+    ) -> result<option<directory-entry>, error-code>
+
+    /// Dispose of the specified `directory-entry-stream`, after which it may no longer
+    /// be used.
+    drop-directory-entry-stream: func(this: directory-entry-stream)
 
-    /// Attempts to extract a filesystem-related `error-code` from the stream
-    /// `error` provided.
+    /// Test whether two descriptors refer to the same filesystem object.
     ///
-    /// Stream operations which return `stream-error::last-operation-failed`
-    /// have a payload with more information about the operation that failed.
-    /// This payload can be passed through to this function to see if there's
-    /// filesystem-related information about the error to return.
+    /// In POSIX, this corresponds to testing whether the two descriptors have the
+    /// same device (`st_dev`) and inode (`st_ino` or `d_ino`) numbers.
+    /// wasi-filesystem does not expose device and inode numbers, so this function
+    /// may be used instead.
+    is-same-object: func(this: descriptor, other: descriptor) -> bool
+
+    /// Return a hash of the metadata associated with a filesystem object referred
+    /// to by a descriptor.
+    ///
+    /// This returns a hash of the last-modification timestamp and file size, and
+    /// may also include the inode number, device number, birth timestamp, and
+    /// other metadata fields that may change when the file is modified or
+    /// replaced. It may also include a secret value chosen by the
+    /// implementation and not otherwise exposed.
+    ///
+    /// Implementations are encourated to provide the following properties:
+    ///
+    ///  - If the file is not modified or replaced, the computed hash value should
+    ///    usually not change.
+    ///  - If the object is modified or replaced, the computed hash value should
+    ///    usually change.
+    ///  - The inputs to the hash should not be easily computable from the
+    ///    computed hash.
+    ///
+    /// However, none of these is required.
+    metadata-hash: func(
+        this: descriptor,
+    ) -> result<metadata-hash-value, error-code>
+
+    /// Return a hash of the metadata associated with a filesystem object referred
+    /// to by a directory descriptor and a relative path.
     ///
-    /// Note that this function is fallible because not all stream-related
-    /// errors are filesystem-related errors.
-    filesystem-error-code: func(err: borrow<error>) -> option<error-code>;
+    /// This performs the same hash computation as `metadata-hash`.
+    metadata-hash-at: func(
+        this: descriptor,
+        /// Flags determining the method of how the path is resolved.
+        path-flags: path-flags,
+        /// The relative path of the file or directory to inspect.
+        path: string,
+    ) -> result<metadata-hash-value, error-code>
 }
diff --git a/crates/wasi-http/wit/deps/filesystem/world.wit b/crates/wasi-http/wit/deps/filesystem/world.wit
index a4654e4cc451..b51f484f8383 100644
--- a/crates/wasi-http/wit/deps/filesystem/world.wit
+++ b/crates/wasi-http/wit/deps/filesystem/world.wit
@@ -1,6 +1,6 @@
-package wasi:filesystem@0.2.0-rc-2023-11-05;
+package wasi:filesystem
 
-world imports {
-    import types;
-    import preopens;
+world example-world {
+    import types
+    import preopens
 }
diff --git a/crates/wasi-http/wit/deps/http/handler.wit b/crates/wasi-http/wit/deps/http/handler.wit
deleted file mode 100644
index 21b97a354cc7..000000000000
--- a/crates/wasi-http/wit/deps/http/handler.wit
+++ /dev/null
@@ -1,41 +0,0 @@
-/// This interface defines a handler of incoming HTTP Requests. It should
-/// be exported by components which can respond to HTTP Requests.
-interface incoming-handler {
-  use types.{incoming-request, response-outparam};
-
-  /// This function is invoked with an incoming HTTP Request, and a resource
-  /// `response-outparam` which provides the capability to reply with an HTTP
-  /// Response. The response is sent by calling the `response-outparam.set`
-  /// method, which allows execution to continue after the response has been
-  /// sent. This enables both streaming to the response body, and performing other
-  /// work.
-  ///
-  /// The implementor of this function must write a response to the
-  /// `response-outparam` before returning, or else the caller will respond
-  /// with an error on its behalf.
-  handle: func(
-    request: incoming-request,
-    response-out: response-outparam
-  );
-}
-
-/// This interface defines a handler of outgoing HTTP Requests. It should be
-/// imported by components which wish to make HTTP Requests.
-interface outgoing-handler {
-  use types.{outgoing-request, request-options, future-incoming-response, error};
-
-  /// This function is invoked with an outgoing HTTP Request, and it returns
-  /// a resource `future-incoming-response` which represents an HTTP Response
-  /// which may arrive in the future.
-  ///
-  /// The `options` argument accepts optional parameters for the HTTP
-  /// protocol's transport layer.
-  ///
-  /// This function may return an error if the `outgoing-request` is invalid
-  /// or not allowed to be made. Otherwise, protocol errors are reported
-  /// through the `future-incoming-response`.
-  handle: func(
-    request: outgoing-request,
-    options: option<request-options>
-  ) -> result<future-incoming-response, error>;
-}
diff --git a/crates/wasi-http/wit/deps/http/incoming-handler.wit b/crates/wasi-http/wit/deps/http/incoming-handler.wit
new file mode 100644
index 000000000000..d0e270465593
--- /dev/null
+++ b/crates/wasi-http/wit/deps/http/incoming-handler.wit
@@ -0,0 +1,24 @@
+// The `wasi:http/incoming-handler` interface is meant to be exported by
+// components and called by the host in response to a new incoming HTTP
+// response.
+//
+//   NOTE: in Preview3, this interface will be merged with
+//   `wasi:http/outgoing-handler` into a single `wasi:http/handler` interface
+//   that takes a `request` parameter and returns a `response` result.
+//
+interface incoming-handler {
+  use types.{incoming-request, response-outparam}
+
+  // The `handle` function takes an outparam instead of returning its response
+  // so that the component may stream its response while streaming any other
+  // request or response bodies. The callee MUST write a response to the
+  // `response-out` and then finish the response before returning. The `handle`
+  // function is allowed to continue execution after finishing the response's
+  // output stream. While this post-response execution is taken off the
+  // critical path, since there is no return value, there is no way to report
+  // its success or failure.
+  handle: func(
+    request: incoming-request,
+    response-out: response-outparam
+  )
+}
diff --git a/crates/wasi-http/wit/deps/http/outgoing-handler.wit b/crates/wasi-http/wit/deps/http/outgoing-handler.wit
new file mode 100644
index 000000000000..06c8e469f95b
--- /dev/null
+++ b/crates/wasi-http/wit/deps/http/outgoing-handler.wit
@@ -0,0 +1,18 @@
+// The `wasi:http/outgoing-handler` interface is meant to be imported by
+// components and implemented by the host.
+//
+//   NOTE: in Preview3, this interface will be merged with
+//   `wasi:http/outgoing-handler` into a single `wasi:http/handler` interface
+//   that takes a `request` parameter and returns a `response` result.
+//
+interface outgoing-handler {
+  use types.{outgoing-request, request-options, future-incoming-response}
+
+  // The parameter and result types of the `handle` function allow the caller
+  // to concurrently stream the bodies of the outgoing request and the incoming
+  // response.
+  handle: func(
+    request: outgoing-request,
+    options: option<request-options>
+  ) -> future-incoming-response
+}
diff --git a/crates/wasi-http/wit/deps/http/proxy.wit b/crates/wasi-http/wit/deps/http/proxy.wit
index 3fa8b9c631d9..162ab32b2348 100644
--- a/crates/wasi-http/wit/deps/http/proxy.wit
+++ b/crates/wasi-http/wit/deps/http/proxy.wit
@@ -1,34 +1,34 @@
-package wasi:http@0.2.0-rc-2023-11-05;
+package wasi:http
 
-/// The `wasi:http/proxy` world captures a widely-implementable intersection of
-/// hosts that includes HTTP forward and reverse proxies. Components targeting
-/// this world may concurrently stream in and out any number of incoming and
-/// outgoing HTTP requests.
+// The `wasi:http/proxy` world captures a widely-implementable intersection of
+// hosts that includes HTTP forward and reverse proxies. Components targeting
+// this world may concurrently stream in and out any number of incoming and
+// outgoing HTTP requests.
 world proxy {
-  /// HTTP proxies have access to time and randomness.
-  import wasi:clocks/wall-clock@0.2.0-rc-2023-11-05;
-  import wasi:clocks/monotonic-clock@0.2.0-rc-2023-11-05;
-  import wasi:clocks/timezone@0.2.0-rc-2023-11-05;
-  import wasi:random/random@0.2.0-rc-2023-11-05;
+  // HTTP proxies have access to time and randomness.
+  import wasi:clocks/wall-clock
+  import wasi:clocks/monotonic-clock
+  import wasi:clocks/timezone
+  import wasi:random/random
 
-  /// Proxies have standard output and error streams which are expected to
-  /// terminate in a developer-facing console provided by the host.
-  import wasi:cli/stdout@0.2.0-rc-2023-11-05;
-  import wasi:cli/stderr@0.2.0-rc-2023-11-05;
+  // Proxies have standard output and error streams which are expected to
+  // terminate in a developer-facing console provided by the host.
+  import wasi:cli/stdout
+  import wasi:cli/stderr
 
-  /// TODO: this is a temporary workaround until component tooling is able to
-  /// gracefully handle the absence of stdin. Hosts must return an eof stream
-  /// for this import, which is what wasi-libc + tooling will do automatically
-  /// when this import is properly removed.
-  import wasi:cli/stdin@0.2.0-rc-2023-11-05;
+  // TODO: this is a temporary workaround until component tooling is able to
+  // gracefully handle the absence of stdin. Hosts must return an eof stream
+  // for this import, which is what wasi-libc + tooling will do automatically
+  // when this import is properly removed.
+  import wasi:cli/stdin
 
-  /// This is the default handler to use when user code simply wants to make an
-  /// HTTP request (e.g., via `fetch()`).
-  import outgoing-handler;
+  // This is the default handler to use when user code simply wants to make an
+  // HTTP request (e.g., via `fetch()`).
+  import outgoing-handler
 
-  /// The host delivers incoming HTTP requests to a component by calling the
-  /// `handle` function of this exported interface. A host may arbitrarily reuse
-  /// or not reuse component instance when delivering incoming HTTP requests and
-  /// thus a component must be able to handle 0..N calls to `handle`.
-  export incoming-handler;
+  // The host delivers incoming HTTP requests to a component by calling the
+  // `handle` function of this exported interface. A host may arbitrarily reuse
+  // or not reuse component instance when delivering incoming HTTP requests and
+  // thus a component must be able to handle 0..N calls to `handle`.
+  export incoming-handler
 }
diff --git a/crates/wasi-http/wit/deps/http/types.wit b/crates/wasi-http/wit/deps/http/types.wit
index 343d3222020f..7b7b015529c0 100644
--- a/crates/wasi-http/wit/deps/http/types.wit
+++ b/crates/wasi-http/wit/deps/http/types.wit
@@ -1,11 +1,11 @@
-/// This interface defines all of the types and methods for implementing
-/// HTTP Requests and Responses, both incoming and outgoing, as well as
-/// their headers, trailers, and bodies.
+// The `wasi:http/types` interface is meant to be imported by components to
+// define the HTTP resource types and operations used by the component's
+// imported and exported interfaces.
 interface types {
-  use wasi:io/streams@0.2.0-rc-2023-11-05.{input-stream, output-stream};
-  use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable};
+  use wasi:io/streams.{input-stream, output-stream}
+  use wasi:poll/poll.{pollable}
 
-  /// This type corresponds to HTTP standard Methods.
+  // This type corresponds to HTTP standard Methods.
   variant method {
     get,
     head,
@@ -19,321 +19,137 @@ interface types {
     other(string)
   }
 
-  /// This type corresponds to HTTP standard Related Schemes.
+  // This type corresponds to HTTP standard Related Schemes.
   variant scheme {
     HTTP,
     HTTPS,
     other(string)
   }
 
-  /// TODO: perhaps better align with HTTP semantics?
-  /// This type enumerates the different kinds of errors that may occur when
-  /// initially returning a response.
+  // TODO: perhaps better align with HTTP semantics?
+  // This type enumerates the different kinds of errors that may occur when
+  // initially returning a response.
   variant error {
-    invalid-url(string),
-    timeout-error(string),
-    protocol-error(string),
-    unexpected-error(string)
+      invalid-url(string),
+      timeout-error(string),
+      protocol-error(string),
+      unexpected-error(string)
   }
 
-  /// Field keys are always strings.
-  type field-key = string;
-
-  /// Field values should always be ASCII strings. However, in
-  /// reality, HTTP implementations often have to interpret malformed values,
-  /// so they are provided as a list of bytes.
-  type field-value = list<u8>;
-
-  /// This following block defines the `fields` resource which corresponds to
-  /// HTTP standard Fields. Fields are a common representation used for both
-  /// Headers and Trailers.
-  resource fields {
-
-    /// Construct an HTTP Fields.
-    ///
-    /// The list represents each key-value pair in the Fields. Keys
-    /// which have multiple values are represented by multiple entries in this
-    /// list with the same key.
-    ///
-    /// The tuple is a pair of the field key, represented as a string, and
-    /// Value, represented as a list of bytes. In a valid Fields, all keys
-    /// and values are valid UTF-8 strings. However, values are not always
-    /// well-formed, so they are represented as a raw list of bytes.
-    constructor(entries: list<tuple<field-key,field-value>>);
-
-    /// Get all of the values corresponding to a key.
-    get: func(name: field-key) -> list<field-value>;
-
-    /// Set all of the values for a key. Clears any existing values for that
-    /// key, if they have been set.
-    set: func(name: field-key, value: list<field-value>);
-
-    /// Delete all values for a key. Does nothing if no values for the key
-    /// exist.
-    delete: func(name: field-key);
-
-    /// Append a value for a key. Does not change or delete any existing
-    /// values for that key.
-    append: func(name: field-key, value: field-value);
-
-
-    /// Retrieve the full set of keys and values in the Fields. Like the
-    /// constructor, the list represents each key-value pair. 
-    ///
-    /// The outer list represents each key-value pair in the Fields. Keys
-    /// which have multiple values are represented by multiple entries in this
-    /// list with the same key.
-    entries: func() -> list<tuple<field-key,field-value>>;
-
-    /// Make a deep copy of the Fields. Equivelant in behavior to calling the
-    /// `fields` constructor on the return value of `entries` 
-    clone: func() -> fields;
-  }
-
-  /// Headers is an alias for Fields.
-  type headers = fields;
-
-  /// Trailers is an alias for Fields.
-  type trailers = fields;
-
-  /// Represents an incoming HTTP Request.
-  resource incoming-request {
-
-    /// Returns the method of the incoming request.
-    method: func() -> method;
-
-    /// Returns the path with query parameters from the request, as a string.
-    path-with-query: func() -> option<string>;
-
-    /// Returns the protocol scheme from the request.
-    scheme: func() -> option<scheme>;
-
-    /// Returns the authority from the request, if it was present.
-    authority: func() -> option<string>;
-
-    /// Returns the `headers` from the request.
-    ///
-    /// The `headers` returned are a child resource: it must be dropped before
-    /// the parent `incoming-request` is dropped. Dropping this
-    /// `incoming-request` before all children are dropped will trap.
-    headers: func() -> headers;
-
-    /// Gives the `incoming-body` associated with this request. Will only
-    /// return success at most once, and subsequent calls will return error.
-    consume: func() -> result<incoming-body>;
-  }
-
-  /// Represents an outgoing HTTP Request.
-  resource outgoing-request {
-
-    /// Construct a new `outgoing-request`.
-    constructor(
-      method: method,
-      path-with-query: option<string>,
-      scheme: option<scheme>,
-      authority: option<string>,
-      headers: borrow<headers>
-    );
-
-    /// Will return the outgoing-body child at most once. If called more than
-    /// once, subsequent calls will return error.
-    write: func() -> result<outgoing-body>;
-  }
-
-  /// Parameters for making an HTTP Request. Each of these parameters is an
-  /// optional timeout, with the unit in milliseconds, applicable to the
-  /// transport layer of the HTTP protocol.
-  ///
-  /// These timeouts are separate from any the user may use to bound a
-  /// blocking call to `wasi:io/poll.poll-list`.
-  ///
-  /// FIXME: Make this a resource to allow it to be optionally extended by
-  /// future evolution of the standard and/or other interfaces at some later
-  /// date?
+  // This following block defines the `fields` resource which corresponds to
+  // HTTP standard Fields. Soon, when resource types are added, the `type
+  // fields = u32` type alias can be replaced by a proper `resource fields`
+  // definition containing all the functions using the method syntactic sugar.
+  type fields = u32
+  drop-fields: func(fields: fields)
+  new-fields: func(entries: list<tuple<string,string>>) -> fields
+  fields-get: func(fields: fields, name: string) -> list<list<u8>>
+  fields-set: func(fields: fields, name: string, value: list<list<u8>>)
+  fields-delete: func(fields: fields, name: string)
+  fields-append: func(fields: fields, name: string, value: list<u8>)
+  fields-entries: func(fields: fields) -> list<tuple<string,list<u8>>>
+  fields-clone: func(fields: fields) -> fields
+
+  type headers = fields
+  type trailers = fields
+
+  // The following block defines stream types which corresponds to the HTTP
+  // standard Contents and Trailers. With Preview3, all of these fields can be
+  // replaced by a stream<u8, option<trailers>>. In the interim, we need to
+  // build on separate resource types defined by `wasi:io/streams`. The
+  // `finish-` functions emulate the stream's result value and MUST be called
+  // exactly once after the final read/write from/to the stream before dropping
+  // the stream.
+  type incoming-stream = input-stream
+  type outgoing-stream = output-stream
+  finish-incoming-stream: func(s: incoming-stream) -> option<trailers>
+  finish-outgoing-stream: func(s: outgoing-stream, trailers: option<trailers>)
+
+  // The following block defines the `incoming-request` and `outgoing-request`
+  // resource types that correspond to HTTP standard Requests. Soon, when
+  // resource types are added, the `u32` type aliases can be replaced by
+  // proper `resource` type definitions containing all the functions as
+  // methods. Later, Preview2 will allow both types to be merged together into
+  // a single `request` type (that uses the single `stream` type mentioned
+  // above). The `consume` and `write` methods may only be called once (and
+  // return failure thereafter).
+  type incoming-request = u32
+  type outgoing-request = u32
+  drop-incoming-request: func(request: incoming-request)
+  drop-outgoing-request: func(request: outgoing-request)
+  incoming-request-method: func(request: incoming-request) -> method
+  incoming-request-path-with-query: func(request: incoming-request) -> option<string>
+  incoming-request-scheme: func(request: incoming-request) -> option<scheme>
+  incoming-request-authority: func(request: incoming-request) -> option<string>
+  incoming-request-headers: func(request: incoming-request) -> headers
+  incoming-request-consume: func(request: incoming-request) -> result<incoming-stream>
+  new-outgoing-request: func(
+    method: method,
+    path-with-query: option<string>,
+    scheme: option<scheme>,
+    authority: option<string>,
+    headers: headers
+  ) -> outgoing-request
+  outgoing-request-write: func(request: outgoing-request) -> result<outgoing-stream>
+
+  // Additional optional parameters that can be set when making a request.
   record request-options {
+    // The following timeouts are specific to the HTTP protocol and work
+    // independently of the overall timeouts passed to `io.poll.poll-oneoff`.
 
-    /// The timeout for the initial connect to the HTTP Server.
+    // The timeout for the initial connect.
     connect-timeout-ms: option<u32>,
 
-    /// The timeout for receiving the first byte of the Response body.
+    // The timeout for receiving the first byte of the response body.
     first-byte-timeout-ms: option<u32>,
 
-    /// The timeout for receiving subsequent chunks of bytes in the Response
-    /// body stream.
+    // The timeout for receiving the next chunk of bytes in the response body
+    // stream.
     between-bytes-timeout-ms: option<u32>
   }
 
-  /// Represents the ability to send an HTTP Response.
-  ///
-  /// This resource is used by the `wasi:http/incoming-handler` interface to
-  /// allow a Response to be sent corresponding to the Request provided as the
-  /// other argument to `incoming-handler.handle`.
-  resource response-outparam {
-
-    /// Set the value of the `response-outparam` to either send a response,
-    /// or indicate an error.
-    ///
-    /// This method consumes the `response-outparam` to ensure that it is
-    /// called at most once. If it is never called, the implementation
-    /// will respond with an error.
-    set: static func(
-      param: response-outparam,
-      response: result<outgoing-response, error>,
-    );
-  }
-
-  /// This type corresponds to the HTTP standard Status Code.
-  type status-code = u16;
-
-  /// Represents an incoming HTTP Response.
-  resource incoming-response {
-
-    /// Returns the status code from the incoming response.
-    status: func() -> status-code;
-
-    /// Returns the headers from the incoming response.
-    headers: func() -> headers;
-
-    /// Returns the incoming body. May be called at most once. Returns error
-    /// if called additional times.
-    consume: func() -> result<incoming-body>;
-  }
-
-  /// Represents an incoming HTTP Request or Response's Body.
-  ///
-  /// A body has both its contents - a stream of bytes - and a (possibly
-  /// empty) set of trailers, indicating that the full contents of the
-  /// body have been received. This resource represents the contents as
-  /// an `input-stream` and the delivery of trailers as a `future-trailers`,
-  /// and ensures that the user of this interface may only be consuming either
-  /// the body contents or waiting on trailers at any given time.
-  resource incoming-body {
-
-    /// Returns the contents of the body, as a stream of bytes.
-    ///
-    /// Returns success on first call: the stream representing the contents
-    /// can be retrieved at most once. Subsequent calls will return error.
-    ///
-    /// The returned `input-stream` resource is a child: it must be dropped
-    /// before the parent `incoming-body` is dropped, or consumed by
-    /// `incoming-body.finish`.
-    ///
-    /// This invariant ensures that the implementation can determine whether
-    /// the user is consuming the contents of the body, waiting on the
-    /// `future-trailers` to be ready, or neither. This allows for network
-    /// backpressure is to be applied when the user is consuming the body,
-    /// and for that backpressure to not inhibit delivery of the trailers if
-    /// the user does not read the entire body.
-    %stream: func() -> result<input-stream>;
-
-    /// Takes ownership of `incoming-body`, and returns a `future-trailers`.
-    /// This function will trap if the `input-stream` child is still alive.
-    finish: static func(this: incoming-body) -> future-trailers;
-  }
-
-  /// Represents a future which may eventaully return trailers, or an error.
-  ///
-  /// In the case that the incoming HTTP Request or Response did not have any
-  /// trailers, this future will resolve to the empty set of trailers once the
-  /// complete Request or Response body has been received.
-  resource future-trailers {
-
-    /// Returns a pollable which becomes ready when either the trailers have
-    /// been received, or an error has occured. When this pollable is ready,
-    /// the `get` method will return `some`.
-    subscribe: func() -> pollable;
-
-    /// Returns the contents of the trailers, or an error which occured,
-    /// once the future is ready.
-    ///
-    /// The outer `option` represents future readiness. Users can wait on this
-    /// `option` to become `some` using the `subscribe` method.
-    ///
-    /// The `result` represents that either the HTTP Request or Response body,
-    /// as well as any trailers, were received successfully, or that an error
-    /// occured receiving them. The optional `trailers` indicates whether or not
-    /// trailers were present in the body.
-    get: func() -> option<result<option<trailers>, error>>;
-  }
-
-  /// Represents an outgoing HTTP Response.
-  resource outgoing-response {
-
-    /// Construct an `outgoing-response`.
-    constructor(status-code: status-code, headers: borrow<headers>);
-
-    /// Returns the resource corresponding to the outgoing Body for this Response.
-    ///
-    /// Returns success on the first call: the `outgoing-body` resource for
-    /// this `outgoing-response` can be retrieved at most once. Sunsequent
-    /// calls will return error.
-    ///
-    /// FIXME: rename this method to `body`.
-    write: func() -> result<outgoing-body>;
-  }
-
-  /// Represents an outgoing HTTP Request or Response's Body.
-  ///
-  /// A body has both its contents - a stream of bytes - and a (possibly
-  /// empty) set of trailers, inducating the full contents of the body
-  /// have been sent. This resource represents the contents as an
-  /// `output-stream` child resource, and the completion of the body (with
-  /// optional trailers) with a static function that consumes the
-  /// `outgoing-body` resource, and ensures that the user of this interface
-  /// may not write to the body contents after the body has been finished.
-  ///
-  /// If the user code drops this resource, as opposed to calling the static
-  /// method `finish`, the implementation should treat the body as incomplete,
-  /// and that an error has occured. The implementation should propogate this
-  /// error to the HTTP protocol by whatever means it has available,
-  /// including: corrupting the body on the wire, aborting the associated
-  /// Request, or sending a late status code for the Response.
-  resource outgoing-body {
-
-    /// Returns a stream for writing the body contents.
-    ///
-    /// The returned `output-stream` is a child resource: it must be dropped
-    /// before the parent `outgoing-body` resource is dropped (or finished),
-    /// otherwise the `outgoing-body` drop or `finish` will trap.
-    ///
-    /// Returns success on the first call: the `output-stream` resource for
-    /// this `outgoing-body` may be retrieved at most once. Subsequent calls
-    /// will return error.
-    write: func() -> result<output-stream>;
-
-    /// Finalize an outgoing body, optionally providing trailers. This must be
-    /// called to signal that the response is complete. If the `outgoing-body`
-    /// is dropped without calling `outgoing-body.finalize`, the implementation
-    /// should treat the body as corrupted.
-    finish: static func(this: outgoing-body, trailers: option<trailers>);
-  }
-
-  /// Represents a future which may eventaully return an incoming HTTP
-  /// Response, or an error.
-  ///
-  /// This resource is returned by the `wasi:http/outgoing-handler` interface to
-  /// provide the HTTP Response corresponding to the sent Request.
-  resource future-incoming-response {
-    /// Returns a pollable which becomes ready when either the Response has
-    /// been received, or an error has occured. When this pollable is ready,
-    /// the `get` method will return `some`.
-    subscribe: func() -> pollable;
-
-    /// Returns the incoming HTTP Response, or an error, once one is ready.
-    ///
-    /// The outer `option` represents future readiness. Users can wait on this
-    /// `option` to become `some` using the `subscribe` method.
-    ///
-    /// The outer `result` is used to retrieve the response or error at most
-    /// once. It will be success on the first call in which the outer option
-    /// is `some`, and error on subsequent calls.
-    ///
-    /// The inner `result` represents that either the incoming HTTP Response
-    /// status and headers have recieved successfully, or that an error
-    /// occured. Errors may also occur while consuming the response body,
-    /// but those will be reported by the `incoming-body` and its
-    /// `output-stream` child.
-    get: func() -> option<result<result<incoming-response, error>>>;
-
-  }
+  // The following block defines a special resource type used by the
+  // `wasi:http/incoming-handler` interface. When resource types are added, this
+  // block can be replaced by a proper `resource response-outparam { ... }`
+  // definition. Later, with Preview3, the need for an outparam goes away entirely
+  // (the `wasi:http/handler` interface used for both incoming and outgoing can
+  // simply return a `stream`).
+  type response-outparam = u32
+  drop-response-outparam: func(response: response-outparam)
+  set-response-outparam: func(param: response-outparam, response: result<outgoing-response, error>) -> result
+
+  // This type corresponds to the HTTP standard Status Code.
+  type status-code = u16
+
+  // The following block defines the `incoming-response` and `outgoing-response`
+  // resource types that correspond to HTTP standard Responses. Soon, when
+  // resource types are added, the `u32` type aliases can be replaced by proper
+  // `resource` type definitions containing all the functions as methods. Later,
+  // Preview2 will allow both types to be merged together into a single `response`
+  // type (that uses the single `stream` type mentioned above). The `consume` and
+  // `write` methods may only be called once (and return failure thereafter).
+  type incoming-response = u32
+  type outgoing-response = u32
+  drop-incoming-response: func(response: incoming-response)
+  drop-outgoing-response: func(response: outgoing-response)
+  incoming-response-status: func(response: incoming-response) -> status-code
+  incoming-response-headers: func(response: incoming-response) -> headers
+  incoming-response-consume: func(response: incoming-response) -> result<incoming-stream>
+  new-outgoing-response: func(
+    status-code: status-code,
+    headers: headers
+  ) -> outgoing-response
+  outgoing-response-write: func(response: outgoing-response) -> result<outgoing-stream>
+
+  // The following block defines a special resource type used by the
+  // `wasi:http/outgoing-handler` interface to emulate
+  // `future<result<response, error>>` in advance of Preview3. Given a
+  // `future-incoming-response`, the client can call the non-blocking `get`
+  // method to get the result if it is available. If the result is not available,
+  // the client can call `listen` to get a `pollable` that can be passed to
+  // `io.poll.poll-oneoff`.
+  type future-incoming-response = u32
+  drop-future-incoming-response: func(f: future-incoming-response)
+  future-incoming-response-get: func(f: future-incoming-response) -> option<result<incoming-response, error>>
+  listen-to-future-incoming-response: func(f: future-incoming-response) -> pollable
 }
diff --git a/crates/wasi-http/wit/deps/io/poll.wit b/crates/wasi-http/wit/deps/io/poll.wit
deleted file mode 100644
index 52a4957dc496..000000000000
--- a/crates/wasi-http/wit/deps/io/poll.wit
+++ /dev/null
@@ -1,34 +0,0 @@
-package wasi:io@0.2.0-rc-2023-11-05;
-
-/// A poll API intended to let users wait for I/O events on multiple handles
-/// at once.
-interface poll {
-    /// A "pollable" handle.
-    resource pollable;
-
-    /// Poll for completion on a set of pollables.
-    ///
-    /// This function takes a list of pollables, which identify I/O sources of
-    /// interest, and waits until one or more of the events is ready for I/O.
-    ///
-    /// The result `list<u32>` contains one or more indices of handles in the
-    /// argument list that is ready for I/O.
-    ///
-    /// If the list contains more elements than can be indexed with a `u32`
-    /// value, this function traps.
-    ///
-    /// A timeout can be implemented by adding a pollable from the
-    /// wasi-clocks API to the list.
-    ///
-    /// This function does not return a `result`; polling in itself does not
-    /// do any I/O so it doesn't fail. If any of the I/O sources identified by
-    /// the pollables has an error, it is indicated by marking the source as
-    /// being reaedy for I/O.
-    poll-list: func(in: list<borrow<pollable>>) -> list<u32>;
-
-    /// Poll for completion on a single pollable.
-    ///
-    /// This function is similar to `poll-list`, but operates on only a single
-    /// pollable. When it returns, the handle is ready for I/O.
-    poll-one: func(in: borrow<pollable>);
-}
diff --git a/crates/wasi-http/wit/deps/io/streams.wit b/crates/wasi-http/wit/deps/io/streams.wit
index 9442f60c0e16..e2631f66a569 100644
--- a/crates/wasi-http/wit/deps/io/streams.wit
+++ b/crates/wasi-http/wit/deps/io/streams.wit
@@ -1,4 +1,4 @@
-package wasi:io@0.2.0-rc-2023-11-05;
+package wasi:io
 
 /// WASI I/O is an I/O abstraction API which is currently focused on providing
 /// stream types.
@@ -6,274 +6,295 @@ package wasi:io@0.2.0-rc-2023-11-05;
 /// In the future, the component model is expected to add built-in stream types;
 /// when it does, they are expected to subsume this API.
 interface streams {
-    use poll.{pollable};
+    use wasi:poll/poll.{pollable}
 
-    /// An error for input-stream and output-stream operations.
-    variant stream-error {
-        /// The last operation (a write or flush) failed before completion.
-        ///
-        /// More information is available in the `error` payload.
-        last-operation-failed(error),
-        /// The stream is closed: no more input will be accepted by the
-        /// stream. A closed output-stream will return this error on all
-        /// future operations.
-        closed
-    }
-
-    /// Contextual error information about the last failure that happened on
-    /// a read, write, or flush from an `input-stream` or `output-stream`.
-    ///
-    /// This type is returned through the `stream-error` type whenever an
-    /// operation on a stream directly fails or an error is discovered
-    /// after-the-fact, for example when a write's failure shows up through a
-    /// later `flush` or `check-write`.
+    /// Streams provide a sequence of data and then end; once they end, they
+    /// no longer provide any further data.
     ///
-    /// Interfaces such as `wasi:filesystem/types` provide functionality to
-    /// further "downcast" this error into interface-specific error information.
-    resource error {
-        /// Returns a string that's suitable to assist humans in debugging this
-        /// error.
-        ///
-        /// The returned string will change across platforms and hosts which
-        /// means that parsing it, for example, would be a
-        /// platform-compatibility hazard.
-        to-debug-string: func() -> string;
+    /// For example, a stream reading from a file ends when the stream reaches
+    /// the end of the file. For another example, a stream reading from a
+    /// socket ends when the socket is closed.
+    enum stream-status {
+        /// The stream is open and may produce further data.
+        open,
+        /// When reading, this indicates that the stream will not produce
+        /// further data.
+        /// When writing, this indicates that the stream will no longer be read.
+        /// Further writes are still permitted.
+        ended,
     }
 
-    /// An input bytestream.
+    /// An input bytestream. In the future, this will be replaced by handle
+    /// types.
     ///
     /// `input-stream`s are *non-blocking* to the extent practical on underlying
     /// platforms. I/O operations always return promptly; if fewer bytes are
     /// promptly available than requested, they return the number of bytes promptly
     /// available, which could even be zero. To wait for data to be available,
-    /// use the `subscribe` function to obtain a `pollable` which can be polled
-    /// for using `wasi:io/poll`.
-    resource input-stream {
-        /// Perform a non-blocking read from the stream.
-        ///
-        /// This function returns a list of bytes containing the data that was
-        /// read, along with a `stream-status` which, indicates whether further
-        /// reads are expected to produce data. The returned list will contain up to
-        /// `len` bytes; it may return fewer than requested, but not more. An
-        /// empty list and `stream-status:open` indicates no more data is
-        /// available at this time, and that the pollable given by `subscribe`
-        /// will be ready when more data is available.
-        ///
-        /// Once a stream has reached the end, subsequent calls to `read` or
-        /// `skip` will always report `stream-status:ended` rather than producing more
-        /// data.
-        ///
-        /// When the caller gives a `len` of 0, it represents a request to read 0
-        /// bytes. This read should  always succeed and return an empty list and
-        /// the current `stream-status`.
-        ///
-        /// The `len` parameter is a `u64`, which could represent a list of u8 which
-        /// is not possible to allocate in wasm32, or not desirable to allocate as
-        /// as a return value by the callee. The callee may return a list of bytes
-        /// less than `len` in size while more bytes are available for reading.
-        read: func(
-            /// The maximum number of bytes to read
-            len: u64
-        ) -> result<list<u8>, stream-error>;
+    /// use the `subscribe-to-input-stream` function to obtain a `pollable` which
+    /// can be polled for using `wasi:poll/poll.poll_oneoff`.
+    ///
+    /// And at present, it is a `u32` instead of being an actual handle, until
+    /// the wit-bindgen implementation of handles and resources is ready.
+    ///
+    /// This [represents a resource](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources).
+    type input-stream = u32
+
+    /// Perform a non-blocking read from the stream.
+    ///
+    /// This function returns a list of bytes containing the data that was
+    /// read, along with a `stream-status` which, indicates whether further
+    /// reads are expected to produce data. The returned list will contain up to
+    /// `len` bytes; it may return fewer than requested, but not more. An
+    /// empty list and `stream-status:open` indicates no more data is
+    /// available at this time, and that the pollable given by
+    /// `subscribe-to-input-stream` will be ready when more data is available.
+    /// 
+    /// Once a stream has reached the end, subsequent calls to `read` or
+    /// `skip` will always report `stream-status:ended` rather than producing more
+    /// data.
+    ///
+    /// When the caller gives a `len` of 0, it represents a request to read 0
+    /// bytes. This read should  always succeed and return an empty list and
+    /// the current `stream-status`.
+    ///
+    /// The `len` parameter is a `u64`, which could represent a list of u8 which
+    /// is not possible to allocate in wasm32, or not desirable to allocate as
+    /// as a return value by the callee. The callee may return a list of bytes
+    /// less than `len` in size while more bytes are available for reading.
+    read: func(
+        this: input-stream,
+        /// The maximum number of bytes to read
+        len: u64
+    ) -> result<tuple<list<u8>, stream-status>>
 
-        /// Read bytes from a stream, after blocking until at least one byte can
-        /// be read. Except for blocking, identical to `read`.
-        blocking-read: func(
-            /// The maximum number of bytes to read
-            len: u64
-        ) -> result<list<u8>, stream-error>;
+    /// Read bytes from a stream, after blocking until at least one byte can
+    /// be read. Except for blocking, identical to `read`.
+    blocking-read: func(
+        this: input-stream,
+        /// The maximum number of bytes to read
+        len: u64
+    ) -> result<tuple<list<u8>, stream-status>>
 
-        /// Skip bytes from a stream.
-        ///
-        /// This is similar to the `read` function, but avoids copying the
-        /// bytes into the instance.
-        ///
-        /// Once a stream has reached the end, subsequent calls to read or
-        /// `skip` will always report end-of-stream rather than producing more
-        /// data.
-        ///
-        /// This function returns the number of bytes skipped, along with a
-        /// `stream-status` indicating whether the end of the stream was
-        /// reached. The returned value will be at most `len`; it may be less.
-        skip: func(
-            /// The maximum number of bytes to skip.
-            len: u64,
-        ) -> result<u64, stream-error>;
+    /// Skip bytes from a stream.
+    ///
+    /// This is similar to the `read` function, but avoids copying the
+    /// bytes into the instance.
+    ///
+    /// Once a stream has reached the end, subsequent calls to read or
+    /// `skip` will always report end-of-stream rather than producing more
+    /// data.
+    ///
+    /// This function returns the number of bytes skipped, along with a
+    /// `stream-status` indicating whether the end of the stream was
+    /// reached. The returned value will be at most `len`; it may be less.
+    skip: func(
+        this: input-stream,
+        /// The maximum number of bytes to skip.
+        len: u64,
+    ) -> result<tuple<u64, stream-status>>
 
-        /// Skip bytes from a stream, after blocking until at least one byte
-        /// can be skipped. Except for blocking behavior, identical to `skip`.
-        blocking-skip: func(
-            /// The maximum number of bytes to skip.
-            len: u64,
-        ) -> result<u64, stream-error>;
+    /// Skip bytes from a stream, after blocking until at least one byte
+    /// can be skipped. Except for blocking behavior, identical to `skip`.
+    blocking-skip: func(
+        this: input-stream,
+        /// The maximum number of bytes to skip.
+        len: u64,
+    ) -> result<tuple<u64, stream-status>>
 
-        /// Create a `pollable` which will resolve once either the specified stream
-        /// has bytes available to read or the other end of the stream has been
-        /// closed.
-        /// The created `pollable` is a child resource of the `input-stream`.
-        /// Implementations may trap if the `input-stream` is dropped before
-        /// all derived `pollable`s created with this function are dropped.
-        subscribe: func() -> pollable;
-    }
+    /// Create a `pollable` which will resolve once either the specified stream
+    /// has bytes available to read or the other end of the stream has been
+    /// closed.
+    /// The created `pollable` is a child resource of the `input-stream`.
+    /// Implementations may trap if the `input-stream` is dropped before
+    /// all derived `pollable`s created with this function are dropped.
+    subscribe-to-input-stream: func(this: input-stream) -> pollable
 
+    /// Dispose of the specified `input-stream`, after which it may no longer
+    /// be used.
+    /// Implementations may trap if this `input-stream` is dropped while child
+    /// `pollable` resources are still alive.
+    /// After this `input-stream` is dropped, implementations may report any
+    /// corresponding `output-stream` has `stream-state.closed`.
+    drop-input-stream: func(this: input-stream)
 
-    /// An output bytestream.
+    /// An output bytestream. In the future, this will be replaced by handle
+    /// types.
     ///
     /// `output-stream`s are *non-blocking* to the extent practical on
     /// underlying platforms. Except where specified otherwise, I/O operations also
     /// always return promptly, after the number of bytes that can be written
     /// promptly, which could even be zero. To wait for the stream to be ready to
-    /// accept data, the `subscribe` function to obtain a `pollable` which can be
-    /// polled for using `wasi:io/poll`.
-    resource output-stream {
-        /// Check readiness for writing. This function never blocks.
-        ///
-        /// Returns the number of bytes permitted for the next call to `write`,
-        /// or an error. Calling `write` with more bytes than this function has
-        /// permitted will trap.
-        ///
-        /// When this function returns 0 bytes, the `subscribe` pollable will
-        /// become ready when this function will report at least 1 byte, or an
-        /// error.
-        check-write: func() -> result<u64, stream-error>;
+    /// accept data, the `subscribe-to-output-stream` function to obtain a
+    /// `pollable` which can be polled for using `wasi:poll`.
+    ///
+    /// And at present, it is a `u32` instead of being an actual handle, until
+    /// the wit-bindgen implementation of handles and resources is ready.
+    ///
+    /// This [represents a resource](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources).
+    type output-stream = u32
+
+    /// An error for output-stream operations.
+    ///
+    /// Contrary to input-streams, a closed output-stream is reported using
+    /// an error.
+    enum write-error {
+        /// The last operation (a write or flush) failed before completion.
+        last-operation-failed,
+        /// The stream is closed: no more input will be accepted by the
+        /// stream. A closed output-stream will return this error on all
+        /// future operations.
+        closed
+    }
+    /// Check readiness for writing. This function never blocks.
+    ///
+    /// Returns the number of bytes permitted for the next call to `write`,
+    /// or an error. Calling `write` with more bytes than this function has
+    /// permitted will trap.
+    ///
+    /// When this function returns 0 bytes, the `subscribe-to-output-stream`
+    /// pollable will become ready when this function will report at least
+    /// 1 byte, or an error.
+    check-write: func(
+        this: output-stream
+    ) -> result<u64, write-error>
+
+    /// Perform a write. This function never blocks.
+    ///
+    /// Precondition: check-write gave permit of Ok(n) and contents has a
+    /// length of less than or equal to n. Otherwise, this function will trap.
+    ///
+    /// returns Err(closed) without writing if the stream has closed since
+    /// the last call to check-write provided a permit.
+    write: func(
+        this: output-stream,
+        contents: list<u8>
+    ) -> result<_, write-error>
+
+    /// Perform a write of up to 4096 bytes, and then flush the stream. Block
+    /// until all of these operations are complete, or an error occurs.
+    ///
+    /// This is a convenience wrapper around the use of `check-write`,
+    /// `subscribe-to-output-stream`, `write`, and `flush`, and is implemented
+    /// with the following pseudo-code:
+    ///
+    /// ```text
+    /// let pollable = subscribe-to-output-stream(this);
+    /// while !contents.is_empty() {
+    ///   // Wait for the stream to become writable
+    ///   poll-oneoff(pollable);
+    ///   let Ok(n) = check-write(this); // eliding error handling
+    ///   let len = min(n, contents.len());
+    ///   let (chunk, rest) = contents.split_at(len);
+    ///   write(this, chunk);            // eliding error handling
+    ///   contents = rest;
+    /// }
+    /// flush(this);
+    /// // Wait for completion of `flush`
+    /// poll-oneoff(pollable);
+    /// // Check for any errors that arose during `flush`
+    /// let _ = check-write(this);       // eliding error handling
+    /// ```
+    blocking-write-and-flush: func(
+      this: output-stream,
+      contents: list<u8>
+    ) -> result<_, write-error>
 
-        /// Perform a write. This function never blocks.
-        ///
-        /// Precondition: check-write gave permit of Ok(n) and contents has a
-        /// length of less than or equal to n. Otherwise, this function will trap.
-        ///
-        /// returns Err(closed) without writing if the stream has closed since
-        /// the last call to check-write provided a permit.
-        write: func(
-            contents: list<u8>
-        ) -> result<_, stream-error>;
+    /// Request to flush buffered output. This function never blocks.
+    ///
+    /// This tells the output-stream that the caller intends any buffered
+    /// output to be flushed. the output which is expected to be flushed
+    /// is all that has been passed to `write` prior to this call.
+    ///
+    /// Upon calling this function, the `output-stream` will not accept any
+    /// writes (`check-write` will return `ok(0)`) until the flush has
+    /// completed. The `subscribe-to-output-stream` pollable will become ready
+    /// when the flush has completed and the stream can accept more writes.
+    flush: func(
+        this: output-stream,
+    ) -> result<_, write-error>
 
-        /// Perform a write of up to 4096 bytes, and then flush the stream. Block
-        /// until all of these operations are complete, or an error occurs.
-        ///
-        /// This is a convenience wrapper around the use of `check-write`,
-        /// `subscribe`, `write`, and `flush`, and is implemented with the
-        /// following pseudo-code:
-        ///
-        /// ```text
-        /// let pollable = this.subscribe();
-        /// while !contents.is_empty() {
-        ///     // Wait for the stream to become writable
-        ///     poll-one(pollable);
-        ///     let Ok(n) = this.check-write(); // eliding error handling
-        ///     let len = min(n, contents.len());
-        ///     let (chunk, rest) = contents.split_at(len);
-        ///     this.write(chunk  );            // eliding error handling
-        ///     contents = rest;
-        /// }
-        /// this.flush();
-        /// // Wait for completion of `flush`
-        /// poll-one(pollable);
-        /// // Check for any errors that arose during `flush`
-        /// let _ = this.check-write();         // eliding error handling
-        /// ```
-        blocking-write-and-flush: func(
-            contents: list<u8>
-        ) -> result<_, stream-error>;
+    /// Request to flush buffered output, and block until flush completes
+    /// and stream is ready for writing again.
+    blocking-flush: func(
+        this: output-stream,
+    ) -> result<_, write-error>
 
-        /// Request to flush buffered output. This function never blocks.
-        ///
-        /// This tells the output-stream that the caller intends any buffered
-        /// output to be flushed. the output which is expected to be flushed
-        /// is all that has been passed to `write` prior to this call.
-        ///
-        /// Upon calling this function, the `output-stream` will not accept any
-        /// writes (`check-write` will return `ok(0)`) until the flush has
-        /// completed. The `subscribe` pollable will become ready when the
-        /// flush has completed and the stream can accept more writes.
-        flush: func() -> result<_, stream-error>;
+    /// Create a `pollable` which will resolve once the output-stream
+    /// is ready for more writing, or an error has occured. When this
+    /// pollable is ready, `check-write` will return `ok(n)` with n>0, or an
+    /// error.
+    ///
+    /// If the stream is closed, this pollable is always ready immediately.
+    ///
+    /// The created `pollable` is a child resource of the `output-stream`.
+    /// Implementations may trap if the `output-stream` is dropped before
+    /// all derived `pollable`s created with this function are dropped.
+    subscribe-to-output-stream: func(this: output-stream) -> pollable
 
-        /// Request to flush buffered output, and block until flush completes
-        /// and stream is ready for writing again.
-        blocking-flush: func() -> result<_, stream-error>;
+    /// Write zeroes to a stream.
+    ///
+    /// this should be used precisely like `write` with the exact same
+    /// preconditions (must use check-write first), but instead of
+    /// passing a list of bytes, you simply pass the number of zero-bytes
+    /// that should be written.
+    write-zeroes: func(
+        this: output-stream,
+        /// The number of zero-bytes to write
+        len: u64
+    ) -> result<_, write-error>
 
-        /// Create a `pollable` which will resolve once the output-stream
-        /// is ready for more writing, or an error has occured. When this
-        /// pollable is ready, `check-write` will return `ok(n)` with n>0, or an
-        /// error.
-        ///
-        /// If the stream is closed, this pollable is always ready immediately.
-        ///
-        /// The created `pollable` is a child resource of the `output-stream`.
-        /// Implementations may trap if the `output-stream` is dropped before
-        /// all derived `pollable`s created with this function are dropped.
-        subscribe: func() -> pollable;
+    /// Read from one stream and write to another.
+    ///
+    /// This function returns the number of bytes transferred; it may be less
+    /// than `len`.
+    ///
+    /// Unlike other I/O functions, this function blocks until all the data
+    /// read from the input stream has been written to the output stream.
+    splice: func(
+        this: output-stream,
+        /// The stream to read from
+        src: input-stream,
+        /// The number of bytes to splice
+        len: u64,
+    ) -> result<tuple<u64, stream-status>>
 
-        /// Write zeroes to a stream.
-        ///
-        /// this should be used precisely like `write` with the exact same
-        /// preconditions (must use check-write first), but instead of
-        /// passing a list of bytes, you simply pass the number of zero-bytes
-        /// that should be written.
-        write-zeroes: func(
-            /// The number of zero-bytes to write
-            len: u64
-        ) -> result<_, stream-error>;
+    /// Read from one stream and write to another, with blocking.
+    ///
+    /// This is similar to `splice`, except that it blocks until at least
+    /// one byte can be read.
+    blocking-splice: func(
+        this: output-stream,
+        /// The stream to read from
+        src: input-stream,
+        /// The number of bytes to splice
+        len: u64,
+    ) -> result<tuple<u64, stream-status>>
 
-        /// Perform a write of up to 4096 zeroes, and then flush the stream.
-        /// Block until all of these operations are complete, or an error
-        /// occurs.
-        ///
-        /// This is a convenience wrapper around the use of `check-write`,
-        /// `subscribe`, `write-zeroes`, and `flush`, and is implemented with
-        /// the following pseudo-code:
-        ///
-        /// ```text
-        /// let pollable = this.subscribe();
-        /// while num_zeroes != 0 {
-        ///     // Wait for the stream to become writable
-        ///     poll-one(pollable);
-        ///     let Ok(n) = this.check-write(); // eliding error handling
-        ///     let len = min(n, num_zeroes);
-        ///     this.write-zeroes(len);         // eliding error handling
-        ///     num_zeroes -= len;
-        /// }
-        /// this.flush();
-        /// // Wait for completion of `flush`
-        /// poll-one(pollable);
-        /// // Check for any errors that arose during `flush`
-        /// let _ = this.check-write();         // eliding error handling
-        /// ```
-        blocking-write-zeroes-and-flush: func(
-            /// The number of zero-bytes to write
-            len: u64
-        ) -> result<_, stream-error>;
+    /// Forward the entire contents of an input stream to an output stream.
+    ///
+    /// This function repeatedly reads from the input stream and writes
+    /// the data to the output stream, until the end of the input stream
+    /// is reached, or an error is encountered.
+    ///
+    /// Unlike other I/O functions, this function blocks until the end
+    /// of the input stream is seen and all the data has been written to
+    /// the output stream.
+    ///
+    /// This function returns the number of bytes transferred, and the status of
+    /// the output stream.
+    forward: func(
+        this: output-stream,
+        /// The stream to read from
+        src: input-stream
+    ) -> result<tuple<u64, stream-status>>
 
-        /// Read from one stream and write to another.
-        ///
-        /// The behavior of splice is equivelant to:
-        /// 1. calling `check-write` on the `output-stream`
-        /// 2. calling `read` on the `input-stream` with the smaller of the
-        /// `check-write` permitted length and the `len` provided to `splice`
-        /// 3. calling `write` on the `output-stream` with that read data.
-        ///
-        /// Any error reported by the call to `check-write`, `read`, or
-        /// `write` ends the splice and reports that error.
-        ///
-        /// This function returns the number of bytes transferred; it may be less
-        /// than `len`.
-        splice: func(
-            /// The stream to read from
-            src: borrow<input-stream>,
-            /// The number of bytes to splice
-            len: u64,
-        ) -> result<u64, stream-error>;
 
-        /// Read from one stream and write to another, with blocking.
-        ///
-        /// This is similar to `splice`, except that it blocks until the
-        /// `output-stream` is ready for writing, and the `input-stream`
-        /// is ready for reading, before performing the `splice`.
-        blocking-splice: func(
-            /// The stream to read from
-            src: borrow<input-stream>,
-            /// The number of bytes to splice
-            len: u64,
-        ) -> result<u64, stream-error>;
-    }
+    /// Dispose of the specified `output-stream`, after which it may no longer
+    /// be used.
+    /// Implementations may trap if this `output-stream` is dropped while
+    /// child `pollable` resources are still alive.
+    /// After this `output-stream` is dropped, implementations may report any
+    /// corresponding `input-stream` has `stream-state.closed`.
+    drop-output-stream: func(this: output-stream)
 }
diff --git a/crates/wasi-http/wit/deps/io/world.wit b/crates/wasi-http/wit/deps/io/world.wit
deleted file mode 100644
index 4b9b21da6833..000000000000
--- a/crates/wasi-http/wit/deps/io/world.wit
+++ /dev/null
@@ -1,6 +0,0 @@
-package wasi:io@0.2.0-rc-2023-11-05;
-
-world imports {
-    import streams;
-    import poll;
-}
diff --git a/crates/wasi-http/wit/deps/logging/logging.wit b/crates/wasi-http/wit/deps/logging/logging.wit
new file mode 100644
index 000000000000..b0cc4514dc8f
--- /dev/null
+++ b/crates/wasi-http/wit/deps/logging/logging.wit
@@ -0,0 +1,37 @@
+package wasi:logging
+
+/// WASI Logging is a logging API intended to let users emit log messages with
+/// simple priority levels and context values.
+interface logging {
+    /// A log level, describing a kind of message.
+    enum level {
+       /// Describes messages about the values of variables and the flow of
+       /// control within a program.
+       trace,
+
+       /// Describes messages likely to be of interest to someone debugging a
+       /// program.
+       debug,
+
+       /// Describes messages likely to be of interest to someone monitoring a
+       /// program.
+       info,
+
+       /// Describes messages indicating hazardous situations.
+       warn,
+
+       /// Describes messages indicating serious errors.
+       error,
+
+       /// Describes messages indicating fatal errors.
+       critical,
+    }
+
+    /// Emit a log message.
+    ///
+    /// A log message has a `level` describing what kind of message is being
+    /// sent, a context, which is an uninterpreted string meant to help
+    /// consumers group similar messages, and a string containing the message
+    /// text.
+    log: func(level: level, context: string, message: string)
+}
diff --git a/crates/wasi-http/wit/deps/poll/poll.wit b/crates/wasi-http/wit/deps/poll/poll.wit
new file mode 100644
index 000000000000..a6334c5570fc
--- /dev/null
+++ b/crates/wasi-http/wit/deps/poll/poll.wit
@@ -0,0 +1,39 @@
+package wasi:poll
+
+/// A poll API intended to let users wait for I/O events on multiple handles
+/// at once.
+interface poll {
+    /// A "pollable" handle.
+    ///
+    /// This is conceptually represents a `stream<_, _>`, or in other words,
+    /// a stream that one can wait on, repeatedly, but which does not itself
+    /// produce any data. It's temporary scaffolding until component-model's
+    /// async features are ready.
+    ///
+    /// And at present, it is a `u32` instead of being an actual handle, until
+    /// the wit-bindgen implementation of handles and resources is ready.
+    ///
+    /// `pollable` lifetimes are not automatically managed. Users must ensure
+    /// that they do not outlive the resource they reference.
+    ///
+    /// This [represents a resource](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources).
+    type pollable = u32
+
+    /// Dispose of the specified `pollable`, after which it may no longer
+    /// be used.
+    drop-pollable: func(this: pollable)
+
+    /// Poll for completion on a set of pollables.
+    ///
+    /// The "oneoff" in the name refers to the fact that this function must do a
+    /// linear scan through the entire list of subscriptions, which may be
+    /// inefficient if the number is large and the same subscriptions are used
+    /// many times. In the future, this is expected to be obsoleted by the
+    /// component model async proposal, which will include a scalable waiting
+    /// facility.
+    ///
+    /// The result list<bool> is the same length as the argument
+    /// list<pollable>, and indicates the readiness of each corresponding
+    /// element in that / list, with true indicating ready.
+    poll-oneoff: func(in: list<pollable>) -> list<bool>
+}
diff --git a/crates/wasi-http/wit/deps/random/insecure-seed.wit b/crates/wasi-http/wit/deps/random/insecure-seed.wit
index 139aed15927c..ff2ff65d0754 100644
--- a/crates/wasi-http/wit/deps/random/insecure-seed.wit
+++ b/crates/wasi-http/wit/deps/random/insecure-seed.wit
@@ -20,5 +20,5 @@ interface insecure-seed {
     /// This will likely be changed to a value import, to prevent it from being
     /// called multiple times and potentially used for purposes other than DoS
     /// protection.
-    insecure-seed: func() -> tuple<u64, u64>;
+    insecure-seed: func() -> tuple<u64, u64>
 }
diff --git a/crates/wasi-http/wit/deps/random/insecure.wit b/crates/wasi-http/wit/deps/random/insecure.wit
index 2ffd223cb344..ff0826822d5f 100644
--- a/crates/wasi-http/wit/deps/random/insecure.wit
+++ b/crates/wasi-http/wit/deps/random/insecure.wit
@@ -11,11 +11,11 @@ interface insecure {
     /// There are no requirements on the values of the returned bytes, however
     /// implementations are encouraged to return evenly distributed values with
     /// a long period.
-    get-insecure-random-bytes: func(len: u64) -> list<u8>;
+    get-insecure-random-bytes: func(len: u64) -> list<u8>
 
     /// Return an insecure pseudo-random `u64` value.
     ///
     /// This function returns the same type of pseudo-random data as
     /// `get-insecure-random-bytes`, represented as a `u64`.
-    get-insecure-random-u64: func() -> u64;
+    get-insecure-random-u64: func() -> u64
 }
diff --git a/crates/wasi-http/wit/deps/random/random.wit b/crates/wasi-http/wit/deps/random/random.wit
index 2c3c6a859c49..f2bd6358c139 100644
--- a/crates/wasi-http/wit/deps/random/random.wit
+++ b/crates/wasi-http/wit/deps/random/random.wit
@@ -1,25 +1,25 @@
+package wasi:random
+
 /// WASI Random is a random data API.
 ///
 /// It is intended to be portable at least between Unix-family platforms and
 /// Windows.
 interface random {
-    /// Return `len` cryptographically-secure random or pseudo-random bytes.
+    /// Return `len` cryptographically-secure pseudo-random bytes.
     ///
-    /// This function must produce data at least as cryptographically secure and
-    /// fast as an adequately seeded cryptographically-secure pseudo-random
-    /// number generator (CSPRNG). It must not block, from the perspective of
-    /// the calling program, under any circumstances, including on the first
-    /// request and on requests for numbers of bytes. The returned data must
-    /// always be unpredictable.
+    /// This function must produce data from an adequately seeded
+    /// cryptographically-secure pseudo-random number generator (CSPRNG), so it
+    /// must not block, from the perspective of the calling program, and the
+    /// returned data is always unpredictable.
     ///
-    /// This function must always return fresh data. Deterministic environments
-    /// must omit this function, rather than implementing it with deterministic
-    /// data.
-    get-random-bytes: func(len: u64) -> list<u8>;
+    /// This function must always return fresh pseudo-random data. Deterministic
+    /// environments must omit this function, rather than implementing it with
+    /// deterministic data.
+    get-random-bytes: func(len: u64) -> list<u8>
 
-    /// Return a cryptographically-secure random or pseudo-random `u64` value.
+    /// Return a cryptographically-secure pseudo-random `u64` value.
     ///
-    /// This function returns the same type of data as `get-random-bytes`,
-    /// represented as a `u64`.
-    get-random-u64: func() -> u64;
+    /// This function returns the same type of pseudo-random data as
+    /// `get-random-bytes`, represented as a `u64`.
+    get-random-u64: func() -> u64
 }
diff --git a/crates/wasi-http/wit/deps/random/world.wit b/crates/wasi-http/wit/deps/random/world.wit
deleted file mode 100644
index 9128dd68f098..000000000000
--- a/crates/wasi-http/wit/deps/random/world.wit
+++ /dev/null
@@ -1,7 +0,0 @@
-package wasi:random@0.2.0-rc-2023-11-05;
-
-world imports {
-    import random;
-    import insecure;
-    import insecure-seed;
-}
diff --git a/crates/wasi-http/wit/deps/sockets/instance-network.wit b/crates/wasi-http/wit/deps/sockets/instance-network.wit
index e455d0ff7b63..d911a29cc8dd 100644
--- a/crates/wasi-http/wit/deps/sockets/instance-network.wit
+++ b/crates/wasi-http/wit/deps/sockets/instance-network.wit
@@ -1,9 +1,9 @@
 
 /// This interface provides a value-export of the default network handle..
 interface instance-network {
-    use network.{network};
+	use network.{network}
 
-    /// Get a handle to the default network.
-    instance-network: func() -> network;
+	/// Get a handle to the default network.
+	instance-network: func() -> network
 
 }
diff --git a/crates/wasi-http/wit/deps/sockets/ip-name-lookup.wit b/crates/wasi-http/wit/deps/sockets/ip-name-lookup.wit
index 5ffe2a217c61..f15d19d037da 100644
--- a/crates/wasi-http/wit/deps/sockets/ip-name-lookup.wit
+++ b/crates/wasi-http/wit/deps/sockets/ip-name-lookup.wit
@@ -1,61 +1,69 @@
 
 interface ip-name-lookup {
-    use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable};
-    use network.{network, error-code, ip-address, ip-address-family};
-
-
-    /// Resolve an internet host name to a list of IP addresses.
-    ///
-    /// See the wasi-socket proposal README.md for a comparison with getaddrinfo.
-    ///
-    /// # Parameters
-    /// - `name`: The name to look up. IP addresses are not allowed. Unicode domain names are automatically converted
-    ///     to ASCII using IDNA encoding.
-    /// - `address-family`: If provided, limit the results to addresses of this specific address family.
-    /// - `include-unavailable`: When set to true, this function will also return addresses of which the runtime
-    ///   thinks (or knows) can't be connected to at the moment. For example, this will return IPv6 addresses on
-    ///   systems without an active IPv6 interface. Notes:
-    ///     - Even when no public IPv6 interfaces are present or active, names like "localhost" can still resolve to an IPv6 address.
-    ///     - Whatever is "available" or "unavailable" is volatile and can change everytime a network cable is unplugged.
-    ///
-    /// This function never blocks. It either immediately fails or immediately returns successfully with a `resolve-address-stream`
-    /// that can be used to (asynchronously) fetch the results.
-    ///
-    /// At the moment, the stream never completes successfully with 0 items. Ie. the first call
-    /// to `resolve-next-address` never returns `ok(none)`. This may change in the future.
-    ///
-    /// # Typical errors
-    /// - `invalid-argument`:     `name` is a syntactically invalid domain name.
-    /// - `invalid-argument`:     `name` is an IP address.
-    /// - `not-supported`:        The specified `address-family` is not supported. (EAI_FAMILY)
-    ///
-    /// # References:
-    /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getaddrinfo.html>
-    /// - <https://man7.org/linux/man-pages/man3/getaddrinfo.3.html>
-    /// - <https://learn.microsoft.com/en-us/windows/win32/api/ws2tcpip/nf-ws2tcpip-getaddrinfo>
-    /// - <https://man.freebsd.org/cgi/man.cgi?query=getaddrinfo&sektion=3>
-    resolve-addresses: func(network: borrow<network>, name: string, address-family: option<ip-address-family>, include-unavailable: bool) -> result<resolve-address-stream, error-code>;
-
-    resource resolve-address-stream {
-        /// Returns the next address from the resolver.
-        ///
-        /// This function should be called multiple times. On each call, it will
-        /// return the next address in connection order preference. If all
-        /// addresses have been exhausted, this function returns `none`.
-        ///
-        /// This function never returns IPv4-mapped IPv6 addresses.
-        ///
-        /// # Typical errors
-        /// - `name-unresolvable`:          Name does not exist or has no suitable associated IP addresses. (EAI_NONAME, EAI_NODATA, EAI_ADDRFAMILY)
-        /// - `temporary-resolver-failure`: A temporary failure in name resolution occurred. (EAI_AGAIN)
-        /// - `permanent-resolver-failure`: A permanent failure in name resolution occurred. (EAI_FAIL)
-        /// - `would-block`:                A result is not available yet. (EWOULDBLOCK, EAGAIN)
-        resolve-next-address: func() -> result<option<ip-address>, error-code>;
-
-        /// Create a `pollable` which will resolve once the stream is ready for I/O.
-        ///
-        /// Note: this function is here for WASI Preview2 only.
-        /// It's planned to be removed when `future` is natively supported in Preview3.
-        subscribe: func() -> pollable;
-    }
+	use wasi:poll/poll.{pollable}
+	use network.{network, error-code, ip-address, ip-address-family}
+
+
+	/// Resolve an internet host name to a list of IP addresses.
+	/// 
+	/// See the wasi-socket proposal README.md for a comparison with getaddrinfo.
+	/// 
+	/// # Parameters
+	/// - `name`: The name to look up. IP addresses are not allowed. Unicode domain names are automatically converted
+	///     to ASCII using IDNA encoding.
+	/// - `address-family`: If provided, limit the results to addresses of this specific address family.
+	/// - `include-unavailable`: When set to true, this function will also return addresses of which the runtime
+	///   thinks (or knows) can't be connected to at the moment. For example, this will return IPv6 addresses on
+	///   systems without an active IPv6 interface. Notes:
+	///     - Even when no public IPv6 interfaces are present or active, names like "localhost" can still resolve to an IPv6 address.
+	///     - Whatever is "available" or "unavailable" is volatile and can change everytime a network cable is unplugged.
+	/// 
+	/// This function never blocks. It either immediately fails or immediately returns successfully with a `resolve-address-stream`
+	/// that can be used to (asynchronously) fetch the results.
+	/// 
+	/// At the moment, the stream never completes successfully with 0 items. Ie. the first call
+	/// to `resolve-next-address` never returns `ok(none)`. This may change in the future.
+	/// 
+	/// # Typical errors
+	/// - `invalid-name`:                 `name` is a syntactically invalid domain name.
+	/// - `invalid-name`:                 `name` is an IP address.
+	/// - `address-family-not-supported`: The specified `address-family` is not supported. (EAI_FAMILY)
+	/// 
+	/// # References:
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getaddrinfo.html>
+	/// - <https://man7.org/linux/man-pages/man3/getaddrinfo.3.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/ws2tcpip/nf-ws2tcpip-getaddrinfo>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=getaddrinfo&sektion=3>
+	resolve-addresses: func(network: network, name: string, address-family: option<ip-address-family>, include-unavailable: bool) -> result<resolve-address-stream, error-code>
+
+
+
+    type resolve-address-stream = u32
+
+	/// Returns the next address from the resolver.
+	/// 
+	/// This function should be called multiple times. On each call, it will
+	/// return the next address in connection order preference. If all
+	/// addresses have been exhausted, this function returns `none`.
+	/// After which, you should release the stream with `drop-resolve-address-stream`.
+	/// 
+	/// This function never returns IPv4-mapped IPv6 addresses.
+	/// 
+	/// # Typical errors
+	/// - `name-unresolvable`:          Name does not exist or has no suitable associated IP addresses. (EAI_NONAME, EAI_NODATA, EAI_ADDRFAMILY)
+	/// - `temporary-resolver-failure`: A temporary failure in name resolution occurred. (EAI_AGAIN)
+	/// - `permanent-resolver-failure`: A permanent failure in name resolution occurred. (EAI_FAIL)
+	/// - `would-block`:                A result is not available yet. (EWOULDBLOCK, EAGAIN)
+	resolve-next-address: func(this: resolve-address-stream) -> result<option<ip-address>, error-code>
+
+	/// Dispose of the specified `resolve-address-stream`, after which it may no longer be used.
+	/// 
+	/// Note: this function is scheduled to be removed when Resources are natively supported in Wit.
+	drop-resolve-address-stream: func(this: resolve-address-stream)
+
+	/// Create a `pollable` which will resolve once the stream is ready for I/O.
+	/// 
+	/// Note: this function is here for WASI Preview2 only.
+	/// It's planned to be removed when `future` is natively supported in Preview3.
+	subscribe: func(this: resolve-address-stream) -> pollable
 }
diff --git a/crates/wasi-http/wit/deps/sockets/network.wit b/crates/wasi-http/wit/deps/sockets/network.wit
index 6bb07cd6faa7..a198ea8017de 100644
--- a/crates/wasi-http/wit/deps/sockets/network.wit
+++ b/crates/wasi-http/wit/deps/sockets/network.wit
@@ -1,147 +1,187 @@
+package wasi:sockets
 
 interface network {
     /// An opaque resource that represents access to (a subset of) the network.
-    /// This enables context-based security for networking.
-    /// There is no need for this to map 1:1 to a physical network interface.
-    resource network;
+	/// This enables context-based security for networking.
+	/// There is no need for this to map 1:1 to a physical network interface.
+	/// 
+	/// FYI, In the future this will be replaced by handle types.
+    type network = u32
 
-    /// Error codes.
-    ///
-    /// In theory, every API can return any error code.
-    /// In practice, API's typically only return the errors documented per API
-    /// combined with a couple of errors that are always possible:
-    /// - `unknown`
-    /// - `access-denied`
-    /// - `not-supported`
-    /// - `out-of-memory`
-    /// - `concurrency-conflict`
-    ///
-    /// See each individual API for what the POSIX equivalents are. They sometimes differ per API.
-    enum error-code {
-        // ### GENERAL ERRORS ###
+	/// Dispose of the specified `network`, after which it may no longer be used.
+	/// 
+	/// Note: this function is scheduled to be removed when Resources are natively supported in Wit.
+	drop-network: func(this: network)
 
-        /// Unknown error
-        unknown,
 
-        /// Access denied.
-        ///
-        /// POSIX equivalent: EACCES, EPERM
-        access-denied,
+	/// Error codes.
+	/// 
+	/// In theory, every API can return any error code.
+	/// In practice, API's typically only return the errors documented per API
+	/// combined with a couple of errors that are always possible:
+	/// - `unknown`
+	/// - `access-denied`
+	/// - `not-supported`
+	/// - `out-of-memory`
+	/// 
+	/// See each individual API for what the POSIX equivalents are. They sometimes differ per API.
+	enum error-code {
+		// ### GENERAL ERRORS ###
 
-        /// The operation is not supported.
-        ///
-        /// POSIX equivalent: EOPNOTSUPP
-        not-supported,
+		/// Unknown error
+		unknown,
 
-        /// One of the arguments is invalid.
-        ///
-        /// POSIX equivalent: EINVAL
-        invalid-argument,
+		/// Access denied.
+		/// 
+		/// POSIX equivalent: EACCES, EPERM
+		access-denied,
 
-        /// Not enough memory to complete the operation.
-        ///
-        /// POSIX equivalent: ENOMEM, ENOBUFS, EAI_MEMORY
-        out-of-memory,
+		/// The operation is not supported.
+		/// 
+		/// POSIX equivalent: EOPNOTSUPP
+		not-supported,
 
-        /// The operation timed out before it could finish completely.
-        timeout,
+		/// Not enough memory to complete the operation.
+		/// 
+		/// POSIX equivalent: ENOMEM, ENOBUFS, EAI_MEMORY
+		out-of-memory,
 
-        /// This operation is incompatible with another asynchronous operation that is already in progress.
-        ///
-        /// POSIX equivalent: EALREADY
-        concurrency-conflict,
+		/// The operation timed out before it could finish completely.
+		timeout,
 
-        /// Trying to finish an asynchronous operation that:
-        /// - has not been started yet, or:
-        /// - was already finished by a previous `finish-*` call.
-        ///
-        /// Note: this is scheduled to be removed when `future`s are natively supported.
-        not-in-progress,
+		/// This operation is incompatible with another asynchronous operation that is already in progress.
+		concurrency-conflict,
 
-        /// The operation has been aborted because it could not be completed immediately.
-        ///
-        /// Note: this is scheduled to be removed when `future`s are natively supported.
-        would-block,
+		/// Trying to finish an asynchronous operation that:
+		/// - has not been started yet, or:
+		/// - was already finished by a previous `finish-*` call.
+		/// 
+		/// Note: this is scheduled to be removed when `future`s are natively supported.
+		not-in-progress,
 
+		/// The operation has been aborted because it could not be completed immediately.
+		/// 
+		/// Note: this is scheduled to be removed when `future`s are natively supported.
+		would-block,
 
 
-        // ### TCP & UDP SOCKET ERRORS ###
+		// ### IP ERRORS ###
 
-        /// The operation is not valid in the socket's current state.
-        invalid-state,
+		/// The specified address-family is not supported.
+		address-family-not-supported,
 
-        /// A new socket resource could not be created because of a system limit.
-        new-socket-limit,
+		/// An IPv4 address was passed to an IPv6 resource, or vice versa.
+		address-family-mismatch,
 
-        /// A bind operation failed because the provided address is not an address that the `network` can bind to.
-        address-not-bindable,
+		/// The socket address is not a valid remote address. E.g. the IP address is set to INADDR_ANY, or the port is set to 0.
+		invalid-remote-address,
 
-        /// A bind operation failed because the provided address is already in use or because there are no ephemeral ports available.
-        address-in-use,
+		/// The operation is only supported on IPv4 resources.
+		ipv4-only-operation,
 
-        /// The remote address is not reachable
-        remote-unreachable,
+		/// The operation is only supported on IPv6 resources.
+		ipv6-only-operation,
 
 
-        // ### TCP SOCKET ERRORS ###
 
-        /// The connection was forcefully rejected
-        connection-refused,
+		// ### TCP & UDP SOCKET ERRORS ###
 
-        /// The connection was reset.
-        connection-reset,
+		/// A new socket resource could not be created because of a system limit.
+		new-socket-limit,
+		
+		/// The socket is already attached to another network.
+		already-attached,
 
-        /// A connection was aborted.
-        connection-aborted,
+		/// The socket is already bound.
+		already-bound,
 
+		/// The socket is already in the Connection state.
+		already-connected,
 
-        // ### UDP SOCKET ERRORS ###
-        datagram-too-large,
+		/// The socket is not bound to any local address.
+		not-bound,
 
+		/// The socket is not in the Connection state.
+		not-connected,
 
-        // ### NAME LOOKUP ERRORS ###
+		/// A bind operation failed because the provided address is not an address that the `network` can bind to.
+		address-not-bindable,
 
-        /// Name does not exist or has no suitable associated IP addresses.
-        name-unresolvable,
+		/// A bind operation failed because the provided address is already in use.
+		address-in-use,
 
-        /// A temporary failure in name resolution occurred.
-        temporary-resolver-failure,
+		/// A bind operation failed because there are no ephemeral ports available.
+		ephemeral-ports-exhausted,
 
-        /// A permanent failure in name resolution occurred.
-        permanent-resolver-failure,
-    }
+		/// The remote address is not reachable
+		remote-unreachable,
+		
 
-    enum ip-address-family {
-        /// Similar to `AF_INET` in POSIX.
-        ipv4,
+		// ### TCP SOCKET ERRORS ###
+		
+		/// The socket is already in the Listener state.
+		already-listening,
 
-        /// Similar to `AF_INET6` in POSIX.
-        ipv6,
-    }
+		/// The socket is already in the Listener state.
+		not-listening,
 
-    type ipv4-address = tuple<u8, u8, u8, u8>;
-    type ipv6-address = tuple<u16, u16, u16, u16, u16, u16, u16, u16>;
+		/// The connection was forcefully rejected
+		connection-refused,
 
-    variant ip-address {
-        ipv4(ipv4-address),
-        ipv6(ipv6-address),
-    }
+		/// The connection was reset.
+		connection-reset,
+		
 
-    record ipv4-socket-address {
-        port: u16, // sin_port
-        address: ipv4-address, // sin_addr
-    }
+		// ### UDP SOCKET ERRORS ###
+		datagram-too-large,
 
-    record ipv6-socket-address {
-        port: u16, // sin6_port
-        flow-info: u32, // sin6_flowinfo
-        address: ipv6-address, // sin6_addr
-        scope-id: u32, // sin6_scope_id
-    }
 
-    variant ip-socket-address {
-        ipv4(ipv4-socket-address),
-        ipv6(ipv6-socket-address),
-    }
+		// ### NAME LOOKUP ERRORS ###
+		
+		/// The provided name is a syntactically invalid domain name.
+		invalid-name,
+
+		/// Name does not exist or has no suitable associated IP addresses.
+		name-unresolvable,
+
+		/// A temporary failure in name resolution occurred.
+		temporary-resolver-failure,
+
+		/// A permanent failure in name resolution occurred.
+		permanent-resolver-failure,
+	}
+
+	enum ip-address-family {
+		/// Similar to `AF_INET` in POSIX.
+		ipv4, 
+
+		/// Similar to `AF_INET6` in POSIX.
+		ipv6,
+	}
+
+	type ipv4-address = tuple<u8, u8, u8, u8>
+	type ipv6-address = tuple<u16, u16, u16, u16, u16, u16, u16, u16>
+
+	variant ip-address {
+		ipv4(ipv4-address),
+		ipv6(ipv6-address),
+	}
+
+	record ipv4-socket-address {
+		port: u16, // sin_port
+		address: ipv4-address, // sin_addr
+	}
+
+	record ipv6-socket-address {
+		port: u16, // sin6_port
+		flow-info: u32, // sin6_flowinfo
+		address: ipv6-address, // sin6_addr
+		scope-id: u32, // sin6_scope_id
+	}
+
+	variant ip-socket-address {
+		ipv4(ipv4-socket-address),
+		ipv6(ipv6-socket-address),
+	}
 
 }
diff --git a/crates/wasi-http/wit/deps/sockets/tcp-create-socket.wit b/crates/wasi-http/wit/deps/sockets/tcp-create-socket.wit
index 768a07c85021..f43bc8979047 100644
--- a/crates/wasi-http/wit/deps/sockets/tcp-create-socket.wit
+++ b/crates/wasi-http/wit/deps/sockets/tcp-create-socket.wit
@@ -1,26 +1,27 @@
 
 interface tcp-create-socket {
-    use network.{network, error-code, ip-address-family};
-    use tcp.{tcp-socket};
+	use network.{network, error-code, ip-address-family}
+	use tcp.{tcp-socket}
 
-    /// Create a new TCP socket.
-    ///
-    /// Similar to `socket(AF_INET or AF_INET6, SOCK_STREAM, IPPROTO_TCP)` in POSIX.
-    ///
-    /// This function does not require a network capability handle. This is considered to be safe because
-    /// at time of creation, the socket is not bound to any `network` yet. Up to the moment `bind`/`listen`/`connect`
-    /// is called, the socket is effectively an in-memory configuration object, unable to communicate with the outside world.
-    ///
-    /// All sockets are non-blocking. Use the wasi-poll interface to block on asynchronous operations.
-    ///
-    /// # Typical errors
-    /// - `not-supported`:     The specified `address-family` is not supported. (EAFNOSUPPORT)
-    /// - `new-socket-limit`:  The new socket resource could not be created because of a system limit. (EMFILE, ENFILE)
-    ///
-    /// # References
-    /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/socket.html>
-    /// - <https://man7.org/linux/man-pages/man2/socket.2.html>
-    /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketw>
-    /// - <https://man.freebsd.org/cgi/man.cgi?query=socket&sektion=2>
-    create-tcp-socket: func(address-family: ip-address-family) -> result<tcp-socket, error-code>;
+	/// Create a new TCP socket.
+	/// 
+	/// Similar to `socket(AF_INET or AF_INET6, SOCK_STREAM, IPPROTO_TCP)` in POSIX.
+	/// 
+	/// This function does not require a network capability handle. This is considered to be safe because
+	/// at time of creation, the socket is not bound to any `network` yet. Up to the moment `bind`/`listen`/`connect`
+	/// is called, the socket is effectively an in-memory configuration object, unable to communicate with the outside world.
+	/// 
+	/// All sockets are non-blocking. Use the wasi-poll interface to block on asynchronous operations.
+	/// 
+	/// # Typical errors
+	/// - `not-supported`:                The host does not support TCP sockets. (EOPNOTSUPP)
+	/// - `address-family-not-supported`: The specified `address-family` is not supported. (EAFNOSUPPORT)
+	/// - `new-socket-limit`:             The new socket resource could not be created because of a system limit. (EMFILE, ENFILE)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/socket.html>
+	/// - <https://man7.org/linux/man-pages/man2/socket.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketw>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=socket&sektion=2>
+	create-tcp-socket: func(address-family: ip-address-family) -> result<tcp-socket, error-code>
 }
diff --git a/crates/wasi-http/wit/deps/sockets/tcp.wit b/crates/wasi-http/wit/deps/sockets/tcp.wit
index b9073b77515d..3922769b308e 100644
--- a/crates/wasi-http/wit/deps/sockets/tcp.wit
+++ b/crates/wasi-http/wit/deps/sockets/tcp.wit
@@ -1,268 +1,268 @@
 
 interface tcp {
-    use wasi:io/streams@0.2.0-rc-2023-11-05.{input-stream, output-stream};
-    use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable};
-    use network.{network, error-code, ip-socket-address, ip-address-family};
+	use wasi:io/streams.{input-stream, output-stream}
+	use wasi:poll/poll.{pollable}
+	use network.{network, error-code, ip-socket-address, ip-address-family}
 
-    enum shutdown-type {
-        /// Similar to `SHUT_RD` in POSIX.
-        receive,
+	/// A TCP socket handle.
+	type tcp-socket = u32
+	
 
-        /// Similar to `SHUT_WR` in POSIX.
-        send,
+	enum shutdown-type {
+		/// Similar to `SHUT_RD` in POSIX.
+		receive,
 
-        /// Similar to `SHUT_RDWR` in POSIX.
-        both,
-    }
+		/// Similar to `SHUT_WR` in POSIX.
+		send,
 
+		/// Similar to `SHUT_RDWR` in POSIX.
+		both,
+	}
 
-    /// A TCP socket handle.
-    resource tcp-socket {
-        /// Bind the socket to a specific network on the provided IP address and port.
-        ///
-        /// If the IP address is zero (`0.0.0.0` in IPv4, `::` in IPv6), it is left to the implementation to decide which
-        /// network interface(s) to bind to.
-        /// If the TCP/UDP port is zero, the socket will be bound to a random free port.
-        ///
-        /// When a socket is not explicitly bound, the first invocation to a listen or connect operation will
-        /// implicitly bind the socket.
-        ///
-        /// Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.
-        ///
-        /// # Typical `start` errors
-        /// - `invalid-argument`:          The `local-address` has the wrong address family. (EAFNOSUPPORT, EFAULT on Windows)
-        /// - `invalid-argument`:          `local-address` is not a unicast address. (EINVAL)
-        /// - `invalid-argument`:          `local-address` is an IPv4-mapped IPv6 address, but the socket has `ipv6-only` enabled. (EINVAL)
-        /// - `invalid-state`:             The socket is already bound. (EINVAL)
-        ///
-        /// # Typical `finish` errors
-        /// - `address-in-use`:            No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows)
-        /// - `address-in-use`:            Address is already in use. (EADDRINUSE)
-        /// - `address-not-bindable`:      `local-address` is not an address that the `network` can bind to. (EADDRNOTAVAIL)
-        /// - `not-in-progress`:           A `bind` operation is not in progress.
-        /// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html>
-        /// - <https://man7.org/linux/man-pages/man2/bind.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-bind>
-        /// - <https://man.freebsd.org/cgi/man.cgi?query=bind&sektion=2&format=html>
-        start-bind: func(network: borrow<network>, local-address: ip-socket-address) -> result<_, error-code>;
-        finish-bind: func() -> result<_, error-code>;
 
-        /// Connect to a remote endpoint.
-        ///
-        /// On success:
-        /// - the socket is transitioned into the Connection state
-        /// - a pair of streams is returned that can be used to read & write to the connection
-        ///
-        /// POSIX mentions:
-        /// > If connect() fails, the state of the socket is unspecified. Conforming applications should
-        /// > close the file descriptor and create a new socket before attempting to reconnect.
-        ///
-        /// WASI prescribes the following behavior:
-        /// - If `connect` fails because an input/state validation error, the socket should remain usable.
-        /// - If a connection was actually attempted but failed, the socket should become unusable for further network communication.
-        ///   Besides `drop`, any method after such a failure may return an error.
-        ///
-        /// # Typical `start` errors
-        /// - `invalid-argument`:          The `remote-address` has the wrong address family. (EAFNOSUPPORT)
-        /// - `invalid-argument`:          `remote-address` is not a unicast address. (EINVAL, ENETUNREACH on Linux, EAFNOSUPPORT on MacOS)
-        /// - `invalid-argument`:          `remote-address` is an IPv4-mapped IPv6 address, but the socket has `ipv6-only` enabled. (EINVAL, EADDRNOTAVAIL on Illumos)
-        /// - `invalid-argument`:          `remote-address` is a non-IPv4-mapped IPv6 address, but the socket was bound to a specific IPv4-mapped IPv6 address. (or vice versa)
-        /// - `invalid-argument`:          The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EADDRNOTAVAIL on Windows)
-        /// - `invalid-argument`:          The port in `remote-address` is set to 0. (EADDRNOTAVAIL on Windows)
-        /// - `invalid-argument`:          The socket is already attached to a different network. The `network` passed to `connect` must be identical to the one passed to `bind`.
-        /// - `invalid-state`:             The socket is already in the Connection state. (EISCONN)
-        /// - `invalid-state`:             The socket is already in the Listener state. (EOPNOTSUPP, EINVAL on Windows)
-        ///
-        /// # Typical `finish` errors
-        /// - `timeout`:                   Connection timed out. (ETIMEDOUT)
-        /// - `connection-refused`:        The connection was forcefully rejected. (ECONNREFUSED)
-        /// - `connection-reset`:          The connection was reset. (ECONNRESET)
-        /// - `connection-aborted`:        The connection was aborted. (ECONNABORTED)
-        /// - `remote-unreachable`:        The remote address is not reachable. (EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN)
-        /// - `address-in-use`:            Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE, EADDRNOTAVAIL on Linux, EAGAIN on BSD)
-        /// - `not-in-progress`:           A `connect` operation is not in progress.
-        /// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/connect.html>
-        /// - <https://man7.org/linux/man-pages/man2/connect.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-connect>
-        /// - <https://man.freebsd.org/cgi/man.cgi?connect>
-        start-connect: func(network: borrow<network>, remote-address: ip-socket-address) -> result<_, error-code>;
-        finish-connect: func() -> result<tuple<input-stream, output-stream>, error-code>;
+	/// Bind the socket to a specific network on the provided IP address and port.
+	///
+	/// If the IP address is zero (`0.0.0.0` in IPv4, `::` in IPv6), it is left to the implementation to decide which
+	/// network interface(s) to bind to.
+	/// If the TCP/UDP port is zero, the socket will be bound to a random free port.
+	/// 
+	/// When a socket is not explicitly bound, the first invocation to a listen or connect operation will
+	/// implicitly bind the socket.
+	/// 
+	/// Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.
+	/// 
+	/// # Typical `start` errors
+	/// - `address-family-mismatch`:   The `local-address` has the wrong address family. (EINVAL)
+	/// - `already-bound`:             The socket is already bound. (EINVAL)
+	/// - `concurrency-conflict`:      Another `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+	/// 
+	/// # Typical `finish` errors
+	/// - `ephemeral-ports-exhausted`: No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows)
+	/// - `address-in-use`:            Address is already in use. (EADDRINUSE)
+	/// - `address-not-bindable`:      `local-address` is not an address that the `network` can bind to. (EADDRNOTAVAIL)
+	/// - `not-in-progress`:           A `bind` operation is not in progress.
+	/// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html>
+	/// - <https://man7.org/linux/man-pages/man2/bind.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-bind>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=bind&sektion=2&format=html>
+	start-bind: func(this: tcp-socket, network: network, local-address: ip-socket-address) -> result<_, error-code>
+	finish-bind: func(this: tcp-socket) -> result<_, error-code>
 
-        /// Start listening for new connections.
-        ///
-        /// Transitions the socket into the Listener state.
-        ///
-        /// Unlike POSIX:
-        /// - this function is async. This enables interactive WASI hosts to inject permission prompts.
-        /// - the socket must already be explicitly bound.
-        ///
-        /// # Typical `start` errors
-        /// - `invalid-state`:             The socket is not bound to any local address. (EDESTADDRREQ)
-        /// - `invalid-state`:             The socket is already in the Connection state. (EISCONN, EINVAL on BSD)
-        /// - `invalid-state`:             The socket is already in the Listener state.
-        ///
-        /// # Typical `finish` errors
-        /// - `address-in-use`:            Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE)
-        /// - `not-in-progress`:           A `listen` operation is not in progress.
-        /// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/listen.html>
-        /// - <https://man7.org/linux/man-pages/man2/listen.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-listen>
-        /// - <https://man.freebsd.org/cgi/man.cgi?query=listen&sektion=2>
-        start-listen: func() -> result<_, error-code>;
-        finish-listen: func() -> result<_, error-code>;
+	/// Connect to a remote endpoint.
+	/// 
+	/// On success:
+	/// - the socket is transitioned into the Connection state
+	/// - a pair of streams is returned that can be used to read & write to the connection
+	/// 
+	/// # Typical `start` errors
+	/// - `address-family-mismatch`:   The `remote-address` has the wrong address family. (EAFNOSUPPORT)
+	/// - `invalid-remote-address`:    The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EADDRNOTAVAIL on Windows)
+	/// - `invalid-remote-address`:    The port in `remote-address` is set to 0. (EADDRNOTAVAIL on Windows)
+	/// - `already-attached`:          The socket is already attached to a different network. The `network` passed to `connect` must be identical to the one passed to `bind`.
+	/// - `already-connected`:         The socket is already in the Connection state. (EISCONN)
+	/// - `already-listening`:         The socket is already in the Listener state. (EOPNOTSUPP, EINVAL on Windows)
+	/// - `concurrency-conflict`:      Another `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+	/// 
+	/// # Typical `finish` errors
+	/// - `timeout`:                   Connection timed out. (ETIMEDOUT)
+	/// - `connection-refused`:        The connection was forcefully rejected. (ECONNREFUSED)
+	/// - `connection-reset`:          The connection was reset. (ECONNRESET)
+	/// - `remote-unreachable`:        The remote address is not reachable. (EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN)
+	/// - `ephemeral-ports-exhausted`: Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE, EADDRNOTAVAIL on Linux, EAGAIN on BSD)
+	/// - `not-in-progress`:           A `connect` operation is not in progress.
+	/// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/connect.html>
+	/// - <https://man7.org/linux/man-pages/man2/connect.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-connect>
+	/// - <https://man.freebsd.org/cgi/man.cgi?connect>
+	start-connect: func(this: tcp-socket, network: network, remote-address: ip-socket-address) -> result<_, error-code>
+	/// Note: the returned `input-stream` and `output-stream` are child
+	/// resources of the `tcp-socket`. Implementations may trap if the
+	/// `tcp-socket` is dropped before both of these streams are dropped.
+	finish-connect: func(this: tcp-socket) -> result<tuple<input-stream, output-stream>, error-code>
 
-        /// Accept a new client socket.
-        ///
-        /// The returned socket is bound and in the Connection state. The following properties are inherited from the listener socket:
-        /// - `address-family`
-        /// - `ipv6-only`
-        /// - `keep-alive`
-        /// - `no-delay`
-        /// - `unicast-hop-limit`
-        /// - `receive-buffer-size`
-        /// - `send-buffer-size`
-        ///
-        /// On success, this function returns the newly accepted client socket along with
-        /// a pair of streams that can be used to read & write to the connection.
-        ///
-        /// # Typical errors
-        /// - `invalid-state`:      Socket is not in the Listener state. (EINVAL)
-        /// - `would-block`:        No pending connections at the moment. (EWOULDBLOCK, EAGAIN)
-        /// - `connection-aborted`: An incoming connection was pending, but was terminated by the client before this listener could accept it. (ECONNABORTED)
-        /// - `new-socket-limit`:   The new socket resource could not be created because of a system limit. (EMFILE, ENFILE)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/accept.html>
-        /// - <https://man7.org/linux/man-pages/man2/accept.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-accept>
-        /// - <https://man.freebsd.org/cgi/man.cgi?query=accept&sektion=2>
-        accept: func() -> result<tuple<tcp-socket, input-stream, output-stream>, error-code>;
+	/// Start listening for new connections.
+	/// 
+	/// Transitions the socket into the Listener state.
+	/// 
+	/// Unlike POSIX:
+	/// - this function is async. This enables interactive WASI hosts to inject permission prompts.
+	/// - the socket must already be explicitly bound.
+	/// 
+	/// # Typical `start` errors
+	/// - `not-bound`:                 The socket is not bound to any local address. (EDESTADDRREQ)
+	/// - `already-connected`:         The socket is already in the Connection state. (EISCONN, EINVAL on BSD)
+	/// - `already-listening`:         The socket is already in the Listener state.
+	/// - `concurrency-conflict`:      Another `bind`, `connect` or `listen` operation is already in progress. (EINVAL on BSD)
+	///
+	/// # Typical `finish` errors
+	/// - `ephemeral-ports-exhausted`: Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE)
+	/// - `not-in-progress`:           A `listen` operation is not in progress.
+	/// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
+	///
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/listen.html>
+	/// - <https://man7.org/linux/man-pages/man2/listen.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-listen>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=listen&sektion=2>
+	start-listen: func(this: tcp-socket) -> result<_, error-code>
+	finish-listen: func(this: tcp-socket) -> result<_, error-code>
 
-        /// Get the bound local address.
-        ///
-        /// POSIX mentions:
-        /// > If the socket has not been bound to a local name, the value
-        /// > stored in the object pointed to by `address` is unspecified.
-        ///
-        /// WASI is stricter and requires `local-address` to return `invalid-state` when the socket hasn't been bound yet.
-        ///
-        /// # Typical errors
-        /// - `invalid-state`: The socket is not bound to any local address.
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockname.html>
-        /// - <https://man7.org/linux/man-pages/man2/getsockname.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getsockname>
-        /// - <https://man.freebsd.org/cgi/man.cgi?getsockname>
-        local-address: func() -> result<ip-socket-address, error-code>;
+	/// Accept a new client socket.
+	/// 
+	/// The returned socket is bound and in the Connection state.
+	/// 
+	/// On success, this function returns the newly accepted client socket along with
+	/// a pair of streams that can be used to read & write to the connection.
+	///
+	/// Note: the returned `input-stream` and `output-stream` are child
+	/// resources of the returned `tcp-socket`. Implementations may trap if the
+	/// `tcp-socket` is dropped before its child streams are dropped.
+	/// 
+	/// # Typical errors
+	/// - `not-listening`: Socket is not in the Listener state. (EINVAL)
+	/// - `would-block`:   No pending connections at the moment. (EWOULDBLOCK, EAGAIN)
+	/// 
+	/// Host implementations must skip over transient errors returned by the native accept syscall.
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/accept.html>
+	/// - <https://man7.org/linux/man-pages/man2/accept.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-accept>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=accept&sektion=2>
+	accept: func(this: tcp-socket) -> result<tuple<tcp-socket, input-stream, output-stream>, error-code>
 
-        /// Get the remote address.
-        ///
-        /// # Typical errors
-        /// - `invalid-state`: The socket is not connected to a remote address. (ENOTCONN)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getpeername.html>
-        /// - <https://man7.org/linux/man-pages/man2/getpeername.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getpeername>
-        /// - <https://man.freebsd.org/cgi/man.cgi?query=getpeername&sektion=2&n=1>
-        remote-address: func() -> result<ip-socket-address, error-code>;
+	/// Get the bound local address.
+	/// 
+	/// # Typical errors
+	/// - `not-bound`: The socket is not bound to any local address.
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockname.html>
+	/// - <https://man7.org/linux/man-pages/man2/getsockname.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getsockname>
+	/// - <https://man.freebsd.org/cgi/man.cgi?getsockname>
+	local-address: func(this: tcp-socket) -> result<ip-socket-address, error-code>
 
-        /// Whether this is a IPv4 or IPv6 socket.
-        ///
-        /// Equivalent to the SO_DOMAIN socket option.
-        address-family: func() -> ip-address-family;
+	/// Get the bound remote address.
+	/// 
+	/// # Typical errors
+	/// - `not-connected`: The socket is not connected to a remote address. (ENOTCONN)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getpeername.html>
+	/// - <https://man7.org/linux/man-pages/man2/getpeername.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getpeername>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=getpeername&sektion=2&n=1>
+	remote-address: func(this: tcp-socket) -> result<ip-socket-address, error-code>
 
-        /// Whether IPv4 compatibility (dual-stack) mode is disabled or not.
-        ///
-        /// Equivalent to the IPV6_V6ONLY socket option.
-        ///
-        /// # Typical errors
-        /// - `invalid-state`:        (set) The socket is already bound.
-        /// - `not-supported`:        (get/set) `this` socket is an IPv4 socket.
-        /// - `not-supported`:        (set) Host does not support dual-stack sockets. (Implementations are not required to.)
-        ipv6-only: func() -> result<bool, error-code>;
-        set-ipv6-only: func(value: bool) -> result<_, error-code>;
+	/// Whether this is a IPv4 or IPv6 socket.
+	/// 
+	/// Equivalent to the SO_DOMAIN socket option.
+	address-family: func(this: tcp-socket) -> ip-address-family
+	
+	/// Whether IPv4 compatibility (dual-stack) mode is disabled or not.
+	/// 
+	/// Equivalent to the IPV6_V6ONLY socket option.
+	/// 
+	/// # Typical errors
+	/// - `ipv6-only-operation`:  (get/set) `this` socket is an IPv4 socket.
+	/// - `already-bound`:        (set) The socket is already bound.
+	/// - `not-supported`:        (set) Host does not support dual-stack sockets. (Implementations are not required to.)
+	/// - `concurrency-conflict`: (set) A `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+	ipv6-only: func(this: tcp-socket) -> result<bool, error-code>
+	set-ipv6-only: func(this: tcp-socket, value: bool) -> result<_, error-code>
 
-        /// Hints the desired listen queue size. Implementations are free to ignore this.
-        ///
-        /// # Typical errors
-        /// - `not-supported`:        (set) The platform does not support changing the backlog size after the initial listen.
-        /// - `invalid-state`:        (set) The socket is already in the Connection state.
-        set-listen-backlog-size: func(value: u64) -> result<_, error-code>;
+	/// Hints the desired listen queue size. Implementations are free to ignore this.
+	/// 
+	/// # Typical errors
+	/// - `already-connected`:    (set) The socket is already in the Connection state.
+	/// - `concurrency-conflict`: (set) A `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+	set-listen-backlog-size: func(this: tcp-socket, value: u64) -> result<_, error-code>
 
-        /// Equivalent to the SO_KEEPALIVE socket option.
-        keep-alive: func() -> result<bool, error-code>;
-        set-keep-alive: func(value: bool) -> result<_, error-code>;
+	/// Equivalent to the SO_KEEPALIVE socket option.
+	/// 
+	/// # Typical errors
+	/// - `concurrency-conflict`: (set) A `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+	keep-alive: func(this: tcp-socket) -> result<bool, error-code>
+	set-keep-alive: func(this: tcp-socket, value: bool) -> result<_, error-code>
 
-        /// Equivalent to the TCP_NODELAY socket option.
-        ///
-        /// The default value is `false`.
-        no-delay: func() -> result<bool, error-code>;
-        set-no-delay: func(value: bool) -> result<_, error-code>;
+	/// Equivalent to the TCP_NODELAY socket option.
+	/// 
+	/// # Typical errors
+	/// - `concurrency-conflict`: (set) A `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+	no-delay: func(this: tcp-socket) -> result<bool, error-code>
+	set-no-delay: func(this: tcp-socket, value: bool) -> result<_, error-code>
+	
+	/// Equivalent to the IP_TTL & IPV6_UNICAST_HOPS socket options.
+	/// 
+	/// # Typical errors
+	/// - `already-connected`:    (set) The socket is already in the Connection state.
+	/// - `already-listening`:    (set) The socket is already in the Listener state.
+	/// - `concurrency-conflict`: (set) A `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+	unicast-hop-limit: func(this: tcp-socket) -> result<u8, error-code>
+	set-unicast-hop-limit: func(this: tcp-socket, value: u8) -> result<_, error-code>
 
-        /// Equivalent to the IP_TTL & IPV6_UNICAST_HOPS socket options.
-        ///
-        /// # Typical errors
-        /// - `invalid-argument`:     (set) The TTL value must be 1 or higher.
-        /// - `invalid-state`:        (set) The socket is already in the Connection state.
-        /// - `invalid-state`:        (set) The socket is already in the Listener state.
-        unicast-hop-limit: func() -> result<u8, error-code>;
-        set-unicast-hop-limit: func(value: u8) -> result<_, error-code>;
+	/// The kernel buffer space reserved for sends/receives on this socket.
+	/// 
+	/// Note #1: an implementation may choose to cap or round the buffer size when setting the value.
+	/// 	In other words, after setting a value, reading the same setting back may return a different value.
+	/// 
+	/// Note #2: there is not necessarily a direct relationship between the kernel buffer size and the bytes of
+	/// 	actual data to be sent/received by the application, because the kernel might also use the buffer space
+	/// 	for internal metadata structures.
+	/// 
+	/// Equivalent to the SO_RCVBUF and SO_SNDBUF socket options.
+	/// 
+	/// # Typical errors
+	/// - `already-connected`:    (set) The socket is already in the Connection state.
+	/// - `already-listening`:    (set) The socket is already in the Listener state.
+	/// - `concurrency-conflict`: (set) A `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+	receive-buffer-size: func(this: tcp-socket) -> result<u64, error-code>
+	set-receive-buffer-size: func(this: tcp-socket, value: u64) -> result<_, error-code>
+	send-buffer-size: func(this: tcp-socket) -> result<u64, error-code>
+	set-send-buffer-size: func(this: tcp-socket, value: u64) -> result<_, error-code>
 
-        /// The kernel buffer space reserved for sends/receives on this socket.
-        ///
-        /// Note #1: an implementation may choose to cap or round the buffer size when setting the value.
-        ///     In other words, after setting a value, reading the same setting back may return a different value.
-        ///
-        /// Note #2: there is not necessarily a direct relationship between the kernel buffer size and the bytes of
-        ///     actual data to be sent/received by the application, because the kernel might also use the buffer space
-        ///     for internal metadata structures.
-        ///
-        /// Equivalent to the SO_RCVBUF and SO_SNDBUF socket options.
-        ///
-        /// # Typical errors
-        /// - `invalid-state`:        (set) The socket is already in the Connection state.
-        /// - `invalid-state`:        (set) The socket is already in the Listener state.
-        receive-buffer-size: func() -> result<u64, error-code>;
-        set-receive-buffer-size: func(value: u64) -> result<_, error-code>;
-        send-buffer-size: func() -> result<u64, error-code>;
-        set-send-buffer-size: func(value: u64) -> result<_, error-code>;
+	/// Create a `pollable` which will resolve once the socket is ready for I/O.
+	/// 
+	/// The created `pollable` is a child resource of the `tcp-socket`.
+	/// Implementations may trap if the `tcp-socket` is dropped before all
+	/// derived `pollable`s created with this function are dropped.
+	///
+	/// Note: this function is here for WASI Preview2 only.
+	/// It's planned to be removed when `future` is natively supported in Preview3.
+	subscribe: func(this: tcp-socket) -> pollable
 
-        /// Create a `pollable` which will resolve once the socket is ready for I/O.
-        ///
-        /// Note: this function is here for WASI Preview2 only.
-        /// It's planned to be removed when `future` is natively supported in Preview3.
-        subscribe: func() -> pollable;
+	/// Initiate a graceful shutdown.
+	/// 
+	/// - receive: the socket is not expecting to receive any more data from the peer. All subsequent read
+	///   operations on the `input-stream` associated with this socket will return an End Of Stream indication.
+	///   Any data still in the receive queue at time of calling `shutdown` will be discarded.
+	/// - send: the socket is not expecting to send any more data to the peer. All subsequent write
+	///   operations on the `output-stream` associated with this socket will return an error.
+	/// - both: same effect as receive & send combined.
+	/// 
+	/// The shutdown function does not close (drop) the socket.
+	/// 
+	/// # Typical errors
+	/// - `not-connected`: The socket is not in the Connection state. (ENOTCONN)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/shutdown.html>
+	/// - <https://man7.org/linux/man-pages/man2/shutdown.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-shutdown>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=shutdown&sektion=2>
+	shutdown: func(this: tcp-socket, shutdown-type: shutdown-type) -> result<_, error-code>
 
-        /// Initiate a graceful shutdown.
-        ///
-        /// - receive: the socket is not expecting to receive any more data from the peer. All subsequent read
-        ///   operations on the `input-stream` associated with this socket will return an End Of Stream indication.
-        ///   Any data still in the receive queue at time of calling `shutdown` will be discarded.
-        /// - send: the socket is not expecting to send any more data to the peer. All subsequent write
-        ///   operations on the `output-stream` associated with this socket will return an error.
-        /// - both: same effect as receive & send combined.
-        ///
-        /// The shutdown function does not close (drop) the socket.
-        ///
-        /// # Typical errors
-        /// - `invalid-state`: The socket is not in the Connection state. (ENOTCONN)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/shutdown.html>
-        /// - <https://man7.org/linux/man-pages/man2/shutdown.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-shutdown>
-        /// - <https://man.freebsd.org/cgi/man.cgi?query=shutdown&sektion=2>
-        shutdown: func(shutdown-type: shutdown-type) -> result<_, error-code>;
-    }
+	/// Dispose of the specified `tcp-socket`, after which it may no longer be used.
+	/// 
+	/// Similar to the POSIX `close` function.
+	/// 
+	/// Note: this function is scheduled to be removed when Resources are natively supported in Wit.
+	drop-tcp-socket: func(this: tcp-socket)
 }
diff --git a/crates/wasi-http/wit/deps/sockets/udp-create-socket.wit b/crates/wasi-http/wit/deps/sockets/udp-create-socket.wit
index cc58234d8455..cd4c08fb1000 100644
--- a/crates/wasi-http/wit/deps/sockets/udp-create-socket.wit
+++ b/crates/wasi-http/wit/deps/sockets/udp-create-socket.wit
@@ -1,26 +1,27 @@
 
 interface udp-create-socket {
-    use network.{network, error-code, ip-address-family};
-    use udp.{udp-socket};
+	use network.{network, error-code, ip-address-family}
+	use udp.{udp-socket}
 
-    /// Create a new UDP socket.
-    ///
-    /// Similar to `socket(AF_INET or AF_INET6, SOCK_DGRAM, IPPROTO_UDP)` in POSIX.
-    ///
-    /// This function does not require a network capability handle. This is considered to be safe because
-    /// at time of creation, the socket is not bound to any `network` yet. Up to the moment `bind` is called,
-    /// the socket is effectively an in-memory configuration object, unable to communicate with the outside world.
-    ///
-    /// All sockets are non-blocking. Use the wasi-poll interface to block on asynchronous operations.
-    ///
-    /// # Typical errors
-    /// - `not-supported`:     The specified `address-family` is not supported. (EAFNOSUPPORT)
-    /// - `new-socket-limit`:  The new socket resource could not be created because of a system limit. (EMFILE, ENFILE)
-    ///
-    /// # References:
-    /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/socket.html>
-    /// - <https://man7.org/linux/man-pages/man2/socket.2.html>
-    /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketw>
-    /// - <https://man.freebsd.org/cgi/man.cgi?query=socket&sektion=2>
-    create-udp-socket: func(address-family: ip-address-family) -> result<udp-socket, error-code>;
+	/// Create a new UDP socket.
+	/// 
+	/// Similar to `socket(AF_INET or AF_INET6, SOCK_DGRAM, IPPROTO_UDP)` in POSIX.
+	/// 
+	/// This function does not require a network capability handle. This is considered to be safe because
+	/// at time of creation, the socket is not bound to any `network` yet. Up to the moment `bind`/`connect` is called,
+	/// the socket is effectively an in-memory configuration object, unable to communicate with the outside world.
+	/// 
+	/// All sockets are non-blocking. Use the wasi-poll interface to block on asynchronous operations.
+	/// 
+	/// # Typical errors
+	/// - `not-supported`:                The host does not support UDP sockets. (EOPNOTSUPP)
+	/// - `address-family-not-supported`: The specified `address-family` is not supported. (EAFNOSUPPORT)
+	/// - `new-socket-limit`:             The new socket resource could not be created because of a system limit. (EMFILE, ENFILE)
+	/// 
+	/// # References:
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/socket.html>
+	/// - <https://man7.org/linux/man-pages/man2/socket.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketw>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=socket&sektion=2>
+	create-udp-socket: func(address-family: ip-address-family) -> result<udp-socket, error-code>
 }
diff --git a/crates/wasi-http/wit/deps/sockets/udp.wit b/crates/wasi-http/wit/deps/sockets/udp.wit
index 232c2b41c7fb..700b9e247692 100644
--- a/crates/wasi-http/wit/deps/sockets/udp.wit
+++ b/crates/wasi-http/wit/deps/sockets/udp.wit
@@ -1,269 +1,220 @@
 
 interface udp {
-    use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable};
-    use network.{network, error-code, ip-socket-address, ip-address-family};
-
-    /// A received datagram.
-    record incoming-datagram {
-        /// The payload.
-        /// 
-        /// Theoretical max size: ~64 KiB. In practice, typically less than 1500 bytes.
-        data: list<u8>,
-
-        /// The source address.
-        ///
-        /// This field is guaranteed to match the remote address the stream was initialized with, if any.
-        ///
-        /// Equivalent to the `src_addr` out parameter of `recvfrom`.
-        remote-address: ip-socket-address,
-    }
-
-    /// A datagram to be sent out.
-    record outgoing-datagram {
-        /// The payload.
-        data: list<u8>,
-
-        /// The destination address.
-        ///
-        /// The requirements on this field depend on how the stream was initialized:
-        /// - with a remote address: this field must be None or match the stream's remote address exactly.
-        /// - without a remote address: this field is required.
-        ///
-        /// If this value is None, the send operation is equivalent to `send` in POSIX. Otherwise it is equivalent to `sendto`.
-        remote-address: option<ip-socket-address>,
-    }
-
-
-
-    /// A UDP socket handle.
-    resource udp-socket {
-        /// Bind the socket to a specific network on the provided IP address and port.
-        ///
-        /// If the IP address is zero (`0.0.0.0` in IPv4, `::` in IPv6), it is left to the implementation to decide which
-        /// network interface(s) to bind to.
-        /// If the port is zero, the socket will be bound to a random free port.
-        ///
-        /// Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.
-        ///
-        /// # Typical `start` errors
-        /// - `invalid-argument`:          The `local-address` has the wrong address family. (EAFNOSUPPORT, EFAULT on Windows)
-        /// - `invalid-state`:             The socket is already bound. (EINVAL)
-        ///
-        /// # Typical `finish` errors
-        /// - `address-in-use`:            No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows)
-        /// - `address-in-use`:            Address is already in use. (EADDRINUSE)
-        /// - `address-not-bindable`:      `local-address` is not an address that the `network` can bind to. (EADDRNOTAVAIL)
-        /// - `not-in-progress`:           A `bind` operation is not in progress.
-        /// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html>
-        /// - <https://man7.org/linux/man-pages/man2/bind.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-bind>
-        /// - <https://man.freebsd.org/cgi/man.cgi?query=bind&sektion=2&format=html>
-        start-bind: func(network: borrow<network>, local-address: ip-socket-address) -> result<_, error-code>;
-        finish-bind: func() -> result<_, error-code>;
-
-        /// Set up inbound & outbound communication channels, optionally to a specific peer.
-        ///
-        /// This function only changes the local socket configuration and does not generate any network traffic.
-        /// On success, the `remote-address` of the socket is updated. The `local-address` may be updated as well,
-        /// based on the best network path to `remote-address`.
-        ///
-        /// When a `remote-address` is provided, the returned streams are limited to communicating with that specific peer:
-        /// - `send` can only be used to send to this destination.
-        /// - `receive` will only return datagrams sent from the provided `remote-address`.
-        ///
-        /// This method may be called multiple times on the same socket to change its association, but
-        /// only the most recently returned pair of streams will be operational. Implementations may trap if
-        /// the streams returned by a previous invocation haven't been dropped yet before calling `stream` again.
-        /// 
-        /// The POSIX equivalent in pseudo-code is:
-        /// ```text
-        /// if (was previously connected) {
-        /// 	connect(s, AF_UNSPEC)
-        /// }
-        /// if (remote_address is Some) {
-        /// 	connect(s, remote_address)
-        /// }
-        /// ```
-        ///
-        /// Unlike in POSIX, the socket must already be explicitly bound.
-        /// 
-        /// # Typical errors
-        /// - `invalid-argument`:          The `remote-address` has the wrong address family. (EAFNOSUPPORT)
-        /// - `invalid-argument`:          `remote-address` is a non-IPv4-mapped IPv6 address, but the socket was bound to a specific IPv4-mapped IPv6 address. (or vice versa)
-        /// - `invalid-argument`:          The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EDESTADDRREQ, EADDRNOTAVAIL)
-        /// - `invalid-argument`:          The port in `remote-address` is set to 0. (EDESTADDRREQ, EADDRNOTAVAIL)
-        /// - `invalid-state`:             The socket is not bound.
-        /// - `address-in-use`:            Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE, EADDRNOTAVAIL on Linux, EAGAIN on BSD)
-        /// - `remote-unreachable`:        The remote address is not reachable. (ECONNREFUSED, ECONNRESET, ENETRESET, EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/connect.html>
-        /// - <https://man7.org/linux/man-pages/man2/connect.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-connect>
-        /// - <https://man.freebsd.org/cgi/man.cgi?connect>
-        %stream: func(remote-address: option<ip-socket-address>) -> result<tuple<incoming-datagram-stream, outgoing-datagram-stream>, error-code>;
-
-        /// Get the current bound address.
-        ///
-        /// POSIX mentions:
-        /// > If the socket has not been bound to a local name, the value
-        /// > stored in the object pointed to by `address` is unspecified.
-        ///
-        /// WASI is stricter and requires `local-address` to return `invalid-state` when the socket hasn't been bound yet.
-        /// 
-        /// # Typical errors
-        /// - `invalid-state`: The socket is not bound to any local address.
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockname.html>
-        /// - <https://man7.org/linux/man-pages/man2/getsockname.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getsockname>
-        /// - <https://man.freebsd.org/cgi/man.cgi?getsockname>
-        local-address: func() -> result<ip-socket-address, error-code>;
-
-        /// Get the address the socket is currently streaming to.
-        ///
-        /// # Typical errors
-        /// - `invalid-state`: The socket is not streaming to a specific remote address. (ENOTCONN)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getpeername.html>
-        /// - <https://man7.org/linux/man-pages/man2/getpeername.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getpeername>
-        /// - <https://man.freebsd.org/cgi/man.cgi?query=getpeername&sektion=2&n=1>
-        remote-address: func() -> result<ip-socket-address, error-code>;
-
-        /// Whether this is a IPv4 or IPv6 socket.
-        ///
-        /// Equivalent to the SO_DOMAIN socket option.
-        address-family: func() -> ip-address-family;
-
-        /// Whether IPv4 compatibility (dual-stack) mode is disabled or not.
-        ///
-        /// Equivalent to the IPV6_V6ONLY socket option.
-        ///
-        /// # Typical errors
-        /// - `not-supported`:        (get/set) `this` socket is an IPv4 socket.
-        /// - `invalid-state`:        (set) The socket is already bound.
-        /// - `not-supported`:        (set) Host does not support dual-stack sockets. (Implementations are not required to.)
-        ipv6-only: func() -> result<bool, error-code>;
-        set-ipv6-only: func(value: bool) -> result<_, error-code>;
-
-        /// Equivalent to the IP_TTL & IPV6_UNICAST_HOPS socket options.
-        unicast-hop-limit: func() -> result<u8, error-code>;
-        set-unicast-hop-limit: func(value: u8) -> result<_, error-code>;
-
-        /// The kernel buffer space reserved for sends/receives on this socket.
-        ///
-        /// Note #1: an implementation may choose to cap or round the buffer size when setting the value.
-        /// 	In other words, after setting a value, reading the same setting back may return a different value.
-        ///
-        /// Note #2: there is not necessarily a direct relationship between the kernel buffer size and the bytes of
-        /// 	actual data to be sent/received by the application, because the kernel might also use the buffer space
-        /// 	for internal metadata structures.
-        ///
-        /// Equivalent to the SO_RCVBUF and SO_SNDBUF socket options.
-        receive-buffer-size: func() -> result<u64, error-code>;
-        set-receive-buffer-size: func(value: u64) -> result<_, error-code>;
-        send-buffer-size: func() -> result<u64, error-code>;
-        set-send-buffer-size: func(value: u64) -> result<_, error-code>;
-
-        /// Create a `pollable` which will resolve once the socket is ready for I/O.
-        ///
-        /// Note: this function is here for WASI Preview2 only.
-        /// It's planned to be removed when `future` is natively supported in Preview3.
-        subscribe: func() -> pollable;
-    }
-
-    resource incoming-datagram-stream {
-        /// Receive messages on the socket.
-        ///
-        /// This function attempts to receive up to `max-results` datagrams on the socket without blocking.
-        /// The returned list may contain fewer elements than requested, but never more.
-        ///
-        /// This function returns successfully with an empty list when either:
-        /// - `max-results` is 0, or:
-        /// - `max-results` is greater than 0, but no results are immediately available.
-        /// This function never returns `error(would-block)`.
-        ///
-        /// # Typical errors
-        /// - `remote-unreachable`: The remote address is not reachable. (ECONNREFUSED, ECONNRESET, ENETRESET on Windows, EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/recvfrom.html>
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/recvmsg.html>
-        /// - <https://man7.org/linux/man-pages/man2/recv.2.html>
-        /// - <https://man7.org/linux/man-pages/man2/recvmmsg.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-recv>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-recvfrom>
-        /// - <https://learn.microsoft.com/en-us/previous-versions/windows/desktop/legacy/ms741687(v=vs.85)>
-        /// - <https://man.freebsd.org/cgi/man.cgi?query=recv&sektion=2>
-        receive: func(max-results: u64) -> result<list<incoming-datagram>, error-code>;
-
-        /// Create a `pollable` which will resolve once the stream is ready to receive again.
-        ///
-        /// Note: this function is here for WASI Preview2 only.
-        /// It's planned to be removed when `future` is natively supported in Preview3.
-        subscribe: func() -> pollable;
-    }
-
-    resource outgoing-datagram-stream {
-        /// Check readiness for sending. This function never blocks.
-        ///
-        /// Returns the number of datagrams permitted for the next call to `send`,
-        /// or an error. Calling `send` with more datagrams than this function has
-        /// permitted will trap.
-        ///
-        /// When this function returns ok(0), the `subscribe` pollable will
-        /// become ready when this function will report at least ok(1), or an
-        /// error.
-        /// 
-        /// Never returns `would-block`.
-        check-send: func() -> result<u64, error-code>;
-
-        /// Send messages on the socket.
-        ///
-        /// This function attempts to send all provided `datagrams` on the socket without blocking and
-        /// returns how many messages were actually sent (or queued for sending). This function never
-        /// returns `error(would-block)`. If none of the datagrams were able to be sent, `ok(0)` is returned.
-        ///
-        /// This function semantically behaves the same as iterating the `datagrams` list and sequentially
-        /// sending each individual datagram until either the end of the list has been reached or the first error occurred.
-        /// If at least one datagram has been sent successfully, this function never returns an error.
-        ///
-        /// If the input list is empty, the function returns `ok(0)`.
-        ///
-        /// Each call to `send` must be permitted by a preceding `check-send`. Implementations must trap if
-        /// either `check-send` was not called or `datagrams` contains more items than `check-send` permitted.
-        ///
-        /// # Typical errors
-        /// - `invalid-argument`:        The `remote-address` has the wrong address family. (EAFNOSUPPORT)
-        /// - `invalid-argument`:        `remote-address` is a non-IPv4-mapped IPv6 address, but the socket was bound to a specific IPv4-mapped IPv6 address. (or vice versa)
-        /// - `invalid-argument`:        The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EDESTADDRREQ, EADDRNOTAVAIL)
-        /// - `invalid-argument`:        The port in `remote-address` is set to 0. (EDESTADDRREQ, EADDRNOTAVAIL)
-        /// - `invalid-argument`:        The socket is in "connected" mode and `remote-address` is `some` value that does not match the address passed to `stream`. (EISCONN)
-        /// - `invalid-argument`:        The socket is not "connected" and no value for `remote-address` was provided. (EDESTADDRREQ)
-        /// - `remote-unreachable`:      The remote address is not reachable. (ECONNREFUSED, ECONNRESET, ENETRESET on Windows, EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN)
-        /// - `datagram-too-large`:      The datagram is too large. (EMSGSIZE)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/sendto.html>
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/sendmsg.html>
-        /// - <https://man7.org/linux/man-pages/man2/send.2.html>
-        /// - <https://man7.org/linux/man-pages/man2/sendmmsg.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-send>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-sendto>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasendmsg>
-        /// - <https://man.freebsd.org/cgi/man.cgi?query=send&sektion=2>
-        send: func(datagrams: list<outgoing-datagram>) -> result<u64, error-code>;
-        
-        /// Create a `pollable` which will resolve once the stream is ready to send again.
-        ///
-        /// Note: this function is here for WASI Preview2 only.
-        /// It's planned to be removed when `future` is natively supported in Preview3.
-        subscribe: func() -> pollable;
-    }
+	use wasi:poll/poll.{pollable}
+	use network.{network, error-code, ip-socket-address, ip-address-family}
+
+
+	/// A UDP socket handle.
+	type udp-socket = u32
+
+
+	record datagram {
+		data: list<u8>, // Theoretical max size: ~64 KiB. In practice, typically less than 1500 bytes.
+		remote-address: ip-socket-address,
+
+		/// Possible future additions:
+		/// local-address: ip-socket-address, // IP_PKTINFO / IP_RECVDSTADDR / IPV6_PKTINFO
+		/// local-interface: u32, // IP_PKTINFO / IP_RECVIF
+		/// ttl: u8, // IP_RECVTTL
+		/// dscp: u6, // IP_RECVTOS
+		/// ecn: u2, // IP_RECVTOS
+	}
+
+
+
+	/// Bind the socket to a specific network on the provided IP address and port.
+	///
+	/// If the IP address is zero (`0.0.0.0` in IPv4, `::` in IPv6), it is left to the implementation to decide which
+	/// network interface(s) to bind to.
+	/// If the TCP/UDP port is zero, the socket will be bound to a random free port.
+	/// 
+	/// When a socket is not explicitly bound, the first invocation to connect will implicitly bind the socket.
+	/// 
+	/// Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.
+	/// 
+	/// # Typical `start` errors
+	/// - `address-family-mismatch`:   The `local-address` has the wrong address family. (EINVAL)
+	/// - `already-bound`:             The socket is already bound. (EINVAL)
+	/// - `concurrency-conflict`:      Another `bind` or `connect` operation is already in progress. (EALREADY)
+	/// 
+	/// # Typical `finish` errors
+	/// - `ephemeral-ports-exhausted`: No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows)
+	/// - `address-in-use`:            Address is already in use. (EADDRINUSE)
+	/// - `address-not-bindable`:      `local-address` is not an address that the `network` can bind to. (EADDRNOTAVAIL)
+	/// - `not-in-progress`:           A `bind` operation is not in progress.
+	/// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html>
+	/// - <https://man7.org/linux/man-pages/man2/bind.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-bind>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=bind&sektion=2&format=html>
+	start-bind: func(this: udp-socket, network: network, local-address: ip-socket-address) -> result<_, error-code>
+	finish-bind: func(this: udp-socket) -> result<_, error-code>
+
+	/// Set the destination address.
+	/// 
+	/// The local-address is updated based on the best network path to `remote-address`.
+	/// 
+	/// When a destination address is set:
+	/// - all receive operations will only return datagrams sent from the provided `remote-address`.
+	/// - the `send` function can only be used to send to this destination.
+	/// 
+	/// Note that this function does not generate any network traffic and the peer is not aware of this "connection".
+	/// 
+	/// Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.
+	/// 
+	/// # Typical `start` errors
+	/// - `address-family-mismatch`:   The `remote-address` has the wrong address family. (EAFNOSUPPORT)
+	/// - `invalid-remote-address`:    The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EDESTADDRREQ, EADDRNOTAVAIL)
+	/// - `invalid-remote-address`:    The port in `remote-address` is set to 0. (EDESTADDRREQ, EADDRNOTAVAIL)
+	/// - `already-attached`:          The socket is already bound to a different network. The `network` passed to `connect` must be identical to the one passed to `bind`.
+	/// - `concurrency-conflict`:      Another `bind` or `connect` operation is already in progress. (EALREADY)
+	/// 
+	/// # Typical `finish` errors
+	/// - `ephemeral-ports-exhausted`: Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE, EADDRNOTAVAIL on Linux, EAGAIN on BSD)
+	/// - `not-in-progress`:           A `connect` operation is not in progress.
+	/// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/connect.html>
+	/// - <https://man7.org/linux/man-pages/man2/connect.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-connect>
+	/// - <https://man.freebsd.org/cgi/man.cgi?connect>
+	start-connect: func(this: udp-socket, network: network, remote-address: ip-socket-address) -> result<_, error-code>
+	finish-connect: func(this: udp-socket) -> result<_, error-code>
+
+	/// Receive messages on the socket.
+	/// 
+	/// This function attempts to receive up to `max-results` datagrams on the socket without blocking.
+	/// The returned list may contain fewer elements than requested, but never more.
+	/// If `max-results` is 0, this function returns successfully with an empty list.
+	/// 
+	/// # Typical errors
+	/// - `not-bound`:          The socket is not bound to any local address. (EINVAL)
+	/// - `remote-unreachable`: The remote address is not reachable. (ECONNREFUSED, ECONNRESET, ENETRESET on Windows, EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN)
+	/// - `would-block`:        There is no pending data available to be read at the moment. (EWOULDBLOCK, EAGAIN)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/recvfrom.html>
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/recvmsg.html>
+	/// - <https://man7.org/linux/man-pages/man2/recv.2.html>
+	/// - <https://man7.org/linux/man-pages/man2/recvmmsg.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-recv>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-recvfrom>
+	/// - <https://learn.microsoft.com/en-us/previous-versions/windows/desktop/legacy/ms741687(v=vs.85)>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=recv&sektion=2>
+	receive: func(this: udp-socket, max-results: u64) -> result<list<datagram>, error-code>
+
+	/// Send messages on the socket.
+	/// 
+	/// This function attempts to send all provided `datagrams` on the socket without blocking and
+	/// returns how many messages were actually sent (or queued for sending).
+	/// 
+	/// This function semantically behaves the same as iterating the `datagrams` list and sequentially
+	/// sending each individual datagram until either the end of the list has been reached or the first error occurred.
+	/// If at least one datagram has been sent successfully, this function never returns an error.
+	/// 
+	/// If the input list is empty, the function returns `ok(0)`.
+	/// 
+	/// The remote address option is required. To send a message to the "connected" peer,
+	/// call `remote-address` to get their address.
+	/// 
+	/// # Typical errors
+	/// - `address-family-mismatch`: The `remote-address` has the wrong address family. (EAFNOSUPPORT)
+	/// - `invalid-remote-address`:  The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EDESTADDRREQ, EADDRNOTAVAIL)
+	/// - `invalid-remote-address`:  The port in `remote-address` is set to 0. (EDESTADDRREQ, EADDRNOTAVAIL)
+	/// - `already-connected`:       The socket is in "connected" mode and the `datagram.remote-address` does not match the address passed to `connect`. (EISCONN)
+	/// - `not-bound`:               The socket is not bound to any local address. Unlike POSIX, this function does not perform an implicit bind.
+	/// - `remote-unreachable`:      The remote address is not reachable. (ECONNREFUSED, ECONNRESET, ENETRESET on Windows, EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN)
+	/// - `datagram-too-large`:      The datagram is too large. (EMSGSIZE)
+	/// - `would-block`:             The send buffer is currently full. (EWOULDBLOCK, EAGAIN)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/sendto.html>
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/sendmsg.html>
+	/// - <https://man7.org/linux/man-pages/man2/send.2.html>
+	/// - <https://man7.org/linux/man-pages/man2/sendmmsg.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-send>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-sendto>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasendmsg>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=send&sektion=2>
+	send: func(this: udp-socket, datagrams: list<datagram>) -> result<u64, error-code>
+
+	/// Get the current bound address.
+	/// 
+	/// # Typical errors
+	/// - `not-bound`: The socket is not bound to any local address.
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockname.html>
+	/// - <https://man7.org/linux/man-pages/man2/getsockname.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getsockname>
+	/// - <https://man.freebsd.org/cgi/man.cgi?getsockname>
+	local-address: func(this: udp-socket) -> result<ip-socket-address, error-code>
+
+	/// Get the address set with `connect`.
+	/// 
+	/// # Typical errors
+	/// - `not-connected`: The socket is not connected to a remote address. (ENOTCONN)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getpeername.html>
+	/// - <https://man7.org/linux/man-pages/man2/getpeername.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getpeername>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=getpeername&sektion=2&n=1>
+	remote-address: func(this: udp-socket) -> result<ip-socket-address, error-code>
+
+	/// Whether this is a IPv4 or IPv6 socket.
+	/// 
+	/// Equivalent to the SO_DOMAIN socket option.
+	address-family: func(this: udp-socket) -> ip-address-family
+
+	/// Whether IPv4 compatibility (dual-stack) mode is disabled or not.
+	/// 
+	/// Equivalent to the IPV6_V6ONLY socket option.
+	/// 
+	/// # Typical errors
+	/// - `ipv6-only-operation`:  (get/set) `this` socket is an IPv4 socket.
+	/// - `already-bound`:        (set) The socket is already bound.
+	/// - `not-supported`:        (set) Host does not support dual-stack sockets. (Implementations are not required to.)
+	/// - `concurrency-conflict`: (set) Another `bind` or `connect` operation is already in progress. (EALREADY)
+	ipv6-only: func(this: udp-socket) -> result<bool, error-code>
+	set-ipv6-only: func(this: udp-socket, value: bool) -> result<_, error-code>
+
+	/// Equivalent to the IP_TTL & IPV6_UNICAST_HOPS socket options.
+	/// 
+	/// # Typical errors
+	/// - `concurrency-conflict`: (set) Another `bind` or `connect` operation is already in progress. (EALREADY)
+	unicast-hop-limit: func(this: udp-socket) -> result<u8, error-code>
+	set-unicast-hop-limit: func(this: udp-socket, value: u8) -> result<_, error-code>
+
+	/// The kernel buffer space reserved for sends/receives on this socket.
+	/// 
+	/// Note #1: an implementation may choose to cap or round the buffer size when setting the value.
+	/// 	In other words, after setting a value, reading the same setting back may return a different value.
+	/// 
+	/// Note #2: there is not necessarily a direct relationship between the kernel buffer size and the bytes of
+	/// 	actual data to be sent/received by the application, because the kernel might also use the buffer space
+	/// 	for internal metadata structures.
+	/// 
+	/// Equivalent to the SO_RCVBUF and SO_SNDBUF socket options.
+	/// 
+	/// # Typical errors
+	/// - `concurrency-conflict`: (set) Another `bind` or `connect` operation is already in progress. (EALREADY)
+	receive-buffer-size: func(this: udp-socket) -> result<u64, error-code>
+	set-receive-buffer-size: func(this: udp-socket, value: u64) -> result<_, error-code>
+	send-buffer-size: func(this: udp-socket) -> result<u64, error-code>
+	set-send-buffer-size: func(this: udp-socket, value: u64) -> result<_, error-code>
+
+	/// Create a `pollable` which will resolve once the socket is ready for I/O.
+	/// 
+	/// Note: this function is here for WASI Preview2 only.
+	/// It's planned to be removed when `future` is natively supported in Preview3.
+	subscribe: func(this: udp-socket) -> pollable
+
+	/// Dispose of the specified `udp-socket`, after which it may no longer be used.
+	/// 
+	/// Note: this function is scheduled to be removed when Resources are natively supported in Wit.
+	drop-udp-socket: func(this: udp-socket)
 }
diff --git a/crates/wasi-http/wit/deps/sockets/world.wit b/crates/wasi-http/wit/deps/sockets/world.wit
deleted file mode 100644
index 979703869c06..000000000000
--- a/crates/wasi-http/wit/deps/sockets/world.wit
+++ /dev/null
@@ -1,11 +0,0 @@
-package wasi:sockets@0.2.0-rc-2023-11-05;
-
-world imports {
-    import instance-network;
-    import network;
-    import udp;
-    import udp-create-socket;
-    import tcp;
-    import tcp-create-socket;
-    import ip-name-lookup;
-}
diff --git a/crates/wasi-http/wit/main.wit b/crates/wasi-http/wit/main.wit
index 90aa28ad3c42..753770ad22ab 100644
--- a/crates/wasi-http/wit/main.wit
+++ b/crates/wasi-http/wit/main.wit
@@ -1,33 +1,33 @@
-package wasmtime:wasi;
+package wasmtime:wasi
 
 // All of the same imports available in the wasi:cli/command world, but no
 // export required:
 world preview1-adapter-reactor {
-  import wasi:clocks/wall-clock@0.2.0-rc-2023-11-05;
-  import wasi:clocks/monotonic-clock@0.2.0-rc-2023-11-05;
-  import wasi:clocks/timezone@0.2.0-rc-2023-11-05;
-  import wasi:filesystem/types@0.2.0-rc-2023-11-05;
-  import wasi:filesystem/preopens@0.2.0-rc-2023-11-05;
-  import wasi:sockets/instance-network@0.2.0-rc-2023-11-05;
-  import wasi:sockets/ip-name-lookup@0.2.0-rc-2023-11-05;
-  import wasi:sockets/network@0.2.0-rc-2023-11-05;
-  import wasi:sockets/tcp-create-socket@0.2.0-rc-2023-11-05;
-  import wasi:sockets/tcp@0.2.0-rc-2023-11-05;
-  import wasi:sockets/udp-create-socket@0.2.0-rc-2023-11-05;
-  import wasi:sockets/udp@0.2.0-rc-2023-11-05;
-  import wasi:random/random@0.2.0-rc-2023-11-05;
-  import wasi:random/insecure@0.2.0-rc-2023-11-05;
-  import wasi:random/insecure-seed@0.2.0-rc-2023-11-05;
-  import wasi:io/poll@0.2.0-rc-2023-11-05;
-  import wasi:io/streams@0.2.0-rc-2023-11-05;
-  import wasi:cli/environment@0.2.0-rc-2023-11-05;
-  import wasi:cli/exit@0.2.0-rc-2023-11-05;
-  import wasi:cli/stdin@0.2.0-rc-2023-11-05;
-  import wasi:cli/stdout@0.2.0-rc-2023-11-05;
-  import wasi:cli/stderr@0.2.0-rc-2023-11-05;
-  import wasi:cli/terminal-input@0.2.0-rc-2023-11-05;
-  import wasi:cli/terminal-output@0.2.0-rc-2023-11-05;
-  import wasi:cli/terminal-stdin@0.2.0-rc-2023-11-05;
-  import wasi:cli/terminal-stdout@0.2.0-rc-2023-11-05;
-  import wasi:cli/terminal-stderr@0.2.0-rc-2023-11-05;
+  import wasi:clocks/wall-clock
+  import wasi:clocks/monotonic-clock
+  import wasi:clocks/timezone
+  import wasi:filesystem/types
+  import wasi:filesystem/preopens
+  import wasi:sockets/instance-network
+  import wasi:sockets/ip-name-lookup
+  import wasi:sockets/network
+  import wasi:sockets/tcp-create-socket
+  import wasi:sockets/tcp
+  import wasi:sockets/udp-create-socket
+  import wasi:sockets/udp
+  import wasi:random/random
+  import wasi:random/insecure
+  import wasi:random/insecure-seed
+  import wasi:poll/poll
+  import wasi:io/streams
+  import wasi:cli/environment
+  import wasi:cli/exit
+  import wasi:cli/stdin
+  import wasi:cli/stdout
+  import wasi:cli/stderr
+  import wasi:cli/terminal-input
+  import wasi:cli/terminal-output
+  import wasi:cli/terminal-stdin
+  import wasi:cli/terminal-stdout
+  import wasi:cli/terminal-stderr
 }
diff --git a/crates/wasi-http/wit/test.wit b/crates/wasi-http/wit/test.wit
index 5e7557ed6d30..4543cb194af1 100644
--- a/crates/wasi-http/wit/test.wit
+++ b/crates/wasi-http/wit/test.wit
@@ -1,20 +1,41 @@
 // only used as part of `test-programs`
 world test-reactor {
-  include wasi:cli/reactor@0.2.0-rc-2023-11-05;
 
-  export add-strings: func(s: list<string>) -> u32;
-  export get-strings: func() -> list<string>;
+  import wasi:cli/environment
+  import wasi:io/streams
+  import wasi:filesystem/types
+  import wasi:filesystem/preopens
+  import wasi:cli/exit
 
-  use wasi:io/streams@0.2.0-rc-2023-11-05.{output-stream};
+  export add-strings: func(s: list<string>) -> u32
+  export get-strings: func() -> list<string>
 
-  export write-strings-to: func(o: output-stream) -> result;
+  use wasi:io/streams.{output-stream}
 
-  use wasi:filesystem/types@0.2.0-rc-2023-11-05.{descriptor-stat};
-  export pass-an-imported-record: func(d: descriptor-stat) -> string;
+  export write-strings-to: func(o: output-stream) -> result
+
+  use wasi:filesystem/types.{descriptor-stat}
+  export pass-an-imported-record: func(d: descriptor-stat) -> string
 }
 
 world test-command {
-  include wasi:cli/reactor@0.2.0-rc-2023-11-05;
-  import wasi:http/types@0.2.0-rc-2023-11-05;
-  import wasi:http/outgoing-handler@0.2.0-rc-2023-11-05;
+  import wasi:poll/poll
+  import wasi:io/streams
+  import wasi:cli/environment
+  import wasi:cli/stdin
+  import wasi:cli/stdout
+  import wasi:cli/stderr
+}
+
+world test-command-with-sockets {
+  import wasi:poll/poll
+  import wasi:io/streams
+  import wasi:cli/environment
+  import wasi:cli/stdin
+  import wasi:cli/stdout
+  import wasi:cli/stderr
+  import wasi:sockets/tcp
+  import wasi:sockets/tcp-create-socket
+  import wasi:sockets/network
+  import wasi:sockets/instance-network
 }
diff --git a/crates/wasi-nn/spec b/crates/wasi-nn/spec
index e2310b860db2..c1f8b87e923a 160000
--- a/crates/wasi-nn/spec
+++ b/crates/wasi-nn/spec
@@ -1 +1 @@
-Subproject commit e2310b860db2ff1719c9d69816099b87e85fabdb
+Subproject commit c1f8b87e923aedda02964c31b0e1d37e331ec402
diff --git a/crates/wasi-nn/src/backend/openvino.rs b/crates/wasi-nn/src/backend/openvino.rs
index be9c0250dbb7..428e0fcbd98d 100644
--- a/crates/wasi-nn/src/backend/openvino.rs
+++ b/crates/wasi-nn/src/backend/openvino.rs
@@ -163,10 +163,8 @@ fn map_tensor_type_to_precision(tensor_type: TensorType) -> openvino::Precision
     match tensor_type {
         TensorType::Fp16 => Precision::FP16,
         TensorType::Fp32 => Precision::FP32,
-        TensorType::Fp64 => Precision::FP64,
         TensorType::U8 => Precision::U8,
         TensorType::I32 => Precision::I32,
-        TensorType::I64 => Precision::I64,
         TensorType::Bf16 => todo!("not yet supported in `openvino` bindings"),
     }
 }
diff --git a/crates/wasi-nn/src/witx.rs b/crates/wasi-nn/src/witx.rs
index d2f85d25f4a1..e13e2678daaa 100644
--- a/crates/wasi-nn/src/witx.rs
+++ b/crates/wasi-nn/src/witx.rs
@@ -179,8 +179,6 @@ impl From<gen::types::TensorType> for crate::wit::types::TensorType {
             gen::types::TensorType::F32 => crate::wit::types::TensorType::Fp32,
             gen::types::TensorType::U8 => crate::wit::types::TensorType::U8,
             gen::types::TensorType::I32 => crate::wit::types::TensorType::I32,
-            gen::types::TensorType::I64 => crate::wit::types::TensorType::I64,
-            gen::types::TensorType::F64 => crate::wit::types::TensorType::Fp64,
         }
     }
 }
diff --git a/crates/wasi-preview1-component-adapter/build.rs b/crates/wasi-preview1-component-adapter/build.rs
index 09f56df1526c..a901cc7037d6 100644
--- a/crates/wasi-preview1-component-adapter/build.rs
+++ b/crates/wasi-preview1-component-adapter/build.rs
@@ -84,6 +84,8 @@ fn build_raw_intrinsics() -> Vec<u8> {
     funcs.function(1);
     funcs.function(0);
     funcs.function(1);
+    funcs.function(0);
+    funcs.function(1);
     module.section(&funcs);
 
     // Declare the globals.
@@ -104,6 +106,14 @@ fn build_raw_intrinsics() -> Vec<u8> {
         },
         &ConstExpr::i32_const(0),
     );
+    // stderr_stream
+    globals.global(
+        GlobalType {
+            val_type: ValType::I32,
+            mutable: true,
+        },
+        &ConstExpr::i32_const(123),
+    );
     module.section(&globals);
 
     // Here the `code` section is defined. This is tricky because an offset is
@@ -115,7 +125,7 @@ fn build_raw_intrinsics() -> Vec<u8> {
     // code section.
 
     let mut code = Vec::new();
-    4u32.encode(&mut code); // number of functions
+    6u32.encode(&mut code); // number of functions
 
     let global_get = 0x23;
     let global_set = 0x24;
@@ -142,6 +152,8 @@ fn build_raw_intrinsics() -> Vec<u8> {
     let internal_state_ptr_ref2 = encode(&mut code, 0, global_set); // set_state_ptr
     let allocation_state_ref1 = encode(&mut code, 1, global_get); // get_allocation_state
     let allocation_state_ref2 = encode(&mut code, 1, global_set); // set_allocation_state
+    let stderr_stream_ref1 = encode(&mut code, 2, global_get); // get_stderr_stream
+    let stderr_stream_ref2 = encode(&mut code, 2, global_set); // set_stderr_stream
 
     module.section(&RawSection {
         id: SectionId::Code as u8,
@@ -159,7 +171,7 @@ fn build_raw_intrinsics() -> Vec<u8> {
 
         linking.push(0x08); // `WASM_SYMBOL_TABLE`
         let mut subsection = Vec::new();
-        6u32.encode(&mut subsection); // 6 symbols (4 functions + 2 globals)
+        9u32.encode(&mut subsection); // 9 symbols (6 functions + 3 globals)
 
         subsection.push(0x00); // SYMTAB_FUNCTION
         0x00.encode(&mut subsection); // flags
@@ -181,6 +193,16 @@ fn build_raw_intrinsics() -> Vec<u8> {
         3u32.encode(&mut subsection); // function index
         "set_allocation_state".encode(&mut subsection); // symbol name
 
+        subsection.push(0x00); // SYMTAB_FUNCTION
+        0x00.encode(&mut subsection); // flags
+        4u32.encode(&mut subsection); // function index
+        "get_stderr_stream".encode(&mut subsection); // symbol name
+
+        subsection.push(0x00); // SYMTAB_FUNCTION
+        0x00.encode(&mut subsection); // flags
+        5u32.encode(&mut subsection); // function index
+        "set_stderr_stream".encode(&mut subsection); // symbol name
+
         subsection.push(0x02); // SYMTAB_GLOBAL
         0x02.encode(&mut subsection); // flags (WASM_SYM_BINDING_LOCAL)
         0u32.encode(&mut subsection); // global index
@@ -191,6 +213,11 @@ fn build_raw_intrinsics() -> Vec<u8> {
         1u32.encode(&mut subsection); // global index
         "allocation_state".encode(&mut subsection); // symbol name
 
+        subsection.push(0x02); // SYMTAB_GLOBAL
+        0x00.encode(&mut subsection); // flags
+        2u32.encode(&mut subsection); // global index
+        "stderr_stream".encode(&mut subsection); // symbol name
+
         subsection.encode(&mut linking);
         module.section(&CustomSection {
             name: "linking".into(),
@@ -203,23 +230,31 @@ fn build_raw_intrinsics() -> Vec<u8> {
     {
         let mut reloc = Vec::new();
         3u32.encode(&mut reloc); // target section (code is the 4th section, 3 when 0-indexed)
-        4u32.encode(&mut reloc); // 4 relocations
+        6u32.encode(&mut reloc); // 6 relocations
 
         reloc.push(0x07); // R_WASM_GLOBAL_INDEX_LEB
         internal_state_ptr_ref1.encode(&mut reloc); // offset
-        4u32.encode(&mut reloc); // symbol index
+        6u32.encode(&mut reloc); // symbol index
 
         reloc.push(0x07); // R_WASM_GLOBAL_INDEX_LEB
         internal_state_ptr_ref2.encode(&mut reloc); // offset
-        4u32.encode(&mut reloc); // symbol index
+        6u32.encode(&mut reloc); // symbol index
 
         reloc.push(0x07); // R_WASM_GLOBAL_INDEX_LEB
         allocation_state_ref1.encode(&mut reloc); // offset
-        5u32.encode(&mut reloc); // symbol index
+        7u32.encode(&mut reloc); // symbol index
 
         reloc.push(0x07); // R_WASM_GLOBAL_INDEX_LEB
         allocation_state_ref2.encode(&mut reloc); // offset
-        5u32.encode(&mut reloc); // symbol index
+        7u32.encode(&mut reloc); // symbol index
+
+        reloc.push(0x07); // R_WASM_GLOBAL_INDEX_LEB
+        stderr_stream_ref1.encode(&mut reloc); // offset
+        8u32.encode(&mut reloc); // symbol index
+
+        reloc.push(0x07); // R_WASM_GLOBAL_INDEX_LEB
+        stderr_stream_ref2.encode(&mut reloc); // offset
+        8u32.encode(&mut reloc); // symbol index
 
         module.section(&CustomSection {
             name: "reloc.CODE".into(),
diff --git a/crates/wasi-preview1-component-adapter/src/descriptors.rs b/crates/wasi-preview1-component-adapter/src/descriptors.rs
index 1eced19abb04..6045358bde36 100644
--- a/crates/wasi-preview1-component-adapter/src/descriptors.rs
+++ b/crates/wasi-preview1-component-adapter/src/descriptors.rs
@@ -1,11 +1,14 @@
 use crate::bindings::wasi::cli::{
-    stderr, stdin, stdout, terminal_stderr, terminal_stdin, terminal_stdout,
+    stderr, stdin, stdout, terminal_input, terminal_output, terminal_stderr, terminal_stdin,
+    terminal_stdout,
 };
 use crate::bindings::wasi::filesystem::types as filesystem;
-use crate::bindings::wasi::io::streams::{InputStream, OutputStream};
+use crate::bindings::wasi::io::streams::{self, InputStream, OutputStream};
 use crate::bindings::wasi::sockets::tcp;
-use crate::{BlockingMode, BumpArena, File, ImportAlloc, TrappingUnwrap, WasmStr};
-use core::cell::{Cell, OnceCell, UnsafeCell};
+use crate::{
+    set_stderr_stream, BlockingMode, BumpArena, File, ImportAlloc, TrappingUnwrap, WasmStr,
+};
+use core::cell::{Cell, UnsafeCell};
 use core::mem::MaybeUninit;
 use wasi::{Errno, Fd};
 
@@ -21,15 +24,36 @@ pub enum Descriptor {
     Streams(Streams),
 }
 
+impl Drop for Descriptor {
+    fn drop(&mut self) {
+        match self {
+            Descriptor::Streams(stream) => {
+                if let Some(input) = stream.input.get() {
+                    streams::drop_input_stream(input);
+                }
+                if let Some(output) = stream.output.get() {
+                    streams::drop_output_stream(output);
+                }
+                match &stream.type_ {
+                    StreamType::File(file) => filesystem::drop_descriptor(file.fd),
+                    StreamType::Socket(_) => unreachable!(),
+                    StreamType::Stdio(_) => {}
+                }
+            }
+            Descriptor::Closed(_) => {}
+        }
+    }
+}
+
 /// Input and/or output wasi-streams, along with a stream type that
 /// identifies what kind of stream they are and possibly supporting
 /// type-specific operations like seeking.
 pub struct Streams {
     /// The input stream, if present.
-    pub input: OnceCell<InputStream>,
+    pub input: Cell<Option<InputStream>>,
 
     /// The output stream, if present.
-    pub output: OnceCell<OutputStream>,
+    pub output: Cell<Option<OutputStream>>,
 
     /// Information about the source of the stream.
     pub type_: StreamType,
@@ -37,65 +61,59 @@ pub struct Streams {
 
 impl Streams {
     /// Return the input stream, initializing it on the fly if needed.
-    pub fn get_read_stream(&self) -> Result<&InputStream, Errno> {
-        match self.input.get() {
-            Some(wasi_stream) => Ok(wasi_stream),
-            None => {
-                let input = match &self.type_ {
-                    // For directories, preview 1 behavior was to return ERRNO_BADF on attempts to read
-                    // or write.
-                    StreamType::File(File {
-                        descriptor_type: filesystem::DescriptorType::Directory,
-                        ..
-                    }) => return Err(wasi::ERRNO_BADF),
-                    // For files, we may have adjusted the position for seeking, so
-                    // create a new stream.
-                    StreamType::File(file) => {
-                        let input = file.fd.read_via_stream(file.position.get())?;
-                        input
-                    }
-                    _ => return Err(wasi::ERRNO_BADF),
-                };
-                self.input.set(input).trapping_unwrap();
-                Ok(self.input.get().trapping_unwrap())
-            }
+    pub fn get_read_stream(&self) -> Result<InputStream, Errno> {
+        match &self.input.get() {
+            Some(wasi_stream) => Ok(*wasi_stream),
+            None => match &self.type_ {
+                // For directories, preview 1 behavior was to return ERRNO_BADF on attempts to read
+                // or write.
+                StreamType::File(File {
+                    descriptor_type: filesystem::DescriptorType::Directory,
+                    ..
+                }) => Err(wasi::ERRNO_BADF),
+                // For files, we may have adjusted the position for seeking, so
+                // create a new stream.
+                StreamType::File(file) => {
+                    let input = filesystem::read_via_stream(file.fd, file.position.get())?;
+                    self.input.set(Some(input));
+                    Ok(input)
+                }
+                _ => Err(wasi::ERRNO_BADF),
+            },
         }
     }
 
     /// Return the output stream, initializing it on the fly if needed.
-    pub fn get_write_stream(&self) -> Result<&OutputStream, Errno> {
-        match self.output.get() {
-            Some(wasi_stream) => Ok(wasi_stream),
-            None => {
-                let output = match &self.type_ {
-                    // For directories, preview 1 behavior was to return ERRNO_BADF on attempts to read
-                    // or write.
-                    StreamType::File(File {
-                        descriptor_type: filesystem::DescriptorType::Directory,
-                        ..
-                    }) => return Err(wasi::ERRNO_BADF),
-                    // For files, we may have adjusted the position for seeking, so
-                    // create a new stream.
-                    StreamType::File(file) => {
-                        let output = if file.append {
-                            file.fd.append_via_stream()?
-                        } else {
-                            file.fd.write_via_stream(file.position.get())?
-                        };
-                        output
-                    }
-                    _ => return Err(wasi::ERRNO_BADF),
-                };
-                self.output.set(output).trapping_unwrap();
-                Ok(self.output.get().trapping_unwrap())
-            }
+    pub fn get_write_stream(&self) -> Result<OutputStream, Errno> {
+        match &self.output.get() {
+            Some(wasi_stream) => Ok(*wasi_stream),
+            None => match &self.type_ {
+                // For directories, preview 1 behavior was to return ERRNO_BADF on attempts to read
+                // or write.
+                StreamType::File(File {
+                    descriptor_type: filesystem::DescriptorType::Directory,
+                    ..
+                }) => Err(wasi::ERRNO_BADF),
+                // For files, we may have adjusted the position for seeking, so
+                // create a new stream.
+                StreamType::File(file) => {
+                    let output = if file.append {
+                        filesystem::append_via_stream(file.fd)?
+                    } else {
+                        filesystem::write_via_stream(file.fd, file.position.get())?
+                    };
+                    self.output.set(Some(output));
+                    Ok(output)
+                }
+                _ => Err(wasi::ERRNO_BADF),
+            },
         }
     }
 }
 
 #[allow(dead_code)] // until Socket is implemented
 pub enum StreamType {
-    /// Streams for implementing stdio.
+    /// Stream is used for implementing stdio.
     Stdio(IsATTY),
 
     /// Streaming data with a file.
@@ -143,46 +161,52 @@ impl Descriptors {
             preopens: Cell::new(None),
         };
 
+        let stdin = stdin::get_stdin();
         let stdin_isatty = match terminal_stdin::get_terminal_stdin() {
-            Some(_) => IsATTY::Yes,
+            Some(t) => {
+                terminal_input::drop_terminal_input(t);
+                IsATTY::Yes
+            }
             None => IsATTY::No,
         };
+        let stdout = stdout::get_stdout();
         let stdout_isatty = match terminal_stdout::get_terminal_stdout() {
-            Some(_) => IsATTY::Yes,
+            Some(t) => {
+                terminal_output::drop_terminal_output(t);
+                IsATTY::Yes
+            }
             None => IsATTY::No,
         };
+        let stderr = stderr::get_stderr();
+        unsafe { set_stderr_stream(stderr) };
         let stderr_isatty = match terminal_stderr::get_terminal_stderr() {
-            Some(_) => IsATTY::Yes,
+            Some(t) => {
+                terminal_output::drop_terminal_output(t);
+                IsATTY::Yes
+            }
             None => IsATTY::No,
         };
 
-        fn new_once<T>(val: T) -> OnceCell<T> {
-            let cell = OnceCell::new();
-            let _ = cell.set(val);
-            cell
-        }
-
         d.push(Descriptor::Streams(Streams {
-            input: new_once(stdin::get_stdin()),
-            output: OnceCell::new(),
+            input: Cell::new(Some(stdin)),
+            output: Cell::new(None),
             type_: StreamType::Stdio(stdin_isatty),
         }))
         .trapping_unwrap();
         d.push(Descriptor::Streams(Streams {
-            input: OnceCell::new(),
-            output: new_once(stdout::get_stdout()),
+            input: Cell::new(None),
+            output: Cell::new(Some(stdout)),
             type_: StreamType::Stdio(stdout_isatty),
         }))
         .trapping_unwrap();
         d.push(Descriptor::Streams(Streams {
-            input: OnceCell::new(),
-            output: new_once(stderr::get_stderr()),
+            input: Cell::new(None),
+            output: Cell::new(Some(stderr)),
             type_: StreamType::Stdio(stderr_isatty),
         }))
         .trapping_unwrap();
 
-        #[link(wasm_import_module = "wasi:filesystem/preopens@0.2.0-rc-2023-11-05")]
-        #[allow(improper_ctypes)] // FIXME(bytecodealliance/wit-bindgen#684)
+        #[link(wasm_import_module = "wasi:filesystem/preopens")]
         extern "C" {
             #[link_name = "get-directories"]
             fn get_preopens_import(rval: *mut PreopenList);
@@ -200,18 +224,14 @@ impl Descriptors {
             std::slice::from_raw_parts(list.base, list.len)
         };
         for preopen in preopens {
-            // Acquire ownership of the descriptor, leaving the rest of the
-            // `Preopen` struct in place.
-            let descriptor = unsafe { preopen.descriptor.assume_init_read() };
             // Expectation is that the descriptor index is initialized with
             // stdio (0,1,2) and no others, so that preopens are 3..
-            let descriptor_type = descriptor.get_type().trapping_unwrap();
             d.push(Descriptor::Streams(Streams {
-                input: OnceCell::new(),
-                output: OnceCell::new(),
+                input: Cell::new(None),
+                output: Cell::new(None),
                 type_: StreamType::File(File {
-                    fd: descriptor,
-                    descriptor_type,
+                    fd: preopen.descriptor,
+                    descriptor_type: filesystem::get_type(preopen.descriptor).trapping_unwrap(),
                     position: Cell::new(0),
                     append: false,
                     blocking_mode: BlockingMode::Blocking,
@@ -297,7 +317,7 @@ impl Descriptors {
     // Internal: close a fd, returning the descriptor.
     fn close_(&mut self, fd: Fd) -> Result<Descriptor, Errno> {
         // Throw an error if closing an fd which is already closed
-        match self.get(fd)? {
+        match self.get_mut(fd)? {
             Descriptor::Closed(_) => Err(wasi::ERRNO_BADF)?,
             _ => {}
         }
@@ -340,14 +360,10 @@ impl Descriptors {
 
     // A bunch of helper functions implemented in terms of the above pub functions:
 
-    pub fn get_stream_with_error_mut(
-        &mut self,
-        fd: Fd,
-        error: Errno,
-    ) -> Result<&mut Streams, Errno> {
-        match self.get_mut(fd)? {
+    pub fn get_stream_with_error(&self, fd: Fd, error: Errno) -> Result<&Streams, Errno> {
+        match self.get(fd)? {
             Descriptor::Streams(streams) => Ok(streams),
-            Descriptor::Closed(_) => Err(error),
+            Descriptor::Closed(_) => Err(wasi::ERRNO_BADF),
         }
     }
 
@@ -371,12 +387,12 @@ impl Descriptors {
     }
 
     #[allow(dead_code)] // until Socket is implemented
-    pub fn get_socket(&self, fd: Fd) -> Result<&tcp::TcpSocket, Errno> {
+    pub fn get_socket(&self, fd: Fd) -> Result<tcp::TcpSocket, Errno> {
         match self.get(fd)? {
             Descriptor::Streams(Streams {
                 type_: StreamType::Socket(socket),
                 ..
-            }) => Ok(&*socket),
+            }) => Ok(*socket),
             Descriptor::Closed(_) => Err(wasi::ERRNO_BADF),
             _ => Err(wasi::ERRNO_INVAL),
         }
@@ -399,7 +415,12 @@ impl Descriptors {
                 ..
             }) => Ok(file),
             Descriptor::Streams(Streams {
-                type_: StreamType::File(File { .. }),
+                type_:
+                    StreamType::File(
+                        file @ File {
+                            descriptor_type: _, ..
+                        },
+                    ),
                 ..
             }) => Err(wasi::ERRNO_NOTDIR),
             _ => Err(wasi::ERRNO_BADF),
@@ -410,18 +431,18 @@ impl Descriptors {
         self.get_file_with_error(fd, wasi::ERRNO_SPIPE)
     }
 
-    pub fn get_seekable_stream_mut(&mut self, fd: Fd) -> Result<&mut Streams, Errno> {
-        self.get_stream_with_error_mut(fd, wasi::ERRNO_SPIPE)
+    pub fn get_seekable_stream(&self, fd: Fd) -> Result<&Streams, Errno> {
+        self.get_stream_with_error(fd, wasi::ERRNO_SPIPE)
     }
 
-    pub fn get_read_stream(&self, fd: Fd) -> Result<&InputStream, Errno> {
+    pub fn get_read_stream(&self, fd: Fd) -> Result<InputStream, Errno> {
         match self.get(fd)? {
             Descriptor::Streams(streams) => streams.get_read_stream(),
             Descriptor::Closed(_) => Err(wasi::ERRNO_BADF),
         }
     }
 
-    pub fn get_write_stream(&self, fd: Fd) -> Result<&OutputStream, Errno> {
+    pub fn get_write_stream(&self, fd: Fd) -> Result<OutputStream, Errno> {
         match self.get(fd)? {
             Descriptor::Streams(streams) => streams.get_write_stream(),
             Descriptor::Closed(_) => Err(wasi::ERRNO_BADF),
@@ -431,9 +452,7 @@ impl Descriptors {
 
 #[repr(C)]
 pub struct Preopen {
-    /// This is `MaybeUninit` because we take ownership of the `Descriptor` to
-    /// put it in our own table.
-    pub descriptor: MaybeUninit<filesystem::Descriptor>,
+    pub descriptor: u32,
     pub path: WasmStr,
 }
 
diff --git a/crates/wasi-preview1-component-adapter/src/lib.rs b/crates/wasi-preview1-component-adapter/src/lib.rs
index 08978baa51a3..d75e8caa5ef0 100644
--- a/crates/wasi-preview1-component-adapter/src/lib.rs
+++ b/crates/wasi-preview1-component-adapter/src/lib.rs
@@ -1,11 +1,12 @@
+#![allow(unused_variables)] // TODO: remove this when more things are implemented
+
 use crate::bindings::wasi::cli::exit;
 use crate::bindings::wasi::clocks::{monotonic_clock, wall_clock};
 use crate::bindings::wasi::filesystem::types as filesystem;
-use crate::bindings::wasi::io::poll;
 use crate::bindings::wasi::io::streams;
+use crate::bindings::wasi::poll::poll;
 use crate::bindings::wasi::random::random;
 use crate::bindings::wasi::sockets::network;
-use core::cell::OnceCell;
 use core::cell::{Cell, RefCell, RefMut, UnsafeCell};
 use core::cmp::min;
 use core::ffi::c_void;
@@ -39,7 +40,7 @@ pub mod bindings {
         // can't support in these special core-wasm adapters.
         // Instead, we manually define the bindings for these functions in
         // terms of raw pointers.
-        skip: ["run", "get-environment", "poll-list"],
+        skip: ["run", "get-environment", "poll-oneoff"],
     });
 
     #[cfg(feature = "reactor")]
@@ -54,11 +55,11 @@ pub mod bindings {
         // can't support in these special core-wasm adapters.
         // Instead, we manually define the bindings for these functions in
         // terms of raw pointers.
-        skip: ["get-environment", "poll-list"],
+        skip: ["get-environment", "poll-oneoff"],
     });
 }
 
-#[export_name = "wasi:cli/run@0.2.0-rc-2023-11-05#run"]
+#[export_name = "wasi:cli/run#run"]
 #[cfg(feature = "command")]
 pub unsafe extern "C" fn run() -> u32 {
     #[link(wasm_import_module = "__main_module__")]
@@ -348,24 +349,23 @@ pub unsafe extern "C" fn environ_sizes_get(
 /// Note: This is similar to `clock_getres` in POSIX.
 #[no_mangle]
 pub extern "C" fn clock_res_get(id: Clockid, resolution: &mut Timestamp) -> Errno {
-    match id {
-        CLOCKID_MONOTONIC => {
-            *resolution = monotonic_clock::resolution();
-            ERRNO_SUCCESS
-        }
-        CLOCKID_REALTIME => {
-            let res = wall_clock::resolution();
-            *resolution = match Timestamp::from(res.seconds)
-                .checked_mul(1_000_000_000)
-                .and_then(|ns| ns.checked_add(res.nanoseconds.into()))
-            {
-                Some(ns) => ns,
-                None => return ERRNO_OVERFLOW,
-            };
-            ERRNO_SUCCESS
+    State::with(|state| {
+        match id {
+            CLOCKID_MONOTONIC => {
+                let res = monotonic_clock::resolution();
+                *resolution = res;
+            }
+            CLOCKID_REALTIME => {
+                let res = wall_clock::resolution();
+                *resolution = Timestamp::from(res.seconds)
+                    .checked_mul(1_000_000_000)
+                    .and_then(|ns| ns.checked_add(res.nanoseconds.into()))
+                    .ok_or(ERRNO_OVERFLOW)?;
+            }
+            _ => unreachable!(),
         }
-        _ => ERRNO_BADF,
-    }
+        Ok(())
+    })
 }
 
 /// Return the time value of a clock.
@@ -376,23 +376,28 @@ pub unsafe extern "C" fn clock_time_get(
     _precision: Timestamp,
     time: &mut Timestamp,
 ) -> Errno {
-    match id {
-        CLOCKID_MONOTONIC => {
-            *time = monotonic_clock::now();
-            ERRNO_SUCCESS
-        }
-        CLOCKID_REALTIME => {
-            let res = wall_clock::now();
-            *time = match Timestamp::from(res.seconds)
-                .checked_mul(1_000_000_000)
-                .and_then(|ns| ns.checked_add(res.nanoseconds.into()))
-            {
-                Some(ns) => ns,
-                None => return ERRNO_OVERFLOW,
-            };
-            ERRNO_SUCCESS
-        }
-        _ => ERRNO_BADF,
+    if matches!(
+        get_allocation_state(),
+        AllocationState::StackAllocated | AllocationState::StateAllocated
+    ) {
+        State::with(|state| match id {
+            CLOCKID_MONOTONIC => {
+                *time = monotonic_clock::now();
+                Ok(())
+            }
+            CLOCKID_REALTIME => {
+                let res = wall_clock::now();
+                *time = Timestamp::from(res.seconds)
+                    .checked_mul(1_000_000_000)
+                    .and_then(|ns| ns.checked_add(res.nanoseconds.into()))
+                    .ok_or(ERRNO_OVERFLOW)?;
+                Ok(())
+            }
+            _ => Err(ERRNO_BADF),
+        })
+    } else {
+        *time = Timestamp::from(0u64);
+        ERRNO_SUCCESS
     }
 }
 
@@ -417,7 +422,7 @@ pub unsafe extern "C" fn fd_advise(
     State::with(|state| {
         let ds = state.descriptors();
         let file = ds.get_seekable_file(fd)?;
-        file.fd.advise(offset, len, advice)?;
+        filesystem::advise(file.fd, offset, len, advice)?;
         Ok(())
     })
 }
@@ -425,11 +430,11 @@ pub unsafe extern "C" fn fd_advise(
 /// Force the allocation of space in a file.
 /// Note: This is similar to `posix_fallocate` in POSIX.
 #[no_mangle]
-pub unsafe extern "C" fn fd_allocate(fd: Fd, _offset: Filesize, _len: Filesize) -> Errno {
+pub unsafe extern "C" fn fd_allocate(fd: Fd, offset: Filesize, len: Filesize) -> Errno {
     State::with(|state| {
         let ds = state.descriptors();
         // For not-files, fail with BADF
-        ds.get_file(fd)?;
+        let file = ds.get_file(fd)?;
         // For all files, fail with NOTSUP, because this call does not exist in preview 2.
         Err(wasi::ERRNO_NOTSUP)
     })
@@ -447,7 +452,7 @@ pub unsafe extern "C" fn fd_close(fd: Fd) -> Errno {
             drop(state.dirent_cache.stream.replace(None));
         }
 
-        state.descriptors_mut().close(fd)?;
+        let desc = state.descriptors_mut().close(fd)?;
         Ok(())
     })
 }
@@ -459,7 +464,7 @@ pub unsafe extern "C" fn fd_datasync(fd: Fd) -> Errno {
     State::with(|state| {
         let ds = state.descriptors();
         let file = ds.get_file(fd)?;
-        file.fd.sync_data()?;
+        filesystem::sync_data(file.fd)?;
         Ok(())
     })
 }
@@ -468,125 +473,122 @@ pub unsafe extern "C" fn fd_datasync(fd: Fd) -> Errno {
 /// Note: This returns similar flags to `fsync(fd, F_GETFL)` in POSIX, as well as additional fields.
 #[no_mangle]
 pub unsafe extern "C" fn fd_fdstat_get(fd: Fd, stat: *mut Fdstat) -> Errno {
-    State::with(|state| {
-        let ds = state.descriptors();
-        match ds.get(fd)? {
-            Descriptor::Streams(Streams {
-                type_: StreamType::File(file),
-                ..
-            }) => {
-                let flags = file.fd.get_flags()?;
-                let type_ = file.fd.get_type()?;
-                match type_ {
-                    filesystem::DescriptorType::Directory => {
-                        // Hard-coded set of rights expected by many userlands:
-                        let fs_rights_base = wasi::RIGHTS_PATH_CREATE_DIRECTORY
-                            | wasi::RIGHTS_PATH_CREATE_FILE
-                            | wasi::RIGHTS_PATH_LINK_SOURCE
-                            | wasi::RIGHTS_PATH_LINK_TARGET
-                            | wasi::RIGHTS_PATH_OPEN
-                            | wasi::RIGHTS_FD_READDIR
-                            | wasi::RIGHTS_PATH_READLINK
-                            | wasi::RIGHTS_PATH_RENAME_SOURCE
-                            | wasi::RIGHTS_PATH_RENAME_TARGET
-                            | wasi::RIGHTS_PATH_SYMLINK
-                            | wasi::RIGHTS_PATH_REMOVE_DIRECTORY
-                            | wasi::RIGHTS_PATH_UNLINK_FILE
-                            | wasi::RIGHTS_PATH_FILESTAT_GET
-                            | wasi::RIGHTS_PATH_FILESTAT_SET_TIMES
-                            | wasi::RIGHTS_FD_FILESTAT_GET
-                            | wasi::RIGHTS_FD_FILESTAT_SET_TIMES;
-
-                        let fs_rights_inheriting = fs_rights_base
-                            | wasi::RIGHTS_FD_DATASYNC
-                            | wasi::RIGHTS_FD_READ
-                            | wasi::RIGHTS_FD_SEEK
-                            | wasi::RIGHTS_FD_FDSTAT_SET_FLAGS
-                            | wasi::RIGHTS_FD_SYNC
-                            | wasi::RIGHTS_FD_TELL
-                            | wasi::RIGHTS_FD_WRITE
-                            | wasi::RIGHTS_FD_ADVISE
-                            | wasi::RIGHTS_FD_ALLOCATE
-                            | wasi::RIGHTS_FD_FILESTAT_GET
-                            | wasi::RIGHTS_FD_FILESTAT_SET_SIZE
-                            | wasi::RIGHTS_FD_FILESTAT_SET_TIMES
-                            | wasi::RIGHTS_POLL_FD_READWRITE;
-
-                        stat.write(Fdstat {
-                            fs_filetype: wasi::FILETYPE_DIRECTORY,
-                            fs_flags: 0,
-                            fs_rights_base,
-                            fs_rights_inheriting,
-                        });
-                        Ok(())
-                    }
-                    _ => {
-                        let fs_filetype = type_.into();
+    State::with(|state| match state.descriptors().get(fd)? {
+        Descriptor::Streams(Streams {
+            type_: StreamType::File(file),
+            ..
+        }) => {
+            let flags = filesystem::get_flags(file.fd)?;
+            let type_ = filesystem::get_type(file.fd)?;
+            match type_ {
+                filesystem::DescriptorType::Directory => {
+                    // Hard-coded set of rights expected by many userlands:
+                    let fs_rights_base = wasi::RIGHTS_PATH_CREATE_DIRECTORY
+                        | wasi::RIGHTS_PATH_CREATE_FILE
+                        | wasi::RIGHTS_PATH_LINK_SOURCE
+                        | wasi::RIGHTS_PATH_LINK_TARGET
+                        | wasi::RIGHTS_PATH_OPEN
+                        | wasi::RIGHTS_FD_READDIR
+                        | wasi::RIGHTS_PATH_READLINK
+                        | wasi::RIGHTS_PATH_RENAME_SOURCE
+                        | wasi::RIGHTS_PATH_RENAME_TARGET
+                        | wasi::RIGHTS_PATH_SYMLINK
+                        | wasi::RIGHTS_PATH_REMOVE_DIRECTORY
+                        | wasi::RIGHTS_PATH_UNLINK_FILE
+                        | wasi::RIGHTS_PATH_FILESTAT_GET
+                        | wasi::RIGHTS_PATH_FILESTAT_SET_TIMES
+                        | wasi::RIGHTS_FD_FILESTAT_GET
+                        | wasi::RIGHTS_FD_FILESTAT_SET_TIMES;
+
+                    let fs_rights_inheriting = fs_rights_base
+                        | wasi::RIGHTS_FD_DATASYNC
+                        | wasi::RIGHTS_FD_READ
+                        | wasi::RIGHTS_FD_SEEK
+                        | wasi::RIGHTS_FD_FDSTAT_SET_FLAGS
+                        | wasi::RIGHTS_FD_SYNC
+                        | wasi::RIGHTS_FD_TELL
+                        | wasi::RIGHTS_FD_WRITE
+                        | wasi::RIGHTS_FD_ADVISE
+                        | wasi::RIGHTS_FD_ALLOCATE
+                        | wasi::RIGHTS_FD_FILESTAT_GET
+                        | wasi::RIGHTS_FD_FILESTAT_SET_SIZE
+                        | wasi::RIGHTS_FD_FILESTAT_SET_TIMES
+                        | wasi::RIGHTS_POLL_FD_READWRITE;
+
+                    stat.write(Fdstat {
+                        fs_filetype: wasi::FILETYPE_DIRECTORY,
+                        fs_flags: 0,
+                        fs_rights_base,
+                        fs_rights_inheriting,
+                    });
+                    Ok(())
+                }
+                _ => {
+                    let fs_filetype = type_.into();
 
-                        let mut fs_flags = 0;
-                        let mut fs_rights_base = !0;
-                        if !flags.contains(filesystem::DescriptorFlags::READ) {
-                            fs_rights_base &= !RIGHTS_FD_READ;
-                        }
-                        if !flags.contains(filesystem::DescriptorFlags::WRITE) {
-                            fs_rights_base &= !RIGHTS_FD_WRITE;
-                        }
-                        if flags.contains(filesystem::DescriptorFlags::DATA_INTEGRITY_SYNC) {
-                            fs_flags |= FDFLAGS_DSYNC;
-                        }
-                        if flags.contains(filesystem::DescriptorFlags::REQUESTED_WRITE_SYNC) {
-                            fs_flags |= FDFLAGS_RSYNC;
-                        }
-                        if flags.contains(filesystem::DescriptorFlags::FILE_INTEGRITY_SYNC) {
-                            fs_flags |= FDFLAGS_SYNC;
-                        }
-                        if file.append {
-                            fs_flags |= FDFLAGS_APPEND;
-                        }
-                        if matches!(file.blocking_mode, BlockingMode::NonBlocking) {
-                            fs_flags |= FDFLAGS_NONBLOCK;
-                        }
-                        let fs_rights_inheriting = fs_rights_base;
-
-                        stat.write(Fdstat {
-                            fs_filetype,
-                            fs_flags,
-                            fs_rights_base,
-                            fs_rights_inheriting,
-                        });
-                        Ok(())
+                    let mut fs_flags = 0;
+                    let mut fs_rights_base = !0;
+                    if !flags.contains(filesystem::DescriptorFlags::READ) {
+                        fs_rights_base &= !RIGHTS_FD_READ;
+                    }
+                    if !flags.contains(filesystem::DescriptorFlags::WRITE) {
+                        fs_rights_base &= !RIGHTS_FD_WRITE;
+                    }
+                    if flags.contains(filesystem::DescriptorFlags::DATA_INTEGRITY_SYNC) {
+                        fs_flags |= FDFLAGS_DSYNC;
                     }
+                    if flags.contains(filesystem::DescriptorFlags::REQUESTED_WRITE_SYNC) {
+                        fs_flags |= FDFLAGS_RSYNC;
+                    }
+                    if flags.contains(filesystem::DescriptorFlags::FILE_INTEGRITY_SYNC) {
+                        fs_flags |= FDFLAGS_SYNC;
+                    }
+                    if file.append {
+                        fs_flags |= FDFLAGS_APPEND;
+                    }
+                    if matches!(file.blocking_mode, BlockingMode::NonBlocking) {
+                        fs_flags |= FDFLAGS_NONBLOCK;
+                    }
+                    let fs_rights_inheriting = fs_rights_base;
+
+                    stat.write(Fdstat {
+                        fs_filetype,
+                        fs_flags,
+                        fs_rights_base,
+                        fs_rights_inheriting,
+                    });
+                    Ok(())
                 }
             }
-            Descriptor::Streams(Streams {
-                input,
-                output,
-                type_: StreamType::Stdio(isatty),
-            }) => {
-                let fs_flags = 0;
-                let mut fs_rights_base = 0;
-                if input.get().is_some() {
-                    fs_rights_base |= RIGHTS_FD_READ;
-                }
-                if output.get().is_some() {
-                    fs_rights_base |= RIGHTS_FD_WRITE;
-                }
-                let fs_rights_inheriting = fs_rights_base;
-                stat.write(Fdstat {
-                    fs_filetype: isatty.filetype(),
-                    fs_flags,
-                    fs_rights_base,
-                    fs_rights_inheriting,
-                });
-                Ok(())
+        }
+        Descriptor::Streams(Streams {
+            input,
+            output,
+            type_: StreamType::Stdio(isatty),
+        }) => {
+            let fs_flags = 0;
+            let mut fs_rights_base = 0;
+            if input.get().is_some() {
+                fs_rights_base |= RIGHTS_FD_READ;
             }
-            Descriptor::Closed(_) => Err(ERRNO_BADF),
-            Descriptor::Streams(Streams {
-                input: _,
-                output: _,
-                type_: StreamType::Socket(_),
-            }) => unreachable!(),
+            if output.get().is_some() {
+                fs_rights_base |= RIGHTS_FD_WRITE;
+            }
+            let fs_rights_inheriting = fs_rights_base;
+            stat.write(Fdstat {
+                fs_filetype: isatty.filetype(),
+                fs_flags,
+                fs_rights_base,
+                fs_rights_inheriting,
+            });
+            Ok(())
         }
+        Descriptor::Closed(_) => Err(ERRNO_BADF),
+        Descriptor::Streams(Streams {
+            input,
+            output,
+            type_: StreamType::Socket(_),
+        }) => unreachable!(),
     })
 }
 
@@ -622,15 +624,12 @@ pub unsafe extern "C" fn fd_fdstat_set_flags(fd: Fd, flags: Fdflags) -> Errno {
 #[no_mangle]
 pub unsafe extern "C" fn fd_fdstat_set_rights(
     fd: Fd,
-    _fs_rights_base: Rights,
-    _fs_rights_inheriting: Rights,
+    fs_rights_base: Rights,
+    fs_rights_inheriting: Rights,
 ) -> Errno {
-    State::with(|state| {
-        let ds = state.descriptors();
-        match ds.get(fd)? {
-            Descriptor::Streams(..) => Ok(()),
-            Descriptor::Closed(..) => Err(wasi::ERRNO_BADF),
-        }
+    State::with(|state| match state.descriptors().get(fd)? {
+        Descriptor::Streams(..) => Ok(()),
+        Descriptor::Closed(..) => Err(wasi::ERRNO_BADF),
     })
 }
 
@@ -644,8 +643,8 @@ pub unsafe extern "C" fn fd_filestat_get(fd: Fd, buf: *mut Filestat) -> Errno {
                 type_: StreamType::File(file),
                 ..
             }) => {
-                let stat = file.fd.stat()?;
-                let metadata_hash = file.fd.metadata_hash()?;
+                let stat = filesystem::stat(file.fd)?;
+                let metadata_hash = filesystem::metadata_hash(file.fd)?;
                 let filetype = stat.type_.into();
                 *buf = Filestat {
                     dev: 1,
@@ -688,7 +687,7 @@ pub unsafe extern "C" fn fd_filestat_set_size(fd: Fd, size: Filesize) -> Errno {
     State::with(|state| {
         let ds = state.descriptors();
         let file = ds.get_file(fd)?;
-        file.fd.set_size(size)?;
+        filesystem::set_size(file.fd, size)?;
         Ok(())
     })
 }
@@ -730,7 +729,7 @@ pub unsafe extern "C" fn fd_filestat_set_times(
         )?;
         let ds = state.descriptors();
         let file = ds.get_file(fd)?;
-        file.fd.set_times(atim, mtim)?;
+        filesystem::set_times(file.fd, atim, mtim)?;
         Ok(())
     })
 }
@@ -763,7 +762,7 @@ pub unsafe extern "C" fn fd_pread(
         let file = ds.get_file(fd)?;
         let (data, end) = state
             .import_alloc
-            .with_buffer(ptr, len, || file.fd.read(len as u64, offset))?;
+            .with_buffer(ptr, len, || filesystem::read(file.fd, len as u64, offset))?;
         assert_eq!(data.as_ptr(), ptr);
         assert!(data.len() <= len);
 
@@ -786,8 +785,7 @@ pub unsafe extern "C" fn fd_prestat_get(fd: Fd, buf: *mut Prestat) -> Errno {
         AllocationState::StackAllocated | AllocationState::StateAllocated
     ) {
         State::with(|state| {
-            let ds = state.descriptors();
-            if let Some(preopen) = ds.get_preopen(fd) {
+            if let Some(preopen) = state.descriptors().get_preopen(fd) {
                 buf.write(Prestat {
                     tag: 0,
                     u: PrestatU {
@@ -811,8 +809,7 @@ pub unsafe extern "C" fn fd_prestat_get(fd: Fd, buf: *mut Prestat) -> Errno {
 #[no_mangle]
 pub unsafe extern "C" fn fd_prestat_dir_name(fd: Fd, path: *mut u8, path_max_len: Size) -> Errno {
     State::with(|state| {
-        let ds = state.descriptors();
-        if let Some(preopen) = ds.get_preopen(fd) {
+        if let Some(preopen) = state.descriptors().get_preopen(fd) {
             if preopen.path.len > path_max_len as usize {
                 Err(ERRNO_NAMETOOLONG)
             } else {
@@ -851,7 +848,7 @@ pub unsafe extern "C" fn fd_pwrite(
     State::with(|state| {
         let ds = state.descriptors();
         let file = ds.get_seekable_file(fd)?;
-        let bytes = file.fd.write(slice::from_raw_parts(ptr, len), offset)?;
+        let bytes = filesystem::write(file.fd, slice::from_raw_parts(ptr, len), offset)?;
         *nwritten = bytes as usize;
         Ok(())
     })
@@ -880,8 +877,7 @@ pub unsafe extern "C" fn fd_read(
     let len = (*iovs_ptr).buf_len;
 
     State::with(|state| {
-        let ds = state.descriptors();
-        match ds.get(fd)? {
+        match state.descriptors().get(fd)? {
             Descriptor::Streams(streams) => {
                 let blocking_mode = if let StreamType::File(file) = &streams.type_ {
                     file.blocking_mode
@@ -891,19 +887,10 @@ pub unsafe extern "C" fn fd_read(
 
                 let read_len = u64::try_from(len).trapping_unwrap();
                 let wasi_stream = streams.get_read_stream()?;
-                let data = match state
+                let (data, stream_stat) = state
                     .import_alloc
                     .with_buffer(ptr, len, || blocking_mode.read(wasi_stream, read_len))
-                {
-                    Ok(data) => data,
-                    Err(streams::StreamError::Closed) => {
-                        *nread = 0;
-                        return Ok(());
-                    }
-                    Err(streams::StreamError::LastOperationFailed(e)) => {
-                        Err(stream_error_to_errno(e))?
-                    }
-                };
+                    .map_err(|_| ERRNO_IO)?;
 
                 assert_eq!(data.as_ptr(), ptr);
                 assert!(data.len() <= len);
@@ -912,28 +899,22 @@ pub unsafe extern "C" fn fd_read(
                 if let StreamType::File(file) = &streams.type_ {
                     file.position
                         .set(file.position.get() + data.len() as filesystem::Filesize);
-                    if len == 0 {
-                        return Err(ERRNO_INTR);
-                    }
                 }
 
                 let len = data.len();
-                *nread = len;
                 forget(data);
-                Ok(())
+                if stream_stat == crate::streams::StreamStatus::Open && len == 0 {
+                    Err(ERRNO_INTR)
+                } else {
+                    *nread = len;
+                    Ok(())
+                }
             }
             Descriptor::Closed(_) => Err(ERRNO_BADF),
         }
     })
 }
 
-fn stream_error_to_errno(err: streams::Error) -> Errno {
-    match filesystem::filesystem_error_code(&err) {
-        Some(code) => code.into(),
-        None => ERRNO_IO,
-    }
-}
-
 /// Read directory entries from a directory.
 /// When successful, the contents of the output buffer consist of a sequence of
 /// directory entries. Each directory entry consists of a `dirent` object,
@@ -989,7 +970,7 @@ pub unsafe extern "C" fn fd_readdir(
                     state,
                     cookie,
                     use_cache: true,
-                    dir_descriptor: &dir.fd,
+                    dir_descriptor: dir.fd,
                 }
             }
 
@@ -1003,8 +984,8 @@ pub unsafe extern "C" fn fd_readdir(
                     state,
                     cookie: wasi::DIRCOOKIE_START,
                     use_cache: false,
-                    stream: DirectoryEntryStream(dir.fd.read_directory()?),
-                    dir_descriptor: &dir.fd,
+                    stream: DirectoryEntryStream(filesystem::read_directory(dir.fd)?),
+                    dir_descriptor: dir.fd,
                 };
 
                 // Skip to the entry that is requested by the `cookie`
@@ -1083,7 +1064,7 @@ pub unsafe extern "C" fn fd_readdir(
         use_cache: bool,
         cookie: Dircookie,
         stream: DirectoryEntryStream,
-        dir_descriptor: &'a filesystem::Descriptor,
+        dir_descriptor: filesystem::Descriptor,
     }
 
     impl<'a> Iterator for DirectoryEntryIterator<'a> {
@@ -1100,7 +1081,7 @@ pub unsafe extern "C" fn fd_readdir(
             // Preview2 excludes them, so re-add them.
             match current_cookie {
                 0 => {
-                    let metadata_hash = match self.dir_descriptor.metadata_hash() {
+                    let metadata_hash = match filesystem::metadata_hash(self.dir_descriptor) {
                         Ok(h) => h,
                         Err(e) => return Some(Err(e.into())),
                     };
@@ -1138,7 +1119,7 @@ pub unsafe extern "C" fn fd_readdir(
             let entry = self.state.import_alloc.with_buffer(
                 self.state.path_buf.get().cast(),
                 PATH_MAX,
-                || self.stream.0.read_directory_entry(),
+                || filesystem::read_directory_entry(self.stream.0),
             );
             let entry = match entry {
                 Ok(Some(entry)) => entry,
@@ -1147,11 +1128,13 @@ pub unsafe extern "C" fn fd_readdir(
             };
 
             let filesystem::DirectoryEntry { type_, name } = entry;
-            let d_ino = self
-                .dir_descriptor
-                .metadata_hash_at(filesystem::PathFlags::empty(), &name)
-                .map(|h| h.lower)
-                .unwrap_or(0);
+            let d_ino = filesystem::metadata_hash_at(
+                self.dir_descriptor,
+                filesystem::PathFlags::empty(),
+                &name,
+            )
+            .map(|h| h.lower)
+            .unwrap_or(0);
             let name = ManuallyDrop::new(name);
             let dirent = wasi::Dirent {
                 d_next: self.cookie,
@@ -1193,11 +1176,11 @@ pub unsafe extern "C" fn fd_seek(
     newoffset: *mut Filesize,
 ) -> Errno {
     State::with(|state| {
-        let mut ds = state.descriptors_mut();
-        let stream = ds.get_seekable_stream_mut(fd)?;
+        let ds = state.descriptors();
+        let stream = ds.get_seekable_stream(fd)?;
 
         // Seeking only works on files.
-        if let StreamType::File(file) = &mut stream.type_ {
+        if let StreamType::File(file) = &stream.type_ {
             if let filesystem::DescriptorType::Directory = file.descriptor_type {
                 // This isn't really the "right" errno, but it is consistient with wasmtime's
                 // preview 1 tests.
@@ -1209,14 +1192,14 @@ pub unsafe extern "C" fn fd_seek(
                     Some(pos) if pos >= 0 => pos,
                     _ => return Err(ERRNO_INVAL),
                 },
-                WHENCE_END => match (file.fd.stat()?.size as i64).checked_add(offset) {
+                WHENCE_END => match (filesystem::stat(file.fd)?.size as i64).checked_add(offset) {
                     Some(pos) if pos >= 0 => pos,
                     _ => return Err(ERRNO_INVAL),
                 },
                 _ => return Err(ERRNO_INVAL),
             };
-            drop(stream.input.take());
-            drop(stream.output.take());
+            stream.input.set(None);
+            stream.output.set(None);
             file.position.set(from as filesystem::Filesize);
             *newoffset = from as filesystem::Filesize;
             Ok(())
@@ -1233,7 +1216,7 @@ pub unsafe extern "C" fn fd_sync(fd: Fd) -> Errno {
     State::with(|state| {
         let ds = state.descriptors();
         let file = ds.get_file(fd)?;
-        file.fd.sync()?;
+        filesystem::sync(file.fd)?;
         Ok(())
     })
 }
@@ -1326,7 +1309,7 @@ pub unsafe extern "C" fn path_create_directory(
     State::with(|state| {
         let ds = state.descriptors();
         let file = ds.get_dir(fd)?;
-        file.fd.create_directory_at(path)?;
+        filesystem::create_directory_at(file.fd, path)?;
         Ok(())
     })
 }
@@ -1347,8 +1330,8 @@ pub unsafe extern "C" fn path_filestat_get(
     State::with(|state| {
         let ds = state.descriptors();
         let file = ds.get_dir(fd)?;
-        let stat = file.fd.stat_at(at_flags, path)?;
-        let metadata_hash = file.fd.metadata_hash_at(at_flags, path)?;
+        let stat = filesystem::stat_at(file.fd, at_flags, path)?;
+        let metadata_hash = filesystem::metadata_hash_at(file.fd, at_flags, path)?;
         let filetype = stat.type_.into();
         *buf = Filestat {
             dev: 1,
@@ -1393,7 +1376,7 @@ pub unsafe extern "C" fn path_filestat_set_times(
 
         let ds = state.descriptors();
         let file = ds.get_dir(fd)?;
-        file.fd.set_times_at(at_flags, path, atim, mtim)?;
+        filesystem::set_times_at(file.fd, at_flags, path, atim, mtim)?;
         Ok(())
     })
 }
@@ -1415,10 +1398,9 @@ pub unsafe extern "C" fn path_link(
     let at_flags = at_flags_from_lookupflags(old_flags);
 
     State::with(|state| {
-        let ds = state.descriptors();
-        let old = &ds.get_dir(old_fd)?.fd;
-        let new = &ds.get_dir(new_fd)?.fd;
-        old.link_at(at_flags, old_path, new, new_path)?;
+        let old = state.descriptors().get_dir(old_fd)?.fd;
+        let new = state.descriptors().get_dir(new_fd)?.fd;
+        filesystem::link_at(old, at_flags, old_path, new, new_path)?;
         Ok(())
     })
 }
@@ -1452,15 +1434,13 @@ pub unsafe extern "C" fn path_open(
     let append = fdflags & wasi::FDFLAGS_APPEND == wasi::FDFLAGS_APPEND;
 
     State::with(|state| {
-        let result = state
-            .descriptors()
-            .get_dir(fd)?
-            .fd
-            .open_at(at_flags, path, o_flags, flags, mode)?;
-        let descriptor_type = result.get_type()?;
+        let mut ds = state.descriptors_mut();
+        let file = ds.get_dir(fd)?;
+        let result = filesystem::open_at(file.fd, at_flags, path, o_flags, flags, mode)?;
+        let descriptor_type = filesystem::get_type(result)?;
         let desc = Descriptor::Streams(Streams {
-            input: OnceCell::new(),
-            output: OnceCell::new(),
+            input: Cell::new(None),
+            output: Cell::new(None),
             type_: StreamType::File(File {
                 fd: result,
                 descriptor_type,
@@ -1474,7 +1454,7 @@ pub unsafe extern "C" fn path_open(
             }),
         });
 
-        let fd = state.descriptors_mut().open(desc)?;
+        let fd = ds.open(desc)?;
         *opened_fd = fd;
         Ok(())
     })
@@ -1505,12 +1485,12 @@ pub unsafe extern "C" fn path_readlink(
             state
                 .import_alloc
                 .with_buffer(state.path_buf.get().cast(), PATH_MAX, || {
-                    file.fd.readlink_at(path)
+                    filesystem::readlink_at(file.fd, path)
                 })?
         } else {
             state
                 .import_alloc
-                .with_buffer(buf, buf_len, || file.fd.readlink_at(path))?
+                .with_buffer(buf, buf_len, || filesystem::readlink_at(file.fd, path))?
         };
 
         if use_state_buf {
@@ -1545,7 +1525,7 @@ pub unsafe extern "C" fn path_remove_directory(
     State::with(|state| {
         let ds = state.descriptors();
         let file = ds.get_dir(fd)?;
-        file.fd.remove_directory_at(path)?;
+        filesystem::remove_directory_at(file.fd, path)?;
         Ok(())
     })
 }
@@ -1566,9 +1546,9 @@ pub unsafe extern "C" fn path_rename(
 
     State::with(|state| {
         let ds = state.descriptors();
-        let old = &ds.get_dir(old_fd)?.fd;
-        let new = &ds.get_dir(new_fd)?.fd;
-        old.rename_at(old_path, new, new_path)?;
+        let old = ds.get_dir(old_fd)?.fd;
+        let new = ds.get_dir(new_fd)?.fd;
+        filesystem::rename_at(old, old_path, new, new_path)?;
         Ok(())
     })
 }
@@ -1589,7 +1569,7 @@ pub unsafe extern "C" fn path_symlink(
     State::with(|state| {
         let ds = state.descriptors();
         let file = ds.get_dir(fd)?;
-        file.fd.symlink_at(old_path, new_path)?;
+        filesystem::symlink_at(file.fd, old_path, new_path)?;
         Ok(())
     })
 }
@@ -1604,7 +1584,7 @@ pub unsafe extern "C" fn path_unlink_file(fd: Fd, path_ptr: *const u8, path_len:
     State::with(|state| {
         let ds = state.descriptors();
         let file = ds.get_dir(fd)?;
-        file.fd.unlink_file_at(path)?;
+        filesystem::unlink_file_at(file.fd, path)?;
         Ok(())
     })
 }
@@ -1618,22 +1598,15 @@ struct Pollables {
 impl Pollables {
     unsafe fn push(&mut self, pollable: Pollable) {
         assert!(self.index < self.length);
-        // Use `ptr::write` instead of `*... = pollable` because `ptr::write`
-        // doesn't call drop on the old memory.
-        self.pointer.add(self.index).write(pollable);
+        *self.pointer.add(self.index) = pollable;
         self.index += 1;
     }
 }
 
-// We create new pollable handles for each `poll_oneoff` call, so drop them all
-// after the call.
 impl Drop for Pollables {
     fn drop(&mut self) {
-        while self.index != 0 {
-            self.index -= 1;
-            unsafe {
-                core::ptr::drop_in_place(self.pointer.add(self.index));
-            }
+        for i in 0..self.index {
+            poll::drop_pollable(unsafe { *self.pointer.add(i) })
         }
     }
 }
@@ -1676,7 +1649,7 @@ pub unsafe extern "C" fn poll_oneoff(
     //
     // First, we assert that this is possible:
     assert!(align_of::<Event>() >= align_of::<Pollable>());
-    assert!(align_of::<Pollable>() >= align_of::<u32>());
+    assert!(align_of::<Pollable>() >= align_of::<u8>());
     assert!(
         nsubscriptions
             .checked_mul(size_of::<Event>())
@@ -1686,7 +1659,7 @@ pub unsafe extern "C" fn poll_oneoff(
                 .trapping_unwrap()
                 .checked_add(
                     nsubscriptions
-                        .checked_mul(size_of::<u32>())
+                        .checked_mul(size_of::<u8>())
                         .trapping_unwrap()
                 )
                 .trapping_unwrap()
@@ -1694,7 +1667,7 @@ pub unsafe extern "C" fn poll_oneoff(
     // Store the pollable handles at the beginning, and the bool results at the
     // end, so that we don't clobber the bool results when writting the events.
     let pollables = out as *mut c_void as *mut Pollable;
-    let results = out.add(nsubscriptions).cast::<u32>().sub(nsubscriptions);
+    let results = out.add(nsubscriptions).cast::<u8>().sub(nsubscriptions);
 
     // Indefinite sleeping is not supported in preview1.
     if nsubscriptions == 0 {
@@ -1751,72 +1724,78 @@ pub unsafe extern "C" fn poll_oneoff(
                             monotonic_clock::subscribe(timeout, false)
                         }
 
-                        CLOCKID_MONOTONIC => {
-                            let s = monotonic_clock::subscribe(clock.timeout, absolute);
-                            s
-                        }
+                        CLOCKID_MONOTONIC => monotonic_clock::subscribe(clock.timeout, absolute),
 
                         _ => return Err(ERRNO_INVAL),
                     }
                 }
 
-                EVENTTYPE_FD_READ => state
-                    .descriptors()
-                    .get_read_stream(subscription.u.u.fd_read.file_descriptor)
-                    .map(|stream| stream.subscribe())?,
+                EVENTTYPE_FD_READ => {
+                    let stream = state
+                        .descriptors()
+                        .get_read_stream(subscription.u.u.fd_read.file_descriptor)?;
+                    streams::subscribe_to_input_stream(stream)
+                }
 
-                EVENTTYPE_FD_WRITE => state
-                    .descriptors()
-                    .get_write_stream(subscription.u.u.fd_write.file_descriptor)
-                    .map(|stream| stream.subscribe())?,
+                EVENTTYPE_FD_WRITE => {
+                    let stream = state
+                        .descriptors()
+                        .get_write_stream(subscription.u.u.fd_write.file_descriptor)?;
+                    streams::subscribe_to_output_stream(stream)
+                }
 
                 _ => return Err(ERRNO_INVAL),
             });
         }
 
-        #[link(wasm_import_module = "wasi:io/poll@0.2.0-rc-2023-11-05")]
-        #[allow(improper_ctypes)] // FIXME(bytecodealliance/wit-bindgen#684)
+        #[link(wasm_import_module = "wasi:poll/poll")]
         extern "C" {
-            #[link_name = "poll-list"]
-            fn poll_list_import(pollables: *const Pollable, len: usize, rval: *mut ReadyList);
+            #[link_name = "poll-oneoff"]
+            fn poll_oneoff_import(pollables: *const Pollable, len: usize, rval: *mut BoolList);
         }
-        let mut ready_list = ReadyList {
+        let mut ready_list = BoolList {
             base: std::ptr::null(),
             len: 0,
         };
 
         state.import_alloc.with_buffer(
-            results.cast(),
+            results,
             nsubscriptions
-                .checked_mul(size_of::<u32>())
+                .checked_mul(size_of::<bool>())
                 .trapping_unwrap(),
             || {
-                poll_list_import(
+                poll_oneoff_import(
                     pollables.pointer,
                     pollables.length,
                     &mut ready_list as *mut _,
-                );
+                )
             },
         );
 
-        assert!(ready_list.len <= nsubscriptions);
-        assert_eq!(ready_list.base, results as *const u32);
+        assert_eq!(ready_list.len, nsubscriptions);
+        assert_eq!(ready_list.base, results as *const bool);
 
         drop(pollables);
 
-        let ready = std::slice::from_raw_parts(ready_list.base, ready_list.len);
+        let ready = subscriptions
+            .iter()
+            .enumerate()
+            .filter_map(|(i, s)| (*ready_list.base.add(i)).then_some(s));
 
         let mut count = 0;
 
         for subscription in ready {
-            let subscription = *subscriptions.as_ptr().add(*subscription as usize);
-
+            let error;
             let type_;
+            let nbytes;
+            let flags;
 
-            let (error, nbytes, flags) = match subscription.u.tag {
+            match subscription.u.tag {
                 EVENTTYPE_CLOCK => {
+                    error = ERRNO_SUCCESS;
                     type_ = wasi::EVENTTYPE_CLOCK;
-                    (ERRNO_SUCCESS, 0, 0)
+                    nbytes = 0;
+                    flags = 0;
                 }
 
                 EVENTTYPE_FD_READ => {
@@ -1827,41 +1806,48 @@ pub unsafe extern "C" fn poll_oneoff(
                         .trapping_unwrap();
                     match desc {
                         Descriptor::Streams(streams) => match &streams.type_ {
-                            StreamType::File(file) => match file.fd.stat() {
+                            StreamType::File(file) => match filesystem::stat(file.fd) {
                                 Ok(stat) => {
-                                    let nbytes = stat.size.saturating_sub(file.position.get());
-                                    (
-                                        ERRNO_SUCCESS,
-                                        nbytes,
-                                        if nbytes == 0 {
-                                            EVENTRWFLAGS_FD_READWRITE_HANGUP
-                                        } else {
-                                            0
-                                        },
-                                    )
+                                    error = ERRNO_SUCCESS;
+                                    nbytes = stat.size.saturating_sub(file.position.get());
+                                    flags = if nbytes == 0 {
+                                        EVENTRWFLAGS_FD_READWRITE_HANGUP
+                                    } else {
+                                        0
+                                    };
+                                }
+                                Err(e) => {
+                                    error = e.into();
+                                    nbytes = 1;
+                                    flags = 0;
                                 }
-                                Err(e) => (e.into(), 1, 0),
                             },
-                            StreamType::Socket(_connection) => {
+                            StreamType::Socket(connection) => {
                                 unreachable!() // TODO
                                                /*
                                                match tcp::bytes_readable(*connection) {
-                                                   Ok(result) => (
-                                                       ERRNO_SUCCESS,
-                                                       result.0,
-                                                       if result.1 {
+                                                   Ok(result) => {
+                                                       error = ERRNO_SUCCESS;
+                                                       nbytes = result.0;
+                                                       flags = if result.1 {
                                                            EVENTRWFLAGS_FD_READWRITE_HANGUP
                                                        } else {
                                                            0
-                                                       }
-                                                   )
+                                                       };
+                                                   }
                                                    Err(e) => {
-                                                       (e.into(), 1, 0)
+                                                       error = e.into();
+                                                       nbytes = 0;
+                                                       flags = 0;
                                                    }
                                                }
                                                */
                             }
-                            StreamType::Stdio(_) => (ERRNO_SUCCESS, 1, 0),
+                            StreamType::Stdio(_) => {
+                                error = ERRNO_SUCCESS;
+                                nbytes = 1;
+                                flags = 0;
+                            }
                         },
                         _ => unreachable!(),
                     }
@@ -1873,23 +1859,29 @@ pub unsafe extern "C" fn poll_oneoff(
                         .get(subscription.u.u.fd_write.file_descriptor)
                         .trapping_unwrap();
                     match desc {
-                        Descriptor::Streams(streams) => match &streams.type_ {
-                            StreamType::File(_) | StreamType::Stdio(_) => (ERRNO_SUCCESS, 1, 0),
-                            StreamType::Socket(_connection) => {
+                        Descriptor::Streams(streams) => match streams.type_ {
+                            StreamType::File(_) | StreamType::Stdio(_) => {
+                                error = ERRNO_SUCCESS;
+                                nbytes = 1;
+                                flags = 0;
+                            }
+                            StreamType::Socket(connection) => {
                                 unreachable!() // TODO
                                                /*
                                                match tcp::bytes_writable(connection) {
-                                                   Ok(result) => (
-                                                       ERRNO_SUCCESS,
-                                                       result.0,
-                                                       if result.1 {
+                                                   Ok(result) => {
+                                                       error = ERRNO_SUCCESS;
+                                                       nbytes = result.0;
+                                                       flags = if result.1 {
                                                            EVENTRWFLAGS_FD_READWRITE_HANGUP
                                                        } else {
-                                                            0
-                                                       }
-                                                   )
+                                                           0
+                                                       };
+                                                   }
                                                    Err(e) => {
-                                                       (e.into(), 0, 0)
+                                                       error = e.into();
+                                                       nbytes = 0;
+                                                       flags = 0;
                                                    }
                                                }
                                                */
@@ -1900,7 +1892,7 @@ pub unsafe extern "C" fn poll_oneoff(
                 }
 
                 _ => unreachable!(),
-            };
+            }
 
             *out.add(count) = Event {
                 userdata: subscription.userdata,
@@ -1931,7 +1923,7 @@ pub unsafe extern "C" fn proc_exit(rval: Exitcode) -> ! {
 /// Send a signal to the process of the calling thread.
 /// Note: This is similar to `raise` in POSIX.
 #[no_mangle]
-pub unsafe extern "C" fn proc_raise(_sig: Signal) -> Errno {
+pub unsafe extern "C" fn proc_raise(sig: Signal) -> Errno {
     unreachable!()
 }
 
@@ -1977,7 +1969,7 @@ pub unsafe extern "C" fn random_get(buf: *mut u8, buf_len: Size) -> Errno {
 /// Accept a new incoming connection.
 /// Note: This is similar to `accept` in POSIX.
 #[no_mangle]
-pub unsafe extern "C" fn sock_accept(_fd: Fd, _flags: Fdflags, _connection: *mut Fd) -> Errno {
+pub unsafe extern "C" fn sock_accept(fd: Fd, flags: Fdflags, connection: *mut Fd) -> Errno {
     unreachable!()
 }
 
@@ -1986,12 +1978,12 @@ pub unsafe extern "C" fn sock_accept(_fd: Fd, _flags: Fdflags, _connection: *mut
 /// the data into multiple buffers in the manner of `readv`.
 #[no_mangle]
 pub unsafe extern "C" fn sock_recv(
-    _fd: Fd,
-    _ri_data_ptr: *const Iovec,
-    _ri_data_len: usize,
-    _ri_flags: Riflags,
-    _ro_datalen: *mut Size,
-    _ro_flags: *mut Roflags,
+    fd: Fd,
+    ri_data_ptr: *const Iovec,
+    ri_data_len: usize,
+    ri_flags: Riflags,
+    ro_datalen: *mut Size,
+    ro_flags: *mut Roflags,
 ) -> Errno {
     unreachable!()
 }
@@ -2001,11 +1993,11 @@ pub unsafe extern "C" fn sock_recv(
 /// the data from multiple buffers in the manner of `writev`.
 #[no_mangle]
 pub unsafe extern "C" fn sock_send(
-    _fd: Fd,
-    _si_data_ptr: *const Ciovec,
-    _si_data_len: usize,
-    _si_flags: Siflags,
-    _so_datalen: *mut Size,
+    fd: Fd,
+    si_data_ptr: *const Ciovec,
+    si_data_len: usize,
+    si_flags: Siflags,
+    so_datalen: *mut Size,
 ) -> Errno {
     unreachable!()
 }
@@ -2013,16 +2005,12 @@ pub unsafe extern "C" fn sock_send(
 /// Shut down socket send and receive channels.
 /// Note: This is similar to `shutdown` in POSIX.
 #[no_mangle]
-pub unsafe extern "C" fn sock_shutdown(_fd: Fd, _how: Sdflags) -> Errno {
+pub unsafe extern "C" fn sock_shutdown(fd: Fd, how: Sdflags) -> Errno {
     unreachable!()
 }
 
-fn datetime_to_timestamp(datetime: Option<filesystem::Datetime>) -> Timestamp {
-    match datetime {
-        Some(datetime) => u64::from(datetime.nanoseconds)
-            .saturating_add(datetime.seconds.saturating_mul(1_000_000_000)),
-        None => 0,
-    }
+fn datetime_to_timestamp(datetime: filesystem::Datetime) -> Timestamp {
+    u64::from(datetime.nanoseconds).saturating_add(datetime.seconds.saturating_mul(1_000_000_000))
 }
 
 fn at_flags_from_lookupflags(flags: Lookupflags) -> filesystem::PathFlags {
@@ -2147,19 +2135,15 @@ impl BlockingMode {
     // breaking our fragile linking scheme
     fn read(
         self,
-        input_stream: &streams::InputStream,
+        input_stream: streams::InputStream,
         read_len: u64,
-    ) -> Result<Vec<u8>, streams::StreamError> {
+    ) -> Result<(Vec<u8>, streams::StreamStatus), ()> {
         match self {
-            BlockingMode::NonBlocking => input_stream.read(read_len),
-            BlockingMode::Blocking => input_stream.blocking_read(read_len),
+            BlockingMode::NonBlocking => streams::read(input_stream, read_len),
+            BlockingMode::Blocking => streams::blocking_read(input_stream, read_len),
         }
     }
-    fn write(
-        self,
-        output_stream: &streams::OutputStream,
-        mut bytes: &[u8],
-    ) -> Result<usize, Errno> {
+    fn write(self, output_stream: streams::OutputStream, mut bytes: &[u8]) -> Result<usize, Errno> {
         match self {
             BlockingMode::Blocking => {
                 let total = bytes.len();
@@ -2167,24 +2151,19 @@ impl BlockingMode {
                     let len = bytes.len().min(4096);
                     let (chunk, rest) = bytes.split_at(len);
                     bytes = rest;
-                    match output_stream.blocking_write_and_flush(chunk) {
+                    match streams::blocking_write_and_flush(output_stream, chunk) {
                         Ok(()) => {}
-                        Err(streams::StreamError::Closed) => return Err(ERRNO_IO),
-                        Err(streams::StreamError::LastOperationFailed(e)) => {
-                            return Err(stream_error_to_errno(e))
-                        }
+                        Err(_) => return Err(ERRNO_IO),
                     }
                 }
                 Ok(total)
             }
 
             BlockingMode::NonBlocking => {
-                let permit = match output_stream.check_write() {
+                let permit = match streams::check_write(output_stream) {
                     Ok(n) => n,
-                    Err(streams::StreamError::Closed) => 0,
-                    Err(streams::StreamError::LastOperationFailed(e)) => {
-                        return Err(stream_error_to_errno(e))
-                    }
+                    Err(streams::WriteError::Closed) => 0,
+                    Err(streams::WriteError::LastOperationFailed) => return Err(ERRNO_IO),
                 };
 
                 let len = bytes.len().min(permit as usize);
@@ -2192,20 +2171,16 @@ impl BlockingMode {
                     return Ok(0);
                 }
 
-                match output_stream.write(&bytes[..len]) {
+                match streams::write(output_stream, &bytes[..len]) {
                     Ok(_) => {}
-                    Err(streams::StreamError::Closed) => return Ok(0),
-                    Err(streams::StreamError::LastOperationFailed(e)) => {
-                        return Err(stream_error_to_errno(e))
-                    }
+                    Err(streams::WriteError::Closed) => return Ok(0),
+                    Err(streams::WriteError::LastOperationFailed) => return Err(ERRNO_IO),
                 }
 
-                match output_stream.blocking_flush() {
+                match streams::blocking_flush(output_stream) {
                     Ok(_) => {}
-                    Err(streams::StreamError::Closed) => return Ok(0),
-                    Err(streams::StreamError::LastOperationFailed(e)) => {
-                        return Err(stream_error_to_errno(e))
-                    }
+                    Err(streams::WriteError::Closed) => return Ok(0),
+                    Err(streams::WriteError::LastOperationFailed) => return Err(ERRNO_IO),
                 }
 
                 Ok(len)
@@ -2313,6 +2288,12 @@ struct DirentCache {
 
 struct DirectoryEntryStream(filesystem::DirectoryEntryStream);
 
+impl Drop for DirectoryEntryStream {
+    fn drop(&mut self) {
+        filesystem::drop_directory_entry_stream(self.0);
+    }
+}
+
 #[repr(C)]
 pub struct WasmStr {
     ptr: *const u8,
@@ -2340,8 +2321,8 @@ pub struct StrTupleList {
 
 #[derive(Copy, Clone)]
 #[repr(C)]
-pub struct ReadyList {
-    base: *const u32,
+pub struct BoolList {
+    base: *const bool,
     len: usize,
 }
 
@@ -2356,7 +2337,7 @@ const fn bump_arena_size() -> usize {
     start -= size_of::<DirentCache>();
 
     // Remove miscellaneous metadata also stored in state.
-    start -= 14 * size_of::<usize>();
+    start -= 16 * size_of::<usize>();
 
     // Everything else is the `command_data` allocation.
     start
@@ -2367,7 +2348,7 @@ const fn bump_arena_size() -> usize {
 // below.
 #[cfg(target_arch = "wasm32")]
 const _: () = {
-    let _size_assert: [(); PAGE_SIZE] = [(); size_of::<State>()];
+    let _size_assert: [(); PAGE_SIZE] = [(); size_of::<RefCell<State>>()];
 };
 
 #[allow(unused)]
@@ -2382,25 +2363,28 @@ enum AllocationState {
 
 #[allow(improper_ctypes)]
 extern "C" {
-    fn get_state_ptr() -> *const State;
-    fn set_state_ptr(state: *const State);
+    fn get_state_ptr() -> *const RefCell<State>;
+    fn set_state_ptr(state: *const RefCell<State>);
     fn get_allocation_state() -> AllocationState;
     fn set_allocation_state(state: AllocationState);
+    fn get_stderr_stream() -> Fd;
+    fn set_stderr_stream(fd: Fd);
 }
 
 impl State {
     fn with(f: impl FnOnce(&State) -> Result<(), Errno>) -> Errno {
-        let state_ref = State::ptr();
-        assert_eq!(state_ref.magic1, MAGIC);
-        assert_eq!(state_ref.magic2, MAGIC);
-        let ret = f(state_ref);
+        let ptr = State::ptr();
+        let ptr = ptr.try_borrow().unwrap_or_else(|_| unreachable!());
+        assert_eq!(ptr.magic1, MAGIC);
+        assert_eq!(ptr.magic2, MAGIC);
+        let ret = f(&*ptr);
         match ret {
             Ok(()) => ERRNO_SUCCESS,
             Err(err) => err,
         }
     }
 
-    fn ptr() -> &'static State {
+    fn ptr() -> &'static RefCell<State> {
         unsafe {
             let mut ptr = get_state_ptr();
             if ptr.is_null() {
@@ -2412,7 +2396,7 @@ impl State {
     }
 
     #[cold]
-    fn new() -> &'static State {
+    fn new() -> &'static RefCell<State> {
         #[link(wasm_import_module = "__main_module__")]
         extern "C" {
             fn cabi_realloc(
@@ -2434,15 +2418,15 @@ impl State {
             cabi_realloc(
                 ptr::null_mut(),
                 0,
-                mem::align_of::<UnsafeCell<State>>(),
-                mem::size_of::<UnsafeCell<State>>(),
-            ) as *mut State
+                mem::align_of::<RefCell<State>>(),
+                mem::size_of::<RefCell<State>>(),
+            ) as *mut RefCell<State>
         };
 
         unsafe { set_allocation_state(AllocationState::StateAllocated) };
 
         unsafe {
-            ret.write(State {
+            ret.write(RefCell::new(State {
                 magic1: MAGIC,
                 magic2: MAGIC,
                 import_alloc: ImportAlloc::new(),
@@ -2464,7 +2448,7 @@ impl State {
                     path_data: UnsafeCell::new(MaybeUninit::uninit()),
                 },
                 dotdot: [UnsafeCell::new(b'.'), UnsafeCell::new(b'.')],
-            });
+            }));
             &*ret
         }
     }
@@ -2495,7 +2479,7 @@ impl State {
 
     fn get_environment(&self) -> &[StrTuple] {
         if self.env_vars.get().is_none() {
-            #[link(wasm_import_module = "wasi:cli/environment@0.2.0-rc-2023-11-05")]
+            #[link(wasm_import_module = "wasi:cli/environment")]
             extern "C" {
                 #[link_name = "get-environment"]
                 fn get_environment_import(rval: *mut StrTupleList);
@@ -2519,7 +2503,7 @@ impl State {
 
     fn get_args(&self) -> &[WasmStr] {
         if self.args.get().is_none() {
-            #[link(wasm_import_module = "wasi:cli/environment@0.2.0-rc-2023-11-05")]
+            #[link(wasm_import_module = "wasi:cli/environment")]
             extern "C" {
                 #[link_name = "get-arguments"]
                 fn get_args_import(rval: *mut WasmStrList);
diff --git a/crates/wasi-preview1-component-adapter/src/macros.rs b/crates/wasi-preview1-component-adapter/src/macros.rs
index c1ec4a515f2a..ca46aacacf1c 100644
--- a/crates/wasi-preview1-component-adapter/src/macros.rs
+++ b/crates/wasi-preview1-component-adapter/src/macros.rs
@@ -3,12 +3,12 @@
 //! We're avoiding static initializers, so we can't have things like string
 //! literals. Replace the standard assert macros with simpler implementations.
 
-use crate::bindings::wasi::cli::stderr::get_stderr;
+use crate::bindings::wasi::io::streams;
 
 #[allow(dead_code)]
 #[doc(hidden)]
 pub fn print(message: &[u8]) {
-    let _ = get_stderr().blocking_write_and_flush(message);
+    let _ = unsafe { streams::write(crate::get_stderr_stream(), message) };
 }
 
 /// A minimal `eprint` for debugging.
diff --git a/crates/wasi/Cargo.toml b/crates/wasi/Cargo.toml
index 9657139a2490..5bc3b63cf8b0 100644
--- a/crates/wasi/Cargo.toml
+++ b/crates/wasi/Cargo.toml
@@ -21,8 +21,6 @@ wasi-tokio = { workspace = true, optional = true }
 wiggle = { workspace = true, optional = true }
 libc = { workspace = true }
 once_cell = { workspace = true }
-log = { workspace = true }
-url = { workspace = true }
 
 tokio = { workspace = true, optional = true, features = ["time", "sync", "io-std", "io-util", "rt", "rt-multi-thread", "net"] }
 bytes = { workspace = true }
@@ -35,6 +33,7 @@ cap-net-ext = { workspace = true, optional = true }
 cap-time-ext = { workspace = true, optional = true }
 io-lifetimes = { workspace = true, optional = true }
 fs-set-times = { workspace = true, optional = true }
+is-terminal = { workspace = true, optional = true }
 bitflags = { workspace = true, optional = true }
 async-trait = { workspace = true, optional = true }
 system-interface = { workspace = true, optional = true}
@@ -44,9 +43,6 @@ futures = { workspace = true, optional = true }
 tokio = { workspace = true, features = ["time", "sync", "io-std", "io-util", "rt", "rt-multi-thread", "net", "macros"] }
 test-log = { workspace = true }
 tracing-subscriber = { workspace = true }
-test-programs-artifacts = { workspace = true }
-tempfile = { workspace = true }
-wasmtime = { workspace = true, features = ['cranelift'] }
 
 [target.'cfg(unix)'.dependencies]
 rustix = { workspace = true, features = ["event", "fs", "net"], optional = true }
@@ -76,6 +72,7 @@ preview2 = [
     'dep:cap-time-ext',
     'dep:io-lifetimes',
     'dep:fs-set-times',
+    'dep:is-terminal',
     'dep:bitflags',
     'dep:async-trait',
     'dep:system-interface',
diff --git a/crates/wasi/src/preview2/command.rs b/crates/wasi/src/preview2/command.rs
index 898311157354..1ba80b93923c 100644
--- a/crates/wasi/src/preview2/command.rs
+++ b/crates/wasi/src/preview2/command.rs
@@ -4,12 +4,16 @@ wasmtime::component::bindgen!({
     world: "wasi:cli/command",
     tracing: true,
     async: true,
+    trappable_error_type: {
+        "wasi:filesystem/types"::"error-code": Error,
+        "wasi:sockets/tcp"::"error-code": Error,
+    },
     with: {
        "wasi:filesystem/types": crate::preview2::bindings::filesystem::types,
        "wasi:filesystem/preopens": crate::preview2::bindings::filesystem::preopens,
        "wasi:sockets/tcp": crate::preview2::bindings::sockets::tcp,
        "wasi:clocks/monotonic_clock": crate::preview2::bindings::clocks::monotonic_clock,
-       "wasi:io/poll": crate::preview2::bindings::io::poll,
+       "wasi:poll/poll": crate::preview2::bindings::poll::poll,
        "wasi:io/streams": crate::preview2::bindings::io::streams,
        "wasi:clocks/timezone": crate::preview2::bindings::clocks::timezone,
        "wasi:clocks/wall_clock": crate::preview2::bindings::clocks::wall_clock,
@@ -33,7 +37,7 @@ pub fn add_to_linker<T: WasiView>(l: &mut wasmtime::component::Linker<T>) -> any
     crate::preview2::bindings::clocks::timezone::add_to_linker(l, |t| t)?;
     crate::preview2::bindings::filesystem::types::add_to_linker(l, |t| t)?;
     crate::preview2::bindings::filesystem::preopens::add_to_linker(l, |t| t)?;
-    crate::preview2::bindings::io::poll::add_to_linker(l, |t| t)?;
+    crate::preview2::bindings::poll::poll::add_to_linker(l, |t| t)?;
     crate::preview2::bindings::io::streams::add_to_linker(l, |t| t)?;
     crate::preview2::bindings::random::random::add_to_linker(l, |t| t)?;
     crate::preview2::bindings::cli::exit::add_to_linker(l, |t| t)?;
@@ -48,11 +52,8 @@ pub fn add_to_linker<T: WasiView>(l: &mut wasmtime::component::Linker<T>) -> any
     crate::preview2::bindings::cli::terminal_stderr::add_to_linker(l, |t| t)?;
     crate::preview2::bindings::sockets::tcp::add_to_linker(l, |t| t)?;
     crate::preview2::bindings::sockets::tcp_create_socket::add_to_linker(l, |t| t)?;
-    crate::preview2::bindings::sockets::udp::add_to_linker(l, |t| t)?;
-    crate::preview2::bindings::sockets::udp_create_socket::add_to_linker(l, |t| t)?;
     crate::preview2::bindings::sockets::instance_network::add_to_linker(l, |t| t)?;
     crate::preview2::bindings::sockets::network::add_to_linker(l, |t| t)?;
-    crate::preview2::bindings::sockets::ip_name_lookup::add_to_linker(l, |t| t)?;
     Ok(())
 }
 
@@ -63,13 +64,16 @@ pub mod sync {
         world: "wasi:cli/command",
         tracing: true,
         async: false,
+        trappable_error_type: {
+            "wasi:filesystem/types"::"error-code": Error,
+            "wasi:sockets/tcp"::"error-code": Error,
+        },
         with: {
            "wasi:filesystem/types": crate::preview2::bindings::sync_io::filesystem::types,
            "wasi:filesystem/preopens": crate::preview2::bindings::filesystem::preopens,
            "wasi:sockets/tcp": crate::preview2::bindings::sockets::tcp,
-           "wasi:sockets/udp": crate::preview2::bindings::sockets::udp,
            "wasi:clocks/monotonic_clock": crate::preview2::bindings::clocks::monotonic_clock,
-           "wasi:io/poll": crate::preview2::bindings::sync_io::io::poll,
+           "wasi:poll/poll": crate::preview2::bindings::sync_io::poll::poll,
            "wasi:io/streams": crate::preview2::bindings::sync_io::io::streams,
            "wasi:clocks/timezone": crate::preview2::bindings::clocks::timezone,
            "wasi:clocks/wall_clock": crate::preview2::bindings::clocks::wall_clock,
@@ -95,7 +99,7 @@ pub mod sync {
         crate::preview2::bindings::clocks::timezone::add_to_linker(l, |t| t)?;
         crate::preview2::bindings::sync_io::filesystem::types::add_to_linker(l, |t| t)?;
         crate::preview2::bindings::filesystem::preopens::add_to_linker(l, |t| t)?;
-        crate::preview2::bindings::sync_io::io::poll::add_to_linker(l, |t| t)?;
+        crate::preview2::bindings::sync_io::poll::poll::add_to_linker(l, |t| t)?;
         crate::preview2::bindings::sync_io::io::streams::add_to_linker(l, |t| t)?;
         crate::preview2::bindings::random::random::add_to_linker(l, |t| t)?;
         crate::preview2::bindings::cli::exit::add_to_linker(l, |t| t)?;
@@ -110,11 +114,8 @@ pub mod sync {
         crate::preview2::bindings::cli::terminal_stderr::add_to_linker(l, |t| t)?;
         crate::preview2::bindings::sockets::tcp::add_to_linker(l, |t| t)?;
         crate::preview2::bindings::sockets::tcp_create_socket::add_to_linker(l, |t| t)?;
-        crate::preview2::bindings::sockets::udp::add_to_linker(l, |t| t)?;
-        crate::preview2::bindings::sockets::udp_create_socket::add_to_linker(l, |t| t)?;
         crate::preview2::bindings::sockets::instance_network::add_to_linker(l, |t| t)?;
         crate::preview2::bindings::sockets::network::add_to_linker(l, |t| t)?;
-        crate::preview2::bindings::sockets::ip_name_lookup::add_to_linker(l, |t| t)?;
         Ok(())
     }
 }
diff --git a/crates/wasi/src/preview2/ctx.rs b/crates/wasi/src/preview2/ctx.rs
index 73cd0e116e50..03b69da3b795 100644
--- a/crates/wasi/src/preview2/ctx.rs
+++ b/crates/wasi/src/preview2/ctx.rs
@@ -1,10 +1,11 @@
 use super::clocks::host::{monotonic_clock, wall_clock};
 use crate::preview2::{
     clocks::{self, HostMonotonicClock, HostWallClock},
-    filesystem::Dir,
+    filesystem::{Dir, TableFsExt},
     pipe, random, stdio,
-    stdio::{StdinStream, StdoutStream},
-    DirPerms, FilePerms, Table,
+    stdio::{StdioInput, StdioOutput},
+    stream::{HostInputStream, HostOutputStream, TableStreamExt},
+    DirPerms, FilePerms, IsATTY, Table,
 };
 use cap_rand::{Rng, RngCore, SeedableRng};
 use cap_std::ipnet::{self, IpNet};
@@ -14,9 +15,9 @@ use std::mem;
 use std::net::{Ipv4Addr, Ipv6Addr};
 
 pub struct WasiCtxBuilder {
-    stdin: Box<dyn StdinStream>,
-    stdout: Box<dyn StdoutStream>,
-    stderr: Box<dyn StdoutStream>,
+    stdin: (Box<dyn HostInputStream>, IsATTY),
+    stdout: (Box<dyn HostOutputStream>, IsATTY),
+    stderr: (Box<dyn HostOutputStream>, IsATTY),
     env: Vec<(String, String)>,
     args: Vec<String>,
     preopens: Vec<(Dir, String)>,
@@ -27,7 +28,6 @@ pub struct WasiCtxBuilder {
     insecure_random_seed: u128,
     wall_clock: Box<dyn HostWallClock + Send + Sync>,
     monotonic_clock: Box<dyn HostMonotonicClock + Send + Sync>,
-    allow_ip_name_lookup: bool,
     built: bool,
 }
 
@@ -54,10 +54,7 @@ impl WasiCtxBuilder {
     pub fn new() -> Self {
         // For the insecure random API, use `SmallRng`, which is fast. It's
         // also insecure, but that's the deal here.
-        let insecure_random = Box::new(
-            cap_rand::rngs::SmallRng::from_rng(cap_rand::thread_rng(cap_rand::ambient_authority()))
-                .unwrap(),
-        );
+        let insecure_random = Box::new(cap_rand::rngs::SmallRng::from_entropy());
 
         // For the insecure random seed, use a `u128` generated from
         // `thread_rng()`, so that it's not guessable from the insecure_random
@@ -65,9 +62,9 @@ impl WasiCtxBuilder {
         let insecure_random_seed =
             cap_rand::thread_rng(cap_rand::ambient_authority()).gen::<u128>();
         Self {
-            stdin: Box::new(pipe::ClosedInputStream),
-            stdout: Box::new(pipe::SinkOutputStream),
-            stderr: Box::new(pipe::SinkOutputStream),
+            stdin: (Box::new(pipe::ClosedInputStream), IsATTY::No),
+            stdout: (Box::new(pipe::SinkOutputStream), IsATTY::No),
+            stderr: (Box::new(pipe::SinkOutputStream), IsATTY::No),
             env: Vec::new(),
             args: Vec::new(),
             preopens: Vec::new(),
@@ -77,36 +74,56 @@ impl WasiCtxBuilder {
             insecure_random_seed,
             wall_clock: wall_clock(),
             monotonic_clock: monotonic_clock(),
-            allow_ip_name_lookup: false,
             built: false,
         }
     }
 
-    pub fn stdin(&mut self, stdin: impl StdinStream + 'static) -> &mut Self {
-        self.stdin = Box::new(stdin);
+    pub fn stdin(&mut self, stdin: impl HostInputStream + 'static, isatty: IsATTY) -> &mut Self {
+        self.stdin = (Box::new(stdin), isatty);
         self
     }
 
-    pub fn stdout(&mut self, stdout: impl StdoutStream + 'static) -> &mut Self {
-        self.stdout = Box::new(stdout);
+    pub fn stdout(&mut self, stdout: impl HostOutputStream + 'static, isatty: IsATTY) -> &mut Self {
+        self.stdout = (Box::new(stdout), isatty);
         self
     }
 
-    pub fn stderr(&mut self, stderr: impl StdoutStream + 'static) -> &mut Self {
-        self.stderr = Box::new(stderr);
+    pub fn stderr(&mut self, stderr: impl HostOutputStream + 'static, isatty: IsATTY) -> &mut Self {
+        self.stderr = (Box::new(stderr), isatty);
         self
     }
 
     pub fn inherit_stdin(&mut self) -> &mut Self {
-        self.stdin(stdio::stdin())
+        use is_terminal::IsTerminal;
+        let inherited = stdio::stdin();
+        let isatty = if inherited.is_terminal() {
+            IsATTY::Yes
+        } else {
+            IsATTY::No
+        };
+        self.stdin(inherited, isatty)
     }
 
     pub fn inherit_stdout(&mut self) -> &mut Self {
-        self.stdout(stdio::stdout())
+        use is_terminal::IsTerminal;
+        let inherited = stdio::stdout();
+        let isatty = if inherited.is_terminal() {
+            IsATTY::Yes
+        } else {
+            IsATTY::No
+        };
+        self.stdout(inherited, isatty)
     }
 
     pub fn inherit_stderr(&mut self) -> &mut Self {
-        self.stderr(stdio::stderr())
+        use is_terminal::IsTerminal;
+        let inherited = stdio::stderr();
+        let isatty = if inherited.is_terminal() {
+            IsATTY::Yes
+        } else {
+            IsATTY::No
+        };
+        self.stderr(inherited, isatty)
     }
 
     pub fn inherit_stdio(&mut self) -> &mut Self {
@@ -203,27 +220,21 @@ impl WasiCtxBuilder {
     }
 
     /// Add network addresses to the pool.
-    pub fn insert_addr<A: cap_std::net::ToSocketAddrs>(
-        &mut self,
-        addrs: A,
-    ) -> std::io::Result<&mut Self> {
-        self.pool.insert(addrs, ambient_authority())?;
-        Ok(self)
+    pub fn insert_addr<A: cap_std::net::ToSocketAddrs>(&mut self, addrs: A) -> std::io::Result<()> {
+        self.pool.insert(addrs, ambient_authority())
     }
 
     /// Add a specific [`cap_std::net::SocketAddr`] to the pool.
-    pub fn insert_socket_addr(&mut self, addr: cap_std::net::SocketAddr) -> &mut Self {
+    pub fn insert_socket_addr(&mut self, addr: cap_std::net::SocketAddr) {
         self.pool.insert_socket_addr(addr, ambient_authority());
-        self
     }
 
     /// Add a range of network addresses, accepting any port, to the pool.
     ///
     /// Unlike `insert_ip_net`, this function grants access to any requested port.
-    pub fn insert_ip_net_port_any(&mut self, ip_net: ipnet::IpNet) -> &mut Self {
+    pub fn insert_ip_net_port_any(&mut self, ip_net: ipnet::IpNet) {
         self.pool
-            .insert_ip_net_port_any(ip_net, ambient_authority());
-        self
+            .insert_ip_net_port_any(ip_net, ambient_authority())
     }
 
     /// Add a range of network addresses, accepting a range of ports, to
@@ -236,35 +247,30 @@ impl WasiCtxBuilder {
         ip_net: ipnet::IpNet,
         ports_start: u16,
         ports_end: Option<u16>,
-    ) -> &mut Self {
+    ) {
         self.pool
-            .insert_ip_net_port_range(ip_net, ports_start, ports_end, ambient_authority());
-        self
+            .insert_ip_net_port_range(ip_net, ports_start, ports_end, ambient_authority())
     }
 
     /// Add a range of network addresses with a specific port to the pool.
-    pub fn insert_ip_net(&mut self, ip_net: ipnet::IpNet, port: u16) -> &mut Self {
-        self.pool.insert_ip_net(ip_net, port, ambient_authority());
-        self
-    }
-
-    /// Allow usage of `wasi:sockets/ip-name-lookup`
-    pub fn allow_ip_name_lookup(&mut self, enable: bool) -> &mut Self {
-        self.allow_ip_name_lookup = enable;
-        self
+    pub fn insert_ip_net(&mut self, ip_net: ipnet::IpNet, port: u16) {
+        self.pool.insert_ip_net(ip_net, port, ambient_authority())
     }
 
     /// Uses the configured context so far to construct the final `WasiCtx`.
     ///
+    /// This will insert resources into the provided `table`.
+    ///
     /// Note that each `WasiCtxBuilder` can only be used to "build" once, and
     /// calling this method twice will panic.
     ///
     /// # Panics
     ///
     /// Panics if this method is called twice.
-    pub fn build(&mut self) -> WasiCtx {
+    pub fn build(&mut self, table: &mut Table) -> Result<WasiCtx, anyhow::Error> {
         assert!(!self.built);
 
+        use anyhow::Context;
         let Self {
             stdin,
             stdout,
@@ -278,15 +284,37 @@ impl WasiCtxBuilder {
             insecure_random_seed,
             wall_clock,
             monotonic_clock,
-            allow_ip_name_lookup,
             built: _,
         } = mem::replace(self, Self::new());
         self.built = true;
 
-        WasiCtx {
-            stdin,
-            stdout,
-            stderr,
+        let stdin_ix = table.push_input_stream(stdin.0).context("stdin")?;
+        let stdout_ix = table.push_output_stream(stdout.0).context("stdout")?;
+        let stderr_ix = table.push_output_stream(stderr.0).context("stderr")?;
+
+        let preopens = preopens
+            .into_iter()
+            .map(|(dir, path)| {
+                let dirfd = table
+                    .push_dir(dir)
+                    .with_context(|| format!("preopen {path:?}"))?;
+                Ok((dirfd, path))
+            })
+            .collect::<anyhow::Result<Vec<_>>>()?;
+
+        Ok(WasiCtx {
+            stdin: StdioInput {
+                input_stream: stdin_ix,
+                isatty: stdin.1,
+            },
+            stdout: StdioOutput {
+                output_stream: stdout_ix,
+                isatty: stdout.1,
+            },
+            stderr: StdioOutput {
+                output_stream: stderr_ix,
+                isatty: stderr.1,
+            },
             env,
             args,
             preopens,
@@ -296,8 +324,7 @@ impl WasiCtxBuilder {
             insecure_random_seed,
             wall_clock,
             monotonic_clock,
-            allow_ip_name_lookup,
-        }
+        })
     }
 }
 
@@ -316,10 +343,9 @@ pub struct WasiCtx {
     pub(crate) monotonic_clock: Box<dyn HostMonotonicClock + Send + Sync>,
     pub(crate) env: Vec<(String, String)>,
     pub(crate) args: Vec<String>,
-    pub(crate) preopens: Vec<(Dir, String)>,
-    pub(crate) stdin: Box<dyn StdinStream>,
-    pub(crate) stdout: Box<dyn StdoutStream>,
-    pub(crate) stderr: Box<dyn StdoutStream>,
+    pub(crate) preopens: Vec<(u32, String)>,
+    pub(crate) stdin: StdioInput,
+    pub(crate) stdout: StdioOutput,
+    pub(crate) stderr: StdioOutput,
     pub(crate) pool: Pool,
-    pub(crate) allow_ip_name_lookup: bool,
 }
diff --git a/crates/wasi/src/preview2/error.rs b/crates/wasi/src/preview2/error.rs
index f92317c1fef7..c3493b238bee 100644
--- a/crates/wasi/src/preview2/error.rs
+++ b/crates/wasi/src/preview2/error.rs
@@ -1,6 +1,4 @@
-use std::error::Error;
 use std::fmt;
-use std::marker;
 
 /// An error returned from the `proc_exit` host syscall.
 ///
@@ -16,82 +14,3 @@ impl fmt::Display for I32Exit {
 }
 
 impl std::error::Error for I32Exit {}
-
-/// A helper error type used by many other modules through type aliases.
-///
-/// This type is an `Error` itself and is intended to be a representation of
-/// either:
-///
-/// * A custom error type `T`
-/// * A trap, represented as `anyhow::Error`
-///
-/// This error is created through either the `::trap` constructor representing a
-/// full-fledged trap or the `From<T>` constructor which is intended to be used
-/// with `?`. The goal is to make normal errors `T` "automatic" but enable error
-/// paths to return a `::trap` error optionally still as necessary without extra
-/// boilerplate everywhere else.
-///
-/// Note that this type isn't used directly but instead is intended to be used
-/// as:
-///
-/// ```rust,ignore
-/// type MyError = TrappableError<bindgen::TheError>;
-/// ```
-///
-/// where `MyError` is what you'll use throughout bindings code and
-/// `bindgen::TheError` is the type that this represents as generated by the
-/// `bindgen!` macro.
-#[repr(transparent)]
-pub struct TrappableError<T> {
-    err: anyhow::Error,
-    _marker: marker::PhantomData<T>,
-}
-
-impl<T> TrappableError<T> {
-    pub fn trap(err: impl Into<anyhow::Error>) -> TrappableError<T> {
-        TrappableError {
-            err: err.into(),
-            _marker: marker::PhantomData,
-        }
-    }
-
-    pub fn downcast(self) -> anyhow::Result<T>
-    where
-        T: Error + Send + Sync + 'static,
-    {
-        self.err.downcast()
-    }
-
-    pub fn downcast_ref(&self) -> Option<&T>
-    where
-        T: Error + Send + Sync + 'static,
-    {
-        self.err.downcast_ref()
-    }
-}
-
-impl<T> From<T> for TrappableError<T>
-where
-    T: Error + Send + Sync + 'static,
-{
-    fn from(error: T) -> Self {
-        Self {
-            err: error.into(),
-            _marker: marker::PhantomData,
-        }
-    }
-}
-
-impl<T> fmt::Debug for TrappableError<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.err.fmt(f)
-    }
-}
-
-impl<T> fmt::Display for TrappableError<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.err.fmt(f)
-    }
-}
-
-impl<T> Error for TrappableError<T> {}
diff --git a/crates/wasi/src/preview2/filesystem.rs b/crates/wasi/src/preview2/filesystem.rs
index ac788414995b..f99b6ab2d9af 100644
--- a/crates/wasi/src/preview2/filesystem.rs
+++ b/crates/wasi/src/preview2/filesystem.rs
@@ -1,65 +1,12 @@
-use crate::preview2::bindings::filesystem::types;
 use crate::preview2::{
-    spawn_blocking, AbortOnDropJoinHandle, HostOutputStream, StreamError, Subscribe, TableError,
-    TrappableError,
+    AbortOnDropJoinHandle, HostOutputStream, OutputStreamError, StreamRuntimeError, StreamState,
+    Table, TableError,
 };
 use anyhow::anyhow;
 use bytes::{Bytes, BytesMut};
-use std::io;
-use std::mem;
+use futures::future::{maybe_done, MaybeDone};
 use std::sync::Arc;
 
-pub type FsResult<T> = Result<T, FsError>;
-
-pub type FsError = TrappableError<types::ErrorCode>;
-
-impl From<TableError> for FsError {
-    fn from(error: TableError) -> Self {
-        Self::trap(error)
-    }
-}
-
-impl From<io::Error> for FsError {
-    fn from(error: io::Error) -> Self {
-        types::ErrorCode::from(error).into()
-    }
-}
-
-pub enum Descriptor {
-    File(File),
-    Dir(Dir),
-}
-
-impl Descriptor {
-    pub fn file(&self) -> Result<&File, types::ErrorCode> {
-        match self {
-            Descriptor::File(f) => Ok(f),
-            Descriptor::Dir(_) => Err(types::ErrorCode::BadDescriptor),
-        }
-    }
-
-    pub fn dir(&self) -> Result<&Dir, types::ErrorCode> {
-        match self {
-            Descriptor::Dir(d) => Ok(d),
-            Descriptor::File(_) => Err(types::ErrorCode::NotDirectory),
-        }
-    }
-
-    pub fn is_file(&self) -> bool {
-        match self {
-            Descriptor::File(_) => true,
-            Descriptor::Dir(_) => false,
-        }
-    }
-
-    pub fn is_dir(&self) -> bool {
-        match self {
-            Descriptor::File(_) => false,
-            Descriptor::Dir(_) => true,
-        }
-    }
-}
-
 bitflags::bitflags! {
     #[derive(Copy, Clone, Debug, PartialEq, Eq)]
     pub struct FilePerms: usize {
@@ -68,7 +15,7 @@ bitflags::bitflags! {
     }
 }
 
-pub struct File {
+pub(crate) struct File {
     /// Wrapped in an Arc because the same underlying file is used for
     /// implementing the stream types. Also needed for [`spawn_blocking`].
     ///
@@ -93,7 +40,46 @@ impl File {
         R: Send + 'static,
     {
         let f = self.file.clone();
-        spawn_blocking(move || body(&f)).await
+        tokio::task::spawn_blocking(move || body(&f)).await.unwrap()
+    }
+}
+pub(crate) trait TableFsExt {
+    fn push_file(&mut self, file: File) -> Result<u32, TableError>;
+    fn delete_file(&mut self, fd: u32) -> Result<File, TableError>;
+    fn is_file(&self, fd: u32) -> bool;
+    fn get_file(&self, fd: u32) -> Result<&File, TableError>;
+
+    fn push_dir(&mut self, dir: Dir) -> Result<u32, TableError>;
+    fn delete_dir(&mut self, fd: u32) -> Result<Dir, TableError>;
+    fn is_dir(&self, fd: u32) -> bool;
+    fn get_dir(&self, fd: u32) -> Result<&Dir, TableError>;
+}
+
+impl TableFsExt for Table {
+    fn push_file(&mut self, file: File) -> Result<u32, TableError> {
+        self.push(Box::new(file))
+    }
+    fn delete_file(&mut self, fd: u32) -> Result<File, TableError> {
+        self.delete(fd)
+    }
+    fn is_file(&self, fd: u32) -> bool {
+        self.is::<File>(fd)
+    }
+    fn get_file(&self, fd: u32) -> Result<&File, TableError> {
+        self.get(fd)
+    }
+
+    fn push_dir(&mut self, dir: Dir) -> Result<u32, TableError> {
+        self.push(Box::new(dir))
+    }
+    fn delete_dir(&mut self, fd: u32) -> Result<Dir, TableError> {
+        self.delete(fd)
+    }
+    fn is_dir(&self, fd: u32) -> bool {
+        self.is::<Dir>(fd)
+    }
+    fn get_dir(&self, fd: u32) -> Result<&Dir, TableError> {
+        self.get(fd)
     }
 }
 
@@ -105,8 +91,7 @@ bitflags::bitflags! {
     }
 }
 
-#[derive(Clone)]
-pub struct Dir {
+pub(crate) struct Dir {
     pub dir: Arc<cap_std::fs::Dir>,
     pub perms: DirPerms,
     pub file_perms: FilePerms,
@@ -129,11 +114,11 @@ impl Dir {
         R: Send + 'static,
     {
         let d = self.dir.clone();
-        spawn_blocking(move || body(&d)).await
+        tokio::task::spawn_blocking(move || body(&d)).await.unwrap()
     }
 }
 
-pub struct FileInputStream {
+pub(crate) struct FileInputStream {
     file: Arc<cap_std::fs::File>,
     position: u64,
 }
@@ -142,34 +127,44 @@ impl FileInputStream {
         Self { file, position }
     }
 
-    pub async fn read(&mut self, size: usize) -> Result<Bytes, StreamError> {
+    pub async fn read(&mut self, size: usize) -> anyhow::Result<(Bytes, StreamState)> {
         use system_interface::fs::FileIoExt;
         let f = Arc::clone(&self.file);
         let p = self.position;
-        let (r, mut buf) = spawn_blocking(move || {
+        let (r, mut buf) = tokio::task::spawn_blocking(move || {
             let mut buf = BytesMut::zeroed(size);
             let r = f.read_at(&mut buf, p);
             (r, buf)
         })
-        .await;
-        let n = read_result(r)?;
+        .await
+        .unwrap();
+        let (n, state) = read_result(r)?;
         buf.truncate(n);
         self.position += n as u64;
-        Ok(buf.freeze())
+        Ok((buf.freeze(), state))
     }
 
-    pub async fn skip(&mut self, nelem: usize) -> Result<usize, StreamError> {
-        let bs = self.read(nelem).await?;
-        Ok(bs.len())
+    pub async fn skip(&mut self, nelem: usize) -> anyhow::Result<(usize, StreamState)> {
+        let mut nread = 0;
+        let mut state = StreamState::Open;
+
+        let (bs, read_state) = self.read(nelem).await?;
+        // TODO: handle the case where `bs.len()` is less than `nelem`
+        nread += bs.len();
+        if read_state.is_closed() {
+            state = read_state;
+        }
+
+        Ok((nread, state))
     }
 }
 
-fn read_result(r: io::Result<usize>) -> Result<usize, StreamError> {
+fn read_result(r: Result<usize, std::io::Error>) -> Result<(usize, StreamState), anyhow::Error> {
     match r {
-        Ok(0) => Err(StreamError::Closed),
-        Ok(n) => Ok(n),
-        Err(e) if e.kind() == std::io::ErrorKind::Interrupted => Ok(0),
-        Err(e) => Err(StreamError::LastOperationFailed(e.into())),
+        Ok(0) => Ok((0, StreamState::Closed)),
+        Ok(n) => Ok((n, StreamState::Open)),
+        Err(e) if e.kind() == std::io::ErrorKind::Interrupted => Ok((0, StreamState::Open)),
+        Err(e) => Err(StreamRuntimeError::from(anyhow!(e)).into()),
     }
 }
 
@@ -182,32 +177,26 @@ pub(crate) enum FileOutputMode {
 pub(crate) struct FileOutputStream {
     file: Arc<cap_std::fs::File>,
     mode: FileOutputMode,
-    state: OutputState,
+    // Allows join future to be awaited in a cancellable manner. Gone variant indicates
+    // no task is currently outstanding.
+    task: MaybeDone<AbortOnDropJoinHandle<Result<(), std::io::Error>>>,
+    closed: bool,
 }
-
-enum OutputState {
-    Ready,
-    /// Allows join future to be awaited in a cancellable manner. Gone variant indicates
-    /// no task is currently outstanding.
-    Waiting(AbortOnDropJoinHandle<io::Result<()>>),
-    /// The last I/O operation failed with this error.
-    Error(io::Error),
-    Closed,
-}
-
 impl FileOutputStream {
     pub fn write_at(file: Arc<cap_std::fs::File>, position: u64) -> Self {
         Self {
             file,
             mode: FileOutputMode::Position(position),
-            state: OutputState::Ready,
+            task: MaybeDone::Gone,
+            closed: false,
         }
     }
     pub fn append(file: Arc<cap_std::fs::File>) -> Self {
         Self {
             file,
             mode: FileOutputMode::Append,
-            state: OutputState::Ready,
+            task: MaybeDone::Gone,
+            closed: false,
         }
     }
 }
@@ -215,103 +204,74 @@ impl FileOutputStream {
 // FIXME: configurable? determine from how much space left in file?
 const FILE_WRITE_CAPACITY: usize = 1024 * 1024;
 
+#[async_trait::async_trait]
 impl HostOutputStream for FileOutputStream {
-    fn write(&mut self, buf: Bytes) -> Result<(), StreamError> {
+    fn write(&mut self, buf: Bytes) -> Result<(), OutputStreamError> {
         use system_interface::fs::FileIoExt;
-        match self.state {
-            OutputState::Ready => {}
-            OutputState::Closed => return Err(StreamError::Closed),
-            OutputState::Waiting(_) | OutputState::Error(_) => {
-                // a write is pending - this call was not permitted
-                return Err(StreamError::Trap(anyhow!(
-                    "write not permitted: check_write not called first"
-                )));
-            }
-        }
 
+        if self.closed {
+            return Err(OutputStreamError::Closed);
+        }
+        if !matches!(self.task, MaybeDone::Gone) {
+            // a write is pending - this call was not permitted
+            return Err(OutputStreamError::Trap(anyhow!(
+                "write not permitted: FileOutputStream write pending"
+            )));
+        }
         let f = Arc::clone(&self.file);
         let m = self.mode;
-        let task = spawn_blocking(move || match m {
-            FileOutputMode::Position(mut p) => {
-                let mut buf = buf;
-                while !buf.is_empty() {
-                    let nwritten = f.write_at(buf.as_ref(), p)?;
-                    // afterwards buf contains [nwritten, len):
-                    let _ = buf.split_to(nwritten);
-                    p += nwritten as u64;
+        self.task = maybe_done(AbortOnDropJoinHandle::from(tokio::task::spawn_blocking(
+            move || match m {
+                FileOutputMode::Position(mut p) => {
+                    let mut buf = buf;
+                    while !buf.is_empty() {
+                        let nwritten = f.write_at(buf.as_ref(), p)?;
+                        // afterwards buf contains [nwritten, len):
+                        let _ = buf.split_to(nwritten);
+                        p += nwritten as u64;
+                    }
+                    Ok(())
                 }
-                Ok(())
-            }
-            FileOutputMode::Append => {
-                let mut buf = buf;
-                while !buf.is_empty() {
-                    let nwritten = f.append(buf.as_ref())?;
-                    let _ = buf.split_to(nwritten);
+                FileOutputMode::Append => {
+                    let mut buf = buf;
+                    while !buf.is_empty() {
+                        let nwritten = f.append(buf.as_ref())?;
+                        let _ = buf.split_to(nwritten);
+                    }
+                    Ok(())
                 }
-                Ok(())
-            }
-        });
-        self.state = OutputState::Waiting(task);
+            },
+        )));
         Ok(())
     }
-    fn flush(&mut self) -> Result<(), StreamError> {
-        match self.state {
-            // Only userland buffering of file writes is in the blocking task,
-            // so there's nothing extra that needs to be done to request a
-            // flush.
-            OutputState::Ready | OutputState::Waiting(_) => Ok(()),
-            OutputState::Closed => Err(StreamError::Closed),
-            OutputState::Error(_) => match mem::replace(&mut self.state, OutputState::Closed) {
-                OutputState::Error(e) => Err(StreamError::LastOperationFailed(e.into())),
-                _ => unreachable!(),
-            },
+    fn flush(&mut self) -> Result<(), OutputStreamError> {
+        if self.closed {
+            return Err(OutputStreamError::Closed);
         }
+        // Only userland buffering of file writes is in the blocking task.
+        Ok(())
     }
-    fn check_write(&mut self) -> Result<usize, StreamError> {
-        match self.state {
-            OutputState::Ready => Ok(FILE_WRITE_CAPACITY),
-            OutputState::Closed => Err(StreamError::Closed),
-            OutputState::Error(_) => match mem::replace(&mut self.state, OutputState::Closed) {
-                OutputState::Error(e) => Err(StreamError::LastOperationFailed(e.into())),
-                _ => unreachable!(),
-            },
-            OutputState::Waiting(_) => Ok(0),
+    async fn write_ready(&mut self) -> Result<usize, OutputStreamError> {
+        if self.closed {
+            return Err(OutputStreamError::Closed);
         }
-    }
-}
-
-#[async_trait::async_trait]
-impl Subscribe for FileOutputStream {
-    async fn ready(&mut self) {
-        if let OutputState::Waiting(task) = &mut self.state {
-            self.state = match task.await {
-                Ok(()) => OutputState::Ready,
-                Err(e) => OutputState::Error(e),
-            };
+        // If there is no outstanding task, accept more input:
+        if matches!(self.task, MaybeDone::Gone) {
+            return Ok(FILE_WRITE_CAPACITY);
+        }
+        // Wait for outstanding task:
+        std::pin::Pin::new(&mut self.task).await;
+
+        // Mark task as finished, and handle output:
+        match std::pin::Pin::new(&mut self.task)
+            .take_output()
+            .expect("just awaited for MaybeDone completion")
+        {
+            Ok(()) => Ok(FILE_WRITE_CAPACITY),
+            Err(e) => {
+                self.closed = true;
+                Err(OutputStreamError::LastOperationFailed(e.into()))
+            }
         }
-    }
-}
-
-pub struct ReaddirIterator(
-    std::sync::Mutex<Box<dyn Iterator<Item = FsResult<types::DirectoryEntry>> + Send + 'static>>,
-);
-
-impl ReaddirIterator {
-    pub(crate) fn new(
-        i: impl Iterator<Item = FsResult<types::DirectoryEntry>> + Send + 'static,
-    ) -> Self {
-        ReaddirIterator(std::sync::Mutex::new(Box::new(i)))
-    }
-    pub(crate) fn next(&self) -> FsResult<Option<types::DirectoryEntry>> {
-        self.0.lock().unwrap().next().transpose()
-    }
-}
-
-impl IntoIterator for ReaddirIterator {
-    type Item = FsResult<types::DirectoryEntry>;
-    type IntoIter = Box<dyn Iterator<Item = Self::Item> + Send>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.into_inner().unwrap()
     }
 }
diff --git a/crates/wasi/src/preview2/host/clocks.rs b/crates/wasi/src/preview2/host/clocks.rs
index 688780edb63e..2c461bd804c8 100644
--- a/crates/wasi/src/preview2/host/clocks.rs
+++ b/crates/wasi/src/preview2/host/clocks.rs
@@ -2,14 +2,12 @@
 
 use crate::preview2::bindings::{
     clocks::monotonic_clock::{self, Instant},
-    clocks::timezone::{self, TimezoneDisplay},
+    clocks::timezone::{self, Timezone, TimezoneDisplay},
     clocks::wall_clock::{self, Datetime},
+    poll::poll::Pollable,
 };
-use crate::preview2::poll::{subscribe, Subscribe};
-use crate::preview2::{Pollable, WasiView};
+use crate::preview2::{HostPollable, TablePollableExt, WasiView};
 use cap_std::time::SystemTime;
-use std::time::Duration;
-use wasmtime::component::Resource;
 
 impl TryFrom<SystemTime> for Datetime {
     type Error = anyhow::Error;
@@ -52,39 +50,58 @@ impl<T: WasiView> monotonic_clock::Host for T {
         Ok(self.ctx().monotonic_clock.resolution())
     }
 
-    fn subscribe(&mut self, when: Instant, absolute: bool) -> anyhow::Result<Resource<Pollable>> {
+    fn subscribe(&mut self, when: Instant, absolute: bool) -> anyhow::Result<Pollable> {
+        use std::time::Duration;
+        // Calculate time relative to clock object, which may not have the same zero
+        // point as tokio Inst::now()
         let clock_now = self.ctx().monotonic_clock.now();
-        let duration = if absolute {
-            Duration::from_nanos(when.saturating_sub(clock_now))
+        if absolute && when < clock_now {
+            // Deadline is in the past, so pollable is always ready:
+            Ok(self
+                .table_mut()
+                .push_host_pollable(HostPollable::Closure(Box::new(|| {
+                    Box::pin(async { Ok(()) })
+                })))?)
         } else {
-            Duration::from_nanos(when)
-        };
-        let deadline = tokio::time::Instant::now()
-            .checked_add(duration)
-            .ok_or_else(|| anyhow::anyhow!("time overflow: duration {duration:?}"))?;
-        // NB: this resource created here is not actually exposed to wasm, it's
-        // only an internal implementation detail used to match the signature
-        // expected by `subscribe`.
-        let sleep = self.table_mut().push(Sleep(deadline))?;
-        subscribe(self.table_mut(), sleep)
-    }
-}
-
-struct Sleep(tokio::time::Instant);
-
-#[async_trait::async_trait]
-impl Subscribe for Sleep {
-    async fn ready(&mut self) {
-        tokio::time::sleep_until(self.0).await;
+            let duration = if absolute {
+                Duration::from_nanos(when - clock_now)
+            } else {
+                Duration::from_nanos(when)
+            };
+            let deadline = tokio::time::Instant::now()
+                .checked_add(duration)
+                .ok_or_else(|| anyhow::anyhow!("time overflow: duration {duration:?}"))?;
+            tracing::trace!(
+                "deadline = {:?}, now = {:?}",
+                deadline,
+                tokio::time::Instant::now()
+            );
+            Ok(self
+                .table_mut()
+                .push_host_pollable(HostPollable::Closure(Box::new(move || {
+                    Box::pin(async move {
+                        tracing::trace!(
+                            "mkf: deadline = {:?}, now = {:?}",
+                            deadline,
+                            tokio::time::Instant::now()
+                        );
+                        Ok(tokio::time::sleep_until(deadline).await)
+                    })
+                })))?)
+        }
     }
 }
 
 impl<T: WasiView> timezone::Host for T {
-    fn display(&mut self, when: Datetime) -> anyhow::Result<TimezoneDisplay> {
+    fn display(&mut self, timezone: Timezone, when: Datetime) -> anyhow::Result<TimezoneDisplay> {
         todo!("timezone display is not implemented")
     }
 
-    fn utc_offset(&mut self, when: Datetime) -> anyhow::Result<i32> {
+    fn utc_offset(&mut self, timezone: Timezone, when: Datetime) -> anyhow::Result<i32> {
         todo!("timezone utc_offset is not implemented")
     }
+
+    fn drop_timezone(&mut self, timezone: Timezone) -> anyhow::Result<()> {
+        todo!("timezone drop is not implemented")
+    }
 }
diff --git a/crates/wasi/src/preview2/host/filesystem.rs b/crates/wasi/src/preview2/host/filesystem.rs
index f011d69e21d9..c9f2105fdb44 100644
--- a/crates/wasi/src/preview2/host/filesystem.rs
+++ b/crates/wasi/src/preview2/host/filesystem.rs
@@ -1,64 +1,34 @@
 use crate::preview2::bindings::clocks::wall_clock;
-use crate::preview2::bindings::filesystem::preopens;
-use crate::preview2::bindings::filesystem::types::{
-    self, ErrorCode, HostDescriptor, HostDirectoryEntryStream,
-};
-use crate::preview2::bindings::io::streams::{InputStream, OutputStream};
-use crate::preview2::filesystem::{Descriptor, Dir, File, ReaddirIterator};
-use crate::preview2::filesystem::{FileInputStream, FileOutputStream};
-use crate::preview2::{DirPerms, FilePerms, FsError, FsResult, Table, WasiView};
-use anyhow::Context;
-use wasmtime::component::Resource;
+use crate::preview2::bindings::filesystem::{preopens, types};
+use crate::preview2::bindings::io::streams;
+use crate::preview2::filesystem::{Dir, File, TableFsExt};
+use crate::preview2::{DirPerms, FilePerms, Table, TableError, WasiView};
+
+use types::ErrorCode;
 
 mod sync;
 
-impl<T: WasiView> preopens::Host for T {
-    fn get_directories(
-        &mut self,
-    ) -> Result<Vec<(Resource<types::Descriptor>, String)>, anyhow::Error> {
-        let mut results = Vec::new();
-        for (dir, name) in self.ctx().preopens.clone() {
-            let fd = self
-                .table_mut()
-                .push(Descriptor::Dir(dir))
-                .with_context(|| format!("failed to push preopen {name}"))?;
-            results.push((fd, name));
-        }
-        Ok(results)
+impl From<TableError> for types::Error {
+    fn from(error: TableError) -> Self {
+        Self::trap(error.into())
     }
 }
 
-#[async_trait::async_trait]
-impl<T: WasiView> types::Host for T {
-    fn convert_error_code(&mut self, err: FsError) -> anyhow::Result<ErrorCode> {
-        err.downcast()
-    }
-
-    fn filesystem_error_code(
-        &mut self,
-        err: Resource<anyhow::Error>,
-    ) -> anyhow::Result<Option<ErrorCode>> {
-        let err = self.table_mut().get(&err)?;
-
-        // Currently `err` always comes from the stream implementation which
-        // uses standard reads/writes so only check for `std::io::Error` here.
-        if let Some(err) = err.downcast_ref::<std::io::Error>() {
-            return Ok(Some(ErrorCode::from(err)));
-        }
-
-        Ok(None)
+impl<T: WasiView> preopens::Host for T {
+    fn get_directories(&mut self) -> Result<Vec<(types::Descriptor, String)>, anyhow::Error> {
+        Ok(self.ctx().preopens.clone())
     }
 }
 
 #[async_trait::async_trait]
-impl<T: WasiView> HostDescriptor for T {
+impl<T: WasiView> types::Host for T {
     async fn advise(
         &mut self,
-        fd: Resource<types::Descriptor>,
+        fd: types::Descriptor,
         offset: types::Filesize,
         len: types::Filesize,
         advice: types::Advice,
-    ) -> FsResult<()> {
+    ) -> Result<(), types::Error> {
         use system_interface::fs::{Advice as A, FileIoExt};
         use types::Advice;
 
@@ -71,43 +41,43 @@ impl<T: WasiView> HostDescriptor for T {
             Advice::NoReuse => A::NoReuse,
         };
 
-        let f = self.table().get(&fd)?.file()?;
+        let f = self.table().get_file(fd)?;
         f.spawn_blocking(move |f| f.advise(offset, len, advice))
             .await?;
         Ok(())
     }
 
-    async fn sync_data(&mut self, fd: Resource<types::Descriptor>) -> FsResult<()> {
+    async fn sync_data(&mut self, fd: types::Descriptor) -> Result<(), types::Error> {
         let table = self.table();
-
-        match table.get(&fd)? {
-            Descriptor::File(f) => {
-                match f.spawn_blocking(|f| f.sync_data()).await {
-                    Ok(()) => Ok(()),
-                    // On windows, `sync_data` uses `FileFlushBuffers` which fails with
-                    // `ERROR_ACCESS_DENIED` if the file is not upen for writing. Ignore
-                    // this error, for POSIX compatibility.
-                    #[cfg(windows)]
-                    Err(e)
-                        if e.raw_os_error()
-                            == Some(windows_sys::Win32::Foundation::ERROR_ACCESS_DENIED as _) =>
-                    {
-                        Ok(())
-                    }
-                    Err(e) => Err(e.into()),
+        if table.is_file(fd) {
+            let f = table.get_file(fd)?;
+            match f.spawn_blocking(|f| f.sync_data()).await {
+                Ok(()) => Ok(()),
+                // On windows, `sync_data` uses `FileFlushBuffers` which fails with
+                // `ERROR_ACCESS_DENIED` if the file is not upen for writing. Ignore
+                // this error, for POSIX compatibility.
+                #[cfg(windows)]
+                Err(e)
+                    if e.raw_os_error()
+                        == Some(windows_sys::Win32::Foundation::ERROR_ACCESS_DENIED as _) =>
+                {
+                    Ok(())
                 }
+                Err(e) => Err(e.into()),
             }
-            Descriptor::Dir(d) => {
-                d.spawn_blocking(|d| Ok(d.open(std::path::Component::CurDir)?.sync_data()?))
-                    .await
-            }
+        } else if table.is_dir(fd) {
+            let d = table.get_dir(fd)?;
+            d.spawn_blocking(|d| Ok(d.open(std::path::Component::CurDir)?.sync_data()?))
+                .await
+        } else {
+            Err(ErrorCode::BadDescriptor.into())
         }
     }
 
     async fn get_flags(
         &mut self,
-        fd: Resource<types::Descriptor>,
-    ) -> FsResult<types::DescriptorFlags> {
+        fd: types::Descriptor,
+    ) -> Result<types::DescriptorFlags, types::Error> {
         use system_interface::fs::{FdFlags, GetSetFdFlags};
         use types::DescriptorFlags;
 
@@ -126,53 +96,56 @@ impl<T: WasiView> HostDescriptor for T {
         }
 
         let table = self.table();
-        match table.get(&fd)? {
-            Descriptor::File(f) => {
-                let flags = f.spawn_blocking(|f| f.get_fd_flags()).await?;
-                let mut flags = get_from_fdflags(flags);
-                if f.perms.contains(FilePerms::READ) {
-                    flags |= DescriptorFlags::READ;
-                }
-                if f.perms.contains(FilePerms::WRITE) {
-                    flags |= DescriptorFlags::WRITE;
-                }
-                Ok(flags)
+        if table.is_file(fd) {
+            let f = table.get_file(fd)?;
+            let flags = f.spawn_blocking(|f| f.get_fd_flags()).await?;
+            let mut flags = get_from_fdflags(flags);
+            if f.perms.contains(FilePerms::READ) {
+                flags |= DescriptorFlags::READ;
             }
-            Descriptor::Dir(d) => {
-                let flags = d.spawn_blocking(|d| d.get_fd_flags()).await?;
-                let mut flags = get_from_fdflags(flags);
-                if d.perms.contains(DirPerms::READ) {
-                    flags |= DescriptorFlags::READ;
-                }
-                if d.perms.contains(DirPerms::MUTATE) {
-                    flags |= DescriptorFlags::MUTATE_DIRECTORY;
-                }
-                Ok(flags)
+            if f.perms.contains(FilePerms::WRITE) {
+                flags |= DescriptorFlags::WRITE;
+            }
+            Ok(flags)
+        } else if table.is_dir(fd) {
+            let d = table.get_dir(fd)?;
+            let flags = d.spawn_blocking(|d| d.get_fd_flags()).await?;
+            let mut flags = get_from_fdflags(flags);
+            if d.perms.contains(DirPerms::READ) {
+                flags |= DescriptorFlags::READ;
             }
+            if d.perms.contains(DirPerms::MUTATE) {
+                flags |= DescriptorFlags::MUTATE_DIRECTORY;
+            }
+            Ok(flags)
+        } else {
+            Err(ErrorCode::BadDescriptor.into())
         }
     }
 
     async fn get_type(
         &mut self,
-        fd: Resource<types::Descriptor>,
-    ) -> FsResult<types::DescriptorType> {
+        fd: types::Descriptor,
+    ) -> Result<types::DescriptorType, types::Error> {
         let table = self.table();
 
-        match table.get(&fd)? {
-            Descriptor::File(f) => {
-                let meta = f.spawn_blocking(|f| f.metadata()).await?;
-                Ok(descriptortype_from(meta.file_type()))
-            }
-            Descriptor::Dir(_) => Ok(types::DescriptorType::Directory),
+        if table.is_file(fd) {
+            let f = table.get_file(fd)?;
+            let meta = f.spawn_blocking(|f| f.metadata()).await?;
+            Ok(descriptortype_from(meta.file_type()))
+        } else if table.is_dir(fd) {
+            Ok(types::DescriptorType::Directory)
+        } else {
+            Err(ErrorCode::BadDescriptor.into())
         }
     }
 
     async fn set_size(
         &mut self,
-        fd: Resource<types::Descriptor>,
+        fd: types::Descriptor,
         size: types::Filesize,
-    ) -> FsResult<()> {
-        let f = self.table().get(&fd)?.file()?;
+    ) -> Result<(), types::Error> {
+        let f = self.table().get_file(fd)?;
         if !f.perms.contains(FilePerms::WRITE) {
             Err(ErrorCode::NotPermitted)?;
         }
@@ -182,47 +155,48 @@ impl<T: WasiView> HostDescriptor for T {
 
     async fn set_times(
         &mut self,
-        fd: Resource<types::Descriptor>,
+        fd: types::Descriptor,
         atim: types::NewTimestamp,
         mtim: types::NewTimestamp,
-    ) -> FsResult<()> {
+    ) -> Result<(), types::Error> {
         use fs_set_times::SetTimes;
 
         let table = self.table();
-        match table.get(&fd)? {
-            Descriptor::File(f) => {
-                if !f.perms.contains(FilePerms::WRITE) {
-                    return Err(ErrorCode::NotPermitted.into());
-                }
-                let atim = systemtimespec_from(atim)?;
-                let mtim = systemtimespec_from(mtim)?;
-                f.spawn_blocking(|f| f.set_times(atim, mtim)).await?;
-                Ok(())
+        if table.is_file(fd) {
+            let f = table.get_file(fd)?;
+            if !f.perms.contains(FilePerms::WRITE) {
+                return Err(ErrorCode::NotPermitted.into());
             }
-            Descriptor::Dir(d) => {
-                if !d.perms.contains(DirPerms::MUTATE) {
-                    return Err(ErrorCode::NotPermitted.into());
-                }
-                let atim = systemtimespec_from(atim)?;
-                let mtim = systemtimespec_from(mtim)?;
-                d.spawn_blocking(|d| d.set_times(atim, mtim)).await?;
-                Ok(())
+            let atim = systemtimespec_from(atim)?;
+            let mtim = systemtimespec_from(mtim)?;
+            f.spawn_blocking(|f| f.set_times(atim, mtim)).await?;
+            Ok(())
+        } else if table.is_dir(fd) {
+            let d = table.get_dir(fd)?;
+            if !d.perms.contains(DirPerms::MUTATE) {
+                return Err(ErrorCode::NotPermitted.into());
             }
+            let atim = systemtimespec_from(atim)?;
+            let mtim = systemtimespec_from(mtim)?;
+            d.spawn_blocking(|d| d.set_times(atim, mtim)).await?;
+            Ok(())
+        } else {
+            Err(ErrorCode::BadDescriptor.into())
         }
     }
 
     async fn read(
         &mut self,
-        fd: Resource<types::Descriptor>,
+        fd: types::Descriptor,
         len: types::Filesize,
         offset: types::Filesize,
-    ) -> FsResult<(Vec<u8>, bool)> {
+    ) -> Result<(Vec<u8>, bool), types::Error> {
         use std::io::IoSliceMut;
         use system_interface::fs::FileIoExt;
 
         let table = self.table();
 
-        let f = table.get(&fd)?.file()?;
+        let f = table.get_file(fd)?;
         if !f.perms.contains(FilePerms::READ) {
             return Err(ErrorCode::NotPermitted.into());
         }
@@ -251,15 +225,15 @@ impl<T: WasiView> HostDescriptor for T {
 
     async fn write(
         &mut self,
-        fd: Resource<types::Descriptor>,
+        fd: types::Descriptor,
         buf: Vec<u8>,
         offset: types::Filesize,
-    ) -> FsResult<types::Filesize> {
+    ) -> Result<types::Filesize, types::Error> {
         use std::io::IoSlice;
         use system_interface::fs::FileIoExt;
 
         let table = self.table();
-        let f = table.get(&fd)?.file()?;
+        let f = table.get_file(fd)?;
         if !f.perms.contains(FilePerms::WRITE) {
             return Err(ErrorCode::NotPermitted.into());
         }
@@ -273,10 +247,10 @@ impl<T: WasiView> HostDescriptor for T {
 
     async fn read_directory(
         &mut self,
-        fd: Resource<types::Descriptor>,
-    ) -> FsResult<Resource<types::DirectoryEntryStream>> {
+        fd: types::Descriptor,
+    ) -> Result<types::DirectoryEntryStream, types::Error> {
         let table = self.table_mut();
-        let d = table.get(&fd)?.dir()?;
+        let d = table.get_dir(fd)?;
         if !d.perms.contains(DirPerms::READ) {
             return Err(ErrorCode::NotPermitted.into());
         }
@@ -330,46 +304,63 @@ impl<T: WasiView> HostDescriptor for T {
         });
         let entries = entries.map(|r| match r {
             Ok(r) => Ok(r),
-            Err(ReaddirError::Io(e)) => Err(e.into()),
+            Err(ReaddirError::Io(e)) => Err(types::Error::from(e)),
             Err(ReaddirError::IllegalSequence) => Err(ErrorCode::IllegalByteSequence.into()),
         });
-        Ok(table.push(ReaddirIterator::new(entries))?)
+        Ok(table.push_readdir(ReaddirIterator::new(entries))?)
     }
 
-    async fn sync(&mut self, fd: Resource<types::Descriptor>) -> FsResult<()> {
+    async fn read_directory_entry(
+        &mut self,
+        stream: types::DirectoryEntryStream,
+    ) -> Result<Option<types::DirectoryEntry>, types::Error> {
         let table = self.table();
+        let readdir = table.get_readdir(stream)?;
+        readdir.next()
+    }
+
+    fn drop_directory_entry_stream(
+        &mut self,
+        stream: types::DirectoryEntryStream,
+    ) -> anyhow::Result<()> {
+        self.table_mut().delete_readdir(stream)?;
+        Ok(())
+    }
 
-        match table.get(&fd)? {
-            Descriptor::File(f) => {
-                match f.spawn_blocking(|f| f.sync_all()).await {
-                    Ok(()) => Ok(()),
-                    // On windows, `sync_data` uses `FileFlushBuffers` which fails with
-                    // `ERROR_ACCESS_DENIED` if the file is not upen for writing. Ignore
-                    // this error, for POSIX compatibility.
-                    #[cfg(windows)]
-                    Err(e)
-                        if e.raw_os_error()
-                            == Some(windows_sys::Win32::Foundation::ERROR_ACCESS_DENIED as _) =>
-                    {
-                        Ok(())
-                    }
-                    Err(e) => Err(e.into()),
+    async fn sync(&mut self, fd: types::Descriptor) -> Result<(), types::Error> {
+        let table = self.table();
+        if table.is_file(fd) {
+            let f = table.get_file(fd)?;
+            match f.spawn_blocking(|f| f.sync_all()).await {
+                Ok(()) => Ok(()),
+                // On windows, `sync_data` uses `FileFlushBuffers` which fails with
+                // `ERROR_ACCESS_DENIED` if the file is not upen for writing. Ignore
+                // this error, for POSIX compatibility.
+                #[cfg(windows)]
+                Err(e)
+                    if e.raw_os_error()
+                        == Some(windows_sys::Win32::Foundation::ERROR_ACCESS_DENIED as _) =>
+                {
+                    Ok(())
                 }
+                Err(e) => Err(e.into()),
             }
-            Descriptor::Dir(d) => {
-                d.spawn_blocking(|d| Ok(d.open(std::path::Component::CurDir)?.sync_all()?))
-                    .await
-            }
+        } else if table.is_dir(fd) {
+            let d = table.get_dir(fd)?;
+            d.spawn_blocking(|d| Ok(d.open(std::path::Component::CurDir)?.sync_all()?))
+                .await
+        } else {
+            Err(ErrorCode::BadDescriptor.into())
         }
     }
 
     async fn create_directory_at(
         &mut self,
-        fd: Resource<types::Descriptor>,
+        fd: types::Descriptor,
         path: String,
-    ) -> FsResult<()> {
+    ) -> Result<(), types::Error> {
         let table = self.table();
-        let d = table.get(&fd)?.dir()?;
+        let d = table.get_dir(fd)?;
         if !d.perms.contains(DirPerms::MUTATE) {
             return Err(ErrorCode::NotPermitted.into());
         }
@@ -377,30 +368,31 @@ impl<T: WasiView> HostDescriptor for T {
         Ok(())
     }
 
-    async fn stat(&mut self, fd: Resource<types::Descriptor>) -> FsResult<types::DescriptorStat> {
+    async fn stat(&mut self, fd: types::Descriptor) -> Result<types::DescriptorStat, types::Error> {
         let table = self.table();
-        match table.get(&fd)? {
-            Descriptor::File(f) => {
-                // No permissions check on stat: if opened, allowed to stat it
-                let meta = f.spawn_blocking(|f| f.metadata()).await?;
-                Ok(descriptorstat_from(meta))
-            }
-            Descriptor::Dir(d) => {
-                // No permissions check on stat: if opened, allowed to stat it
-                let meta = d.spawn_blocking(|d| d.dir_metadata()).await?;
-                Ok(descriptorstat_from(meta))
-            }
+        if table.is_file(fd) {
+            let f = table.get_file(fd)?;
+            // No permissions check on stat: if opened, allowed to stat it
+            let meta = f.spawn_blocking(|f| f.metadata()).await?;
+            Ok(descriptorstat_from(meta))
+        } else if table.is_dir(fd) {
+            let d = table.get_dir(fd)?;
+            // No permissions check on stat: if opened, allowed to stat it
+            let meta = d.spawn_blocking(|d| d.dir_metadata()).await?;
+            Ok(descriptorstat_from(meta))
+        } else {
+            Err(ErrorCode::BadDescriptor.into())
         }
     }
 
     async fn stat_at(
         &mut self,
-        fd: Resource<types::Descriptor>,
+        fd: types::Descriptor,
         path_flags: types::PathFlags,
         path: String,
-    ) -> FsResult<types::DescriptorStat> {
+    ) -> Result<types::DescriptorStat, types::Error> {
         let table = self.table();
-        let d = table.get(&fd)?.dir()?;
+        let d = table.get_dir(fd)?;
         if !d.perms.contains(DirPerms::READ) {
             return Err(ErrorCode::NotPermitted.into());
         }
@@ -415,16 +407,16 @@ impl<T: WasiView> HostDescriptor for T {
 
     async fn set_times_at(
         &mut self,
-        fd: Resource<types::Descriptor>,
+        fd: types::Descriptor,
         path_flags: types::PathFlags,
         path: String,
         atim: types::NewTimestamp,
         mtim: types::NewTimestamp,
-    ) -> FsResult<()> {
+    ) -> Result<(), types::Error> {
         use cap_fs_ext::DirExt;
 
         let table = self.table();
-        let d = table.get(&fd)?.dir()?;
+        let d = table.get_dir(fd)?;
         if !d.perms.contains(DirPerms::MUTATE) {
             return Err(ErrorCode::NotPermitted.into());
         }
@@ -454,19 +446,19 @@ impl<T: WasiView> HostDescriptor for T {
 
     async fn link_at(
         &mut self,
-        fd: Resource<types::Descriptor>,
+        fd: types::Descriptor,
         // TODO delete the path flags from this function
         old_path_flags: types::PathFlags,
         old_path: String,
-        new_descriptor: Resource<types::Descriptor>,
+        new_descriptor: types::Descriptor,
         new_path: String,
-    ) -> FsResult<()> {
+    ) -> Result<(), types::Error> {
         let table = self.table();
-        let old_dir = table.get(&fd)?.dir()?;
+        let old_dir = table.get_dir(fd)?;
         if !old_dir.perms.contains(DirPerms::MUTATE) {
             return Err(ErrorCode::NotPermitted.into());
         }
-        let new_dir = table.get(&new_descriptor)?.dir()?;
+        let new_dir = table.get_dir(new_descriptor)?;
         if !new_dir.perms.contains(DirPerms::MUTATE) {
             return Err(ErrorCode::NotPermitted.into());
         }
@@ -482,7 +474,7 @@ impl<T: WasiView> HostDescriptor for T {
 
     async fn open_at(
         &mut self,
-        fd: Resource<types::Descriptor>,
+        fd: types::Descriptor,
         path_flags: types::PathFlags,
         path: String,
         oflags: types::OpenFlags,
@@ -490,13 +482,16 @@ impl<T: WasiView> HostDescriptor for T {
         // TODO: These are the permissions to use when creating a new file.
         // Not implemented yet.
         _mode: types::Modes,
-    ) -> FsResult<Resource<types::Descriptor>> {
+    ) -> Result<types::Descriptor, types::Error> {
         use cap_fs_ext::{FollowSymlinks, OpenOptionsFollowExt, OpenOptionsMaybeDirExt};
         use system_interface::fs::{FdFlags, GetSetFdFlags};
         use types::{DescriptorFlags, OpenFlags};
 
         let table = self.table_mut();
-        let d = table.get(&fd)?.dir()?;
+        if table.is_file(fd) {
+            Err(ErrorCode::NotDirectory)?;
+        }
+        let d = table.get_dir(fd)?;
         if !d.perms.contains(DirPerms::READ) {
             Err(ErrorCode::NotPermitted)?;
         }
@@ -585,20 +580,17 @@ impl<T: WasiView> HostDescriptor for T {
             .await?;
 
         match opened {
-            OpenResult::Dir(dir) => {
-                Ok(table.push(Descriptor::Dir(Dir::new(dir, d.perms, d.file_perms)))?)
-            }
+            OpenResult::Dir(dir) => Ok(table.push_dir(Dir::new(dir, d.perms, d.file_perms))?),
 
-            OpenResult::File(file) => Ok(table.push(Descriptor::File(File::new(
-                file,
-                mask_file_perms(d.file_perms, flags),
-            )))?),
+            OpenResult::File(file) => {
+                Ok(table.push_file(File::new(file, mask_file_perms(d.file_perms, flags)))?)
+            }
 
             OpenResult::NotDir => Err(ErrorCode::NotDirectory.into()),
         }
     }
 
-    fn drop(&mut self, fd: Resource<types::Descriptor>) -> anyhow::Result<()> {
+    fn drop_descriptor(&mut self, fd: types::Descriptor) -> anyhow::Result<()> {
         let table = self.table_mut();
 
         // The Drop will close the file/dir, but if the close syscall
@@ -606,18 +598,20 @@ impl<T: WasiView> HostDescriptor for T {
         // tokio::fs::File just uses std::fs::File's Drop impl to close, so
         // it doesn't appear anyone else has found this to be a problem.
         // (Not that they could solve it without async drop...)
-        table.delete(fd)?;
+        if table.delete_file(fd).is_err() {
+            table.delete_dir(fd)?;
+        }
 
         Ok(())
     }
 
     async fn readlink_at(
         &mut self,
-        fd: Resource<types::Descriptor>,
+        fd: types::Descriptor,
         path: String,
-    ) -> FsResult<String> {
+    ) -> Result<String, types::Error> {
         let table = self.table();
-        let d = table.get(&fd)?.dir()?;
+        let d = table.get_dir(fd)?;
         if !d.perms.contains(DirPerms::READ) {
             return Err(ErrorCode::NotPermitted.into());
         }
@@ -630,11 +624,11 @@ impl<T: WasiView> HostDescriptor for T {
 
     async fn remove_directory_at(
         &mut self,
-        fd: Resource<types::Descriptor>,
+        fd: types::Descriptor,
         path: String,
-    ) -> FsResult<()> {
+    ) -> Result<(), types::Error> {
         let table = self.table();
-        let d = table.get(&fd)?.dir()?;
+        let d = table.get_dir(fd)?;
         if !d.perms.contains(DirPerms::MUTATE) {
             return Err(ErrorCode::NotPermitted.into());
         }
@@ -643,17 +637,17 @@ impl<T: WasiView> HostDescriptor for T {
 
     async fn rename_at(
         &mut self,
-        fd: Resource<types::Descriptor>,
+        fd: types::Descriptor,
         old_path: String,
-        new_fd: Resource<types::Descriptor>,
+        new_fd: types::Descriptor,
         new_path: String,
-    ) -> FsResult<()> {
+    ) -> Result<(), types::Error> {
         let table = self.table();
-        let old_dir = table.get(&fd)?.dir()?;
+        let old_dir = table.get_dir(fd)?;
         if !old_dir.perms.contains(DirPerms::MUTATE) {
             return Err(ErrorCode::NotPermitted.into());
         }
-        let new_dir = table.get(&new_fd)?.dir()?;
+        let new_dir = table.get_dir(new_fd)?;
         if !new_dir.perms.contains(DirPerms::MUTATE) {
             return Err(ErrorCode::NotPermitted.into());
         }
@@ -665,16 +659,16 @@ impl<T: WasiView> HostDescriptor for T {
 
     async fn symlink_at(
         &mut self,
-        fd: Resource<types::Descriptor>,
+        fd: types::Descriptor,
         src_path: String,
         dest_path: String,
-    ) -> FsResult<()> {
+    ) -> Result<(), types::Error> {
         // On windows, Dir.symlink is provided by DirExt
         #[cfg(windows)]
         use cap_fs_ext::DirExt;
 
         let table = self.table();
-        let d = table.get(&fd)?.dir()?;
+        let d = table.get_dir(fd)?;
         if !d.perms.contains(DirPerms::MUTATE) {
             return Err(ErrorCode::NotPermitted.into());
         }
@@ -684,13 +678,13 @@ impl<T: WasiView> HostDescriptor for T {
 
     async fn unlink_file_at(
         &mut self,
-        fd: Resource<types::Descriptor>,
+        fd: types::Descriptor,
         path: String,
-    ) -> FsResult<()> {
+    ) -> Result<(), types::Error> {
         use cap_fs_ext::DirExt;
 
         let table = self.table();
-        let d = table.get(&fd)?.dir()?;
+        let d = table.get_dir(fd)?;
         if !d.perms.contains(DirPerms::MUTATE) {
             return Err(ErrorCode::NotPermitted.into());
         }
@@ -700,41 +694,66 @@ impl<T: WasiView> HostDescriptor for T {
 
     async fn access_at(
         &mut self,
-        _fd: Resource<types::Descriptor>,
+        _fd: types::Descriptor,
         _path_flags: types::PathFlags,
         _path: String,
         _access: types::AccessType,
-    ) -> FsResult<()> {
+    ) -> Result<(), types::Error> {
         todo!("filesystem access_at is not implemented")
     }
 
     async fn change_file_permissions_at(
         &mut self,
-        _fd: Resource<types::Descriptor>,
+        _fd: types::Descriptor,
         _path_flags: types::PathFlags,
         _path: String,
         _mode: types::Modes,
-    ) -> FsResult<()> {
+    ) -> Result<(), types::Error> {
         todo!("filesystem change_file_permissions_at is not implemented")
     }
 
     async fn change_directory_permissions_at(
         &mut self,
-        _fd: Resource<types::Descriptor>,
+        _fd: types::Descriptor,
         _path_flags: types::PathFlags,
         _path: String,
         _mode: types::Modes,
-    ) -> FsResult<()> {
+    ) -> Result<(), types::Error> {
         todo!("filesystem change_directory_permissions_at is not implemented")
     }
 
+    async fn lock_shared(&mut self, _fd: types::Descriptor) -> Result<(), types::Error> {
+        todo!("filesystem lock_shared is not implemented")
+    }
+
+    async fn lock_exclusive(&mut self, _fd: types::Descriptor) -> Result<(), types::Error> {
+        todo!("filesystem lock_exclusive is not implemented")
+    }
+
+    async fn try_lock_shared(&mut self, _fd: types::Descriptor) -> Result<(), types::Error> {
+        todo!("filesystem try_lock_shared is not implemented")
+    }
+
+    async fn try_lock_exclusive(&mut self, _fd: types::Descriptor) -> Result<(), types::Error> {
+        todo!("filesystem try_lock_exclusive is not implemented")
+    }
+
+    async fn unlock(&mut self, _fd: types::Descriptor) -> Result<(), types::Error> {
+        todo!("filesystem unlock is not implemented")
+    }
+
     fn read_via_stream(
         &mut self,
-        fd: Resource<types::Descriptor>,
+        fd: types::Descriptor,
         offset: types::Filesize,
-    ) -> FsResult<Resource<InputStream>> {
+    ) -> Result<streams::InputStream, types::Error> {
+        use crate::preview2::{
+            filesystem::FileInputStream,
+            stream::{InternalInputStream, InternalTableStreamExt},
+        };
+
         // Trap if fd lookup fails:
-        let f = self.table().get(&fd)?.file()?;
+        let f = self.table().get_file(fd)?;
 
         if !f.perms.contains(FilePerms::READ) {
             Err(types::ErrorCode::BadDescriptor)?;
@@ -746,18 +765,22 @@ impl<T: WasiView> HostDescriptor for T {
         let reader = FileInputStream::new(clone, offset);
 
         // Insert the stream view into the table. Trap if the table is full.
-        let index = self.table_mut().push(InputStream::File(reader))?;
+        let index = self
+            .table_mut()
+            .push_internal_input_stream(InternalInputStream::File(reader))?;
 
         Ok(index)
     }
 
     fn write_via_stream(
         &mut self,
-        fd: Resource<types::Descriptor>,
+        fd: types::Descriptor,
         offset: types::Filesize,
-    ) -> FsResult<Resource<OutputStream>> {
+    ) -> Result<streams::OutputStream, types::Error> {
+        use crate::preview2::{filesystem::FileOutputStream, TableStreamExt};
+
         // Trap if fd lookup fails:
-        let f = self.table().get(&fd)?.file()?;
+        let f = self.table().get_file(fd)?;
 
         if !f.perms.contains(FilePerms::WRITE) {
             Err(types::ErrorCode::BadDescriptor)?;
@@ -768,20 +791,21 @@ impl<T: WasiView> HostDescriptor for T {
 
         // Create a stream view for it.
         let writer = FileOutputStream::write_at(clone, offset);
-        let writer: OutputStream = Box::new(writer);
 
         // Insert the stream view into the table. Trap if the table is full.
-        let index = self.table_mut().push(writer)?;
+        let index = self.table_mut().push_output_stream(Box::new(writer))?;
 
         Ok(index)
     }
 
     fn append_via_stream(
         &mut self,
-        fd: Resource<types::Descriptor>,
-    ) -> FsResult<Resource<OutputStream>> {
+        fd: types::Descriptor,
+    ) -> Result<streams::OutputStream, types::Error> {
+        use crate::preview2::{filesystem::FileOutputStream, TableStreamExt};
+
         // Trap if fd lookup fails:
-        let f = self.table().get(&fd)?.file()?;
+        let f = self.table().get_file(fd)?;
 
         if !f.perms.contains(FilePerms::WRITE) {
             Err(types::ErrorCode::BadDescriptor)?;
@@ -791,18 +815,17 @@ impl<T: WasiView> HostDescriptor for T {
 
         // Create a stream view for it.
         let appender = FileOutputStream::append(clone);
-        let appender: OutputStream = Box::new(appender);
 
         // Insert the stream view into the table. Trap if the table is full.
-        let index = self.table_mut().push(appender)?;
+        let index = self.table_mut().push_output_stream(Box::new(appender))?;
 
         Ok(index)
     }
 
     async fn is_same_object(
         &mut self,
-        a: Resource<types::Descriptor>,
-        b: Resource<types::Descriptor>,
+        a: types::Descriptor,
+        b: types::Descriptor,
     ) -> anyhow::Result<bool> {
         use cap_fs_ext::MetadataExt;
         let table = self.table();
@@ -827,20 +850,20 @@ impl<T: WasiView> HostDescriptor for T {
     }
     async fn metadata_hash(
         &mut self,
-        fd: Resource<types::Descriptor>,
-    ) -> FsResult<types::MetadataHashValue> {
+        fd: types::Descriptor,
+    ) -> Result<types::MetadataHashValue, types::Error> {
         let table = self.table();
         let meta = get_descriptor_metadata(table, fd).await?;
         Ok(calculate_metadata_hash(&meta))
     }
     async fn metadata_hash_at(
         &mut self,
-        fd: Resource<types::Descriptor>,
+        fd: types::Descriptor,
         path_flags: types::PathFlags,
         path: String,
-    ) -> FsResult<types::MetadataHashValue> {
+    ) -> Result<types::MetadataHashValue, types::Error> {
         let table = self.table();
-        let d = table.get(&fd)?.dir()?;
+        let d = table.get_dir(fd)?;
         // No permissions check on metadata: if dir opened, allowed to stat it
         let meta = d
             .spawn_blocking(move |d| {
@@ -855,36 +878,20 @@ impl<T: WasiView> HostDescriptor for T {
     }
 }
 
-#[async_trait::async_trait]
-impl<T: WasiView> HostDirectoryEntryStream for T {
-    async fn read_directory_entry(
-        &mut self,
-        stream: Resource<types::DirectoryEntryStream>,
-    ) -> FsResult<Option<types::DirectoryEntry>> {
-        let table = self.table();
-        let readdir = table.get(&stream)?;
-        readdir.next()
-    }
-
-    fn drop(&mut self, stream: Resource<types::DirectoryEntryStream>) -> anyhow::Result<()> {
-        self.table_mut().delete(stream)?;
-        Ok(())
-    }
-}
-
 async fn get_descriptor_metadata(
     table: &Table,
-    fd: Resource<types::Descriptor>,
-) -> FsResult<cap_std::fs::Metadata> {
-    match table.get(&fd)? {
-        Descriptor::File(f) => {
-            // No permissions check on metadata: if opened, allowed to stat it
-            Ok(f.spawn_blocking(|f| f.metadata()).await?)
-        }
-        Descriptor::Dir(d) => {
-            // No permissions check on metadata: if opened, allowed to stat it
-            Ok(d.spawn_blocking(|d| d.dir_metadata()).await?)
-        }
+    fd: types::Descriptor,
+) -> Result<cap_std::fs::Metadata, types::Error> {
+    if table.is_file(fd) {
+        let f = table.get_file(fd)?;
+        // No permissions check on metadata: if opened, allowed to stat it
+        Ok(f.spawn_blocking(|f| f.metadata()).await?)
+    } else if table.is_dir(fd) {
+        let d = table.get_dir(fd)?;
+        // No permissions check on metadata: if opened, allowed to stat it
+        Ok(d.spawn_blocking(|d| d.dir_metadata()).await?)
+    } else {
+        Err(ErrorCode::BadDescriptor.into())
     }
 }
 
@@ -913,109 +920,100 @@ fn calculate_metadata_hash(meta: &cap_std::fs::Metadata) -> types::MetadataHashV
 }
 
 #[cfg(unix)]
-fn from_raw_os_error(err: Option<i32>) -> Option<ErrorCode> {
+fn from_raw_os_error(err: Option<i32>) -> Option<types::Error> {
     use rustix::io::Errno as RustixErrno;
     if err.is_none() {
         return None;
     }
     Some(match RustixErrno::from_raw_os_error(err.unwrap()) {
-        RustixErrno::PIPE => ErrorCode::Pipe,
-        RustixErrno::PERM => ErrorCode::NotPermitted,
-        RustixErrno::NOENT => ErrorCode::NoEntry,
-        RustixErrno::NOMEM => ErrorCode::InsufficientMemory,
-        RustixErrno::IO => ErrorCode::Io,
-        RustixErrno::BADF => ErrorCode::BadDescriptor,
-        RustixErrno::BUSY => ErrorCode::Busy,
-        RustixErrno::ACCESS => ErrorCode::Access,
-        RustixErrno::NOTDIR => ErrorCode::NotDirectory,
-        RustixErrno::ISDIR => ErrorCode::IsDirectory,
-        RustixErrno::INVAL => ErrorCode::Invalid,
-        RustixErrno::EXIST => ErrorCode::Exist,
-        RustixErrno::FBIG => ErrorCode::FileTooLarge,
-        RustixErrno::NOSPC => ErrorCode::InsufficientSpace,
-        RustixErrno::SPIPE => ErrorCode::InvalidSeek,
-        RustixErrno::MLINK => ErrorCode::TooManyLinks,
-        RustixErrno::NAMETOOLONG => ErrorCode::NameTooLong,
-        RustixErrno::NOTEMPTY => ErrorCode::NotEmpty,
-        RustixErrno::LOOP => ErrorCode::Loop,
-        RustixErrno::OVERFLOW => ErrorCode::Overflow,
-        RustixErrno::ILSEQ => ErrorCode::IllegalByteSequence,
-        RustixErrno::NOTSUP => ErrorCode::Unsupported,
-        RustixErrno::ALREADY => ErrorCode::Already,
-        RustixErrno::INPROGRESS => ErrorCode::InProgress,
-        RustixErrno::INTR => ErrorCode::Interrupted,
-
-        // On some platforms, these have the same value as other errno values.
+        RustixErrno::PIPE => ErrorCode::Pipe.into(),
+        RustixErrno::PERM => ErrorCode::NotPermitted.into(),
+        RustixErrno::NOENT => ErrorCode::NoEntry.into(),
+        RustixErrno::NOMEM => ErrorCode::InsufficientMemory.into(),
+        RustixErrno::IO => ErrorCode::Io.into(),
+        RustixErrno::BADF => ErrorCode::BadDescriptor.into(),
+        RustixErrno::BUSY => ErrorCode::Busy.into(),
+        RustixErrno::ACCESS => ErrorCode::Access.into(),
+        RustixErrno::NOTDIR => ErrorCode::NotDirectory.into(),
+        RustixErrno::ISDIR => ErrorCode::IsDirectory.into(),
+        RustixErrno::INVAL => ErrorCode::Invalid.into(),
+        RustixErrno::EXIST => ErrorCode::Exist.into(),
+        RustixErrno::FBIG => ErrorCode::FileTooLarge.into(),
+        RustixErrno::NOSPC => ErrorCode::InsufficientSpace.into(),
+        RustixErrno::SPIPE => ErrorCode::InvalidSeek.into(),
+        RustixErrno::MLINK => ErrorCode::TooManyLinks.into(),
+        RustixErrno::NAMETOOLONG => ErrorCode::NameTooLong.into(),
+        RustixErrno::NOTEMPTY => ErrorCode::NotEmpty.into(),
+        RustixErrno::LOOP => ErrorCode::Loop.into(),
+        RustixErrno::OVERFLOW => ErrorCode::Overflow.into(),
+        RustixErrno::ILSEQ => ErrorCode::IllegalByteSequence.into(),
+        RustixErrno::NOTSUP => ErrorCode::Unsupported.into(),
+        RustixErrno::ALREADY => ErrorCode::Already.into(),
+        RustixErrno::INPROGRESS => ErrorCode::InProgress.into(),
+        RustixErrno::INTR => ErrorCode::Interrupted.into(),
+
+        // On some platforms.into(), these have the same value as other errno values.
         #[allow(unreachable_patterns)]
-        RustixErrno::OPNOTSUPP => ErrorCode::Unsupported,
+        RustixErrno::OPNOTSUPP => ErrorCode::Unsupported.into(),
 
         _ => return None,
     })
 }
 #[cfg(windows)]
-fn from_raw_os_error(raw_os_error: Option<i32>) -> Option<ErrorCode> {
+fn from_raw_os_error(raw_os_error: Option<i32>) -> Option<types::Error> {
     use windows_sys::Win32::Foundation;
     Some(match raw_os_error.map(|code| code as u32) {
-        Some(Foundation::ERROR_FILE_NOT_FOUND) => ErrorCode::NoEntry,
-        Some(Foundation::ERROR_PATH_NOT_FOUND) => ErrorCode::NoEntry,
-        Some(Foundation::ERROR_ACCESS_DENIED) => ErrorCode::Access,
-        Some(Foundation::ERROR_SHARING_VIOLATION) => ErrorCode::Access,
-        Some(Foundation::ERROR_PRIVILEGE_NOT_HELD) => ErrorCode::NotPermitted,
-        Some(Foundation::ERROR_INVALID_HANDLE) => ErrorCode::BadDescriptor,
-        Some(Foundation::ERROR_INVALID_NAME) => ErrorCode::NoEntry,
-        Some(Foundation::ERROR_NOT_ENOUGH_MEMORY) => ErrorCode::InsufficientMemory,
-        Some(Foundation::ERROR_OUTOFMEMORY) => ErrorCode::InsufficientMemory,
-        Some(Foundation::ERROR_DIR_NOT_EMPTY) => ErrorCode::NotEmpty,
-        Some(Foundation::ERROR_NOT_READY) => ErrorCode::Busy,
-        Some(Foundation::ERROR_BUSY) => ErrorCode::Busy,
-        Some(Foundation::ERROR_NOT_SUPPORTED) => ErrorCode::Unsupported,
-        Some(Foundation::ERROR_FILE_EXISTS) => ErrorCode::Exist,
-        Some(Foundation::ERROR_BROKEN_PIPE) => ErrorCode::Pipe,
-        Some(Foundation::ERROR_BUFFER_OVERFLOW) => ErrorCode::NameTooLong,
-        Some(Foundation::ERROR_NOT_A_REPARSE_POINT) => ErrorCode::Invalid,
-        Some(Foundation::ERROR_NEGATIVE_SEEK) => ErrorCode::Invalid,
-        Some(Foundation::ERROR_DIRECTORY) => ErrorCode::NotDirectory,
-        Some(Foundation::ERROR_ALREADY_EXISTS) => ErrorCode::Exist,
-        Some(Foundation::ERROR_STOPPED_ON_SYMLINK) => ErrorCode::Loop,
-        Some(Foundation::ERROR_DIRECTORY_NOT_SUPPORTED) => ErrorCode::IsDirectory,
+        Some(Foundation::ERROR_FILE_NOT_FOUND) => ErrorCode::NoEntry.into(),
+        Some(Foundation::ERROR_PATH_NOT_FOUND) => ErrorCode::NoEntry.into(),
+        Some(Foundation::ERROR_ACCESS_DENIED) => ErrorCode::Access.into(),
+        Some(Foundation::ERROR_SHARING_VIOLATION) => ErrorCode::Access.into(),
+        Some(Foundation::ERROR_PRIVILEGE_NOT_HELD) => ErrorCode::NotPermitted.into(),
+        Some(Foundation::ERROR_INVALID_HANDLE) => ErrorCode::BadDescriptor.into(),
+        Some(Foundation::ERROR_INVALID_NAME) => ErrorCode::NoEntry.into(),
+        Some(Foundation::ERROR_NOT_ENOUGH_MEMORY) => ErrorCode::InsufficientMemory.into(),
+        Some(Foundation::ERROR_OUTOFMEMORY) => ErrorCode::InsufficientMemory.into(),
+        Some(Foundation::ERROR_DIR_NOT_EMPTY) => ErrorCode::NotEmpty.into(),
+        Some(Foundation::ERROR_NOT_READY) => ErrorCode::Busy.into(),
+        Some(Foundation::ERROR_BUSY) => ErrorCode::Busy.into(),
+        Some(Foundation::ERROR_NOT_SUPPORTED) => ErrorCode::Unsupported.into(),
+        Some(Foundation::ERROR_FILE_EXISTS) => ErrorCode::Exist.into(),
+        Some(Foundation::ERROR_BROKEN_PIPE) => ErrorCode::Pipe.into(),
+        Some(Foundation::ERROR_BUFFER_OVERFLOW) => ErrorCode::NameTooLong.into(),
+        Some(Foundation::ERROR_NOT_A_REPARSE_POINT) => ErrorCode::Invalid.into(),
+        Some(Foundation::ERROR_NEGATIVE_SEEK) => ErrorCode::Invalid.into(),
+        Some(Foundation::ERROR_DIRECTORY) => ErrorCode::NotDirectory.into(),
+        Some(Foundation::ERROR_ALREADY_EXISTS) => ErrorCode::Exist.into(),
+        Some(Foundation::ERROR_STOPPED_ON_SYMLINK) => ErrorCode::Loop.into(),
+        Some(Foundation::ERROR_DIRECTORY_NOT_SUPPORTED) => ErrorCode::IsDirectory.into(),
         _ => return None,
     })
 }
 
-impl From<std::io::Error> for ErrorCode {
-    fn from(err: std::io::Error) -> ErrorCode {
-        ErrorCode::from(&err)
-    }
-}
-
-impl<'a> From<&'a std::io::Error> for ErrorCode {
-    fn from(err: &'a std::io::Error) -> ErrorCode {
+impl From<std::io::Error> for types::Error {
+    fn from(err: std::io::Error) -> types::Error {
         match from_raw_os_error(err.raw_os_error()) {
             Some(errno) => errno,
-            None => {
-                log::debug!("unknown raw os error: {err}");
-                match err.kind() {
-                    std::io::ErrorKind::NotFound => ErrorCode::NoEntry,
-                    std::io::ErrorKind::PermissionDenied => ErrorCode::NotPermitted,
-                    std::io::ErrorKind::AlreadyExists => ErrorCode::Exist,
-                    std::io::ErrorKind::InvalidInput => ErrorCode::Invalid,
-                    _ => ErrorCode::Io,
-                }
-            }
+            None => match err.kind() {
+                std::io::ErrorKind::NotFound => ErrorCode::NoEntry.into(),
+                std::io::ErrorKind::PermissionDenied => ErrorCode::NotPermitted.into(),
+                std::io::ErrorKind::AlreadyExists => ErrorCode::Exist.into(),
+                std::io::ErrorKind::InvalidInput => ErrorCode::Invalid.into(),
+                _ => types::Error::trap(anyhow::anyhow!(err).context("Unknown OS error")),
+            },
         }
     }
 }
 
-impl From<cap_rand::Error> for ErrorCode {
-    fn from(err: cap_rand::Error) -> ErrorCode {
+impl From<cap_rand::Error> for types::Error {
+    fn from(err: cap_rand::Error) -> types::Error {
         // I picked Error::Io as a 'reasonable default', FIXME dan is this ok?
-        from_raw_os_error(err.raw_os_error()).unwrap_or(ErrorCode::Io)
+        from_raw_os_error(err.raw_os_error()).unwrap_or_else(|| types::Error::from(ErrorCode::Io))
     }
 }
 
-impl From<std::num::TryFromIntError> for ErrorCode {
-    fn from(_err: std::num::TryFromIntError) -> ErrorCode {
-        ErrorCode::Overflow
+impl From<std::num::TryFromIntError> for types::Error {
+    fn from(_err: std::num::TryFromIntError) -> types::Error {
+        ErrorCode::Overflow.into()
     }
 }
 
@@ -1037,7 +1035,9 @@ fn descriptortype_from(ft: cap_std::fs::FileType) -> types::DescriptorType {
     }
 }
 
-fn systemtimespec_from(t: types::NewTimestamp) -> FsResult<Option<fs_set_times::SystemTimeSpec>> {
+fn systemtimespec_from(
+    t: types::NewTimestamp,
+) -> Result<Option<fs_set_times::SystemTimeSpec>, types::Error> {
     use fs_set_times::SystemTimeSpec;
     use types::NewTimestamp;
     match t {
@@ -1047,7 +1047,7 @@ fn systemtimespec_from(t: types::NewTimestamp) -> FsResult<Option<fs_set_times::
     }
 }
 
-fn systemtime_from(t: wall_clock::Datetime) -> FsResult<std::time::SystemTime> {
+fn systemtime_from(t: wall_clock::Datetime) -> Result<std::time::SystemTime, types::Error> {
     use std::time::{Duration, SystemTime};
     SystemTime::UNIX_EPOCH
         .checked_add(Duration::new(t.seconds, t.nanoseconds))
@@ -1065,9 +1065,28 @@ fn descriptorstat_from(meta: cap_std::fs::Metadata) -> types::DescriptorStat {
         type_: descriptortype_from(meta.file_type()),
         link_count: meta.nlink(),
         size: meta.len(),
-        data_access_timestamp: meta.accessed().map(|t| datetime_from(t.into_std())).ok(),
-        data_modification_timestamp: meta.modified().map(|t| datetime_from(t.into_std())).ok(),
-        status_change_timestamp: meta.created().map(|t| datetime_from(t.into_std())).ok(),
+        // FIXME change the wit to make these timestamps optional
+        data_access_timestamp: meta
+            .accessed()
+            .map(|t| datetime_from(t.into_std()))
+            .unwrap_or(wall_clock::Datetime {
+                seconds: 0,
+                nanoseconds: 0,
+            }),
+        data_modification_timestamp: meta
+            .modified()
+            .map(|t| datetime_from(t.into_std()))
+            .unwrap_or(wall_clock::Datetime {
+                seconds: 0,
+                nanoseconds: 0,
+            }),
+        status_change_timestamp: meta
+            .created()
+            .map(|t| datetime_from(t.into_std()))
+            .unwrap_or(wall_clock::Datetime {
+                seconds: 0,
+                nanoseconds: 0,
+            }),
     }
 }
 
@@ -1075,6 +1094,51 @@ fn symlink_follow(path_flags: types::PathFlags) -> bool {
     path_flags.contains(types::PathFlags::SYMLINK_FOLLOW)
 }
 
+pub(crate) struct ReaddirIterator(
+    std::sync::Mutex<
+        Box<dyn Iterator<Item = Result<types::DirectoryEntry, types::Error>> + Send + 'static>,
+    >,
+);
+
+impl ReaddirIterator {
+    fn new(
+        i: impl Iterator<Item = Result<types::DirectoryEntry, types::Error>> + Send + 'static,
+    ) -> Self {
+        ReaddirIterator(std::sync::Mutex::new(Box::new(i)))
+    }
+    fn next(&self) -> Result<Option<types::DirectoryEntry>, types::Error> {
+        self.0.lock().unwrap().next().transpose()
+    }
+}
+
+impl IntoIterator for ReaddirIterator {
+    type Item = Result<types::DirectoryEntry, types::Error>;
+    type IntoIter = Box<dyn Iterator<Item = Self::Item> + Send>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_inner().unwrap()
+    }
+}
+
+pub(crate) trait TableReaddirExt {
+    fn push_readdir(&mut self, readdir: ReaddirIterator) -> Result<u32, TableError>;
+    fn delete_readdir(&mut self, fd: u32) -> Result<ReaddirIterator, TableError>;
+    fn get_readdir(&self, fd: u32) -> Result<&ReaddirIterator, TableError>;
+}
+
+impl TableReaddirExt for Table {
+    fn push_readdir(&mut self, readdir: ReaddirIterator) -> Result<u32, TableError> {
+        self.push(Box::new(readdir))
+    }
+    fn delete_readdir(&mut self, fd: u32) -> Result<ReaddirIterator, TableError> {
+        self.delete(fd)
+    }
+
+    fn get_readdir(&self, fd: u32) -> Result<&ReaddirIterator, TableError> {
+        self.get(fd)
+    }
+}
+
 fn mask_file_perms(p: FilePerms, flags: types::DescriptorFlags) -> FilePerms {
     use types::DescriptorFlags;
     let mut out = FilePerms::empty();
@@ -1094,9 +1158,10 @@ mod test {
     fn table_readdir_works() {
         let mut table = Table::new();
         let ix = table
-            .push(ReaddirIterator::new(std::iter::empty()))
+            .push_readdir(ReaddirIterator::new(std::iter::empty()))
             .unwrap();
-        let _ = table.get(&ix).unwrap();
-        table.delete(ix).unwrap();
+        let _ = table.get_readdir(ix).unwrap();
+        table.delete_readdir(ix).unwrap();
+        let _ = table.get_readdir(ix).err().unwrap();
     }
 }
diff --git a/crates/wasi/src/preview2/host/filesystem/sync.rs b/crates/wasi/src/preview2/host/filesystem/sync.rs
index 28a9b77f50fe..55ad761d8cfc 100644
--- a/crates/wasi/src/preview2/host/filesystem/sync.rs
+++ b/crates/wasi/src/preview2/host/filesystem/sync.rs
@@ -1,140 +1,155 @@
 use crate::preview2::bindings::filesystem::types as async_filesystem;
 use crate::preview2::bindings::sync_io::filesystem::types as sync_filesystem;
 use crate::preview2::bindings::sync_io::io::streams;
-use crate::preview2::{in_tokio, FsError, FsResult};
-use wasmtime::component::Resource;
+use crate::preview2::in_tokio;
 
 impl<T: async_filesystem::Host> sync_filesystem::Host for T {
-    fn convert_error_code(&mut self, err: FsError) -> anyhow::Result<sync_filesystem::ErrorCode> {
-        Ok(async_filesystem::Host::convert_error_code(self, err)?.into())
-    }
-
-    fn filesystem_error_code(
-        &mut self,
-        err: Resource<streams::Error>,
-    ) -> anyhow::Result<Option<sync_filesystem::ErrorCode>> {
-        Ok(async_filesystem::Host::filesystem_error_code(self, err)?.map(|e| e.into()))
-    }
-}
-
-impl<T: async_filesystem::HostDescriptor> sync_filesystem::HostDescriptor for T {
     fn advise(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         offset: sync_filesystem::Filesize,
         len: sync_filesystem::Filesize,
         advice: sync_filesystem::Advice,
-    ) -> FsResult<()> {
-        in_tokio(async {
-            async_filesystem::HostDescriptor::advise(self, fd, offset, len, advice.into()).await
-        })
+    ) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::advise(self, fd, offset, len, advice.into()).await
+        })?)
     }
 
-    fn sync_data(&mut self, fd: Resource<sync_filesystem::Descriptor>) -> FsResult<()> {
-        in_tokio(async { async_filesystem::HostDescriptor::sync_data(self, fd).await })
+    fn sync_data(&mut self, fd: sync_filesystem::Descriptor) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::sync_data(self, fd).await
+        })?)
     }
 
     fn get_flags(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
-    ) -> FsResult<sync_filesystem::DescriptorFlags> {
-        Ok(in_tokio(async { async_filesystem::HostDescriptor::get_flags(self, fd).await })?.into())
+        fd: sync_filesystem::Descriptor,
+    ) -> Result<sync_filesystem::DescriptorFlags, sync_filesystem::Error> {
+        Ok(in_tokio(async { async_filesystem::Host::get_flags(self, fd).await })?.into())
     }
 
     fn get_type(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
-    ) -> FsResult<sync_filesystem::DescriptorType> {
-        Ok(in_tokio(async { async_filesystem::HostDescriptor::get_type(self, fd).await })?.into())
+        fd: sync_filesystem::Descriptor,
+    ) -> Result<sync_filesystem::DescriptorType, sync_filesystem::Error> {
+        Ok(in_tokio(async { async_filesystem::Host::get_type(self, fd).await })?.into())
     }
 
     fn set_size(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         size: sync_filesystem::Filesize,
-    ) -> FsResult<()> {
-        in_tokio(async { async_filesystem::HostDescriptor::set_size(self, fd, size).await })
+    ) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::set_size(self, fd, size).await
+        })?)
     }
 
     fn set_times(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         atim: sync_filesystem::NewTimestamp,
         mtim: sync_filesystem::NewTimestamp,
-    ) -> FsResult<()> {
-        in_tokio(async {
-            async_filesystem::HostDescriptor::set_times(self, fd, atim.into(), mtim.into()).await
-        })
+    ) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::set_times(self, fd, atim.into(), mtim.into()).await
+        })?)
     }
 
     fn read(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         len: sync_filesystem::Filesize,
         offset: sync_filesystem::Filesize,
-    ) -> FsResult<(Vec<u8>, bool)> {
-        in_tokio(async { async_filesystem::HostDescriptor::read(self, fd, len, offset).await })
+    ) -> Result<(Vec<u8>, bool), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::read(self, fd, len, offset).await
+        })?)
     }
 
     fn write(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         buf: Vec<u8>,
         offset: sync_filesystem::Filesize,
-    ) -> FsResult<sync_filesystem::Filesize> {
-        in_tokio(async { async_filesystem::HostDescriptor::write(self, fd, buf, offset).await })
+    ) -> Result<sync_filesystem::Filesize, sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::write(self, fd, buf, offset).await
+        })?)
     }
 
     fn read_directory(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
-    ) -> FsResult<Resource<sync_filesystem::DirectoryEntryStream>> {
-        in_tokio(async { async_filesystem::HostDescriptor::read_directory(self, fd).await })
+        fd: sync_filesystem::Descriptor,
+    ) -> Result<sync_filesystem::DirectoryEntryStream, sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::read_directory(self, fd).await
+        })?)
+    }
+
+    fn read_directory_entry(
+        &mut self,
+        stream: sync_filesystem::DirectoryEntryStream,
+    ) -> Result<Option<sync_filesystem::DirectoryEntry>, sync_filesystem::Error> {
+        Ok(
+            in_tokio(async { async_filesystem::Host::read_directory_entry(self, stream).await })?
+                .map(|e| e.into()),
+        )
     }
 
-    fn sync(&mut self, fd: Resource<sync_filesystem::Descriptor>) -> FsResult<()> {
-        in_tokio(async { async_filesystem::HostDescriptor::sync(self, fd).await })
+    fn drop_directory_entry_stream(
+        &mut self,
+        stream: sync_filesystem::DirectoryEntryStream,
+    ) -> anyhow::Result<()> {
+        async_filesystem::Host::drop_directory_entry_stream(self, stream)
+    }
+
+    fn sync(&mut self, fd: sync_filesystem::Descriptor) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::sync(self, fd).await
+        })?)
     }
 
     fn create_directory_at(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         path: String,
-    ) -> FsResult<()> {
-        in_tokio(async {
-            async_filesystem::HostDescriptor::create_directory_at(self, fd, path).await
-        })
+    ) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::create_directory_at(self, fd, path).await
+        })?)
     }
 
     fn stat(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
-    ) -> FsResult<sync_filesystem::DescriptorStat> {
-        Ok(in_tokio(async { async_filesystem::HostDescriptor::stat(self, fd).await })?.into())
+        fd: sync_filesystem::Descriptor,
+    ) -> Result<sync_filesystem::DescriptorStat, sync_filesystem::Error> {
+        Ok(in_tokio(async { async_filesystem::Host::stat(self, fd).await })?.into())
     }
 
     fn stat_at(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         path_flags: sync_filesystem::PathFlags,
         path: String,
-    ) -> FsResult<sync_filesystem::DescriptorStat> {
+    ) -> Result<sync_filesystem::DescriptorStat, sync_filesystem::Error> {
         Ok(in_tokio(async {
-            async_filesystem::HostDescriptor::stat_at(self, fd, path_flags.into(), path).await
+            async_filesystem::Host::stat_at(self, fd, path_flags.into(), path).await
         })?
         .into())
     }
 
     fn set_times_at(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         path_flags: sync_filesystem::PathFlags,
         path: String,
         atim: sync_filesystem::NewTimestamp,
         mtim: sync_filesystem::NewTimestamp,
-    ) -> FsResult<()> {
-        in_tokio(async {
-            async_filesystem::HostDescriptor::set_times_at(
+    ) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::set_times_at(
                 self,
                 fd,
                 path_flags.into(),
@@ -143,20 +158,20 @@ impl<T: async_filesystem::HostDescriptor> sync_filesystem::HostDescriptor for T
                 mtim.into(),
             )
             .await
-        })
+        })?)
     }
 
     fn link_at(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         // TODO delete the path flags from this function
         old_path_flags: sync_filesystem::PathFlags,
         old_path: String,
-        new_descriptor: Resource<sync_filesystem::Descriptor>,
+        new_descriptor: sync_filesystem::Descriptor,
         new_path: String,
-    ) -> FsResult<()> {
-        in_tokio(async {
-            async_filesystem::HostDescriptor::link_at(
+    ) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::link_at(
                 self,
                 fd,
                 old_path_flags.into(),
@@ -165,20 +180,20 @@ impl<T: async_filesystem::HostDescriptor> sync_filesystem::HostDescriptor for T
                 new_path,
             )
             .await
-        })
+        })?)
     }
 
     fn open_at(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         path_flags: sync_filesystem::PathFlags,
         path: String,
         oflags: sync_filesystem::OpenFlags,
         flags: sync_filesystem::DescriptorFlags,
         mode: sync_filesystem::Modes,
-    ) -> FsResult<Resource<sync_filesystem::Descriptor>> {
-        in_tokio(async {
-            async_filesystem::HostDescriptor::open_at(
+    ) -> Result<sync_filesystem::Descriptor, sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::open_at(
                 self,
                 fd,
                 path_flags.into(),
@@ -188,90 +203,88 @@ impl<T: async_filesystem::HostDescriptor> sync_filesystem::HostDescriptor for T
                 mode.into(),
             )
             .await
-        })
+        })?)
     }
 
-    fn drop(&mut self, fd: Resource<sync_filesystem::Descriptor>) -> anyhow::Result<()> {
-        async_filesystem::HostDescriptor::drop(self, fd)
+    fn drop_descriptor(&mut self, fd: sync_filesystem::Descriptor) -> anyhow::Result<()> {
+        async_filesystem::Host::drop_descriptor(self, fd)
     }
 
     fn readlink_at(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         path: String,
-    ) -> FsResult<String> {
-        in_tokio(async { async_filesystem::HostDescriptor::readlink_at(self, fd, path).await })
+    ) -> Result<String, sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::readlink_at(self, fd, path).await
+        })?)
     }
 
     fn remove_directory_at(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         path: String,
-    ) -> FsResult<()> {
-        in_tokio(async {
-            async_filesystem::HostDescriptor::remove_directory_at(self, fd, path).await
-        })
+    ) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::remove_directory_at(self, fd, path).await
+        })?)
     }
 
     fn rename_at(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         old_path: String,
-        new_fd: Resource<sync_filesystem::Descriptor>,
+        new_fd: sync_filesystem::Descriptor,
         new_path: String,
-    ) -> FsResult<()> {
-        in_tokio(async {
-            async_filesystem::HostDescriptor::rename_at(self, fd, old_path, new_fd, new_path).await
-        })
+    ) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::rename_at(self, fd, old_path, new_fd, new_path).await
+        })?)
     }
 
     fn symlink_at(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         src_path: String,
         dest_path: String,
-    ) -> FsResult<()> {
-        in_tokio(async {
-            async_filesystem::HostDescriptor::symlink_at(self, fd, src_path, dest_path).await
-        })
+    ) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::symlink_at(self, fd, src_path, dest_path).await
+        })?)
     }
 
     fn unlink_file_at(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         path: String,
-    ) -> FsResult<()> {
-        in_tokio(async { async_filesystem::HostDescriptor::unlink_file_at(self, fd, path).await })
+    ) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::unlink_file_at(self, fd, path).await
+        })?)
     }
 
     fn access_at(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         path_flags: sync_filesystem::PathFlags,
         path: String,
         access: sync_filesystem::AccessType,
-    ) -> FsResult<()> {
-        in_tokio(async {
-            async_filesystem::HostDescriptor::access_at(
-                self,
-                fd,
-                path_flags.into(),
-                path,
-                access.into(),
-            )
-            .await
-        })
+    ) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::access_at(self, fd, path_flags.into(), path, access.into())
+                .await
+        })?)
     }
 
     fn change_file_permissions_at(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         path_flags: sync_filesystem::PathFlags,
         path: String,
         mode: sync_filesystem::Modes,
-    ) -> FsResult<()> {
-        in_tokio(async {
-            async_filesystem::HostDescriptor::change_file_permissions_at(
+    ) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::change_file_permissions_at(
                 self,
                 fd,
                 path_flags.into(),
@@ -279,18 +292,18 @@ impl<T: async_filesystem::HostDescriptor> sync_filesystem::HostDescriptor for T
                 mode.into(),
             )
             .await
-        })
+        })?)
     }
 
     fn change_directory_permissions_at(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         path_flags: sync_filesystem::PathFlags,
         path: String,
         mode: sync_filesystem::Modes,
-    ) -> FsResult<()> {
-        in_tokio(async {
-            async_filesystem::HostDescriptor::change_directory_permissions_at(
+    ) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::change_directory_permissions_at(
                 self,
                 fd,
                 path_flags.into(),
@@ -298,89 +311,102 @@ impl<T: async_filesystem::HostDescriptor> sync_filesystem::HostDescriptor for T
                 mode.into(),
             )
             .await
-        })
+        })?)
+    }
+
+    fn lock_shared(
+        &mut self,
+        fd: sync_filesystem::Descriptor,
+    ) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::lock_shared(self, fd).await
+        })?)
+    }
+
+    fn lock_exclusive(
+        &mut self,
+        fd: sync_filesystem::Descriptor,
+    ) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::lock_exclusive(self, fd).await
+        })?)
+    }
+
+    fn try_lock_shared(
+        &mut self,
+        fd: sync_filesystem::Descriptor,
+    ) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::try_lock_shared(self, fd).await
+        })?)
+    }
+
+    fn try_lock_exclusive(
+        &mut self,
+        fd: sync_filesystem::Descriptor,
+    ) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::try_lock_exclusive(self, fd).await
+        })?)
+    }
+
+    fn unlock(&mut self, fd: sync_filesystem::Descriptor) -> Result<(), sync_filesystem::Error> {
+        Ok(in_tokio(async {
+            async_filesystem::Host::unlock(self, fd).await
+        })?)
     }
 
     fn read_via_stream(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         offset: sync_filesystem::Filesize,
-    ) -> FsResult<Resource<streams::InputStream>> {
-        Ok(async_filesystem::HostDescriptor::read_via_stream(
-            self, fd, offset,
-        )?)
+    ) -> Result<streams::InputStream, sync_filesystem::Error> {
+        Ok(async_filesystem::Host::read_via_stream(self, fd, offset)?)
     }
 
     fn write_via_stream(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         offset: sync_filesystem::Filesize,
-    ) -> FsResult<Resource<streams::OutputStream>> {
-        Ok(async_filesystem::HostDescriptor::write_via_stream(
-            self, fd, offset,
-        )?)
+    ) -> Result<streams::OutputStream, sync_filesystem::Error> {
+        Ok(async_filesystem::Host::write_via_stream(self, fd, offset)?)
     }
 
     fn append_via_stream(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
-    ) -> FsResult<Resource<streams::OutputStream>> {
-        Ok(async_filesystem::HostDescriptor::append_via_stream(
-            self, fd,
-        )?)
+        fd: sync_filesystem::Descriptor,
+    ) -> Result<streams::OutputStream, sync_filesystem::Error> {
+        Ok(async_filesystem::Host::append_via_stream(self, fd)?)
     }
 
     fn is_same_object(
         &mut self,
-        a: Resource<sync_filesystem::Descriptor>,
-        b: Resource<sync_filesystem::Descriptor>,
+        a: sync_filesystem::Descriptor,
+        b: sync_filesystem::Descriptor,
     ) -> anyhow::Result<bool> {
-        in_tokio(async { async_filesystem::HostDescriptor::is_same_object(self, a, b).await })
+        Ok(in_tokio(async {
+            async_filesystem::Host::is_same_object(self, a, b).await
+        })?)
     }
     fn metadata_hash(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
-    ) -> FsResult<sync_filesystem::MetadataHashValue> {
-        Ok(
-            in_tokio(async { async_filesystem::HostDescriptor::metadata_hash(self, fd).await })?
-                .into(),
-        )
+        fd: sync_filesystem::Descriptor,
+    ) -> Result<sync_filesystem::MetadataHashValue, sync_filesystem::Error> {
+        Ok(in_tokio(async { async_filesystem::Host::metadata_hash(self, fd).await })?.into())
     }
     fn metadata_hash_at(
         &mut self,
-        fd: Resource<sync_filesystem::Descriptor>,
+        fd: sync_filesystem::Descriptor,
         path_flags: sync_filesystem::PathFlags,
         path: String,
-    ) -> FsResult<sync_filesystem::MetadataHashValue> {
+    ) -> Result<sync_filesystem::MetadataHashValue, sync_filesystem::Error> {
         Ok(in_tokio(async {
-            async_filesystem::HostDescriptor::metadata_hash_at(self, fd, path_flags.into(), path)
-                .await
+            async_filesystem::Host::metadata_hash_at(self, fd, path_flags.into(), path).await
         })?
         .into())
     }
 }
 
-impl<T: async_filesystem::HostDirectoryEntryStream> sync_filesystem::HostDirectoryEntryStream
-    for T
-{
-    fn read_directory_entry(
-        &mut self,
-        stream: Resource<sync_filesystem::DirectoryEntryStream>,
-    ) -> FsResult<Option<sync_filesystem::DirectoryEntry>> {
-        Ok(in_tokio(async {
-            async_filesystem::HostDirectoryEntryStream::read_directory_entry(self, stream).await
-        })?
-        .map(|e| e.into()))
-    }
-
-    fn drop(
-        &mut self,
-        stream: Resource<sync_filesystem::DirectoryEntryStream>,
-    ) -> anyhow::Result<()> {
-        async_filesystem::HostDirectoryEntryStream::drop(self, stream)
-    }
-}
-
 impl From<async_filesystem::ErrorCode> for sync_filesystem::ErrorCode {
     fn from(other: async_filesystem::ErrorCode) -> Self {
         use async_filesystem::ErrorCode;
@@ -426,6 +452,15 @@ impl From<async_filesystem::ErrorCode> for sync_filesystem::ErrorCode {
     }
 }
 
+impl From<async_filesystem::Error> for sync_filesystem::Error {
+    fn from(other: async_filesystem::Error) -> Self {
+        match other.downcast() {
+            Ok(errorcode) => Self::from(sync_filesystem::ErrorCode::from(errorcode)),
+            Err(other) => Self::trap(other),
+        }
+    }
+}
+
 impl From<sync_filesystem::Advice> for async_filesystem::Advice {
     fn from(other: sync_filesystem::Advice) -> Self {
         use sync_filesystem::Advice;
diff --git a/crates/wasi/src/preview2/host/instance_network.rs b/crates/wasi/src/preview2/host/instance_network.rs
index 6c36a738404c..8c8b56974aa1 100644
--- a/crates/wasi/src/preview2/host/instance_network.rs
+++ b/crates/wasi/src/preview2/host/instance_network.rs
@@ -1,15 +1,11 @@
-use crate::preview2::bindings::sockets::instance_network;
-use crate::preview2::network::Network;
+use crate::preview2::bindings::sockets::instance_network::{self, Network};
+use crate::preview2::network::{HostNetwork, TableNetworkExt};
 use crate::preview2::WasiView;
-use wasmtime::component::Resource;
 
 impl<T: WasiView> instance_network::Host for T {
-    fn instance_network(&mut self) -> Result<Resource<Network>, anyhow::Error> {
-        let network = Network {
-            pool: self.ctx().pool.clone(),
-            allow_ip_name_lookup: self.ctx().allow_ip_name_lookup,
-        };
-        let network = self.table_mut().push(network)?;
+    fn instance_network(&mut self) -> Result<Network, anyhow::Error> {
+        let network = HostNetwork::new(self.ctx().pool.clone());
+        let network = self.table_mut().push_network(network)?;
         Ok(network)
     }
 }
diff --git a/crates/wasi/src/preview2/host/io.rs b/crates/wasi/src/preview2/host/io.rs
index 1ad5b4ccb075..128272850348 100644
--- a/crates/wasi/src/preview2/host/io.rs
+++ b/crates/wasi/src/preview2/host/io.rs
@@ -1,375 +1,552 @@
 use crate::preview2::{
     bindings::io::streams::{self, InputStream, OutputStream},
-    poll::subscribe,
-    Pollable, StreamError, StreamResult, WasiView,
+    bindings::poll::poll::Pollable,
+    filesystem::FileInputStream,
+    poll::PollableFuture,
+    stream::{
+        HostInputStream, HostOutputStream, InternalInputStream, InternalTableStreamExt,
+        OutputStreamError, StreamRuntimeError, StreamState, TableStreamExt,
+    },
+    HostPollable, TableError, TablePollableExt, WasiView,
 };
-use wasmtime::component::Resource;
-
-impl<T: WasiView> streams::Host for T {
-    fn convert_stream_error(&mut self, err: StreamError) -> anyhow::Result<streams::StreamError> {
-        match err {
-            StreamError::Closed => Ok(streams::StreamError::Closed),
-            StreamError::LastOperationFailed(e) => Ok(streams::StreamError::LastOperationFailed(
-                self.table_mut().push(e)?,
-            )),
-            StreamError::Trap(e) => Err(e),
+use std::any::Any;
+use std::future::Future;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+impl From<StreamState> for streams::StreamStatus {
+    fn from(state: StreamState) -> Self {
+        match state {
+            StreamState::Open => Self::Open,
+            StreamState::Closed => Self::Ended,
         }
     }
 }
 
-impl<T: WasiView> streams::HostError for T {
-    fn drop(&mut self, err: Resource<streams::Error>) -> anyhow::Result<()> {
-        self.table_mut().delete(err)?;
-        Ok(())
+impl From<TableError> for streams::Error {
+    fn from(e: TableError) -> streams::Error {
+        streams::Error::trap(e.into())
     }
-
-    fn to_debug_string(&mut self, err: Resource<streams::Error>) -> anyhow::Result<String> {
-        Ok(format!("{:?}", self.table_mut().get(&err)?))
+}
+impl From<OutputStreamError> for streams::Error {
+    fn from(e: OutputStreamError) -> streams::Error {
+        match e {
+            OutputStreamError::Closed => streams::WriteError::Closed.into(),
+            OutputStreamError::LastOperationFailed(e) => {
+                tracing::debug!("streams::WriteError::LastOperationFailed: {e:?}");
+                streams::WriteError::LastOperationFailed.into()
+            }
+            OutputStreamError::Trap(e) => streams::Error::trap(e),
+        }
     }
 }
 
 #[async_trait::async_trait]
-impl<T: WasiView> streams::HostOutputStream for T {
-    fn drop(&mut self, stream: Resource<OutputStream>) -> anyhow::Result<()> {
-        self.table_mut().delete(stream)?;
+impl<T: WasiView> streams::Host for T {
+    fn drop_input_stream(&mut self, stream: InputStream) -> anyhow::Result<()> {
+        self.table_mut().delete_internal_input_stream(stream)?;
         Ok(())
     }
 
-    fn check_write(&mut self, stream: Resource<OutputStream>) -> StreamResult<u64> {
-        let bytes = self.table_mut().get_mut(&stream)?.check_write()?;
-        Ok(bytes as u64)
-    }
-
-    fn write(&mut self, stream: Resource<OutputStream>, bytes: Vec<u8>) -> StreamResult<()> {
-        self.table_mut().get_mut(&stream)?.write(bytes.into())?;
+    fn drop_output_stream(&mut self, stream: OutputStream) -> anyhow::Result<()> {
+        self.table_mut().delete_output_stream(stream)?;
         Ok(())
     }
 
-    fn subscribe(&mut self, stream: Resource<OutputStream>) -> anyhow::Result<Resource<Pollable>> {
-        subscribe(self.table_mut(), stream)
-    }
-
-    async fn blocking_write_and_flush(
+    async fn read(
         &mut self,
-        stream: Resource<OutputStream>,
-        bytes: Vec<u8>,
-    ) -> StreamResult<()> {
-        let s = self.table_mut().get_mut(&stream)?;
-
-        if bytes.len() > 4096 {
-            return Err(StreamError::trap(
-                "Buffer too large for blocking-write-and-flush (expected at most 4096)",
-            ));
+        stream: InputStream,
+        len: u64,
+    ) -> anyhow::Result<Result<(Vec<u8>, streams::StreamStatus), ()>> {
+        match self.table_mut().get_internal_input_stream_mut(stream)? {
+            InternalInputStream::Host(s) => {
+                let (bytes, state) = match HostInputStream::read(s.as_mut(), len as usize) {
+                    Ok(a) => a,
+                    Err(e) => {
+                        if let Some(e) = e.downcast_ref::<StreamRuntimeError>() {
+                            tracing::debug!("stream runtime error: {e:?}");
+                            return Ok(Err(()));
+                        } else {
+                            return Err(e);
+                        }
+                    }
+                };
+                debug_assert!(bytes.len() <= len as usize);
+
+                Ok(Ok((bytes.into(), state.into())))
+            }
+            InternalInputStream::File(s) => {
+                let (bytes, state) = match FileInputStream::read(s, len as usize).await {
+                    Ok(a) => a,
+                    Err(e) => {
+                        if let Some(e) = e.downcast_ref::<StreamRuntimeError>() {
+                            tracing::debug!("stream runtime error: {e:?}");
+                            return Ok(Err(()));
+                        } else {
+                            return Err(e);
+                        }
+                    }
+                };
+                Ok(Ok((bytes.into(), state.into())))
+            }
         }
+    }
 
-        let mut bytes = bytes::Bytes::from(bytes);
-        while !bytes.is_empty() {
-            let permit = s.write_ready().await?;
-            let len = bytes.len().min(permit);
-            let chunk = bytes.split_to(len);
-            s.write(chunk)?;
+    async fn blocking_read(
+        &mut self,
+        stream: InputStream,
+        len: u64,
+    ) -> anyhow::Result<Result<(Vec<u8>, streams::StreamStatus), ()>> {
+        match self.table_mut().get_internal_input_stream_mut(stream)? {
+            InternalInputStream::Host(s) => {
+                s.ready().await?;
+                let (bytes, state) = match HostInputStream::read(s.as_mut(), len as usize) {
+                    Ok(a) => a,
+                    Err(e) => {
+                        if let Some(e) = e.downcast_ref::<StreamRuntimeError>() {
+                            tracing::debug!("stream runtime error: {e:?}");
+                            return Ok(Err(()));
+                        } else {
+                            return Err(e);
+                        }
+                    }
+                };
+                debug_assert!(bytes.len() <= len as usize);
+                Ok(Ok((bytes.into(), state.into())))
+            }
+            InternalInputStream::File(s) => {
+                let (bytes, state) = match FileInputStream::read(s, len as usize).await {
+                    Ok(a) => a,
+                    Err(e) => {
+                        if let Some(e) = e.downcast_ref::<StreamRuntimeError>() {
+                            tracing::debug!("stream runtime error: {e:?}");
+                            return Ok(Err(()));
+                        } else {
+                            return Err(e);
+                        }
+                    }
+                };
+                Ok(Ok((bytes.into(), state.into())))
+            }
         }
-
-        s.flush()?;
-        s.write_ready().await?;
-
-        Ok(())
     }
 
-    async fn blocking_write_zeroes_and_flush(
+    async fn skip(
         &mut self,
-        stream: Resource<OutputStream>,
+        stream: InputStream,
         len: u64,
-    ) -> StreamResult<()> {
-        let s = self.table_mut().get_mut(&stream)?;
-
-        if len > 4096 {
-            return Err(StreamError::trap(
-                "Buffer too large for blocking-write-zeroes-and-flush (expected at most 4096)",
-            ));
+    ) -> anyhow::Result<Result<(u64, streams::StreamStatus), ()>> {
+        match self.table_mut().get_internal_input_stream_mut(stream)? {
+            InternalInputStream::Host(s) => {
+                // TODO: the cast to usize should be fallible, use `.try_into()?`
+                let (bytes_skipped, state) = match HostInputStream::skip(s.as_mut(), len as usize) {
+                    Ok(a) => a,
+                    Err(e) => {
+                        if let Some(e) = e.downcast_ref::<StreamRuntimeError>() {
+                            tracing::debug!("stream runtime error: {e:?}");
+                            return Ok(Err(()));
+                        } else {
+                            return Err(e);
+                        }
+                    }
+                };
+
+                Ok(Ok((bytes_skipped as u64, state.into())))
+            }
+            InternalInputStream::File(s) => {
+                let (bytes_skipped, state) = match FileInputStream::skip(s, len as usize).await {
+                    Ok(a) => a,
+                    Err(e) => {
+                        if let Some(e) = e.downcast_ref::<StreamRuntimeError>() {
+                            tracing::debug!("stream runtime error: {e:?}");
+                            return Ok(Err(()));
+                        } else {
+                            return Err(e);
+                        }
+                    }
+                };
+                Ok(Ok((bytes_skipped as u64, state.into())))
+            }
         }
+    }
 
-        let mut len = len;
-        while len > 0 {
-            let permit = s.write_ready().await?;
-            let this_len = len.min(permit as u64);
-            s.write_zeroes(this_len as usize)?;
-            len -= this_len;
+    async fn blocking_skip(
+        &mut self,
+        stream: InputStream,
+        len: u64,
+    ) -> anyhow::Result<Result<(u64, streams::StreamStatus), ()>> {
+        match self.table_mut().get_internal_input_stream_mut(stream)? {
+            InternalInputStream::Host(s) => {
+                s.ready().await?;
+                // TODO: the cast to usize should be fallible, use `.try_into()?`
+                let (bytes_skipped, state) = match HostInputStream::skip(s.as_mut(), len as usize) {
+                    Ok(a) => a,
+                    Err(e) => {
+                        if let Some(e) = e.downcast_ref::<StreamRuntimeError>() {
+                            tracing::debug!("stream runtime error: {e:?}");
+                            return Ok(Err(()));
+                        } else {
+                            return Err(e);
+                        }
+                    }
+                };
+
+                Ok(Ok((bytes_skipped as u64, state.into())))
+            }
+            InternalInputStream::File(s) => {
+                let (bytes_skipped, state) = match FileInputStream::skip(s, len as usize).await {
+                    Ok(a) => a,
+                    Err(e) => {
+                        if let Some(e) = e.downcast_ref::<StreamRuntimeError>() {
+                            tracing::debug!("stream runtime error: {e:?}");
+                            return Ok(Err(()));
+                        } else {
+                            return Err(e);
+                        }
+                    }
+                };
+                Ok(Ok((bytes_skipped as u64, state.into())))
+            }
         }
-
-        s.flush()?;
-        s.write_ready().await?;
-
-        Ok(())
     }
 
-    fn write_zeroes(&mut self, stream: Resource<OutputStream>, len: u64) -> StreamResult<()> {
-        self.table_mut()
-            .get_mut(&stream)?
-            .write_zeroes(len as usize)?;
-        Ok(())
+    fn subscribe_to_input_stream(&mut self, stream: InputStream) -> anyhow::Result<Pollable> {
+        // Ensure that table element is an input-stream:
+        let pollable = match self.table_mut().get_internal_input_stream_mut(stream)? {
+            InternalInputStream::Host(_) => {
+                fn input_stream_ready<'a>(stream: &'a mut dyn Any) -> PollableFuture<'a> {
+                    let stream = stream
+                        .downcast_mut::<InternalInputStream>()
+                        .expect("downcast to InternalInputStream failed");
+                    match *stream {
+                        InternalInputStream::Host(ref mut hs) => hs.ready(),
+                        _ => unreachable!(),
+                    }
+                }
+
+                HostPollable::TableEntry {
+                    index: stream,
+                    make_future: input_stream_ready,
+                }
+            }
+            // Files are always "ready" immediately (because we have no way to actually wait on
+            // readiness in epoll)
+            InternalInputStream::File(_) => {
+                HostPollable::Closure(Box::new(|| Box::pin(futures::future::ready(Ok(())))))
+            }
+        };
+        Ok(self.table_mut().push_host_pollable(pollable)?)
     }
 
-    fn flush(&mut self, stream: Resource<OutputStream>) -> StreamResult<()> {
-        self.table_mut().get_mut(&stream)?.flush()?;
-        Ok(())
+    /* --------------------------------------------------------------
+     *
+     * OutputStream methods
+     *
+     * -------------------------------------------------------------- */
+
+    fn check_write(&mut self, stream: OutputStream) -> Result<u64, streams::Error> {
+        let s = self.table_mut().get_output_stream_mut(stream)?;
+        let mut ready = s.write_ready();
+        let mut task = Context::from_waker(futures::task::noop_waker_ref());
+        match Pin::new(&mut ready).poll(&mut task) {
+            Poll::Ready(Ok(permit)) => Ok(permit as u64),
+            Poll::Ready(Err(e)) => Err(e.into()),
+            Poll::Pending => Ok(0),
+        }
     }
 
-    async fn blocking_flush(&mut self, stream: Resource<OutputStream>) -> StreamResult<()> {
-        let s = self.table_mut().get_mut(&stream)?;
-        s.flush()?;
-        s.write_ready().await?;
+    async fn write(&mut self, stream: OutputStream, bytes: Vec<u8>) -> Result<(), streams::Error> {
+        let s = self.table_mut().get_output_stream_mut(stream)?;
+        HostOutputStream::write(s, bytes.into())?;
         Ok(())
     }
 
-    async fn splice(
-        &mut self,
-        dest: Resource<OutputStream>,
-        src: Resource<InputStream>,
-        len: u64,
-    ) -> StreamResult<u64> {
-        let len = len.try_into().unwrap_or(usize::MAX);
-
-        let permit = {
-            let output = self.table_mut().get_mut(&dest)?;
-            output.check_write()?
-        };
-        let len = len.min(permit);
-        if len == 0 {
-            return Ok(0);
-        }
-
-        let contents = match self.table_mut().get_mut(&src)? {
-            InputStream::Host(h) => h.read(len)?,
-            InputStream::File(f) => f.read(len).await?,
-        };
-
-        let len = contents.len();
-        if len == 0 {
-            return Ok(0);
+    fn subscribe_to_output_stream(&mut self, stream: OutputStream) -> anyhow::Result<Pollable> {
+        // Ensure that table element is an output-stream:
+        let _ = self.table_mut().get_output_stream_mut(stream)?;
+
+        fn output_stream_ready<'a>(stream: &'a mut dyn Any) -> PollableFuture<'a> {
+            let stream = stream
+                .downcast_mut::<Box<dyn HostOutputStream>>()
+                .expect("downcast to HostOutputStream failed");
+            Box::pin(async move {
+                let _ = stream.write_ready().await?;
+                Ok(())
+            })
         }
 
-        let output = self.table_mut().get_mut(&dest)?;
-        output.write(contents)?;
-        Ok(len.try_into().expect("usize can fit in u64"))
+        Ok(self
+            .table_mut()
+            .push_host_pollable(HostPollable::TableEntry {
+                index: stream,
+                make_future: output_stream_ready,
+            })?)
     }
 
-    async fn blocking_splice(
+    async fn blocking_write_and_flush(
         &mut self,
-        dest: Resource<OutputStream>,
-        src: Resource<InputStream>,
-        len: u64,
-    ) -> StreamResult<u64> {
-        use crate::preview2::Subscribe;
+        stream: OutputStream,
+        bytes: Vec<u8>,
+    ) -> Result<(), streams::Error> {
+        let s = self.table_mut().get_output_stream_mut(stream)?;
 
-        self.table_mut().get_mut(&dest)?.ready().await;
+        if bytes.len() > 4096 {
+            return Err(streams::Error::trap(anyhow::anyhow!(
+                "Buffer too large for blocking-write-and-flush (expected at most 4096)"
+            )));
+        }
 
-        self.table_mut().get_mut(&src)?.ready().await;
+        let mut bytes = bytes::Bytes::from(bytes);
+        while !bytes.is_empty() {
+            let permit = s.write_ready().await?;
+            let len = bytes.len().min(permit);
+            let chunk = bytes.split_to(len);
+            HostOutputStream::write(s, chunk)?;
+        }
 
-        self.splice(dest, src, len).await
-    }
-}
+        HostOutputStream::flush(s)?;
+        let _ = s.write_ready().await?;
 
-#[async_trait::async_trait]
-impl<T: WasiView> streams::HostInputStream for T {
-    fn drop(&mut self, stream: Resource<InputStream>) -> anyhow::Result<()> {
-        self.table_mut().delete(stream)?;
         Ok(())
     }
 
-    async fn read(&mut self, stream: Resource<InputStream>, len: u64) -> StreamResult<Vec<u8>> {
-        let len = len.try_into().unwrap_or(usize::MAX);
-        let bytes = match self.table_mut().get_mut(&stream)? {
-            InputStream::Host(s) => s.read(len)?,
-            InputStream::File(s) => s.read(len).await?,
-        };
-        debug_assert!(bytes.len() <= len as usize);
-        Ok(bytes.into())
+    fn write_zeroes(&mut self, stream: OutputStream, len: u64) -> Result<(), streams::Error> {
+        let s = self.table_mut().get_output_stream_mut(stream)?;
+        HostOutputStream::write_zeroes(s, len as usize)?;
+        Ok(())
     }
 
-    async fn blocking_read(
-        &mut self,
-        stream: Resource<InputStream>,
-        len: u64,
-    ) -> StreamResult<Vec<u8>> {
-        if let InputStream::Host(s) = self.table_mut().get_mut(&stream)? {
-            s.ready().await;
-        }
-        self.read(stream, len).await
+    fn flush(&mut self, stream: OutputStream) -> Result<(), streams::Error> {
+        let s = self.table_mut().get_output_stream_mut(stream)?;
+        HostOutputStream::flush(s)?;
+        Ok(())
+    }
+    async fn blocking_flush(&mut self, stream: OutputStream) -> Result<(), streams::Error> {
+        let s = self.table_mut().get_output_stream_mut(stream)?;
+        HostOutputStream::flush(s)?;
+        let _ = s.write_ready().await?;
+        Ok(())
     }
 
-    async fn skip(&mut self, stream: Resource<InputStream>, len: u64) -> StreamResult<u64> {
-        let len = len.try_into().unwrap_or(usize::MAX);
-        let written = match self.table_mut().get_mut(&stream)? {
-            InputStream::Host(s) => s.skip(len)?,
-            InputStream::File(s) => s.skip(len).await?,
-        };
-        Ok(written.try_into().expect("usize always fits in u64"))
+    /* --------------------------------------------------------------
+     *
+     * Aspirational methods
+     *
+     * -------------------------------------------------------------- */
+    async fn splice(
+        &mut self,
+        _src: InputStream,
+        _dst: OutputStream,
+        _len: u64,
+    ) -> anyhow::Result<Result<(u64, streams::StreamStatus), ()>> {
+        // TODO: We can't get two streams at the same time because they both
+        // carry the exclusive lifetime of `ctx`. When [`get_many_mut`] is
+        // stabilized, that could allow us to add a `get_many_stream_mut` or
+        // so which lets us do this.
+        //
+        // [`get_many_mut`]: https://doc.rust-lang.org/stable/std/collections/hash_map/struct.HashMap.html#method.get_many_mut
+        /*
+        let s: &mut Box<dyn crate::InputStream> = ctx
+            .table_mut()
+            .get_input_stream_mut(src)
+            ?;
+        let d: &mut Box<dyn crate::OutputStream> = ctx
+            .table_mut()
+            .get_output_stream_mut(dst)
+            ?;
+
+        let bytes_spliced: u64 = s.splice(&mut **d, len).await?;
+
+        Ok(bytes_spliced)
+        */
+        todo!("stream splice is not implemented")
     }
 
-    async fn blocking_skip(
+    async fn blocking_splice(
         &mut self,
-        stream: Resource<InputStream>,
-        len: u64,
-    ) -> StreamResult<u64> {
-        if let InputStream::Host(s) = self.table_mut().get_mut(&stream)? {
-            s.ready().await;
-        }
-        self.skip(stream, len).await
+        _src: InputStream,
+        _dst: OutputStream,
+        _len: u64,
+    ) -> anyhow::Result<Result<(u64, streams::StreamStatus), ()>> {
+        // TODO: once splice is implemented, figure out what the blocking semantics are for waiting
+        // on src and dest here.
+        todo!("stream splice is not implemented")
     }
 
-    fn subscribe(&mut self, stream: Resource<InputStream>) -> anyhow::Result<Resource<Pollable>> {
-        crate::preview2::poll::subscribe(self.table_mut(), stream)
+    async fn forward(
+        &mut self,
+        _src: InputStream,
+        _dst: OutputStream,
+    ) -> anyhow::Result<Result<(u64, streams::StreamStatus), ()>> {
+        // TODO: We can't get two streams at the same time because they both
+        // carry the exclusive lifetime of `ctx`. When [`get_many_mut`] is
+        // stabilized, that could allow us to add a `get_many_stream_mut` or
+        // so which lets us do this.
+        //
+        // [`get_many_mut`]: https://doc.rust-lang.org/stable/std/collections/hash_map/struct.HashMap.html#method.get_many_mut
+        /*
+        let s: &mut Box<dyn crate::InputStream> = ctx
+            .table_mut()
+            .get_input_stream_mut(src)
+            ?;
+        let d: &mut Box<dyn crate::OutputStream> = ctx
+            .table_mut()
+            .get_output_stream_mut(dst)
+            ?;
+
+        let bytes_spliced: u64 = s.splice(&mut **d, len).await?;
+
+        Ok(bytes_spliced)
+        */
+
+        todo!("stream forward is not implemented")
     }
 }
 
 pub mod sync {
     use crate::preview2::{
-        bindings::io::streams::{
-            self as async_streams, Host as AsyncHost, HostError as AsyncHostError,
-            HostInputStream as AsyncHostInputStream, HostOutputStream as AsyncHostOutputStream,
-        },
-        bindings::sync_io::io::poll::Pollable,
+        bindings::io::streams::{self as async_streams, Host as AsyncHost},
         bindings::sync_io::io::streams::{self, InputStream, OutputStream},
-        in_tokio, StreamError, StreamResult, WasiView,
+        bindings::sync_io::poll::poll::Pollable,
+        in_tokio, WasiView,
     };
-    use wasmtime::component::Resource;
 
-    impl From<async_streams::StreamError> for streams::StreamError {
-        fn from(other: async_streams::StreamError) -> Self {
+    // same boilerplate everywhere, converting between two identical types with different
+    // definition sites. one day wasmtime-wit-bindgen will make all this unnecessary
+    fn xform<A>(
+        r: Result<(A, async_streams::StreamStatus), ()>,
+    ) -> Result<(A, streams::StreamStatus), ()> {
+        r.map(|(a, b)| (a, b.into()))
+    }
+
+    impl From<async_streams::StreamStatus> for streams::StreamStatus {
+        fn from(other: async_streams::StreamStatus) -> Self {
             match other {
-                async_streams::StreamError::LastOperationFailed(e) => Self::LastOperationFailed(e),
-                async_streams::StreamError::Closed => Self::Closed,
+                async_streams::StreamStatus::Open => Self::Open,
+                async_streams::StreamStatus::Ended => Self::Ended,
             }
         }
     }
 
-    impl<T: WasiView> streams::Host for T {
-        fn convert_stream_error(
-            &mut self,
-            err: StreamError,
-        ) -> anyhow::Result<streams::StreamError> {
-            Ok(AsyncHost::convert_stream_error(self, err)?.into())
+    impl From<async_streams::WriteError> for streams::WriteError {
+        fn from(other: async_streams::WriteError) -> Self {
+            match other {
+                async_streams::WriteError::LastOperationFailed => Self::LastOperationFailed,
+                async_streams::WriteError::Closed => Self::Closed,
+            }
         }
     }
-
-    impl<T: WasiView> streams::HostError for T {
-        fn drop(&mut self, err: Resource<streams::Error>) -> anyhow::Result<()> {
-            AsyncHostError::drop(self, err)
-        }
-
-        fn to_debug_string(&mut self, err: Resource<streams::Error>) -> anyhow::Result<String> {
-            AsyncHostError::to_debug_string(self, err)
+    impl From<async_streams::Error> for streams::Error {
+        fn from(other: async_streams::Error) -> Self {
+            match other.downcast() {
+                Ok(write_error) => streams::Error::from(streams::WriteError::from(write_error)),
+                Err(e) => streams::Error::trap(e),
+            }
         }
     }
 
-    impl<T: WasiView> streams::HostOutputStream for T {
-        fn drop(&mut self, stream: Resource<OutputStream>) -> anyhow::Result<()> {
-            AsyncHostOutputStream::drop(self, stream)
-        }
-
-        fn check_write(&mut self, stream: Resource<OutputStream>) -> StreamResult<u64> {
-            Ok(AsyncHostOutputStream::check_write(self, stream)?)
+    impl<T: WasiView> streams::Host for T {
+        fn drop_input_stream(&mut self, stream: InputStream) -> anyhow::Result<()> {
+            AsyncHost::drop_input_stream(self, stream)
         }
 
-        fn write(&mut self, stream: Resource<OutputStream>, bytes: Vec<u8>) -> StreamResult<()> {
-            Ok(AsyncHostOutputStream::write(self, stream, bytes)?)
+        fn drop_output_stream(&mut self, stream: OutputStream) -> anyhow::Result<()> {
+            AsyncHost::drop_output_stream(self, stream)
         }
 
-        fn blocking_write_and_flush(
+        fn read(
             &mut self,
-            stream: Resource<OutputStream>,
-            bytes: Vec<u8>,
-        ) -> StreamResult<()> {
-            in_tokio(async {
-                AsyncHostOutputStream::blocking_write_and_flush(self, stream, bytes).await
-            })
+            stream: InputStream,
+            len: u64,
+        ) -> anyhow::Result<Result<(Vec<u8>, streams::StreamStatus), ()>> {
+            in_tokio(async { AsyncHost::read(self, stream, len).await }).map(xform)
         }
 
-        fn blocking_write_zeroes_and_flush(
+        fn blocking_read(
             &mut self,
-            stream: Resource<OutputStream>,
+            stream: InputStream,
             len: u64,
-        ) -> StreamResult<()> {
-            in_tokio(async {
-                AsyncHostOutputStream::blocking_write_zeroes_and_flush(self, stream, len).await
-            })
+        ) -> anyhow::Result<Result<(Vec<u8>, streams::StreamStatus), ()>> {
+            in_tokio(async { AsyncHost::blocking_read(self, stream, len).await }).map(xform)
         }
 
-        fn subscribe(
+        fn check_write(&mut self, stream: OutputStream) -> Result<u64, streams::Error> {
+            Ok(AsyncHost::check_write(self, stream)?)
+        }
+        fn write(&mut self, stream: OutputStream, bytes: Vec<u8>) -> Result<(), streams::Error> {
+            Ok(in_tokio(async {
+                AsyncHost::write(self, stream, bytes).await
+            })?)
+        }
+        fn blocking_write_and_flush(
             &mut self,
-            stream: Resource<OutputStream>,
-        ) -> anyhow::Result<Resource<Pollable>> {
-            Ok(AsyncHostOutputStream::subscribe(self, stream)?)
+            stream: OutputStream,
+            bytes: Vec<u8>,
+        ) -> Result<(), streams::Error> {
+            Ok(in_tokio(async {
+                AsyncHost::blocking_write_and_flush(self, stream, bytes).await
+            })?)
         }
-
-        fn write_zeroes(&mut self, stream: Resource<OutputStream>, len: u64) -> StreamResult<()> {
-            Ok(AsyncHostOutputStream::write_zeroes(self, stream, len)?)
+        fn subscribe_to_output_stream(&mut self, stream: OutputStream) -> anyhow::Result<Pollable> {
+            AsyncHost::subscribe_to_output_stream(self, stream)
         }
-
-        fn flush(&mut self, stream: Resource<OutputStream>) -> StreamResult<()> {
-            Ok(AsyncHostOutputStream::flush(
-                self,
-                Resource::new_borrow(stream.rep()),
-            )?)
+        fn write_zeroes(&mut self, stream: OutputStream, len: u64) -> Result<(), streams::Error> {
+            Ok(AsyncHost::write_zeroes(self, stream, len)?)
         }
 
-        fn blocking_flush(&mut self, stream: Resource<OutputStream>) -> StreamResult<()> {
-            in_tokio(async {
-                AsyncHostOutputStream::blocking_flush(self, Resource::new_borrow(stream.rep()))
-                    .await
-            })
+        fn flush(&mut self, stream: OutputStream) -> Result<(), streams::Error> {
+            Ok(AsyncHost::flush(self, stream)?)
+        }
+        fn blocking_flush(&mut self, stream: OutputStream) -> Result<(), streams::Error> {
+            Ok(in_tokio(async {
+                AsyncHost::blocking_flush(self, stream).await
+            })?)
         }
 
-        fn splice(
+        fn skip(
             &mut self,
-            dst: Resource<OutputStream>,
-            src: Resource<InputStream>,
+            stream: InputStream,
             len: u64,
-        ) -> StreamResult<u64> {
-            in_tokio(async { AsyncHostOutputStream::splice(self, dst, src, len).await })
+        ) -> anyhow::Result<Result<(u64, streams::StreamStatus), ()>> {
+            in_tokio(async { AsyncHost::skip(self, stream, len).await }).map(xform)
         }
 
-        fn blocking_splice(
+        fn blocking_skip(
             &mut self,
-            dst: Resource<OutputStream>,
-            src: Resource<InputStream>,
+            stream: InputStream,
             len: u64,
-        ) -> StreamResult<u64> {
-            in_tokio(async { AsyncHostOutputStream::blocking_splice(self, dst, src, len).await })
-        }
-    }
-
-    impl<T: WasiView> streams::HostInputStream for T {
-        fn drop(&mut self, stream: Resource<InputStream>) -> anyhow::Result<()> {
-            AsyncHostInputStream::drop(self, stream)
-        }
-
-        fn read(&mut self, stream: Resource<InputStream>, len: u64) -> StreamResult<Vec<u8>> {
-            in_tokio(async { AsyncHostInputStream::read(self, stream, len).await })
+        ) -> anyhow::Result<Result<(u64, streams::StreamStatus), ()>> {
+            in_tokio(async { AsyncHost::blocking_skip(self, stream, len).await }).map(xform)
         }
 
-        fn blocking_read(
+        fn splice(
             &mut self,
-            stream: Resource<InputStream>,
+            src: InputStream,
+            dst: OutputStream,
             len: u64,
-        ) -> StreamResult<Vec<u8>> {
-            in_tokio(async { AsyncHostInputStream::blocking_read(self, stream, len).await })
+        ) -> anyhow::Result<Result<(u64, streams::StreamStatus), ()>> {
+            in_tokio(async { AsyncHost::splice(self, src, dst, len).await }).map(xform)
         }
 
-        fn skip(&mut self, stream: Resource<InputStream>, len: u64) -> StreamResult<u64> {
-            in_tokio(async { AsyncHostInputStream::skip(self, stream, len).await })
+        fn blocking_splice(
+            &mut self,
+            src: InputStream,
+            dst: OutputStream,
+            len: u64,
+        ) -> anyhow::Result<Result<(u64, streams::StreamStatus), ()>> {
+            in_tokio(async { AsyncHost::blocking_splice(self, src, dst, len).await }).map(xform)
         }
 
-        fn blocking_skip(&mut self, stream: Resource<InputStream>, len: u64) -> StreamResult<u64> {
-            in_tokio(async { AsyncHostInputStream::blocking_skip(self, stream, len).await })
+        fn forward(
+            &mut self,
+            src: InputStream,
+            dst: OutputStream,
+        ) -> anyhow::Result<Result<(u64, streams::StreamStatus), ()>> {
+            in_tokio(async { AsyncHost::forward(self, src, dst).await }).map(xform)
         }
 
-        fn subscribe(
-            &mut self,
-            stream: Resource<InputStream>,
-        ) -> anyhow::Result<Resource<Pollable>> {
-            AsyncHostInputStream::subscribe(self, stream)
+        fn subscribe_to_input_stream(&mut self, stream: InputStream) -> anyhow::Result<Pollable> {
+            AsyncHost::subscribe_to_input_stream(self, stream)
         }
     }
 }
diff --git a/crates/wasi/src/preview2/host/mod.rs b/crates/wasi/src/preview2/host/mod.rs
index 651d2cd38e0c..138166731565 100644
--- a/crates/wasi/src/preview2/host/mod.rs
+++ b/crates/wasi/src/preview2/host/mod.rs
@@ -8,5 +8,3 @@ mod network;
 mod random;
 mod tcp;
 mod tcp_create_socket;
-mod udp;
-mod udp_create_socket;
diff --git a/crates/wasi/src/preview2/host/network.rs b/crates/wasi/src/preview2/host/network.rs
index aa01cb4f4307..023a5d9f3026 100644
--- a/crates/wasi/src/preview2/host/network.rs
+++ b/crates/wasi/src/preview2/host/network.rs
@@ -2,105 +2,78 @@ use crate::preview2::bindings::sockets::network::{
     self, ErrorCode, IpAddressFamily, IpSocketAddress, Ipv4Address, Ipv4SocketAddress, Ipv6Address,
     Ipv6SocketAddress,
 };
-use crate::preview2::{SocketError, WasiView};
-use rustix::io::Errno;
+use crate::preview2::network::TableNetworkExt;
+use crate::preview2::{TableError, WasiView};
 use std::io;
-use wasmtime::component::Resource;
 
 impl<T: WasiView> network::Host for T {
-    fn convert_error_code(&mut self, error: SocketError) -> anyhow::Result<ErrorCode> {
-        error.downcast()
-    }
-}
-
-impl<T: WasiView> crate::preview2::bindings::sockets::network::HostNetwork for T {
-    fn drop(&mut self, this: Resource<network::Network>) -> Result<(), anyhow::Error> {
+    fn drop_network(&mut self, this: network::Network) -> Result<(), anyhow::Error> {
         let table = self.table_mut();
 
-        table.delete(this)?;
+        table.delete_network(this)?;
 
         Ok(())
     }
 }
 
-impl From<io::Error> for ErrorCode {
-    fn from(value: io::Error) -> Self {
-        // Attempt the more detailed native error code first:
-        if let Some(errno) = Errno::from_io_error(&value) {
-            return errno.into();
-        }
+impl From<TableError> for network::Error {
+    fn from(error: TableError) -> Self {
+        Self::trap(error.into())
+    }
+}
 
-        match value.kind() {
-            std::io::ErrorKind::AddrInUse => ErrorCode::AddressInUse,
-            std::io::ErrorKind::AddrNotAvailable => ErrorCode::AddressNotBindable,
-            std::io::ErrorKind::ConnectionAborted => ErrorCode::ConnectionAborted,
-            std::io::ErrorKind::ConnectionRefused => ErrorCode::ConnectionRefused,
-            std::io::ErrorKind::ConnectionReset => ErrorCode::ConnectionReset,
-            std::io::ErrorKind::Interrupted => ErrorCode::WouldBlock,
-            std::io::ErrorKind::InvalidInput => ErrorCode::InvalidArgument,
-            std::io::ErrorKind::NotConnected => ErrorCode::InvalidState,
-            std::io::ErrorKind::OutOfMemory => ErrorCode::OutOfMemory,
-            std::io::ErrorKind::PermissionDenied => ErrorCode::AccessDenied,
-            std::io::ErrorKind::TimedOut => ErrorCode::Timeout,
-            std::io::ErrorKind::Unsupported => ErrorCode::NotSupported,
-            std::io::ErrorKind::WouldBlock => ErrorCode::WouldBlock,
-
-            _ => {
-                log::debug!("unknown I/O error: {value}");
-                ErrorCode::Unknown
+impl From<io::Error> for network::Error {
+    fn from(error: io::Error) -> Self {
+        match error.kind() {
+            // Errors that we can directly map.
+            io::ErrorKind::PermissionDenied => ErrorCode::AccessDenied,
+            io::ErrorKind::ConnectionRefused => ErrorCode::ConnectionRefused,
+            io::ErrorKind::ConnectionReset => ErrorCode::ConnectionReset,
+            io::ErrorKind::NotConnected => ErrorCode::NotConnected,
+            io::ErrorKind::AddrInUse => ErrorCode::AddressInUse,
+            io::ErrorKind::AddrNotAvailable => ErrorCode::AddressNotBindable,
+            io::ErrorKind::WouldBlock => ErrorCode::WouldBlock,
+            io::ErrorKind::TimedOut => ErrorCode::Timeout,
+            io::ErrorKind::Unsupported => ErrorCode::NotSupported,
+            io::ErrorKind::OutOfMemory => ErrorCode::OutOfMemory,
+
+            // Errors we don't expect to see here.
+            io::ErrorKind::Interrupted | io::ErrorKind::ConnectionAborted => {
+                // Transient errors should be skipped.
+                return Self::trap(error.into());
             }
+
+            // Errors not expected from network APIs.
+            io::ErrorKind::WriteZero
+            | io::ErrorKind::InvalidInput
+            | io::ErrorKind::InvalidData
+            | io::ErrorKind::BrokenPipe
+            | io::ErrorKind::NotFound
+            | io::ErrorKind::UnexpectedEof
+            | io::ErrorKind::AlreadyExists => return Self::trap(error.into()),
+
+            // Errors that don't correspond to a Rust `io::ErrorKind`.
+            io::ErrorKind::Other => match error.raw_os_error() {
+                None => return Self::trap(error.into()),
+                Some(libc::ENOBUFS) | Some(libc::ENOMEM) => ErrorCode::OutOfMemory,
+                Some(libc::EOPNOTSUPP) => ErrorCode::NotSupported,
+                Some(libc::ENETUNREACH) | Some(libc::EHOSTUNREACH) | Some(libc::ENETDOWN) => {
+                    ErrorCode::RemoteUnreachable
+                }
+                Some(libc::ECONNRESET) => ErrorCode::ConnectionReset,
+                Some(libc::ECONNREFUSED) => ErrorCode::ConnectionRefused,
+                Some(libc::EADDRINUSE) => ErrorCode::AddressInUse,
+                Some(_) => return Self::trap(error.into()),
+            },
+            _ => return Self::trap(error.into()),
         }
+        .into()
     }
 }
 
-impl From<Errno> for ErrorCode {
-    fn from(value: Errno) -> Self {
-        match value {
-            Errno::WOULDBLOCK => ErrorCode::WouldBlock,
-            #[allow(unreachable_patterns)] // EWOULDBLOCK and EAGAIN can have the same value.
-            Errno::AGAIN => ErrorCode::WouldBlock,
-            Errno::INTR => ErrorCode::WouldBlock,
-            #[cfg(not(windows))]
-            Errno::PERM => ErrorCode::AccessDenied,
-            Errno::ACCESS => ErrorCode::AccessDenied,
-            Errno::ADDRINUSE => ErrorCode::AddressInUse,
-            Errno::ADDRNOTAVAIL => ErrorCode::AddressNotBindable,
-            Errno::ALREADY => ErrorCode::ConcurrencyConflict,
-            Errno::TIMEDOUT => ErrorCode::Timeout,
-            Errno::CONNREFUSED => ErrorCode::ConnectionRefused,
-            Errno::CONNRESET => ErrorCode::ConnectionReset,
-            Errno::CONNABORTED => ErrorCode::ConnectionAborted,
-            Errno::INVAL => ErrorCode::InvalidArgument,
-            Errno::HOSTUNREACH => ErrorCode::RemoteUnreachable,
-            Errno::HOSTDOWN => ErrorCode::RemoteUnreachable,
-            Errno::NETDOWN => ErrorCode::RemoteUnreachable,
-            Errno::NETUNREACH => ErrorCode::RemoteUnreachable,
-            #[cfg(target_os = "linux")]
-            Errno::NONET => ErrorCode::RemoteUnreachable,
-            Errno::ISCONN => ErrorCode::InvalidState,
-            Errno::NOTCONN => ErrorCode::InvalidState,
-            Errno::DESTADDRREQ => ErrorCode::InvalidState,
-            #[cfg(not(windows))]
-            Errno::NFILE => ErrorCode::NewSocketLimit,
-            Errno::MFILE => ErrorCode::NewSocketLimit,
-            Errno::MSGSIZE => ErrorCode::DatagramTooLarge,
-            #[cfg(not(windows))]
-            Errno::NOMEM => ErrorCode::OutOfMemory,
-            Errno::NOBUFS => ErrorCode::OutOfMemory,
-            Errno::OPNOTSUPP => ErrorCode::NotSupported,
-            Errno::NOPROTOOPT => ErrorCode::NotSupported,
-            Errno::PFNOSUPPORT => ErrorCode::NotSupported,
-            Errno::PROTONOSUPPORT => ErrorCode::NotSupported,
-            Errno::PROTOTYPE => ErrorCode::NotSupported,
-            Errno::SOCKTNOSUPPORT => ErrorCode::NotSupported,
-            Errno::AFNOSUPPORT => ErrorCode::NotSupported,
-
-            // FYI, EINPROGRESS should have already been handled by connect.
-            _ => {
-                log::debug!("unknown I/O error: {value}");
-                ErrorCode::Unknown
-            }
-        }
+impl From<rustix::io::Errno> for network::Error {
+    fn from(error: rustix::io::Errno) -> Self {
+        std::io::Error::from(error).into()
     }
 }
 
@@ -211,12 +184,3 @@ impl From<IpAddressFamily> for cap_net_ext::AddressFamily {
         }
     }
 }
-
-impl From<cap_net_ext::AddressFamily> for IpAddressFamily {
-    fn from(family: cap_net_ext::AddressFamily) -> Self {
-        match family {
-            cap_net_ext::AddressFamily::Ipv4 => IpAddressFamily::Ipv4,
-            cap_net_ext::AddressFamily::Ipv6 => IpAddressFamily::Ipv6,
-        }
-    }
-}
diff --git a/crates/wasi/src/preview2/host/tcp.rs b/crates/wasi/src/preview2/host/tcp.rs
index f15fccd73cd5..89f9bc240207 100644
--- a/crates/wasi/src/preview2/host/tcp.rs
+++ b/crates/wasi/src/preview2/host/tcp.rs
@@ -1,106 +1,83 @@
-use crate::preview2::tcp::{TcpSocket, TcpState};
-use crate::preview2::{
-    bindings::{
-        io::streams::{InputStream, OutputStream},
-        sockets::network::{ErrorCode, IpAddressFamily, IpSocketAddress, Network},
-        sockets::tcp::{self, ShutdownType},
-    },
-    tcp::SocketAddressFamily,
+use crate::preview2::bindings::{
+    io::streams::{InputStream, OutputStream},
+    poll::poll::Pollable,
+    sockets::network::{self, ErrorCode, IpAddressFamily, IpSocketAddress, Network},
+    sockets::tcp::{self, ShutdownType},
 };
-use crate::preview2::{Pollable, SocketResult, WasiView};
+use crate::preview2::network::TableNetworkExt;
+use crate::preview2::poll::TablePollableExt;
+use crate::preview2::stream::TableStreamExt;
+use crate::preview2::tcp::{HostTcpSocket, HostTcpState, TableTcpSocketExt};
+use crate::preview2::{HostPollable, PollableFuture, WasiView};
 use cap_net_ext::{Blocking, PoolExt, TcpListenerExt};
 use cap_std::net::TcpListener;
 use io_lifetimes::AsSocketlike;
 use rustix::io::Errno;
 use rustix::net::sockopt;
-use std::net::{IpAddr, Ipv6Addr, SocketAddr};
+use std::any::Any;
 use tokio::io::Interest;
-use wasmtime::component::Resource;
 
-impl<T: WasiView> tcp::Host for T {}
-
-impl<T: WasiView> crate::preview2::host::tcp::tcp::HostTcpSocket for T {
+impl<T: WasiView> tcp::Host for T {
     fn start_bind(
         &mut self,
-        this: Resource<tcp::TcpSocket>,
-        network: Resource<Network>,
+        this: tcp::TcpSocket,
+        network: Network,
         local_address: IpSocketAddress,
-    ) -> SocketResult<()> {
+    ) -> Result<(), network::Error> {
         let table = self.table_mut();
-        let socket = table.get(&this)?;
-        let network = table.get(&network)?;
-        let local_address: SocketAddr = local_address.into();
+        let socket = table.get_tcp_socket(this)?;
 
         match socket.tcp_state {
-            TcpState::Default => {}
-            TcpState::BindStarted => return Err(ErrorCode::ConcurrencyConflict.into()),
-            _ => return Err(ErrorCode::InvalidState.into()),
+            HostTcpState::Default => {}
+            _ => return Err(ErrorCode::NotInProgress.into()),
         }
 
-        validate_unicast(&local_address)?;
-        validate_address_family(&socket, &local_address)?;
-
-        let binder = network.pool.tcp_binder(local_address)?;
+        let network = table.get_network(network)?;
+        let binder = network.0.tcp_binder(local_address)?;
 
         // Perform the OS bind call.
-        binder
-            .bind_existing_tcp_listener(&*socket.tcp_socket().as_socketlike_view::<TcpListener>())
-            .map_err(|error| match Errno::from_io_error(&error) {
-                Some(Errno::AFNOSUPPORT) => ErrorCode::InvalidArgument, // Just in case our own validations weren't sufficient.
-                #[cfg(windows)]
-                Some(Errno::NOBUFS) => ErrorCode::AddressInUse, // Windows returns WSAENOBUFS when the ephemeral ports have been exhausted.
-                _ => ErrorCode::from(error),
-            })?;
-
-        let socket = table.get_mut(&this)?;
-        socket.tcp_state = TcpState::BindStarted;
+        binder.bind_existing_tcp_listener(
+            &*socket.tcp_socket().as_socketlike_view::<TcpListener>(),
+        )?;
+
+        let socket = table.get_tcp_socket_mut(this)?;
+        socket.tcp_state = HostTcpState::BindStarted;
 
         Ok(())
     }
 
-    fn finish_bind(&mut self, this: Resource<tcp::TcpSocket>) -> SocketResult<()> {
+    fn finish_bind(&mut self, this: tcp::TcpSocket) -> Result<(), network::Error> {
         let table = self.table_mut();
-        let socket = table.get_mut(&this)?;
+        let socket = table.get_tcp_socket_mut(this)?;
 
         match socket.tcp_state {
-            TcpState::BindStarted => {}
+            HostTcpState::BindStarted => {}
             _ => return Err(ErrorCode::NotInProgress.into()),
         }
 
-        socket.tcp_state = TcpState::Bound;
+        socket.tcp_state = HostTcpState::Bound;
 
         Ok(())
     }
 
     fn start_connect(
         &mut self,
-        this: Resource<tcp::TcpSocket>,
-        network: Resource<Network>,
+        this: tcp::TcpSocket,
+        network: Network,
         remote_address: IpSocketAddress,
-    ) -> SocketResult<()> {
+    ) -> Result<(), network::Error> {
         let table = self.table_mut();
         let r = {
-            let socket = table.get(&this)?;
-            let network = table.get(&network)?;
-            let remote_address: SocketAddr = remote_address.into();
+            let socket = table.get_tcp_socket(this)?;
 
             match socket.tcp_state {
-                TcpState::Default => {}
-                TcpState::Bound
-                | TcpState::Connected
-                | TcpState::ConnectFailed
-                | TcpState::Listening => return Err(ErrorCode::InvalidState.into()),
-                TcpState::Connecting
-                | TcpState::ConnectReady
-                | TcpState::ListenStarted
-                | TcpState::BindStarted => return Err(ErrorCode::ConcurrencyConflict.into()),
+                HostTcpState::Default => {}
+                HostTcpState::Connected => return Err(ErrorCode::AlreadyConnected.into()),
+                _ => return Err(ErrorCode::NotInProgress.into()),
             }
 
-            validate_unicast(&remote_address)?;
-            validate_remote_address(&remote_address)?;
-            validate_address_family(&socket, &remote_address)?;
-
-            let connecter = network.pool.tcp_connecter(remote_address)?;
+            let network = table.get_network(network)?;
+            let connecter = network.0.tcp_connecter(remote_address)?;
 
             // Do an OS `connect`. Our socket is non-blocking, so it'll either...
             {
@@ -113,37 +90,32 @@ impl<T: WasiView> crate::preview2::host::tcp::tcp::HostTcpSocket for T {
         match r {
             // succeed immediately,
             Ok(()) => {
-                let socket = table.get_mut(&this)?;
-                socket.tcp_state = TcpState::ConnectReady;
+                let socket = table.get_tcp_socket_mut(this)?;
+                socket.tcp_state = HostTcpState::ConnectReady;
                 return Ok(());
             }
             // continue in progress,
-            Err(err) if Errno::from_io_error(&err) == Some(INPROGRESS) => {}
+            Err(err) if err.raw_os_error() == Some(INPROGRESS.raw_os_error()) => {}
             // or fail immediately.
-            Err(err) => {
-                return Err(match Errno::from_io_error(&err) {
-                    Some(Errno::AFNOSUPPORT) => ErrorCode::InvalidArgument.into(), // Just in case our own validations weren't sufficient.
-                    _ => err.into(),
-                });
-            }
+            Err(err) => return Err(err.into()),
         }
 
-        let socket = table.get_mut(&this)?;
-        socket.tcp_state = TcpState::Connecting;
+        let socket = table.get_tcp_socket_mut(this)?;
+        socket.tcp_state = HostTcpState::Connecting;
 
         Ok(())
     }
 
     fn finish_connect(
         &mut self,
-        this: Resource<tcp::TcpSocket>,
-    ) -> SocketResult<(Resource<InputStream>, Resource<OutputStream>)> {
+        this: tcp::TcpSocket,
+    ) -> Result<(InputStream, OutputStream), network::Error> {
         let table = self.table_mut();
-        let socket = table.get_mut(&this)?;
+        let socket = table.get_tcp_socket_mut(this)?;
 
         match socket.tcp_state {
-            TcpState::ConnectReady => {}
-            TcpState::Connecting => {
+            HostTcpState::ConnectReady => {}
+            HostTcpState::Connecting => {
                 // Do a `poll` to test for completion, using a timeout of zero
                 // to avoid blocking.
                 match rustix::event::poll(
@@ -161,162 +133,96 @@ impl<T: WasiView> crate::preview2::host::tcp::tcp::HostTcpSocket for T {
                 // Check whether the connect succeeded.
                 match sockopt::get_socket_error(socket.tcp_socket()) {
                     Ok(Ok(())) => {}
-                    Err(err) | Ok(Err(err)) => {
-                        socket.tcp_state = TcpState::ConnectFailed;
-                        return Err(err.into());
-                    }
+                    Err(err) | Ok(Err(err)) => return Err(err.into()),
                 }
             }
             _ => return Err(ErrorCode::NotInProgress.into()),
         };
 
-        socket.tcp_state = TcpState::Connected;
+        socket.tcp_state = HostTcpState::Connected;
         let (input, output) = socket.as_split();
-        let input_stream = self.table_mut().push_child(input, &this)?;
-        let output_stream = self.table_mut().push_child(output, &this)?;
+        let input_stream = self.table_mut().push_input_stream_child(input, this)?;
+        let output_stream = self.table_mut().push_output_stream_child(output, this)?;
 
         Ok((input_stream, output_stream))
     }
 
-    fn start_listen(&mut self, this: Resource<tcp::TcpSocket>) -> SocketResult<()> {
+    fn start_listen(&mut self, this: tcp::TcpSocket) -> Result<(), network::Error> {
         let table = self.table_mut();
-        let socket = table.get_mut(&this)?;
+        let socket = table.get_tcp_socket_mut(this)?;
 
         match socket.tcp_state {
-            TcpState::Bound => {}
-            TcpState::Default
-            | TcpState::Connected
-            | TcpState::ConnectFailed
-            | TcpState::Listening => return Err(ErrorCode::InvalidState.into()),
-            TcpState::ListenStarted
-            | TcpState::Connecting
-            | TcpState::ConnectReady
-            | TcpState::BindStarted => return Err(ErrorCode::ConcurrencyConflict.into()),
+            HostTcpState::Bound => {}
+            HostTcpState::ListenStarted => return Err(ErrorCode::AlreadyListening.into()),
+            HostTcpState::Connected => return Err(ErrorCode::AlreadyConnected.into()),
+            _ => return Err(ErrorCode::NotInProgress.into()),
         }
 
         socket
             .tcp_socket()
             .as_socketlike_view::<TcpListener>()
-            .listen(socket.listen_backlog_size)
-            .map_err(|error| match Errno::from_io_error(&error) {
-                #[cfg(windows)]
-                Some(Errno::MFILE) => ErrorCode::OutOfMemory, // We're not trying to create a new socket. Rewrite it to less surprising error code.
-                _ => ErrorCode::from(error),
-            })?;
+            .listen(None)?;
 
-        socket.tcp_state = TcpState::ListenStarted;
+        socket.tcp_state = HostTcpState::ListenStarted;
 
         Ok(())
     }
 
-    fn finish_listen(&mut self, this: Resource<tcp::TcpSocket>) -> SocketResult<()> {
+    fn finish_listen(&mut self, this: tcp::TcpSocket) -> Result<(), network::Error> {
         let table = self.table_mut();
-        let socket = table.get_mut(&this)?;
+        let socket = table.get_tcp_socket_mut(this)?;
 
         match socket.tcp_state {
-            TcpState::ListenStarted => {}
+            HostTcpState::ListenStarted => {}
             _ => return Err(ErrorCode::NotInProgress.into()),
         }
 
-        socket.tcp_state = TcpState::Listening;
+        socket.tcp_state = HostTcpState::Listening;
 
         Ok(())
     }
 
     fn accept(
         &mut self,
-        this: Resource<tcp::TcpSocket>,
-    ) -> SocketResult<(
-        Resource<tcp::TcpSocket>,
-        Resource<InputStream>,
-        Resource<OutputStream>,
-    )> {
+        this: tcp::TcpSocket,
+    ) -> Result<(tcp::TcpSocket, InputStream, OutputStream), network::Error> {
         let table = self.table();
-        let socket = table.get(&this)?;
+        let socket = table.get_tcp_socket(this)?;
 
         match socket.tcp_state {
-            TcpState::Listening => {}
-            _ => return Err(ErrorCode::InvalidState.into()),
+            HostTcpState::Listening => {}
+            HostTcpState::Connected => return Err(ErrorCode::AlreadyConnected.into()),
+            _ => return Err(ErrorCode::NotInProgress.into()),
         }
 
         // Do the OS accept call.
         let tcp_socket = socket.tcp_socket();
-        let (connection, _addr) = tcp_socket
-            .try_io(Interest::READABLE, || {
-                tcp_socket
-                    .as_socketlike_view::<TcpListener>()
-                    .accept_with(Blocking::No)
-            })
-            .map_err(|error| match Errno::from_io_error(&error) {
-                #[cfg(windows)]
-                Some(Errno::INPROGRESS) => ErrorCode::WouldBlock, // "A blocking Windows Sockets 1.1 call is in progress, or the service provider is still processing a callback function."
-
-                // Normalize Linux' non-standard behavior.
-                // "Linux accept() passes already-pending network errors on the new socket as an error code from accept(). This behavior differs from other BSD socket implementations."
-                #[cfg(target_os = "linux")]
-                Some(
-                    Errno::CONNRESET
-                    | Errno::NETRESET
-                    | Errno::HOSTUNREACH
-                    | Errno::HOSTDOWN
-                    | Errno::NETDOWN
-                    | Errno::NETUNREACH
-                    | Errno::PROTO
-                    | Errno::NOPROTOOPT
-                    | Errno::NONET
-                    | Errno::OPNOTSUPP,
-                ) => ErrorCode::ConnectionAborted,
-
-                _ => ErrorCode::from(error),
-            })?;
-
-        #[cfg(target_os = "macos")]
-        {
-            // Manually inherit socket options from listener. We only have to
-            // do this on platforms that don't already do this automatically
-            // and only if a specific value was explicitly set on the listener.
-
-            if let Some(size) = socket.receive_buffer_size {
-                _ = sockopt::set_socket_recv_buffer_size(&connection, size); // Ignore potential error.
-            }
-
-            if let Some(size) = socket.send_buffer_size {
-                _ = sockopt::set_socket_send_buffer_size(&connection, size); // Ignore potential error.
-            }
-
-            // For some reason, IP_TTL is inherited, but IPV6_UNICAST_HOPS isn't.
-            if let (SocketAddressFamily::Ipv6 { .. }, Some(ttl)) = (socket.family, socket.hop_limit)
-            {
-                _ = sockopt::set_ipv6_unicast_hops(&connection, Some(ttl));
-                // Ignore potential error.
-            }
-        }
-
-        let mut tcp_socket = TcpSocket::from_tcp_stream(connection, socket.family)?;
+        let (connection, _addr) = tcp_socket.try_io(Interest::READABLE, || {
+            tcp_socket
+                .as_socketlike_view::<TcpListener>()
+                .accept_with(Blocking::No)
+        })?;
+        let mut tcp_socket = HostTcpSocket::from_tcp_stream(connection)?;
 
         // Mark the socket as connected so that we can exit early from methods like `start-bind`.
-        tcp_socket.tcp_state = TcpState::Connected;
+        tcp_socket.tcp_state = HostTcpState::Connected;
 
         let (input, output) = tcp_socket.as_split();
-        let output: OutputStream = output;
 
-        let tcp_socket = self.table_mut().push(tcp_socket)?;
-        let input_stream = self.table_mut().push_child(input, &tcp_socket)?;
-        let output_stream = self.table_mut().push_child(output, &tcp_socket)?;
+        let tcp_socket = self.table_mut().push_tcp_socket(tcp_socket)?;
+        let input_stream = self
+            .table_mut()
+            .push_input_stream_child(input, tcp_socket)?;
+        let output_stream = self
+            .table_mut()
+            .push_output_stream_child(output, tcp_socket)?;
 
         Ok((tcp_socket, input_stream, output_stream))
     }
 
-    fn local_address(&mut self, this: Resource<tcp::TcpSocket>) -> SocketResult<IpSocketAddress> {
+    fn local_address(&mut self, this: tcp::TcpSocket) -> Result<IpSocketAddress, network::Error> {
         let table = self.table();
-        let socket = table.get(&this)?;
-
-        match socket.tcp_state {
-            TcpState::Default => return Err(ErrorCode::InvalidState.into()),
-            TcpState::BindStarted => return Err(ErrorCode::ConcurrencyConflict.into()),
-            _ => {}
-        }
-
+        let socket = table.get_tcp_socket(this)?;
         let addr = socket
             .tcp_socket()
             .as_socketlike_view::<std::net::TcpStream>()
@@ -324,15 +230,9 @@ impl<T: WasiView> crate::preview2::host::tcp::tcp::HostTcpSocket for T {
         Ok(addr.into())
     }
 
-    fn remote_address(&mut self, this: Resource<tcp::TcpSocket>) -> SocketResult<IpSocketAddress> {
+    fn remote_address(&mut self, this: tcp::TcpSocket) -> Result<IpSocketAddress, network::Error> {
         let table = self.table();
-        let socket = table.get(&this)?;
-
-        match socket.tcp_state {
-            TcpState::Connected => {}
-            _ => return Err(ErrorCode::InvalidState.into()),
-        }
-
+        let socket = table.get_tcp_socket(this)?;
         let addr = socket
             .tcp_socket()
             .as_socketlike_view::<std::net::TcpStream>()
@@ -340,249 +240,220 @@ impl<T: WasiView> crate::preview2::host::tcp::tcp::HostTcpSocket for T {
         Ok(addr.into())
     }
 
-    fn address_family(
-        &mut self,
-        this: Resource<tcp::TcpSocket>,
-    ) -> Result<IpAddressFamily, anyhow::Error> {
+    fn address_family(&mut self, this: tcp::TcpSocket) -> Result<IpAddressFamily, anyhow::Error> {
         let table = self.table();
-        let socket = table.get(&this)?;
+        let socket = table.get_tcp_socket(this)?;
+
+        // If `SO_DOMAIN` is available, use it.
+        //
+        // TODO: OpenBSD also supports this; upstream PRs are posted.
+        #[cfg(not(any(
+            windows,
+            target_os = "ios",
+            target_os = "macos",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        )))]
+        {
+            use rustix::net::AddressFamily;
+
+            let family = sockopt::get_socket_domain(socket.tcp_socket())?;
+            let family = match family {
+                AddressFamily::INET => IpAddressFamily::Ipv4,
+                AddressFamily::INET6 => IpAddressFamily::Ipv6,
+                _ => return Err(ErrorCode::NotSupported.into()),
+            };
+            Ok(family)
+        }
 
-        match socket.family {
-            SocketAddressFamily::Ipv4 => Ok(IpAddressFamily::Ipv4),
-            SocketAddressFamily::Ipv6 { .. } => Ok(IpAddressFamily::Ipv6),
+        // When `SO_DOMAIN` is not available, emulate it.
+        #[cfg(any(
+            windows,
+            target_os = "ios",
+            target_os = "macos",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ))]
+        {
+            if let Ok(_) = sockopt::get_ipv6_unicast_hops(socket.tcp_socket()) {
+                return Ok(IpAddressFamily::Ipv6);
+            }
+            if let Ok(_) = sockopt::get_ip_ttl(socket.tcp_socket()) {
+                return Ok(IpAddressFamily::Ipv4);
+            }
+            Err(ErrorCode::NotSupported.into())
         }
     }
 
-    fn ipv6_only(&mut self, this: Resource<tcp::TcpSocket>) -> SocketResult<bool> {
+    fn ipv6_only(&mut self, this: tcp::TcpSocket) -> Result<bool, network::Error> {
         let table = self.table();
-        let socket = table.get(&this)?;
-
-        // Instead of just calling the OS we return our own internal state, because
-        // MacOS doesn't propogate the V6ONLY state on to accepted client sockets.
-
-        match socket.family {
-            SocketAddressFamily::Ipv4 => Err(ErrorCode::NotSupported.into()),
-            SocketAddressFamily::Ipv6 { v6only } => Ok(v6only),
-        }
+        let socket = table.get_tcp_socket(this)?;
+        Ok(sockopt::get_ipv6_v6only(socket.tcp_socket())?)
     }
 
-    fn set_ipv6_only(&mut self, this: Resource<tcp::TcpSocket>, value: bool) -> SocketResult<()> {
-        let table = self.table_mut();
-        let socket = table.get_mut(&this)?;
-
-        match socket.family {
-            SocketAddressFamily::Ipv4 => Err(ErrorCode::NotSupported.into()),
-            SocketAddressFamily::Ipv6 { .. } => match socket.tcp_state {
-                TcpState::Default => {
-                    sockopt::set_ipv6_v6only(socket.tcp_socket(), value)?;
-                    socket.family = SocketAddressFamily::Ipv6 { v6only: value };
-                    Ok(())
-                }
-                TcpState::BindStarted => Err(ErrorCode::ConcurrencyConflict.into()),
-                _ => Err(ErrorCode::InvalidState.into()),
-            },
-        }
+    fn set_ipv6_only(&mut self, this: tcp::TcpSocket, value: bool) -> Result<(), network::Error> {
+        let table = self.table();
+        let socket = table.get_tcp_socket(this)?;
+        Ok(sockopt::set_ipv6_v6only(socket.tcp_socket(), value)?)
     }
 
     fn set_listen_backlog_size(
         &mut self,
-        this: Resource<tcp::TcpSocket>,
+        this: tcp::TcpSocket,
         value: u64,
-    ) -> SocketResult<()> {
-        const MIN_BACKLOG: i32 = 1;
-        const MAX_BACKLOG: i32 = i32::MAX; // OS'es will most likely limit it down even further.
-
-        let table = self.table_mut();
-        let socket = table.get_mut(&this)?;
-
-        // Silently clamp backlog size. This is OK for us to do, because operating systems do this too.
-        let value = value
-            .try_into()
-            .unwrap_or(i32::MAX)
-            .clamp(MIN_BACKLOG, MAX_BACKLOG);
+    ) -> Result<(), network::Error> {
+        let table = self.table();
+        let socket = table.get_tcp_socket(this)?;
 
         match socket.tcp_state {
-            TcpState::Default | TcpState::BindStarted | TcpState::Bound => {
-                // Socket not listening yet. Stash value for first invocation to `listen`.
-                socket.listen_backlog_size = Some(value);
-
-                Ok(())
-            }
-            TcpState::Listening => {
-                // Try to update the backlog by calling `listen` again.
-                // Not all platforms support this. We'll only update our own value if the OS supports changing the backlog size after the fact.
-
-                rustix::net::listen(socket.tcp_socket(), value)
-                    .map_err(|_| ErrorCode::NotSupported)?;
-
-                socket.listen_backlog_size = Some(value);
-
-                Ok(())
-            }
-            TcpState::Connected | TcpState::ConnectFailed => Err(ErrorCode::InvalidState.into()),
-            TcpState::Connecting | TcpState::ConnectReady | TcpState::ListenStarted => {
-                Err(ErrorCode::ConcurrencyConflict.into())
-            }
+            HostTcpState::Listening => {}
+            _ => return Err(ErrorCode::NotInProgress.into()),
         }
+
+        let value = value.try_into().map_err(|_| ErrorCode::OutOfMemory)?;
+        Ok(rustix::net::listen(socket.tcp_socket(), value)?)
     }
 
-    fn keep_alive(&mut self, this: Resource<tcp::TcpSocket>) -> SocketResult<bool> {
+    fn keep_alive(&mut self, this: tcp::TcpSocket) -> Result<bool, network::Error> {
         let table = self.table();
-        let socket = table.get(&this)?;
+        let socket = table.get_tcp_socket(this)?;
         Ok(sockopt::get_socket_keepalive(socket.tcp_socket())?)
     }
 
-    fn set_keep_alive(&mut self, this: Resource<tcp::TcpSocket>, value: bool) -> SocketResult<()> {
+    fn set_keep_alive(&mut self, this: tcp::TcpSocket, value: bool) -> Result<(), network::Error> {
         let table = self.table();
-        let socket = table.get(&this)?;
+        let socket = table.get_tcp_socket(this)?;
         Ok(sockopt::set_socket_keepalive(socket.tcp_socket(), value)?)
     }
 
-    fn no_delay(&mut self, this: Resource<tcp::TcpSocket>) -> SocketResult<bool> {
+    fn no_delay(&mut self, this: tcp::TcpSocket) -> Result<bool, network::Error> {
         let table = self.table();
-        let socket = table.get(&this)?;
+        let socket = table.get_tcp_socket(this)?;
         Ok(sockopt::get_tcp_nodelay(socket.tcp_socket())?)
     }
 
-    fn set_no_delay(&mut self, this: Resource<tcp::TcpSocket>, value: bool) -> SocketResult<()> {
+    fn set_no_delay(&mut self, this: tcp::TcpSocket, value: bool) -> Result<(), network::Error> {
         let table = self.table();
-        let socket = table.get(&this)?;
+        let socket = table.get_tcp_socket(this)?;
         Ok(sockopt::set_tcp_nodelay(socket.tcp_socket(), value)?)
     }
 
-    fn unicast_hop_limit(&mut self, this: Resource<tcp::TcpSocket>) -> SocketResult<u8> {
+    fn unicast_hop_limit(&mut self, this: tcp::TcpSocket) -> Result<u8, network::Error> {
         let table = self.table();
-        let socket = table.get(&this)?;
-
-        let ttl = match socket.family {
-            SocketAddressFamily::Ipv4 => sockopt::get_ip_ttl(socket.tcp_socket())?
-                .try_into()
-                .unwrap(),
-            SocketAddressFamily::Ipv6 { .. } => {
-                sockopt::get_ipv6_unicast_hops(socket.tcp_socket())?
+        let socket = table.get_tcp_socket(this)?;
+
+        // We don't track whether the socket is IPv4 or IPv6 so try one and
+        // fall back to the other.
+        match sockopt::get_ipv6_unicast_hops(socket.tcp_socket()) {
+            Ok(value) => Ok(value),
+            Err(Errno::NOPROTOOPT) => {
+                let value = sockopt::get_ip_ttl(socket.tcp_socket())?;
+                let value = value.try_into().unwrap();
+                Ok(value)
             }
-        };
-
-        Ok(ttl)
+            Err(err) => Err(err.into()),
+        }
     }
 
     fn set_unicast_hop_limit(
         &mut self,
-        this: Resource<tcp::TcpSocket>,
+        this: tcp::TcpSocket,
         value: u8,
-    ) -> SocketResult<()> {
-        let table = self.table_mut();
-        let socket = table.get_mut(&this)?;
-
-        if value == 0 {
-            // A well-behaved IP application should never send out new packets with TTL 0.
-            // We validate the value ourselves because OS'es are not consistent in this.
-            // On Linux the validation is even inconsistent between their IPv4 and IPv6 implementation.
-            return Err(ErrorCode::InvalidArgument.into());
-        }
-
-        match socket.family {
-            SocketAddressFamily::Ipv4 => sockopt::set_ip_ttl(socket.tcp_socket(), value.into())?,
-            SocketAddressFamily::Ipv6 { .. } => {
-                sockopt::set_ipv6_unicast_hops(socket.tcp_socket(), Some(value))?
-            }
-        }
-
-        #[cfg(target_os = "macos")]
-        {
-            socket.hop_limit = Some(value);
+    ) -> Result<(), network::Error> {
+        let table = self.table();
+        let socket = table.get_tcp_socket(this)?;
+
+        // We don't track whether the socket is IPv4 or IPv6 so try one and
+        // fall back to the other.
+        match sockopt::set_ipv6_unicast_hops(socket.tcp_socket(), Some(value)) {
+            Ok(()) => Ok(()),
+            Err(Errno::NOPROTOOPT) => Ok(sockopt::set_ip_ttl(socket.tcp_socket(), value.into())?),
+            Err(err) => Err(err.into()),
         }
-
-        Ok(())
     }
 
-    fn receive_buffer_size(&mut self, this: Resource<tcp::TcpSocket>) -> SocketResult<u64> {
+    fn receive_buffer_size(&mut self, this: tcp::TcpSocket) -> Result<u64, network::Error> {
         let table = self.table();
-        let socket = table.get(&this)?;
-
-        let value = sockopt::get_socket_recv_buffer_size(socket.tcp_socket())? as u64;
-        Ok(normalize_getsockopt_buffer_size(value))
+        let socket = table.get_tcp_socket(this)?;
+        Ok(sockopt::get_socket_recv_buffer_size(socket.tcp_socket())? as u64)
     }
 
     fn set_receive_buffer_size(
         &mut self,
-        this: Resource<tcp::TcpSocket>,
+        this: tcp::TcpSocket,
         value: u64,
-    ) -> SocketResult<()> {
-        let table = self.table_mut();
-        let socket = table.get_mut(&this)?;
-        let value = normalize_setsockopt_buffer_size(value);
-
-        match sockopt::set_socket_recv_buffer_size(socket.tcp_socket(), value) {
-            // Most platforms (Linux, Windows, Fuchsia, Solaris, Illumos, Haiku, ESP-IDF, ..and more?) treat the value
-            // passed to SO_SNDBUF/SO_RCVBUF as a performance tuning hint and silently clamp the input if it exceeds
-            // their capability.
-            // As far as I can see, only the *BSD family views this option as a hard requirement and fails when the
-            // value is out of range. We normalize this behavior in favor of the more commonly understood
-            // "performance hint" semantics. In other words; even ENOBUFS is "Ok".
-            // A future improvement could be to query the corresponding sysctl on *BSD platforms and clamp the input
-            // `size` ourselves, to completely close the gap with other platforms.
-            Err(Errno::NOBUFS) => Ok(()),
-            r => r,
-        }?;
-
-        #[cfg(target_os = "macos")]
-        {
-            socket.receive_buffer_size = Some(value);
-        }
-
-        Ok(())
+    ) -> Result<(), network::Error> {
+        let table = self.table();
+        let socket = table.get_tcp_socket(this)?;
+        let value = value.try_into().map_err(|_| ErrorCode::OutOfMemory)?;
+        Ok(sockopt::set_socket_recv_buffer_size(
+            socket.tcp_socket(),
+            value,
+        )?)
     }
 
-    fn send_buffer_size(&mut self, this: Resource<tcp::TcpSocket>) -> SocketResult<u64> {
+    fn send_buffer_size(&mut self, this: tcp::TcpSocket) -> Result<u64, network::Error> {
         let table = self.table();
-        let socket = table.get(&this)?;
-
-        let value = sockopt::get_socket_send_buffer_size(socket.tcp_socket())? as u64;
-        Ok(normalize_getsockopt_buffer_size(value))
+        let socket = table.get_tcp_socket(this)?;
+        Ok(sockopt::get_socket_send_buffer_size(socket.tcp_socket())? as u64)
     }
 
     fn set_send_buffer_size(
         &mut self,
-        this: Resource<tcp::TcpSocket>,
+        this: tcp::TcpSocket,
         value: u64,
-    ) -> SocketResult<()> {
-        let table = self.table_mut();
-        let socket = table.get_mut(&this)?;
-        let value = normalize_setsockopt_buffer_size(value);
+    ) -> Result<(), network::Error> {
+        let table = self.table();
+        let socket = table.get_tcp_socket(this)?;
+        let value = value.try_into().map_err(|_| ErrorCode::OutOfMemory)?;
+        Ok(sockopt::set_socket_send_buffer_size(
+            socket.tcp_socket(),
+            value,
+        )?)
+    }
 
-        match sockopt::set_socket_send_buffer_size(socket.tcp_socket(), value) {
-            Err(Errno::NOBUFS) => Ok(()), // See `set_receive_buffer_size`
-            r => r,
-        }?;
+    fn subscribe(&mut self, this: tcp::TcpSocket) -> anyhow::Result<Pollable> {
+        fn make_tcp_socket_future<'a>(stream: &'a mut dyn Any) -> PollableFuture<'a> {
+            let socket = stream
+                .downcast_mut::<HostTcpSocket>()
+                .expect("downcast to HostTcpSocket failed");
 
-        #[cfg(target_os = "macos")]
-        {
-            socket.send_buffer_size = Some(value);
+            // Some states are ready immediately.
+            match socket.tcp_state {
+                HostTcpState::BindStarted
+                | HostTcpState::ListenStarted
+                | HostTcpState::ConnectReady => return Box::pin(async { Ok(()) }),
+                _ => {}
+            }
+
+            // FIXME: Add `Interest::ERROR` when we update to tokio 1.32.
+            let join = Box::pin(async move {
+                socket
+                    .inner
+                    .ready(Interest::READABLE | Interest::WRITABLE)
+                    .await
+                    .unwrap();
+                Ok(())
+            });
+
+            join
         }
 
-        Ok(())
-    }
+        let pollable = HostPollable::TableEntry {
+            index: this,
+            make_future: make_tcp_socket_future,
+        };
 
-    fn subscribe(&mut self, this: Resource<tcp::TcpSocket>) -> anyhow::Result<Resource<Pollable>> {
-        crate::preview2::poll::subscribe(self.table_mut(), this)
+        Ok(self.table_mut().push_host_pollable(pollable)?)
     }
 
     fn shutdown(
         &mut self,
-        this: Resource<tcp::TcpSocket>,
+        this: tcp::TcpSocket,
         shutdown_type: ShutdownType,
-    ) -> SocketResult<()> {
+    ) -> Result<(), network::Error> {
         let table = self.table();
-        let socket = table.get(&this)?;
-
-        match socket.tcp_state {
-            TcpState::Connected => {}
-            TcpState::Connecting | TcpState::ConnectReady => {
-                return Err(ErrorCode::ConcurrencyConflict.into())
-            }
-            _ => return Err(ErrorCode::InvalidState.into()),
-        }
+        let socket = table.get_tcp_socket(this)?;
 
         let how = match shutdown_type {
             ShutdownType::Receive => std::net::Shutdown::Read,
@@ -597,12 +468,32 @@ impl<T: WasiView> crate::preview2::host::tcp::tcp::HostTcpSocket for T {
         Ok(())
     }
 
-    fn drop(&mut self, this: Resource<tcp::TcpSocket>) -> Result<(), anyhow::Error> {
+    fn drop_tcp_socket(&mut self, this: tcp::TcpSocket) -> Result<(), anyhow::Error> {
         let table = self.table_mut();
 
         // As in the filesystem implementation, we assume closing a socket
         // doesn't block.
-        let dropped = table.delete(this)?;
+        let dropped = table.delete_tcp_socket(this)?;
+
+        // If we might have an `event::poll` waiting on the socket, wake it up.
+        #[cfg(not(unix))]
+        {
+            match dropped.tcp_state {
+                HostTcpState::Default
+                | HostTcpState::BindStarted
+                | HostTcpState::Bound
+                | HostTcpState::ListenStarted
+                | HostTcpState::ConnectReady => {}
+
+                HostTcpState::Listening | HostTcpState::Connecting | HostTcpState::Connected => {
+                    match rustix::net::shutdown(&dropped.inner, rustix::net::Shutdown::ReadWrite) {
+                        Ok(()) | Err(Errno::NOTCONN) => {}
+                        Err(err) => Err(err).unwrap(),
+                    }
+                }
+            }
+        }
+
         drop(dropped);
 
         Ok(())
@@ -618,89 +509,3 @@ const INPROGRESS: Errno = Errno::INPROGRESS;
 // <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-connect>
 #[cfg(windows)]
 const INPROGRESS: Errno = Errno::WOULDBLOCK;
-
-fn validate_unicast(addr: &SocketAddr) -> SocketResult<()> {
-    match to_canonical(&addr.ip()) {
-        IpAddr::V4(ipv4) => {
-            if ipv4.is_multicast() || ipv4.is_broadcast() {
-                Err(ErrorCode::InvalidArgument.into())
-            } else {
-                Ok(())
-            }
-        }
-        IpAddr::V6(ipv6) => {
-            if ipv6.is_multicast() {
-                Err(ErrorCode::InvalidArgument.into())
-            } else {
-                Ok(())
-            }
-        }
-    }
-}
-
-fn validate_remote_address(addr: &SocketAddr) -> SocketResult<()> {
-    if to_canonical(&addr.ip()).is_unspecified() {
-        return Err(ErrorCode::InvalidArgument.into());
-    }
-
-    if addr.port() == 0 {
-        return Err(ErrorCode::InvalidArgument.into());
-    }
-
-    Ok(())
-}
-
-fn validate_address_family(socket: &TcpSocket, addr: &SocketAddr) -> SocketResult<()> {
-    match (socket.family, addr.ip()) {
-        (SocketAddressFamily::Ipv4, IpAddr::V4(_)) => Ok(()),
-        (SocketAddressFamily::Ipv6 { v6only }, IpAddr::V6(ipv6)) => {
-            if is_deprecated_ipv4_compatible(&ipv6) {
-                // Reject IPv4-*compatible* IPv6 addresses. They have been deprecated
-                // since 2006, OS handling of them is inconsistent and our own
-                // validations don't take them into account either.
-                // Note that these are not the same as IPv4-*mapped* IPv6 addresses.
-                Err(ErrorCode::InvalidArgument.into())
-            } else if v6only && ipv6.to_ipv4_mapped().is_some() {
-                Err(ErrorCode::InvalidArgument.into())
-            } else {
-                Ok(())
-            }
-        }
-        _ => Err(ErrorCode::InvalidArgument.into()),
-    }
-}
-
-// Can be removed once `IpAddr::to_canonical` becomes stable.
-fn to_canonical(addr: &IpAddr) -> IpAddr {
-    match addr {
-        IpAddr::V4(ipv4) => IpAddr::V4(*ipv4),
-        IpAddr::V6(ipv6) => {
-            if let Some(ipv4) = ipv6.to_ipv4_mapped() {
-                IpAddr::V4(ipv4)
-            } else {
-                IpAddr::V6(*ipv6)
-            }
-        }
-    }
-}
-
-fn is_deprecated_ipv4_compatible(addr: &Ipv6Addr) -> bool {
-    matches!(addr.segments(), [0, 0, 0, 0, 0, 0, _, _])
-        && *addr != Ipv6Addr::UNSPECIFIED
-        && *addr != Ipv6Addr::LOCALHOST
-}
-
-fn normalize_setsockopt_buffer_size(value: u64) -> usize {
-    value.clamp(1, i32::MAX as u64).try_into().unwrap()
-}
-
-fn normalize_getsockopt_buffer_size(value: u64) -> u64 {
-    if cfg!(target_os = "linux") {
-        // Linux doubles the value passed to setsockopt to allow space for bookkeeping overhead.
-        // getsockopt returns this internally doubled value.
-        // We'll half the value to at least get it back into the same ballpark that the application requested it in.
-        value / 2
-    } else {
-        value
-    }
-}
diff --git a/crates/wasi/src/preview2/host/tcp_create_socket.rs b/crates/wasi/src/preview2/host/tcp_create_socket.rs
index 3018ef709f8a..d2559e7df7d5 100644
--- a/crates/wasi/src/preview2/host/tcp_create_socket.rs
+++ b/crates/wasi/src/preview2/host/tcp_create_socket.rs
@@ -1,15 +1,18 @@
-use crate::preview2::bindings::{sockets::network::IpAddressFamily, sockets::tcp_create_socket};
-use crate::preview2::tcp::TcpSocket;
-use crate::preview2::{SocketResult, WasiView};
-use wasmtime::component::Resource;
+use crate::preview2::bindings::{
+    sockets::network::{self, IpAddressFamily},
+    sockets::tcp::TcpSocket,
+    sockets::tcp_create_socket,
+};
+use crate::preview2::tcp::{HostTcpSocket, TableTcpSocketExt};
+use crate::preview2::WasiView;
 
 impl<T: WasiView> tcp_create_socket::Host for T {
     fn create_tcp_socket(
         &mut self,
         address_family: IpAddressFamily,
-    ) -> SocketResult<Resource<TcpSocket>> {
-        let socket = TcpSocket::new(address_family.into())?;
-        let socket = self.table_mut().push(socket)?;
+    ) -> Result<TcpSocket, network::Error> {
+        let socket = HostTcpSocket::new(address_family.into())?;
+        let socket = self.table_mut().push_tcp_socket(socket)?;
         Ok(socket)
     }
 }
diff --git a/crates/wasi/src/preview2/host/udp.rs b/crates/wasi/src/preview2/host/udp.rs
deleted file mode 100644
index a97bd1bcd187..000000000000
--- a/crates/wasi/src/preview2/host/udp.rs
+++ /dev/null
@@ -1,483 +0,0 @@
-use std::net::SocketAddr;
-
-use crate::preview2::{
-    bindings::{
-        sockets::network::{ErrorCode, IpAddressFamily, IpSocketAddress, Network},
-        sockets::udp,
-    },
-    udp::{IncomingDatagramStream, OutgoingDatagramStream, SendState, UdpState},
-    Subscribe,
-};
-use crate::preview2::{Pollable, SocketError, SocketResult, WasiView};
-use anyhow::anyhow;
-use async_trait::async_trait;
-use cap_net_ext::{AddressFamily, PoolExt};
-use io_lifetimes::AsSocketlike;
-use rustix::io::Errno;
-use rustix::net::sockopt;
-use tokio::io::Interest;
-use wasmtime::component::Resource;
-
-/// Theoretical maximum byte size of a UDP datagram, the real limit is lower,
-/// but we do not account for e.g. the transport layer here for simplicity.
-/// In practice, datagrams are typically less than 1500 bytes.
-const MAX_UDP_DATAGRAM_SIZE: usize = u16::MAX as usize;
-
-impl<T: WasiView> udp::Host for T {}
-
-impl<T: WasiView> udp::HostUdpSocket for T {
-    fn start_bind(
-        &mut self,
-        this: Resource<udp::UdpSocket>,
-        network: Resource<Network>,
-        local_address: IpSocketAddress,
-    ) -> SocketResult<()> {
-        let table = self.table_mut();
-        let socket = table.get(&this)?;
-        let network = table.get(&network)?;
-        let local_address: SocketAddr = local_address.into();
-
-        match socket.udp_state {
-            UdpState::Default => {}
-            UdpState::BindStarted => return Err(ErrorCode::ConcurrencyConflict.into()),
-            UdpState::Bound | UdpState::Connected => return Err(ErrorCode::InvalidState.into()),
-        }
-
-        let binder = network.pool.udp_binder(local_address)?;
-
-        // Perform the OS bind call.
-        binder.bind_existing_udp_socket(
-            &*socket
-                .udp_socket()
-                .as_socketlike_view::<cap_std::net::UdpSocket>(),
-        )?;
-
-        let socket = table.get_mut(&this)?;
-        socket.udp_state = UdpState::BindStarted;
-
-        Ok(())
-    }
-
-    fn finish_bind(&mut self, this: Resource<udp::UdpSocket>) -> SocketResult<()> {
-        let table = self.table_mut();
-        let socket = table.get_mut(&this)?;
-
-        match socket.udp_state {
-            UdpState::BindStarted => {
-                socket.udp_state = UdpState::Bound;
-                Ok(())
-            }
-            _ => Err(ErrorCode::NotInProgress.into()),
-        }
-    }
-
-    fn stream(
-        &mut self,
-        this: Resource<udp::UdpSocket>,
-        remote_address: Option<IpSocketAddress>,
-    ) -> SocketResult<(
-        Resource<udp::IncomingDatagramStream>,
-        Resource<udp::OutgoingDatagramStream>,
-    )> {
-        let table = self.table_mut();
-
-        let has_active_streams = table
-            .iter_children(&this)?
-            .any(|c| c.is::<IncomingDatagramStream>() || c.is::<OutgoingDatagramStream>());
-
-        if has_active_streams {
-            return Err(SocketError::trap(anyhow!("UDP streams not dropped yet")));
-        }
-
-        let socket = table.get_mut(&this)?;
-        let remote_address = remote_address.map(SocketAddr::from);
-
-        match socket.udp_state {
-            UdpState::Bound | UdpState::Connected => {}
-            _ => return Err(ErrorCode::InvalidState.into()),
-        }
-
-        if let UdpState::Connected = socket.udp_state {
-            // FIXME: Allow multiple (dis)connects. This needs to be supported by rustix first.
-            // rustix::net::disconnect(socket.udp_socket())?;
-            // socket.udp_state = UdpState::Bound;
-            return Err(ErrorCode::NotSupported.into());
-        }
-
-        if let Some(connect_addr) = remote_address {
-            rustix::net::connect(socket.udp_socket(), &connect_addr)?;
-            socket.udp_state = UdpState::Connected;
-        }
-
-        let incoming_stream = IncomingDatagramStream {
-            inner: socket.inner.clone(),
-            remote_address,
-        };
-        let outgoing_stream = OutgoingDatagramStream {
-            inner: socket.inner.clone(),
-            remote_address,
-            send_state: SendState::Idle,
-        };
-
-        Ok((
-            self.table_mut().push_child(incoming_stream, &this)?,
-            self.table_mut().push_child(outgoing_stream, &this)?,
-        ))
-    }
-
-    fn local_address(&mut self, this: Resource<udp::UdpSocket>) -> SocketResult<IpSocketAddress> {
-        let table = self.table();
-        let socket = table.get(&this)?;
-        let addr = socket
-            .udp_socket()
-            .as_socketlike_view::<std::net::UdpSocket>()
-            .local_addr()?;
-        Ok(addr.into())
-    }
-
-    fn remote_address(&mut self, this: Resource<udp::UdpSocket>) -> SocketResult<IpSocketAddress> {
-        let table = self.table();
-        let socket = table.get(&this)?;
-        let addr = socket
-            .udp_socket()
-            .as_socketlike_view::<std::net::UdpSocket>()
-            .peer_addr()?;
-        Ok(addr.into())
-    }
-
-    fn address_family(
-        &mut self,
-        this: Resource<udp::UdpSocket>,
-    ) -> Result<IpAddressFamily, anyhow::Error> {
-        let table = self.table();
-        let socket = table.get(&this)?;
-        match socket.family {
-            AddressFamily::Ipv4 => Ok(IpAddressFamily::Ipv4),
-            AddressFamily::Ipv6 => Ok(IpAddressFamily::Ipv6),
-        }
-    }
-
-    fn ipv6_only(&mut self, this: Resource<udp::UdpSocket>) -> SocketResult<bool> {
-        let table = self.table();
-        let socket = table.get(&this)?;
-        Ok(sockopt::get_ipv6_v6only(socket.udp_socket())?)
-    }
-
-    fn set_ipv6_only(&mut self, this: Resource<udp::UdpSocket>, value: bool) -> SocketResult<()> {
-        let table = self.table();
-        let socket = table.get(&this)?;
-        Ok(sockopt::set_ipv6_v6only(socket.udp_socket(), value)?)
-    }
-
-    fn unicast_hop_limit(&mut self, this: Resource<udp::UdpSocket>) -> SocketResult<u8> {
-        let table = self.table();
-        let socket = table.get(&this)?;
-
-        // We don't track whether the socket is IPv4 or IPv6 so try one and
-        // fall back to the other.
-        match sockopt::get_ipv6_unicast_hops(socket.udp_socket()) {
-            Ok(value) => Ok(value),
-            Err(Errno::NOPROTOOPT) => {
-                let value = sockopt::get_ip_ttl(socket.udp_socket())?;
-                let value = value.try_into().unwrap();
-                Ok(value)
-            }
-            Err(err) => Err(err.into()),
-        }
-    }
-
-    fn set_unicast_hop_limit(
-        &mut self,
-        this: Resource<udp::UdpSocket>,
-        value: u8,
-    ) -> SocketResult<()> {
-        let table = self.table();
-        let socket = table.get(&this)?;
-
-        // We don't track whether the socket is IPv4 or IPv6 so try one and
-        // fall back to the other.
-        match sockopt::set_ipv6_unicast_hops(socket.udp_socket(), Some(value)) {
-            Ok(()) => Ok(()),
-            Err(Errno::NOPROTOOPT) => Ok(sockopt::set_ip_ttl(socket.udp_socket(), value.into())?),
-            Err(err) => Err(err.into()),
-        }
-    }
-
-    fn receive_buffer_size(&mut self, this: Resource<udp::UdpSocket>) -> SocketResult<u64> {
-        let table = self.table();
-        let socket = table.get(&this)?;
-        Ok(sockopt::get_socket_recv_buffer_size(socket.udp_socket())? as u64)
-    }
-
-    fn set_receive_buffer_size(
-        &mut self,
-        this: Resource<udp::UdpSocket>,
-        value: u64,
-    ) -> SocketResult<()> {
-        let table = self.table();
-        let socket = table.get(&this)?;
-        let value = value.try_into().map_err(|_| ErrorCode::OutOfMemory)?;
-        Ok(sockopt::set_socket_recv_buffer_size(
-            socket.udp_socket(),
-            value,
-        )?)
-    }
-
-    fn send_buffer_size(&mut self, this: Resource<udp::UdpSocket>) -> SocketResult<u64> {
-        let table = self.table();
-        let socket = table.get(&this)?;
-        Ok(sockopt::get_socket_send_buffer_size(socket.udp_socket())? as u64)
-    }
-
-    fn set_send_buffer_size(
-        &mut self,
-        this: Resource<udp::UdpSocket>,
-        value: u64,
-    ) -> SocketResult<()> {
-        let table = self.table();
-        let socket = table.get(&this)?;
-        let value = value.try_into().map_err(|_| ErrorCode::OutOfMemory)?;
-        Ok(sockopt::set_socket_send_buffer_size(
-            socket.udp_socket(),
-            value,
-        )?)
-    }
-
-    fn subscribe(&mut self, this: Resource<udp::UdpSocket>) -> anyhow::Result<Resource<Pollable>> {
-        crate::preview2::poll::subscribe(self.table_mut(), this)
-    }
-
-    fn drop(&mut self, this: Resource<udp::UdpSocket>) -> Result<(), anyhow::Error> {
-        let table = self.table_mut();
-
-        // As in the filesystem implementation, we assume closing a socket
-        // doesn't block.
-        let dropped = table.delete(this)?;
-        drop(dropped);
-
-        Ok(())
-    }
-}
-
-impl<T: WasiView> udp::HostIncomingDatagramStream for T {
-    fn receive(
-        &mut self,
-        this: Resource<udp::IncomingDatagramStream>,
-        max_results: u64,
-    ) -> SocketResult<Vec<udp::IncomingDatagram>> {
-        // Returns Ok(None) when the message was dropped.
-        fn recv_one(
-            stream: &IncomingDatagramStream,
-        ) -> SocketResult<Option<udp::IncomingDatagram>> {
-            let mut buf = [0; MAX_UDP_DATAGRAM_SIZE];
-            let (size, received_addr) = stream.inner.try_recv_from(&mut buf)?;
-
-            match stream.remote_address {
-                Some(connected_addr) if connected_addr != received_addr => {
-                    // Normally, this should have already been checked for us by the OS.
-                    return Ok(None);
-                }
-                _ => {}
-            }
-
-            // FIXME: check permission to receive from `received_addr`.
-            Ok(Some(udp::IncomingDatagram {
-                data: buf[..size].into(),
-                remote_address: received_addr.into(),
-            }))
-        }
-
-        let table = self.table();
-        let stream = table.get(&this)?;
-        let max_results: usize = max_results.try_into().unwrap_or(usize::MAX);
-
-        if max_results == 0 {
-            return Ok(vec![]);
-        }
-
-        let mut datagrams = vec![];
-
-        while datagrams.len() < max_results {
-            match recv_one(stream) {
-                Ok(Some(datagram)) => {
-                    datagrams.push(datagram);
-                }
-                Ok(None) => {
-                    // Message was dropped
-                }
-                Err(_) if datagrams.len() > 0 => {
-                    return Ok(datagrams);
-                }
-                Err(e) if matches!(e.downcast_ref(), Some(ErrorCode::WouldBlock)) => {
-                    return Ok(datagrams);
-                }
-                Err(e) => {
-                    return Err(e);
-                }
-            }
-        }
-
-        Ok(datagrams)
-    }
-
-    fn subscribe(
-        &mut self,
-        this: Resource<udp::IncomingDatagramStream>,
-    ) -> anyhow::Result<Resource<Pollable>> {
-        crate::preview2::poll::subscribe(self.table_mut(), this)
-    }
-
-    fn drop(&mut self, this: Resource<udp::IncomingDatagramStream>) -> Result<(), anyhow::Error> {
-        let table = self.table_mut();
-
-        // As in the filesystem implementation, we assume closing a socket
-        // doesn't block.
-        let dropped = table.delete(this)?;
-        drop(dropped);
-
-        Ok(())
-    }
-}
-
-#[async_trait]
-impl Subscribe for IncomingDatagramStream {
-    async fn ready(&mut self) {
-        // FIXME: Add `Interest::ERROR` when we update to tokio 1.32.
-        self.inner
-            .ready(Interest::READABLE)
-            .await
-            .expect("failed to await UDP socket readiness");
-    }
-}
-
-impl<T: WasiView> udp::HostOutgoingDatagramStream for T {
-    fn check_send(&mut self, this: Resource<udp::OutgoingDatagramStream>) -> SocketResult<u64> {
-        let table = self.table_mut();
-        let stream = table.get_mut(&this)?;
-
-        let permit = match stream.send_state {
-            SendState::Idle => {
-                const PERMIT: usize = 16;
-                stream.send_state = SendState::Permitted(PERMIT);
-                PERMIT
-            }
-            SendState::Permitted(n) => n,
-            SendState::Waiting => 0,
-        };
-
-        Ok(permit.try_into().unwrap())
-    }
-
-    fn send(
-        &mut self,
-        this: Resource<udp::OutgoingDatagramStream>,
-        datagrams: Vec<udp::OutgoingDatagram>,
-    ) -> SocketResult<u64> {
-        fn send_one(
-            stream: &OutgoingDatagramStream,
-            datagram: &udp::OutgoingDatagram,
-        ) -> SocketResult<()> {
-            if datagram.data.len() > MAX_UDP_DATAGRAM_SIZE {
-                return Err(ErrorCode::DatagramTooLarge.into());
-            }
-
-            let provided_addr = datagram.remote_address.map(SocketAddr::from);
-            let addr = match (stream.remote_address, provided_addr) {
-                (None, Some(addr)) => addr,
-                (Some(addr), None) => addr,
-                (Some(connected_addr), Some(provided_addr)) if connected_addr == provided_addr => {
-                    connected_addr
-                }
-                _ => return Err(ErrorCode::InvalidArgument.into()),
-            };
-
-            // FIXME: check permission to send to `addr`.
-            if stream.remote_address == Some(addr) {
-                stream.inner.try_send(&datagram.data)?;
-            } else {
-                stream.inner.try_send_to(&datagram.data, addr)?;
-            }
-
-            Ok(())
-        }
-
-        let table = self.table_mut();
-        let stream = table.get_mut(&this)?;
-
-        match stream.send_state {
-            SendState::Permitted(n) if n >= datagrams.len() => {
-                stream.send_state = SendState::Idle;
-            }
-            SendState::Permitted(_) => {
-                return Err(SocketError::trap(anyhow::anyhow!(
-                    "unpermitted: argument exceeds permitted size"
-                )))
-            }
-            SendState::Idle | SendState::Waiting => {
-                return Err(SocketError::trap(anyhow::anyhow!(
-                    "unpermitted: must call check-send first"
-                )))
-            }
-        }
-
-        if datagrams.is_empty() {
-            return Ok(0);
-        }
-
-        let mut count = 0;
-
-        for datagram in datagrams {
-            match send_one(stream, &datagram) {
-                Ok(_) => count += 1,
-                Err(_) if count > 0 => {
-                    // WIT: "If at least one datagram has been sent successfully, this function never returns an error."
-                    return Ok(count);
-                }
-                Err(e) if matches!(e.downcast_ref(), Some(ErrorCode::WouldBlock)) => {
-                    stream.send_state = SendState::Waiting;
-                    return Ok(count);
-                }
-                Err(e) => {
-                    return Err(e);
-                }
-            }
-        }
-
-        Ok(count)
-    }
-
-    fn subscribe(
-        &mut self,
-        this: Resource<udp::OutgoingDatagramStream>,
-    ) -> anyhow::Result<Resource<Pollable>> {
-        crate::preview2::poll::subscribe(self.table_mut(), this)
-    }
-
-    fn drop(&mut self, this: Resource<udp::OutgoingDatagramStream>) -> Result<(), anyhow::Error> {
-        let table = self.table_mut();
-
-        // As in the filesystem implementation, we assume closing a socket
-        // doesn't block.
-        let dropped = table.delete(this)?;
-        drop(dropped);
-
-        Ok(())
-    }
-}
-
-#[async_trait]
-impl Subscribe for OutgoingDatagramStream {
-    async fn ready(&mut self) {
-        match self.send_state {
-            SendState::Idle | SendState::Permitted(_) => {}
-            SendState::Waiting => {
-                // FIXME: Add `Interest::ERROR` when we update to tokio 1.32.
-                self.inner
-                    .ready(Interest::WRITABLE)
-                    .await
-                    .expect("failed to await UDP socket readiness");
-                self.send_state = SendState::Idle;
-            }
-        }
-    }
-}
diff --git a/crates/wasi/src/preview2/host/udp_create_socket.rs b/crates/wasi/src/preview2/host/udp_create_socket.rs
deleted file mode 100644
index 23edbddf949b..000000000000
--- a/crates/wasi/src/preview2/host/udp_create_socket.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use crate::preview2::bindings::{sockets::network::IpAddressFamily, sockets::udp_create_socket};
-use crate::preview2::udp::UdpSocket;
-use crate::preview2::{SocketResult, WasiView};
-use wasmtime::component::Resource;
-
-impl<T: WasiView> udp_create_socket::Host for T {
-    fn create_udp_socket(
-        &mut self,
-        address_family: IpAddressFamily,
-    ) -> SocketResult<Resource<UdpSocket>> {
-        let socket = UdpSocket::new(address_family.into())?;
-        let socket = self.table_mut().push(socket)?;
-        Ok(socket)
-    }
-}
diff --git a/crates/wasi/src/preview2/ip_name_lookup.rs b/crates/wasi/src/preview2/ip_name_lookup.rs
deleted file mode 100644
index b832bd5017c7..000000000000
--- a/crates/wasi/src/preview2/ip_name_lookup.rs
+++ /dev/null
@@ -1,128 +0,0 @@
-use crate::preview2::bindings::sockets::ip_name_lookup::{Host, HostResolveAddressStream};
-use crate::preview2::bindings::sockets::network::{ErrorCode, IpAddress, IpAddressFamily, Network};
-use crate::preview2::poll::{subscribe, Pollable, Subscribe};
-use crate::preview2::{spawn_blocking, AbortOnDropJoinHandle, SocketError, WasiView};
-use anyhow::Result;
-use std::mem;
-use std::net::{SocketAddr, ToSocketAddrs};
-use std::pin::Pin;
-use std::vec;
-use wasmtime::component::Resource;
-
-pub enum ResolveAddressStream {
-    Waiting(AbortOnDropJoinHandle<Result<Vec<IpAddress>, SocketError>>),
-    Done(Result<vec::IntoIter<IpAddress>, SocketError>),
-}
-
-#[async_trait::async_trait]
-impl<T: WasiView> Host for T {
-    fn resolve_addresses(
-        &mut self,
-        network: Resource<Network>,
-        name: String,
-        family: Option<IpAddressFamily>,
-        include_unavailable: bool,
-    ) -> Result<Resource<ResolveAddressStream>, SocketError> {
-        let network = self.table().get(&network)?;
-
-        // `Host::parse` serves us two functions:
-        // 1. validate the input is not an IP address,
-        // 2. convert unicode domains to punycode.
-        let name = match url::Host::parse(&name).map_err(|_| ErrorCode::InvalidArgument)? {
-            url::Host::Domain(name) => name,
-            url::Host::Ipv4(_) => return Err(ErrorCode::InvalidArgument.into()),
-            url::Host::Ipv6(_) => return Err(ErrorCode::InvalidArgument.into()),
-        };
-
-        if !network.allow_ip_name_lookup {
-            return Err(ErrorCode::PermanentResolverFailure.into());
-        }
-
-        // ignored for now, should probably have a future PR to actually take
-        // this into account. This would require invoking `getaddrinfo` directly
-        // rather than using the standard library to do it for us.
-        let _ = include_unavailable;
-
-        // For now use the standard library to perform actual resolution through
-        // the usage of the `ToSocketAddrs` trait. This blocks the current
-        // thread, so use `spawn_blocking`. Finally note that this is only
-        // resolving names, not ports, so force the port to be 0.
-        let task = spawn_blocking(move || -> Result<Vec<_>, SocketError> {
-            let result = (name.as_str(), 0)
-                .to_socket_addrs()
-                .map_err(|_| ErrorCode::NameUnresolvable)?; // If/when we use `getaddrinfo` directly, map the error properly.
-            Ok(result
-                .filter_map(|addr| {
-                    // In lieu of preventing these addresses from being resolved
-                    // in the first place, filter them out here.
-                    match addr {
-                        SocketAddr::V4(addr) => match family {
-                            None | Some(IpAddressFamily::Ipv4) => {
-                                let [a, b, c, d] = addr.ip().octets();
-                                Some(IpAddress::Ipv4((a, b, c, d)))
-                            }
-                            Some(IpAddressFamily::Ipv6) => None,
-                        },
-                        SocketAddr::V6(addr) => match family {
-                            None | Some(IpAddressFamily::Ipv6) => {
-                                let [a, b, c, d, e, f, g, h] = addr.ip().segments();
-                                Some(IpAddress::Ipv6((a, b, c, d, e, f, g, h)))
-                            }
-                            Some(IpAddressFamily::Ipv4) => None,
-                        },
-                    }
-                })
-                .collect())
-        });
-        let resource = self.table_mut().push(ResolveAddressStream::Waiting(task))?;
-        Ok(resource)
-    }
-}
-
-#[async_trait::async_trait]
-impl<T: WasiView> HostResolveAddressStream for T {
-    fn resolve_next_address(
-        &mut self,
-        resource: Resource<ResolveAddressStream>,
-    ) -> Result<Option<IpAddress>, SocketError> {
-        let stream = self.table_mut().get_mut(&resource)?;
-        loop {
-            match stream {
-                ResolveAddressStream::Waiting(future) => {
-                    match crate::preview2::poll_noop(Pin::new(future)) {
-                        Some(result) => {
-                            *stream = ResolveAddressStream::Done(result.map(|v| v.into_iter()));
-                        }
-                        None => return Err(ErrorCode::WouldBlock.into()),
-                    }
-                }
-                ResolveAddressStream::Done(slot @ Err(_)) => {
-                    mem::replace(slot, Ok(Vec::new().into_iter()))?;
-                    unreachable!();
-                }
-                ResolveAddressStream::Done(Ok(iter)) => return Ok(iter.next()),
-            }
-        }
-    }
-
-    fn subscribe(
-        &mut self,
-        resource: Resource<ResolveAddressStream>,
-    ) -> Result<Resource<Pollable>> {
-        subscribe(self.table_mut(), resource)
-    }
-
-    fn drop(&mut self, resource: Resource<ResolveAddressStream>) -> Result<()> {
-        self.table_mut().delete(resource)?;
-        Ok(())
-    }
-}
-
-#[async_trait::async_trait]
-impl Subscribe for ResolveAddressStream {
-    async fn ready(&mut self) {
-        if let ResolveAddressStream::Waiting(future) = self {
-            *self = ResolveAddressStream::Done(future.await.map(|v| v.into_iter()));
-        }
-    }
-}
diff --git a/crates/wasi/src/preview2/mod.rs b/crates/wasi/src/preview2/mod.rs
index f9d0977453b2..2e0a3e95e114 100644
--- a/crates/wasi/src/preview2/mod.rs
+++ b/crates/wasi/src/preview2/mod.rs
@@ -15,17 +15,12 @@
 //! `pub mod legacy` with an off-by-default feature flag, and after 2
 //! releases, retire and remove that code from our tree.
 
-use std::future::Future;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
 mod clocks;
 pub mod command;
 mod ctx;
 mod error;
 mod filesystem;
 mod host;
-mod ip_name_lookup;
 mod network;
 pub mod pipe;
 mod poll;
@@ -36,23 +31,19 @@ mod stdio;
 mod stream;
 mod table;
 mod tcp;
-mod udp;
-mod write_stream;
 
 pub use self::clocks::{HostMonotonicClock, HostWallClock};
 pub use self::ctx::{WasiCtx, WasiCtxBuilder, WasiView};
-pub use self::error::{I32Exit, TrappableError};
-pub use self::filesystem::{DirPerms, FilePerms, FsError, FsResult};
-pub use self::network::{Network, SocketError, SocketResult};
-pub use self::poll::{subscribe, ClosureFuture, MakeFuture, Pollable, PollableFuture, Subscribe};
+pub use self::error::I32Exit;
+pub use self::filesystem::{DirPerms, FilePerms};
+pub use self::poll::{ClosureFuture, HostPollable, MakeFuture, PollableFuture, TablePollableExt};
 pub use self::random::{thread_rng, Deterministic};
-pub use self::stdio::{
-    stderr, stdin, stdout, IsATTY, Stderr, Stdin, StdinStream, Stdout, StdoutStream,
-};
+pub use self::stdio::{stderr, stdin, stdout, IsATTY, Stderr, Stdin, Stdout};
 pub use self::stream::{
-    HostInputStream, HostOutputStream, InputStream, OutputStream, StreamError, StreamResult,
+    HostInputStream, HostOutputStream, OutputStreamError, StreamRuntimeError, StreamState,
+    TableStreamExt,
 };
-pub use self::table::{Table, TableError};
+pub use self::table::{OccupiedEntry, Table, TableError};
 pub use cap_fs_ext::SystemTimeSpec;
 pub use cap_rand::RngCore;
 
@@ -63,37 +54,29 @@ pub mod bindings {
     // have some functions in `only_imports` below for being async.
     pub mod sync_io {
         pub(crate) mod _internal {
-            use crate::preview2::{FsError, StreamError};
-
             wasmtime::component::bindgen!({
                 path: "wit",
                 interfaces: "
-                    import wasi:io/poll@0.2.0-rc-2023-11-05;
-                    import wasi:io/streams@0.2.0-rc-2023-11-05;
-                    import wasi:filesystem/types@0.2.0-rc-2023-11-05;
+                    import wasi:poll/poll
+                    import wasi:io/streams
+                    import wasi:filesystem/types
                 ",
                 tracing: true,
                 trappable_error_type: {
-                    "wasi:io/streams/stream-error" => StreamError,
-                    "wasi:filesystem/types/error-code" => FsError,
+                    "wasi:io/streams"::"write-error": Error,
+                    "wasi:filesystem/types"::"error-code": Error,
                 },
                 with: {
                     "wasi:clocks/wall-clock": crate::preview2::bindings::clocks::wall_clock,
-                    "wasi:filesystem/types/descriptor": super::super::filesystem::types::Descriptor,
-                    "wasi:filesystem/types/directory-entry-stream": super::super::filesystem::types::DirectoryEntryStream,
-                    "wasi:io/poll/pollable": super::super::io::poll::Pollable,
-                    "wasi:io/streams/input-stream": super::super::io::streams::InputStream,
-                    "wasi:io/streams/output-stream": super::super::io::streams::OutputStream,
-                    "wasi:io/streams/error": super::super::io::streams::Error,
                 }
             });
         }
-        pub use self::_internal::wasi::{filesystem, io};
+        pub use self::_internal::wasi::{filesystem, io, poll};
     }
 
     wasmtime::component::bindgen!({
         path: "wit",
-        world: "wasi:cli/reactor",
+        interfaces: "include wasi:cli/reactor",
         tracing: true,
         async: {
             // Only these functions are `async` and everything else is sync
@@ -104,74 +87,55 @@ pub mod bindings {
             // which in theory can be shared across interfaces, so this may
             // need fancier syntax in the future.
             only_imports: [
-                "[method]descriptor.access-at",
-                "[method]descriptor.advise",
-                "[method]descriptor.change-directory-permissions-at",
-                "[method]descriptor.change-file-permissions-at",
-                "[method]descriptor.create-directory-at",
-                "[method]descriptor.get-flags",
-                "[method]descriptor.get-type",
-                "[method]descriptor.is-same-object",
-                "[method]descriptor.link-at",
-                "[method]descriptor.lock-exclusive",
-                "[method]descriptor.lock-shared",
-                "[method]descriptor.metadata-hash",
-                "[method]descriptor.metadata-hash-at",
-                "[method]descriptor.open-at",
-                "[method]descriptor.read",
-                "[method]descriptor.read-directory",
-                "[method]descriptor.readlink-at",
-                "[method]descriptor.remove-directory-at",
-                "[method]descriptor.rename-at",
-                "[method]descriptor.set-size",
-                "[method]descriptor.set-times",
-                "[method]descriptor.set-times-at",
-                "[method]descriptor.stat",
-                "[method]descriptor.stat-at",
-                "[method]descriptor.symlink-at",
-                "[method]descriptor.sync",
-                "[method]descriptor.sync-data",
-                "[method]descriptor.try-lock-exclusive",
-                "[method]descriptor.try-lock-shared",
-                "[method]descriptor.unlink-file-at",
-                "[method]descriptor.unlock",
-                "[method]descriptor.write",
-                "[method]input-stream.read",
-                "[method]input-stream.blocking-read",
-                "[method]input-stream.blocking-skip",
-                "[method]input-stream.skip",
-                "[method]output-stream.forward",
-                "[method]output-stream.splice",
-                "[method]output-stream.blocking-splice",
-                "[method]output-stream.blocking-flush",
-                "[method]output-stream.blocking-write",
-                "[method]output-stream.blocking-write-and-flush",
-                "[method]output-stream.blocking-write-zeroes-and-flush",
-                "[method]directory-entry-stream.read-directory-entry",
-                "poll-list",
-                "poll-one",
+                "access-at",
+                "advise",
+                "blocking-flush",
+                "blocking-read",
+                "blocking-skip",
+                "blocking-splice",
+                "blocking-write",
+                "blocking-write-and-flush",
+                "change-directory-permissions-at",
+                "change-file-permissions-at",
+                "create-directory-at",
+                "forward",
+                "get-flags",
+                "get-type",
+                "is-same-object",
+                "link-at",
+                "lock-exclusive",
+                "lock-shared",
+                "metadata-hash",
+                "metadata-hash-at",
+                "open-at",
+                "poll-oneoff",
+                "read",
+                "read-directory",
+                "read-directory-entry",
+                "readlink-at",
+                "remove-directory-at",
+                "rename-at",
+                "set-size",
+                "set-times",
+                "set-times-at",
+                "skip",
+                "splice",
+                "stat",
+                "stat-at",
+                "symlink-at",
+                "sync",
+                "sync-data",
+                "try-lock-exclusive",
+                "try-lock-shared",
+                "unlink-file-at",
+                "unlock",
+                "write",
             ],
         },
         trappable_error_type: {
-            "wasi:io/streams/stream-error" => crate::preview2::StreamError,
-            "wasi:filesystem/types/error-code" => crate::preview2::FsError,
-            "wasi:sockets/network/error-code" => crate::preview2::SocketError,
-        },
-        with: {
-            "wasi:sockets/network/network": super::network::Network,
-            "wasi:sockets/tcp/tcp-socket": super::tcp::TcpSocket,
-            "wasi:sockets/udp/udp-socket": super::udp::UdpSocket,
-            "wasi:sockets/udp/incoming-datagram-stream": super::udp::IncomingDatagramStream,
-            "wasi:sockets/udp/outgoing-datagram-stream": super::udp::OutgoingDatagramStream,
-            "wasi:sockets/ip-name-lookup/resolve-address-stream": super::ip_name_lookup::ResolveAddressStream,
-            "wasi:filesystem/types/directory-entry-stream": super::filesystem::ReaddirIterator,
-            "wasi:filesystem/types/descriptor": super::filesystem::Descriptor,
-            "wasi:io/streams/input-stream": super::stream::InputStream,
-            "wasi:io/streams/output-stream": super::stream::OutputStream,
-            "wasi:io/streams/error": super::stream::Error,
-            "wasi:io/poll/pollable": super::poll::Pollable,
-            "wasi:cli/terminal-input/terminal-input": super::stdio::TerminalInput,
-            "wasi:cli/terminal-output/terminal-output": super::stdio::TerminalOutput,
+            "wasi:io/streams"::"write-error": Error,
+            "wasi:filesystem/types"::"error-code": Error,
+            "wasi:sockets/network"::"error-code": Error,
         },
     });
 
@@ -187,7 +151,7 @@ pub(crate) static RUNTIME: once_cell::sync::Lazy<tokio::runtime::Runtime> =
             .unwrap()
     });
 
-pub struct AbortOnDropJoinHandle<T>(tokio::task::JoinHandle<T>);
+pub(crate) struct AbortOnDropJoinHandle<T>(tokio::task::JoinHandle<T>);
 impl<T> Drop for AbortOnDropJoinHandle<T> {
     fn drop(&mut self) {
         self.0.abort()
@@ -209,9 +173,14 @@ impl<T> From<tokio::task::JoinHandle<T>> for AbortOnDropJoinHandle<T> {
         AbortOnDropJoinHandle(jh)
     }
 }
-impl<T> Future for AbortOnDropJoinHandle<T> {
+impl<T> std::future::Future for AbortOnDropJoinHandle<T> {
     type Output = T;
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+    fn poll(
+        mut self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Self::Output> {
+        use std::pin::Pin;
+        use std::task::Poll;
         match Pin::new(&mut self.as_mut().0).poll(cx) {
             Poll::Pending => Poll::Pending,
             Poll::Ready(r) => Poll::Ready(r.expect("child task panicked")),
@@ -219,73 +188,30 @@ impl<T> Future for AbortOnDropJoinHandle<T> {
     }
 }
 
-pub fn spawn<F>(f: F) -> AbortOnDropJoinHandle<F::Output>
-where
-    F: Future + Send + 'static,
-    F::Output: Send + 'static,
-{
-    let j = with_ambient_tokio_runtime(|| tokio::task::spawn(f));
-    AbortOnDropJoinHandle(j)
-}
-
-pub fn spawn_blocking<F, R>(f: F) -> AbortOnDropJoinHandle<R>
+pub(crate) fn spawn<F, G>(f: F) -> AbortOnDropJoinHandle<G>
 where
-    F: FnOnce() -> R + Send + 'static,
-    R: Send + 'static,
+    F: std::future::Future<Output = G> + Send + 'static,
+    G: Send + 'static,
 {
-    let j = with_ambient_tokio_runtime(|| tokio::task::spawn_blocking(f));
+    let j = match tokio::runtime::Handle::try_current() {
+        Ok(_) => tokio::task::spawn(f),
+        Err(_) => {
+            let _enter = RUNTIME.enter();
+            tokio::task::spawn(f)
+        }
+    };
     AbortOnDropJoinHandle(j)
 }
 
-pub fn in_tokio<F: Future>(f: F) -> F::Output {
+pub fn in_tokio<F: std::future::Future>(f: F) -> F::Output {
     match tokio::runtime::Handle::try_current() {
         Ok(h) => {
             let _enter = h.enter();
             h.block_on(f)
         }
-        // The `yield_now` here is non-obvious and if you're reading this
-        // you're likely curious about why it's here. This is currently required
-        // to get some features of "sync mode" working correctly, such as with
-        // the CLI. To illustrate why this is required, consider a program
-        // organized as:
-        //
-        // * A program has a `pollable` that it's waiting on.
-        // * This `pollable` is always ready .
-        // * Actually making the corresponding operation ready, however,
-        //   requires some background work on Tokio's part.
-        // * The program is looping on "wait for readiness" coupled with
-        //   performing the operation.
-        //
-        // In this situation this program ends up infinitely looping in waiting
-        // for pollables. The reason appears to be that when we enter the tokio
-        // runtime here it doesn't necessary yield to background work because
-        // the provided future `f` is ready immediately. The future `f` will run
-        // through the list of pollables and determine one of them is ready.
-        //
-        // Historically this happened with UDP sockets. A test send a datagram
-        // from one socket to another and the other socket infinitely didn't
-        // receive the data. This appeared to be because the server socket was
-        // waiting on `READABLE | WRITABLE` (which is itself a bug but ignore
-        // that) and the socket was currently in the "writable" state but never
-        // ended up receiving a notification for the "readable" state. Moving
-        // the socket to "readable" would require Tokio to perform some
-        // background work via epoll/kqueue/handle events but if the future
-        // provided here is always ready, then that never happened.
-        //
-        // Thus the `yield_now()` is an attempt to force Tokio to go do some
-        // background work eventually and look at new interest masks for
-        // example. This is a bit of a kludge but everything's already a bit
-        // wonky in synchronous mode anyway. Note that this is hypothesized to
-        // not be an issue in async mode because async mode typically has the
-        // Tokio runtime in a separate thread or otherwise participating in a
-        // larger application, it's only here in synchronous mode where we
-        // effectively own the runtime that we need some special care.
         Err(_) => {
             let _enter = RUNTIME.enter();
-            RUNTIME.block_on(async move {
-                tokio::task::yield_now().await;
-                f.await
-            })
+            RUNTIME.block_on(f)
         }
     }
 }
@@ -299,14 +225,3 @@ fn with_ambient_tokio_runtime<R>(f: impl FnOnce() -> R) -> R {
         }
     }
 }
-
-fn poll_noop<F>(future: Pin<&mut F>) -> Option<F::Output>
-where
-    F: Future,
-{
-    let mut task = Context::from_waker(futures::task::noop_waker_ref());
-    match future.poll(&mut task) {
-        Poll::Ready(result) => Some(result),
-        Poll::Pending => None,
-    }
-}
diff --git a/crates/wasi/src/preview2/network.rs b/crates/wasi/src/preview2/network.rs
index 1f49e06f349f..4d462fcbd275 100644
--- a/crates/wasi/src/preview2/network.rs
+++ b/crates/wasi/src/preview2/network.rs
@@ -1,30 +1,32 @@
-use crate::preview2::bindings::wasi::sockets::network::ErrorCode;
-use crate::preview2::{TableError, TrappableError};
+use crate::preview2::{Table, TableError};
 use cap_std::net::Pool;
 
-pub struct Network {
-    pub pool: Pool,
-    pub allow_ip_name_lookup: bool,
-}
-
-pub type SocketResult<T> = Result<T, SocketError>;
+pub(crate) struct HostNetwork(pub(crate) Pool);
 
-pub type SocketError = TrappableError<ErrorCode>;
-
-impl From<TableError> for SocketError {
-    fn from(error: TableError) -> Self {
-        Self::trap(error)
+impl HostNetwork {
+    pub fn new(pool: Pool) -> Self {
+        Self(pool)
     }
 }
 
-impl From<std::io::Error> for SocketError {
-    fn from(error: std::io::Error) -> Self {
-        ErrorCode::from(error).into()
-    }
+pub(crate) trait TableNetworkExt {
+    fn push_network(&mut self, network: HostNetwork) -> Result<u32, TableError>;
+    fn delete_network(&mut self, fd: u32) -> Result<HostNetwork, TableError>;
+    fn is_network(&self, fd: u32) -> bool;
+    fn get_network(&self, fd: u32) -> Result<&HostNetwork, TableError>;
 }
 
-impl From<rustix::io::Errno> for SocketError {
-    fn from(error: rustix::io::Errno) -> Self {
-        ErrorCode::from(error).into()
+impl TableNetworkExt for Table {
+    fn push_network(&mut self, network: HostNetwork) -> Result<u32, TableError> {
+        self.push(Box::new(network))
+    }
+    fn delete_network(&mut self, fd: u32) -> Result<HostNetwork, TableError> {
+        self.delete(fd)
+    }
+    fn is_network(&self, fd: u32) -> bool {
+        self.is::<HostNetwork>(fd)
+    }
+    fn get_network(&self, fd: u32) -> Result<&HostNetwork, TableError> {
+        self.get(fd)
     }
 }
diff --git a/crates/wasi/src/preview2/pipe.rs b/crates/wasi/src/preview2/pipe.rs
index bc8d20b1de56..a01215c11323 100644
--- a/crates/wasi/src/preview2/pipe.rs
+++ b/crates/wasi/src/preview2/pipe.rs
@@ -7,55 +7,56 @@
 //! Some convenience constructors are included for common backing types like `Vec<u8>` and `String`,
 //! but the virtual pipes can be instantiated with any `Read` or `Write` type.
 //!
-use crate::preview2::poll::Subscribe;
-use crate::preview2::{HostInputStream, HostOutputStream, StreamError};
-use anyhow::anyhow;
+use crate::preview2::{HostInputStream, HostOutputStream, OutputStreamError, StreamState};
+use anyhow::{anyhow, Error};
 use bytes::Bytes;
 use std::sync::{Arc, Mutex};
 use tokio::sync::mpsc;
 
-pub use crate::preview2::write_stream::AsyncWriteStream;
-
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub struct MemoryInputPipe {
-    buffer: Arc<Mutex<Bytes>>,
+    buffer: std::io::Cursor<Bytes>,
 }
 
 impl MemoryInputPipe {
     pub fn new(bytes: Bytes) -> Self {
         Self {
-            buffer: Arc::new(Mutex::new(bytes)),
+            buffer: std::io::Cursor::new(bytes),
         }
     }
 
     pub fn is_empty(&self) -> bool {
-        self.buffer.lock().unwrap().is_empty()
+        self.buffer.get_ref().len() as u64 == self.buffer.position()
     }
 }
 
 #[async_trait::async_trait]
 impl HostInputStream for MemoryInputPipe {
-    fn read(&mut self, size: usize) -> Result<Bytes, StreamError> {
-        let mut buffer = self.buffer.lock().unwrap();
-        if buffer.is_empty() {
-            return Err(StreamError::Closed);
+    fn read(&mut self, size: usize) -> Result<(Bytes, StreamState), Error> {
+        if self.is_empty() {
+            return Ok((Bytes::new(), StreamState::Closed));
         }
 
-        let size = size.min(buffer.len());
-        let read = buffer.split_to(size);
-        Ok(read)
-    }
-}
+        let mut dest = bytes::BytesMut::zeroed(size);
+        let nbytes = std::io::Read::read(&mut self.buffer, dest.as_mut())?;
+        dest.truncate(nbytes);
 
-#[async_trait::async_trait]
-impl Subscribe for MemoryInputPipe {
-    async fn ready(&mut self) {}
+        let state = if self.is_empty() {
+            StreamState::Closed
+        } else {
+            StreamState::Open
+        };
+        Ok((dest.freeze(), state))
+    }
+    async fn ready(&mut self) -> Result<(), Error> {
+        Ok(())
+    }
 }
 
 #[derive(Debug, Clone)]
 pub struct MemoryOutputPipe {
     capacity: usize,
-    buffer: Arc<Mutex<bytes::BytesMut>>,
+    buffer: std::sync::Arc<std::sync::Mutex<bytes::BytesMut>>,
 }
 
 impl MemoryOutputPipe {
@@ -75,11 +76,12 @@ impl MemoryOutputPipe {
     }
 }
 
+#[async_trait::async_trait]
 impl HostOutputStream for MemoryOutputPipe {
-    fn write(&mut self, bytes: Bytes) -> Result<(), StreamError> {
+    fn write(&mut self, bytes: Bytes) -> Result<(), OutputStreamError> {
         let mut buf = self.buffer.lock().unwrap();
         if bytes.len() > self.capacity - buf.len() {
-            return Err(StreamError::Trap(anyhow!(
+            return Err(OutputStreamError::Trap(anyhow!(
                 "write beyond capacity of MemoryOutputPipe"
             )));
         }
@@ -87,31 +89,37 @@ impl HostOutputStream for MemoryOutputPipe {
         // Always ready for writing
         Ok(())
     }
-    fn flush(&mut self) -> Result<(), StreamError> {
+    fn flush(&mut self) -> Result<(), OutputStreamError> {
         // This stream is always flushed
         Ok(())
     }
-    fn check_write(&mut self) -> Result<usize, StreamError> {
+    async fn write_ready(&mut self) -> Result<usize, OutputStreamError> {
         let consumed = self.buffer.lock().unwrap().len();
         if consumed < self.capacity {
             Ok(self.capacity - consumed)
         } else {
             // Since the buffer is full, no more bytes will ever be written
-            Err(StreamError::Closed)
+            Err(OutputStreamError::Closed)
         }
     }
 }
 
-#[async_trait::async_trait]
-impl Subscribe for MemoryOutputPipe {
-    async fn ready(&mut self) {}
+/// FIXME: this needs docs
+pub fn pipe(size: usize) -> (AsyncReadStream, AsyncWriteStream) {
+    let (a, b) = tokio::io::duplex(size);
+    let (_read_half, write_half) = tokio::io::split(a);
+    let (read_half, _write_half) = tokio::io::split(b);
+    (
+        AsyncReadStream::new(read_half),
+        AsyncWriteStream::new(size, write_half),
+    )
 }
 
 /// Provides a [`HostInputStream`] impl from a [`tokio::io::AsyncRead`] impl
 pub struct AsyncReadStream {
-    closed: bool,
-    buffer: Option<Result<Bytes, StreamError>>,
-    receiver: mpsc::Receiver<Result<Bytes, StreamError>>,
+    state: StreamState,
+    buffer: Option<Result<Bytes, std::io::Error>>,
+    receiver: mpsc::Receiver<Result<(Bytes, StreamState), std::io::Error>>,
     _join_handle: crate::preview2::AbortOnDropJoinHandle<()>,
 }
 
@@ -125,13 +133,11 @@ impl AsyncReadStream {
                 use tokio::io::AsyncReadExt;
                 let mut buf = bytes::BytesMut::with_capacity(4096);
                 let sent = match reader.read_buf(&mut buf).await {
-                    Ok(nbytes) if nbytes == 0 => sender.send(Err(StreamError::Closed)).await,
-                    Ok(_) => sender.send(Ok(buf.freeze())).await,
-                    Err(e) => {
-                        sender
-                            .send(Err(StreamError::LastOperationFailed(e.into())))
-                            .await
+                    Ok(nbytes) if nbytes == 0 => {
+                        sender.send(Ok((Bytes::new(), StreamState::Closed))).await
                     }
+                    Ok(_) => sender.send(Ok((buf.freeze(), StreamState::Open))).await,
+                    Err(e) => sender.send(Err(e)).await,
                 };
                 if sent.is_err() {
                     // no more receiver - stop trying to read
@@ -140,7 +146,7 @@ impl AsyncReadStream {
             }
         });
         AsyncReadStream {
-            closed: false,
+            state: StreamState::Open,
             buffer: None,
             receiver,
             _join_handle: join_handle,
@@ -150,7 +156,7 @@ impl AsyncReadStream {
 
 #[async_trait::async_trait]
 impl HostInputStream for AsyncReadStream {
-    fn read(&mut self, size: usize) -> Result<Bytes, StreamError> {
+    fn read(&mut self, size: usize) -> Result<(Bytes, StreamState), Error> {
         use mpsc::error::TryRecvError;
 
         match self.buffer.take() {
@@ -158,146 +164,337 @@ impl HostInputStream for AsyncReadStream {
                 // TODO: de-duplicate the buffer management with the case below
                 let len = bytes.len().min(size);
                 let rest = bytes.split_off(len);
-                if !rest.is_empty() {
+                let return_state = if !rest.is_empty() {
                     self.buffer = Some(Ok(rest));
-                }
-                return Ok(bytes);
-            }
-            Some(Err(e)) => {
-                self.closed = true;
-                return Err(e);
+                    StreamState::Open
+                } else {
+                    self.state
+                };
+                return Ok((bytes, return_state));
             }
+            Some(Err(e)) => return Err(e.into()),
             None => {}
         }
 
         match self.receiver.try_recv() {
-            Ok(Ok(mut bytes)) => {
+            Ok(Ok((mut bytes, state))) => {
+                self.state = state;
+
                 let len = bytes.len().min(size);
                 let rest = bytes.split_off(len);
-                if !rest.is_empty() {
+                let return_state = if !rest.is_empty() {
                     self.buffer = Some(Ok(rest));
+                    StreamState::Open
+                } else {
+                    self.state
+                };
+
+                Ok((bytes, return_state))
+            }
+            Ok(Err(e)) => Err(e.into()),
+            Err(TryRecvError::Empty) => Ok((Bytes::new(), self.state)),
+            Err(TryRecvError::Disconnected) => Err(anyhow!(
+                "AsyncReadStream sender died - should be impossible"
+            )),
+        }
+    }
+
+    async fn ready(&mut self) -> Result<(), Error> {
+        if self.buffer.is_some() || self.state == StreamState::Closed {
+            return Ok(());
+        }
+        match self.receiver.recv().await {
+            Some(Ok((bytes, state))) => {
+                if state == StreamState::Closed {
+                    self.state = state;
                 }
+                self.buffer = Some(Ok(bytes));
+            }
+            Some(Err(e)) => self.buffer = Some(Err(e)),
+            None => {
+                return Err(anyhow!(
+                    "no more sender for an open AsyncReadStream - should be impossible"
+                ))
+            }
+        }
+        Ok(())
+    }
+}
 
-                Ok(bytes)
+#[derive(Debug)]
+struct WorkerState {
+    alive: bool,
+    items: std::collections::VecDeque<Bytes>,
+    write_budget: usize,
+    flush_pending: bool,
+    error: Option<anyhow::Error>,
+}
+
+impl WorkerState {
+    fn check_error(&mut self) -> Result<(), OutputStreamError> {
+        if let Some(e) = self.error.take() {
+            return Err(OutputStreamError::LastOperationFailed(e));
+        }
+        if !self.alive {
+            return Err(OutputStreamError::Closed);
+        }
+        Ok(())
+    }
+}
+
+struct Worker {
+    state: Mutex<WorkerState>,
+    new_work: tokio::sync::Notify,
+    write_ready_changed: tokio::sync::Notify,
+}
+
+enum Job {
+    Flush,
+    Write(Bytes),
+}
+
+enum WriteStatus<'a> {
+    Done(Result<usize, OutputStreamError>),
+    Pending(tokio::sync::futures::Notified<'a>),
+}
+
+impl Worker {
+    fn new(write_budget: usize) -> Self {
+        Self {
+            state: Mutex::new(WorkerState {
+                alive: true,
+                items: std::collections::VecDeque::new(),
+                write_budget,
+                flush_pending: false,
+                error: None,
+            }),
+            new_work: tokio::sync::Notify::new(),
+            write_ready_changed: tokio::sync::Notify::new(),
+        }
+    }
+    fn check_write(&self) -> WriteStatus<'_> {
+        let mut state = self.state();
+        if let Err(e) = state.check_error() {
+            return WriteStatus::Done(Err(e));
+        }
+
+        if state.flush_pending || state.write_budget == 0 {
+            return WriteStatus::Pending(self.write_ready_changed.notified());
+        }
+
+        WriteStatus::Done(Ok(state.write_budget))
+    }
+    fn state(&self) -> std::sync::MutexGuard<WorkerState> {
+        self.state.lock().unwrap()
+    }
+    fn pop(&self) -> Option<Job> {
+        let mut state = self.state();
+        if state.items.is_empty() {
+            if state.flush_pending {
+                return Some(Job::Flush);
             }
-            Ok(Err(e)) => {
-                self.closed = true;
-                Err(e)
+        } else if let Some(bytes) = state.items.pop_front() {
+            return Some(Job::Write(bytes));
+        }
+
+        None
+    }
+    fn report_error(&self, e: std::io::Error) {
+        {
+            let mut state = self.state();
+            state.alive = false;
+            state.error = Some(e.into());
+            state.flush_pending = false;
+        }
+        self.write_ready_changed.notify_waiters();
+    }
+    async fn work<T: tokio::io::AsyncWrite + Send + Sync + Unpin + 'static>(&self, mut writer: T) {
+        use tokio::io::AsyncWriteExt;
+        loop {
+            let notified = self.new_work.notified();
+            while let Some(job) = self.pop() {
+                match job {
+                    Job::Flush => {
+                        if let Err(e) = writer.flush().await {
+                            self.report_error(e);
+                            return;
+                        }
+
+                        tracing::debug!("worker marking flush complete");
+                        self.state().flush_pending = false;
+                    }
+
+                    Job::Write(mut bytes) => {
+                        tracing::debug!("worker writing: {bytes:?}");
+                        let len = bytes.len();
+                        match writer.write_all_buf(&mut bytes).await {
+                            Err(e) => {
+                                self.report_error(e);
+                                return;
+                            }
+                            Ok(_) => {
+                                self.state().write_budget += len;
+                            }
+                        }
+                    }
+                }
+
+                self.write_ready_changed.notify_waiters();
             }
-            Err(TryRecvError::Empty) => Ok(Bytes::new()),
-            Err(TryRecvError::Disconnected) => Err(StreamError::Trap(anyhow!(
-                "AsyncReadStream sender died - should be impossible"
-            ))),
+
+            notified.await;
+        }
+    }
+}
+
+/// Provides a [`HostOutputStream`] impl from a [`tokio::io::AsyncWrite`] impl
+pub struct AsyncWriteStream {
+    worker: Arc<Worker>,
+    _join_handle: crate::preview2::AbortOnDropJoinHandle<()>,
+}
+
+impl AsyncWriteStream {
+    /// Create a [`AsyncWriteStream`]. In order to use the [`HostOutputStream`] impl
+    /// provided by this struct, the argument must impl [`tokio::io::AsyncWrite`].
+    pub fn new<T: tokio::io::AsyncWrite + Send + Sync + Unpin + 'static>(
+        write_budget: usize,
+        writer: T,
+    ) -> Self {
+        let worker = Arc::new(Worker::new(write_budget));
+
+        let w = Arc::clone(&worker);
+        let join_handle = crate::preview2::spawn(async move { w.work(writer).await });
+
+        AsyncWriteStream {
+            worker,
+            _join_handle: join_handle,
         }
     }
 }
+
 #[async_trait::async_trait]
-impl Subscribe for AsyncReadStream {
-    async fn ready(&mut self) {
-        if self.buffer.is_some() || self.closed {
-            return;
+impl HostOutputStream for AsyncWriteStream {
+    fn write(&mut self, bytes: Bytes) -> Result<(), OutputStreamError> {
+        let mut state = self.worker.state();
+        state.check_error()?;
+        if state.flush_pending {
+            return Err(OutputStreamError::Trap(anyhow!(
+                "write not permitted while flush pending"
+            )));
         }
-        match self.receiver.recv().await {
-            Some(res) => self.buffer = Some(res),
-            None => {
-                panic!("no more sender for an open AsyncReadStream - should be impossible")
+        match state.write_budget.checked_sub(bytes.len()) {
+            Some(remaining_budget) => {
+                state.write_budget = remaining_budget;
+                state.items.push_back(bytes);
+            }
+            None => return Err(OutputStreamError::Trap(anyhow!("write exceeded budget"))),
+        }
+        drop(state);
+        self.worker.new_work.notify_waiters();
+        Ok(())
+    }
+    fn flush(&mut self) -> Result<(), OutputStreamError> {
+        let mut state = self.worker.state();
+        state.check_error()?;
+
+        state.flush_pending = true;
+        self.worker.new_work.notify_waiters();
+
+        Ok(())
+    }
+
+    async fn write_ready(&mut self) -> Result<usize, OutputStreamError> {
+        loop {
+            match self.worker.check_write() {
+                WriteStatus::Done(r) => return r,
+                WriteStatus::Pending(notifier) => notifier.await,
             }
         }
     }
 }
 
 /// An output stream that consumes all input written to it, and is always ready.
-#[derive(Copy, Clone)]
 pub struct SinkOutputStream;
 
+#[async_trait::async_trait]
 impl HostOutputStream for SinkOutputStream {
-    fn write(&mut self, _buf: Bytes) -> Result<(), StreamError> {
+    fn write(&mut self, _buf: Bytes) -> Result<(), OutputStreamError> {
         Ok(())
     }
-    fn flush(&mut self) -> Result<(), StreamError> {
+    fn flush(&mut self) -> Result<(), OutputStreamError> {
         // This stream is always flushed
         Ok(())
     }
 
-    fn check_write(&mut self) -> Result<usize, StreamError> {
+    async fn write_ready(&mut self) -> Result<usize, OutputStreamError> {
         // This stream is always ready for writing.
         Ok(usize::MAX)
     }
 }
 
-#[async_trait::async_trait]
-impl Subscribe for SinkOutputStream {
-    async fn ready(&mut self) {}
-}
-
 /// A stream that is ready immediately, but will always report that it's closed.
-#[derive(Copy, Clone)]
 pub struct ClosedInputStream;
 
 #[async_trait::async_trait]
 impl HostInputStream for ClosedInputStream {
-    fn read(&mut self, _size: usize) -> Result<Bytes, StreamError> {
-        Err(StreamError::Closed)
+    fn read(&mut self, _size: usize) -> Result<(Bytes, StreamState), Error> {
+        Ok((Bytes::new(), StreamState::Closed))
     }
-}
 
-#[async_trait::async_trait]
-impl Subscribe for ClosedInputStream {
-    async fn ready(&mut self) {}
+    async fn ready(&mut self) -> Result<(), Error> {
+        Ok(())
+    }
 }
 
 /// An output stream that is always closed.
-#[derive(Copy, Clone)]
 pub struct ClosedOutputStream;
 
+#[async_trait::async_trait]
 impl HostOutputStream for ClosedOutputStream {
-    fn write(&mut self, _: Bytes) -> Result<(), StreamError> {
-        Err(StreamError::Closed)
+    fn write(&mut self, _: Bytes) -> Result<(), OutputStreamError> {
+        Err(OutputStreamError::Closed)
     }
-    fn flush(&mut self) -> Result<(), StreamError> {
-        Err(StreamError::Closed)
+    fn flush(&mut self) -> Result<(), OutputStreamError> {
+        Err(OutputStreamError::Closed)
     }
 
-    fn check_write(&mut self) -> Result<usize, StreamError> {
-        Err(StreamError::Closed)
+    async fn write_ready(&mut self) -> Result<usize, OutputStreamError> {
+        Err(OutputStreamError::Closed)
     }
 }
 
-#[async_trait::async_trait]
-impl Subscribe for ClosedOutputStream {
-    async fn ready(&mut self) {}
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
-    use std::time::Duration;
     use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
 
     // This is a gross way to handle CI running under qemu for non-x86 architectures.
     #[cfg(not(target_arch = "x86_64"))]
     const TEST_ITERATIONS: usize = 10;
 
+    // This is a gross way to handle CI running under qemu for non-x86 architectures.
+    #[cfg(not(target_arch = "x86_64"))]
+    const REASONABLE_DURATION: std::time::Duration = std::time::Duration::from_millis(200);
+
     #[cfg(target_arch = "x86_64")]
     const TEST_ITERATIONS: usize = 100;
 
+    #[cfg(target_arch = "x86_64")]
+    const REASONABLE_DURATION: std::time::Duration = std::time::Duration::from_millis(10);
+
     async fn resolves_immediately<F, O>(fut: F) -> O
     where
         F: futures::Future<Output = O>,
     {
-        // The input `fut` should resolve immediately, but in case it
-        // accidentally doesn't don't hang the test indefinitely. Provide a
-        // generous timeout to account for CI sensitivity and various systems.
-        tokio::time::timeout(Duration::from_secs(2), fut)
+        tokio::time::timeout(REASONABLE_DURATION, fut)
             .await
             .expect("operation timed out")
     }
 
+    // TODO: is there a way to get tokio to warp through timeouts when it knows nothing is
+    // happening?
     async fn never_resolves<F: futures::Future>(fut: F) {
-        // The input `fut` should never resolve, so only give it a small window
-        // of budget before we time out. If `fut` is actually resolved this
-        // should show up as a flaky test.
-        tokio::time::timeout(Duration::from_millis(10), fut)
+        tokio::time::timeout(REASONABLE_DURATION, fut)
             .await
             .err()
             .expect("operation should time out");
@@ -313,20 +510,24 @@ mod test {
     #[test_log::test(tokio::test(flavor = "multi_thread"))]
     async fn empty_read_stream() {
         let mut reader = AsyncReadStream::new(tokio::io::empty());
+        let (bs, state) = reader.read(10).unwrap();
+        assert!(bs.is_empty());
 
         // In a multi-threaded context, the value of state is not deterministic -- the spawned
         // reader task may run on a different thread.
-        match reader.read(10) {
+        match state {
             // The reader task ran before we tried to read, and noticed that the input was empty.
-            Err(StreamError::Closed) => {}
+            StreamState::Closed => {}
 
             // The reader task hasn't run yet. Call `ready` to await and fill the buffer.
-            Ok(bs) => {
+            StreamState::Open => {
+                resolves_immediately(reader.ready())
+                    .await
+                    .expect("ready is ok");
+                let (bs, state) = reader.read(0).unwrap();
                 assert!(bs.is_empty());
-                resolves_immediately(reader.ready()).await;
-                assert!(matches!(reader.read(0), Err(StreamError::Closed)));
+                assert_eq!(state, StreamState::Closed);
             }
-            res => panic!("unexpected: {res:?}"),
         }
     }
 
@@ -334,23 +535,29 @@ mod test {
     async fn infinite_read_stream() {
         let mut reader = AsyncReadStream::new(tokio::io::repeat(0));
 
-        let bs = reader.read(10).unwrap();
+        let (bs, state) = reader.read(10).unwrap();
+        assert_eq!(state, StreamState::Open);
         if bs.is_empty() {
             // Reader task hasn't run yet. Call `ready` to await and fill the buffer.
-            resolves_immediately(reader.ready()).await;
+            resolves_immediately(reader.ready())
+                .await
+                .expect("ready is ok");
             // Now a read should succeed
-            let bs = reader.read(10).unwrap();
+            let (bs, state) = reader.read(10).unwrap();
             assert_eq!(bs.len(), 10);
+            assert_eq!(state, StreamState::Open);
         } else {
             assert_eq!(bs.len(), 10);
         }
 
         // Subsequent reads should succeed
-        let bs = reader.read(10).unwrap();
+        let (bs, state) = reader.read(10).unwrap();
+        assert_eq!(state, StreamState::Open);
         assert_eq!(bs.len(), 10);
 
         // Even 0-length reads should succeed and show its open
-        let bs = reader.read(0).unwrap();
+        let (bs, state) = reader.read(0).unwrap();
+        assert_eq!(state, StreamState::Open);
         assert_eq!(bs.len(), 0);
     }
 
@@ -364,29 +571,37 @@ mod test {
     async fn finite_read_stream() {
         let mut reader = AsyncReadStream::new(finite_async_reader(&[1; 123]).await);
 
-        let bs = reader.read(123).unwrap();
+        let (bs, state) = reader.read(123).unwrap();
+        assert_eq!(state, StreamState::Open);
         if bs.is_empty() {
             // Reader task hasn't run yet. Call `ready` to await and fill the buffer.
-            resolves_immediately(reader.ready()).await;
+            resolves_immediately(reader.ready())
+                .await
+                .expect("ready is ok");
             // Now a read should succeed
-            let bs = reader.read(123).unwrap();
+            let (bs, state) = reader.read(123).unwrap();
             assert_eq!(bs.len(), 123);
+            assert_eq!(state, StreamState::Open);
         } else {
             assert_eq!(bs.len(), 123);
         }
 
         // The AsyncRead's should be empty now, but we have a race where the reader task hasn't
         // yet send that to the AsyncReadStream.
-        match reader.read(0) {
-            Err(StreamError::Closed) => {} // Correct!
-            Ok(bs) => {
-                assert!(bs.is_empty());
+        let (bs, state) = reader.read(0).unwrap();
+        assert!(bs.is_empty());
+        match state {
+            StreamState::Closed => {} // Correct!
+            StreamState::Open => {
                 // Need to await to give this side time to catch up
-                resolves_immediately(reader.ready()).await;
+                resolves_immediately(reader.ready())
+                    .await
+                    .expect("ready is ok");
                 // Now a read should show closed
-                assert!(matches!(reader.read(0), Err(StreamError::Closed)));
+                let (bs, state) = reader.read(0).unwrap();
+                assert_eq!(bs.len(), 0);
+                assert_eq!(state, StreamState::Closed);
             }
-            res => panic!("unexpected: {res:?}"),
         }
     }
 
@@ -399,59 +614,74 @@ mod test {
 
         w.write_all(&[123]).await.unwrap();
 
-        let bs = reader.read(1).unwrap();
+        let (bs, state) = reader.read(1).unwrap();
+        assert_eq!(state, StreamState::Open);
         if bs.is_empty() {
             // Reader task hasn't run yet. Call `ready` to await and fill the buffer.
-            resolves_immediately(reader.ready()).await;
+            resolves_immediately(reader.ready())
+                .await
+                .expect("ready is ok");
             // Now a read should succeed
-            let bs = reader.read(1).unwrap();
+            let (bs, state) = reader.read(1).unwrap();
             assert_eq!(*bs, [123u8]);
+            assert_eq!(state, StreamState::Open);
         } else {
             assert_eq!(*bs, [123u8]);
         }
 
         // The stream should be empty and open now:
-        let bs = reader.read(1).unwrap();
+        let (bs, state) = reader.read(1).unwrap();
         assert!(bs.is_empty());
+        assert_eq!(state, StreamState::Open);
 
         // We can wait on readiness and it will time out:
         never_resolves(reader.ready()).await;
 
         // Still open and empty:
-        let bs = reader.read(1).unwrap();
+        let (bs, state) = reader.read(1).unwrap();
         assert!(bs.is_empty());
+        assert_eq!(state, StreamState::Open);
 
         // Put something else in the stream:
         w.write_all(&[45]).await.unwrap();
 
         // Wait readiness (yes we could possibly win the race and read it out faster, leaving that
         // out of the test for simplicity)
-        resolves_immediately(reader.ready()).await;
+        resolves_immediately(reader.ready())
+            .await
+            .expect("the ready is ok");
 
         // read the something else back out:
-        let bs = reader.read(1).unwrap();
+        let (bs, state) = reader.read(1).unwrap();
         assert_eq!(*bs, [45u8]);
+        assert_eq!(state, StreamState::Open);
 
         // nothing else in there:
-        let bs = reader.read(1).unwrap();
+        let (bs, state) = reader.read(1).unwrap();
         assert!(bs.is_empty());
+        assert_eq!(state, StreamState::Open);
 
         // We can wait on readiness and it will time out:
         never_resolves(reader.ready()).await;
 
         // nothing else in there:
-        let bs = reader.read(1).unwrap();
+        let (bs, state) = reader.read(1).unwrap();
         assert!(bs.is_empty());
+        assert_eq!(state, StreamState::Open);
 
         // Now close the pipe:
         drop(w);
 
         // Wait readiness (yes we could possibly win the race and read it out faster, leaving that
         // out of the test for simplicity)
-        resolves_immediately(reader.ready()).await;
+        resolves_immediately(reader.ready())
+            .await
+            .expect("the ready is ok");
 
         // empty and now closed:
-        assert!(matches!(reader.read(1), Err(StreamError::Closed)));
+        let (bs, state) = reader.read(1).unwrap();
+        assert!(bs.is_empty());
+        assert_eq!(state, StreamState::Closed);
     }
 
     #[test_log::test(tokio::test(flavor = "multi_thread"))]
@@ -468,20 +698,26 @@ mod test {
             w
         });
 
-        resolves_immediately(reader.ready()).await;
+        resolves_immediately(reader.ready())
+            .await
+            .expect("ready is ok");
 
         // Now we expect the reader task has sent 4k from the stream to the reader.
         // Try to read out one bigger than the buffer available:
-        let bs = reader.read(4097).unwrap();
+        let (bs, state) = reader.read(4097).unwrap();
         assert_eq!(bs.len(), 4096);
+        assert_eq!(state, StreamState::Open);
 
         // Allow the crank to turn more:
-        resolves_immediately(reader.ready()).await;
+        resolves_immediately(reader.ready())
+            .await
+            .expect("ready is ok");
 
         // Again we expect the reader task has sent 4k from the stream to the reader.
         // Try to read out one bigger than the buffer available:
-        let bs = reader.read(4097).unwrap();
+        let (bs, state) = reader.read(4097).unwrap();
         assert_eq!(bs.len(), 4096);
+        assert_eq!(state, StreamState::Open);
 
         // The writer task is now finished - join with it:
         let w = resolves_immediately(writer_task).await;
@@ -490,10 +726,14 @@ mod test {
         drop(w);
 
         // Allow the crank to turn more:
-        resolves_immediately(reader.ready()).await;
+        resolves_immediately(reader.ready())
+            .await
+            .expect("ready is ok");
 
         // Now we expect the reader to be empty, and the stream closed:
-        assert!(matches!(reader.read(4097), Err(StreamError::Closed)));
+        let (bs, state) = reader.read(4097).unwrap();
+        assert_eq!(bs.len(), 0);
+        assert_eq!(state, StreamState::Closed);
     }
 
     #[test_log::test(test_log::test(tokio::test(flavor = "multi_thread")))]
@@ -564,7 +804,7 @@ mod test {
                 // worker hasn't processed write yet:
                 Ok(1023) => {}
                 // worker reports failure:
-                Err(StreamError::LastOperationFailed(_)) => {
+                Err(OutputStreamError::LastOperationFailed(_)) => {
                     tracing::debug!("discovered stream failure in first write_ready");
                     should_be_closed = true;
                 }
@@ -578,13 +818,13 @@ mod test {
         let flush_res = writer.flush();
         match flush_res {
             // worker reports failure:
-            Err(StreamError::LastOperationFailed(_)) => {
+            Err(OutputStreamError::LastOperationFailed(_)) => {
                 tracing::debug!("discovered stream failure trying to flush");
                 assert!(!should_be_closed);
                 should_be_closed = true;
             }
             // Already reported failure, now closed
-            Err(StreamError::Closed) => {
+            Err(OutputStreamError::Closed) => {
                 assert!(
                     should_be_closed,
                     "expected a LastOperationFailed before we see Closed. {write_ready_res:?}"
@@ -599,12 +839,12 @@ mod test {
         // closed.
         match resolves_immediately(writer.write_ready()).await {
             // worker reports failure:
-            Err(StreamError::LastOperationFailed(_)) => {
+            Err(OutputStreamError::LastOperationFailed(_)) => {
                 tracing::debug!("discovered stream failure trying to flush");
                 assert!(!should_be_closed);
             }
             // Already reported failure, now closed
-            Err(StreamError::Closed) => {
+            Err(OutputStreamError::Closed) => {
                 assert!(should_be_closed);
             }
             r => {
diff --git a/crates/wasi/src/preview2/poll.rs b/crates/wasi/src/preview2/poll.rs
index ebb2820693f9..0a947fef3dec 100644
--- a/crates/wasi/src/preview2/poll.rs
+++ b/crates/wasi/src/preview2/poll.rs
@@ -1,165 +1,148 @@
-use crate::preview2::{bindings::io::poll, Table, WasiView};
+use crate::preview2::{
+    bindings::poll::poll::{self, Pollable},
+    Table, TableError, WasiView,
+};
 use anyhow::Result;
 use std::any::Any;
-use std::collections::HashMap;
+use std::collections::{hash_map::Entry, HashMap};
 use std::future::Future;
 use std::pin::Pin;
 use std::task::{Context, Poll};
-use wasmtime::component::Resource;
 
-pub type PollableFuture<'a> = Pin<Box<dyn Future<Output = ()> + Send + 'a>>;
+pub type PollableFuture<'a> = Pin<Box<dyn Future<Output = Result<()>> + Send + 'a>>;
 pub type MakeFuture = for<'a> fn(&'a mut dyn Any) -> PollableFuture<'a>;
 pub type ClosureFuture = Box<dyn Fn() -> PollableFuture<'static> + Send + Sync + 'static>;
 
-/// A host representation of the `wasi:io/poll.pollable` resource.
+/// A host representation of the `wasi:poll/poll.pollable` resource.
 ///
 /// A pollable is not the same thing as a Rust Future: the same pollable may be used to
 /// repeatedly check for readiness of a given condition, e.g. if a stream is readable
 /// or writable. So, rather than containing a Future, which can only become Ready once, a
-/// Pollable contains a way to create a Future in each call to `poll_list`.
-pub struct Pollable {
-    index: u32,
-    make_future: MakeFuture,
-    remove_index_on_delete: Option<fn(&mut Table, u32) -> Result<()>>,
+/// HostPollable contains a way to create a Future in each call to poll_oneoff.
+pub enum HostPollable {
+    /// Create a Future by calling a fn on another resource in the table. This
+    /// indirection means the created Future can use a mut borrow of another
+    /// resource in the Table (e.g. a stream)
+    TableEntry { index: u32, make_future: MakeFuture },
+    /// Create a future by calling an owned, static closure. This is used for
+    /// pollables which do not share state with another resource in the Table
+    /// (e.g. a timer)
+    Closure(ClosureFuture),
 }
 
-#[async_trait::async_trait]
-pub trait Subscribe: Send + Sync + 'static {
-    async fn ready(&mut self);
+pub trait TablePollableExt {
+    fn push_host_pollable(&mut self, p: HostPollable) -> Result<u32, TableError>;
+    fn get_host_pollable_mut(&mut self, fd: u32) -> Result<&mut HostPollable, TableError>;
+    fn delete_host_pollable(&mut self, fd: u32) -> Result<HostPollable, TableError>;
 }
 
-/// Creates a `pollable` resource which is susbcribed to the provided
-/// `resource`.
-///
-/// If `resource` is an owned resource then it will be deleted when the returned
-/// resource is deleted. Otherwise the returned resource is considered a "child"
-/// of the given `resource` which means that the given resource cannot be
-/// deleted while the `pollable` is still alive.
-pub fn subscribe<T>(table: &mut Table, resource: Resource<T>) -> Result<Resource<Pollable>>
-where
-    T: Subscribe,
-{
-    fn make_future<'a, T>(stream: &'a mut dyn Any) -> PollableFuture<'a>
-    where
-        T: Subscribe,
-    {
-        stream.downcast_mut::<T>().unwrap().ready()
+impl TablePollableExt for Table {
+    fn push_host_pollable(&mut self, p: HostPollable) -> Result<u32, TableError> {
+        match p {
+            HostPollable::TableEntry { index, .. } => self.push_child(Box::new(p), index),
+            HostPollable::Closure { .. } => self.push(Box::new(p)),
+        }
+    }
+    fn get_host_pollable_mut(&mut self, fd: u32) -> Result<&mut HostPollable, TableError> {
+        self.get_mut::<HostPollable>(fd)
+    }
+    fn delete_host_pollable(&mut self, fd: u32) -> Result<HostPollable, TableError> {
+        self.delete::<HostPollable>(fd)
     }
-
-    let pollable = Pollable {
-        index: resource.rep(),
-        remove_index_on_delete: if resource.owned() {
-            Some(|table, idx| {
-                let resource = Resource::<T>::new_own(idx);
-                table.delete(resource)?;
-                Ok(())
-            })
-        } else {
-            None
-        },
-        make_future: make_future::<T>,
-    };
-
-    Ok(table.push_child(pollable, &resource)?)
 }
 
 #[async_trait::async_trait]
 impl<T: WasiView> poll::Host for T {
-    async fn poll_list(&mut self, pollables: Vec<Resource<Pollable>>) -> Result<Vec<u32>> {
-        type ReadylistIndex = u32;
+    fn drop_pollable(&mut self, pollable: Pollable) -> Result<()> {
+        self.table_mut().delete_host_pollable(pollable)?;
+        Ok(())
+    }
+
+    async fn poll_oneoff(&mut self, pollables: Vec<Pollable>) -> Result<Vec<bool>> {
+        type ReadylistIndex = usize;
 
         let table = self.table_mut();
 
         let mut table_futures: HashMap<u32, (MakeFuture, Vec<ReadylistIndex>)> = HashMap::new();
+        let mut closure_futures: Vec<(PollableFuture<'_>, Vec<ReadylistIndex>)> = Vec::new();
 
         for (ix, p) in pollables.iter().enumerate() {
-            let ix: u32 = ix.try_into()?;
-
-            let pollable = table.get(p)?;
-            let (_, list) = table_futures
-                .entry(pollable.index)
-                .or_insert((pollable.make_future, Vec::new()));
-            list.push(ix);
+            match table.get_host_pollable_mut(*p)? {
+                HostPollable::Closure(f) => closure_futures.push((f(), vec![ix])),
+                HostPollable::TableEntry { index, make_future } => {
+                    match table_futures.entry(*index) {
+                        Entry::Vacant(v) => {
+                            v.insert((*make_future, vec![ix]));
+                        }
+                        Entry::Occupied(mut o) => {
+                            let (_, v) = o.get_mut();
+                            v.push(ix);
+                        }
+                    }
+                }
+            }
         }
 
-        let mut futures: Vec<(PollableFuture<'_>, Vec<ReadylistIndex>)> = Vec::new();
         for (entry, (make_future, readylist_indices)) in table.iter_entries(table_futures) {
             let entry = entry?;
-            futures.push((make_future(entry), readylist_indices));
+            closure_futures.push((make_future(entry), readylist_indices));
         }
 
-        struct PollList<'a> {
-            futures: Vec<(PollableFuture<'a>, Vec<ReadylistIndex>)>,
+        struct PollOneoff<'a> {
+            elems: Vec<(PollableFuture<'a>, Vec<ReadylistIndex>)>,
         }
-        impl<'a> Future for PollList<'a> {
-            type Output = Vec<u32>;
+        impl<'a> Future for PollOneoff<'a> {
+            type Output = Result<Vec<bool>>;
 
             fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
                 let mut any_ready = false;
-                let mut results = Vec::new();
-                for (fut, readylist_indicies) in self.futures.iter_mut() {
+                let mut results = vec![false; self.elems.len()];
+                for (fut, readylist_indicies) in self.elems.iter_mut() {
                     match fut.as_mut().poll(cx) {
-                        Poll::Ready(()) => {
-                            results.extend_from_slice(readylist_indicies);
+                        Poll::Ready(Ok(())) => {
+                            for r in readylist_indicies {
+                                results[*r] = true;
+                            }
                             any_ready = true;
                         }
+                        Poll::Ready(Err(e)) => {
+                            return Poll::Ready(Err(
+                                e.context(format!("poll_oneoff {readylist_indicies:?}"))
+                            ));
+                        }
                         Poll::Pending => {}
                     }
                 }
                 if any_ready {
-                    Poll::Ready(results)
+                    Poll::Ready(Ok(results))
                 } else {
                     Poll::Pending
                 }
             }
         }
 
-        Ok(PollList { futures }.await)
-    }
-
-    async fn poll_one(&mut self, pollable: Resource<Pollable>) -> Result<()> {
-        let table = self.table_mut();
-
-        let pollable = table.get(&pollable)?;
-        let ready = (pollable.make_future)(table.get_any_mut(pollable.index)?);
-        ready.await;
-        Ok(())
-    }
-}
-
-#[async_trait::async_trait]
-impl<T: WasiView> crate::preview2::bindings::io::poll::HostPollable for T {
-    fn drop(&mut self, pollable: Resource<Pollable>) -> Result<()> {
-        let pollable = self.table_mut().delete(pollable)?;
-        if let Some(delete) = pollable.remove_index_on_delete {
-            delete(self.table_mut(), pollable.index)?;
+        Ok(PollOneoff {
+            elems: closure_futures,
         }
-        Ok(())
+        .await?)
     }
 }
 
 pub mod sync {
     use crate::preview2::{
-        bindings::io::poll as async_poll,
-        bindings::sync_io::io::poll::{self, Pollable},
+        bindings::poll::poll::Host as AsyncHost,
+        bindings::sync_io::poll::poll::{self, Pollable},
         in_tokio, WasiView,
     };
     use anyhow::Result;
-    use wasmtime::component::Resource;
 
     impl<T: WasiView> poll::Host for T {
-        fn poll_list(&mut self, pollables: Vec<Resource<Pollable>>) -> Result<Vec<u32>> {
-            in_tokio(async { async_poll::Host::poll_list(self, pollables).await })
+        fn drop_pollable(&mut self, pollable: Pollable) -> Result<()> {
+            AsyncHost::drop_pollable(self, pollable)
         }
 
-        fn poll_one(&mut self, pollable: Resource<Pollable>) -> Result<()> {
-            in_tokio(async { async_poll::Host::poll_one(self, pollable).await })
-        }
-    }
-
-    impl<T: WasiView> crate::preview2::bindings::sync_io::io::poll::HostPollable for T {
-        fn drop(&mut self, pollable: Resource<Pollable>) -> Result<()> {
-            async_poll::HostPollable::drop(self, pollable)
+        fn poll_oneoff(&mut self, pollables: Vec<Pollable>) -> Result<Vec<bool>> {
+            in_tokio(async { AsyncHost::poll_oneoff(self, pollables).await })
         }
     }
 }
diff --git a/crates/wasi/src/preview2/preview1.rs b/crates/wasi/src/preview2/preview1.rs
index 282f50ae75f6..a44330b25b11 100644
--- a/crates/wasi/src/preview2/preview1.rs
+++ b/crates/wasi/src/preview2/preview1.rs
@@ -1,30 +1,30 @@
-use crate::preview2::bindings::{
-    self,
-    cli::{
-        stderr, stdin, stdout, terminal_input, terminal_output, terminal_stderr, terminal_stdin,
-        terminal_stdout,
-    },
-    clocks::{monotonic_clock, wall_clock},
-    filesystem::{preopens, types as filesystem},
-    io::{poll, streams},
+use crate::preview2::bindings::cli::{
+    stderr, stdin, stdout, terminal_input, terminal_output, terminal_stderr, terminal_stdin,
+    terminal_stdout,
 };
-use crate::preview2::{FsError, IsATTY, StreamError, StreamResult, TableError, WasiView};
+use crate::preview2::bindings::clocks::{monotonic_clock, wall_clock};
+use crate::preview2::bindings::filesystem::{preopens, types as filesystem};
+use crate::preview2::bindings::io::streams;
+use crate::preview2::bindings::poll;
+use crate::preview2::filesystem::TableFsExt;
+use crate::preview2::host::filesystem::TableReaddirExt;
+use crate::preview2::{bindings, IsATTY, TableError, WasiView};
 use anyhow::{anyhow, bail, Context};
 use std::borrow::Borrow;
-use std::collections::{BTreeMap, HashSet};
-use std::mem::{self, size_of, size_of_val};
+use std::cell::Cell;
+use std::collections::BTreeMap;
+use std::mem::{size_of, size_of_val};
 use std::ops::{Deref, DerefMut};
 use std::slice;
 use std::sync::atomic::{AtomicU64, Ordering};
 use std::sync::Arc;
-use wasmtime::component::Resource;
 use wiggle::tracing::instrument;
 use wiggle::{GuestError, GuestPtr, GuestSlice, GuestSliceMut, GuestStrCow, GuestType};
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 struct File {
     /// The handle to the preview2 descriptor that this file is referencing.
-    fd: Resource<filesystem::Descriptor>,
+    fd: filesystem::Descriptor,
 
     /// The current-position pointer.
     position: Arc<AtomicU64>,
@@ -54,36 +54,26 @@ impl BlockingMode {
     async fn read(
         &self,
         host: &mut impl streams::Host,
-        input_stream: Resource<streams::InputStream>,
+        input_stream: streams::InputStream,
         max_size: usize,
-    ) -> Result<Vec<u8>, types::Error> {
+    ) -> Result<(Vec<u8>, streams::StreamStatus), types::Error> {
         let max_size = max_size.try_into().unwrap_or(u64::MAX);
         match self {
             BlockingMode::Blocking => {
-                match streams::HostInputStream::blocking_read(host, input_stream, max_size).await {
-                    Ok(r) if r.is_empty() => Err(types::Errno::Intr.into()),
-                    Ok(r) => Ok(r),
-                    Err(StreamError::Closed) => Ok(Vec::new()),
-                    Err(e) => Err(e.into()),
-                }
+                stream_res(streams::Host::blocking_read(host, input_stream, max_size).await)
             }
-
             BlockingMode::NonBlocking => {
-                match streams::HostInputStream::read(host, input_stream, max_size).await {
-                    Ok(r) => Ok(r),
-                    Err(StreamError::Closed) => Ok(Vec::new()),
-                    Err(e) => Err(e.into()),
-                }
+                stream_res(streams::Host::read(host, input_stream, max_size).await)
             }
         }
     }
     async fn write(
         &self,
-        host: &mut (impl streams::Host + poll::Host),
-        output_stream: Resource<streams::OutputStream>,
+        host: &mut (impl streams::Host + poll::poll::Host),
+        output_stream: streams::OutputStream,
         mut bytes: &[u8],
-    ) -> StreamResult<usize> {
-        use streams::HostOutputStream as Streams;
+    ) -> Result<usize, types::Error> {
+        use streams::Host as Streams;
 
         match self {
             BlockingMode::Blocking => {
@@ -94,20 +84,15 @@ impl BlockingMode {
                     let (chunk, rest) = bytes.split_at(len);
                     bytes = rest;
 
-                    Streams::blocking_write_and_flush(
-                        host,
-                        output_stream.borrowed(),
-                        Vec::from(chunk),
-                    )
-                    .await?
+                    Streams::blocking_write_and_flush(host, output_stream, Vec::from(chunk)).await?
                 }
 
                 Ok(total)
             }
             BlockingMode::NonBlocking => {
-                let n = match Streams::check_write(host, output_stream.borrowed()) {
+                let n = match Streams::check_write(host, output_stream) {
                     Ok(n) => n,
-                    Err(StreamError::Closed) => 0,
+                    Err(e) if matches!(e.downcast_ref(), Some(streams::WriteError::Closed)) => 0,
                     Err(e) => Err(e)?,
                 };
 
@@ -116,15 +101,19 @@ impl BlockingMode {
                     return Ok(0);
                 }
 
-                match Streams::write(host, output_stream.borrowed(), bytes[..len].to_vec()) {
+                match Streams::write(host, output_stream, bytes[..len].to_vec()).await {
                     Ok(()) => {}
-                    Err(StreamError::Closed) => return Ok(0),
+                    Err(e) if matches!(e.downcast_ref(), Some(streams::WriteError::Closed)) => {
+                        return Ok(0)
+                    }
                     Err(e) => Err(e)?,
                 }
 
-                match Streams::blocking_flush(host, output_stream.borrowed()).await {
+                match Streams::blocking_flush(host, output_stream).await {
                     Ok(()) => {}
-                    Err(StreamError::Closed) => return Ok(0),
+                    Err(e) if matches!(e.downcast_ref(), Some(streams::WriteError::Closed)) => {
+                        return Ok(0)
+                    }
                     Err(e) => Err(e)?,
                 };
 
@@ -134,21 +123,21 @@ impl BlockingMode {
     }
 }
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 enum Descriptor {
     Stdin {
-        stream: Resource<streams::InputStream>,
+        input_stream: streams::InputStream,
         isatty: IsATTY,
     },
     Stdout {
-        stream: Resource<streams::OutputStream>,
+        output_stream: streams::OutputStream,
         isatty: IsATTY,
     },
     Stderr {
-        stream: Resource<streams::OutputStream>,
+        output_stream: streams::OutputStream,
         isatty: IsATTY,
     },
-    PreopenDirectory((Resource<filesystem::Descriptor>, String)),
+    PreopenDirectory((filesystem::Descriptor, String)),
     File(File),
 }
 
@@ -193,7 +182,7 @@ impl Descriptors {
     ) -> Result<Self, types::Error> {
         let mut descriptors = Self::default();
         descriptors.push(Descriptor::Stdin {
-            stream: host
+            input_stream: host
                 .get_stdin()
                 .context("failed to call `get-stdin`")
                 .map_err(types::Error::trap)?,
@@ -202,7 +191,7 @@ impl Descriptors {
                 .context("failed to call `get-terminal-stdin`")
                 .map_err(types::Error::trap)?
             {
-                terminal_input::HostTerminalInput::drop(host, term_in)
+                host.drop_terminal_input(term_in)
                     .context("failed to call `drop-terminal-input`")
                     .map_err(types::Error::trap)?;
                 IsATTY::Yes
@@ -211,7 +200,7 @@ impl Descriptors {
             },
         })?;
         descriptors.push(Descriptor::Stdout {
-            stream: host
+            output_stream: host
                 .get_stdout()
                 .context("failed to call `get-stdout`")
                 .map_err(types::Error::trap)?,
@@ -220,7 +209,7 @@ impl Descriptors {
                 .context("failed to call `get-terminal-stdout`")
                 .map_err(types::Error::trap)?
             {
-                terminal_output::HostTerminalOutput::drop(host, term_out)
+                host.drop_terminal_output(term_out)
                     .context("failed to call `drop-terminal-output`")
                     .map_err(types::Error::trap)?;
                 IsATTY::Yes
@@ -229,7 +218,7 @@ impl Descriptors {
             },
         })?;
         descriptors.push(Descriptor::Stderr {
-            stream: host
+            output_stream: host
                 .get_stderr()
                 .context("failed to call `get-stderr`")
                 .map_err(types::Error::trap)?,
@@ -238,7 +227,7 @@ impl Descriptors {
                 .context("failed to call `get-terminal-stderr`")
                 .map_err(types::Error::trap)?
             {
-                terminal_output::HostTerminalOutput::drop(host, term_out)
+                host.drop_terminal_output(term_out)
                     .context("failed to call `drop-terminal-output`")
                     .map_err(types::Error::trap)?;
                 IsATTY::Yes
@@ -252,7 +241,7 @@ impl Descriptors {
             .context("failed to call `get-directories`")
             .map_err(types::Error::trap)?
         {
-            descriptors.push(Descriptor::PreopenDirectory((dir.0, dir.1)))?;
+            descriptors.push(Descriptor::PreopenDirectory(dir))?;
         }
         Ok(descriptors)
     }
@@ -328,13 +317,13 @@ pub trait WasiPreview1View: WasiView {
 // call methods like [`TableFsExt::is_file`] and hiding complexity from preview1 method implementations.
 struct Transaction<'a, T: WasiPreview1View + ?Sized> {
     view: &'a mut T,
-    descriptors: Descriptors,
+    descriptors: Cell<Descriptors>,
 }
 
 impl<T: WasiPreview1View + ?Sized> Drop for Transaction<'_, T> {
     /// Record changes in the [`WasiPreview1Adapter`] returned by [`WasiPreview1View::adapter_mut`]
     fn drop(&mut self) {
-        let descriptors = mem::take(&mut self.descriptors);
+        let descriptors = self.descriptors.take();
         self.view.adapter_mut().descriptors = Some(descriptors);
     }
 }
@@ -345,19 +334,22 @@ impl<T: WasiPreview1View + ?Sized> Transaction<'_, T> {
     /// # Errors
     ///
     /// Returns [`types::Errno::Badf`] if no [`Descriptor`] is found
-    fn get_descriptor(&self, fd: types::Fd) -> Result<&Descriptor> {
+    fn get_descriptor(&mut self, fd: types::Fd) -> Result<&Descriptor> {
         let fd = fd.into();
-        let desc = self.descriptors.get(&fd).ok_or(types::Errno::Badf)?;
+        let desc = self
+            .descriptors
+            .get_mut()
+            .get(&fd)
+            .ok_or(types::Errno::Badf)?;
         Ok(desc)
     }
 
     /// Borrows [`File`] corresponding to `fd`
     /// if it describes a [`Descriptor::File`] of [`crate::preview2::filesystem::File`] type
-    fn get_file(&self, fd: types::Fd) -> Result<&File> {
+    fn get_file(&mut self, fd: types::Fd) -> Result<&File> {
         let fd = fd.into();
-        match self.descriptors.get(&fd) {
-            Some(Descriptor::File(file @ File { fd, .. })) => {
-                self.view.table().get(fd)?.file()?;
+        match self.descriptors.get_mut().get(&fd) {
+            Some(Descriptor::File(file @ File { fd, .. })) if self.view.table().is_file(*fd) => {
                 Ok(file)
             }
             _ => Err(types::Errno::Badf.into()),
@@ -368,11 +360,8 @@ impl<T: WasiPreview1View + ?Sized> Transaction<'_, T> {
     /// if it describes a [`Descriptor::File`] of [`crate::preview2::filesystem::File`] type
     fn get_file_mut(&mut self, fd: types::Fd) -> Result<&mut File> {
         let fd = fd.into();
-        match self.descriptors.get_mut(&fd) {
-            Some(Descriptor::File(file)) => {
-                self.view.table().get(&file.fd)?.file()?;
-                Ok(file)
-            }
+        match self.descriptors.get_mut().get_mut(&fd) {
+            Some(Descriptor::File(file)) if self.view.table().is_file(file.fd) => Ok(file),
             _ => Err(types::Errno::Badf.into()),
         }
     }
@@ -383,12 +372,10 @@ impl<T: WasiPreview1View + ?Sized> Transaction<'_, T> {
     /// # Errors
     ///
     /// Returns [`types::Errno::Spipe`] if the descriptor corresponds to stdio
-    fn get_seekable(&self, fd: types::Fd) -> Result<&File> {
+    fn get_seekable(&mut self, fd: types::Fd) -> Result<&File> {
         let fd = fd.into();
-        match self.descriptors.get(&fd) {
-            Some(Descriptor::File(file @ File { fd, .. }))
-                if self.view.table().get(fd)?.is_file() =>
-            {
+        match self.descriptors.get_mut().get(&fd) {
+            Some(Descriptor::File(file @ File { fd, .. })) if self.view.table().is_file(*fd) => {
                 Ok(file)
             }
             Some(
@@ -402,32 +389,31 @@ impl<T: WasiPreview1View + ?Sized> Transaction<'_, T> {
     }
 
     /// Returns [`filesystem::Descriptor`] corresponding to `fd`
-    fn get_fd(&self, fd: types::Fd) -> Result<Resource<filesystem::Descriptor>> {
+    fn get_fd(&mut self, fd: types::Fd) -> Result<filesystem::Descriptor> {
         match self.get_descriptor(fd)? {
-            Descriptor::File(File { fd, .. }) => Ok(fd.borrowed()),
-            Descriptor::PreopenDirectory((fd, _)) => Ok(fd.borrowed()),
-            Descriptor::Stdin { .. } | Descriptor::Stdout { .. } | Descriptor::Stderr { .. } => {
-                Err(types::Errno::Badf.into())
+            Descriptor::File(File { fd, .. }) => Ok(*fd),
+            Descriptor::PreopenDirectory((fd, _)) => Ok(*fd),
+            Descriptor::Stdin { input_stream, .. } => Ok(*input_stream),
+            Descriptor::Stdout { output_stream, .. } | Descriptor::Stderr { output_stream, .. } => {
+                Ok(*output_stream)
             }
         }
     }
 
     /// Returns [`filesystem::Descriptor`] corresponding to `fd`
     /// if it describes a [`Descriptor::File`] of [`crate::preview2::filesystem::File`] type
-    fn get_file_fd(&self, fd: types::Fd) -> Result<Resource<filesystem::Descriptor>> {
-        self.get_file(fd).map(|File { fd, .. }| fd.borrowed())
+    fn get_file_fd(&mut self, fd: types::Fd) -> Result<filesystem::Descriptor> {
+        self.get_file(fd).map(|File { fd, .. }| *fd)
     }
 
     /// Returns [`filesystem::Descriptor`] corresponding to `fd`
     /// if it describes a [`Descriptor::File`] or [`Descriptor::PreopenDirectory`]
     /// of [`crate::preview2::filesystem::Dir`] type
-    fn get_dir_fd(&self, fd: types::Fd) -> Result<Resource<filesystem::Descriptor>> {
+    fn get_dir_fd(&mut self, fd: types::Fd) -> Result<filesystem::Descriptor> {
         let fd = fd.into();
-        match self.descriptors.get(&fd) {
-            Some(Descriptor::File(File { fd, .. })) if self.view.table().get(fd)?.is_dir() => {
-                Ok(fd.borrowed())
-            }
-            Some(Descriptor::PreopenDirectory((fd, _))) => Ok(fd.borrowed()),
+        match self.descriptors.get_mut().get(&fd) {
+            Some(Descriptor::File(File { fd, .. })) if self.view.table().is_dir(*fd) => Ok(*fd),
+            Some(Descriptor::PreopenDirectory((fd, _))) => Ok(*fd),
             _ => Err(types::Errno::Badf.into()),
         }
     }
@@ -462,8 +448,8 @@ trait WasiPreview1ViewExt:
 
     /// Lazily initializes [`WasiPreview1Adapter`] returned by [`WasiPreview1View::adapter_mut`]
     /// and returns [`filesystem::Descriptor`] corresponding to `fd`
-    fn get_fd(&mut self, fd: types::Fd) -> Result<Resource<filesystem::Descriptor>, types::Error> {
-        let st = self.transact()?;
+    fn get_fd(&mut self, fd: types::Fd) -> Result<filesystem::Descriptor, types::Error> {
+        let mut st = self.transact()?;
         let fd = st.get_fd(fd)?;
         Ok(fd)
     }
@@ -471,11 +457,8 @@ trait WasiPreview1ViewExt:
     /// Lazily initializes [`WasiPreview1Adapter`] returned by [`WasiPreview1View::adapter_mut`]
     /// and returns [`filesystem::Descriptor`] corresponding to `fd`
     /// if it describes a [`Descriptor::File`] of [`crate::preview2::filesystem::File`] type
-    fn get_file_fd(
-        &mut self,
-        fd: types::Fd,
-    ) -> Result<Resource<filesystem::Descriptor>, types::Error> {
-        let st = self.transact()?;
+    fn get_file_fd(&mut self, fd: types::Fd) -> Result<filesystem::Descriptor, types::Error> {
+        let mut st = self.transact()?;
         let fd = st.get_file_fd(fd)?;
         Ok(fd)
     }
@@ -484,11 +467,8 @@ trait WasiPreview1ViewExt:
     /// and returns [`filesystem::Descriptor`] corresponding to `fd`
     /// if it describes a [`Descriptor::File`] or [`Descriptor::PreopenDirectory`]
     /// of [`crate::preview2::filesystem::Dir`] type
-    fn get_dir_fd(
-        &mut self,
-        fd: types::Fd,
-    ) -> Result<Resource<filesystem::Descriptor>, types::Error> {
-        let st = self.transact()?;
+    fn get_dir_fd(&mut self, fd: types::Fd) -> Result<filesystem::Descriptor, types::Error> {
+        let mut st = self.transact()?;
         let fd = st.get_dir_fd(fd)?;
         Ok(fd)
     }
@@ -496,13 +476,13 @@ trait WasiPreview1ViewExt:
 
 impl<T: WasiPreview1View + preopens::Host> WasiPreview1ViewExt for T {}
 
-pub fn add_to_linker_async<T: WasiPreview1View + Sync>(
+pub fn add_to_linker_async<T: WasiPreview1View>(
     linker: &mut wasmtime::Linker<T>,
 ) -> anyhow::Result<()> {
     wasi_snapshot_preview1::add_to_linker(linker, |t| t)
 }
 
-pub fn add_to_linker_sync<T: WasiPreview1View + Sync>(
+pub fn add_to_linker_sync<T: WasiPreview1View>(
     linker: &mut wasmtime::Linker<T>,
 ) -> anyhow::Result<()> {
     sync::add_wasi_snapshot_preview1_to_linker(linker, |t| t)
@@ -558,28 +538,23 @@ impl wiggle::GuestErrorType for types::Errno {
     }
 }
 
-impl From<StreamError> for types::Error {
-    fn from(err: StreamError) -> Self {
-        match err {
-            StreamError::Closed => types::Errno::Io.into(),
-            StreamError::LastOperationFailed(e) => match e.downcast::<std::io::Error>() {
-                Ok(err) => filesystem::ErrorCode::from(err).into(),
-                Err(e) => {
-                    log::debug!("dropping error {e:?}");
-                    types::Errno::Io.into()
-                }
-            },
-            StreamError::Trap(e) => types::Error::trap(e),
+impl From<streams::Error> for types::Error {
+    fn from(err: streams::Error) -> Self {
+        match err.downcast() {
+            Ok(streams::WriteError::Closed | streams::WriteError::LastOperationFailed) => {
+                types::Errno::Io.into()
+            }
+
+            Err(t) => types::Error::trap(t),
         }
     }
 }
 
-impl From<FsError> for types::Error {
-    fn from(err: FsError) -> Self {
-        match err.downcast() {
-            Ok(code) => code.into(),
-            Err(e) => types::Error::trap(e),
-        }
+fn stream_res<A>(r: anyhow::Result<Result<A, ()>>) -> Result<A, types::Error> {
+    match r {
+        Ok(Ok(a)) => Ok(a),
+        Ok(Err(_)) => Err(types::Errno::Io.into()),
+        Err(trap) => Err(types::Error::trap(trap)),
     }
 }
 
@@ -772,6 +747,28 @@ impl From<filesystem::ErrorCode> for types::Error {
     }
 }
 
+impl TryFrom<filesystem::Error> for types::Errno {
+    type Error = anyhow::Error;
+
+    fn try_from(err: filesystem::Error) -> Result<Self, Self::Error> {
+        match err.downcast() {
+            Ok(code) => Ok(code.into()),
+            Err(e) => Err(e),
+        }
+    }
+}
+
+impl TryFrom<filesystem::Error> for types::Error {
+    type Error = anyhow::Error;
+
+    fn try_from(err: filesystem::Error) -> Result<Self, Self::Error> {
+        match err.downcast() {
+            Ok(code) => Ok(code.into()),
+            Err(e) => Err(e),
+        }
+    }
+}
+
 impl From<TableError> for types::Error {
     fn from(err: TableError) -> Self {
         types::Error::trap(err.into())
@@ -852,7 +849,7 @@ impl<
             + bindings::cli::exit::Host
             + bindings::filesystem::preopens::Host
             + bindings::filesystem::types::Host
-            + bindings::io::poll::Host
+            + bindings::poll::poll::Host
             + bindings::random::random::Host
             + bindings::io::streams::Host
             + bindings::clocks::monotonic_clock::Host
@@ -1015,18 +1012,22 @@ impl<
         let desc = self
             .transact()?
             .descriptors
+            .get_mut()
             .remove(fd)
-            .ok_or(types::Errno::Badf)?;
+            .ok_or(types::Errno::Badf)?
+            .clone();
         match desc {
-            Descriptor::Stdin { stream, .. } => streams::HostInputStream::drop(self, stream)
-                .context("failed to call `drop` on `input-stream`"),
-            Descriptor::Stdout { stream, .. } | Descriptor::Stderr { stream, .. } => {
-                streams::HostOutputStream::drop(self, stream)
-                    .context("failed to call `drop` on `output-stream`")
+            Descriptor::Stdin { input_stream, .. } => {
+                streams::Host::drop_input_stream(self, input_stream)
+                    .context("failed to call `drop-input-stream`")
             }
-            Descriptor::File(File { fd, .. }) | Descriptor::PreopenDirectory((fd, _)) => {
-                filesystem::HostDescriptor::drop(self, fd).context("failed to call `drop`")
+            Descriptor::Stdout { output_stream, .. } | Descriptor::Stderr { output_stream, .. } => {
+                streams::Host::drop_output_stream(self, output_stream)
+                    .context("failed to call `drop-output-stream`")
             }
+            Descriptor::File(File { fd, .. }) | Descriptor::PreopenDirectory((fd, _)) => self
+                .drop_descriptor(fd)
+                .context("failed to call `drop-descriptor`"),
         }
         .map_err(types::Error::trap)
     }
@@ -1112,15 +1113,15 @@ impl<
                 blocking_mode,
                 append,
                 ..
-            }) => (fd.borrowed(), *blocking_mode, *append),
+            }) => (*fd, *blocking_mode, *append),
         };
-        let flags = self.get_flags(fd.borrowed()).await.map_err(|e| {
+        let flags = self.get_flags(fd).await.map_err(|e| {
             e.try_into()
                 .context("failed to call `get-flags`")
                 .unwrap_or_else(types::Error::trap)
         })?;
         let fs_filetype = self
-            .get_type(fd.borrowed())
+            .get_type(fd)
             .await
             .map_err(|e| {
                 e.try_into()
@@ -1202,15 +1203,14 @@ impl<
     /// Return the attributes of an open file.
     #[instrument(skip(self))]
     async fn fd_filestat_get(&mut self, fd: types::Fd) -> Result<types::Filestat, types::Error> {
-        let t = self.transact()?;
-        let desc = t.get_descriptor(fd)?;
+        let desc = self.transact()?.get_descriptor(fd)?.clone();
         match desc {
             Descriptor::Stdin { isatty, .. }
             | Descriptor::Stdout { isatty, .. }
             | Descriptor::Stderr { isatty, .. } => Ok(types::Filestat {
                 dev: 0,
                 ino: 0,
-                filetype: (*isatty).into(),
+                filetype: isatty.into(),
                 nlink: 0,
                 size: 0,
                 atim: 0,
@@ -1218,8 +1218,6 @@ impl<
                 ctim: 0,
             }),
             Descriptor::PreopenDirectory((fd, _)) | Descriptor::File(File { fd, .. }) => {
-                let fd = fd.borrowed();
-                drop(t);
                 let filesystem::DescriptorStat {
                     type_,
                     link_count: nlink,
@@ -1227,7 +1225,7 @@ impl<
                     data_access_timestamp,
                     data_modification_timestamp,
                     status_change_timestamp,
-                } = self.stat(fd.borrowed()).await.map_err(|e| {
+                } = self.stat(fd).await.map_err(|e| {
                     e.try_into()
                         .context("failed to call `stat`")
                         .unwrap_or_else(types::Error::trap)
@@ -1238,13 +1236,9 @@ impl<
                         .unwrap_or_else(types::Error::trap)
                 })?;
                 let filetype = type_.try_into().map_err(types::Error::trap)?;
-                let zero = wall_clock::Datetime {
-                    seconds: 0,
-                    nanoseconds: 0,
-                };
-                let atim = data_access_timestamp.unwrap_or(zero).try_into()?;
-                let mtim = data_modification_timestamp.unwrap_or(zero).try_into()?;
-                let ctim = status_change_timestamp.unwrap_or(zero).try_into()?;
+                let atim = data_access_timestamp.try_into()?;
+                let mtim = data_modification_timestamp.try_into()?;
+                let ctim = status_change_timestamp.try_into()?;
                 Ok(types::Filestat {
                     dev: 1,
                     ino: metadata_hash.lower,
@@ -1312,50 +1306,53 @@ impl<
         fd: types::Fd,
         iovs: &types::IovecArray<'a>,
     ) -> Result<types::Size, types::Error> {
-        let t = self.transact()?;
-        let desc = t.get_descriptor(fd)?;
-        let (mut buf, read) = match desc {
+        let desc = self.transact()?.get_descriptor(fd)?.clone();
+        let (mut buf, read, state) = match desc {
             Descriptor::File(File {
                 fd,
                 blocking_mode,
                 position,
                 ..
-            }) if t.view.table().get(fd)?.is_file() => {
-                let fd = fd.borrowed();
-                let blocking_mode = *blocking_mode;
-                let position = position.clone();
-                drop(t);
+            }) if self.table().is_file(fd) => {
                 let Some(buf) = first_non_empty_iovec(iovs)? else {
                     return Ok(0);
                 };
 
                 let pos = position.load(Ordering::Relaxed);
-                let stream = self.read_via_stream(fd.borrowed(), pos).map_err(|e| {
+                let stream = self.read_via_stream(fd, pos).map_err(|e| {
                     e.try_into()
                         .context("failed to call `read-via-stream`")
                         .unwrap_or_else(types::Error::trap)
                 })?;
-                let read = blocking_mode.read(self, stream, buf.len()).await?;
+                let (read, state) = blocking_mode.read(self, stream, buf.len()).await?;
                 let n = read.len().try_into()?;
                 let pos = pos.checked_add(n).ok_or(types::Errno::Overflow)?;
                 position.store(pos, Ordering::Relaxed);
 
-                (buf, read)
+                (buf, read, state)
             }
-            Descriptor::Stdin { stream, .. } => {
-                let stream = stream.borrowed();
-                drop(t);
+            Descriptor::Stdin { input_stream, .. } => {
                 let Some(buf) = first_non_empty_iovec(iovs)? else {
                     return Ok(0);
                 };
-                let read = BlockingMode::Blocking.read(self, stream, buf.len()).await?;
-                (buf, read)
+                let (read, state) = stream_res(
+                    streams::Host::blocking_read(
+                        self,
+                        input_stream,
+                        buf.len().try_into().unwrap_or(u64::MAX),
+                    )
+                    .await,
+                )?;
+                (buf, read, state)
             }
             _ => return Err(types::Errno::Badf.into()),
         };
         if read.len() > buf.len() {
             return Err(types::Errno::Range.into());
         }
+        if state == streams::StreamStatus::Open && read.len() == 0 {
+            return Err(types::Errno::Intr.into());
+        }
         let (buf, _) = buf.split_at_mut(read.len());
         buf.copy_from_slice(&read);
         let n = read.len().try_into()?;
@@ -1371,15 +1368,11 @@ impl<
         iovs: &types::IovecArray<'a>,
         offset: types::Filesize,
     ) -> Result<types::Size, types::Error> {
-        let t = self.transact()?;
-        let desc = t.get_descriptor(fd)?;
-        let (mut buf, read) = match desc {
+        let desc = self.transact()?.get_descriptor(fd)?.clone();
+        let (mut buf, read, state) = match desc {
             Descriptor::File(File {
                 fd, blocking_mode, ..
-            }) if t.view.table().get(fd)?.is_file() => {
-                let fd = fd.borrowed();
-                let blocking_mode = *blocking_mode;
-                drop(t);
+            }) if self.table().is_file(fd) => {
                 let Some(buf) = first_non_empty_iovec(iovs)? else {
                     return Ok(0);
                 };
@@ -1389,8 +1382,8 @@ impl<
                         .context("failed to call `read-via-stream`")
                         .unwrap_or_else(types::Error::trap)
                 })?;
-                let read = blocking_mode.read(self, stream, buf.len()).await?;
-                (buf, read)
+                let (read, state) = blocking_mode.read(self, stream, buf.len()).await?;
+                (buf, read, state)
             }
             Descriptor::Stdin { .. } => {
                 // NOTE: legacy implementation returns SPIPE here
@@ -1401,6 +1394,9 @@ impl<
         if read.len() > buf.len() {
             return Err(types::Errno::Range.into());
         }
+        if state == streams::StreamStatus::Open && read.len() == 0 {
+            return Err(types::Errno::Intr.into());
+        }
         let (buf, _) = buf.split_at_mut(read.len());
         buf.copy_from_slice(&read);
         let n = read.len().try_into()?;
@@ -1415,20 +1411,14 @@ impl<
         fd: types::Fd,
         ciovs: &types::CiovecArray<'a>,
     ) -> Result<types::Size, types::Error> {
-        let t = self.transact()?;
-        let desc = t.get_descriptor(fd)?;
+        let desc = self.transact()?.get_descriptor(fd)?.clone();
         match desc {
             Descriptor::File(File {
                 fd,
                 blocking_mode,
                 append,
                 position,
-            }) if t.view.table().get(fd)?.is_file() => {
-                let fd = fd.borrowed();
-                let blocking_mode = *blocking_mode;
-                let position = position.clone();
-                let append = *append;
-                drop(t);
+            }) if self.table().is_file(fd) => {
                 let Some(buf) = first_non_empty_ciovec(ciovs)? else {
                     return Ok(0);
                 };
@@ -1440,33 +1430,29 @@ impl<
                     })?;
                     (stream, 0)
                 } else {
-                    let pos = position.load(Ordering::Relaxed);
-                    let stream = self.write_via_stream(fd, pos).map_err(|e| {
+                    let position = position.load(Ordering::Relaxed);
+                    let stream = self.write_via_stream(fd, position).map_err(|e| {
                         e.try_into()
                             .context("failed to call `write-via-stream`")
                             .unwrap_or_else(types::Error::trap)
                     })?;
-                    (stream, pos)
+                    (stream, position)
                 };
                 let n = blocking_mode.write(self, stream, &buf).await?;
                 if !append {
                     let pos = pos.checked_add(n as u64).ok_or(types::Errno::Overflow)?;
                     position.store(pos, Ordering::Relaxed);
                 }
-                let n = n.try_into()?;
-                Ok(n)
+                Ok(n.try_into()?)
             }
-            Descriptor::Stdout { stream, .. } | Descriptor::Stderr { stream, .. } => {
-                let stream = stream.borrowed();
-                drop(t);
+            Descriptor::Stdout { output_stream, .. } | Descriptor::Stderr { output_stream, .. } => {
                 let Some(buf) = first_non_empty_ciovec(ciovs)? else {
                     return Ok(0);
                 };
-                let n = BlockingMode::Blocking
-                    .write(self, stream, &buf)
+                Ok(BlockingMode::Blocking
+                    .write(self, output_stream, &buf)
                     .await?
-                    .try_into()?;
-                Ok(n)
+                    .try_into()?)
             }
             _ => Err(types::Errno::Badf.into()),
         }
@@ -1481,15 +1467,11 @@ impl<
         ciovs: &types::CiovecArray<'a>,
         offset: types::Filesize,
     ) -> Result<types::Size, types::Error> {
-        let t = self.transact()?;
-        let desc = t.get_descriptor(fd)?;
+        let desc = self.transact()?.get_descriptor(fd)?.clone();
         let n = match desc {
             Descriptor::File(File {
                 fd, blocking_mode, ..
-            }) if t.view.table().get(fd)?.is_file() => {
-                let fd = fd.borrowed();
-                let blocking_mode = *blocking_mode;
-                drop(t);
+            }) if self.table().is_file(fd) => {
                 let Some(buf) = first_non_empty_ciovec(ciovs)? else {
                     return Ok(0);
                 };
@@ -1542,8 +1524,9 @@ impl<
     #[instrument(skip(self))]
     fn fd_renumber(&mut self, from: types::Fd, to: types::Fd) -> Result<(), types::Error> {
         let mut st = self.transact()?;
-        let desc = st.descriptors.remove(from).ok_or(types::Errno::Badf)?;
-        st.descriptors.insert(to.into(), desc);
+        let descriptors = st.descriptors.get_mut();
+        let desc = descriptors.remove(from).ok_or(types::Errno::Badf)?;
+        descriptors.insert(to.into(), desc);
         Ok(())
     }
 
@@ -1556,11 +1539,11 @@ impl<
         offset: types::Filedelta,
         whence: types::Whence,
     ) -> Result<types::Filesize, types::Error> {
-        let t = self.transact()?;
-        let File { fd, position, .. } = t.get_seekable(fd)?;
-        let fd = fd.borrowed();
-        let position = position.clone();
-        drop(t);
+        let (fd, position) = {
+            let mut st = self.transact()?;
+            let File { fd, position, .. } = st.get_seekable(fd)?;
+            (*fd, Arc::clone(&position))
+        };
         let pos = match whence {
             types::Whence::Set if offset >= 0 => offset as _,
             types::Whence::Cur => position
@@ -1613,12 +1596,12 @@ impl<
         cookie: types::Dircookie,
     ) -> Result<types::Size, types::Error> {
         let fd = self.get_dir_fd(fd)?;
-        let stream = self.read_directory(fd.borrowed()).await.map_err(|e| {
+        let stream = self.read_directory(fd).await.map_err(|e| {
             e.try_into()
                 .context("failed to call `read-directory`")
                 .unwrap_or_else(types::Error::trap)
         })?;
-        let dir_metadata_hash = self.metadata_hash(fd.borrowed()).await.map_err(|e| {
+        let dir_metadata_hash = self.metadata_hash(fd).await.map_err(|e| {
             e.try_into()
                 .context("failed to call `metadata-hash`")
                 .unwrap_or_else(types::Error::trap)
@@ -1650,7 +1633,7 @@ impl<
         for (entry, d_next) in self
             .table_mut()
             // remove iterator from table and use it directly:
-            .delete(stream)?
+            .delete_readdir(stream)?
             .into_iter()
             .zip(3u64..)
         {
@@ -1660,7 +1643,7 @@ impl<
                     .unwrap_or_else(types::Error::trap)
             })?;
             let metadata_hash = self
-                .metadata_hash_at(fd.borrowed(), filesystem::PathFlags::empty(), name.clone())
+                .metadata_hash_at(fd, filesystem::PathFlags::empty(), name.clone())
                 .await
                 .map_err(|e| {
                     e.try_into()
@@ -1726,13 +1709,11 @@ impl<
     ) -> Result<(), types::Error> {
         let dirfd = self.get_dir_fd(dirfd)?;
         let path = read_string(path)?;
-        self.create_directory_at(dirfd.borrowed(), path)
-            .await
-            .map_err(|e| {
-                e.try_into()
-                    .context("failed to call `create-directory-at`")
-                    .unwrap_or_else(types::Error::trap)
-            })
+        self.create_directory_at(dirfd, path).await.map_err(|e| {
+            e.try_into()
+                .context("failed to call `create-directory-at`")
+                .unwrap_or_else(types::Error::trap)
+        })
     }
 
     /// Return the attributes of a file or directory.
@@ -1754,7 +1735,7 @@ impl<
             data_modification_timestamp,
             status_change_timestamp,
         } = self
-            .stat_at(dirfd.borrowed(), flags.into(), path.clone())
+            .stat_at(dirfd, flags.into(), path.clone())
             .await
             .map_err(|e| {
                 e.try_into()
@@ -1770,13 +1751,9 @@ impl<
                     .unwrap_or_else(types::Error::trap)
             })?;
         let filetype = type_.try_into().map_err(types::Error::trap)?;
-        let zero = wall_clock::Datetime {
-            seconds: 0,
-            nanoseconds: 0,
-        };
-        let atim = data_access_timestamp.unwrap_or(zero).try_into()?;
-        let mtim = data_modification_timestamp.unwrap_or(zero).try_into()?;
-        let ctim = status_change_timestamp.unwrap_or(zero).try_into()?;
+        let atim = data_access_timestamp.try_into()?;
+        let mtim = data_modification_timestamp.try_into()?;
+        let ctim = status_change_timestamp.try_into()?;
         Ok(types::Filestat {
             dev: 1,
             ino: metadata_hash.lower,
@@ -1879,16 +1856,16 @@ impl<
             flags |= filesystem::DescriptorFlags::REQUESTED_WRITE_SYNC;
         }
 
-        let t = self.transact()?;
-        let dirfd = match t.get_descriptor(dirfd)? {
-            Descriptor::PreopenDirectory((fd, _)) => fd.borrowed(),
-            Descriptor::File(File { fd, .. }) => {
-                t.view.table().get(fd)?.dir()?;
-                fd.borrowed()
+        let desc = self.transact()?.get_descriptor(dirfd)?.clone();
+        let dirfd = match desc {
+            Descriptor::PreopenDirectory((fd, _)) => fd,
+            Descriptor::File(File { fd, .. }) if self.table().is_dir(fd) => fd,
+            Descriptor::File(File { fd, .. }) if !self.table().is_dir(fd) => {
+                // NOTE: Unlike most other methods, legacy implementation returns `NOTDIR` here
+                return Err(types::Errno::Notdir.into());
             }
             _ => return Err(types::Errno::Badf.into()),
         };
-        drop(t);
         let fd = self
             .open_at(
                 dirfd,
@@ -1904,7 +1881,7 @@ impl<
                     .context("failed to call `open-at`")
                     .unwrap_or_else(types::Error::trap)
             })?;
-        let fd = self.transact()?.descriptors.push_file(File {
+        let fd = self.transact()?.descriptors.get_mut().push_file(File {
             fd,
             position: Default::default(),
             append: fdflags.contains(types::Fdflags::APPEND),
@@ -1991,7 +1968,7 @@ impl<
         let dirfd = self.get_dir_fd(dirfd)?;
         let src_path = read_string(src_path)?;
         let dest_path = read_string(dest_path)?;
-        self.symlink_at(dirfd.borrowed(), src_path, dest_path)
+        self.symlink_at(dirfd, src_path, dest_path)
             .await
             .map_err(|e| {
                 e.try_into()
@@ -2008,15 +1985,14 @@ impl<
     ) -> Result<(), types::Error> {
         let dirfd = self.get_dir_fd(dirfd)?;
         let path = path.as_cow()?.to_string();
-        self.unlink_file_at(dirfd.borrowed(), path)
-            .await
-            .map_err(|e| {
-                e.try_into()
-                    .context("failed to call `unlink-file-at`")
-                    .unwrap_or_else(types::Error::trap)
-            })
+        self.unlink_file_at(dirfd, path).await.map_err(|e| {
+            e.try_into()
+                .context("failed to call `unlink-file-at`")
+                .unwrap_or_else(types::Error::trap)
+        })
     }
 
+    #[allow(unused_variables)]
     #[instrument(skip(self))]
     async fn poll_oneoff<'a>(
         &mut self,
@@ -2024,236 +2000,7 @@ impl<
         events: &GuestPtr<'a, types::Event>,
         nsubscriptions: types::Size,
     ) -> Result<types::Size, types::Error> {
-        if nsubscriptions == 0 {
-            // Indefinite sleeping is not supported in preview1.
-            return Err(types::Errno::Inval.into());
-        }
-        let subs = subs.as_array(nsubscriptions);
-        let events = events.as_array(nsubscriptions);
-
-        let n = usize::try_from(nsubscriptions).unwrap_or(usize::MAX);
-        let mut pollables = Vec::with_capacity(n);
-        for sub in subs.iter() {
-            let sub = sub?.read()?;
-            let p = match sub.u {
-                types::SubscriptionU::Clock(types::SubscriptionClock {
-                    id,
-                    timeout,
-                    flags,
-                    ..
-                }) => {
-                    let absolute = flags.contains(types::Subclockflags::SUBSCRIPTION_CLOCK_ABSTIME);
-                    let (timeout, absolute) = match id {
-                        types::Clockid::Monotonic => (timeout, absolute),
-                        types::Clockid::Realtime if !absolute => (timeout, false),
-                        types::Clockid::Realtime => {
-                            let now = wall_clock::Host::now(self)
-                                .context("failed to call `wall_clock::now`")
-                                .map_err(types::Error::trap)?;
-
-                            // Convert `timeout` to `Datetime` format.
-                            let seconds = timeout / 1_000_000_000;
-                            let nanoseconds = timeout % 1_000_000_000;
-
-                            let timeout = if now.seconds < seconds
-                                || now.seconds == seconds
-                                    && u64::from(now.nanoseconds) < nanoseconds
-                            {
-                                // `now` is less than `timeout`, which is expressable as u64,
-                                // substract the nanosecond counts directly
-                                now.seconds * 1_000_000_000 + u64::from(now.nanoseconds) - timeout
-                            } else {
-                                0
-                            };
-                            (timeout, false)
-                        }
-                        _ => return Err(types::Errno::Inval.into()),
-                    };
-                    monotonic_clock::Host::subscribe(self, timeout, absolute)
-                        .context("failed to call `monotonic_clock::subscribe`")
-                        .map_err(types::Error::trap)?
-                }
-                types::SubscriptionU::FdRead(types::SubscriptionFdReadwrite {
-                    file_descriptor,
-                }) => {
-                    let stream = {
-                        let t = self.transact()?;
-                        let desc = t.get_descriptor(file_descriptor)?;
-                        match desc {
-                            Descriptor::Stdin { stream, .. } => stream.borrowed(),
-                            Descriptor::File(File { fd, position, .. })
-                                if t.view.table().get(fd)?.is_file() =>
-                            {
-                                let pos = position.load(Ordering::Relaxed);
-                                let fd = fd.borrowed();
-                                drop(t);
-                                self.read_via_stream(fd, pos).map_err(|e| {
-                                    e.try_into()
-                                        .context("failed to call `read-via-stream`")
-                                        .unwrap_or_else(types::Error::trap)
-                                })?
-                            }
-                            // TODO: Support sockets
-                            _ => return Err(types::Errno::Badf.into()),
-                        }
-                    };
-                    streams::HostInputStream::subscribe(self, stream)
-                        .context("failed to call `subscribe` on `input-stream`")
-                        .map_err(types::Error::trap)?
-                }
-                types::SubscriptionU::FdWrite(types::SubscriptionFdReadwrite {
-                    file_descriptor,
-                }) => {
-                    let stream = {
-                        let t = self.transact()?;
-                        let desc = t.get_descriptor(file_descriptor)?;
-                        match desc {
-                            Descriptor::Stdout { stream, .. }
-                            | Descriptor::Stderr { stream, .. } => stream.borrowed(),
-                            Descriptor::File(File {
-                                fd,
-                                position,
-                                append,
-                                ..
-                            }) if t.view.table().get(fd)?.is_file() => {
-                                let fd = fd.borrowed();
-                                let position = position.clone();
-                                let append = *append;
-                                drop(t);
-                                if append {
-                                    self.append_via_stream(fd).map_err(|e| {
-                                        e.try_into()
-                                            .context("failed to call `append-via-stream`")
-                                            .unwrap_or_else(types::Error::trap)
-                                    })?
-                                } else {
-                                    let pos = position.load(Ordering::Relaxed);
-                                    self.write_via_stream(fd, pos).map_err(|e| {
-                                        e.try_into()
-                                            .context("failed to call `write-via-stream`")
-                                            .unwrap_or_else(types::Error::trap)
-                                    })?
-                                }
-                            }
-                            // TODO: Support sockets
-                            _ => return Err(types::Errno::Badf.into()),
-                        }
-                    };
-                    streams::HostOutputStream::subscribe(self, stream)
-                        .context("failed to call `subscribe` on `output-stream`")
-                        .map_err(types::Error::trap)?
-                }
-            };
-            pollables.push(p);
-        }
-        let ready: HashSet<_> = self
-            .poll_list(pollables)
-            .await
-            .context("failed to call `poll-oneoff`")
-            .map_err(types::Error::trap)?
-            .into_iter()
-            .collect();
-
-        let mut count: types::Size = 0;
-        for (sub, event) in (0..)
-            .zip(subs.iter())
-            .filter_map(|(idx, sub)| ready.contains(&idx).then_some(sub))
-            .zip(events.iter())
-        {
-            let sub = sub?.read()?;
-            let event = event?;
-            let e = match sub.u {
-                types::SubscriptionU::Clock(..) => types::Event {
-                    userdata: sub.userdata,
-                    error: types::Errno::Success,
-                    type_: types::Eventtype::Clock,
-                    fd_readwrite: types::EventFdReadwrite {
-                        flags: types::Eventrwflags::empty(),
-                        nbytes: 0,
-                    },
-                },
-                types::SubscriptionU::FdRead(types::SubscriptionFdReadwrite {
-                    file_descriptor,
-                }) => {
-                    let t = self.transact()?;
-                    let desc = t.get_descriptor(file_descriptor)?;
-                    match desc {
-                        Descriptor::Stdin { .. } => types::Event {
-                            userdata: sub.userdata,
-                            error: types::Errno::Success,
-                            type_: types::Eventtype::FdRead,
-                            fd_readwrite: types::EventFdReadwrite {
-                                flags: types::Eventrwflags::empty(),
-                                nbytes: 1,
-                            },
-                        },
-                        Descriptor::File(File { fd, position, .. })
-                            if t.view.table().get(fd)?.is_file() =>
-                        {
-                            let fd = fd.borrowed();
-                            let position = position.clone();
-                            drop(t);
-                            match self.stat(fd).await? {
-                                filesystem::DescriptorStat { size, .. } => {
-                                    let pos = position.load(Ordering::Relaxed);
-                                    let nbytes = size.saturating_sub(pos);
-                                    types::Event {
-                                        userdata: sub.userdata,
-                                        error: types::Errno::Success,
-                                        type_: types::Eventtype::FdRead,
-                                        fd_readwrite: types::EventFdReadwrite {
-                                            flags: if nbytes == 0 {
-                                                types::Eventrwflags::FD_READWRITE_HANGUP
-                                            } else {
-                                                types::Eventrwflags::empty()
-                                            },
-                                            nbytes: 1,
-                                        },
-                                    }
-                                }
-                            }
-                        }
-                        // TODO: Support sockets
-                        _ => return Err(types::Errno::Badf.into()),
-                    }
-                }
-                types::SubscriptionU::FdWrite(types::SubscriptionFdReadwrite {
-                    file_descriptor,
-                }) => {
-                    let t = self.transact()?;
-                    let desc = t.get_descriptor(file_descriptor)?;
-                    match desc {
-                        Descriptor::Stdout { .. } | Descriptor::Stderr { .. } => types::Event {
-                            userdata: sub.userdata,
-                            error: types::Errno::Success,
-                            type_: types::Eventtype::FdWrite,
-                            fd_readwrite: types::EventFdReadwrite {
-                                flags: types::Eventrwflags::empty(),
-                                nbytes: 1,
-                            },
-                        },
-                        Descriptor::File(File { fd, .. }) if t.view.table().get(fd)?.is_file() => {
-                            types::Event {
-                                userdata: sub.userdata,
-                                error: types::Errno::Success,
-                                type_: types::Eventtype::FdWrite,
-                                fd_readwrite: types::EventFdReadwrite {
-                                    flags: types::Eventrwflags::empty(),
-                                    nbytes: 1,
-                                },
-                            }
-                        }
-                        // TODO: Support sockets
-                        _ => return Err(types::Errno::Badf.into()),
-                    }
-                }
-            };
-            event.write(e)?;
-            count = count
-                .checked_add(1)
-                .ok_or_else(|| types::Error::from(types::Errno::Overflow))?
-        }
-        Ok(count)
+        todo!("preview1 poll_oneoff is not implemented")
     }
 
     #[instrument(skip(self))]
@@ -2331,13 +2078,3 @@ impl<
         todo!("preview1 sock_shutdown is not implemented")
     }
 }
-
-trait ResourceExt<T> {
-    fn borrowed(&self) -> Resource<T>;
-}
-
-impl<T: 'static> ResourceExt<T> for Resource<T> {
-    fn borrowed(&self) -> Resource<T> {
-        Resource::new_borrow(self.rep())
-    }
-}
diff --git a/crates/wasi/src/preview2/stdio.rs b/crates/wasi/src/preview2/stdio.rs
index 1ad802302c5a..f385329c1a37 100644
--- a/crates/wasi/src/preview2/stdio.rs
+++ b/crates/wasi/src/preview2/stdio.rs
@@ -3,55 +3,10 @@ use crate::preview2::bindings::cli::{
     terminal_stdout,
 };
 use crate::preview2::bindings::io::streams;
-use crate::preview2::pipe::{self, AsyncWriteStream};
-use crate::preview2::{HostInputStream, HostOutputStream, WasiView};
-use std::io::IsTerminal;
-use wasmtime::component::Resource;
-
-/// A trait used to represent the standard input to a guest program.
-///
-/// This is used to implement various WASI APIs via the method implementations
-/// below.
-///
-/// Built-in implementations are provided for [`Stdin`],
-/// [`pipe::MemoryInputPipe`], and [`pipe::ClosedInputStream`].
-pub trait StdinStream: Send + Sync {
-    /// Creates a fresh stream which is reading stdin.
-    ///
-    /// Note that the returned stream must share state with all other streams
-    /// previously created. Guests may create multiple handles to the same stdin
-    /// and they should all be synchronized in their progress through the
-    /// program's input.
-    ///
-    /// Note that this means that if one handle becomes ready for reading they
-    /// all become ready for reading. Subsequently if one is read from it may
-    /// mean that all the others are no longer ready for reading. This is
-    /// basically a consequence of the way the WIT APIs are designed today.
-    fn stream(&self) -> Box<dyn HostInputStream>;
-
-    /// Returns whether this stream is backed by a TTY.
-    fn isatty(&self) -> bool;
-}
-
-impl StdinStream for pipe::MemoryInputPipe {
-    fn stream(&self) -> Box<dyn HostInputStream> {
-        Box::new(self.clone())
-    }
-
-    fn isatty(&self) -> bool {
-        false
-    }
-}
-
-impl StdinStream for pipe::ClosedInputStream {
-    fn stream(&self) -> Box<dyn HostInputStream> {
-        Box::new(self.clone())
-    }
-
-    fn isatty(&self) -> bool {
-        false
-    }
-}
+use crate::preview2::pipe::AsyncWriteStream;
+use crate::preview2::{HostOutputStream, OutputStreamError, WasiView};
+use bytes::Bytes;
+use is_terminal::IsTerminal;
 
 mod worker_thread_stdin;
 pub use self::worker_thread_stdin::{stdin, Stdin};
@@ -62,93 +17,57 @@ pub use self::worker_thread_stdin::{stdin, Stdin};
 // and tokio's stdout/err.
 const STDIO_BUFFER_SIZE: usize = 4096;
 
-/// Similar to [`StdinStream`], except for output.
-pub trait StdoutStream: Send + Sync {
-    /// Returns a fresh new stream which can write to this output stream.
-    ///
-    /// Note that all output streams should output to the same logical source.
-    /// This means that it's possible for each independent stream to acquire a
-    /// separate "permit" to write and then act on that permit. Note that
-    /// additionally at this time once a permit is "acquired" there's no way to
-    /// release it, for example you can wait for readiness and then never
-    /// actually write in WASI. This means that acquisition of a permit for one
-    /// stream cannot discount the size of a permit another stream could
-    /// obtain.
-    ///
-    /// Implementations must be able to handle this
-    fn stream(&self) -> Box<dyn HostOutputStream>;
-
-    /// Returns whether this stream is backed by a TTY.
-    fn isatty(&self) -> bool;
-}
-
-impl StdoutStream for pipe::MemoryOutputPipe {
-    fn stream(&self) -> Box<dyn HostOutputStream> {
-        Box::new(self.clone())
-    }
+pub struct Stdout(AsyncWriteStream);
 
-    fn isatty(&self) -> bool {
-        false
-    }
+pub fn stdout() -> Stdout {
+    Stdout(AsyncWriteStream::new(
+        STDIO_BUFFER_SIZE,
+        tokio::io::stdout(),
+    ))
 }
-
-impl StdoutStream for pipe::SinkOutputStream {
-    fn stream(&self) -> Box<dyn HostOutputStream> {
-        Box::new(self.clone())
-    }
-
-    fn isatty(&self) -> bool {
-        false
+impl IsTerminal for Stdout {
+    fn is_terminal(&self) -> bool {
+        std::io::stdout().is_terminal()
     }
 }
-
-impl StdoutStream for pipe::ClosedOutputStream {
-    fn stream(&self) -> Box<dyn HostOutputStream> {
-        Box::new(self.clone())
+#[async_trait::async_trait]
+impl HostOutputStream for Stdout {
+    fn write(&mut self, bytes: Bytes) -> Result<(), OutputStreamError> {
+        self.0.write(bytes)
     }
-
-    fn isatty(&self) -> bool {
-        false
+    fn flush(&mut self) -> Result<(), OutputStreamError> {
+        self.0.flush()
     }
-}
-
-pub struct Stdout;
-
-pub fn stdout() -> Stdout {
-    Stdout
-}
-
-impl StdoutStream for Stdout {
-    fn stream(&self) -> Box<dyn HostOutputStream> {
-        Box::new(AsyncWriteStream::new(
-            STDIO_BUFFER_SIZE,
-            tokio::io::stdout(),
-        ))
-    }
-
-    fn isatty(&self) -> bool {
-        std::io::stdout().is_terminal()
+    async fn write_ready(&mut self) -> Result<usize, OutputStreamError> {
+        self.0.write_ready().await
     }
 }
 
-pub struct Stderr;
+pub struct Stderr(AsyncWriteStream);
 
 pub fn stderr() -> Stderr {
-    Stderr
+    Stderr(AsyncWriteStream::new(
+        STDIO_BUFFER_SIZE,
+        tokio::io::stderr(),
+    ))
 }
-
-impl StdoutStream for Stderr {
-    fn stream(&self) -> Box<dyn HostOutputStream> {
-        Box::new(AsyncWriteStream::new(
-            STDIO_BUFFER_SIZE,
-            tokio::io::stderr(),
-        ))
-    }
-
-    fn isatty(&self) -> bool {
+impl IsTerminal for Stderr {
+    fn is_terminal(&self) -> bool {
         std::io::stderr().is_terminal()
     }
 }
+#[async_trait::async_trait]
+impl HostOutputStream for Stderr {
+    fn write(&mut self, bytes: Bytes) -> Result<(), OutputStreamError> {
+        self.0.write(bytes)
+    }
+    fn flush(&mut self) -> Result<(), OutputStreamError> {
+        self.0.flush()
+    }
+    async fn write_ready(&mut self) -> Result<usize, OutputStreamError> {
+        self.0.write_ready().await
+    }
+}
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum IsATTY {
@@ -156,69 +75,71 @@ pub enum IsATTY {
     No,
 }
 
+pub(crate) struct StdioInput {
+    pub input_stream: streams::InputStream,
+    pub isatty: IsATTY,
+}
+
+pub(crate) struct StdioOutput {
+    pub output_stream: streams::OutputStream,
+    pub isatty: IsATTY,
+}
+
 impl<T: WasiView> stdin::Host for T {
-    fn get_stdin(&mut self) -> Result<Resource<streams::InputStream>, anyhow::Error> {
-        let stream = self.ctx_mut().stdin.stream();
-        Ok(self.table_mut().push(streams::InputStream::Host(stream))?)
+    fn get_stdin(&mut self) -> Result<streams::InputStream, anyhow::Error> {
+        Ok(self.ctx().stdin.input_stream)
     }
 }
 
 impl<T: WasiView> stdout::Host for T {
-    fn get_stdout(&mut self) -> Result<Resource<streams::OutputStream>, anyhow::Error> {
-        let stream = self.ctx_mut().stdout.stream();
-        Ok(self.table_mut().push(stream)?)
+    fn get_stdout(&mut self) -> Result<streams::OutputStream, anyhow::Error> {
+        Ok(self.ctx().stdout.output_stream)
     }
 }
 
 impl<T: WasiView> stderr::Host for T {
-    fn get_stderr(&mut self) -> Result<Resource<streams::OutputStream>, anyhow::Error> {
-        let stream = self.ctx_mut().stderr.stream();
-        Ok(self.table_mut().push(stream)?)
+    fn get_stderr(&mut self) -> Result<streams::OutputStream, anyhow::Error> {
+        Ok(self.ctx().stderr.output_stream)
     }
 }
 
-pub struct TerminalInput;
-pub struct TerminalOutput;
+struct HostTerminalInput;
+struct HostTerminalOutput;
 
-impl<T: WasiView> terminal_input::Host for T {}
-impl<T: WasiView> terminal_input::HostTerminalInput for T {
-    fn drop(&mut self, r: Resource<TerminalInput>) -> anyhow::Result<()> {
-        self.table_mut().delete(r)?;
+impl<T: WasiView> terminal_input::Host for T {
+    fn drop_terminal_input(&mut self, r: terminal_input::TerminalInput) -> anyhow::Result<()> {
+        self.table_mut().delete::<HostTerminalInput>(r)?;
         Ok(())
     }
 }
-impl<T: WasiView> terminal_output::Host for T {}
-impl<T: WasiView> terminal_output::HostTerminalOutput for T {
-    fn drop(&mut self, r: Resource<TerminalOutput>) -> anyhow::Result<()> {
-        self.table_mut().delete(r)?;
+impl<T: WasiView> terminal_output::Host for T {
+    fn drop_terminal_output(&mut self, r: terminal_output::TerminalOutput) -> anyhow::Result<()> {
+        self.table_mut().delete::<HostTerminalOutput>(r)?;
         Ok(())
     }
 }
 impl<T: WasiView> terminal_stdin::Host for T {
-    fn get_terminal_stdin(&mut self) -> anyhow::Result<Option<Resource<TerminalInput>>> {
-        if self.ctx().stdin.isatty() {
-            let fd = self.table_mut().push(TerminalInput)?;
-            Ok(Some(fd))
+    fn get_terminal_stdin(&mut self) -> anyhow::Result<Option<terminal_input::TerminalInput>> {
+        if let IsATTY::Yes = self.ctx().stdin.isatty {
+            Ok(Some(self.table_mut().push(Box::new(HostTerminalInput))?))
         } else {
             Ok(None)
         }
     }
 }
 impl<T: WasiView> terminal_stdout::Host for T {
-    fn get_terminal_stdout(&mut self) -> anyhow::Result<Option<Resource<TerminalOutput>>> {
-        if self.ctx().stdout.isatty() {
-            let fd = self.table_mut().push(TerminalOutput)?;
-            Ok(Some(fd))
+    fn get_terminal_stdout(&mut self) -> anyhow::Result<Option<terminal_output::TerminalOutput>> {
+        if let IsATTY::Yes = self.ctx().stdout.isatty {
+            Ok(Some(self.table_mut().push(Box::new(HostTerminalOutput))?))
         } else {
             Ok(None)
         }
     }
 }
 impl<T: WasiView> terminal_stderr::Host for T {
-    fn get_terminal_stderr(&mut self) -> anyhow::Result<Option<Resource<TerminalOutput>>> {
-        if self.ctx().stderr.isatty() {
-            let fd = self.table_mut().push(TerminalOutput)?;
-            Ok(Some(fd))
+    fn get_terminal_stderr(&mut self) -> anyhow::Result<Option<terminal_output::TerminalOutput>> {
+        if let IsATTY::Yes = self.ctx().stderr.isatty {
+            Ok(Some(self.table_mut().push(Box::new(HostTerminalOutput))?))
         } else {
             Ok(None)
         }
@@ -227,7 +148,7 @@ impl<T: WasiView> terminal_stderr::Host for T {
 
 #[cfg(all(unix, test))]
 mod test {
-    use crate::preview2::HostInputStream;
+    use crate::preview2::{HostInputStream, StreamState};
     use libc;
     use std::fs::File;
     use std::io::{BufRead, BufReader, Write};
@@ -316,13 +237,15 @@ mod test {
                                 let mut buffer = String::new();
                                 loop {
                                     println!("child: waiting for stdin to be ready");
-                                    stdin.ready().await;
+                                    stdin.ready().await.unwrap();
 
                                     println!("child: reading input");
-                                    // We can't effectively test for the case where stdin was closed, so panic if it is...
-                                    let bytes = stdin.read(1024).unwrap();
+                                    let (bytes, status) = stdin.read(1024).unwrap();
 
-                                    println!("child got: {:?}", bytes);
+                                    println!("child: {:?}, {:?}", bytes, status);
+
+                                    // We can't effectively test for the case where stdin was closed.
+                                    assert_eq!(status, StreamState::Open);
 
                                     buffer.push_str(std::str::from_utf8(bytes.as_ref()).unwrap());
                                     if let Some((line, rest)) = buffer.split_once('\n') {
@@ -410,7 +333,14 @@ mod test {
 
     // This test doesn't work under qemu because of the use of fork in the test helper.
     #[test]
-    #[cfg_attr(not(target_arch = "x86_64"), ignore)]
+    #[cfg_attr(not(target = "x86_64"), ignore)]
+    fn test_async_fd_stdin() {
+        test_stdin_by_forking(super::stdin);
+    }
+
+    // This test doesn't work under qemu because of the use of fork in the test helper.
+    #[test]
+    #[cfg_attr(not(target = "x86_64"), ignore)]
     fn test_worker_thread_stdin() {
         test_stdin_by_forking(super::worker_thread_stdin::stdin);
     }
diff --git a/crates/wasi/src/preview2/stdio/worker_thread_stdin.rs b/crates/wasi/src/preview2/stdio/worker_thread_stdin.rs
index cb2f50f2c61b..e1505dff844b 100644
--- a/crates/wasi/src/preview2/stdio/worker_thread_stdin.rs
+++ b/crates/wasi/src/preview2/stdio/worker_thread_stdin.rs
@@ -23,11 +23,10 @@
 //! This module is one that's likely to change over time though as new systems
 //! are encountered along with preexisting bugs.
 
-use crate::preview2::poll::Subscribe;
-use crate::preview2::stdio::StdinStream;
-use crate::preview2::{HostInputStream, StreamError};
+use crate::preview2::{HostInputStream, StreamState};
+use anyhow::Error;
 use bytes::{Bytes, BytesMut};
-use std::io::{IsTerminal, Read};
+use std::io::Read;
 use std::mem;
 use std::sync::{Condvar, Mutex, OnceLock};
 use tokio::sync::Notify;
@@ -104,27 +103,23 @@ pub fn stdin() -> Stdin {
     Stdin
 }
 
-impl StdinStream for Stdin {
-    fn stream(&self) -> Box<dyn HostInputStream> {
-        Box::new(Stdin)
-    }
-
-    fn isatty(&self) -> bool {
+impl is_terminal::IsTerminal for Stdin {
+    fn is_terminal(&self) -> bool {
         std::io::stdin().is_terminal()
     }
 }
 
 #[async_trait::async_trait]
 impl HostInputStream for Stdin {
-    fn read(&mut self, size: usize) -> Result<Bytes, StreamError> {
+    fn read(&mut self, size: usize) -> Result<(Bytes, StreamState), Error> {
         let g = GlobalStdin::get();
         let mut locked = g.state.lock().unwrap();
         match mem::replace(&mut *locked, StdinState::ReadRequested) {
             StdinState::ReadNotRequested => {
                 g.read_requested.notify_one();
-                Ok(Bytes::new())
+                Ok((Bytes::new(), StreamState::Open))
             }
-            StdinState::ReadRequested => Ok(Bytes::new()),
+            StdinState::ReadRequested => Ok((Bytes::new(), StreamState::Open)),
             StdinState::Data(mut data) => {
                 let size = data.len().min(size);
                 let bytes = data.split_to(size);
@@ -133,23 +128,20 @@ impl HostInputStream for Stdin {
                 } else {
                     StdinState::Data(data)
                 };
-                Ok(bytes.freeze())
+                Ok((bytes.freeze(), StreamState::Open))
             }
             StdinState::Error(e) => {
                 *locked = StdinState::Closed;
-                Err(StreamError::LastOperationFailed(e.into()))
+                return Err(e.into());
             }
             StdinState::Closed => {
                 *locked = StdinState::Closed;
-                Err(StreamError::Closed)
+                Ok((Bytes::new(), StreamState::Closed))
             }
         }
     }
-}
 
-#[async_trait::async_trait]
-impl Subscribe for Stdin {
-    async fn ready(&mut self) {
+    async fn ready(&mut self) -> Result<(), Error> {
         let g = GlobalStdin::get();
 
         // Scope the synchronous `state.lock()` to this block which does not
@@ -164,10 +156,12 @@ impl Subscribe for Stdin {
                     g.read_completed.notified()
                 }
                 StdinState::ReadRequested => g.read_completed.notified(),
-                StdinState::Data(_) | StdinState::Closed | StdinState::Error(_) => return,
+                StdinState::Data(_) | StdinState::Closed | StdinState::Error(_) => return Ok(()),
             }
         };
 
         notified.await;
+
+        Ok(())
     }
 }
diff --git a/crates/wasi/src/preview2/stream.rs b/crates/wasi/src/preview2/stream.rs
index 6200e1226d07..2c8a46b7f99d 100644
--- a/crates/wasi/src/preview2/stream.rs
+++ b/crates/wasi/src/preview2/stream.rs
@@ -1,182 +1,347 @@
 use crate::preview2::filesystem::FileInputStream;
-use crate::preview2::poll::Subscribe;
-use crate::preview2::TableError;
-use anyhow::Result;
+use crate::preview2::{Table, TableError};
+use anyhow::Error;
 use bytes::Bytes;
+use std::fmt;
+
+/// An error which should be reported to Wasm as a runtime error, rather than
+/// an error which should trap Wasm execution. The definition for runtime
+/// stream errors is the empty type, so the contents of this error will only
+/// be available via a `tracing`::event` at `Level::DEBUG`.
+pub struct StreamRuntimeError(anyhow::Error);
+impl From<anyhow::Error> for StreamRuntimeError {
+    fn from(e: anyhow::Error) -> Self {
+        StreamRuntimeError(e)
+    }
+}
+impl fmt::Debug for StreamRuntimeError {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(fmt, "Stream runtime error: {:?}", self.0)
+    }
+}
+impl fmt::Display for StreamRuntimeError {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(fmt, "Stream runtime error")
+    }
+}
+impl std::error::Error for StreamRuntimeError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        self.0.source()
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum StreamState {
+    Open,
+    Closed,
+}
+
+impl StreamState {
+    pub fn is_closed(&self) -> bool {
+        *self == Self::Closed
+    }
+}
 
 /// Host trait for implementing the `wasi:io/streams.input-stream` resource: A
 /// bytestream which can be read from.
 #[async_trait::async_trait]
-pub trait HostInputStream: Subscribe {
-    /// Reads up to `size` bytes, returning a buffer holding these bytes on
-    /// success.
-    ///
-    /// This function does not block the current thread and is the equivalent of
-    /// a non-blocking read. On success all bytes read are returned through
-    /// `Bytes`, which is no larger than the `size` provided. If the returned
-    /// list of `Bytes` is empty then no data is ready to be read at this time.
-    ///
-    /// # Errors
-    ///
-    /// The [`StreamError`] return value communicates when this stream is
-    /// closed, when a read fails, or when a trap should be generated.
-    fn read(&mut self, size: usize) -> StreamResult<Bytes>;
+pub trait HostInputStream: Send + Sync {
+    /// Read bytes. On success, returns a pair holding the number of bytes
+    /// read and a flag indicating whether the end of the stream was reached.
+    /// Important: this read must be non-blocking!
+    /// Returning an Err which downcasts to a [`StreamRuntimeError`] will be
+    /// reported to Wasm as the empty error result. Otherwise, errors will trap.
+    fn read(&mut self, size: usize) -> Result<(Bytes, StreamState), Error>;
 
-    /// Same as the `read` method except that bytes are skipped.
-    ///
-    /// Note that this method is non-blocking like `read` and returns the same
-    /// errors.
-    fn skip(&mut self, nelem: usize) -> StreamResult<usize> {
-        let bs = self.read(nelem)?;
-        Ok(bs.len())
-    }
-}
+    /// Read bytes from a stream and discard them. Important: this method must
+    /// be non-blocking!
+    /// Returning an Error which downcasts to a StreamRuntimeError will be
+    /// reported to Wasm as the empty error result. Otherwise, errors will trap.
+    fn skip(&mut self, nelem: usize) -> Result<(usize, StreamState), Error> {
+        let mut nread = 0;
+        let mut state = StreamState::Open;
+
+        let (bs, read_state) = self.read(nelem)?;
+        // TODO: handle the case where `bs.len()` is less than `nelem`
+        nread += bs.len();
+        if read_state.is_closed() {
+            state = read_state;
+        }
 
-/// Representation of the `error` resource type in the `wasi:io/streams`
-/// interface.
-///
-/// This is currently `anyhow::Error` to retain full type information for
-/// errors.
-pub type Error = anyhow::Error;
+        Ok((nread, state))
+    }
 
-pub type StreamResult<T> = Result<T, StreamError>;
+    /// Check for read readiness: this method blocks until the stream is ready
+    /// for reading.
+    /// Returning an error will trap execution.
+    async fn ready(&mut self) -> Result<(), Error>;
+}
 
 #[derive(Debug)]
-pub enum StreamError {
+pub enum OutputStreamError {
     Closed,
     LastOperationFailed(anyhow::Error),
     Trap(anyhow::Error),
 }
-
-impl StreamError {
-    pub fn trap(msg: &str) -> StreamError {
-        StreamError::Trap(anyhow::anyhow!("{msg}"))
-    }
-}
-
-impl std::fmt::Display for StreamError {
+impl std::fmt::Display for OutputStreamError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            StreamError::Closed => write!(f, "closed"),
-            StreamError::LastOperationFailed(e) => write!(f, "last operation failed: {e}"),
-            StreamError::Trap(e) => write!(f, "trap: {e}"),
+            OutputStreamError::Closed => write!(f, "closed"),
+            OutputStreamError::LastOperationFailed(e) => write!(f, "last operation failed: {e}"),
+            OutputStreamError::Trap(e) => write!(f, "trap: {e}"),
         }
     }
 }
-
-impl std::error::Error for StreamError {
+impl std::error::Error for OutputStreamError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match self {
-            StreamError::Closed => None,
-            StreamError::LastOperationFailed(e) | StreamError::Trap(e) => e.source(),
+            OutputStreamError::Closed => None,
+            OutputStreamError::LastOperationFailed(e) | OutputStreamError::Trap(e) => e.source(),
         }
     }
 }
 
-impl From<TableError> for StreamError {
-    fn from(error: TableError) -> Self {
-        Self::Trap(error.into())
-    }
-}
-
 /// Host trait for implementing the `wasi:io/streams.output-stream` resource:
 /// A bytestream which can be written to.
 #[async_trait::async_trait]
-pub trait HostOutputStream: Subscribe {
+pub trait HostOutputStream: Send + Sync {
     /// Write bytes after obtaining a permit to write those bytes
+    /// Prior to calling [`write`](Self::write)
+    /// the caller must call [`write_ready`](Self::write_ready),
+    /// which resolves to a non-zero permit
     ///
-    /// Prior to calling [`write`](Self::write) the caller must call
-    /// [`check_write`](Self::check_write), which resolves to a non-zero permit
-    ///
-    /// This method must never block.  The [`check_write`](Self::check_write)
-    /// permit indicates the maximum amount of bytes that are permitted to be
-    /// written in a single [`write`](Self::write) following the
-    /// [`check_write`](Self::check_write) resolution.
+    /// This method must never block.
+    /// [`write_ready`](Self::write_ready) permit indicates the maximum amount of bytes that are
+    /// permitted to be written in a single [`write`](Self::write) following the
+    /// [`write_ready`](Self::write_ready) resolution
     ///
     /// # Errors
     ///
-    /// Returns a [`StreamError`] if:
+    /// Returns an [OutputStreamError] if:
     /// - stream is closed
     /// - prior operation ([`write`](Self::write) or [`flush`](Self::flush)) failed
     /// - caller performed an illegal operation (e.g. wrote more bytes than were permitted)
-    fn write(&mut self, bytes: Bytes) -> StreamResult<()>;
+    fn write(&mut self, bytes: Bytes) -> Result<(), OutputStreamError>;
 
     /// Trigger a flush of any bytes buffered in this stream implementation.
     ///
     /// This method may be called at any time and must never block.
     ///
-    /// After this method is called, [`check_write`](Self::check_write) must
-    /// pend until flush is complete.
-    ///
-    /// When [`check_write`](Self::check_write) becomes ready after a flush,
-    /// that guarantees that all prior writes have been flushed from the
-    /// implementation successfully, or that any error associated with those
-    /// writes is reported in the return value of [`flush`](Self::flush) or
-    /// [`check_write`](Self::check_write)
+    /// After this method is called, [`write_ready`](Self::write_ready) must pend until flush is
+    /// complete.
+    /// When [`write_ready`](Self::write_ready) becomes ready after a flush, that guarantees that
+    /// all prior writes have been flushed from the implementation successfully, or that any error
+    /// associated with those writes is reported in the return value of [`flush`](Self::flush) or
+    /// [`write_ready`](Self::write_ready)
     ///
     /// # Errors
     ///
-    /// Returns a [`StreamError`] if:
+    /// Returns an [OutputStreamError] if:
     /// - stream is closed
     /// - prior operation ([`write`](Self::write) or [`flush`](Self::flush)) failed
     /// - caller performed an illegal operation (e.g. wrote more bytes than were permitted)
-    fn flush(&mut self) -> StreamResult<()>;
+    fn flush(&mut self) -> Result<(), OutputStreamError>;
 
-    /// Returns the number of bytes that are ready to be written to this stream.
-    ///
-    /// Zero bytes indicates that this stream is not currently ready for writing
-    /// and `ready()` must be awaited first.
-    ///
-    /// Note that this method does not block.
+    /// Returns a future, which:
+    /// - when pending, indicates 0 bytes are permitted for writing
+    /// - when ready, returns a non-zero number of bytes permitted to write
     ///
     /// # Errors
     ///
-    /// Returns an [`StreamError`] if:
+    /// Returns an [OutputStreamError] if:
     /// - stream is closed
     /// - prior operation ([`write`](Self::write) or [`flush`](Self::flush)) failed
-    fn check_write(&mut self) -> StreamResult<usize>;
+    async fn write_ready(&mut self) -> Result<usize, OutputStreamError>;
 
     /// Repeatedly write a byte to a stream.
     /// Important: this write must be non-blocking!
-    /// Returning an Err which downcasts to a [`StreamError`] will be
+    /// Returning an Err which downcasts to a [`StreamRuntimeError`] will be
     /// reported to Wasm as the empty error result. Otherwise, errors will trap.
-    fn write_zeroes(&mut self, nelem: usize) -> StreamResult<()> {
+    fn write_zeroes(&mut self, nelem: usize) -> Result<(), OutputStreamError> {
         // TODO: We could optimize this to not allocate one big zeroed buffer, and instead write
         // repeatedly from a 'static buffer of zeros.
         let bs = Bytes::from_iter(core::iter::repeat(0 as u8).take(nelem));
         self.write(bs)?;
         Ok(())
     }
+}
 
-    /// Simultaneously waits for this stream to be writable and then returns how
-    /// much may be written or the last error that happened.
-    async fn write_ready(&mut self) -> StreamResult<usize> {
-        self.ready().await;
-        self.check_write()
-    }
+pub(crate) enum InternalInputStream {
+    Host(Box<dyn HostInputStream>),
+    File(FileInputStream),
 }
 
-#[async_trait::async_trait]
-impl Subscribe for Box<dyn HostOutputStream> {
-    async fn ready(&mut self) {
-        (**self).ready().await
+pub(crate) trait InternalTableStreamExt {
+    fn push_internal_input_stream(
+        &mut self,
+        istream: InternalInputStream,
+    ) -> Result<u32, TableError>;
+    fn push_internal_input_stream_child(
+        &mut self,
+        istream: InternalInputStream,
+        parent: u32,
+    ) -> Result<u32, TableError>;
+    fn get_internal_input_stream_mut(
+        &mut self,
+        fd: u32,
+    ) -> Result<&mut InternalInputStream, TableError>;
+    fn delete_internal_input_stream(&mut self, fd: u32) -> Result<InternalInputStream, TableError>;
+}
+impl InternalTableStreamExt for Table {
+    fn push_internal_input_stream(
+        &mut self,
+        istream: InternalInputStream,
+    ) -> Result<u32, TableError> {
+        self.push(Box::new(istream))
+    }
+    fn push_internal_input_stream_child(
+        &mut self,
+        istream: InternalInputStream,
+        parent: u32,
+    ) -> Result<u32, TableError> {
+        self.push_child(Box::new(istream), parent)
+    }
+    fn get_internal_input_stream_mut(
+        &mut self,
+        fd: u32,
+    ) -> Result<&mut InternalInputStream, TableError> {
+        self.get_mut(fd)
+    }
+    fn delete_internal_input_stream(&mut self, fd: u32) -> Result<InternalInputStream, TableError> {
+        self.delete(fd)
     }
 }
 
-pub enum InputStream {
-    Host(Box<dyn HostInputStream>),
-    File(FileInputStream),
-}
+/// Extension trait for managing [`HostInputStream`]s and [`HostOutputStream`]s in the [`Table`].
+pub trait TableStreamExt {
+    /// Push a [`HostInputStream`] into a [`Table`], returning the table index.
+    fn push_input_stream(&mut self, istream: Box<dyn HostInputStream>) -> Result<u32, TableError>;
+    /// Same as [`push_input_stream`](Self::push_output_stream) except assigns a parent resource to
+    /// the input-stream created.
+    fn push_input_stream_child(
+        &mut self,
+        istream: Box<dyn HostInputStream>,
+        parent: u32,
+    ) -> Result<u32, TableError>;
+    /// Get a mutable reference to a [`HostInputStream`] in a [`Table`].
+    fn get_input_stream_mut(&mut self, fd: u32) -> Result<&mut dyn HostInputStream, TableError>;
+    /// Remove [`HostInputStream`] from table:
+    fn delete_input_stream(&mut self, fd: u32) -> Result<Box<dyn HostInputStream>, TableError>;
 
-#[async_trait::async_trait]
-impl Subscribe for InputStream {
-    async fn ready(&mut self) {
-        match self {
-            InputStream::Host(stream) => stream.ready().await,
-            // Files are always ready
-            InputStream::File(_) => {}
+    /// Push a [`HostOutputStream`] into a [`Table`], returning the table index.
+    fn push_output_stream(&mut self, ostream: Box<dyn HostOutputStream>)
+        -> Result<u32, TableError>;
+    /// Same as [`push_output_stream`](Self::push_output_stream) except assigns a parent resource
+    /// to the output-stream created.
+    fn push_output_stream_child(
+        &mut self,
+        ostream: Box<dyn HostOutputStream>,
+        parent: u32,
+    ) -> Result<u32, TableError>;
+    /// Get a mutable reference to a [`HostOutputStream`] in a [`Table`].
+    fn get_output_stream_mut(&mut self, fd: u32) -> Result<&mut dyn HostOutputStream, TableError>;
+
+    /// Remove [`HostOutputStream`] from table:
+    fn delete_output_stream(&mut self, fd: u32) -> Result<Box<dyn HostOutputStream>, TableError>;
+}
+impl TableStreamExt for Table {
+    fn push_input_stream(&mut self, istream: Box<dyn HostInputStream>) -> Result<u32, TableError> {
+        self.push_internal_input_stream(InternalInputStream::Host(istream))
+    }
+    fn push_input_stream_child(
+        &mut self,
+        istream: Box<dyn HostInputStream>,
+        parent: u32,
+    ) -> Result<u32, TableError> {
+        self.push_internal_input_stream_child(InternalInputStream::Host(istream), parent)
+    }
+    fn get_input_stream_mut(&mut self, fd: u32) -> Result<&mut dyn HostInputStream, TableError> {
+        match self.get_internal_input_stream_mut(fd)? {
+            InternalInputStream::Host(ref mut h) => Ok(h.as_mut()),
+            _ => Err(TableError::WrongType),
         }
     }
+    fn delete_input_stream(&mut self, fd: u32) -> Result<Box<dyn HostInputStream>, TableError> {
+        let occ = self.entry(fd)?;
+        match occ.get().downcast_ref::<InternalInputStream>() {
+            Some(InternalInputStream::Host(_)) => {
+                let any = occ.remove_entry()?;
+                match *any.downcast().expect("downcast checked above") {
+                    InternalInputStream::Host(h) => Ok(h),
+                    _ => unreachable!("variant checked above"),
+                }
+            }
+            _ => Err(TableError::WrongType),
+        }
+    }
+
+    fn push_output_stream(
+        &mut self,
+        ostream: Box<dyn HostOutputStream>,
+    ) -> Result<u32, TableError> {
+        self.push(Box::new(ostream))
+    }
+    fn push_output_stream_child(
+        &mut self,
+        ostream: Box<dyn HostOutputStream>,
+        parent: u32,
+    ) -> Result<u32, TableError> {
+        self.push_child(Box::new(ostream), parent)
+    }
+    fn get_output_stream_mut(&mut self, fd: u32) -> Result<&mut dyn HostOutputStream, TableError> {
+        let boxed: &mut Box<dyn HostOutputStream> = self.get_mut(fd)?;
+        Ok(boxed.as_mut())
+    }
+    fn delete_output_stream(&mut self, fd: u32) -> Result<Box<dyn HostOutputStream>, TableError> {
+        self.delete(fd)
+    }
 }
 
-pub type OutputStream = Box<dyn HostOutputStream>;
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn input_stream_in_table() {
+        let dummy = crate::preview2::pipe::ClosedInputStream;
+        let mut table = Table::new();
+        // Put it into the table:
+        let ix = table.push_input_stream(Box::new(dummy)).unwrap();
+        // Get a mut ref to it:
+        let _ = table.get_input_stream_mut(ix).unwrap();
+        // Fails at wrong type:
+        assert!(matches!(
+            table.get_output_stream_mut(ix),
+            Err(TableError::WrongType)
+        ));
+        // Delete it:
+        let _ = table.delete_input_stream(ix).unwrap();
+        // Now absent from table:
+        assert!(matches!(
+            table.get_input_stream_mut(ix),
+            Err(TableError::NotPresent)
+        ));
+    }
+
+    #[test]
+    fn output_stream_in_table() {
+        let dummy = crate::preview2::pipe::SinkOutputStream;
+        let mut table = Table::new();
+        // Put it in the table:
+        let ix = table.push_output_stream(Box::new(dummy)).unwrap();
+        // Get a mut ref to it:
+        let _ = table.get_output_stream_mut(ix).unwrap();
+        // Fails at wrong type:
+        assert!(matches!(
+            table.get_input_stream_mut(ix),
+            Err(TableError::WrongType)
+        ));
+        // Delete it:
+        let _ = table.delete_output_stream(ix).unwrap();
+        // Now absent:
+        assert!(matches!(
+            table.get_output_stream_mut(ix),
+            Err(TableError::NotPresent)
+        ));
+    }
+}
diff --git a/crates/wasi/src/preview2/table.rs b/crates/wasi/src/preview2/table.rs
index 444e7b25f363..f4efd8005ed1 100644
--- a/crates/wasi/src/preview2/table.rs
+++ b/crates/wasi/src/preview2/table.rs
@@ -1,6 +1,5 @@
 use std::any::Any;
 use std::collections::{BTreeSet, HashMap};
-use wasmtime::component::Resource;
 
 #[derive(thiserror::Error, Debug)]
 pub enum TableError {
@@ -64,6 +63,32 @@ impl TableEntry {
     }
 }
 
+/// Like [`std::collections::hash_map::OccupiedEntry`], with a subset of
+/// methods available in order to uphold [`Table`] invariants.
+pub struct OccupiedEntry<'a> {
+    table: &'a mut Table,
+    index: u32,
+}
+impl<'a> OccupiedEntry<'a> {
+    /// Get the dynamically-typed reference to the resource.
+    pub fn get(&self) -> &(dyn Any + Send + Sync + 'static) {
+        self.table.map.get(&self.index).unwrap().entry.as_ref()
+    }
+    /// Get the dynamically-typed mutable reference to the resource.
+    pub fn get_mut(&mut self) -> &mut (dyn Any + Send + Sync + 'static) {
+        self.table.map.get_mut(&self.index).unwrap().entry.as_mut()
+    }
+    /// Remove the resource from the table, returning the contents of the
+    /// resource.
+    /// May fail with [`TableError::HasChildren`] if the entry has any
+    /// children, see [`Table::push_child`].
+    /// If this method fails, the [`OccupiedEntry`] is consumed, but the
+    /// resource remains in the table.
+    pub fn remove_entry(self) -> Result<Box<dyn Any + Send + Sync>, TableError> {
+        self.table.delete_entry(self.index).map(|e| e.entry)
+    }
+}
+
 impl Table {
     /// Create an empty table
     pub fn new() -> Self {
@@ -77,31 +102,9 @@ impl Table {
         }
     }
 
-    /// Inserts a new value `T` into this table, returning a corresponding
-    /// `Resource<T>` which can be used to refer to it after it was inserted.
-    pub fn push<T>(&mut self, entry: T) -> Result<Resource<T>, TableError>
-    where
-        T: Send + Sync + 'static,
-    {
-        let idx = self.push_(TableEntry::new(Box::new(entry), None))?;
-        Ok(Resource::new_own(idx))
-    }
-
-    fn push_(&mut self, e: TableEntry) -> Result<u32, TableError> {
-        // NOTE: The performance of this new key calculation could be very bad once keys wrap
-        // around.
-        if self.map.len() == u32::MAX as usize {
-            return Err(TableError::Full);
-        }
-        loop {
-            let key = self.next_key;
-            self.next_key = self.next_key.wrapping_add(1);
-            if self.map.contains_key(&key) {
-                continue;
-            }
-            self.map.insert(key, e);
-            return Ok(key);
-        }
+    /// Insert a resource at the next available index.
+    pub fn push(&mut self, entry: Box<dyn Any + Send + Sync>) -> Result<u32, TableError> {
+        self.push_(TableEntry::new(entry, None))
     }
 
     /// Insert a resource at the next available index, and track that it has a
@@ -109,7 +112,8 @@ impl Table {
     ///
     /// The parent must exist to create a child. All children resources must
     /// be destroyed before a parent can be destroyed - otherwise [`Table::delete`]
-    /// will fail with [`TableError::HasChildren`].
+    /// or [`OccupiedEntry::remove_entry`] will fail with
+    /// [`TableError::HasChildren`].
     ///
     /// Parent-child relationships are tracked inside the table to ensure that
     /// a parent resource is not deleted while it has live children. This
@@ -122,25 +126,12 @@ impl Table {
     /// Parent-child relationships may not be modified once created. There
     /// is no way to observe these relationships through the [`Table`] methods
     /// except for erroring on deletion, or the [`std::fmt::Debug`] impl.
-    pub fn push_child<T, U>(
-        &mut self,
-        entry: T,
-        parent: &Resource<U>,
-    ) -> Result<Resource<T>, TableError>
-    where
-        T: Send + Sync + 'static,
-        U: 'static,
-    {
-        let idx = self.push_child_(Box::new(entry), parent.rep())?;
-        Ok(Resource::new_own(idx))
-    }
-
-    fn push_child_(
+    pub fn push_child(
         &mut self,
         entry: Box<dyn Any + Send + Sync>,
         parent: u32,
     ) -> Result<u32, TableError> {
-        if !self.map.contains_key(&parent) {
+        if !self.contains_key(parent) {
             return Err(TableError::NotPresent);
         }
         let child = self.push_(TableEntry::new(entry, Some(parent)))?;
@@ -151,45 +142,72 @@ impl Table {
         Ok(child)
     }
 
-    /// Get an immutable reference to a resource of a given type at a given
-    /// index.
-    ///
-    /// Multiple shared references can be borrowed at any given time.
-    pub fn get<T: Any + Sized>(&self, key: &Resource<T>) -> Result<&T, TableError> {
-        self.get_(key.rep())?
-            .downcast_ref()
-            .ok_or(TableError::WrongType)
+    fn push_(&mut self, e: TableEntry) -> Result<u32, TableError> {
+        // NOTE: The performance of this new key calculation could be very bad once keys wrap
+        // around.
+        if self.map.len() == u32::MAX as usize {
+            return Err(TableError::Full);
+        }
+        loop {
+            let key = self.next_key;
+            self.next_key = self.next_key.wrapping_add(1);
+            if self.map.contains_key(&key) {
+                continue;
+            }
+            self.map.insert(key, e);
+            return Ok(key);
+        }
     }
 
-    fn get_(&self, key: u32) -> Result<&dyn Any, TableError> {
-        let r = self.map.get(&key).ok_or(TableError::NotPresent)?;
-        Ok(&*r.entry)
+    /// Check if the table has a resource at the given index.
+    pub fn contains_key(&self, key: u32) -> bool {
+        self.map.contains_key(&key)
     }
 
-    /// Get an mutable reference to a resource of a given type at a given
-    /// index.
-    pub fn get_mut<T: Any + Sized>(&mut self, key: &Resource<T>) -> Result<&mut T, TableError> {
-        self.get_any_mut(key.rep())?
-            .downcast_mut()
-            .ok_or(TableError::WrongType)
+    /// Check if the resource at a given index can be downcast to a given type.
+    /// Note: this will always fail if the resource is already borrowed.
+    pub fn is<T: Any + Sized>(&self, key: u32) -> bool {
+        if let Some(r) = self.map.get(&key) {
+            r.entry.is::<T>()
+        } else {
+            false
+        }
     }
 
-    /// Returns the raw `Any` at the `key` index provided.
-    pub fn get_any_mut(&mut self, key: u32) -> Result<&mut dyn Any, TableError> {
-        let r = self.map.get_mut(&key).ok_or(TableError::NotPresent)?;
-        Ok(&mut *r.entry)
+    /// Get an immutable reference to a resource of a given type at a given index. Multiple
+    /// immutable references can be borrowed at any given time. Borrow failure
+    /// results in a trapping error.
+    pub fn get<T: Any + Sized>(&self, key: u32) -> Result<&T, TableError> {
+        if let Some(r) = self.map.get(&key) {
+            r.entry
+                .downcast_ref::<T>()
+                .ok_or_else(|| TableError::WrongType)
+        } else {
+            Err(TableError::NotPresent)
+        }
     }
 
-    /// Same as `delete`, but typed
-    pub fn delete<T>(&mut self, resource: Resource<T>) -> Result<T, TableError>
-    where
-        T: Any,
-    {
-        debug_assert!(resource.owned());
-        let entry = self.delete_entry(resource.rep())?;
-        match entry.entry.downcast() {
-            Ok(t) => Ok(*t),
-            Err(_e) => Err(TableError::WrongType),
+    /// Get a mutable reference to a resource of a given type at a given index. Only one mutable
+    /// reference can be borrowed at any given time. Borrow failure results in a trapping error.
+    pub fn get_mut<T: Any + Sized>(&mut self, key: u32) -> Result<&mut T, TableError> {
+        if let Some(r) = self.map.get_mut(&key) {
+            r.entry
+                .downcast_mut::<T>()
+                .ok_or_else(|| TableError::WrongType)
+        } else {
+            Err(TableError::NotPresent)
+        }
+    }
+
+    /// Get an [`OccupiedEntry`] corresponding to a table entry, if it exists. This allows you to
+    /// remove or replace the entry based on its contents. The methods available are a subset of
+    /// [`std::collections::hash_map::OccupiedEntry`] - it does not give access to the key, it
+    /// restricts replacing the entry to items of the same type, and it does not allow for deletion.
+    pub fn entry(&mut self, index: u32) -> Result<OccupiedEntry, TableError> {
+        if self.map.contains_key(&index) {
+            Ok(OccupiedEntry { table: self, index })
+        } else {
+            Err(TableError::NotPresent)
         }
     }
 
@@ -216,6 +234,38 @@ impl Table {
         Ok(e)
     }
 
+    /// Remove a resource at a given index from the table.
+    ///
+    /// If this method fails, the resource remains in the table.
+    ///
+    /// May fail with [`TableError::HasChildren`] if the resource has any live
+    /// children.
+    pub fn delete<T: Any + Sized>(&mut self, key: u32) -> Result<T, TableError> {
+        let e = self.delete_entry(key)?;
+        match e.entry.downcast::<T>() {
+            Ok(v) => Ok(*v),
+            Err(entry) => {
+                // Re-insert into parent list
+                if let Some(parent) = e.parent {
+                    self.map
+                        .get_mut(&parent)
+                        .expect("already checked parent exists")
+                        .add_child(key);
+                }
+                // Insert the value back
+                self.map.insert(
+                    key,
+                    TableEntry {
+                        entry,
+                        children: e.children,
+                        parent: e.parent,
+                    },
+                );
+                Err(TableError::WrongType)
+            }
+        }
+    }
+
     /// Zip the values of the map with mutable references to table entries corresponding to each
     /// key. As the keys in the [HashMap] are unique, this iterator can give mutable references
     /// with the same lifetime as the mutable reference to the [Table].
@@ -234,21 +284,6 @@ impl Table {
             (item, v)
         })
     }
-
-    /// Iterate over all children belonging to the provided parent
-    pub fn iter_children<T>(
-        &self,
-        parent: &Resource<T>,
-    ) -> Result<impl Iterator<Item = &(dyn Any + Send + Sync)>, TableError>
-    where
-        T: 'static,
-    {
-        let parent_entry = self.map.get(&parent.rep()).ok_or(TableError::NotPresent)?;
-        Ok(parent_entry.children.iter().map(|child_index| {
-            let child = self.map.get(child_index).expect("missing child");
-            child.entry.as_ref()
-        }))
-    }
 }
 
 impl Default for Table {
diff --git a/crates/wasi/src/preview2/tcp.rs b/crates/wasi/src/preview2/tcp.rs
index dd782c4c66ce..9721e2c3c37a 100644
--- a/crates/wasi/src/preview2/tcp.rs
+++ b/crates/wasi/src/preview2/tcp.rs
@@ -1,22 +1,18 @@
-use super::{HostInputStream, HostOutputStream, StreamError};
+use super::{HostInputStream, HostOutputStream, OutputStreamError};
 use crate::preview2::{
-    with_ambient_tokio_runtime, AbortOnDropJoinHandle, InputStream, OutputStream, Subscribe,
+    with_ambient_tokio_runtime, AbortOnDropJoinHandle, StreamState, Table, TableError,
 };
-use anyhow::{Error, Result};
 use cap_net_ext::{AddressFamily, Blocking, TcpListenerExt};
 use cap_std::net::TcpListener;
 use io_lifetimes::raw::{FromRawSocketlike, IntoRawSocketlike};
-use rustix::net::sockopt;
 use std::io;
-use std::mem;
 use std::sync::Arc;
-use tokio::io::Interest;
 
 /// The state of a TCP socket.
 ///
 /// This represents the various states a socket can be in during the
 /// activities of binding, listening, accepting, and connecting.
-pub(crate) enum TcpState {
+pub(crate) enum HostTcpState {
     /// The initial state for a newly-created socket.
     Default,
 
@@ -39,9 +35,6 @@ pub(crate) enum TcpState {
     /// An outgoing connection is ready to be established.
     ConnectReady,
 
-    /// An outgoing connection was attempted but failed.
-    ConnectFailed,
-
     /// An outgoing connection has been established.
     Connected,
 }
@@ -50,34 +43,13 @@ pub(crate) enum TcpState {
 ///
 /// The inner state is wrapped in an Arc because the same underlying socket is
 /// used for implementing the stream types.
-pub struct TcpSocket {
-    /// The part of a `TcpSocket` which is reference-counted so that we
+pub(crate) struct HostTcpSocket {
+    /// The part of a `HostTcpSocket` which is reference-counted so that we
     /// can pass it to async tasks.
     pub(crate) inner: Arc<tokio::net::TcpStream>,
 
     /// The current state in the bind/listen/accept/connect progression.
-    pub(crate) tcp_state: TcpState,
-
-    /// The desired listen queue size. Set to None to use the system's default.
-    pub(crate) listen_backlog_size: Option<i32>,
-
-    pub(crate) family: SocketAddressFamily,
-
-    /// The manually configured buffer size. `None` means: no preference, use system default.
-    #[cfg(target_os = "macos")]
-    pub(crate) receive_buffer_size: Option<usize>,
-    /// The manually configured buffer size. `None` means: no preference, use system default.
-    #[cfg(target_os = "macos")]
-    pub(crate) send_buffer_size: Option<usize>,
-    /// The manually configured TTL. `None` means: no preference, use system default.
-    #[cfg(target_os = "macos")]
-    pub(crate) hop_limit: Option<u8>,
-}
-
-#[derive(Copy, Clone)]
-pub(crate) enum SocketAddressFamily {
-    Ipv4,
-    Ipv6 { v6only: bool },
+    pub(crate) tcp_state: HostTcpState,
 }
 
 pub(crate) struct TcpReadStream {
@@ -92,16 +64,20 @@ impl TcpReadStream {
             closed: false,
         }
     }
+    fn stream_state(&self) -> StreamState {
+        if self.closed {
+            StreamState::Closed
+        } else {
+            StreamState::Open
+        }
+    }
 }
 
 #[async_trait::async_trait]
 impl HostInputStream for TcpReadStream {
-    fn read(&mut self, size: usize) -> Result<bytes::Bytes, StreamError> {
-        if self.closed {
-            return Err(StreamError::Closed);
-        }
-        if size == 0 {
-            return Ok(bytes::Bytes::new());
+    fn read(&mut self, size: usize) -> Result<(bytes::Bytes, StreamState), anyhow::Error> {
+        if size == 0 || self.closed {
+            return Ok((bytes::Bytes::new(), self.stream_state()));
         }
 
         let mut buf = bytes::BytesMut::with_capacity(size);
@@ -118,23 +94,22 @@ impl HostInputStream for TcpReadStream {
             Err(e) if e.kind() == std::io::ErrorKind::WouldBlock => 0,
 
             Err(e) => {
+                tracing::debug!("unexpected error on TcpReadStream read: {e:?}");
                 self.closed = true;
-                return Err(StreamError::LastOperationFailed(e.into()));
+                0
             }
         };
 
         buf.truncate(n);
-        Ok(buf.freeze())
+        Ok((buf.freeze(), self.stream_state()))
     }
-}
 
-#[async_trait::async_trait]
-impl Subscribe for TcpReadStream {
-    async fn ready(&mut self) {
+    async fn ready(&mut self) -> Result<(), anyhow::Error> {
         if self.closed {
-            return;
+            return Ok(());
         }
-        self.stream.readable().await.unwrap();
+        self.stream.readable().await?;
+        Ok(())
     }
 }
 
@@ -142,60 +117,53 @@ const SOCKET_READY_SIZE: usize = 1024 * 1024 * 1024;
 
 pub(crate) struct TcpWriteStream {
     stream: Arc<tokio::net::TcpStream>,
-    last_write: LastWrite,
-}
-
-enum LastWrite {
-    Waiting(AbortOnDropJoinHandle<Result<()>>),
-    Error(Error),
-    Done,
+    write_handle: Option<AbortOnDropJoinHandle<anyhow::Result<()>>>,
 }
 
 impl TcpWriteStream {
     pub(crate) fn new(stream: Arc<tokio::net::TcpStream>) -> Self {
         Self {
             stream,
-            last_write: LastWrite::Done,
+            write_handle: None,
         }
     }
 
     /// Write `bytes` in a background task, remembering the task handle for use in a future call to
     /// `write_ready`
     fn background_write(&mut self, mut bytes: bytes::Bytes) {
-        assert!(matches!(self.last_write, LastWrite::Done));
+        assert!(self.write_handle.is_none());
 
         let stream = self.stream.clone();
-        self.last_write = LastWrite::Waiting(crate::preview2::spawn(async move {
-            // Note: we are not using the AsyncWrite impl here, and instead using the TcpStream
-            // primitive try_write, which goes directly to attempt a write with mio. This has
-            // two advantages: 1. this operation takes a &TcpStream instead of a &mut TcpStream
-            // required to AsyncWrite, and 2. it eliminates any buffering in tokio we may need
-            // to flush.
-            while !bytes.is_empty() {
-                stream.writable().await?;
-                match stream.try_write(&bytes) {
-                    Ok(n) => {
-                        let _ = bytes.split_to(n);
+        self.write_handle
+            .replace(crate::preview2::spawn(async move {
+                // Note: we are not using the AsyncWrite impl here, and instead using the TcpStream
+                // primitive try_write, which goes directly to attempt a write with mio. This has
+                // two advantages: 1. this operation takes a &TcpStream instead of a &mut TcpStream
+                // required to AsyncWrite, and 2. it eliminates any buffering in tokio we may need
+                // to flush.
+                while !bytes.is_empty() {
+                    stream.writable().await?;
+                    match stream.try_write(&bytes) {
+                        Ok(n) => {
+                            let _ = bytes.split_to(n);
+                        }
+                        Err(e) if e.kind() == std::io::ErrorKind::WouldBlock => continue,
+                        Err(e) => return Err(e.into()),
                     }
-                    Err(e) if e.kind() == std::io::ErrorKind::WouldBlock => continue,
-                    Err(e) => return Err(e.into()),
                 }
-            }
 
-            Ok(())
-        }));
+                Ok(())
+            }));
     }
 }
 
+#[async_trait::async_trait]
 impl HostOutputStream for TcpWriteStream {
-    fn write(&mut self, mut bytes: bytes::Bytes) -> Result<(), StreamError> {
-        match self.last_write {
-            LastWrite::Done => {}
-            LastWrite::Waiting(_) | LastWrite::Error(_) => {
-                return Err(StreamError::Trap(anyhow::anyhow!(
-                    "unpermitted: must call check_write first"
-                )));
-            }
+    fn write(&mut self, mut bytes: bytes::Bytes) -> Result<(), OutputStreamError> {
+        if self.write_handle.is_some() {
+            return Err(OutputStreamError::Trap(anyhow::anyhow!(
+                "unpermitted: cannot write while background write ongoing"
+            )));
         }
         while !bytes.is_empty() {
             match self.stream.try_write(&bytes) {
@@ -211,101 +179,65 @@ impl HostOutputStream for TcpWriteStream {
                     return Ok(());
                 }
 
-                Err(e) => return Err(StreamError::LastOperationFailed(e.into())),
+                Err(e) => return Err(OutputStreamError::LastOperationFailed(e.into())),
             }
         }
 
         Ok(())
     }
 
-    fn flush(&mut self) -> Result<(), StreamError> {
+    fn flush(&mut self) -> Result<(), OutputStreamError> {
         // `flush` is a no-op here, as we're not managing any internal buffer. Additionally,
         // `write_ready` will join the background write task if it's active, so following `flush`
         // with `write_ready` will have the desired effect.
         Ok(())
     }
 
-    fn check_write(&mut self) -> Result<usize, StreamError> {
-        match mem::replace(&mut self.last_write, LastWrite::Done) {
-            LastWrite::Waiting(task) => {
-                self.last_write = LastWrite::Waiting(task);
-                return Ok(0);
-            }
-            LastWrite::Done => {}
-            LastWrite::Error(e) => return Err(StreamError::LastOperationFailed(e.into())),
-        }
+    async fn write_ready(&mut self) -> Result<usize, OutputStreamError> {
+        if let Some(handle) = &mut self.write_handle {
+            handle
+                .await
+                .map_err(|e| OutputStreamError::LastOperationFailed(e.into()))?;
 
-        let writable = self.stream.writable();
-        futures::pin_mut!(writable);
-        if super::poll_noop(writable).is_none() {
-            return Ok(0);
+            // Only clear out the write handle once the task has exited, to ensure that
+            // `write_ready` remains cancel-safe.
+            self.write_handle = None;
         }
-        Ok(SOCKET_READY_SIZE)
-    }
-}
 
-#[async_trait::async_trait]
-impl Subscribe for TcpWriteStream {
-    async fn ready(&mut self) {
-        if let LastWrite::Waiting(task) = &mut self.last_write {
-            self.last_write = match task.await {
-                Ok(()) => LastWrite::Done,
-                Err(e) => LastWrite::Error(e),
-            };
-        }
-        if let LastWrite::Done = self.last_write {
-            self.stream.writable().await.unwrap();
-        }
+        self.stream
+            .writable()
+            .await
+            .map_err(|e| OutputStreamError::LastOperationFailed(e.into()))?;
+
+        Ok(SOCKET_READY_SIZE)
     }
 }
 
-impl TcpSocket {
+impl HostTcpSocket {
     /// Create a new socket in the given family.
     pub fn new(family: AddressFamily) -> io::Result<Self> {
         // Create a new host socket and set it to non-blocking, which is needed
         // by our async implementation.
         let tcp_listener = TcpListener::new(family, Blocking::No)?;
-
-        let socket_address_family = match family {
-            AddressFamily::Ipv4 => SocketAddressFamily::Ipv4,
-            AddressFamily::Ipv6 => SocketAddressFamily::Ipv6 {
-                v6only: sockopt::get_ipv6_v6only(&tcp_listener)?,
-            },
-        };
-
-        Self::from_tcp_listener(tcp_listener, socket_address_family)
+        Self::from_tcp_listener(tcp_listener)
     }
 
-    /// Create a `TcpSocket` from an existing socket.
+    /// Create a `HostTcpSocket` from an existing socket.
     ///
     /// The socket must be in non-blocking mode.
-    pub(crate) fn from_tcp_stream(
-        tcp_socket: cap_std::net::TcpStream,
-        family: SocketAddressFamily,
-    ) -> io::Result<Self> {
+    pub fn from_tcp_stream(tcp_socket: cap_std::net::TcpStream) -> io::Result<Self> {
         let tcp_listener = TcpListener::from(rustix::fd::OwnedFd::from(tcp_socket));
-        Self::from_tcp_listener(tcp_listener, family)
+        Self::from_tcp_listener(tcp_listener)
     }
 
-    pub(crate) fn from_tcp_listener(
-        tcp_listener: cap_std::net::TcpListener,
-        family: SocketAddressFamily,
-    ) -> io::Result<Self> {
+    pub fn from_tcp_listener(tcp_listener: cap_std::net::TcpListener) -> io::Result<Self> {
         let fd = tcp_listener.into_raw_socketlike();
         let std_stream = unsafe { std::net::TcpStream::from_raw_socketlike(fd) };
         let stream = with_ambient_tokio_runtime(|| tokio::net::TcpStream::try_from(std_stream))?;
 
         Ok(Self {
             inner: Arc::new(stream),
-            tcp_state: TcpState::Default,
-            listen_backlog_size: None,
-            family,
-            #[cfg(target_os = "macos")]
-            receive_buffer_size: None,
-            #[cfg(target_os = "macos")]
-            send_buffer_size: None,
-            #[cfg(target_os = "macos")]
-            hop_limit: None,
+            tcp_state: HostTcpState::Default,
         })
     }
 
@@ -314,26 +246,35 @@ impl TcpSocket {
     }
 
     /// Create the input/output stream pair for a tcp socket.
-    pub fn as_split(&self) -> (InputStream, OutputStream) {
+    pub fn as_split(&self) -> (Box<impl HostInputStream>, Box<impl HostOutputStream>) {
         let input = Box::new(TcpReadStream::new(self.inner.clone()));
         let output = Box::new(TcpWriteStream::new(self.inner.clone()));
-        (InputStream::Host(input), output)
+        (input, output)
     }
 }
 
-#[async_trait::async_trait]
-impl Subscribe for TcpSocket {
-    async fn ready(&mut self) {
-        // Some states are ready immediately.
-        match self.tcp_state {
-            TcpState::BindStarted | TcpState::ListenStarted | TcpState::ConnectReady => return,
-            _ => {}
-        }
+pub(crate) trait TableTcpSocketExt {
+    fn push_tcp_socket(&mut self, tcp_socket: HostTcpSocket) -> Result<u32, TableError>;
+    fn delete_tcp_socket(&mut self, fd: u32) -> Result<HostTcpSocket, TableError>;
+    fn is_tcp_socket(&self, fd: u32) -> bool;
+    fn get_tcp_socket(&self, fd: u32) -> Result<&HostTcpSocket, TableError>;
+    fn get_tcp_socket_mut(&mut self, fd: u32) -> Result<&mut HostTcpSocket, TableError>;
+}
 
-        // FIXME: Add `Interest::ERROR` when we update to tokio 1.32.
-        self.inner
-            .ready(Interest::READABLE | Interest::WRITABLE)
-            .await
-            .unwrap();
+impl TableTcpSocketExt for Table {
+    fn push_tcp_socket(&mut self, tcp_socket: HostTcpSocket) -> Result<u32, TableError> {
+        self.push(Box::new(tcp_socket))
+    }
+    fn delete_tcp_socket(&mut self, fd: u32) -> Result<HostTcpSocket, TableError> {
+        self.delete(fd)
+    }
+    fn is_tcp_socket(&self, fd: u32) -> bool {
+        self.is::<HostTcpSocket>(fd)
+    }
+    fn get_tcp_socket(&self, fd: u32) -> Result<&HostTcpSocket, TableError> {
+        self.get(fd)
+    }
+    fn get_tcp_socket_mut(&mut self, fd: u32) -> Result<&mut HostTcpSocket, TableError> {
+        self.get_mut(fd)
     }
 }
diff --git a/crates/wasi/src/preview2/udp.rs b/crates/wasi/src/preview2/udp.rs
deleted file mode 100644
index 504dba0b17f5..000000000000
--- a/crates/wasi/src/preview2/udp.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-use crate::preview2::poll::Subscribe;
-use crate::preview2::with_ambient_tokio_runtime;
-use async_trait::async_trait;
-use cap_net_ext::{AddressFamily, Blocking, UdpSocketExt};
-use io_lifetimes::raw::{FromRawSocketlike, IntoRawSocketlike};
-use std::io;
-use std::net::SocketAddr;
-use std::sync::Arc;
-
-/// The state of a UDP socket.
-///
-/// This represents the various states a socket can be in during the
-/// activities of binding, and connecting.
-pub(crate) enum UdpState {
-    /// The initial state for a newly-created socket.
-    Default,
-
-    /// Binding started via `start_bind`.
-    BindStarted,
-
-    /// Binding finished via `finish_bind`. The socket has an address but
-    /// is not yet listening for connections.
-    Bound,
-
-    /// The socket is "connected" to a peer address.
-    Connected,
-}
-
-/// A host UDP socket, plus associated bookkeeping.
-///
-/// The inner state is wrapped in an Arc because the same underlying socket is
-/// used for implementing the stream types.
-pub struct UdpSocket {
-    /// The part of a `UdpSocket` which is reference-counted so that we
-    /// can pass it to async tasks.
-    pub(crate) inner: Arc<tokio::net::UdpSocket>,
-
-    /// The current state in the bind/connect progression.
-    pub(crate) udp_state: UdpState,
-
-    /// Socket address family.
-    pub(crate) family: AddressFamily,
-}
-
-#[async_trait]
-impl Subscribe for UdpSocket {
-    async fn ready(&mut self) {
-        // None of the socket-level operations block natively
-    }
-}
-
-impl UdpSocket {
-    /// Create a new socket in the given family.
-    pub fn new(family: AddressFamily) -> io::Result<Self> {
-        Ok(UdpSocket {
-            inner: Arc::new(Self::new_tokio_socket(family)?),
-            udp_state: UdpState::Default,
-            family,
-        })
-    }
-
-    fn new_tokio_socket(family: AddressFamily) -> io::Result<tokio::net::UdpSocket> {
-        // Create a new host socket and set it to non-blocking, which is needed
-        // by our async implementation.
-        let cap_std_socket = cap_std::net::UdpSocket::new(family, Blocking::No)?;
-        let fd = cap_std_socket.into_raw_socketlike();
-        let std_socket = unsafe { std::net::UdpSocket::from_raw_socketlike(fd) };
-        let tokio_socket =
-            with_ambient_tokio_runtime(|| tokio::net::UdpSocket::try_from(std_socket))?;
-
-        Ok(tokio_socket)
-    }
-
-    pub fn udp_socket(&self) -> &tokio::net::UdpSocket {
-        &self.inner
-    }
-}
-
-pub struct IncomingDatagramStream {
-    pub(crate) inner: Arc<tokio::net::UdpSocket>,
-
-    /// If this has a value, the stream is "connected".
-    pub(crate) remote_address: Option<SocketAddr>,
-}
-
-pub struct OutgoingDatagramStream {
-    pub(crate) inner: Arc<tokio::net::UdpSocket>,
-
-    /// If this has a value, the stream is "connected".
-    pub(crate) remote_address: Option<SocketAddr>,
-
-    pub(crate) send_state: SendState,
-}
-
-pub(crate) enum SendState {
-    /// Waiting for the API consumer to call `check-send`.
-    Idle,
-
-    /// Ready to send up to x datagrams.
-    Permitted(usize),
-
-    /// Waiting for the OS.
-    Waiting,
-}
diff --git a/crates/wasi/src/preview2/write_stream.rs b/crates/wasi/src/preview2/write_stream.rs
deleted file mode 100644
index afc2305f007a..000000000000
--- a/crates/wasi/src/preview2/write_stream.rs
+++ /dev/null
@@ -1,203 +0,0 @@
-use crate::preview2::{HostOutputStream, StreamError, Subscribe};
-use anyhow::anyhow;
-use bytes::Bytes;
-use std::sync::{Arc, Mutex};
-
-#[derive(Debug)]
-struct WorkerState {
-    alive: bool,
-    items: std::collections::VecDeque<Bytes>,
-    write_budget: usize,
-    flush_pending: bool,
-    error: Option<anyhow::Error>,
-}
-
-impl WorkerState {
-    fn check_error(&mut self) -> Result<(), StreamError> {
-        if let Some(e) = self.error.take() {
-            return Err(StreamError::LastOperationFailed(e));
-        }
-        if !self.alive {
-            return Err(StreamError::Closed);
-        }
-        Ok(())
-    }
-}
-
-struct Worker {
-    state: Mutex<WorkerState>,
-    new_work: tokio::sync::Notify,
-    write_ready_changed: tokio::sync::Notify,
-}
-
-enum Job {
-    Flush,
-    Write(Bytes),
-}
-
-impl Worker {
-    fn new(write_budget: usize) -> Self {
-        Self {
-            state: Mutex::new(WorkerState {
-                alive: true,
-                items: std::collections::VecDeque::new(),
-                write_budget,
-                flush_pending: false,
-                error: None,
-            }),
-            new_work: tokio::sync::Notify::new(),
-            write_ready_changed: tokio::sync::Notify::new(),
-        }
-    }
-    async fn ready(&self) {
-        loop {
-            {
-                let state = self.state();
-                if state.error.is_some()
-                    || !state.alive
-                    || (!state.flush_pending && state.write_budget > 0)
-                {
-                    return;
-                }
-            }
-            self.write_ready_changed.notified().await;
-        }
-    }
-    fn check_write(&self) -> Result<usize, StreamError> {
-        let mut state = self.state();
-        if let Err(e) = state.check_error() {
-            return Err(e);
-        }
-
-        if state.flush_pending || state.write_budget == 0 {
-            return Ok(0);
-        }
-
-        Ok(state.write_budget)
-    }
-    fn state(&self) -> std::sync::MutexGuard<WorkerState> {
-        self.state.lock().unwrap()
-    }
-    fn pop(&self) -> Option<Job> {
-        let mut state = self.state();
-        if state.items.is_empty() {
-            if state.flush_pending {
-                return Some(Job::Flush);
-            }
-        } else if let Some(bytes) = state.items.pop_front() {
-            return Some(Job::Write(bytes));
-        }
-
-        None
-    }
-    fn report_error(&self, e: std::io::Error) {
-        {
-            let mut state = self.state();
-            state.alive = false;
-            state.error = Some(e.into());
-            state.flush_pending = false;
-        }
-        self.write_ready_changed.notify_one();
-    }
-    async fn work<T: tokio::io::AsyncWrite + Send + Sync + Unpin + 'static>(&self, mut writer: T) {
-        use tokio::io::AsyncWriteExt;
-        loop {
-            while let Some(job) = self.pop() {
-                match job {
-                    Job::Flush => {
-                        if let Err(e) = writer.flush().await {
-                            self.report_error(e);
-                            return;
-                        }
-
-                        tracing::debug!("worker marking flush complete");
-                        self.state().flush_pending = false;
-                    }
-
-                    Job::Write(mut bytes) => {
-                        tracing::debug!("worker writing: {bytes:?}");
-                        let len = bytes.len();
-                        match writer.write_all_buf(&mut bytes).await {
-                            Err(e) => {
-                                self.report_error(e);
-                                return;
-                            }
-                            Ok(_) => {
-                                self.state().write_budget += len;
-                            }
-                        }
-                    }
-                }
-
-                self.write_ready_changed.notify_one();
-            }
-            self.new_work.notified().await;
-        }
-    }
-}
-
-/// Provides a [`HostOutputStream`] impl from a [`tokio::io::AsyncWrite`] impl
-pub struct AsyncWriteStream {
-    worker: Arc<Worker>,
-    _join_handle: crate::preview2::AbortOnDropJoinHandle<()>,
-}
-
-impl AsyncWriteStream {
-    /// Create a [`AsyncWriteStream`]. In order to use the [`HostOutputStream`] impl
-    /// provided by this struct, the argument must impl [`tokio::io::AsyncWrite`].
-    pub fn new<T: tokio::io::AsyncWrite + Send + Sync + Unpin + 'static>(
-        write_budget: usize,
-        writer: T,
-    ) -> Self {
-        let worker = Arc::new(Worker::new(write_budget));
-
-        let w = Arc::clone(&worker);
-        let join_handle = crate::preview2::spawn(async move { w.work(writer).await });
-
-        AsyncWriteStream {
-            worker,
-            _join_handle: join_handle,
-        }
-    }
-}
-
-impl HostOutputStream for AsyncWriteStream {
-    fn write(&mut self, bytes: Bytes) -> Result<(), StreamError> {
-        let mut state = self.worker.state();
-        state.check_error()?;
-        if state.flush_pending {
-            return Err(StreamError::Trap(anyhow!(
-                "write not permitted while flush pending"
-            )));
-        }
-        match state.write_budget.checked_sub(bytes.len()) {
-            Some(remaining_budget) => {
-                state.write_budget = remaining_budget;
-                state.items.push_back(bytes);
-            }
-            None => return Err(StreamError::Trap(anyhow!("write exceeded budget"))),
-        }
-        drop(state);
-        self.worker.new_work.notify_one();
-        Ok(())
-    }
-    fn flush(&mut self) -> Result<(), StreamError> {
-        let mut state = self.worker.state();
-        state.check_error()?;
-
-        state.flush_pending = true;
-        self.worker.new_work.notify_one();
-
-        Ok(())
-    }
-
-    fn check_write(&mut self) -> Result<usize, StreamError> {
-        self.worker.check_write()
-    }
-}
-#[async_trait::async_trait]
-impl Subscribe for AsyncWriteStream {
-    async fn ready(&mut self) {
-        self.worker.ready().await;
-    }
-}
diff --git a/crates/wasi/tests/all/api.rs b/crates/wasi/tests/all/api.rs
deleted file mode 100644
index 4abf8a11923c..000000000000
--- a/crates/wasi/tests/all/api.rs
+++ /dev/null
@@ -1,218 +0,0 @@
-use anyhow::Result;
-use cap_std::ambient_authority;
-use cap_std::fs::Dir;
-use std::io::Write;
-use std::sync::Mutex;
-use std::time::Duration;
-use wasmtime::component::{Component, Linker};
-use wasmtime::{Config, Engine, Store};
-use wasmtime_wasi::preview2::bindings::wasi::clocks::wall_clock;
-use wasmtime_wasi::preview2::bindings::wasi::filesystem::types as filesystem;
-use wasmtime_wasi::preview2::command::{add_to_linker, Command};
-use wasmtime_wasi::preview2::{
-    self, DirPerms, FilePerms, HostMonotonicClock, HostWallClock, Table, WasiCtx, WasiCtxBuilder,
-    WasiView,
-};
-
-struct CommandCtx {
-    table: Table,
-    wasi: WasiCtx,
-}
-
-impl WasiView for CommandCtx {
-    fn table(&self) -> &Table {
-        &self.table
-    }
-    fn table_mut(&mut self) -> &mut Table {
-        &mut self.table
-    }
-    fn ctx(&self) -> &WasiCtx {
-        &self.wasi
-    }
-    fn ctx_mut(&mut self) -> &mut WasiCtx {
-        &mut self.wasi
-    }
-}
-
-use test_programs_artifacts::*;
-
-foreach_api!(assert_test_exists);
-
-async fn instantiate(path: &str, ctx: CommandCtx) -> Result<(Store<CommandCtx>, Command)> {
-    let mut config = Config::new();
-    config.async_support(true).wasm_component_model(true);
-    let engine = Engine::new(&config)?;
-    let mut linker = Linker::new(&engine);
-    add_to_linker(&mut linker)?;
-
-    let mut store = Store::new(&engine, ctx);
-    let component = Component::from_file(&engine, path)?;
-    let (command, _instance) = Command::instantiate_async(&mut store, &component, &linker).await?;
-    Ok((store, command))
-}
-
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn api_time() -> Result<()> {
-    struct FakeWallClock;
-
-    impl HostWallClock for FakeWallClock {
-        fn resolution(&self) -> Duration {
-            Duration::from_secs(1)
-        }
-
-        fn now(&self) -> Duration {
-            Duration::new(1431648000, 100)
-        }
-    }
-
-    struct FakeMonotonicClock {
-        now: Mutex<u64>,
-    }
-
-    impl HostMonotonicClock for FakeMonotonicClock {
-        fn resolution(&self) -> u64 {
-            1_000_000_000
-        }
-
-        fn now(&self) -> u64 {
-            let mut now = self.now.lock().unwrap();
-            let then = *now;
-            *now += 42 * 1_000_000_000;
-            then
-        }
-    }
-
-    let table = Table::new();
-    let wasi = WasiCtxBuilder::new()
-        .monotonic_clock(FakeMonotonicClock { now: Mutex::new(0) })
-        .wall_clock(FakeWallClock)
-        .build();
-
-    let (mut store, command) = instantiate(API_TIME_COMPONENT, CommandCtx { table, wasi }).await?;
-
-    command
-        .wasi_cli_run()
-        .call_run(&mut store)
-        .await?
-        .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
-}
-
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn api_read_only() -> Result<()> {
-    let dir = tempfile::tempdir()?;
-
-    std::fs::File::create(dir.path().join("bar.txt"))?.write_all(b"And stood awhile in thought")?;
-    std::fs::create_dir(dir.path().join("sub"))?;
-
-    let table = Table::new();
-    let open_dir = Dir::open_ambient_dir(dir.path(), ambient_authority())?;
-    let wasi = WasiCtxBuilder::new()
-        .preopened_dir(open_dir, DirPerms::READ, FilePerms::READ, "/")
-        .build();
-
-    let (mut store, command) =
-        instantiate(API_READ_ONLY_COMPONENT, CommandCtx { table, wasi }).await?;
-
-    command
-        .wasi_cli_run()
-        .call_run(&mut store)
-        .await?
-        .map_err(|()| anyhow::anyhow!("command returned with failing exit status"))
-}
-
-// This is tested in the wasi-http crate, but need to satisfy the `foreach_api!`
-// macro above.
-#[allow(dead_code)]
-fn api_proxy() {}
-
-// This is tested in the wasi-http crate, but need to satisfy the `foreach_api!`
-// macro above.
-#[allow(dead_code)]
-fn api_proxy_streaming() {}
-
-wasmtime::component::bindgen!({
-    world: "test-reactor",
-    async: true,
-    with: {
-       "wasi:io/streams": preview2::bindings::io::streams,
-       "wasi:filesystem/types": preview2::bindings::filesystem::types,
-       "wasi:filesystem/preopens": preview2::bindings::filesystem::preopens,
-       "wasi:cli/environment": preview2::bindings::cli::environment,
-       "wasi:cli/exit": preview2::bindings::cli::exit,
-       "wasi:cli/stdin": preview2::bindings::cli::stdin,
-       "wasi:cli/stdout": preview2::bindings::cli::stdout,
-       "wasi:cli/stderr": preview2::bindings::cli::stderr,
-       "wasi:cli/terminal_input": preview2::bindings::cli::terminal_input,
-       "wasi:cli/terminal_output": preview2::bindings::cli::terminal_output,
-       "wasi:cli/terminal_stdin": preview2::bindings::cli::terminal_stdin,
-       "wasi:cli/terminal_stdout": preview2::bindings::cli::terminal_stdout,
-       "wasi:cli/terminal_stderr": preview2::bindings::cli::terminal_stderr,
-    },
-    ownership: Borrowing {
-        duplicate_if_necessary: false
-    }
-});
-
-#[test_log::test(tokio::test)]
-async fn api_reactor() -> Result<()> {
-    let table = Table::new();
-    let wasi = WasiCtxBuilder::new().env("GOOD_DOG", "gussie").build();
-
-    let mut config = Config::new();
-    config.async_support(true).wasm_component_model(true);
-    let engine = Engine::new(&config)?;
-    let mut linker = Linker::new(&engine);
-    add_to_linker(&mut linker)?;
-
-    let mut store = Store::new(&engine, CommandCtx { table, wasi });
-    let component = Component::from_file(&engine, API_REACTOR_COMPONENT)?;
-    let (reactor, _instance) =
-        TestReactor::instantiate_async(&mut store, &component, &linker).await?;
-
-    // Show that integration with the WASI context is working - the guest will
-    // interpolate $GOOD_DOG to gussie here using the environment:
-    let r = reactor
-        .call_add_strings(&mut store, &["hello", "$GOOD_DOG"])
-        .await?;
-    assert_eq!(r, 2);
-
-    let contents = reactor.call_get_strings(&mut store).await?;
-    assert_eq!(contents, &["hello", "gussie"]);
-
-    // Show that we can pass in a resource type whose impls are defined in the
-    // `host` and `wasi-common` crate.
-    // Note, this works because of the add_to_linker invocations using the
-    // `host` crate for `streams`, not because of `with` in the bindgen macro.
-    let writepipe = preview2::pipe::MemoryOutputPipe::new(4096);
-    let stream: preview2::OutputStream = Box::new(writepipe.clone());
-    let table_ix = store.data_mut().table_mut().push(stream)?;
-    let r = reactor.call_write_strings_to(&mut store, table_ix).await?;
-    assert_eq!(r, Ok(()));
-
-    assert_eq!(writepipe.contents().as_ref(), b"hellogussie");
-
-    // Show that the `with` invocation in the macro means we get to re-use the
-    // type definitions from inside the `host` crate for these structures:
-    let ds = filesystem::DescriptorStat {
-        data_access_timestamp: Some(wall_clock::Datetime {
-            nanoseconds: 123,
-            seconds: 45,
-        }),
-        data_modification_timestamp: Some(wall_clock::Datetime {
-            nanoseconds: 789,
-            seconds: 10,
-        }),
-        link_count: 0,
-        size: 0,
-        status_change_timestamp: Some(wall_clock::Datetime {
-            nanoseconds: 0,
-            seconds: 1,
-        }),
-        type_: filesystem::DescriptorType::Unknown,
-    };
-    let expected = format!("{ds:?}");
-    let got = reactor.call_pass_an_imported_record(&mut store, ds).await?;
-    assert_eq!(expected, got);
-
-    Ok(())
-}
diff --git a/crates/wasi/tests/all/async_.rs b/crates/wasi/tests/all/async_.rs
deleted file mode 100644
index c1813476bf74..000000000000
--- a/crates/wasi/tests/all/async_.rs
+++ /dev/null
@@ -1,346 +0,0 @@
-use super::*;
-use std::path::Path;
-use test_programs_artifacts::*;
-use wasmtime_wasi::preview2::command::{add_to_linker, Command};
-
-async fn run(path: &str, inherit_stdio: bool) -> Result<()> {
-    let path = Path::new(path);
-    let name = path.file_stem().unwrap().to_str().unwrap();
-    let mut config = Config::new();
-    config.async_support(true).wasm_component_model(true);
-    let engine = Engine::new(&config)?;
-    let mut linker = Linker::new(&engine);
-    add_to_linker(&mut linker)?;
-
-    let (mut store, _td) = store(&engine, name, inherit_stdio)?;
-    let component = Component::from_file(&engine, path)?;
-    let (command, _instance) = Command::instantiate_async(&mut store, &component, &linker).await?;
-    command
-        .wasi_cli_run()
-        .call_run(&mut store)
-        .await?
-        .map_err(|()| anyhow::anyhow!("run returned a failure"))
-}
-
-foreach_preview1!(assert_test_exists);
-foreach_preview2!(assert_test_exists);
-
-// Below here is mechanical: there should be one test for every binary in
-// wasi-tests. The only differences should be should_panic annotations for
-// tests which fail.
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_big_random_buf() {
-    run(PREVIEW1_BIG_RANDOM_BUF_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_clock_time_get() {
-    run(PREVIEW1_CLOCK_TIME_GET_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_close_preopen() {
-    run(PREVIEW1_CLOSE_PREOPEN_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_dangling_fd() {
-    run(PREVIEW1_DANGLING_FD_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_dangling_symlink() {
-    run(PREVIEW1_DANGLING_SYMLINK_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_directory_seek() {
-    run(PREVIEW1_DIRECTORY_SEEK_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_dir_fd_op_failures() {
-    run(PREVIEW1_DIR_FD_OP_FAILURES_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_fd_advise() {
-    run(PREVIEW1_FD_ADVISE_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_fd_filestat_get() {
-    run(PREVIEW1_FD_FILESTAT_GET_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_fd_filestat_set() {
-    run(PREVIEW1_FD_FILESTAT_SET_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_fd_flags_set() {
-    run(PREVIEW1_FD_FLAGS_SET_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_fd_readdir() {
-    run(PREVIEW1_FD_READDIR_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_file_allocate() {
-    run(PREVIEW1_FILE_ALLOCATE_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_file_pread_pwrite() {
-    run(PREVIEW1_FILE_PREAD_PWRITE_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_file_seek_tell() {
-    run(PREVIEW1_FILE_SEEK_TELL_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_file_truncation() {
-    run(PREVIEW1_FILE_TRUNCATION_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_file_unbuffered_write() {
-    run(PREVIEW1_FILE_UNBUFFERED_WRITE_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-#[cfg_attr(windows, should_panic)]
-async fn preview1_interesting_paths() {
-    run(PREVIEW1_INTERESTING_PATHS_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_regular_file_isatty() {
-    run(PREVIEW1_REGULAR_FILE_ISATTY_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_nofollow_errors() {
-    run(PREVIEW1_NOFOLLOW_ERRORS_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_overwrite_preopen() {
-    run(PREVIEW1_OVERWRITE_PREOPEN_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_exists() {
-    run(PREVIEW1_PATH_EXISTS_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_filestat() {
-    run(PREVIEW1_PATH_FILESTAT_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_link() {
-    run(PREVIEW1_PATH_LINK_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_open_create_existing() {
-    run(PREVIEW1_PATH_OPEN_CREATE_EXISTING_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_open_read_write() {
-    run(PREVIEW1_PATH_OPEN_READ_WRITE_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_open_dirfd_not_dir() {
-    run(PREVIEW1_PATH_OPEN_DIRFD_NOT_DIR_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_open_missing() {
-    run(PREVIEW1_PATH_OPEN_MISSING_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_open_nonblock() {
-    run(PREVIEW1_PATH_OPEN_NONBLOCK_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_rename_dir_trailing_slashes() {
-    run(PREVIEW1_PATH_RENAME_DIR_TRAILING_SLASHES_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-#[should_panic]
-async fn preview1_path_rename_file_trailing_slashes() {
-    run(PREVIEW1_PATH_RENAME_FILE_TRAILING_SLASHES_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_rename() {
-    run(PREVIEW1_PATH_RENAME_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_symlink_trailing_slashes() {
-    run(PREVIEW1_PATH_SYMLINK_TRAILING_SLASHES_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_poll_oneoff_files() {
-    run(PREVIEW1_POLL_ONEOFF_FILES_COMPONENT, false)
-        .await
-        .unwrap()
-}
-
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_poll_oneoff_stdio() {
-    run(PREVIEW1_POLL_ONEOFF_STDIO_COMPONENT, true)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_readlink() {
-    run(PREVIEW1_READLINK_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-#[should_panic]
-async fn preview1_remove_directory_trailing_slashes() {
-    run(PREVIEW1_REMOVE_DIRECTORY_TRAILING_SLASHES_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_remove_nonempty_directory() {
-    run(PREVIEW1_REMOVE_NONEMPTY_DIRECTORY_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_renumber() {
-    run(PREVIEW1_RENUMBER_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_sched_yield() {
-    run(PREVIEW1_SCHED_YIELD_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_stdio() {
-    run(PREVIEW1_STDIO_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_stdio_isatty() {
-    // If the test process is setup such that stdio is a terminal:
-    if test_programs_artifacts::stdio_is_terminal() {
-        // Inherit stdio, test asserts each is not tty:
-        run(PREVIEW1_STDIO_ISATTY_COMPONENT, true).await.unwrap()
-    }
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_stdio_not_isatty() {
-    // Don't inherit stdio, test asserts each is not tty:
-    run(PREVIEW1_STDIO_NOT_ISATTY_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_symlink_create() {
-    run(PREVIEW1_SYMLINK_CREATE_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_symlink_filestat() {
-    run(PREVIEW1_SYMLINK_FILESTAT_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_symlink_loop() {
-    run(PREVIEW1_SYMLINK_LOOP_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_unlink_file_trailing_slashes() {
-    run(PREVIEW1_UNLINK_FILE_TRAILING_SLASHES_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_open_preopen() {
-    run(PREVIEW1_PATH_OPEN_PREOPEN_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_unicode_output() {
-    run(PREVIEW1_UNICODE_OUTPUT_COMPONENT, true).await.unwrap()
-}
-
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview2_sleep() {
-    run(PREVIEW2_SLEEP_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview2_random() {
-    run(PREVIEW2_RANDOM_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview2_ip_name_lookup() {
-    run(PREVIEW2_IP_NAME_LOOKUP_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview2_tcp_sockopts() {
-    run(PREVIEW2_TCP_SOCKOPTS_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview2_tcp_sample_application() {
-    run(PREVIEW2_TCP_SAMPLE_APPLICATION_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview2_tcp_states() {
-    run(PREVIEW2_TCP_STATES_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview2_tcp_bind() {
-    run(PREVIEW2_TCP_BIND_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview2_udp_sample_application() {
-    run(PREVIEW2_UDP_SAMPLE_APPLICATION_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview2_tcp_connect() {
-    run(PREVIEW2_TCP_CONNECT_COMPONENT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview2_stream_pollable_correct() {
-    run(PREVIEW2_STREAM_POLLABLE_CORRECT_COMPONENT, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview2_stream_pollable_traps() {
-    let e = run(PREVIEW2_STREAM_POLLABLE_TRAPS_COMPONENT, false)
-        .await
-        .unwrap_err();
-    assert_eq!(
-        format!("{}", e.source().expect("trap source")),
-        "entry still has children"
-    )
-}
diff --git a/crates/wasi/tests/all/main.rs b/crates/wasi/tests/all/main.rs
deleted file mode 100644
index 1af5503f029d..000000000000
--- a/crates/wasi/tests/all/main.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-use anyhow::Result;
-use cap_std::ambient_authority;
-use tempfile::TempDir;
-use wasmtime::{
-    component::{Component, Linker},
-    Config, Engine, Store,
-};
-use wasmtime_wasi::preview2::{
-    pipe::MemoryOutputPipe,
-    preview1::{WasiPreview1Adapter, WasiPreview1View},
-    DirPerms, FilePerms, Table, WasiCtx, WasiCtxBuilder, WasiView,
-};
-
-struct Ctx {
-    table: Table,
-    wasi: WasiCtx,
-    stdout: MemoryOutputPipe,
-    stderr: MemoryOutputPipe,
-    adapter: WasiPreview1Adapter,
-}
-
-impl WasiView for Ctx {
-    fn table(&self) -> &Table {
-        &self.table
-    }
-    fn table_mut(&mut self) -> &mut Table {
-        &mut self.table
-    }
-    fn ctx(&self) -> &WasiCtx {
-        &self.wasi
-    }
-    fn ctx_mut(&mut self) -> &mut WasiCtx {
-        &mut self.wasi
-    }
-}
-
-impl WasiPreview1View for Ctx {
-    fn adapter(&self) -> &WasiPreview1Adapter {
-        &self.adapter
-    }
-    fn adapter_mut(&mut self) -> &mut WasiPreview1Adapter {
-        &mut self.adapter
-    }
-}
-
-fn prepare_workspace(exe_name: &str) -> Result<TempDir> {
-    let prefix = format!("wasi_components_{}_", exe_name);
-    let tempdir = tempfile::Builder::new().prefix(&prefix).tempdir()?;
-    Ok(tempdir)
-}
-
-fn store(engine: &Engine, name: &str, inherit_stdio: bool) -> Result<(Store<Ctx>, TempDir)> {
-    let stdout = MemoryOutputPipe::new(4096);
-    let stderr = MemoryOutputPipe::new(4096);
-    let workspace = prepare_workspace(name)?;
-
-    // Create our wasi context.
-    let mut builder = WasiCtxBuilder::new();
-    if inherit_stdio {
-        builder.inherit_stdio();
-    } else {
-        builder.stdout(stdout.clone()).stderr(stderr.clone());
-    }
-
-    builder
-        .args(&[name, "."])
-        .inherit_network(ambient_authority())
-        .allow_ip_name_lookup(true);
-    println!("preopen: {:?}", workspace);
-    let preopen_dir =
-        cap_std::fs::Dir::open_ambient_dir(workspace.path(), cap_std::ambient_authority())?;
-    builder.preopened_dir(preopen_dir, DirPerms::all(), FilePerms::all(), ".");
-    for (var, val) in test_programs_artifacts::wasi_tests_environment() {
-        builder.env(var, val);
-    }
-
-    let ctx = Ctx {
-        table: Table::new(),
-        wasi: builder.build(),
-        stderr,
-        stdout,
-        adapter: WasiPreview1Adapter::new(),
-    };
-
-    Ok((Store::new(&engine, ctx), workspace))
-}
-
-impl Drop for Ctx {
-    fn drop(&mut self) {
-        let stdout = self.stdout.contents();
-        if !stdout.is_empty() {
-            println!("[guest] stdout:\n{}\n===", String::from_utf8_lossy(&stdout));
-        }
-        let stderr = self.stderr.contents();
-        if !stderr.is_empty() {
-            println!("[guest] stderr:\n{}\n===", String::from_utf8_lossy(&stderr));
-        }
-    }
-}
-
-// Assert that each of `sync` and `async` below are testing everything through
-// assertion of the existence of the test function itself.
-macro_rules! assert_test_exists {
-    ($name:ident) => {
-        #[allow(unused_imports)]
-        use self::$name as _;
-    };
-}
-
-mod api;
-mod async_;
-mod preview1;
-mod sync;
diff --git a/crates/wasi/tests/all/preview1.rs b/crates/wasi/tests/all/preview1.rs
deleted file mode 100644
index 692b4fa55e68..000000000000
--- a/crates/wasi/tests/all/preview1.rs
+++ /dev/null
@@ -1,247 +0,0 @@
-use super::*;
-use std::path::Path;
-use test_programs_artifacts::*;
-use wasmtime::{Linker, Module};
-use wasmtime_wasi::preview2::preview1::add_to_linker_async;
-
-async fn run(path: &str, inherit_stdio: bool) -> Result<()> {
-    let path = Path::new(path);
-    let name = path.file_stem().unwrap().to_str().unwrap();
-    let mut config = Config::new();
-    config.async_support(true).wasm_component_model(true);
-    let engine = Engine::new(&config)?;
-    let mut linker = Linker::new(&engine);
-    add_to_linker_async(&mut linker)?;
-
-    let module = Module::from_file(&engine, path)?;
-    let (mut store, _td) = store(&engine, name, inherit_stdio)?;
-    let instance = linker.instantiate_async(&mut store, &module).await?;
-    let start = instance.get_typed_func::<(), ()>(&mut store, "_start")?;
-    start.call_async(&mut store, ()).await?;
-    Ok(())
-}
-
-foreach_preview1!(assert_test_exists);
-
-// Below here is mechanical: there should be one test for every binary in
-// wasi-tests. The only differences should be should_panic annotations for
-// tests which fail.
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_big_random_buf() {
-    run(PREVIEW1_BIG_RANDOM_BUF, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_clock_time_get() {
-    run(PREVIEW1_CLOCK_TIME_GET, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_close_preopen() {
-    run(PREVIEW1_CLOSE_PREOPEN, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_dangling_fd() {
-    run(PREVIEW1_DANGLING_FD, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_dangling_symlink() {
-    run(PREVIEW1_DANGLING_SYMLINK, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_directory_seek() {
-    run(PREVIEW1_DIRECTORY_SEEK, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_dir_fd_op_failures() {
-    run(PREVIEW1_DIR_FD_OP_FAILURES, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_fd_advise() {
-    run(PREVIEW1_FD_ADVISE, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_fd_filestat_get() {
-    run(PREVIEW1_FD_FILESTAT_GET, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_fd_filestat_set() {
-    run(PREVIEW1_FD_FILESTAT_SET, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_fd_flags_set() {
-    run(PREVIEW1_FD_FLAGS_SET, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_fd_readdir() {
-    run(PREVIEW1_FD_READDIR, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_file_allocate() {
-    run(PREVIEW1_FILE_ALLOCATE, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_file_pread_pwrite() {
-    run(PREVIEW1_FILE_PREAD_PWRITE, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_file_seek_tell() {
-    run(PREVIEW1_FILE_SEEK_TELL, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_file_truncation() {
-    run(PREVIEW1_FILE_TRUNCATION, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_file_unbuffered_write() {
-    run(PREVIEW1_FILE_UNBUFFERED_WRITE, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-#[cfg_attr(windows, should_panic)]
-async fn preview1_interesting_paths() {
-    run(PREVIEW1_INTERESTING_PATHS, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_regular_file_isatty() {
-    run(PREVIEW1_REGULAR_FILE_ISATTY, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_nofollow_errors() {
-    run(PREVIEW1_NOFOLLOW_ERRORS, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_overwrite_preopen() {
-    run(PREVIEW1_OVERWRITE_PREOPEN, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_exists() {
-    run(PREVIEW1_PATH_EXISTS, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_filestat() {
-    run(PREVIEW1_PATH_FILESTAT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_link() {
-    run(PREVIEW1_PATH_LINK, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_open_create_existing() {
-    run(PREVIEW1_PATH_OPEN_CREATE_EXISTING, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_open_read_write() {
-    run(PREVIEW1_PATH_OPEN_READ_WRITE, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_open_dirfd_not_dir() {
-    run(PREVIEW1_PATH_OPEN_DIRFD_NOT_DIR, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_open_missing() {
-    run(PREVIEW1_PATH_OPEN_MISSING, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_open_nonblock() {
-    run(PREVIEW1_PATH_OPEN_NONBLOCK, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_rename_dir_trailing_slashes() {
-    run(PREVIEW1_PATH_RENAME_DIR_TRAILING_SLASHES, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-#[should_panic]
-async fn preview1_path_rename_file_trailing_slashes() {
-    run(PREVIEW1_PATH_RENAME_FILE_TRAILING_SLASHES, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_rename() {
-    run(PREVIEW1_PATH_RENAME, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_symlink_trailing_slashes() {
-    run(PREVIEW1_PATH_SYMLINK_TRAILING_SLASHES, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_poll_oneoff_files() {
-    run(PREVIEW1_POLL_ONEOFF_FILES, false).await.unwrap()
-}
-
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_poll_oneoff_stdio() {
-    run(PREVIEW1_POLL_ONEOFF_STDIO, true).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_readlink() {
-    run(PREVIEW1_READLINK, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-#[should_panic]
-async fn preview1_remove_directory_trailing_slashes() {
-    run(PREVIEW1_REMOVE_DIRECTORY_TRAILING_SLASHES, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_remove_nonempty_directory() {
-    run(PREVIEW1_REMOVE_NONEMPTY_DIRECTORY, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_renumber() {
-    run(PREVIEW1_RENUMBER, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_sched_yield() {
-    run(PREVIEW1_SCHED_YIELD, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_stdio() {
-    run(PREVIEW1_STDIO, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_stdio_isatty() {
-    // If the test process is setup such that stdio is a terminal:
-    if test_programs_artifacts::stdio_is_terminal() {
-        // Inherit stdio, test asserts each is not tty:
-        run(PREVIEW1_STDIO_ISATTY, true).await.unwrap()
-    }
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_stdio_not_isatty() {
-    // Don't inherit stdio, test asserts each is not tty:
-    run(PREVIEW1_STDIO_NOT_ISATTY, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_symlink_create() {
-    run(PREVIEW1_SYMLINK_CREATE, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_symlink_filestat() {
-    run(PREVIEW1_SYMLINK_FILESTAT, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_symlink_loop() {
-    run(PREVIEW1_SYMLINK_LOOP, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_unlink_file_trailing_slashes() {
-    run(PREVIEW1_UNLINK_FILE_TRAILING_SLASHES, false)
-        .await
-        .unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_path_open_preopen() {
-    run(PREVIEW1_PATH_OPEN_PREOPEN, false).await.unwrap()
-}
-#[test_log::test(tokio::test(flavor = "multi_thread"))]
-async fn preview1_unicode_output() {
-    run(PREVIEW1_UNICODE_OUTPUT, true).await.unwrap()
-}
diff --git a/crates/wasi/tests/all/sync.rs b/crates/wasi/tests/all/sync.rs
deleted file mode 100644
index 4347e01d904a..000000000000
--- a/crates/wasi/tests/all/sync.rs
+++ /dev/null
@@ -1,283 +0,0 @@
-use super::*;
-use std::path::Path;
-use test_programs_artifacts::*;
-use wasmtime_wasi::preview2::command::sync::{add_to_linker, Command};
-
-fn run(path: &str, inherit_stdio: bool) -> Result<()> {
-    let path = Path::new(path);
-    let name = path.file_stem().unwrap().to_str().unwrap();
-    let mut config = Config::new();
-    config.wasm_component_model(true);
-    let engine = Engine::new(&config)?;
-    let mut linker = Linker::new(&engine);
-    add_to_linker(&mut linker)?;
-
-    let (mut store, _td) = store(&engine, name, inherit_stdio)?;
-    let component = Component::from_file(&engine, path)?;
-    let (command, _instance) = Command::instantiate(&mut store, &component, &linker)?;
-    command
-        .wasi_cli_run()
-        .call_run(&mut store)?
-        .map_err(|()| anyhow::anyhow!("run returned a failure"))
-}
-
-foreach_preview1!(assert_test_exists);
-foreach_preview2!(assert_test_exists);
-
-// Below here is mechanical: there should be one test for every binary in
-// wasi-tests. The only differences should be should_panic annotations for
-// tests which fail.
-#[test_log::test]
-fn preview1_big_random_buf() {
-    run(PREVIEW1_BIG_RANDOM_BUF_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_clock_time_get() {
-    run(PREVIEW1_CLOCK_TIME_GET_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_close_preopen() {
-    run(PREVIEW1_CLOSE_PREOPEN_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_dangling_fd() {
-    run(PREVIEW1_DANGLING_FD_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_dangling_symlink() {
-    run(PREVIEW1_DANGLING_SYMLINK_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_directory_seek() {
-    run(PREVIEW1_DIRECTORY_SEEK_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_dir_fd_op_failures() {
-    run(PREVIEW1_DIR_FD_OP_FAILURES_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_fd_advise() {
-    run(PREVIEW1_FD_ADVISE_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_fd_filestat_get() {
-    run(PREVIEW1_FD_FILESTAT_GET_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_fd_filestat_set() {
-    run(PREVIEW1_FD_FILESTAT_SET_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_fd_flags_set() {
-    run(PREVIEW1_FD_FLAGS_SET_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_fd_readdir() {
-    run(PREVIEW1_FD_READDIR_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_file_allocate() {
-    run(PREVIEW1_FILE_ALLOCATE_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_file_pread_pwrite() {
-    run(PREVIEW1_FILE_PREAD_PWRITE_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_file_seek_tell() {
-    run(PREVIEW1_FILE_SEEK_TELL_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_file_truncation() {
-    run(PREVIEW1_FILE_TRUNCATION_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_file_unbuffered_write() {
-    run(PREVIEW1_FILE_UNBUFFERED_WRITE_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-#[cfg_attr(windows, should_panic)]
-fn preview1_interesting_paths() {
-    run(PREVIEW1_INTERESTING_PATHS_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_regular_file_isatty() {
-    run(PREVIEW1_REGULAR_FILE_ISATTY_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_nofollow_errors() {
-    run(PREVIEW1_NOFOLLOW_ERRORS_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_overwrite_preopen() {
-    run(PREVIEW1_OVERWRITE_PREOPEN_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_path_exists() {
-    run(PREVIEW1_PATH_EXISTS_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_path_filestat() {
-    run(PREVIEW1_PATH_FILESTAT_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_path_link() {
-    run(PREVIEW1_PATH_LINK_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_path_open_create_existing() {
-    run(PREVIEW1_PATH_OPEN_CREATE_EXISTING_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_path_open_read_write() {
-    run(PREVIEW1_PATH_OPEN_READ_WRITE_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_path_open_dirfd_not_dir() {
-    run(PREVIEW1_PATH_OPEN_DIRFD_NOT_DIR_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_path_open_missing() {
-    run(PREVIEW1_PATH_OPEN_MISSING_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_path_open_nonblock() {
-    run(PREVIEW1_PATH_OPEN_NONBLOCK_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_path_rename_dir_trailing_slashes() {
-    run(PREVIEW1_PATH_RENAME_DIR_TRAILING_SLASHES_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-#[should_panic]
-fn preview1_path_rename_file_trailing_slashes() {
-    run(PREVIEW1_PATH_RENAME_FILE_TRAILING_SLASHES_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_path_rename() {
-    run(PREVIEW1_PATH_RENAME_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_path_symlink_trailing_slashes() {
-    run(PREVIEW1_PATH_SYMLINK_TRAILING_SLASHES_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_poll_oneoff_files() {
-    run(PREVIEW1_POLL_ONEOFF_FILES_COMPONENT, false).unwrap()
-}
-
-#[test_log::test]
-fn preview1_poll_oneoff_stdio() {
-    run(PREVIEW1_POLL_ONEOFF_STDIO_COMPONENT, true).unwrap()
-}
-#[test_log::test]
-fn preview1_readlink() {
-    run(PREVIEW1_READLINK_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-#[should_panic]
-fn preview1_remove_directory_trailing_slashes() {
-    run(PREVIEW1_REMOVE_DIRECTORY_TRAILING_SLASHES_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_remove_nonempty_directory() {
-    run(PREVIEW1_REMOVE_NONEMPTY_DIRECTORY_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_renumber() {
-    run(PREVIEW1_RENUMBER_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_sched_yield() {
-    run(PREVIEW1_SCHED_YIELD_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_stdio() {
-    run(PREVIEW1_STDIO_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_stdio_isatty() {
-    // If the test process is setup such that stdio is a terminal:
-    if test_programs_artifacts::stdio_is_terminal() {
-        // Inherit stdio, test asserts each is not tty:
-        run(PREVIEW1_STDIO_ISATTY_COMPONENT, true).unwrap()
-    }
-}
-#[test_log::test]
-fn preview1_stdio_not_isatty() {
-    // Don't inherit stdio, test asserts each is not tty:
-    run(PREVIEW1_STDIO_NOT_ISATTY_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_symlink_create() {
-    run(PREVIEW1_SYMLINK_CREATE_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_symlink_filestat() {
-    run(PREVIEW1_SYMLINK_FILESTAT_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_symlink_loop() {
-    run(PREVIEW1_SYMLINK_LOOP_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_unlink_file_trailing_slashes() {
-    run(PREVIEW1_UNLINK_FILE_TRAILING_SLASHES_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_path_open_preopen() {
-    run(PREVIEW1_PATH_OPEN_PREOPEN_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview1_unicode_output() {
-    run(PREVIEW1_UNICODE_OUTPUT_COMPONENT, true).unwrap()
-}
-
-#[test_log::test]
-fn preview2_sleep() {
-    run(PREVIEW2_SLEEP_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview2_random() {
-    run(PREVIEW2_RANDOM_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview2_ip_name_lookup() {
-    run(PREVIEW2_IP_NAME_LOOKUP_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview2_tcp_sockopts() {
-    run(PREVIEW2_TCP_SOCKOPTS_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview2_tcp_sample_application() {
-    run(PREVIEW2_TCP_SAMPLE_APPLICATION_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview2_tcp_states() {
-    run(PREVIEW2_TCP_STATES_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview2_tcp_bind() {
-    run(PREVIEW2_TCP_BIND_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview2_udp_sample_application() {
-    run(PREVIEW2_UDP_SAMPLE_APPLICATION_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview2_tcp_connect() {
-    run(PREVIEW2_TCP_CONNECT_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview2_stream_pollable_correct() {
-    run(PREVIEW2_STREAM_POLLABLE_CORRECT_COMPONENT, false).unwrap()
-}
-#[test_log::test]
-fn preview2_stream_pollable_traps() {
-    let e = run(PREVIEW2_STREAM_POLLABLE_TRAPS_COMPONENT, false).unwrap_err();
-    assert_eq!(
-        format!("{}", e.source().expect("trap source")),
-        "entry still has children"
-    )
-}
diff --git a/crates/wasi/wit/command-extended.wit b/crates/wasi/wit/command-extended.wit
index 00cee3aafb39..314e26dfce1b 100644
--- a/crates/wasi/wit/command-extended.wit
+++ b/crates/wasi/wit/command-extended.wit
@@ -1,6 +1,37 @@
 // All of the same imports and exports available in the wasi:cli/command world
 // with addition of HTTP proxy related imports:
 world command-extended {
-  include wasi:cli/command@0.2.0-rc-2023-11-05;
-  import wasi:http/outgoing-handler@0.2.0-rc-2023-11-05;
+  import wasi:clocks/wall-clock
+  import wasi:clocks/monotonic-clock
+  import wasi:clocks/timezone
+  import wasi:filesystem/types
+  import wasi:filesystem/preopens
+  import wasi:sockets/instance-network
+  import wasi:sockets/ip-name-lookup
+  import wasi:sockets/network
+  import wasi:sockets/tcp-create-socket
+  import wasi:sockets/tcp
+  import wasi:sockets/udp-create-socket
+  import wasi:sockets/udp
+  import wasi:random/random
+  import wasi:random/insecure
+  import wasi:random/insecure-seed
+  import wasi:poll/poll
+  import wasi:io/streams
+  import wasi:cli/environment
+  import wasi:cli/exit
+  import wasi:cli/stdin
+  import wasi:cli/stdout
+  import wasi:cli/stderr
+  import wasi:cli/terminal-input
+  import wasi:cli/terminal-output
+  import wasi:cli/terminal-stdin
+  import wasi:cli/terminal-stdout
+  import wasi:cli/terminal-stderr
+
+  // We should replace all others with `include self.command`
+  // as soon as the unioning of worlds is available:
+  // https://github.com/WebAssembly/component-model/issues/169
+  import wasi:logging/logging
+  import wasi:http/outgoing-handler
 }
diff --git a/crates/wasi/wit/deps/cli/command.wit b/crates/wasi/wit/deps/cli/command.wit
index 07925c0377b3..d28f5f6282a4 100644
--- a/crates/wasi/wit/deps/cli/command.wit
+++ b/crates/wasi/wit/deps/cli/command.wit
@@ -1,7 +1,7 @@
-package wasi:cli@0.2.0-rc-2023-11-05;
+package wasi:cli
 
 world command {
-  include reactor;
+  include reactor
 
-  export run;
+  export run
 }
diff --git a/crates/wasi/wit/deps/cli/environment.wit b/crates/wasi/wit/deps/cli/environment.wit
index 70065233e81b..36790fe714d2 100644
--- a/crates/wasi/wit/deps/cli/environment.wit
+++ b/crates/wasi/wit/deps/cli/environment.wit
@@ -7,12 +7,12 @@ interface environment {
   /// Morally, these are a value import, but until value imports are available
   /// in the component model, this import function should return the same
   /// values each time it is called.
-  get-environment: func() -> list<tuple<string, string>>;
+  get-environment: func() -> list<tuple<string, string>>
 
   /// Get the POSIX-style arguments to the program.
-  get-arguments: func() -> list<string>;
+  get-arguments: func() -> list<string>
 
   /// Return a path that programs should use as their initial current working
   /// directory, interpreting `.` as shorthand for this.
-  initial-cwd: func() -> option<string>;
+  initial-cwd: func() -> option<string>
 }
diff --git a/crates/wasi/wit/deps/cli/exit.wit b/crates/wasi/wit/deps/cli/exit.wit
index d0c2b82ae2c7..4831d50789af 100644
--- a/crates/wasi/wit/deps/cli/exit.wit
+++ b/crates/wasi/wit/deps/cli/exit.wit
@@ -1,4 +1,4 @@
 interface exit {
   /// Exit the current instance and any linked instances.
-  exit: func(status: result);
+  exit: func(status: result)
 }
diff --git a/crates/wasi/wit/deps/cli/reactor.wit b/crates/wasi/wit/deps/cli/reactor.wit
index 4b829834c25b..46e3186e5636 100644
--- a/crates/wasi/wit/deps/cli/reactor.wit
+++ b/crates/wasi/wit/deps/cli/reactor.wit
@@ -1,32 +1,33 @@
-package wasi:cli@0.2.0-rc-2023-11-05;
+package wasi:cli
 
 world reactor {
-  import wasi:clocks/wall-clock@0.2.0-rc-2023-11-05;
-  import wasi:clocks/monotonic-clock@0.2.0-rc-2023-11-05;
-  import wasi:clocks/timezone@0.2.0-rc-2023-11-05;
-  import wasi:filesystem/types@0.2.0-rc-2023-11-05;
-  import wasi:filesystem/preopens@0.2.0-rc-2023-11-05;
-  import wasi:sockets/instance-network@0.2.0-rc-2023-11-05;
-  import wasi:sockets/ip-name-lookup@0.2.0-rc-2023-11-05;
-  import wasi:sockets/network@0.2.0-rc-2023-11-05;
-  import wasi:sockets/tcp-create-socket@0.2.0-rc-2023-11-05;
-  import wasi:sockets/tcp@0.2.0-rc-2023-11-05;
-  import wasi:sockets/udp-create-socket@0.2.0-rc-2023-11-05;
-  import wasi:sockets/udp@0.2.0-rc-2023-11-05;
-  import wasi:random/random@0.2.0-rc-2023-11-05;
-  import wasi:random/insecure@0.2.0-rc-2023-11-05;
-  import wasi:random/insecure-seed@0.2.0-rc-2023-11-05;
-  import wasi:io/poll@0.2.0-rc-2023-11-05;
-  import wasi:io/streams@0.2.0-rc-2023-11-05;
+  import wasi:clocks/wall-clock
+  import wasi:clocks/monotonic-clock
+  import wasi:clocks/timezone
+  import wasi:filesystem/types
+  import wasi:filesystem/preopens
+  import wasi:sockets/instance-network
+  import wasi:sockets/ip-name-lookup
+  import wasi:sockets/network
+  import wasi:sockets/tcp-create-socket
+  import wasi:sockets/tcp
+  import wasi:sockets/udp-create-socket
+  import wasi:sockets/udp
+  import wasi:random/random
+  import wasi:random/insecure
+  import wasi:random/insecure-seed
+  import wasi:poll/poll
+  import wasi:io/streams
 
-  import environment;
-  import exit;
-  import stdin;
-  import stdout;
-  import stderr;
-  import terminal-input;
-  import terminal-output;
-  import terminal-stdin;
-  import terminal-stdout;
-  import terminal-stderr;
+  import environment
+  import exit
+  import stdin
+  import stdout
+  import stderr
+  import terminal-input
+  import terminal-output
+  import terminal-stdin
+  import terminal-stdout
+  import terminal-stderr
 }
+
diff --git a/crates/wasi/wit/deps/cli/run.wit b/crates/wasi/wit/deps/cli/run.wit
index a70ee8c038f2..45a1ca533f0e 100644
--- a/crates/wasi/wit/deps/cli/run.wit
+++ b/crates/wasi/wit/deps/cli/run.wit
@@ -1,4 +1,4 @@
 interface run {
   /// Run the program.
-  run: func() -> result;
+  run: func() -> result
 }
diff --git a/crates/wasi/wit/deps/cli/stdio.wit b/crates/wasi/wit/deps/cli/stdio.wit
index 6058260cf1b6..6c9d4a41a6f9 100644
--- a/crates/wasi/wit/deps/cli/stdio.wit
+++ b/crates/wasi/wit/deps/cli/stdio.wit
@@ -1,17 +1,17 @@
 interface stdin {
-  use wasi:io/streams@0.2.0-rc-2023-11-05.{input-stream};
+  use wasi:io/streams.{input-stream}
 
-  get-stdin: func() -> input-stream;
+  get-stdin: func() -> input-stream
 }
 
 interface stdout {
-  use wasi:io/streams@0.2.0-rc-2023-11-05.{output-stream};
+  use wasi:io/streams.{output-stream}
 
-  get-stdout: func() -> output-stream;
+  get-stdout: func() -> output-stream
 }
 
 interface stderr {
-  use wasi:io/streams@0.2.0-rc-2023-11-05.{output-stream};
+  use wasi:io/streams.{output-stream}
 
-  get-stderr: func() -> output-stream;
+  get-stderr: func() -> output-stream
 }
diff --git a/crates/wasi/wit/deps/cli/terminal.wit b/crates/wasi/wit/deps/cli/terminal.wit
index 47495769b31f..f32e74437484 100644
--- a/crates/wasi/wit/deps/cli/terminal.wit
+++ b/crates/wasi/wit/deps/cli/terminal.wit
@@ -1,47 +1,59 @@
 interface terminal-input {
     /// The input side of a terminal.
-    resource terminal-input;
+    ///
+    /// This [represents a resource](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources).
+    type terminal-input = u32
 
     // In the future, this may include functions for disabling echoing,
     // disabling input buffering so that keyboard events are sent through
     // immediately, querying supported features, and so on.
+
+    /// Dispose of the specified terminal-input after which it may no longer
+    /// be used.
+    drop-terminal-input: func(this: terminal-input)
 }
 
 interface terminal-output {
     /// The output side of a terminal.
-    resource terminal-output;
+    ///
+    /// This [represents a resource](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources).
+    type terminal-output = u32
 
     // In the future, this may include functions for querying the terminal
     // size, being notified of terminal size changes, querying supported
     // features, and so on.
+
+    /// Dispose of the specified terminal-output, after which it may no longer
+    /// be used.
+    drop-terminal-output: func(this: terminal-output)
 }
 
 /// An interface providing an optional `terminal-input` for stdin as a
 /// link-time authority.
 interface terminal-stdin {
-    use terminal-input.{terminal-input};
+    use terminal-input.{terminal-input}
 
     /// If stdin is connected to a terminal, return a `terminal-input` handle
     /// allowing further interaction with it.
-    get-terminal-stdin: func() -> option<terminal-input>;
+    get-terminal-stdin: func() -> option<terminal-input>
 }
 
 /// An interface providing an optional `terminal-output` for stdout as a
 /// link-time authority.
 interface terminal-stdout {
-    use terminal-output.{terminal-output};
+    use terminal-output.{terminal-output}
 
     /// If stdout is connected to a terminal, return a `terminal-output` handle
     /// allowing further interaction with it.
-    get-terminal-stdout: func() -> option<terminal-output>;
+    get-terminal-stdout: func() -> option<terminal-output>
 }
 
 /// An interface providing an optional `terminal-output` for stderr as a
 /// link-time authority.
 interface terminal-stderr {
-    use terminal-output.{terminal-output};
+    use terminal-output.{terminal-output}
 
     /// If stderr is connected to a terminal, return a `terminal-output` handle
     /// allowing further interaction with it.
-    get-terminal-stderr: func() -> option<terminal-output>;
+    get-terminal-stderr: func() -> option<terminal-output>
 }
diff --git a/crates/wasi/wit/deps/clocks/monotonic-clock.wit b/crates/wasi/wit/deps/clocks/monotonic-clock.wit
index a3f7fe25c65b..50eb4de111af 100644
--- a/crates/wasi/wit/deps/clocks/monotonic-clock.wit
+++ b/crates/wasi/wit/deps/clocks/monotonic-clock.wit
@@ -1,3 +1,5 @@
+package wasi:clocks
+
 /// WASI Monotonic Clock is a clock API intended to let users measure elapsed
 /// time.
 ///
@@ -9,24 +11,24 @@
 ///
 /// It is intended for measuring elapsed time.
 interface monotonic-clock {
-    use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable};
+    use wasi:poll/poll.{pollable}
 
     /// A timestamp in nanoseconds.
-    type instant = u64;
+    type instant = u64
 
     /// Read the current value of the clock.
     ///
     /// The clock is monotonic, therefore calling this function repeatedly will
     /// produce a sequence of non-decreasing values.
-    now: func() -> instant;
+    now: func() -> instant
 
     /// Query the resolution of the clock.
-    resolution: func() -> instant;
+    resolution: func() -> instant
 
     /// Create a `pollable` which will resolve once the specified time has been
     /// reached.
     subscribe: func(
         when: instant,
         absolute: bool
-    ) -> pollable;
+    ) -> pollable
 }
diff --git a/crates/wasi/wit/deps/clocks/timezone.wit b/crates/wasi/wit/deps/clocks/timezone.wit
index e717e7b8dda9..2b6855668e1d 100644
--- a/crates/wasi/wit/deps/clocks/timezone.wit
+++ b/crates/wasi/wit/deps/clocks/timezone.wit
@@ -1,5 +1,16 @@
+package wasi:clocks
+
 interface timezone {
-    use wall-clock.{datetime};
+    use wall-clock.{datetime}
+
+    /// A timezone.
+    ///
+    /// In timezones that recognize daylight saving time, also known as daylight
+    /// time and summer time, the information returned from the functions varies
+    /// over time to reflect these adjustments.
+    ///
+    /// This [represents a resource](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources).
+    type timezone = u32
 
     /// Return information needed to display the given `datetime`. This includes
     /// the UTC offset, the time zone name, and a flag indicating whether
@@ -8,10 +19,14 @@ interface timezone {
     /// If the timezone cannot be determined for the given `datetime`, return a
     /// `timezone-display` for `UTC` with a `utc-offset` of 0 and no daylight
     /// saving time.
-    display: func(when: datetime) -> timezone-display;
+    display: func(this: timezone, when: datetime) -> timezone-display
 
     /// The same as `display`, but only return the UTC offset.
-    utc-offset: func(when: datetime) -> s32;
+    utc-offset: func(this: timezone, when: datetime) -> s32
+
+    /// Dispose of the specified input-stream, after which it may no longer
+    /// be used.
+    drop-timezone: func(this: timezone)
 
     /// Information useful for displaying the timezone of a specific `datetime`.
     ///
diff --git a/crates/wasi/wit/deps/clocks/wall-clock.wit b/crates/wasi/wit/deps/clocks/wall-clock.wit
index c39564967a7e..6137724f60b1 100644
--- a/crates/wasi/wit/deps/clocks/wall-clock.wit
+++ b/crates/wasi/wit/deps/clocks/wall-clock.wit
@@ -1,3 +1,5 @@
+package wasi:clocks
+
 /// WASI Wall Clock is a clock API intended to let users query the current
 /// time. The name "wall" makes an analogy to a "clock on the wall", which
 /// is not necessarily monotonic as it may be reset.
@@ -32,10 +34,10 @@ interface wall-clock {
     ///
     /// [POSIX's Seconds Since the Epoch]: https://pubs.opengroup.org/onlinepubs/9699919799/xrat/V4_xbd_chap04.html#tag_21_04_16
     /// [Unix Time]: https://en.wikipedia.org/wiki/Unix_time
-    now: func() -> datetime;
+    now: func() -> datetime
 
     /// Query the resolution of the clock.
     ///
     /// The nanoseconds field of the output is always less than 1000000000.
-    resolution: func() -> datetime;
+    resolution: func() -> datetime
 }
diff --git a/crates/wasi/wit/deps/clocks/world.wit b/crates/wasi/wit/deps/clocks/world.wit
deleted file mode 100644
index a53d025b85b0..000000000000
--- a/crates/wasi/wit/deps/clocks/world.wit
+++ /dev/null
@@ -1,7 +0,0 @@
-package wasi:clocks@0.2.0-rc-2023-11-05;
-
-world imports {
-    import monotonic-clock;
-    import wall-clock;
-    import timezone;
-}
diff --git a/crates/wasi/wit/deps/filesystem/preopens.wit b/crates/wasi/wit/deps/filesystem/preopens.wit
index 3f787ac3fead..f45661b8a849 100644
--- a/crates/wasi/wit/deps/filesystem/preopens.wit
+++ b/crates/wasi/wit/deps/filesystem/preopens.wit
@@ -1,6 +1,6 @@
 interface preopens {
-    use types.{descriptor};
+    use types.{descriptor}
 
     /// Return the set of preopened directories, and their path.
-    get-directories: func() -> list<tuple<descriptor, string>>;
+    get-directories: func() -> list<tuple<descriptor, string>>
 }
diff --git a/crates/wasi/wit/deps/filesystem/types.wit b/crates/wasi/wit/deps/filesystem/types.wit
index 37700332bd6b..e72a742de6c8 100644
--- a/crates/wasi/wit/deps/filesystem/types.wit
+++ b/crates/wasi/wit/deps/filesystem/types.wit
@@ -17,17 +17,12 @@
 /// `..` and symbolic link steps, reaches a directory outside of the base
 /// directory, or reaches a symlink to an absolute or rooted path in the
 /// underlying filesystem, the function fails with `error-code::not-permitted`.
-///
-/// For more information about WASI path resolution and sandboxing, see
-/// [WASI filesystem path resolution].
-///
-/// [WASI filesystem path resolution]: https://github.com/WebAssembly/wasi-filesystem/blob/main/path-resolution.md
 interface types {
-    use wasi:io/streams@0.2.0-rc-2023-11-05.{input-stream, output-stream, error};
-    use wasi:clocks/wall-clock@0.2.0-rc-2023-11-05.{datetime};
+    use wasi:io/streams.{input-stream, output-stream}
+    use wasi:clocks/wall-clock.{datetime}
 
     /// File size or length of a region within a file.
-    type filesize = u64;
+    type filesize = u64
 
     /// The type of a filesystem object referenced by a descriptor.
     ///
@@ -107,20 +102,11 @@ interface types {
         /// length in bytes of the pathname contained in the symbolic link.
         size: filesize,
         /// Last data access timestamp.
-        ///
-        /// If the `option` is none, the platform doesn't maintain an access
-        /// timestamp for this file.
-        data-access-timestamp: option<datetime>,
+        data-access-timestamp: datetime,
         /// Last data modification timestamp.
-        ///
-        /// If the `option` is none, the platform doesn't maintain a
-        /// modification timestamp for this file.
-        data-modification-timestamp: option<datetime>,
-        /// Last file status-change timestamp.
-        ///
-        /// If the `option` is none, the platform doesn't maintain a
-        /// status-change timestamp for this file.
-        status-change-timestamp: option<datetime>,
+        data-modification-timestamp: datetime,
+        /// Last file status change timestamp.
+        status-change-timestamp: datetime,
     }
 
     /// Flags determining the method of how paths are resolved.
@@ -166,7 +152,7 @@ interface types {
     }
 
     /// Number of hard links to an inode.
-    type link-count = u64;
+    type link-count = u64
 
     /// When setting a timestamp, this gives the value to set it to.
     variant new-timestamp {
@@ -291,6 +277,13 @@ interface types {
         no-reuse,
     }
 
+    /// A descriptor is a reference to a filesystem object, which may be a file,
+    /// directory, named pipe, special file, or other object on which filesystem
+    /// calls may be made.
+    ///
+    /// This [represents a resource](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources).
+    type descriptor = u32
+
     /// A 128-bit hash value, split into parts because wasm doesn't have a
     /// 128-bit integer type.
     record metadata-hash-value {
@@ -300,412 +293,532 @@ interface types {
        upper: u64,
     }
 
-    /// A descriptor is a reference to a filesystem object, which may be a file,
-    /// directory, named pipe, special file, or other object on which filesystem
-    /// calls may be made.
-    resource descriptor {
-        /// Return a stream for reading from a file, if available.
-        ///
-        /// May fail with an error-code describing why the file cannot be read.
-        ///
-        /// Multiple read, write, and append streams may be active on the same open
-        /// file and they do not interfere with each other.
-        ///
-        /// Note: This allows using `read-stream`, which is similar to `read` in POSIX.
-        read-via-stream: func(
-            /// The offset within the file at which to start reading.
-            offset: filesize,
-        ) -> result<input-stream, error-code>;
-
-        /// Return a stream for writing to a file, if available.
-        ///
-        /// May fail with an error-code describing why the file cannot be written.
-        ///
-        /// Note: This allows using `write-stream`, which is similar to `write` in
-        /// POSIX.
-        write-via-stream: func(
-            /// The offset within the file at which to start writing.
-            offset: filesize,
-        ) -> result<output-stream, error-code>;
-
-        /// Return a stream for appending to a file, if available.
-        ///
-        /// May fail with an error-code describing why the file cannot be appended.
-        ///
-        /// Note: This allows using `write-stream`, which is similar to `write` with
-        /// `O_APPEND` in in POSIX.
-        append-via-stream: func() -> result<output-stream, error-code>;
+    /// Return a stream for reading from a file, if available.
+    ///
+    /// May fail with an error-code describing why the file cannot be read.
+    ///
+    /// Multiple read, write, and append streams may be active on the same open
+    /// file and they do not interfere with each other.
+    ///
+    /// Note: This allows using `read-stream`, which is similar to `read` in POSIX.
+    read-via-stream: func(
+        this: descriptor,
+        /// The offset within the file at which to start reading.
+        offset: filesize,
+    ) -> result<input-stream, error-code>
+
+    /// Return a stream for writing to a file, if available.
+    ///
+    /// May fail with an error-code describing why the file cannot be written.
+    ///
+    /// Note: This allows using `write-stream`, which is similar to `write` in
+    /// POSIX.
+    write-via-stream: func(
+        this: descriptor,
+        /// The offset within the file at which to start writing.
+        offset: filesize,
+    ) -> result<output-stream, error-code>
+
+    /// Return a stream for appending to a file, if available.
+    ///
+    /// May fail with an error-code describing why the file cannot be appended.
+    ///
+    /// Note: This allows using `write-stream`, which is similar to `write` with
+    /// `O_APPEND` in in POSIX.
+    append-via-stream: func(
+        this: descriptor,
+    ) -> result<output-stream, error-code>
 
-        /// Provide file advisory information on a descriptor.
-        ///
-        /// This is similar to `posix_fadvise` in POSIX.
-        advise: func(
-            /// The offset within the file to which the advisory applies.
-            offset: filesize,
-            /// The length of the region to which the advisory applies.
-            length: filesize,
-            /// The advice.
-            advice: advice
-        ) -> result<_, error-code>;
-
-        /// Synchronize the data of a file to disk.
-        ///
-        /// This function succeeds with no effect if the file descriptor is not
-        /// opened for writing.
-        ///
-        /// Note: This is similar to `fdatasync` in POSIX.
-        sync-data: func() -> result<_, error-code>;
+    /// Provide file advisory information on a descriptor.
+    ///
+    /// This is similar to `posix_fadvise` in POSIX.
+    advise: func(
+        this: descriptor,
+        /// The offset within the file to which the advisory applies.
+        offset: filesize,
+        /// The length of the region to which the advisory applies.
+        length: filesize,
+        /// The advice.
+        advice: advice
+    ) -> result<_, error-code>
+
+    /// Synchronize the data of a file to disk.
+    ///
+    /// This function succeeds with no effect if the file descriptor is not
+    /// opened for writing.
+    ///
+    /// Note: This is similar to `fdatasync` in POSIX.
+    sync-data: func(this: descriptor) -> result<_, error-code>
 
-        /// Get flags associated with a descriptor.
-        ///
-        /// Note: This returns similar flags to `fcntl(fd, F_GETFL)` in POSIX.
-        ///
-        /// Note: This returns the value that was the `fs_flags` value returned
-        /// from `fdstat_get` in earlier versions of WASI.
-        get-flags: func() -> result<descriptor-flags, error-code>;
+    /// Get flags associated with a descriptor.
+    ///
+    /// Note: This returns similar flags to `fcntl(fd, F_GETFL)` in POSIX.
+    ///
+    /// Note: This returns the value that was the `fs_flags` value returned
+    /// from `fdstat_get` in earlier versions of WASI.
+    get-flags: func(this: descriptor) -> result<descriptor-flags, error-code>
 
-        /// Get the dynamic type of a descriptor.
-        ///
-        /// Note: This returns the same value as the `type` field of the `fd-stat`
-        /// returned by `stat`, `stat-at` and similar.
-        ///
-        /// Note: This returns similar flags to the `st_mode & S_IFMT` value provided
-        /// by `fstat` in POSIX.
-        ///
-        /// Note: This returns the value that was the `fs_filetype` value returned
-        /// from `fdstat_get` in earlier versions of WASI.
-        get-type: func() -> result<descriptor-type, error-code>;
+    /// Get the dynamic type of a descriptor.
+    ///
+    /// Note: This returns the same value as the `type` field of the `fd-stat`
+    /// returned by `stat`, `stat-at` and similar.
+    ///
+    /// Note: This returns similar flags to the `st_mode & S_IFMT` value provided
+    /// by `fstat` in POSIX.
+    ///
+    /// Note: This returns the value that was the `fs_filetype` value returned
+    /// from `fdstat_get` in earlier versions of WASI.
+    get-type: func(this: descriptor) -> result<descriptor-type, error-code>
 
-        /// Adjust the size of an open file. If this increases the file's size, the
-        /// extra bytes are filled with zeros.
-        ///
-        /// Note: This was called `fd_filestat_set_size` in earlier versions of WASI.
-        set-size: func(size: filesize) -> result<_, error-code>;
+    /// Adjust the size of an open file. If this increases the file's size, the
+    /// extra bytes are filled with zeros.
+    ///
+    /// Note: This was called `fd_filestat_set_size` in earlier versions of WASI.
+    set-size: func(this: descriptor, size: filesize) -> result<_, error-code>
 
-        /// Adjust the timestamps of an open file or directory.
-        ///
-        /// Note: This is similar to `futimens` in POSIX.
-        ///
-        /// Note: This was called `fd_filestat_set_times` in earlier versions of WASI.
-        set-times: func(
-            /// The desired values of the data access timestamp.
-            data-access-timestamp: new-timestamp,
-            /// The desired values of the data modification timestamp.
-            data-modification-timestamp: new-timestamp,
-        ) -> result<_, error-code>;
-
-        /// Read from a descriptor, without using and updating the descriptor's offset.
-        ///
-        /// This function returns a list of bytes containing the data that was
-        /// read, along with a bool which, when true, indicates that the end of the
-        /// file was reached. The returned list will contain up to `length` bytes; it
-        /// may return fewer than requested, if the end of the file is reached or
-        /// if the I/O operation is interrupted.
-        ///
-        /// In the future, this may change to return a `stream<u8, error-code>`.
-        ///
-        /// Note: This is similar to `pread` in POSIX.
-        read: func(
-            /// The maximum number of bytes to read.
-            length: filesize,
-            /// The offset within the file at which to read.
-            offset: filesize,
-        ) -> result<tuple<list<u8>, bool>, error-code>;
-
-        /// Write to a descriptor, without using and updating the descriptor's offset.
-        ///
-        /// It is valid to write past the end of a file; the file is extended to the
-        /// extent of the write, with bytes between the previous end and the start of
-        /// the write set to zero.
-        ///
-        /// In the future, this may change to take a `stream<u8, error-code>`.
-        ///
-        /// Note: This is similar to `pwrite` in POSIX.
-        write: func(
-            /// Data to write
-            buffer: list<u8>,
-            /// The offset within the file at which to write.
-            offset: filesize,
-        ) -> result<filesize, error-code>;
-
-        /// Read directory entries from a directory.
-        ///
-        /// On filesystems where directories contain entries referring to themselves
-        /// and their parents, often named `.` and `..` respectively, these entries
-        /// are omitted.
-        ///
-        /// This always returns a new stream which starts at the beginning of the
-        /// directory. Multiple streams may be active on the same directory, and they
-        /// do not interfere with each other.
-        read-directory: func() -> result<directory-entry-stream, error-code>;
+    /// Adjust the timestamps of an open file or directory.
+    ///
+    /// Note: This is similar to `futimens` in POSIX.
+    ///
+    /// Note: This was called `fd_filestat_set_times` in earlier versions of WASI.
+    set-times: func(
+        this: descriptor,
+        /// The desired values of the data access timestamp.
+        data-access-timestamp: new-timestamp,
+        /// The desired values of the data modification timestamp.
+        data-modification-timestamp: new-timestamp,
+    ) -> result<_, error-code>
+
+    /// Read from a descriptor, without using and updating the descriptor's offset.
+    ///
+    /// This function returns a list of bytes containing the data that was
+    /// read, along with a bool which, when true, indicates that the end of the
+    /// file was reached. The returned list will contain up to `length` bytes; it
+    /// may return fewer than requested, if the end of the file is reached or
+    /// if the I/O operation is interrupted.
+    ///
+    /// In the future, this may change to return a `stream<u8, error-code>`.
+    ///
+    /// Note: This is similar to `pread` in POSIX.
+    read: func(
+        this: descriptor,
+        /// The maximum number of bytes to read.
+        length: filesize,
+        /// The offset within the file at which to read.
+        offset: filesize,
+    ) -> result<tuple<list<u8>, bool>, error-code>
+
+    /// Write to a descriptor, without using and updating the descriptor's offset.
+    ///
+    /// It is valid to write past the end of a file; the file is extended to the
+    /// extent of the write, with bytes between the previous end and the start of
+    /// the write set to zero.
+    ///
+    /// In the future, this may change to take a `stream<u8, error-code>`.
+    ///
+    /// Note: This is similar to `pwrite` in POSIX.
+    write: func(
+        this: descriptor,
+        /// Data to write
+        buffer: list<u8>,
+        /// The offset within the file at which to write.
+        offset: filesize,
+    ) -> result<filesize, error-code>
+
+    /// Read directory entries from a directory.
+    ///
+    /// On filesystems where directories contain entries referring to themselves
+    /// and their parents, often named `.` and `..` respectively, these entries
+    /// are omitted.
+    ///
+    /// This always returns a new stream which starts at the beginning of the
+    /// directory. Multiple streams may be active on the same directory, and they
+    /// do not interfere with each other.
+    read-directory: func(
+        this: descriptor
+    ) -> result<directory-entry-stream, error-code>
+
+    /// Synchronize the data and metadata of a file to disk.
+    ///
+    /// This function succeeds with no effect if the file descriptor is not
+    /// opened for writing.
+    ///
+    /// Note: This is similar to `fsync` in POSIX.
+    sync: func(this: descriptor) -> result<_, error-code>
 
-        /// Synchronize the data and metadata of a file to disk.
-        ///
-        /// This function succeeds with no effect if the file descriptor is not
-        /// opened for writing.
-        ///
-        /// Note: This is similar to `fsync` in POSIX.
-        sync: func() -> result<_, error-code>;
+    /// Create a directory.
+    ///
+    /// Note: This is similar to `mkdirat` in POSIX.
+    create-directory-at: func(
+        this: descriptor,
+        /// The relative path at which to create the directory.
+        path: string,
+    ) -> result<_, error-code>
+
+    /// Return the attributes of an open file or directory.
+    ///
+    /// Note: This is similar to `fstat` in POSIX, except that it does not return
+    /// device and inode information. For testing whether two descriptors refer to
+    /// the same underlying filesystem object, use `is-same-object`. To obtain
+    /// additional data that can be used do determine whether a file has been
+    /// modified, use `metadata-hash`.
+    ///
+    /// Note: This was called `fd_filestat_get` in earlier versions of WASI.
+    stat: func(this: descriptor) -> result<descriptor-stat, error-code>
 
-        /// Create a directory.
-        ///
-        /// Note: This is similar to `mkdirat` in POSIX.
-        create-directory-at: func(
-            /// The relative path at which to create the directory.
-            path: string,
-        ) -> result<_, error-code>;
+    /// Return the attributes of a file or directory.
+    ///
+    /// Note: This is similar to `fstatat` in POSIX, except that it does not
+    /// return device and inode information. See the `stat` description for a
+    /// discussion of alternatives.
+    ///
+    /// Note: This was called `path_filestat_get` in earlier versions of WASI.
+    stat-at: func(
+        this: descriptor,
+        /// Flags determining the method of how the path is resolved.
+        path-flags: path-flags,
+        /// The relative path of the file or directory to inspect.
+        path: string,
+    ) -> result<descriptor-stat, error-code>
+
+    /// Adjust the timestamps of a file or directory.
+    ///
+    /// Note: This is similar to `utimensat` in POSIX.
+    ///
+    /// Note: This was called `path_filestat_set_times` in earlier versions of
+    /// WASI.
+    set-times-at: func(
+        this: descriptor,
+        /// Flags determining the method of how the path is resolved.
+        path-flags: path-flags,
+        /// The relative path of the file or directory to operate on.
+        path: string,
+        /// The desired values of the data access timestamp.
+        data-access-timestamp: new-timestamp,
+        /// The desired values of the data modification timestamp.
+        data-modification-timestamp: new-timestamp,
+    ) -> result<_, error-code>
+
+    /// Create a hard link.
+    ///
+    /// Note: This is similar to `linkat` in POSIX.
+    link-at: func(
+        this: descriptor,
+        /// Flags determining the method of how the path is resolved.
+        old-path-flags: path-flags,
+        /// The relative source path from which to link.
+        old-path: string,
+        /// The base directory for `new-path`.
+        new-descriptor: descriptor,
+        /// The relative destination path at which to create the hard link.
+        new-path: string,
+    ) -> result<_, error-code>
+
+    /// Open a file or directory.
+    ///
+    /// The returned descriptor is not guaranteed to be the lowest-numbered
+    /// descriptor not currently open/ it is randomized to prevent applications
+    /// from depending on making assumptions about indexes, since this is
+    /// error-prone in multi-threaded contexts. The returned descriptor is
+    /// guaranteed to be less than 2**31.
+    ///
+    /// If `flags` contains `descriptor-flags::mutate-directory`, and the base
+    /// descriptor doesn't have `descriptor-flags::mutate-directory` set,
+    /// `open-at` fails with `error-code::read-only`.
+    ///
+    /// If `flags` contains `write` or `mutate-directory`, or `open-flags`
+    /// contains `truncate` or `create`, and the base descriptor doesn't have
+    /// `descriptor-flags::mutate-directory` set, `open-at` fails with
+    /// `error-code::read-only`.
+    ///
+    /// Note: This is similar to `openat` in POSIX.
+    open-at: func(
+        this: descriptor,
+        /// Flags determining the method of how the path is resolved.
+        path-flags: path-flags,
+        /// The relative path of the object to open.
+        path: string,
+        /// The method by which to open the file.
+        open-flags: open-flags,
+        /// Flags to use for the resulting descriptor.
+        %flags: descriptor-flags,
+        /// Permissions to use when creating a new file.
+        modes: modes
+    ) -> result<descriptor, error-code>
+
+    /// Read the contents of a symbolic link.
+    ///
+    /// If the contents contain an absolute or rooted path in the underlying
+    /// filesystem, this function fails with `error-code::not-permitted`.
+    ///
+    /// Note: This is similar to `readlinkat` in POSIX.
+    readlink-at: func(
+        this: descriptor,
+        /// The relative path of the symbolic link from which to read.
+        path: string,
+    ) -> result<string, error-code>
+
+    /// Remove a directory.
+    ///
+    /// Return `error-code::not-empty` if the directory is not empty.
+    ///
+    /// Note: This is similar to `unlinkat(fd, path, AT_REMOVEDIR)` in POSIX.
+    remove-directory-at: func(
+        this: descriptor,
+        /// The relative path to a directory to remove.
+        path: string,
+    ) -> result<_, error-code>
+
+    /// Rename a filesystem object.
+    ///
+    /// Note: This is similar to `renameat` in POSIX.
+    rename-at: func(
+        this: descriptor,
+        /// The relative source path of the file or directory to rename.
+        old-path: string,
+        /// The base directory for `new-path`.
+        new-descriptor: descriptor,
+        /// The relative destination path to which to rename the file or directory.
+        new-path: string,
+    ) -> result<_, error-code>
+
+    /// Create a symbolic link (also known as a "symlink").
+    ///
+    /// If `old-path` starts with `/`, the function fails with
+    /// `error-code::not-permitted`.
+    ///
+    /// Note: This is similar to `symlinkat` in POSIX.
+    symlink-at: func(
+        this: descriptor,
+        /// The contents of the symbolic link.
+        old-path: string,
+        /// The relative destination path at which to create the symbolic link.
+        new-path: string,
+    ) -> result<_, error-code>
+
+    /// Check accessibility of a filesystem path.
+    ///
+    /// Check whether the given filesystem path names an object which is
+    /// readable, writable, or executable, or whether it exists.
+    ///
+    /// This does not a guarantee that subsequent accesses will succeed, as
+    /// filesystem permissions may be modified asynchronously by external
+    /// entities.
+    ///
+    /// Note: This is similar to `faccessat` with the `AT_EACCESS` flag in POSIX.
+    access-at: func(
+        this: descriptor,
+        /// Flags determining the method of how the path is resolved.
+        path-flags: path-flags,
+        /// The relative path to check.
+        path: string,
+        /// The type of check to perform.
+        %type: access-type
+    ) -> result<_, error-code>
+
+    /// Unlink a filesystem object that is not a directory.
+    ///
+    /// Return `error-code::is-directory` if the path refers to a directory.
+    /// Note: This is similar to `unlinkat(fd, path, 0)` in POSIX.
+    unlink-file-at: func(
+        this: descriptor,
+        /// The relative path to a file to unlink.
+        path: string,
+    ) -> result<_, error-code>
+
+    /// Change the permissions of a filesystem object that is not a directory.
+    ///
+    /// Note that the ultimate meanings of these permissions is
+    /// filesystem-specific.
+    ///
+    /// Note: This is similar to `fchmodat` in POSIX.
+    change-file-permissions-at: func(
+        this: descriptor,
+        /// Flags determining the method of how the path is resolved.
+        path-flags: path-flags,
+        /// The relative path to operate on.
+        path: string,
+        /// The new permissions for the filesystem object.
+        modes: modes,
+    ) -> result<_, error-code>
+
+    /// Change the permissions of a directory.
+    ///
+    /// Note that the ultimate meanings of these permissions is
+    /// filesystem-specific.
+    ///
+    /// Unlike in POSIX, the `executable` flag is not reinterpreted as a "search"
+    /// flag. `read` on a directory implies readability and searchability, and
+    /// `execute` is not valid for directories.
+    ///
+    /// Note: This is similar to `fchmodat` in POSIX.
+    change-directory-permissions-at: func(
+        this: descriptor,
+        /// Flags determining the method of how the path is resolved.
+        path-flags: path-flags,
+        /// The relative path to operate on.
+        path: string,
+        /// The new permissions for the directory.
+        modes: modes,
+    ) -> result<_, error-code>
+
+    /// Request a shared advisory lock for an open file.
+    ///
+    /// This requests a *shared* lock; more than one shared lock can be held for
+    /// a file at the same time.
+    ///
+    /// If the open file has an exclusive lock, this function downgrades the lock
+    /// to a shared lock. If it has a shared lock, this function has no effect.
+    ///
+    /// This requests an *advisory* lock, meaning that the file could be accessed
+    /// by other programs that don't hold the lock.
+    ///
+    /// It is unspecified how shared locks interact with locks acquired by
+    /// non-WASI programs.
+    ///
+    /// This function blocks until the lock can be acquired.
+    ///
+    /// Not all filesystems support locking; on filesystems which don't support
+    /// locking, this function returns `error-code::unsupported`.
+    ///
+    /// Note: This is similar to `flock(fd, LOCK_SH)` in Unix.
+    lock-shared: func(this: descriptor) -> result<_, error-code>
 
-        /// Return the attributes of an open file or directory.
-        ///
-        /// Note: This is similar to `fstat` in POSIX, except that it does not return
-        /// device and inode information. For testing whether two descriptors refer to
-        /// the same underlying filesystem object, use `is-same-object`. To obtain
-        /// additional data that can be used do determine whether a file has been
-        /// modified, use `metadata-hash`.
-        ///
-        /// Note: This was called `fd_filestat_get` in earlier versions of WASI.
-        stat: func() -> result<descriptor-stat, error-code>;
+    /// Request an exclusive advisory lock for an open file.
+    ///
+    /// This requests an *exclusive* lock; no other locks may be held for the
+    /// file while an exclusive lock is held.
+    ///
+    /// If the open file has a shared lock and there are no exclusive locks held
+    /// for the file, this function upgrades the lock to an exclusive lock. If the
+    /// open file already has an exclusive lock, this function has no effect.
+    ///
+    /// This requests an *advisory* lock, meaning that the file could be accessed
+    /// by other programs that don't hold the lock.
+    ///
+    /// It is unspecified whether this function succeeds if the file descriptor
+    /// is not opened for writing. It is unspecified how exclusive locks interact
+    /// with locks acquired by non-WASI programs.
+    ///
+    /// This function blocks until the lock can be acquired.
+    ///
+    /// Not all filesystems support locking; on filesystems which don't support
+    /// locking, this function returns `error-code::unsupported`.
+    ///
+    /// Note: This is similar to `flock(fd, LOCK_EX)` in Unix.
+    lock-exclusive: func(this: descriptor) -> result<_, error-code>
 
-        /// Return the attributes of a file or directory.
-        ///
-        /// Note: This is similar to `fstatat` in POSIX, except that it does not
-        /// return device and inode information. See the `stat` description for a
-        /// discussion of alternatives.
-        ///
-        /// Note: This was called `path_filestat_get` in earlier versions of WASI.
-        stat-at: func(
-            /// Flags determining the method of how the path is resolved.
-            path-flags: path-flags,
-            /// The relative path of the file or directory to inspect.
-            path: string,
-        ) -> result<descriptor-stat, error-code>;
-
-        /// Adjust the timestamps of a file or directory.
-        ///
-        /// Note: This is similar to `utimensat` in POSIX.
-        ///
-        /// Note: This was called `path_filestat_set_times` in earlier versions of
-        /// WASI.
-        set-times-at: func(
-            /// Flags determining the method of how the path is resolved.
-            path-flags: path-flags,
-            /// The relative path of the file or directory to operate on.
-            path: string,
-            /// The desired values of the data access timestamp.
-            data-access-timestamp: new-timestamp,
-            /// The desired values of the data modification timestamp.
-            data-modification-timestamp: new-timestamp,
-        ) -> result<_, error-code>;
-
-        /// Create a hard link.
-        ///
-        /// Note: This is similar to `linkat` in POSIX.
-        link-at: func(
-            /// Flags determining the method of how the path is resolved.
-            old-path-flags: path-flags,
-            /// The relative source path from which to link.
-            old-path: string,
-            /// The base directory for `new-path`.
-            new-descriptor: borrow<descriptor>,
-            /// The relative destination path at which to create the hard link.
-            new-path: string,
-        ) -> result<_, error-code>;
-
-        /// Open a file or directory.
-        ///
-        /// The returned descriptor is not guaranteed to be the lowest-numbered
-        /// descriptor not currently open/ it is randomized to prevent applications
-        /// from depending on making assumptions about indexes, since this is
-        /// error-prone in multi-threaded contexts. The returned descriptor is
-        /// guaranteed to be less than 2**31.
-        ///
-        /// If `flags` contains `descriptor-flags::mutate-directory`, and the base
-        /// descriptor doesn't have `descriptor-flags::mutate-directory` set,
-        /// `open-at` fails with `error-code::read-only`.
-        ///
-        /// If `flags` contains `write` or `mutate-directory`, or `open-flags`
-        /// contains `truncate` or `create`, and the base descriptor doesn't have
-        /// `descriptor-flags::mutate-directory` set, `open-at` fails with
-        /// `error-code::read-only`.
-        ///
-        /// Note: This is similar to `openat` in POSIX.
-        open-at: func(
-            /// Flags determining the method of how the path is resolved.
-            path-flags: path-flags,
-            /// The relative path of the object to open.
-            path: string,
-            /// The method by which to open the file.
-            open-flags: open-flags,
-            /// Flags to use for the resulting descriptor.
-            %flags: descriptor-flags,
-            /// Permissions to use when creating a new file.
-            modes: modes
-        ) -> result<descriptor, error-code>;
-
-        /// Read the contents of a symbolic link.
-        ///
-        /// If the contents contain an absolute or rooted path in the underlying
-        /// filesystem, this function fails with `error-code::not-permitted`.
-        ///
-        /// Note: This is similar to `readlinkat` in POSIX.
-        readlink-at: func(
-            /// The relative path of the symbolic link from which to read.
-            path: string,
-        ) -> result<string, error-code>;
+    /// Request a shared advisory lock for an open file.
+    ///
+    /// This requests a *shared* lock; more than one shared lock can be held for
+    /// a file at the same time.
+    ///
+    /// If the open file has an exclusive lock, this function downgrades the lock
+    /// to a shared lock. If it has a shared lock, this function has no effect.
+    ///
+    /// This requests an *advisory* lock, meaning that the file could be accessed
+    /// by other programs that don't hold the lock.
+    ///
+    /// It is unspecified how shared locks interact with locks acquired by
+    /// non-WASI programs.
+    ///
+    /// This function returns `error-code::would-block` if the lock cannot be
+    /// acquired.
+    ///
+    /// Not all filesystems support locking; on filesystems which don't support
+    /// locking, this function returns `error-code::unsupported`.
+    ///
+    /// Note: This is similar to `flock(fd, LOCK_SH | LOCK_NB)` in Unix.
+    try-lock-shared: func(this: descriptor) -> result<_, error-code>
 
-        /// Remove a directory.
-        ///
-        /// Return `error-code::not-empty` if the directory is not empty.
-        ///
-        /// Note: This is similar to `unlinkat(fd, path, AT_REMOVEDIR)` in POSIX.
-        remove-directory-at: func(
-            /// The relative path to a directory to remove.
-            path: string,
-        ) -> result<_, error-code>;
+    /// Request an exclusive advisory lock for an open file.
+    ///
+    /// This requests an *exclusive* lock; no other locks may be held for the
+    /// file while an exclusive lock is held.
+    ///
+    /// If the open file has a shared lock and there are no exclusive locks held
+    /// for the file, this function upgrades the lock to an exclusive lock. If the
+    /// open file already has an exclusive lock, this function has no effect.
+    ///
+    /// This requests an *advisory* lock, meaning that the file could be accessed
+    /// by other programs that don't hold the lock.
+    ///
+    /// It is unspecified whether this function succeeds if the file descriptor
+    /// is not opened for writing. It is unspecified how exclusive locks interact
+    /// with locks acquired by non-WASI programs.
+    ///
+    /// This function returns `error-code::would-block` if the lock cannot be
+    /// acquired.
+    ///
+    /// Not all filesystems support locking; on filesystems which don't support
+    /// locking, this function returns `error-code::unsupported`.
+    ///
+    /// Note: This is similar to `flock(fd, LOCK_EX | LOCK_NB)` in Unix.
+    try-lock-exclusive: func(this: descriptor) -> result<_, error-code>
 
-        /// Rename a filesystem object.
-        ///
-        /// Note: This is similar to `renameat` in POSIX.
-        rename-at: func(
-            /// The relative source path of the file or directory to rename.
-            old-path: string,
-            /// The base directory for `new-path`.
-            new-descriptor: borrow<descriptor>,
-            /// The relative destination path to which to rename the file or directory.
-            new-path: string,
-        ) -> result<_, error-code>;
-
-        /// Create a symbolic link (also known as a "symlink").
-        ///
-        /// If `old-path` starts with `/`, the function fails with
-        /// `error-code::not-permitted`.
-        ///
-        /// Note: This is similar to `symlinkat` in POSIX.
-        symlink-at: func(
-            /// The contents of the symbolic link.
-            old-path: string,
-            /// The relative destination path at which to create the symbolic link.
-            new-path: string,
-        ) -> result<_, error-code>;
-
-        /// Check accessibility of a filesystem path.
-        ///
-        /// Check whether the given filesystem path names an object which is
-        /// readable, writable, or executable, or whether it exists.
-        ///
-        /// This does not a guarantee that subsequent accesses will succeed, as
-        /// filesystem permissions may be modified asynchronously by external
-        /// entities.
-        ///
-        /// Note: This is similar to `faccessat` with the `AT_EACCESS` flag in POSIX.
-        access-at: func(
-            /// Flags determining the method of how the path is resolved.
-            path-flags: path-flags,
-            /// The relative path to check.
-            path: string,
-            /// The type of check to perform.
-            %type: access-type
-        ) -> result<_, error-code>;
-
-        /// Unlink a filesystem object that is not a directory.
-        ///
-        /// Return `error-code::is-directory` if the path refers to a directory.
-        /// Note: This is similar to `unlinkat(fd, path, 0)` in POSIX.
-        unlink-file-at: func(
-            /// The relative path to a file to unlink.
-            path: string,
-        ) -> result<_, error-code>;
-
-        /// Change the permissions of a filesystem object that is not a directory.
-        ///
-        /// Note that the ultimate meanings of these permissions is
-        /// filesystem-specific.
-        ///
-        /// Note: This is similar to `fchmodat` in POSIX.
-        change-file-permissions-at: func(
-            /// Flags determining the method of how the path is resolved.
-            path-flags: path-flags,
-            /// The relative path to operate on.
-            path: string,
-            /// The new permissions for the filesystem object.
-            modes: modes,
-        ) -> result<_, error-code>;
-
-        /// Change the permissions of a directory.
-        ///
-        /// Note that the ultimate meanings of these permissions is
-        /// filesystem-specific.
-        ///
-        /// Unlike in POSIX, the `executable` flag is not reinterpreted as a "search"
-        /// flag. `read` on a directory implies readability and searchability, and
-        /// `execute` is not valid for directories.
-        ///
-        /// Note: This is similar to `fchmodat` in POSIX.
-        change-directory-permissions-at: func(
-            /// Flags determining the method of how the path is resolved.
-            path-flags: path-flags,
-            /// The relative path to operate on.
-            path: string,
-            /// The new permissions for the directory.
-            modes: modes,
-        ) -> result<_, error-code>;
-
-        /// Test whether two descriptors refer to the same filesystem object.
-        ///
-        /// In POSIX, this corresponds to testing whether the two descriptors have the
-        /// same device (`st_dev`) and inode (`st_ino` or `d_ino`) numbers.
-        /// wasi-filesystem does not expose device and inode numbers, so this function
-        /// may be used instead.
-        is-same-object: func(other: borrow<descriptor>) -> bool;
-
-        /// Return a hash of the metadata associated with a filesystem object referred
-        /// to by a descriptor.
-        ///
-        /// This returns a hash of the last-modification timestamp and file size, and
-        /// may also include the inode number, device number, birth timestamp, and
-        /// other metadata fields that may change when the file is modified or
-        /// replaced. It may also include a secret value chosen by the
-        /// implementation and not otherwise exposed.
-        ///
-        /// Implementations are encourated to provide the following properties:
-        ///
-        ///  - If the file is not modified or replaced, the computed hash value should
-        ///    usually not change.
-        ///  - If the object is modified or replaced, the computed hash value should
-        ///    usually change.
-        ///  - The inputs to the hash should not be easily computable from the
-        ///    computed hash.
-        ///
-        /// However, none of these is required.
-        metadata-hash: func() -> result<metadata-hash-value, error-code>;
+    /// Release a shared or exclusive lock on an open file.
+    ///
+    /// Note: This is similar to `flock(fd, LOCK_UN)` in Unix.
+    unlock: func(this: descriptor) -> result<_, error-code>
 
-        /// Return a hash of the metadata associated with a filesystem object referred
-        /// to by a directory descriptor and a relative path.
-        ///
-        /// This performs the same hash computation as `metadata-hash`.
-        metadata-hash-at: func(
-            /// Flags determining the method of how the path is resolved.
-            path-flags: path-flags,
-            /// The relative path of the file or directory to inspect.
-            path: string,
-        ) -> result<metadata-hash-value, error-code>;
-    }
+    /// Dispose of the specified `descriptor`, after which it may no longer
+    /// be used.
+    drop-descriptor: func(this: descriptor)
 
     /// A stream of directory entries.
-    resource directory-entry-stream {
-        /// Read a single directory entry from a `directory-entry-stream`.
-        read-directory-entry: func() -> result<option<directory-entry>, error-code>;
-    }
+    ///
+    /// This [represents a stream of `dir-entry`](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Streams).
+    type directory-entry-stream = u32
+
+    /// Read a single directory entry from a `directory-entry-stream`.
+    read-directory-entry: func(
+        this: directory-entry-stream
+    ) -> result<option<directory-entry>, error-code>
+
+    /// Dispose of the specified `directory-entry-stream`, after which it may no longer
+    /// be used.
+    drop-directory-entry-stream: func(this: directory-entry-stream)
 
-    /// Attempts to extract a filesystem-related `error-code` from the stream
-    /// `error` provided.
+    /// Test whether two descriptors refer to the same filesystem object.
     ///
-    /// Stream operations which return `stream-error::last-operation-failed`
-    /// have a payload with more information about the operation that failed.
-    /// This payload can be passed through to this function to see if there's
-    /// filesystem-related information about the error to return.
+    /// In POSIX, this corresponds to testing whether the two descriptors have the
+    /// same device (`st_dev`) and inode (`st_ino` or `d_ino`) numbers.
+    /// wasi-filesystem does not expose device and inode numbers, so this function
+    /// may be used instead.
+    is-same-object: func(this: descriptor, other: descriptor) -> bool
+
+    /// Return a hash of the metadata associated with a filesystem object referred
+    /// to by a descriptor.
+    ///
+    /// This returns a hash of the last-modification timestamp and file size, and
+    /// may also include the inode number, device number, birth timestamp, and
+    /// other metadata fields that may change when the file is modified or
+    /// replaced. It may also include a secret value chosen by the
+    /// implementation and not otherwise exposed.
+    ///
+    /// Implementations are encourated to provide the following properties:
+    ///
+    ///  - If the file is not modified or replaced, the computed hash value should
+    ///    usually not change.
+    ///  - If the object is modified or replaced, the computed hash value should
+    ///    usually change.
+    ///  - The inputs to the hash should not be easily computable from the
+    ///    computed hash.
+    ///
+    /// However, none of these is required.
+    metadata-hash: func(
+        this: descriptor,
+    ) -> result<metadata-hash-value, error-code>
+
+    /// Return a hash of the metadata associated with a filesystem object referred
+    /// to by a directory descriptor and a relative path.
     ///
-    /// Note that this function is fallible because not all stream-related
-    /// errors are filesystem-related errors.
-    filesystem-error-code: func(err: borrow<error>) -> option<error-code>;
+    /// This performs the same hash computation as `metadata-hash`.
+    metadata-hash-at: func(
+        this: descriptor,
+        /// Flags determining the method of how the path is resolved.
+        path-flags: path-flags,
+        /// The relative path of the file or directory to inspect.
+        path: string,
+    ) -> result<metadata-hash-value, error-code>
 }
diff --git a/crates/wasi/wit/deps/filesystem/world.wit b/crates/wasi/wit/deps/filesystem/world.wit
index a4654e4cc451..b51f484f8383 100644
--- a/crates/wasi/wit/deps/filesystem/world.wit
+++ b/crates/wasi/wit/deps/filesystem/world.wit
@@ -1,6 +1,6 @@
-package wasi:filesystem@0.2.0-rc-2023-11-05;
+package wasi:filesystem
 
-world imports {
-    import types;
-    import preopens;
+world example-world {
+    import types
+    import preopens
 }
diff --git a/crates/wasi/wit/deps/http/handler.wit b/crates/wasi/wit/deps/http/handler.wit
deleted file mode 100644
index 21b97a354cc7..000000000000
--- a/crates/wasi/wit/deps/http/handler.wit
+++ /dev/null
@@ -1,41 +0,0 @@
-/// This interface defines a handler of incoming HTTP Requests. It should
-/// be exported by components which can respond to HTTP Requests.
-interface incoming-handler {
-  use types.{incoming-request, response-outparam};
-
-  /// This function is invoked with an incoming HTTP Request, and a resource
-  /// `response-outparam` which provides the capability to reply with an HTTP
-  /// Response. The response is sent by calling the `response-outparam.set`
-  /// method, which allows execution to continue after the response has been
-  /// sent. This enables both streaming to the response body, and performing other
-  /// work.
-  ///
-  /// The implementor of this function must write a response to the
-  /// `response-outparam` before returning, or else the caller will respond
-  /// with an error on its behalf.
-  handle: func(
-    request: incoming-request,
-    response-out: response-outparam
-  );
-}
-
-/// This interface defines a handler of outgoing HTTP Requests. It should be
-/// imported by components which wish to make HTTP Requests.
-interface outgoing-handler {
-  use types.{outgoing-request, request-options, future-incoming-response, error};
-
-  /// This function is invoked with an outgoing HTTP Request, and it returns
-  /// a resource `future-incoming-response` which represents an HTTP Response
-  /// which may arrive in the future.
-  ///
-  /// The `options` argument accepts optional parameters for the HTTP
-  /// protocol's transport layer.
-  ///
-  /// This function may return an error if the `outgoing-request` is invalid
-  /// or not allowed to be made. Otherwise, protocol errors are reported
-  /// through the `future-incoming-response`.
-  handle: func(
-    request: outgoing-request,
-    options: option<request-options>
-  ) -> result<future-incoming-response, error>;
-}
diff --git a/crates/wasi/wit/deps/http/incoming-handler.wit b/crates/wasi/wit/deps/http/incoming-handler.wit
new file mode 100644
index 000000000000..d0e270465593
--- /dev/null
+++ b/crates/wasi/wit/deps/http/incoming-handler.wit
@@ -0,0 +1,24 @@
+// The `wasi:http/incoming-handler` interface is meant to be exported by
+// components and called by the host in response to a new incoming HTTP
+// response.
+//
+//   NOTE: in Preview3, this interface will be merged with
+//   `wasi:http/outgoing-handler` into a single `wasi:http/handler` interface
+//   that takes a `request` parameter and returns a `response` result.
+//
+interface incoming-handler {
+  use types.{incoming-request, response-outparam}
+
+  // The `handle` function takes an outparam instead of returning its response
+  // so that the component may stream its response while streaming any other
+  // request or response bodies. The callee MUST write a response to the
+  // `response-out` and then finish the response before returning. The `handle`
+  // function is allowed to continue execution after finishing the response's
+  // output stream. While this post-response execution is taken off the
+  // critical path, since there is no return value, there is no way to report
+  // its success or failure.
+  handle: func(
+    request: incoming-request,
+    response-out: response-outparam
+  )
+}
diff --git a/crates/wasi/wit/deps/http/outgoing-handler.wit b/crates/wasi/wit/deps/http/outgoing-handler.wit
new file mode 100644
index 000000000000..06c8e469f95b
--- /dev/null
+++ b/crates/wasi/wit/deps/http/outgoing-handler.wit
@@ -0,0 +1,18 @@
+// The `wasi:http/outgoing-handler` interface is meant to be imported by
+// components and implemented by the host.
+//
+//   NOTE: in Preview3, this interface will be merged with
+//   `wasi:http/outgoing-handler` into a single `wasi:http/handler` interface
+//   that takes a `request` parameter and returns a `response` result.
+//
+interface outgoing-handler {
+  use types.{outgoing-request, request-options, future-incoming-response}
+
+  // The parameter and result types of the `handle` function allow the caller
+  // to concurrently stream the bodies of the outgoing request and the incoming
+  // response.
+  handle: func(
+    request: outgoing-request,
+    options: option<request-options>
+  ) -> future-incoming-response
+}
diff --git a/crates/wasi/wit/deps/http/proxy.wit b/crates/wasi/wit/deps/http/proxy.wit
index 3fa8b9c631d9..162ab32b2348 100644
--- a/crates/wasi/wit/deps/http/proxy.wit
+++ b/crates/wasi/wit/deps/http/proxy.wit
@@ -1,34 +1,34 @@
-package wasi:http@0.2.0-rc-2023-11-05;
+package wasi:http
 
-/// The `wasi:http/proxy` world captures a widely-implementable intersection of
-/// hosts that includes HTTP forward and reverse proxies. Components targeting
-/// this world may concurrently stream in and out any number of incoming and
-/// outgoing HTTP requests.
+// The `wasi:http/proxy` world captures a widely-implementable intersection of
+// hosts that includes HTTP forward and reverse proxies. Components targeting
+// this world may concurrently stream in and out any number of incoming and
+// outgoing HTTP requests.
 world proxy {
-  /// HTTP proxies have access to time and randomness.
-  import wasi:clocks/wall-clock@0.2.0-rc-2023-11-05;
-  import wasi:clocks/monotonic-clock@0.2.0-rc-2023-11-05;
-  import wasi:clocks/timezone@0.2.0-rc-2023-11-05;
-  import wasi:random/random@0.2.0-rc-2023-11-05;
+  // HTTP proxies have access to time and randomness.
+  import wasi:clocks/wall-clock
+  import wasi:clocks/monotonic-clock
+  import wasi:clocks/timezone
+  import wasi:random/random
 
-  /// Proxies have standard output and error streams which are expected to
-  /// terminate in a developer-facing console provided by the host.
-  import wasi:cli/stdout@0.2.0-rc-2023-11-05;
-  import wasi:cli/stderr@0.2.0-rc-2023-11-05;
+  // Proxies have standard output and error streams which are expected to
+  // terminate in a developer-facing console provided by the host.
+  import wasi:cli/stdout
+  import wasi:cli/stderr
 
-  /// TODO: this is a temporary workaround until component tooling is able to
-  /// gracefully handle the absence of stdin. Hosts must return an eof stream
-  /// for this import, which is what wasi-libc + tooling will do automatically
-  /// when this import is properly removed.
-  import wasi:cli/stdin@0.2.0-rc-2023-11-05;
+  // TODO: this is a temporary workaround until component tooling is able to
+  // gracefully handle the absence of stdin. Hosts must return an eof stream
+  // for this import, which is what wasi-libc + tooling will do automatically
+  // when this import is properly removed.
+  import wasi:cli/stdin
 
-  /// This is the default handler to use when user code simply wants to make an
-  /// HTTP request (e.g., via `fetch()`).
-  import outgoing-handler;
+  // This is the default handler to use when user code simply wants to make an
+  // HTTP request (e.g., via `fetch()`).
+  import outgoing-handler
 
-  /// The host delivers incoming HTTP requests to a component by calling the
-  /// `handle` function of this exported interface. A host may arbitrarily reuse
-  /// or not reuse component instance when delivering incoming HTTP requests and
-  /// thus a component must be able to handle 0..N calls to `handle`.
-  export incoming-handler;
+  // The host delivers incoming HTTP requests to a component by calling the
+  // `handle` function of this exported interface. A host may arbitrarily reuse
+  // or not reuse component instance when delivering incoming HTTP requests and
+  // thus a component must be able to handle 0..N calls to `handle`.
+  export incoming-handler
 }
diff --git a/crates/wasi/wit/deps/http/types.wit b/crates/wasi/wit/deps/http/types.wit
index 343d3222020f..7b7b015529c0 100644
--- a/crates/wasi/wit/deps/http/types.wit
+++ b/crates/wasi/wit/deps/http/types.wit
@@ -1,11 +1,11 @@
-/// This interface defines all of the types and methods for implementing
-/// HTTP Requests and Responses, both incoming and outgoing, as well as
-/// their headers, trailers, and bodies.
+// The `wasi:http/types` interface is meant to be imported by components to
+// define the HTTP resource types and operations used by the component's
+// imported and exported interfaces.
 interface types {
-  use wasi:io/streams@0.2.0-rc-2023-11-05.{input-stream, output-stream};
-  use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable};
+  use wasi:io/streams.{input-stream, output-stream}
+  use wasi:poll/poll.{pollable}
 
-  /// This type corresponds to HTTP standard Methods.
+  // This type corresponds to HTTP standard Methods.
   variant method {
     get,
     head,
@@ -19,321 +19,137 @@ interface types {
     other(string)
   }
 
-  /// This type corresponds to HTTP standard Related Schemes.
+  // This type corresponds to HTTP standard Related Schemes.
   variant scheme {
     HTTP,
     HTTPS,
     other(string)
   }
 
-  /// TODO: perhaps better align with HTTP semantics?
-  /// This type enumerates the different kinds of errors that may occur when
-  /// initially returning a response.
+  // TODO: perhaps better align with HTTP semantics?
+  // This type enumerates the different kinds of errors that may occur when
+  // initially returning a response.
   variant error {
-    invalid-url(string),
-    timeout-error(string),
-    protocol-error(string),
-    unexpected-error(string)
+      invalid-url(string),
+      timeout-error(string),
+      protocol-error(string),
+      unexpected-error(string)
   }
 
-  /// Field keys are always strings.
-  type field-key = string;
-
-  /// Field values should always be ASCII strings. However, in
-  /// reality, HTTP implementations often have to interpret malformed values,
-  /// so they are provided as a list of bytes.
-  type field-value = list<u8>;
-
-  /// This following block defines the `fields` resource which corresponds to
-  /// HTTP standard Fields. Fields are a common representation used for both
-  /// Headers and Trailers.
-  resource fields {
-
-    /// Construct an HTTP Fields.
-    ///
-    /// The list represents each key-value pair in the Fields. Keys
-    /// which have multiple values are represented by multiple entries in this
-    /// list with the same key.
-    ///
-    /// The tuple is a pair of the field key, represented as a string, and
-    /// Value, represented as a list of bytes. In a valid Fields, all keys
-    /// and values are valid UTF-8 strings. However, values are not always
-    /// well-formed, so they are represented as a raw list of bytes.
-    constructor(entries: list<tuple<field-key,field-value>>);
-
-    /// Get all of the values corresponding to a key.
-    get: func(name: field-key) -> list<field-value>;
-
-    /// Set all of the values for a key. Clears any existing values for that
-    /// key, if they have been set.
-    set: func(name: field-key, value: list<field-value>);
-
-    /// Delete all values for a key. Does nothing if no values for the key
-    /// exist.
-    delete: func(name: field-key);
-
-    /// Append a value for a key. Does not change or delete any existing
-    /// values for that key.
-    append: func(name: field-key, value: field-value);
-
-
-    /// Retrieve the full set of keys and values in the Fields. Like the
-    /// constructor, the list represents each key-value pair. 
-    ///
-    /// The outer list represents each key-value pair in the Fields. Keys
-    /// which have multiple values are represented by multiple entries in this
-    /// list with the same key.
-    entries: func() -> list<tuple<field-key,field-value>>;
-
-    /// Make a deep copy of the Fields. Equivelant in behavior to calling the
-    /// `fields` constructor on the return value of `entries` 
-    clone: func() -> fields;
-  }
-
-  /// Headers is an alias for Fields.
-  type headers = fields;
-
-  /// Trailers is an alias for Fields.
-  type trailers = fields;
-
-  /// Represents an incoming HTTP Request.
-  resource incoming-request {
-
-    /// Returns the method of the incoming request.
-    method: func() -> method;
-
-    /// Returns the path with query parameters from the request, as a string.
-    path-with-query: func() -> option<string>;
-
-    /// Returns the protocol scheme from the request.
-    scheme: func() -> option<scheme>;
-
-    /// Returns the authority from the request, if it was present.
-    authority: func() -> option<string>;
-
-    /// Returns the `headers` from the request.
-    ///
-    /// The `headers` returned are a child resource: it must be dropped before
-    /// the parent `incoming-request` is dropped. Dropping this
-    /// `incoming-request` before all children are dropped will trap.
-    headers: func() -> headers;
-
-    /// Gives the `incoming-body` associated with this request. Will only
-    /// return success at most once, and subsequent calls will return error.
-    consume: func() -> result<incoming-body>;
-  }
-
-  /// Represents an outgoing HTTP Request.
-  resource outgoing-request {
-
-    /// Construct a new `outgoing-request`.
-    constructor(
-      method: method,
-      path-with-query: option<string>,
-      scheme: option<scheme>,
-      authority: option<string>,
-      headers: borrow<headers>
-    );
-
-    /// Will return the outgoing-body child at most once. If called more than
-    /// once, subsequent calls will return error.
-    write: func() -> result<outgoing-body>;
-  }
-
-  /// Parameters for making an HTTP Request. Each of these parameters is an
-  /// optional timeout, with the unit in milliseconds, applicable to the
-  /// transport layer of the HTTP protocol.
-  ///
-  /// These timeouts are separate from any the user may use to bound a
-  /// blocking call to `wasi:io/poll.poll-list`.
-  ///
-  /// FIXME: Make this a resource to allow it to be optionally extended by
-  /// future evolution of the standard and/or other interfaces at some later
-  /// date?
+  // This following block defines the `fields` resource which corresponds to
+  // HTTP standard Fields. Soon, when resource types are added, the `type
+  // fields = u32` type alias can be replaced by a proper `resource fields`
+  // definition containing all the functions using the method syntactic sugar.
+  type fields = u32
+  drop-fields: func(fields: fields)
+  new-fields: func(entries: list<tuple<string,string>>) -> fields
+  fields-get: func(fields: fields, name: string) -> list<list<u8>>
+  fields-set: func(fields: fields, name: string, value: list<list<u8>>)
+  fields-delete: func(fields: fields, name: string)
+  fields-append: func(fields: fields, name: string, value: list<u8>)
+  fields-entries: func(fields: fields) -> list<tuple<string,list<u8>>>
+  fields-clone: func(fields: fields) -> fields
+
+  type headers = fields
+  type trailers = fields
+
+  // The following block defines stream types which corresponds to the HTTP
+  // standard Contents and Trailers. With Preview3, all of these fields can be
+  // replaced by a stream<u8, option<trailers>>. In the interim, we need to
+  // build on separate resource types defined by `wasi:io/streams`. The
+  // `finish-` functions emulate the stream's result value and MUST be called
+  // exactly once after the final read/write from/to the stream before dropping
+  // the stream.
+  type incoming-stream = input-stream
+  type outgoing-stream = output-stream
+  finish-incoming-stream: func(s: incoming-stream) -> option<trailers>
+  finish-outgoing-stream: func(s: outgoing-stream, trailers: option<trailers>)
+
+  // The following block defines the `incoming-request` and `outgoing-request`
+  // resource types that correspond to HTTP standard Requests. Soon, when
+  // resource types are added, the `u32` type aliases can be replaced by
+  // proper `resource` type definitions containing all the functions as
+  // methods. Later, Preview2 will allow both types to be merged together into
+  // a single `request` type (that uses the single `stream` type mentioned
+  // above). The `consume` and `write` methods may only be called once (and
+  // return failure thereafter).
+  type incoming-request = u32
+  type outgoing-request = u32
+  drop-incoming-request: func(request: incoming-request)
+  drop-outgoing-request: func(request: outgoing-request)
+  incoming-request-method: func(request: incoming-request) -> method
+  incoming-request-path-with-query: func(request: incoming-request) -> option<string>
+  incoming-request-scheme: func(request: incoming-request) -> option<scheme>
+  incoming-request-authority: func(request: incoming-request) -> option<string>
+  incoming-request-headers: func(request: incoming-request) -> headers
+  incoming-request-consume: func(request: incoming-request) -> result<incoming-stream>
+  new-outgoing-request: func(
+    method: method,
+    path-with-query: option<string>,
+    scheme: option<scheme>,
+    authority: option<string>,
+    headers: headers
+  ) -> outgoing-request
+  outgoing-request-write: func(request: outgoing-request) -> result<outgoing-stream>
+
+  // Additional optional parameters that can be set when making a request.
   record request-options {
+    // The following timeouts are specific to the HTTP protocol and work
+    // independently of the overall timeouts passed to `io.poll.poll-oneoff`.
 
-    /// The timeout for the initial connect to the HTTP Server.
+    // The timeout for the initial connect.
     connect-timeout-ms: option<u32>,
 
-    /// The timeout for receiving the first byte of the Response body.
+    // The timeout for receiving the first byte of the response body.
     first-byte-timeout-ms: option<u32>,
 
-    /// The timeout for receiving subsequent chunks of bytes in the Response
-    /// body stream.
+    // The timeout for receiving the next chunk of bytes in the response body
+    // stream.
     between-bytes-timeout-ms: option<u32>
   }
 
-  /// Represents the ability to send an HTTP Response.
-  ///
-  /// This resource is used by the `wasi:http/incoming-handler` interface to
-  /// allow a Response to be sent corresponding to the Request provided as the
-  /// other argument to `incoming-handler.handle`.
-  resource response-outparam {
-
-    /// Set the value of the `response-outparam` to either send a response,
-    /// or indicate an error.
-    ///
-    /// This method consumes the `response-outparam` to ensure that it is
-    /// called at most once. If it is never called, the implementation
-    /// will respond with an error.
-    set: static func(
-      param: response-outparam,
-      response: result<outgoing-response, error>,
-    );
-  }
-
-  /// This type corresponds to the HTTP standard Status Code.
-  type status-code = u16;
-
-  /// Represents an incoming HTTP Response.
-  resource incoming-response {
-
-    /// Returns the status code from the incoming response.
-    status: func() -> status-code;
-
-    /// Returns the headers from the incoming response.
-    headers: func() -> headers;
-
-    /// Returns the incoming body. May be called at most once. Returns error
-    /// if called additional times.
-    consume: func() -> result<incoming-body>;
-  }
-
-  /// Represents an incoming HTTP Request or Response's Body.
-  ///
-  /// A body has both its contents - a stream of bytes - and a (possibly
-  /// empty) set of trailers, indicating that the full contents of the
-  /// body have been received. This resource represents the contents as
-  /// an `input-stream` and the delivery of trailers as a `future-trailers`,
-  /// and ensures that the user of this interface may only be consuming either
-  /// the body contents or waiting on trailers at any given time.
-  resource incoming-body {
-
-    /// Returns the contents of the body, as a stream of bytes.
-    ///
-    /// Returns success on first call: the stream representing the contents
-    /// can be retrieved at most once. Subsequent calls will return error.
-    ///
-    /// The returned `input-stream` resource is a child: it must be dropped
-    /// before the parent `incoming-body` is dropped, or consumed by
-    /// `incoming-body.finish`.
-    ///
-    /// This invariant ensures that the implementation can determine whether
-    /// the user is consuming the contents of the body, waiting on the
-    /// `future-trailers` to be ready, or neither. This allows for network
-    /// backpressure is to be applied when the user is consuming the body,
-    /// and for that backpressure to not inhibit delivery of the trailers if
-    /// the user does not read the entire body.
-    %stream: func() -> result<input-stream>;
-
-    /// Takes ownership of `incoming-body`, and returns a `future-trailers`.
-    /// This function will trap if the `input-stream` child is still alive.
-    finish: static func(this: incoming-body) -> future-trailers;
-  }
-
-  /// Represents a future which may eventaully return trailers, or an error.
-  ///
-  /// In the case that the incoming HTTP Request or Response did not have any
-  /// trailers, this future will resolve to the empty set of trailers once the
-  /// complete Request or Response body has been received.
-  resource future-trailers {
-
-    /// Returns a pollable which becomes ready when either the trailers have
-    /// been received, or an error has occured. When this pollable is ready,
-    /// the `get` method will return `some`.
-    subscribe: func() -> pollable;
-
-    /// Returns the contents of the trailers, or an error which occured,
-    /// once the future is ready.
-    ///
-    /// The outer `option` represents future readiness. Users can wait on this
-    /// `option` to become `some` using the `subscribe` method.
-    ///
-    /// The `result` represents that either the HTTP Request or Response body,
-    /// as well as any trailers, were received successfully, or that an error
-    /// occured receiving them. The optional `trailers` indicates whether or not
-    /// trailers were present in the body.
-    get: func() -> option<result<option<trailers>, error>>;
-  }
-
-  /// Represents an outgoing HTTP Response.
-  resource outgoing-response {
-
-    /// Construct an `outgoing-response`.
-    constructor(status-code: status-code, headers: borrow<headers>);
-
-    /// Returns the resource corresponding to the outgoing Body for this Response.
-    ///
-    /// Returns success on the first call: the `outgoing-body` resource for
-    /// this `outgoing-response` can be retrieved at most once. Sunsequent
-    /// calls will return error.
-    ///
-    /// FIXME: rename this method to `body`.
-    write: func() -> result<outgoing-body>;
-  }
-
-  /// Represents an outgoing HTTP Request or Response's Body.
-  ///
-  /// A body has both its contents - a stream of bytes - and a (possibly
-  /// empty) set of trailers, inducating the full contents of the body
-  /// have been sent. This resource represents the contents as an
-  /// `output-stream` child resource, and the completion of the body (with
-  /// optional trailers) with a static function that consumes the
-  /// `outgoing-body` resource, and ensures that the user of this interface
-  /// may not write to the body contents after the body has been finished.
-  ///
-  /// If the user code drops this resource, as opposed to calling the static
-  /// method `finish`, the implementation should treat the body as incomplete,
-  /// and that an error has occured. The implementation should propogate this
-  /// error to the HTTP protocol by whatever means it has available,
-  /// including: corrupting the body on the wire, aborting the associated
-  /// Request, or sending a late status code for the Response.
-  resource outgoing-body {
-
-    /// Returns a stream for writing the body contents.
-    ///
-    /// The returned `output-stream` is a child resource: it must be dropped
-    /// before the parent `outgoing-body` resource is dropped (or finished),
-    /// otherwise the `outgoing-body` drop or `finish` will trap.
-    ///
-    /// Returns success on the first call: the `output-stream` resource for
-    /// this `outgoing-body` may be retrieved at most once. Subsequent calls
-    /// will return error.
-    write: func() -> result<output-stream>;
-
-    /// Finalize an outgoing body, optionally providing trailers. This must be
-    /// called to signal that the response is complete. If the `outgoing-body`
-    /// is dropped without calling `outgoing-body.finalize`, the implementation
-    /// should treat the body as corrupted.
-    finish: static func(this: outgoing-body, trailers: option<trailers>);
-  }
-
-  /// Represents a future which may eventaully return an incoming HTTP
-  /// Response, or an error.
-  ///
-  /// This resource is returned by the `wasi:http/outgoing-handler` interface to
-  /// provide the HTTP Response corresponding to the sent Request.
-  resource future-incoming-response {
-    /// Returns a pollable which becomes ready when either the Response has
-    /// been received, or an error has occured. When this pollable is ready,
-    /// the `get` method will return `some`.
-    subscribe: func() -> pollable;
-
-    /// Returns the incoming HTTP Response, or an error, once one is ready.
-    ///
-    /// The outer `option` represents future readiness. Users can wait on this
-    /// `option` to become `some` using the `subscribe` method.
-    ///
-    /// The outer `result` is used to retrieve the response or error at most
-    /// once. It will be success on the first call in which the outer option
-    /// is `some`, and error on subsequent calls.
-    ///
-    /// The inner `result` represents that either the incoming HTTP Response
-    /// status and headers have recieved successfully, or that an error
-    /// occured. Errors may also occur while consuming the response body,
-    /// but those will be reported by the `incoming-body` and its
-    /// `output-stream` child.
-    get: func() -> option<result<result<incoming-response, error>>>;
-
-  }
+  // The following block defines a special resource type used by the
+  // `wasi:http/incoming-handler` interface. When resource types are added, this
+  // block can be replaced by a proper `resource response-outparam { ... }`
+  // definition. Later, with Preview3, the need for an outparam goes away entirely
+  // (the `wasi:http/handler` interface used for both incoming and outgoing can
+  // simply return a `stream`).
+  type response-outparam = u32
+  drop-response-outparam: func(response: response-outparam)
+  set-response-outparam: func(param: response-outparam, response: result<outgoing-response, error>) -> result
+
+  // This type corresponds to the HTTP standard Status Code.
+  type status-code = u16
+
+  // The following block defines the `incoming-response` and `outgoing-response`
+  // resource types that correspond to HTTP standard Responses. Soon, when
+  // resource types are added, the `u32` type aliases can be replaced by proper
+  // `resource` type definitions containing all the functions as methods. Later,
+  // Preview2 will allow both types to be merged together into a single `response`
+  // type (that uses the single `stream` type mentioned above). The `consume` and
+  // `write` methods may only be called once (and return failure thereafter).
+  type incoming-response = u32
+  type outgoing-response = u32
+  drop-incoming-response: func(response: incoming-response)
+  drop-outgoing-response: func(response: outgoing-response)
+  incoming-response-status: func(response: incoming-response) -> status-code
+  incoming-response-headers: func(response: incoming-response) -> headers
+  incoming-response-consume: func(response: incoming-response) -> result<incoming-stream>
+  new-outgoing-response: func(
+    status-code: status-code,
+    headers: headers
+  ) -> outgoing-response
+  outgoing-response-write: func(response: outgoing-response) -> result<outgoing-stream>
+
+  // The following block defines a special resource type used by the
+  // `wasi:http/outgoing-handler` interface to emulate
+  // `future<result<response, error>>` in advance of Preview3. Given a
+  // `future-incoming-response`, the client can call the non-blocking `get`
+  // method to get the result if it is available. If the result is not available,
+  // the client can call `listen` to get a `pollable` that can be passed to
+  // `io.poll.poll-oneoff`.
+  type future-incoming-response = u32
+  drop-future-incoming-response: func(f: future-incoming-response)
+  future-incoming-response-get: func(f: future-incoming-response) -> option<result<incoming-response, error>>
+  listen-to-future-incoming-response: func(f: future-incoming-response) -> pollable
 }
diff --git a/crates/wasi/wit/deps/io/poll.wit b/crates/wasi/wit/deps/io/poll.wit
deleted file mode 100644
index 52a4957dc496..000000000000
--- a/crates/wasi/wit/deps/io/poll.wit
+++ /dev/null
@@ -1,34 +0,0 @@
-package wasi:io@0.2.0-rc-2023-11-05;
-
-/// A poll API intended to let users wait for I/O events on multiple handles
-/// at once.
-interface poll {
-    /// A "pollable" handle.
-    resource pollable;
-
-    /// Poll for completion on a set of pollables.
-    ///
-    /// This function takes a list of pollables, which identify I/O sources of
-    /// interest, and waits until one or more of the events is ready for I/O.
-    ///
-    /// The result `list<u32>` contains one or more indices of handles in the
-    /// argument list that is ready for I/O.
-    ///
-    /// If the list contains more elements than can be indexed with a `u32`
-    /// value, this function traps.
-    ///
-    /// A timeout can be implemented by adding a pollable from the
-    /// wasi-clocks API to the list.
-    ///
-    /// This function does not return a `result`; polling in itself does not
-    /// do any I/O so it doesn't fail. If any of the I/O sources identified by
-    /// the pollables has an error, it is indicated by marking the source as
-    /// being reaedy for I/O.
-    poll-list: func(in: list<borrow<pollable>>) -> list<u32>;
-
-    /// Poll for completion on a single pollable.
-    ///
-    /// This function is similar to `poll-list`, but operates on only a single
-    /// pollable. When it returns, the handle is ready for I/O.
-    poll-one: func(in: borrow<pollable>);
-}
diff --git a/crates/wasi/wit/deps/io/streams.wit b/crates/wasi/wit/deps/io/streams.wit
index 9442f60c0e16..e2631f66a569 100644
--- a/crates/wasi/wit/deps/io/streams.wit
+++ b/crates/wasi/wit/deps/io/streams.wit
@@ -1,4 +1,4 @@
-package wasi:io@0.2.0-rc-2023-11-05;
+package wasi:io
 
 /// WASI I/O is an I/O abstraction API which is currently focused on providing
 /// stream types.
@@ -6,274 +6,295 @@ package wasi:io@0.2.0-rc-2023-11-05;
 /// In the future, the component model is expected to add built-in stream types;
 /// when it does, they are expected to subsume this API.
 interface streams {
-    use poll.{pollable};
+    use wasi:poll/poll.{pollable}
 
-    /// An error for input-stream and output-stream operations.
-    variant stream-error {
-        /// The last operation (a write or flush) failed before completion.
-        ///
-        /// More information is available in the `error` payload.
-        last-operation-failed(error),
-        /// The stream is closed: no more input will be accepted by the
-        /// stream. A closed output-stream will return this error on all
-        /// future operations.
-        closed
-    }
-
-    /// Contextual error information about the last failure that happened on
-    /// a read, write, or flush from an `input-stream` or `output-stream`.
-    ///
-    /// This type is returned through the `stream-error` type whenever an
-    /// operation on a stream directly fails or an error is discovered
-    /// after-the-fact, for example when a write's failure shows up through a
-    /// later `flush` or `check-write`.
+    /// Streams provide a sequence of data and then end; once they end, they
+    /// no longer provide any further data.
     ///
-    /// Interfaces such as `wasi:filesystem/types` provide functionality to
-    /// further "downcast" this error into interface-specific error information.
-    resource error {
-        /// Returns a string that's suitable to assist humans in debugging this
-        /// error.
-        ///
-        /// The returned string will change across platforms and hosts which
-        /// means that parsing it, for example, would be a
-        /// platform-compatibility hazard.
-        to-debug-string: func() -> string;
+    /// For example, a stream reading from a file ends when the stream reaches
+    /// the end of the file. For another example, a stream reading from a
+    /// socket ends when the socket is closed.
+    enum stream-status {
+        /// The stream is open and may produce further data.
+        open,
+        /// When reading, this indicates that the stream will not produce
+        /// further data.
+        /// When writing, this indicates that the stream will no longer be read.
+        /// Further writes are still permitted.
+        ended,
     }
 
-    /// An input bytestream.
+    /// An input bytestream. In the future, this will be replaced by handle
+    /// types.
     ///
     /// `input-stream`s are *non-blocking* to the extent practical on underlying
     /// platforms. I/O operations always return promptly; if fewer bytes are
     /// promptly available than requested, they return the number of bytes promptly
     /// available, which could even be zero. To wait for data to be available,
-    /// use the `subscribe` function to obtain a `pollable` which can be polled
-    /// for using `wasi:io/poll`.
-    resource input-stream {
-        /// Perform a non-blocking read from the stream.
-        ///
-        /// This function returns a list of bytes containing the data that was
-        /// read, along with a `stream-status` which, indicates whether further
-        /// reads are expected to produce data. The returned list will contain up to
-        /// `len` bytes; it may return fewer than requested, but not more. An
-        /// empty list and `stream-status:open` indicates no more data is
-        /// available at this time, and that the pollable given by `subscribe`
-        /// will be ready when more data is available.
-        ///
-        /// Once a stream has reached the end, subsequent calls to `read` or
-        /// `skip` will always report `stream-status:ended` rather than producing more
-        /// data.
-        ///
-        /// When the caller gives a `len` of 0, it represents a request to read 0
-        /// bytes. This read should  always succeed and return an empty list and
-        /// the current `stream-status`.
-        ///
-        /// The `len` parameter is a `u64`, which could represent a list of u8 which
-        /// is not possible to allocate in wasm32, or not desirable to allocate as
-        /// as a return value by the callee. The callee may return a list of bytes
-        /// less than `len` in size while more bytes are available for reading.
-        read: func(
-            /// The maximum number of bytes to read
-            len: u64
-        ) -> result<list<u8>, stream-error>;
+    /// use the `subscribe-to-input-stream` function to obtain a `pollable` which
+    /// can be polled for using `wasi:poll/poll.poll_oneoff`.
+    ///
+    /// And at present, it is a `u32` instead of being an actual handle, until
+    /// the wit-bindgen implementation of handles and resources is ready.
+    ///
+    /// This [represents a resource](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources).
+    type input-stream = u32
+
+    /// Perform a non-blocking read from the stream.
+    ///
+    /// This function returns a list of bytes containing the data that was
+    /// read, along with a `stream-status` which, indicates whether further
+    /// reads are expected to produce data. The returned list will contain up to
+    /// `len` bytes; it may return fewer than requested, but not more. An
+    /// empty list and `stream-status:open` indicates no more data is
+    /// available at this time, and that the pollable given by
+    /// `subscribe-to-input-stream` will be ready when more data is available.
+    /// 
+    /// Once a stream has reached the end, subsequent calls to `read` or
+    /// `skip` will always report `stream-status:ended` rather than producing more
+    /// data.
+    ///
+    /// When the caller gives a `len` of 0, it represents a request to read 0
+    /// bytes. This read should  always succeed and return an empty list and
+    /// the current `stream-status`.
+    ///
+    /// The `len` parameter is a `u64`, which could represent a list of u8 which
+    /// is not possible to allocate in wasm32, or not desirable to allocate as
+    /// as a return value by the callee. The callee may return a list of bytes
+    /// less than `len` in size while more bytes are available for reading.
+    read: func(
+        this: input-stream,
+        /// The maximum number of bytes to read
+        len: u64
+    ) -> result<tuple<list<u8>, stream-status>>
 
-        /// Read bytes from a stream, after blocking until at least one byte can
-        /// be read. Except for blocking, identical to `read`.
-        blocking-read: func(
-            /// The maximum number of bytes to read
-            len: u64
-        ) -> result<list<u8>, stream-error>;
+    /// Read bytes from a stream, after blocking until at least one byte can
+    /// be read. Except for blocking, identical to `read`.
+    blocking-read: func(
+        this: input-stream,
+        /// The maximum number of bytes to read
+        len: u64
+    ) -> result<tuple<list<u8>, stream-status>>
 
-        /// Skip bytes from a stream.
-        ///
-        /// This is similar to the `read` function, but avoids copying the
-        /// bytes into the instance.
-        ///
-        /// Once a stream has reached the end, subsequent calls to read or
-        /// `skip` will always report end-of-stream rather than producing more
-        /// data.
-        ///
-        /// This function returns the number of bytes skipped, along with a
-        /// `stream-status` indicating whether the end of the stream was
-        /// reached. The returned value will be at most `len`; it may be less.
-        skip: func(
-            /// The maximum number of bytes to skip.
-            len: u64,
-        ) -> result<u64, stream-error>;
+    /// Skip bytes from a stream.
+    ///
+    /// This is similar to the `read` function, but avoids copying the
+    /// bytes into the instance.
+    ///
+    /// Once a stream has reached the end, subsequent calls to read or
+    /// `skip` will always report end-of-stream rather than producing more
+    /// data.
+    ///
+    /// This function returns the number of bytes skipped, along with a
+    /// `stream-status` indicating whether the end of the stream was
+    /// reached. The returned value will be at most `len`; it may be less.
+    skip: func(
+        this: input-stream,
+        /// The maximum number of bytes to skip.
+        len: u64,
+    ) -> result<tuple<u64, stream-status>>
 
-        /// Skip bytes from a stream, after blocking until at least one byte
-        /// can be skipped. Except for blocking behavior, identical to `skip`.
-        blocking-skip: func(
-            /// The maximum number of bytes to skip.
-            len: u64,
-        ) -> result<u64, stream-error>;
+    /// Skip bytes from a stream, after blocking until at least one byte
+    /// can be skipped. Except for blocking behavior, identical to `skip`.
+    blocking-skip: func(
+        this: input-stream,
+        /// The maximum number of bytes to skip.
+        len: u64,
+    ) -> result<tuple<u64, stream-status>>
 
-        /// Create a `pollable` which will resolve once either the specified stream
-        /// has bytes available to read or the other end of the stream has been
-        /// closed.
-        /// The created `pollable` is a child resource of the `input-stream`.
-        /// Implementations may trap if the `input-stream` is dropped before
-        /// all derived `pollable`s created with this function are dropped.
-        subscribe: func() -> pollable;
-    }
+    /// Create a `pollable` which will resolve once either the specified stream
+    /// has bytes available to read or the other end of the stream has been
+    /// closed.
+    /// The created `pollable` is a child resource of the `input-stream`.
+    /// Implementations may trap if the `input-stream` is dropped before
+    /// all derived `pollable`s created with this function are dropped.
+    subscribe-to-input-stream: func(this: input-stream) -> pollable
 
+    /// Dispose of the specified `input-stream`, after which it may no longer
+    /// be used.
+    /// Implementations may trap if this `input-stream` is dropped while child
+    /// `pollable` resources are still alive.
+    /// After this `input-stream` is dropped, implementations may report any
+    /// corresponding `output-stream` has `stream-state.closed`.
+    drop-input-stream: func(this: input-stream)
 
-    /// An output bytestream.
+    /// An output bytestream. In the future, this will be replaced by handle
+    /// types.
     ///
     /// `output-stream`s are *non-blocking* to the extent practical on
     /// underlying platforms. Except where specified otherwise, I/O operations also
     /// always return promptly, after the number of bytes that can be written
     /// promptly, which could even be zero. To wait for the stream to be ready to
-    /// accept data, the `subscribe` function to obtain a `pollable` which can be
-    /// polled for using `wasi:io/poll`.
-    resource output-stream {
-        /// Check readiness for writing. This function never blocks.
-        ///
-        /// Returns the number of bytes permitted for the next call to `write`,
-        /// or an error. Calling `write` with more bytes than this function has
-        /// permitted will trap.
-        ///
-        /// When this function returns 0 bytes, the `subscribe` pollable will
-        /// become ready when this function will report at least 1 byte, or an
-        /// error.
-        check-write: func() -> result<u64, stream-error>;
+    /// accept data, the `subscribe-to-output-stream` function to obtain a
+    /// `pollable` which can be polled for using `wasi:poll`.
+    ///
+    /// And at present, it is a `u32` instead of being an actual handle, until
+    /// the wit-bindgen implementation of handles and resources is ready.
+    ///
+    /// This [represents a resource](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources).
+    type output-stream = u32
+
+    /// An error for output-stream operations.
+    ///
+    /// Contrary to input-streams, a closed output-stream is reported using
+    /// an error.
+    enum write-error {
+        /// The last operation (a write or flush) failed before completion.
+        last-operation-failed,
+        /// The stream is closed: no more input will be accepted by the
+        /// stream. A closed output-stream will return this error on all
+        /// future operations.
+        closed
+    }
+    /// Check readiness for writing. This function never blocks.
+    ///
+    /// Returns the number of bytes permitted for the next call to `write`,
+    /// or an error. Calling `write` with more bytes than this function has
+    /// permitted will trap.
+    ///
+    /// When this function returns 0 bytes, the `subscribe-to-output-stream`
+    /// pollable will become ready when this function will report at least
+    /// 1 byte, or an error.
+    check-write: func(
+        this: output-stream
+    ) -> result<u64, write-error>
+
+    /// Perform a write. This function never blocks.
+    ///
+    /// Precondition: check-write gave permit of Ok(n) and contents has a
+    /// length of less than or equal to n. Otherwise, this function will trap.
+    ///
+    /// returns Err(closed) without writing if the stream has closed since
+    /// the last call to check-write provided a permit.
+    write: func(
+        this: output-stream,
+        contents: list<u8>
+    ) -> result<_, write-error>
+
+    /// Perform a write of up to 4096 bytes, and then flush the stream. Block
+    /// until all of these operations are complete, or an error occurs.
+    ///
+    /// This is a convenience wrapper around the use of `check-write`,
+    /// `subscribe-to-output-stream`, `write`, and `flush`, and is implemented
+    /// with the following pseudo-code:
+    ///
+    /// ```text
+    /// let pollable = subscribe-to-output-stream(this);
+    /// while !contents.is_empty() {
+    ///   // Wait for the stream to become writable
+    ///   poll-oneoff(pollable);
+    ///   let Ok(n) = check-write(this); // eliding error handling
+    ///   let len = min(n, contents.len());
+    ///   let (chunk, rest) = contents.split_at(len);
+    ///   write(this, chunk);            // eliding error handling
+    ///   contents = rest;
+    /// }
+    /// flush(this);
+    /// // Wait for completion of `flush`
+    /// poll-oneoff(pollable);
+    /// // Check for any errors that arose during `flush`
+    /// let _ = check-write(this);       // eliding error handling
+    /// ```
+    blocking-write-and-flush: func(
+      this: output-stream,
+      contents: list<u8>
+    ) -> result<_, write-error>
 
-        /// Perform a write. This function never blocks.
-        ///
-        /// Precondition: check-write gave permit of Ok(n) and contents has a
-        /// length of less than or equal to n. Otherwise, this function will trap.
-        ///
-        /// returns Err(closed) without writing if the stream has closed since
-        /// the last call to check-write provided a permit.
-        write: func(
-            contents: list<u8>
-        ) -> result<_, stream-error>;
+    /// Request to flush buffered output. This function never blocks.
+    ///
+    /// This tells the output-stream that the caller intends any buffered
+    /// output to be flushed. the output which is expected to be flushed
+    /// is all that has been passed to `write` prior to this call.
+    ///
+    /// Upon calling this function, the `output-stream` will not accept any
+    /// writes (`check-write` will return `ok(0)`) until the flush has
+    /// completed. The `subscribe-to-output-stream` pollable will become ready
+    /// when the flush has completed and the stream can accept more writes.
+    flush: func(
+        this: output-stream,
+    ) -> result<_, write-error>
 
-        /// Perform a write of up to 4096 bytes, and then flush the stream. Block
-        /// until all of these operations are complete, or an error occurs.
-        ///
-        /// This is a convenience wrapper around the use of `check-write`,
-        /// `subscribe`, `write`, and `flush`, and is implemented with the
-        /// following pseudo-code:
-        ///
-        /// ```text
-        /// let pollable = this.subscribe();
-        /// while !contents.is_empty() {
-        ///     // Wait for the stream to become writable
-        ///     poll-one(pollable);
-        ///     let Ok(n) = this.check-write(); // eliding error handling
-        ///     let len = min(n, contents.len());
-        ///     let (chunk, rest) = contents.split_at(len);
-        ///     this.write(chunk  );            // eliding error handling
-        ///     contents = rest;
-        /// }
-        /// this.flush();
-        /// // Wait for completion of `flush`
-        /// poll-one(pollable);
-        /// // Check for any errors that arose during `flush`
-        /// let _ = this.check-write();         // eliding error handling
-        /// ```
-        blocking-write-and-flush: func(
-            contents: list<u8>
-        ) -> result<_, stream-error>;
+    /// Request to flush buffered output, and block until flush completes
+    /// and stream is ready for writing again.
+    blocking-flush: func(
+        this: output-stream,
+    ) -> result<_, write-error>
 
-        /// Request to flush buffered output. This function never blocks.
-        ///
-        /// This tells the output-stream that the caller intends any buffered
-        /// output to be flushed. the output which is expected to be flushed
-        /// is all that has been passed to `write` prior to this call.
-        ///
-        /// Upon calling this function, the `output-stream` will not accept any
-        /// writes (`check-write` will return `ok(0)`) until the flush has
-        /// completed. The `subscribe` pollable will become ready when the
-        /// flush has completed and the stream can accept more writes.
-        flush: func() -> result<_, stream-error>;
+    /// Create a `pollable` which will resolve once the output-stream
+    /// is ready for more writing, or an error has occured. When this
+    /// pollable is ready, `check-write` will return `ok(n)` with n>0, or an
+    /// error.
+    ///
+    /// If the stream is closed, this pollable is always ready immediately.
+    ///
+    /// The created `pollable` is a child resource of the `output-stream`.
+    /// Implementations may trap if the `output-stream` is dropped before
+    /// all derived `pollable`s created with this function are dropped.
+    subscribe-to-output-stream: func(this: output-stream) -> pollable
 
-        /// Request to flush buffered output, and block until flush completes
-        /// and stream is ready for writing again.
-        blocking-flush: func() -> result<_, stream-error>;
+    /// Write zeroes to a stream.
+    ///
+    /// this should be used precisely like `write` with the exact same
+    /// preconditions (must use check-write first), but instead of
+    /// passing a list of bytes, you simply pass the number of zero-bytes
+    /// that should be written.
+    write-zeroes: func(
+        this: output-stream,
+        /// The number of zero-bytes to write
+        len: u64
+    ) -> result<_, write-error>
 
-        /// Create a `pollable` which will resolve once the output-stream
-        /// is ready for more writing, or an error has occured. When this
-        /// pollable is ready, `check-write` will return `ok(n)` with n>0, or an
-        /// error.
-        ///
-        /// If the stream is closed, this pollable is always ready immediately.
-        ///
-        /// The created `pollable` is a child resource of the `output-stream`.
-        /// Implementations may trap if the `output-stream` is dropped before
-        /// all derived `pollable`s created with this function are dropped.
-        subscribe: func() -> pollable;
+    /// Read from one stream and write to another.
+    ///
+    /// This function returns the number of bytes transferred; it may be less
+    /// than `len`.
+    ///
+    /// Unlike other I/O functions, this function blocks until all the data
+    /// read from the input stream has been written to the output stream.
+    splice: func(
+        this: output-stream,
+        /// The stream to read from
+        src: input-stream,
+        /// The number of bytes to splice
+        len: u64,
+    ) -> result<tuple<u64, stream-status>>
 
-        /// Write zeroes to a stream.
-        ///
-        /// this should be used precisely like `write` with the exact same
-        /// preconditions (must use check-write first), but instead of
-        /// passing a list of bytes, you simply pass the number of zero-bytes
-        /// that should be written.
-        write-zeroes: func(
-            /// The number of zero-bytes to write
-            len: u64
-        ) -> result<_, stream-error>;
+    /// Read from one stream and write to another, with blocking.
+    ///
+    /// This is similar to `splice`, except that it blocks until at least
+    /// one byte can be read.
+    blocking-splice: func(
+        this: output-stream,
+        /// The stream to read from
+        src: input-stream,
+        /// The number of bytes to splice
+        len: u64,
+    ) -> result<tuple<u64, stream-status>>
 
-        /// Perform a write of up to 4096 zeroes, and then flush the stream.
-        /// Block until all of these operations are complete, or an error
-        /// occurs.
-        ///
-        /// This is a convenience wrapper around the use of `check-write`,
-        /// `subscribe`, `write-zeroes`, and `flush`, and is implemented with
-        /// the following pseudo-code:
-        ///
-        /// ```text
-        /// let pollable = this.subscribe();
-        /// while num_zeroes != 0 {
-        ///     // Wait for the stream to become writable
-        ///     poll-one(pollable);
-        ///     let Ok(n) = this.check-write(); // eliding error handling
-        ///     let len = min(n, num_zeroes);
-        ///     this.write-zeroes(len);         // eliding error handling
-        ///     num_zeroes -= len;
-        /// }
-        /// this.flush();
-        /// // Wait for completion of `flush`
-        /// poll-one(pollable);
-        /// // Check for any errors that arose during `flush`
-        /// let _ = this.check-write();         // eliding error handling
-        /// ```
-        blocking-write-zeroes-and-flush: func(
-            /// The number of zero-bytes to write
-            len: u64
-        ) -> result<_, stream-error>;
+    /// Forward the entire contents of an input stream to an output stream.
+    ///
+    /// This function repeatedly reads from the input stream and writes
+    /// the data to the output stream, until the end of the input stream
+    /// is reached, or an error is encountered.
+    ///
+    /// Unlike other I/O functions, this function blocks until the end
+    /// of the input stream is seen and all the data has been written to
+    /// the output stream.
+    ///
+    /// This function returns the number of bytes transferred, and the status of
+    /// the output stream.
+    forward: func(
+        this: output-stream,
+        /// The stream to read from
+        src: input-stream
+    ) -> result<tuple<u64, stream-status>>
 
-        /// Read from one stream and write to another.
-        ///
-        /// The behavior of splice is equivelant to:
-        /// 1. calling `check-write` on the `output-stream`
-        /// 2. calling `read` on the `input-stream` with the smaller of the
-        /// `check-write` permitted length and the `len` provided to `splice`
-        /// 3. calling `write` on the `output-stream` with that read data.
-        ///
-        /// Any error reported by the call to `check-write`, `read`, or
-        /// `write` ends the splice and reports that error.
-        ///
-        /// This function returns the number of bytes transferred; it may be less
-        /// than `len`.
-        splice: func(
-            /// The stream to read from
-            src: borrow<input-stream>,
-            /// The number of bytes to splice
-            len: u64,
-        ) -> result<u64, stream-error>;
 
-        /// Read from one stream and write to another, with blocking.
-        ///
-        /// This is similar to `splice`, except that it blocks until the
-        /// `output-stream` is ready for writing, and the `input-stream`
-        /// is ready for reading, before performing the `splice`.
-        blocking-splice: func(
-            /// The stream to read from
-            src: borrow<input-stream>,
-            /// The number of bytes to splice
-            len: u64,
-        ) -> result<u64, stream-error>;
-    }
+    /// Dispose of the specified `output-stream`, after which it may no longer
+    /// be used.
+    /// Implementations may trap if this `output-stream` is dropped while
+    /// child `pollable` resources are still alive.
+    /// After this `output-stream` is dropped, implementations may report any
+    /// corresponding `input-stream` has `stream-state.closed`.
+    drop-output-stream: func(this: output-stream)
 }
diff --git a/crates/wasi/wit/deps/io/world.wit b/crates/wasi/wit/deps/io/world.wit
deleted file mode 100644
index 4b9b21da6833..000000000000
--- a/crates/wasi/wit/deps/io/world.wit
+++ /dev/null
@@ -1,6 +0,0 @@
-package wasi:io@0.2.0-rc-2023-11-05;
-
-world imports {
-    import streams;
-    import poll;
-}
diff --git a/crates/wasi/wit/deps/logging/logging.wit b/crates/wasi/wit/deps/logging/logging.wit
new file mode 100644
index 000000000000..b0cc4514dc8f
--- /dev/null
+++ b/crates/wasi/wit/deps/logging/logging.wit
@@ -0,0 +1,37 @@
+package wasi:logging
+
+/// WASI Logging is a logging API intended to let users emit log messages with
+/// simple priority levels and context values.
+interface logging {
+    /// A log level, describing a kind of message.
+    enum level {
+       /// Describes messages about the values of variables and the flow of
+       /// control within a program.
+       trace,
+
+       /// Describes messages likely to be of interest to someone debugging a
+       /// program.
+       debug,
+
+       /// Describes messages likely to be of interest to someone monitoring a
+       /// program.
+       info,
+
+       /// Describes messages indicating hazardous situations.
+       warn,
+
+       /// Describes messages indicating serious errors.
+       error,
+
+       /// Describes messages indicating fatal errors.
+       critical,
+    }
+
+    /// Emit a log message.
+    ///
+    /// A log message has a `level` describing what kind of message is being
+    /// sent, a context, which is an uninterpreted string meant to help
+    /// consumers group similar messages, and a string containing the message
+    /// text.
+    log: func(level: level, context: string, message: string)
+}
diff --git a/crates/wasi/wit/deps/poll/poll.wit b/crates/wasi/wit/deps/poll/poll.wit
new file mode 100644
index 000000000000..a6334c5570fc
--- /dev/null
+++ b/crates/wasi/wit/deps/poll/poll.wit
@@ -0,0 +1,39 @@
+package wasi:poll
+
+/// A poll API intended to let users wait for I/O events on multiple handles
+/// at once.
+interface poll {
+    /// A "pollable" handle.
+    ///
+    /// This is conceptually represents a `stream<_, _>`, or in other words,
+    /// a stream that one can wait on, repeatedly, but which does not itself
+    /// produce any data. It's temporary scaffolding until component-model's
+    /// async features are ready.
+    ///
+    /// And at present, it is a `u32` instead of being an actual handle, until
+    /// the wit-bindgen implementation of handles and resources is ready.
+    ///
+    /// `pollable` lifetimes are not automatically managed. Users must ensure
+    /// that they do not outlive the resource they reference.
+    ///
+    /// This [represents a resource](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources).
+    type pollable = u32
+
+    /// Dispose of the specified `pollable`, after which it may no longer
+    /// be used.
+    drop-pollable: func(this: pollable)
+
+    /// Poll for completion on a set of pollables.
+    ///
+    /// The "oneoff" in the name refers to the fact that this function must do a
+    /// linear scan through the entire list of subscriptions, which may be
+    /// inefficient if the number is large and the same subscriptions are used
+    /// many times. In the future, this is expected to be obsoleted by the
+    /// component model async proposal, which will include a scalable waiting
+    /// facility.
+    ///
+    /// The result list<bool> is the same length as the argument
+    /// list<pollable>, and indicates the readiness of each corresponding
+    /// element in that / list, with true indicating ready.
+    poll-oneoff: func(in: list<pollable>) -> list<bool>
+}
diff --git a/crates/wasi/wit/deps/random/insecure-seed.wit b/crates/wasi/wit/deps/random/insecure-seed.wit
index 139aed15927c..ff2ff65d0754 100644
--- a/crates/wasi/wit/deps/random/insecure-seed.wit
+++ b/crates/wasi/wit/deps/random/insecure-seed.wit
@@ -20,5 +20,5 @@ interface insecure-seed {
     /// This will likely be changed to a value import, to prevent it from being
     /// called multiple times and potentially used for purposes other than DoS
     /// protection.
-    insecure-seed: func() -> tuple<u64, u64>;
+    insecure-seed: func() -> tuple<u64, u64>
 }
diff --git a/crates/wasi/wit/deps/random/insecure.wit b/crates/wasi/wit/deps/random/insecure.wit
index 2ffd223cb344..ff0826822d5f 100644
--- a/crates/wasi/wit/deps/random/insecure.wit
+++ b/crates/wasi/wit/deps/random/insecure.wit
@@ -11,11 +11,11 @@ interface insecure {
     /// There are no requirements on the values of the returned bytes, however
     /// implementations are encouraged to return evenly distributed values with
     /// a long period.
-    get-insecure-random-bytes: func(len: u64) -> list<u8>;
+    get-insecure-random-bytes: func(len: u64) -> list<u8>
 
     /// Return an insecure pseudo-random `u64` value.
     ///
     /// This function returns the same type of pseudo-random data as
     /// `get-insecure-random-bytes`, represented as a `u64`.
-    get-insecure-random-u64: func() -> u64;
+    get-insecure-random-u64: func() -> u64
 }
diff --git a/crates/wasi/wit/deps/random/random.wit b/crates/wasi/wit/deps/random/random.wit
index 2c3c6a859c49..f2bd6358c139 100644
--- a/crates/wasi/wit/deps/random/random.wit
+++ b/crates/wasi/wit/deps/random/random.wit
@@ -1,25 +1,25 @@
+package wasi:random
+
 /// WASI Random is a random data API.
 ///
 /// It is intended to be portable at least between Unix-family platforms and
 /// Windows.
 interface random {
-    /// Return `len` cryptographically-secure random or pseudo-random bytes.
+    /// Return `len` cryptographically-secure pseudo-random bytes.
     ///
-    /// This function must produce data at least as cryptographically secure and
-    /// fast as an adequately seeded cryptographically-secure pseudo-random
-    /// number generator (CSPRNG). It must not block, from the perspective of
-    /// the calling program, under any circumstances, including on the first
-    /// request and on requests for numbers of bytes. The returned data must
-    /// always be unpredictable.
+    /// This function must produce data from an adequately seeded
+    /// cryptographically-secure pseudo-random number generator (CSPRNG), so it
+    /// must not block, from the perspective of the calling program, and the
+    /// returned data is always unpredictable.
     ///
-    /// This function must always return fresh data. Deterministic environments
-    /// must omit this function, rather than implementing it with deterministic
-    /// data.
-    get-random-bytes: func(len: u64) -> list<u8>;
+    /// This function must always return fresh pseudo-random data. Deterministic
+    /// environments must omit this function, rather than implementing it with
+    /// deterministic data.
+    get-random-bytes: func(len: u64) -> list<u8>
 
-    /// Return a cryptographically-secure random or pseudo-random `u64` value.
+    /// Return a cryptographically-secure pseudo-random `u64` value.
     ///
-    /// This function returns the same type of data as `get-random-bytes`,
-    /// represented as a `u64`.
-    get-random-u64: func() -> u64;
+    /// This function returns the same type of pseudo-random data as
+    /// `get-random-bytes`, represented as a `u64`.
+    get-random-u64: func() -> u64
 }
diff --git a/crates/wasi/wit/deps/random/world.wit b/crates/wasi/wit/deps/random/world.wit
deleted file mode 100644
index 9128dd68f098..000000000000
--- a/crates/wasi/wit/deps/random/world.wit
+++ /dev/null
@@ -1,7 +0,0 @@
-package wasi:random@0.2.0-rc-2023-11-05;
-
-world imports {
-    import random;
-    import insecure;
-    import insecure-seed;
-}
diff --git a/crates/wasi/wit/deps/sockets/instance-network.wit b/crates/wasi/wit/deps/sockets/instance-network.wit
index e455d0ff7b63..d911a29cc8dd 100644
--- a/crates/wasi/wit/deps/sockets/instance-network.wit
+++ b/crates/wasi/wit/deps/sockets/instance-network.wit
@@ -1,9 +1,9 @@
 
 /// This interface provides a value-export of the default network handle..
 interface instance-network {
-    use network.{network};
+	use network.{network}
 
-    /// Get a handle to the default network.
-    instance-network: func() -> network;
+	/// Get a handle to the default network.
+	instance-network: func() -> network
 
 }
diff --git a/crates/wasi/wit/deps/sockets/ip-name-lookup.wit b/crates/wasi/wit/deps/sockets/ip-name-lookup.wit
index 5ffe2a217c61..f15d19d037da 100644
--- a/crates/wasi/wit/deps/sockets/ip-name-lookup.wit
+++ b/crates/wasi/wit/deps/sockets/ip-name-lookup.wit
@@ -1,61 +1,69 @@
 
 interface ip-name-lookup {
-    use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable};
-    use network.{network, error-code, ip-address, ip-address-family};
-
-
-    /// Resolve an internet host name to a list of IP addresses.
-    ///
-    /// See the wasi-socket proposal README.md for a comparison with getaddrinfo.
-    ///
-    /// # Parameters
-    /// - `name`: The name to look up. IP addresses are not allowed. Unicode domain names are automatically converted
-    ///     to ASCII using IDNA encoding.
-    /// - `address-family`: If provided, limit the results to addresses of this specific address family.
-    /// - `include-unavailable`: When set to true, this function will also return addresses of which the runtime
-    ///   thinks (or knows) can't be connected to at the moment. For example, this will return IPv6 addresses on
-    ///   systems without an active IPv6 interface. Notes:
-    ///     - Even when no public IPv6 interfaces are present or active, names like "localhost" can still resolve to an IPv6 address.
-    ///     - Whatever is "available" or "unavailable" is volatile and can change everytime a network cable is unplugged.
-    ///
-    /// This function never blocks. It either immediately fails or immediately returns successfully with a `resolve-address-stream`
-    /// that can be used to (asynchronously) fetch the results.
-    ///
-    /// At the moment, the stream never completes successfully with 0 items. Ie. the first call
-    /// to `resolve-next-address` never returns `ok(none)`. This may change in the future.
-    ///
-    /// # Typical errors
-    /// - `invalid-argument`:     `name` is a syntactically invalid domain name.
-    /// - `invalid-argument`:     `name` is an IP address.
-    /// - `not-supported`:        The specified `address-family` is not supported. (EAI_FAMILY)
-    ///
-    /// # References:
-    /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getaddrinfo.html>
-    /// - <https://man7.org/linux/man-pages/man3/getaddrinfo.3.html>
-    /// - <https://learn.microsoft.com/en-us/windows/win32/api/ws2tcpip/nf-ws2tcpip-getaddrinfo>
-    /// - <https://man.freebsd.org/cgi/man.cgi?query=getaddrinfo&sektion=3>
-    resolve-addresses: func(network: borrow<network>, name: string, address-family: option<ip-address-family>, include-unavailable: bool) -> result<resolve-address-stream, error-code>;
-
-    resource resolve-address-stream {
-        /// Returns the next address from the resolver.
-        ///
-        /// This function should be called multiple times. On each call, it will
-        /// return the next address in connection order preference. If all
-        /// addresses have been exhausted, this function returns `none`.
-        ///
-        /// This function never returns IPv4-mapped IPv6 addresses.
-        ///
-        /// # Typical errors
-        /// - `name-unresolvable`:          Name does not exist or has no suitable associated IP addresses. (EAI_NONAME, EAI_NODATA, EAI_ADDRFAMILY)
-        /// - `temporary-resolver-failure`: A temporary failure in name resolution occurred. (EAI_AGAIN)
-        /// - `permanent-resolver-failure`: A permanent failure in name resolution occurred. (EAI_FAIL)
-        /// - `would-block`:                A result is not available yet. (EWOULDBLOCK, EAGAIN)
-        resolve-next-address: func() -> result<option<ip-address>, error-code>;
-
-        /// Create a `pollable` which will resolve once the stream is ready for I/O.
-        ///
-        /// Note: this function is here for WASI Preview2 only.
-        /// It's planned to be removed when `future` is natively supported in Preview3.
-        subscribe: func() -> pollable;
-    }
+	use wasi:poll/poll.{pollable}
+	use network.{network, error-code, ip-address, ip-address-family}
+
+
+	/// Resolve an internet host name to a list of IP addresses.
+	/// 
+	/// See the wasi-socket proposal README.md for a comparison with getaddrinfo.
+	/// 
+	/// # Parameters
+	/// - `name`: The name to look up. IP addresses are not allowed. Unicode domain names are automatically converted
+	///     to ASCII using IDNA encoding.
+	/// - `address-family`: If provided, limit the results to addresses of this specific address family.
+	/// - `include-unavailable`: When set to true, this function will also return addresses of which the runtime
+	///   thinks (or knows) can't be connected to at the moment. For example, this will return IPv6 addresses on
+	///   systems without an active IPv6 interface. Notes:
+	///     - Even when no public IPv6 interfaces are present or active, names like "localhost" can still resolve to an IPv6 address.
+	///     - Whatever is "available" or "unavailable" is volatile and can change everytime a network cable is unplugged.
+	/// 
+	/// This function never blocks. It either immediately fails or immediately returns successfully with a `resolve-address-stream`
+	/// that can be used to (asynchronously) fetch the results.
+	/// 
+	/// At the moment, the stream never completes successfully with 0 items. Ie. the first call
+	/// to `resolve-next-address` never returns `ok(none)`. This may change in the future.
+	/// 
+	/// # Typical errors
+	/// - `invalid-name`:                 `name` is a syntactically invalid domain name.
+	/// - `invalid-name`:                 `name` is an IP address.
+	/// - `address-family-not-supported`: The specified `address-family` is not supported. (EAI_FAMILY)
+	/// 
+	/// # References:
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getaddrinfo.html>
+	/// - <https://man7.org/linux/man-pages/man3/getaddrinfo.3.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/ws2tcpip/nf-ws2tcpip-getaddrinfo>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=getaddrinfo&sektion=3>
+	resolve-addresses: func(network: network, name: string, address-family: option<ip-address-family>, include-unavailable: bool) -> result<resolve-address-stream, error-code>
+
+
+
+    type resolve-address-stream = u32
+
+	/// Returns the next address from the resolver.
+	/// 
+	/// This function should be called multiple times. On each call, it will
+	/// return the next address in connection order preference. If all
+	/// addresses have been exhausted, this function returns `none`.
+	/// After which, you should release the stream with `drop-resolve-address-stream`.
+	/// 
+	/// This function never returns IPv4-mapped IPv6 addresses.
+	/// 
+	/// # Typical errors
+	/// - `name-unresolvable`:          Name does not exist or has no suitable associated IP addresses. (EAI_NONAME, EAI_NODATA, EAI_ADDRFAMILY)
+	/// - `temporary-resolver-failure`: A temporary failure in name resolution occurred. (EAI_AGAIN)
+	/// - `permanent-resolver-failure`: A permanent failure in name resolution occurred. (EAI_FAIL)
+	/// - `would-block`:                A result is not available yet. (EWOULDBLOCK, EAGAIN)
+	resolve-next-address: func(this: resolve-address-stream) -> result<option<ip-address>, error-code>
+
+	/// Dispose of the specified `resolve-address-stream`, after which it may no longer be used.
+	/// 
+	/// Note: this function is scheduled to be removed when Resources are natively supported in Wit.
+	drop-resolve-address-stream: func(this: resolve-address-stream)
+
+	/// Create a `pollable` which will resolve once the stream is ready for I/O.
+	/// 
+	/// Note: this function is here for WASI Preview2 only.
+	/// It's planned to be removed when `future` is natively supported in Preview3.
+	subscribe: func(this: resolve-address-stream) -> pollable
 }
diff --git a/crates/wasi/wit/deps/sockets/network.wit b/crates/wasi/wit/deps/sockets/network.wit
index 6bb07cd6faa7..a198ea8017de 100644
--- a/crates/wasi/wit/deps/sockets/network.wit
+++ b/crates/wasi/wit/deps/sockets/network.wit
@@ -1,147 +1,187 @@
+package wasi:sockets
 
 interface network {
     /// An opaque resource that represents access to (a subset of) the network.
-    /// This enables context-based security for networking.
-    /// There is no need for this to map 1:1 to a physical network interface.
-    resource network;
+	/// This enables context-based security for networking.
+	/// There is no need for this to map 1:1 to a physical network interface.
+	/// 
+	/// FYI, In the future this will be replaced by handle types.
+    type network = u32
 
-    /// Error codes.
-    ///
-    /// In theory, every API can return any error code.
-    /// In practice, API's typically only return the errors documented per API
-    /// combined with a couple of errors that are always possible:
-    /// - `unknown`
-    /// - `access-denied`
-    /// - `not-supported`
-    /// - `out-of-memory`
-    /// - `concurrency-conflict`
-    ///
-    /// See each individual API for what the POSIX equivalents are. They sometimes differ per API.
-    enum error-code {
-        // ### GENERAL ERRORS ###
+	/// Dispose of the specified `network`, after which it may no longer be used.
+	/// 
+	/// Note: this function is scheduled to be removed when Resources are natively supported in Wit.
+	drop-network: func(this: network)
 
-        /// Unknown error
-        unknown,
 
-        /// Access denied.
-        ///
-        /// POSIX equivalent: EACCES, EPERM
-        access-denied,
+	/// Error codes.
+	/// 
+	/// In theory, every API can return any error code.
+	/// In practice, API's typically only return the errors documented per API
+	/// combined with a couple of errors that are always possible:
+	/// - `unknown`
+	/// - `access-denied`
+	/// - `not-supported`
+	/// - `out-of-memory`
+	/// 
+	/// See each individual API for what the POSIX equivalents are. They sometimes differ per API.
+	enum error-code {
+		// ### GENERAL ERRORS ###
 
-        /// The operation is not supported.
-        ///
-        /// POSIX equivalent: EOPNOTSUPP
-        not-supported,
+		/// Unknown error
+		unknown,
 
-        /// One of the arguments is invalid.
-        ///
-        /// POSIX equivalent: EINVAL
-        invalid-argument,
+		/// Access denied.
+		/// 
+		/// POSIX equivalent: EACCES, EPERM
+		access-denied,
 
-        /// Not enough memory to complete the operation.
-        ///
-        /// POSIX equivalent: ENOMEM, ENOBUFS, EAI_MEMORY
-        out-of-memory,
+		/// The operation is not supported.
+		/// 
+		/// POSIX equivalent: EOPNOTSUPP
+		not-supported,
 
-        /// The operation timed out before it could finish completely.
-        timeout,
+		/// Not enough memory to complete the operation.
+		/// 
+		/// POSIX equivalent: ENOMEM, ENOBUFS, EAI_MEMORY
+		out-of-memory,
 
-        /// This operation is incompatible with another asynchronous operation that is already in progress.
-        ///
-        /// POSIX equivalent: EALREADY
-        concurrency-conflict,
+		/// The operation timed out before it could finish completely.
+		timeout,
 
-        /// Trying to finish an asynchronous operation that:
-        /// - has not been started yet, or:
-        /// - was already finished by a previous `finish-*` call.
-        ///
-        /// Note: this is scheduled to be removed when `future`s are natively supported.
-        not-in-progress,
+		/// This operation is incompatible with another asynchronous operation that is already in progress.
+		concurrency-conflict,
 
-        /// The operation has been aborted because it could not be completed immediately.
-        ///
-        /// Note: this is scheduled to be removed when `future`s are natively supported.
-        would-block,
+		/// Trying to finish an asynchronous operation that:
+		/// - has not been started yet, or:
+		/// - was already finished by a previous `finish-*` call.
+		/// 
+		/// Note: this is scheduled to be removed when `future`s are natively supported.
+		not-in-progress,
 
+		/// The operation has been aborted because it could not be completed immediately.
+		/// 
+		/// Note: this is scheduled to be removed when `future`s are natively supported.
+		would-block,
 
 
-        // ### TCP & UDP SOCKET ERRORS ###
+		// ### IP ERRORS ###
 
-        /// The operation is not valid in the socket's current state.
-        invalid-state,
+		/// The specified address-family is not supported.
+		address-family-not-supported,
 
-        /// A new socket resource could not be created because of a system limit.
-        new-socket-limit,
+		/// An IPv4 address was passed to an IPv6 resource, or vice versa.
+		address-family-mismatch,
 
-        /// A bind operation failed because the provided address is not an address that the `network` can bind to.
-        address-not-bindable,
+		/// The socket address is not a valid remote address. E.g. the IP address is set to INADDR_ANY, or the port is set to 0.
+		invalid-remote-address,
 
-        /// A bind operation failed because the provided address is already in use or because there are no ephemeral ports available.
-        address-in-use,
+		/// The operation is only supported on IPv4 resources.
+		ipv4-only-operation,
 
-        /// The remote address is not reachable
-        remote-unreachable,
+		/// The operation is only supported on IPv6 resources.
+		ipv6-only-operation,
 
 
-        // ### TCP SOCKET ERRORS ###
 
-        /// The connection was forcefully rejected
-        connection-refused,
+		// ### TCP & UDP SOCKET ERRORS ###
 
-        /// The connection was reset.
-        connection-reset,
+		/// A new socket resource could not be created because of a system limit.
+		new-socket-limit,
+		
+		/// The socket is already attached to another network.
+		already-attached,
 
-        /// A connection was aborted.
-        connection-aborted,
+		/// The socket is already bound.
+		already-bound,
 
+		/// The socket is already in the Connection state.
+		already-connected,
 
-        // ### UDP SOCKET ERRORS ###
-        datagram-too-large,
+		/// The socket is not bound to any local address.
+		not-bound,
 
+		/// The socket is not in the Connection state.
+		not-connected,
 
-        // ### NAME LOOKUP ERRORS ###
+		/// A bind operation failed because the provided address is not an address that the `network` can bind to.
+		address-not-bindable,
 
-        /// Name does not exist or has no suitable associated IP addresses.
-        name-unresolvable,
+		/// A bind operation failed because the provided address is already in use.
+		address-in-use,
 
-        /// A temporary failure in name resolution occurred.
-        temporary-resolver-failure,
+		/// A bind operation failed because there are no ephemeral ports available.
+		ephemeral-ports-exhausted,
 
-        /// A permanent failure in name resolution occurred.
-        permanent-resolver-failure,
-    }
+		/// The remote address is not reachable
+		remote-unreachable,
+		
 
-    enum ip-address-family {
-        /// Similar to `AF_INET` in POSIX.
-        ipv4,
+		// ### TCP SOCKET ERRORS ###
+		
+		/// The socket is already in the Listener state.
+		already-listening,
 
-        /// Similar to `AF_INET6` in POSIX.
-        ipv6,
-    }
+		/// The socket is already in the Listener state.
+		not-listening,
 
-    type ipv4-address = tuple<u8, u8, u8, u8>;
-    type ipv6-address = tuple<u16, u16, u16, u16, u16, u16, u16, u16>;
+		/// The connection was forcefully rejected
+		connection-refused,
 
-    variant ip-address {
-        ipv4(ipv4-address),
-        ipv6(ipv6-address),
-    }
+		/// The connection was reset.
+		connection-reset,
+		
 
-    record ipv4-socket-address {
-        port: u16, // sin_port
-        address: ipv4-address, // sin_addr
-    }
+		// ### UDP SOCKET ERRORS ###
+		datagram-too-large,
 
-    record ipv6-socket-address {
-        port: u16, // sin6_port
-        flow-info: u32, // sin6_flowinfo
-        address: ipv6-address, // sin6_addr
-        scope-id: u32, // sin6_scope_id
-    }
 
-    variant ip-socket-address {
-        ipv4(ipv4-socket-address),
-        ipv6(ipv6-socket-address),
-    }
+		// ### NAME LOOKUP ERRORS ###
+		
+		/// The provided name is a syntactically invalid domain name.
+		invalid-name,
+
+		/// Name does not exist or has no suitable associated IP addresses.
+		name-unresolvable,
+
+		/// A temporary failure in name resolution occurred.
+		temporary-resolver-failure,
+
+		/// A permanent failure in name resolution occurred.
+		permanent-resolver-failure,
+	}
+
+	enum ip-address-family {
+		/// Similar to `AF_INET` in POSIX.
+		ipv4, 
+
+		/// Similar to `AF_INET6` in POSIX.
+		ipv6,
+	}
+
+	type ipv4-address = tuple<u8, u8, u8, u8>
+	type ipv6-address = tuple<u16, u16, u16, u16, u16, u16, u16, u16>
+
+	variant ip-address {
+		ipv4(ipv4-address),
+		ipv6(ipv6-address),
+	}
+
+	record ipv4-socket-address {
+		port: u16, // sin_port
+		address: ipv4-address, // sin_addr
+	}
+
+	record ipv6-socket-address {
+		port: u16, // sin6_port
+		flow-info: u32, // sin6_flowinfo
+		address: ipv6-address, // sin6_addr
+		scope-id: u32, // sin6_scope_id
+	}
+
+	variant ip-socket-address {
+		ipv4(ipv4-socket-address),
+		ipv6(ipv6-socket-address),
+	}
 
 }
diff --git a/crates/wasi/wit/deps/sockets/tcp-create-socket.wit b/crates/wasi/wit/deps/sockets/tcp-create-socket.wit
index 768a07c85021..f43bc8979047 100644
--- a/crates/wasi/wit/deps/sockets/tcp-create-socket.wit
+++ b/crates/wasi/wit/deps/sockets/tcp-create-socket.wit
@@ -1,26 +1,27 @@
 
 interface tcp-create-socket {
-    use network.{network, error-code, ip-address-family};
-    use tcp.{tcp-socket};
+	use network.{network, error-code, ip-address-family}
+	use tcp.{tcp-socket}
 
-    /// Create a new TCP socket.
-    ///
-    /// Similar to `socket(AF_INET or AF_INET6, SOCK_STREAM, IPPROTO_TCP)` in POSIX.
-    ///
-    /// This function does not require a network capability handle. This is considered to be safe because
-    /// at time of creation, the socket is not bound to any `network` yet. Up to the moment `bind`/`listen`/`connect`
-    /// is called, the socket is effectively an in-memory configuration object, unable to communicate with the outside world.
-    ///
-    /// All sockets are non-blocking. Use the wasi-poll interface to block on asynchronous operations.
-    ///
-    /// # Typical errors
-    /// - `not-supported`:     The specified `address-family` is not supported. (EAFNOSUPPORT)
-    /// - `new-socket-limit`:  The new socket resource could not be created because of a system limit. (EMFILE, ENFILE)
-    ///
-    /// # References
-    /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/socket.html>
-    /// - <https://man7.org/linux/man-pages/man2/socket.2.html>
-    /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketw>
-    /// - <https://man.freebsd.org/cgi/man.cgi?query=socket&sektion=2>
-    create-tcp-socket: func(address-family: ip-address-family) -> result<tcp-socket, error-code>;
+	/// Create a new TCP socket.
+	/// 
+	/// Similar to `socket(AF_INET or AF_INET6, SOCK_STREAM, IPPROTO_TCP)` in POSIX.
+	/// 
+	/// This function does not require a network capability handle. This is considered to be safe because
+	/// at time of creation, the socket is not bound to any `network` yet. Up to the moment `bind`/`listen`/`connect`
+	/// is called, the socket is effectively an in-memory configuration object, unable to communicate with the outside world.
+	/// 
+	/// All sockets are non-blocking. Use the wasi-poll interface to block on asynchronous operations.
+	/// 
+	/// # Typical errors
+	/// - `not-supported`:                The host does not support TCP sockets. (EOPNOTSUPP)
+	/// - `address-family-not-supported`: The specified `address-family` is not supported. (EAFNOSUPPORT)
+	/// - `new-socket-limit`:             The new socket resource could not be created because of a system limit. (EMFILE, ENFILE)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/socket.html>
+	/// - <https://man7.org/linux/man-pages/man2/socket.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketw>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=socket&sektion=2>
+	create-tcp-socket: func(address-family: ip-address-family) -> result<tcp-socket, error-code>
 }
diff --git a/crates/wasi/wit/deps/sockets/tcp.wit b/crates/wasi/wit/deps/sockets/tcp.wit
index b9073b77515d..3922769b308e 100644
--- a/crates/wasi/wit/deps/sockets/tcp.wit
+++ b/crates/wasi/wit/deps/sockets/tcp.wit
@@ -1,268 +1,268 @@
 
 interface tcp {
-    use wasi:io/streams@0.2.0-rc-2023-11-05.{input-stream, output-stream};
-    use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable};
-    use network.{network, error-code, ip-socket-address, ip-address-family};
+	use wasi:io/streams.{input-stream, output-stream}
+	use wasi:poll/poll.{pollable}
+	use network.{network, error-code, ip-socket-address, ip-address-family}
 
-    enum shutdown-type {
-        /// Similar to `SHUT_RD` in POSIX.
-        receive,
+	/// A TCP socket handle.
+	type tcp-socket = u32
+	
 
-        /// Similar to `SHUT_WR` in POSIX.
-        send,
+	enum shutdown-type {
+		/// Similar to `SHUT_RD` in POSIX.
+		receive,
 
-        /// Similar to `SHUT_RDWR` in POSIX.
-        both,
-    }
+		/// Similar to `SHUT_WR` in POSIX.
+		send,
 
+		/// Similar to `SHUT_RDWR` in POSIX.
+		both,
+	}
 
-    /// A TCP socket handle.
-    resource tcp-socket {
-        /// Bind the socket to a specific network on the provided IP address and port.
-        ///
-        /// If the IP address is zero (`0.0.0.0` in IPv4, `::` in IPv6), it is left to the implementation to decide which
-        /// network interface(s) to bind to.
-        /// If the TCP/UDP port is zero, the socket will be bound to a random free port.
-        ///
-        /// When a socket is not explicitly bound, the first invocation to a listen or connect operation will
-        /// implicitly bind the socket.
-        ///
-        /// Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.
-        ///
-        /// # Typical `start` errors
-        /// - `invalid-argument`:          The `local-address` has the wrong address family. (EAFNOSUPPORT, EFAULT on Windows)
-        /// - `invalid-argument`:          `local-address` is not a unicast address. (EINVAL)
-        /// - `invalid-argument`:          `local-address` is an IPv4-mapped IPv6 address, but the socket has `ipv6-only` enabled. (EINVAL)
-        /// - `invalid-state`:             The socket is already bound. (EINVAL)
-        ///
-        /// # Typical `finish` errors
-        /// - `address-in-use`:            No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows)
-        /// - `address-in-use`:            Address is already in use. (EADDRINUSE)
-        /// - `address-not-bindable`:      `local-address` is not an address that the `network` can bind to. (EADDRNOTAVAIL)
-        /// - `not-in-progress`:           A `bind` operation is not in progress.
-        /// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html>
-        /// - <https://man7.org/linux/man-pages/man2/bind.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-bind>
-        /// - <https://man.freebsd.org/cgi/man.cgi?query=bind&sektion=2&format=html>
-        start-bind: func(network: borrow<network>, local-address: ip-socket-address) -> result<_, error-code>;
-        finish-bind: func() -> result<_, error-code>;
 
-        /// Connect to a remote endpoint.
-        ///
-        /// On success:
-        /// - the socket is transitioned into the Connection state
-        /// - a pair of streams is returned that can be used to read & write to the connection
-        ///
-        /// POSIX mentions:
-        /// > If connect() fails, the state of the socket is unspecified. Conforming applications should
-        /// > close the file descriptor and create a new socket before attempting to reconnect.
-        ///
-        /// WASI prescribes the following behavior:
-        /// - If `connect` fails because an input/state validation error, the socket should remain usable.
-        /// - If a connection was actually attempted but failed, the socket should become unusable for further network communication.
-        ///   Besides `drop`, any method after such a failure may return an error.
-        ///
-        /// # Typical `start` errors
-        /// - `invalid-argument`:          The `remote-address` has the wrong address family. (EAFNOSUPPORT)
-        /// - `invalid-argument`:          `remote-address` is not a unicast address. (EINVAL, ENETUNREACH on Linux, EAFNOSUPPORT on MacOS)
-        /// - `invalid-argument`:          `remote-address` is an IPv4-mapped IPv6 address, but the socket has `ipv6-only` enabled. (EINVAL, EADDRNOTAVAIL on Illumos)
-        /// - `invalid-argument`:          `remote-address` is a non-IPv4-mapped IPv6 address, but the socket was bound to a specific IPv4-mapped IPv6 address. (or vice versa)
-        /// - `invalid-argument`:          The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EADDRNOTAVAIL on Windows)
-        /// - `invalid-argument`:          The port in `remote-address` is set to 0. (EADDRNOTAVAIL on Windows)
-        /// - `invalid-argument`:          The socket is already attached to a different network. The `network` passed to `connect` must be identical to the one passed to `bind`.
-        /// - `invalid-state`:             The socket is already in the Connection state. (EISCONN)
-        /// - `invalid-state`:             The socket is already in the Listener state. (EOPNOTSUPP, EINVAL on Windows)
-        ///
-        /// # Typical `finish` errors
-        /// - `timeout`:                   Connection timed out. (ETIMEDOUT)
-        /// - `connection-refused`:        The connection was forcefully rejected. (ECONNREFUSED)
-        /// - `connection-reset`:          The connection was reset. (ECONNRESET)
-        /// - `connection-aborted`:        The connection was aborted. (ECONNABORTED)
-        /// - `remote-unreachable`:        The remote address is not reachable. (EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN)
-        /// - `address-in-use`:            Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE, EADDRNOTAVAIL on Linux, EAGAIN on BSD)
-        /// - `not-in-progress`:           A `connect` operation is not in progress.
-        /// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/connect.html>
-        /// - <https://man7.org/linux/man-pages/man2/connect.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-connect>
-        /// - <https://man.freebsd.org/cgi/man.cgi?connect>
-        start-connect: func(network: borrow<network>, remote-address: ip-socket-address) -> result<_, error-code>;
-        finish-connect: func() -> result<tuple<input-stream, output-stream>, error-code>;
+	/// Bind the socket to a specific network on the provided IP address and port.
+	///
+	/// If the IP address is zero (`0.0.0.0` in IPv4, `::` in IPv6), it is left to the implementation to decide which
+	/// network interface(s) to bind to.
+	/// If the TCP/UDP port is zero, the socket will be bound to a random free port.
+	/// 
+	/// When a socket is not explicitly bound, the first invocation to a listen or connect operation will
+	/// implicitly bind the socket.
+	/// 
+	/// Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.
+	/// 
+	/// # Typical `start` errors
+	/// - `address-family-mismatch`:   The `local-address` has the wrong address family. (EINVAL)
+	/// - `already-bound`:             The socket is already bound. (EINVAL)
+	/// - `concurrency-conflict`:      Another `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+	/// 
+	/// # Typical `finish` errors
+	/// - `ephemeral-ports-exhausted`: No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows)
+	/// - `address-in-use`:            Address is already in use. (EADDRINUSE)
+	/// - `address-not-bindable`:      `local-address` is not an address that the `network` can bind to. (EADDRNOTAVAIL)
+	/// - `not-in-progress`:           A `bind` operation is not in progress.
+	/// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html>
+	/// - <https://man7.org/linux/man-pages/man2/bind.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-bind>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=bind&sektion=2&format=html>
+	start-bind: func(this: tcp-socket, network: network, local-address: ip-socket-address) -> result<_, error-code>
+	finish-bind: func(this: tcp-socket) -> result<_, error-code>
 
-        /// Start listening for new connections.
-        ///
-        /// Transitions the socket into the Listener state.
-        ///
-        /// Unlike POSIX:
-        /// - this function is async. This enables interactive WASI hosts to inject permission prompts.
-        /// - the socket must already be explicitly bound.
-        ///
-        /// # Typical `start` errors
-        /// - `invalid-state`:             The socket is not bound to any local address. (EDESTADDRREQ)
-        /// - `invalid-state`:             The socket is already in the Connection state. (EISCONN, EINVAL on BSD)
-        /// - `invalid-state`:             The socket is already in the Listener state.
-        ///
-        /// # Typical `finish` errors
-        /// - `address-in-use`:            Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE)
-        /// - `not-in-progress`:           A `listen` operation is not in progress.
-        /// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/listen.html>
-        /// - <https://man7.org/linux/man-pages/man2/listen.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-listen>
-        /// - <https://man.freebsd.org/cgi/man.cgi?query=listen&sektion=2>
-        start-listen: func() -> result<_, error-code>;
-        finish-listen: func() -> result<_, error-code>;
+	/// Connect to a remote endpoint.
+	/// 
+	/// On success:
+	/// - the socket is transitioned into the Connection state
+	/// - a pair of streams is returned that can be used to read & write to the connection
+	/// 
+	/// # Typical `start` errors
+	/// - `address-family-mismatch`:   The `remote-address` has the wrong address family. (EAFNOSUPPORT)
+	/// - `invalid-remote-address`:    The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EADDRNOTAVAIL on Windows)
+	/// - `invalid-remote-address`:    The port in `remote-address` is set to 0. (EADDRNOTAVAIL on Windows)
+	/// - `already-attached`:          The socket is already attached to a different network. The `network` passed to `connect` must be identical to the one passed to `bind`.
+	/// - `already-connected`:         The socket is already in the Connection state. (EISCONN)
+	/// - `already-listening`:         The socket is already in the Listener state. (EOPNOTSUPP, EINVAL on Windows)
+	/// - `concurrency-conflict`:      Another `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+	/// 
+	/// # Typical `finish` errors
+	/// - `timeout`:                   Connection timed out. (ETIMEDOUT)
+	/// - `connection-refused`:        The connection was forcefully rejected. (ECONNREFUSED)
+	/// - `connection-reset`:          The connection was reset. (ECONNRESET)
+	/// - `remote-unreachable`:        The remote address is not reachable. (EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN)
+	/// - `ephemeral-ports-exhausted`: Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE, EADDRNOTAVAIL on Linux, EAGAIN on BSD)
+	/// - `not-in-progress`:           A `connect` operation is not in progress.
+	/// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/connect.html>
+	/// - <https://man7.org/linux/man-pages/man2/connect.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-connect>
+	/// - <https://man.freebsd.org/cgi/man.cgi?connect>
+	start-connect: func(this: tcp-socket, network: network, remote-address: ip-socket-address) -> result<_, error-code>
+	/// Note: the returned `input-stream` and `output-stream` are child
+	/// resources of the `tcp-socket`. Implementations may trap if the
+	/// `tcp-socket` is dropped before both of these streams are dropped.
+	finish-connect: func(this: tcp-socket) -> result<tuple<input-stream, output-stream>, error-code>
 
-        /// Accept a new client socket.
-        ///
-        /// The returned socket is bound and in the Connection state. The following properties are inherited from the listener socket:
-        /// - `address-family`
-        /// - `ipv6-only`
-        /// - `keep-alive`
-        /// - `no-delay`
-        /// - `unicast-hop-limit`
-        /// - `receive-buffer-size`
-        /// - `send-buffer-size`
-        ///
-        /// On success, this function returns the newly accepted client socket along with
-        /// a pair of streams that can be used to read & write to the connection.
-        ///
-        /// # Typical errors
-        /// - `invalid-state`:      Socket is not in the Listener state. (EINVAL)
-        /// - `would-block`:        No pending connections at the moment. (EWOULDBLOCK, EAGAIN)
-        /// - `connection-aborted`: An incoming connection was pending, but was terminated by the client before this listener could accept it. (ECONNABORTED)
-        /// - `new-socket-limit`:   The new socket resource could not be created because of a system limit. (EMFILE, ENFILE)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/accept.html>
-        /// - <https://man7.org/linux/man-pages/man2/accept.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-accept>
-        /// - <https://man.freebsd.org/cgi/man.cgi?query=accept&sektion=2>
-        accept: func() -> result<tuple<tcp-socket, input-stream, output-stream>, error-code>;
+	/// Start listening for new connections.
+	/// 
+	/// Transitions the socket into the Listener state.
+	/// 
+	/// Unlike POSIX:
+	/// - this function is async. This enables interactive WASI hosts to inject permission prompts.
+	/// - the socket must already be explicitly bound.
+	/// 
+	/// # Typical `start` errors
+	/// - `not-bound`:                 The socket is not bound to any local address. (EDESTADDRREQ)
+	/// - `already-connected`:         The socket is already in the Connection state. (EISCONN, EINVAL on BSD)
+	/// - `already-listening`:         The socket is already in the Listener state.
+	/// - `concurrency-conflict`:      Another `bind`, `connect` or `listen` operation is already in progress. (EINVAL on BSD)
+	///
+	/// # Typical `finish` errors
+	/// - `ephemeral-ports-exhausted`: Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE)
+	/// - `not-in-progress`:           A `listen` operation is not in progress.
+	/// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
+	///
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/listen.html>
+	/// - <https://man7.org/linux/man-pages/man2/listen.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-listen>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=listen&sektion=2>
+	start-listen: func(this: tcp-socket) -> result<_, error-code>
+	finish-listen: func(this: tcp-socket) -> result<_, error-code>
 
-        /// Get the bound local address.
-        ///
-        /// POSIX mentions:
-        /// > If the socket has not been bound to a local name, the value
-        /// > stored in the object pointed to by `address` is unspecified.
-        ///
-        /// WASI is stricter and requires `local-address` to return `invalid-state` when the socket hasn't been bound yet.
-        ///
-        /// # Typical errors
-        /// - `invalid-state`: The socket is not bound to any local address.
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockname.html>
-        /// - <https://man7.org/linux/man-pages/man2/getsockname.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getsockname>
-        /// - <https://man.freebsd.org/cgi/man.cgi?getsockname>
-        local-address: func() -> result<ip-socket-address, error-code>;
+	/// Accept a new client socket.
+	/// 
+	/// The returned socket is bound and in the Connection state.
+	/// 
+	/// On success, this function returns the newly accepted client socket along with
+	/// a pair of streams that can be used to read & write to the connection.
+	///
+	/// Note: the returned `input-stream` and `output-stream` are child
+	/// resources of the returned `tcp-socket`. Implementations may trap if the
+	/// `tcp-socket` is dropped before its child streams are dropped.
+	/// 
+	/// # Typical errors
+	/// - `not-listening`: Socket is not in the Listener state. (EINVAL)
+	/// - `would-block`:   No pending connections at the moment. (EWOULDBLOCK, EAGAIN)
+	/// 
+	/// Host implementations must skip over transient errors returned by the native accept syscall.
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/accept.html>
+	/// - <https://man7.org/linux/man-pages/man2/accept.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-accept>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=accept&sektion=2>
+	accept: func(this: tcp-socket) -> result<tuple<tcp-socket, input-stream, output-stream>, error-code>
 
-        /// Get the remote address.
-        ///
-        /// # Typical errors
-        /// - `invalid-state`: The socket is not connected to a remote address. (ENOTCONN)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getpeername.html>
-        /// - <https://man7.org/linux/man-pages/man2/getpeername.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getpeername>
-        /// - <https://man.freebsd.org/cgi/man.cgi?query=getpeername&sektion=2&n=1>
-        remote-address: func() -> result<ip-socket-address, error-code>;
+	/// Get the bound local address.
+	/// 
+	/// # Typical errors
+	/// - `not-bound`: The socket is not bound to any local address.
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockname.html>
+	/// - <https://man7.org/linux/man-pages/man2/getsockname.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getsockname>
+	/// - <https://man.freebsd.org/cgi/man.cgi?getsockname>
+	local-address: func(this: tcp-socket) -> result<ip-socket-address, error-code>
 
-        /// Whether this is a IPv4 or IPv6 socket.
-        ///
-        /// Equivalent to the SO_DOMAIN socket option.
-        address-family: func() -> ip-address-family;
+	/// Get the bound remote address.
+	/// 
+	/// # Typical errors
+	/// - `not-connected`: The socket is not connected to a remote address. (ENOTCONN)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getpeername.html>
+	/// - <https://man7.org/linux/man-pages/man2/getpeername.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getpeername>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=getpeername&sektion=2&n=1>
+	remote-address: func(this: tcp-socket) -> result<ip-socket-address, error-code>
 
-        /// Whether IPv4 compatibility (dual-stack) mode is disabled or not.
-        ///
-        /// Equivalent to the IPV6_V6ONLY socket option.
-        ///
-        /// # Typical errors
-        /// - `invalid-state`:        (set) The socket is already bound.
-        /// - `not-supported`:        (get/set) `this` socket is an IPv4 socket.
-        /// - `not-supported`:        (set) Host does not support dual-stack sockets. (Implementations are not required to.)
-        ipv6-only: func() -> result<bool, error-code>;
-        set-ipv6-only: func(value: bool) -> result<_, error-code>;
+	/// Whether this is a IPv4 or IPv6 socket.
+	/// 
+	/// Equivalent to the SO_DOMAIN socket option.
+	address-family: func(this: tcp-socket) -> ip-address-family
+	
+	/// Whether IPv4 compatibility (dual-stack) mode is disabled or not.
+	/// 
+	/// Equivalent to the IPV6_V6ONLY socket option.
+	/// 
+	/// # Typical errors
+	/// - `ipv6-only-operation`:  (get/set) `this` socket is an IPv4 socket.
+	/// - `already-bound`:        (set) The socket is already bound.
+	/// - `not-supported`:        (set) Host does not support dual-stack sockets. (Implementations are not required to.)
+	/// - `concurrency-conflict`: (set) A `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+	ipv6-only: func(this: tcp-socket) -> result<bool, error-code>
+	set-ipv6-only: func(this: tcp-socket, value: bool) -> result<_, error-code>
 
-        /// Hints the desired listen queue size. Implementations are free to ignore this.
-        ///
-        /// # Typical errors
-        /// - `not-supported`:        (set) The platform does not support changing the backlog size after the initial listen.
-        /// - `invalid-state`:        (set) The socket is already in the Connection state.
-        set-listen-backlog-size: func(value: u64) -> result<_, error-code>;
+	/// Hints the desired listen queue size. Implementations are free to ignore this.
+	/// 
+	/// # Typical errors
+	/// - `already-connected`:    (set) The socket is already in the Connection state.
+	/// - `concurrency-conflict`: (set) A `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+	set-listen-backlog-size: func(this: tcp-socket, value: u64) -> result<_, error-code>
 
-        /// Equivalent to the SO_KEEPALIVE socket option.
-        keep-alive: func() -> result<bool, error-code>;
-        set-keep-alive: func(value: bool) -> result<_, error-code>;
+	/// Equivalent to the SO_KEEPALIVE socket option.
+	/// 
+	/// # Typical errors
+	/// - `concurrency-conflict`: (set) A `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+	keep-alive: func(this: tcp-socket) -> result<bool, error-code>
+	set-keep-alive: func(this: tcp-socket, value: bool) -> result<_, error-code>
 
-        /// Equivalent to the TCP_NODELAY socket option.
-        ///
-        /// The default value is `false`.
-        no-delay: func() -> result<bool, error-code>;
-        set-no-delay: func(value: bool) -> result<_, error-code>;
+	/// Equivalent to the TCP_NODELAY socket option.
+	/// 
+	/// # Typical errors
+	/// - `concurrency-conflict`: (set) A `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+	no-delay: func(this: tcp-socket) -> result<bool, error-code>
+	set-no-delay: func(this: tcp-socket, value: bool) -> result<_, error-code>
+	
+	/// Equivalent to the IP_TTL & IPV6_UNICAST_HOPS socket options.
+	/// 
+	/// # Typical errors
+	/// - `already-connected`:    (set) The socket is already in the Connection state.
+	/// - `already-listening`:    (set) The socket is already in the Listener state.
+	/// - `concurrency-conflict`: (set) A `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+	unicast-hop-limit: func(this: tcp-socket) -> result<u8, error-code>
+	set-unicast-hop-limit: func(this: tcp-socket, value: u8) -> result<_, error-code>
 
-        /// Equivalent to the IP_TTL & IPV6_UNICAST_HOPS socket options.
-        ///
-        /// # Typical errors
-        /// - `invalid-argument`:     (set) The TTL value must be 1 or higher.
-        /// - `invalid-state`:        (set) The socket is already in the Connection state.
-        /// - `invalid-state`:        (set) The socket is already in the Listener state.
-        unicast-hop-limit: func() -> result<u8, error-code>;
-        set-unicast-hop-limit: func(value: u8) -> result<_, error-code>;
+	/// The kernel buffer space reserved for sends/receives on this socket.
+	/// 
+	/// Note #1: an implementation may choose to cap or round the buffer size when setting the value.
+	/// 	In other words, after setting a value, reading the same setting back may return a different value.
+	/// 
+	/// Note #2: there is not necessarily a direct relationship between the kernel buffer size and the bytes of
+	/// 	actual data to be sent/received by the application, because the kernel might also use the buffer space
+	/// 	for internal metadata structures.
+	/// 
+	/// Equivalent to the SO_RCVBUF and SO_SNDBUF socket options.
+	/// 
+	/// # Typical errors
+	/// - `already-connected`:    (set) The socket is already in the Connection state.
+	/// - `already-listening`:    (set) The socket is already in the Listener state.
+	/// - `concurrency-conflict`: (set) A `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+	receive-buffer-size: func(this: tcp-socket) -> result<u64, error-code>
+	set-receive-buffer-size: func(this: tcp-socket, value: u64) -> result<_, error-code>
+	send-buffer-size: func(this: tcp-socket) -> result<u64, error-code>
+	set-send-buffer-size: func(this: tcp-socket, value: u64) -> result<_, error-code>
 
-        /// The kernel buffer space reserved for sends/receives on this socket.
-        ///
-        /// Note #1: an implementation may choose to cap or round the buffer size when setting the value.
-        ///     In other words, after setting a value, reading the same setting back may return a different value.
-        ///
-        /// Note #2: there is not necessarily a direct relationship between the kernel buffer size and the bytes of
-        ///     actual data to be sent/received by the application, because the kernel might also use the buffer space
-        ///     for internal metadata structures.
-        ///
-        /// Equivalent to the SO_RCVBUF and SO_SNDBUF socket options.
-        ///
-        /// # Typical errors
-        /// - `invalid-state`:        (set) The socket is already in the Connection state.
-        /// - `invalid-state`:        (set) The socket is already in the Listener state.
-        receive-buffer-size: func() -> result<u64, error-code>;
-        set-receive-buffer-size: func(value: u64) -> result<_, error-code>;
-        send-buffer-size: func() -> result<u64, error-code>;
-        set-send-buffer-size: func(value: u64) -> result<_, error-code>;
+	/// Create a `pollable` which will resolve once the socket is ready for I/O.
+	/// 
+	/// The created `pollable` is a child resource of the `tcp-socket`.
+	/// Implementations may trap if the `tcp-socket` is dropped before all
+	/// derived `pollable`s created with this function are dropped.
+	///
+	/// Note: this function is here for WASI Preview2 only.
+	/// It's planned to be removed when `future` is natively supported in Preview3.
+	subscribe: func(this: tcp-socket) -> pollable
 
-        /// Create a `pollable` which will resolve once the socket is ready for I/O.
-        ///
-        /// Note: this function is here for WASI Preview2 only.
-        /// It's planned to be removed when `future` is natively supported in Preview3.
-        subscribe: func() -> pollable;
+	/// Initiate a graceful shutdown.
+	/// 
+	/// - receive: the socket is not expecting to receive any more data from the peer. All subsequent read
+	///   operations on the `input-stream` associated with this socket will return an End Of Stream indication.
+	///   Any data still in the receive queue at time of calling `shutdown` will be discarded.
+	/// - send: the socket is not expecting to send any more data to the peer. All subsequent write
+	///   operations on the `output-stream` associated with this socket will return an error.
+	/// - both: same effect as receive & send combined.
+	/// 
+	/// The shutdown function does not close (drop) the socket.
+	/// 
+	/// # Typical errors
+	/// - `not-connected`: The socket is not in the Connection state. (ENOTCONN)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/shutdown.html>
+	/// - <https://man7.org/linux/man-pages/man2/shutdown.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-shutdown>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=shutdown&sektion=2>
+	shutdown: func(this: tcp-socket, shutdown-type: shutdown-type) -> result<_, error-code>
 
-        /// Initiate a graceful shutdown.
-        ///
-        /// - receive: the socket is not expecting to receive any more data from the peer. All subsequent read
-        ///   operations on the `input-stream` associated with this socket will return an End Of Stream indication.
-        ///   Any data still in the receive queue at time of calling `shutdown` will be discarded.
-        /// - send: the socket is not expecting to send any more data to the peer. All subsequent write
-        ///   operations on the `output-stream` associated with this socket will return an error.
-        /// - both: same effect as receive & send combined.
-        ///
-        /// The shutdown function does not close (drop) the socket.
-        ///
-        /// # Typical errors
-        /// - `invalid-state`: The socket is not in the Connection state. (ENOTCONN)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/shutdown.html>
-        /// - <https://man7.org/linux/man-pages/man2/shutdown.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-shutdown>
-        /// - <https://man.freebsd.org/cgi/man.cgi?query=shutdown&sektion=2>
-        shutdown: func(shutdown-type: shutdown-type) -> result<_, error-code>;
-    }
+	/// Dispose of the specified `tcp-socket`, after which it may no longer be used.
+	/// 
+	/// Similar to the POSIX `close` function.
+	/// 
+	/// Note: this function is scheduled to be removed when Resources are natively supported in Wit.
+	drop-tcp-socket: func(this: tcp-socket)
 }
diff --git a/crates/wasi/wit/deps/sockets/udp-create-socket.wit b/crates/wasi/wit/deps/sockets/udp-create-socket.wit
index cc58234d8455..cd4c08fb1000 100644
--- a/crates/wasi/wit/deps/sockets/udp-create-socket.wit
+++ b/crates/wasi/wit/deps/sockets/udp-create-socket.wit
@@ -1,26 +1,27 @@
 
 interface udp-create-socket {
-    use network.{network, error-code, ip-address-family};
-    use udp.{udp-socket};
+	use network.{network, error-code, ip-address-family}
+	use udp.{udp-socket}
 
-    /// Create a new UDP socket.
-    ///
-    /// Similar to `socket(AF_INET or AF_INET6, SOCK_DGRAM, IPPROTO_UDP)` in POSIX.
-    ///
-    /// This function does not require a network capability handle. This is considered to be safe because
-    /// at time of creation, the socket is not bound to any `network` yet. Up to the moment `bind` is called,
-    /// the socket is effectively an in-memory configuration object, unable to communicate with the outside world.
-    ///
-    /// All sockets are non-blocking. Use the wasi-poll interface to block on asynchronous operations.
-    ///
-    /// # Typical errors
-    /// - `not-supported`:     The specified `address-family` is not supported. (EAFNOSUPPORT)
-    /// - `new-socket-limit`:  The new socket resource could not be created because of a system limit. (EMFILE, ENFILE)
-    ///
-    /// # References:
-    /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/socket.html>
-    /// - <https://man7.org/linux/man-pages/man2/socket.2.html>
-    /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketw>
-    /// - <https://man.freebsd.org/cgi/man.cgi?query=socket&sektion=2>
-    create-udp-socket: func(address-family: ip-address-family) -> result<udp-socket, error-code>;
+	/// Create a new UDP socket.
+	/// 
+	/// Similar to `socket(AF_INET or AF_INET6, SOCK_DGRAM, IPPROTO_UDP)` in POSIX.
+	/// 
+	/// This function does not require a network capability handle. This is considered to be safe because
+	/// at time of creation, the socket is not bound to any `network` yet. Up to the moment `bind`/`connect` is called,
+	/// the socket is effectively an in-memory configuration object, unable to communicate with the outside world.
+	/// 
+	/// All sockets are non-blocking. Use the wasi-poll interface to block on asynchronous operations.
+	/// 
+	/// # Typical errors
+	/// - `not-supported`:                The host does not support UDP sockets. (EOPNOTSUPP)
+	/// - `address-family-not-supported`: The specified `address-family` is not supported. (EAFNOSUPPORT)
+	/// - `new-socket-limit`:             The new socket resource could not be created because of a system limit. (EMFILE, ENFILE)
+	/// 
+	/// # References:
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/socket.html>
+	/// - <https://man7.org/linux/man-pages/man2/socket.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketw>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=socket&sektion=2>
+	create-udp-socket: func(address-family: ip-address-family) -> result<udp-socket, error-code>
 }
diff --git a/crates/wasi/wit/deps/sockets/udp.wit b/crates/wasi/wit/deps/sockets/udp.wit
index 232c2b41c7fb..700b9e247692 100644
--- a/crates/wasi/wit/deps/sockets/udp.wit
+++ b/crates/wasi/wit/deps/sockets/udp.wit
@@ -1,269 +1,220 @@
 
 interface udp {
-    use wasi:io/poll@0.2.0-rc-2023-11-05.{pollable};
-    use network.{network, error-code, ip-socket-address, ip-address-family};
-
-    /// A received datagram.
-    record incoming-datagram {
-        /// The payload.
-        /// 
-        /// Theoretical max size: ~64 KiB. In practice, typically less than 1500 bytes.
-        data: list<u8>,
-
-        /// The source address.
-        ///
-        /// This field is guaranteed to match the remote address the stream was initialized with, if any.
-        ///
-        /// Equivalent to the `src_addr` out parameter of `recvfrom`.
-        remote-address: ip-socket-address,
-    }
-
-    /// A datagram to be sent out.
-    record outgoing-datagram {
-        /// The payload.
-        data: list<u8>,
-
-        /// The destination address.
-        ///
-        /// The requirements on this field depend on how the stream was initialized:
-        /// - with a remote address: this field must be None or match the stream's remote address exactly.
-        /// - without a remote address: this field is required.
-        ///
-        /// If this value is None, the send operation is equivalent to `send` in POSIX. Otherwise it is equivalent to `sendto`.
-        remote-address: option<ip-socket-address>,
-    }
-
-
-
-    /// A UDP socket handle.
-    resource udp-socket {
-        /// Bind the socket to a specific network on the provided IP address and port.
-        ///
-        /// If the IP address is zero (`0.0.0.0` in IPv4, `::` in IPv6), it is left to the implementation to decide which
-        /// network interface(s) to bind to.
-        /// If the port is zero, the socket will be bound to a random free port.
-        ///
-        /// Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.
-        ///
-        /// # Typical `start` errors
-        /// - `invalid-argument`:          The `local-address` has the wrong address family. (EAFNOSUPPORT, EFAULT on Windows)
-        /// - `invalid-state`:             The socket is already bound. (EINVAL)
-        ///
-        /// # Typical `finish` errors
-        /// - `address-in-use`:            No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows)
-        /// - `address-in-use`:            Address is already in use. (EADDRINUSE)
-        /// - `address-not-bindable`:      `local-address` is not an address that the `network` can bind to. (EADDRNOTAVAIL)
-        /// - `not-in-progress`:           A `bind` operation is not in progress.
-        /// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html>
-        /// - <https://man7.org/linux/man-pages/man2/bind.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-bind>
-        /// - <https://man.freebsd.org/cgi/man.cgi?query=bind&sektion=2&format=html>
-        start-bind: func(network: borrow<network>, local-address: ip-socket-address) -> result<_, error-code>;
-        finish-bind: func() -> result<_, error-code>;
-
-        /// Set up inbound & outbound communication channels, optionally to a specific peer.
-        ///
-        /// This function only changes the local socket configuration and does not generate any network traffic.
-        /// On success, the `remote-address` of the socket is updated. The `local-address` may be updated as well,
-        /// based on the best network path to `remote-address`.
-        ///
-        /// When a `remote-address` is provided, the returned streams are limited to communicating with that specific peer:
-        /// - `send` can only be used to send to this destination.
-        /// - `receive` will only return datagrams sent from the provided `remote-address`.
-        ///
-        /// This method may be called multiple times on the same socket to change its association, but
-        /// only the most recently returned pair of streams will be operational. Implementations may trap if
-        /// the streams returned by a previous invocation haven't been dropped yet before calling `stream` again.
-        /// 
-        /// The POSIX equivalent in pseudo-code is:
-        /// ```text
-        /// if (was previously connected) {
-        /// 	connect(s, AF_UNSPEC)
-        /// }
-        /// if (remote_address is Some) {
-        /// 	connect(s, remote_address)
-        /// }
-        /// ```
-        ///
-        /// Unlike in POSIX, the socket must already be explicitly bound.
-        /// 
-        /// # Typical errors
-        /// - `invalid-argument`:          The `remote-address` has the wrong address family. (EAFNOSUPPORT)
-        /// - `invalid-argument`:          `remote-address` is a non-IPv4-mapped IPv6 address, but the socket was bound to a specific IPv4-mapped IPv6 address. (or vice versa)
-        /// - `invalid-argument`:          The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EDESTADDRREQ, EADDRNOTAVAIL)
-        /// - `invalid-argument`:          The port in `remote-address` is set to 0. (EDESTADDRREQ, EADDRNOTAVAIL)
-        /// - `invalid-state`:             The socket is not bound.
-        /// - `address-in-use`:            Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE, EADDRNOTAVAIL on Linux, EAGAIN on BSD)
-        /// - `remote-unreachable`:        The remote address is not reachable. (ECONNREFUSED, ECONNRESET, ENETRESET, EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/connect.html>
-        /// - <https://man7.org/linux/man-pages/man2/connect.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-connect>
-        /// - <https://man.freebsd.org/cgi/man.cgi?connect>
-        %stream: func(remote-address: option<ip-socket-address>) -> result<tuple<incoming-datagram-stream, outgoing-datagram-stream>, error-code>;
-
-        /// Get the current bound address.
-        ///
-        /// POSIX mentions:
-        /// > If the socket has not been bound to a local name, the value
-        /// > stored in the object pointed to by `address` is unspecified.
-        ///
-        /// WASI is stricter and requires `local-address` to return `invalid-state` when the socket hasn't been bound yet.
-        /// 
-        /// # Typical errors
-        /// - `invalid-state`: The socket is not bound to any local address.
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockname.html>
-        /// - <https://man7.org/linux/man-pages/man2/getsockname.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getsockname>
-        /// - <https://man.freebsd.org/cgi/man.cgi?getsockname>
-        local-address: func() -> result<ip-socket-address, error-code>;
-
-        /// Get the address the socket is currently streaming to.
-        ///
-        /// # Typical errors
-        /// - `invalid-state`: The socket is not streaming to a specific remote address. (ENOTCONN)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getpeername.html>
-        /// - <https://man7.org/linux/man-pages/man2/getpeername.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getpeername>
-        /// - <https://man.freebsd.org/cgi/man.cgi?query=getpeername&sektion=2&n=1>
-        remote-address: func() -> result<ip-socket-address, error-code>;
-
-        /// Whether this is a IPv4 or IPv6 socket.
-        ///
-        /// Equivalent to the SO_DOMAIN socket option.
-        address-family: func() -> ip-address-family;
-
-        /// Whether IPv4 compatibility (dual-stack) mode is disabled or not.
-        ///
-        /// Equivalent to the IPV6_V6ONLY socket option.
-        ///
-        /// # Typical errors
-        /// - `not-supported`:        (get/set) `this` socket is an IPv4 socket.
-        /// - `invalid-state`:        (set) The socket is already bound.
-        /// - `not-supported`:        (set) Host does not support dual-stack sockets. (Implementations are not required to.)
-        ipv6-only: func() -> result<bool, error-code>;
-        set-ipv6-only: func(value: bool) -> result<_, error-code>;
-
-        /// Equivalent to the IP_TTL & IPV6_UNICAST_HOPS socket options.
-        unicast-hop-limit: func() -> result<u8, error-code>;
-        set-unicast-hop-limit: func(value: u8) -> result<_, error-code>;
-
-        /// The kernel buffer space reserved for sends/receives on this socket.
-        ///
-        /// Note #1: an implementation may choose to cap or round the buffer size when setting the value.
-        /// 	In other words, after setting a value, reading the same setting back may return a different value.
-        ///
-        /// Note #2: there is not necessarily a direct relationship between the kernel buffer size and the bytes of
-        /// 	actual data to be sent/received by the application, because the kernel might also use the buffer space
-        /// 	for internal metadata structures.
-        ///
-        /// Equivalent to the SO_RCVBUF and SO_SNDBUF socket options.
-        receive-buffer-size: func() -> result<u64, error-code>;
-        set-receive-buffer-size: func(value: u64) -> result<_, error-code>;
-        send-buffer-size: func() -> result<u64, error-code>;
-        set-send-buffer-size: func(value: u64) -> result<_, error-code>;
-
-        /// Create a `pollable` which will resolve once the socket is ready for I/O.
-        ///
-        /// Note: this function is here for WASI Preview2 only.
-        /// It's planned to be removed when `future` is natively supported in Preview3.
-        subscribe: func() -> pollable;
-    }
-
-    resource incoming-datagram-stream {
-        /// Receive messages on the socket.
-        ///
-        /// This function attempts to receive up to `max-results` datagrams on the socket without blocking.
-        /// The returned list may contain fewer elements than requested, but never more.
-        ///
-        /// This function returns successfully with an empty list when either:
-        /// - `max-results` is 0, or:
-        /// - `max-results` is greater than 0, but no results are immediately available.
-        /// This function never returns `error(would-block)`.
-        ///
-        /// # Typical errors
-        /// - `remote-unreachable`: The remote address is not reachable. (ECONNREFUSED, ECONNRESET, ENETRESET on Windows, EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/recvfrom.html>
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/recvmsg.html>
-        /// - <https://man7.org/linux/man-pages/man2/recv.2.html>
-        /// - <https://man7.org/linux/man-pages/man2/recvmmsg.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-recv>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-recvfrom>
-        /// - <https://learn.microsoft.com/en-us/previous-versions/windows/desktop/legacy/ms741687(v=vs.85)>
-        /// - <https://man.freebsd.org/cgi/man.cgi?query=recv&sektion=2>
-        receive: func(max-results: u64) -> result<list<incoming-datagram>, error-code>;
-
-        /// Create a `pollable` which will resolve once the stream is ready to receive again.
-        ///
-        /// Note: this function is here for WASI Preview2 only.
-        /// It's planned to be removed when `future` is natively supported in Preview3.
-        subscribe: func() -> pollable;
-    }
-
-    resource outgoing-datagram-stream {
-        /// Check readiness for sending. This function never blocks.
-        ///
-        /// Returns the number of datagrams permitted for the next call to `send`,
-        /// or an error. Calling `send` with more datagrams than this function has
-        /// permitted will trap.
-        ///
-        /// When this function returns ok(0), the `subscribe` pollable will
-        /// become ready when this function will report at least ok(1), or an
-        /// error.
-        /// 
-        /// Never returns `would-block`.
-        check-send: func() -> result<u64, error-code>;
-
-        /// Send messages on the socket.
-        ///
-        /// This function attempts to send all provided `datagrams` on the socket without blocking and
-        /// returns how many messages were actually sent (or queued for sending). This function never
-        /// returns `error(would-block)`. If none of the datagrams were able to be sent, `ok(0)` is returned.
-        ///
-        /// This function semantically behaves the same as iterating the `datagrams` list and sequentially
-        /// sending each individual datagram until either the end of the list has been reached or the first error occurred.
-        /// If at least one datagram has been sent successfully, this function never returns an error.
-        ///
-        /// If the input list is empty, the function returns `ok(0)`.
-        ///
-        /// Each call to `send` must be permitted by a preceding `check-send`. Implementations must trap if
-        /// either `check-send` was not called or `datagrams` contains more items than `check-send` permitted.
-        ///
-        /// # Typical errors
-        /// - `invalid-argument`:        The `remote-address` has the wrong address family. (EAFNOSUPPORT)
-        /// - `invalid-argument`:        `remote-address` is a non-IPv4-mapped IPv6 address, but the socket was bound to a specific IPv4-mapped IPv6 address. (or vice versa)
-        /// - `invalid-argument`:        The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EDESTADDRREQ, EADDRNOTAVAIL)
-        /// - `invalid-argument`:        The port in `remote-address` is set to 0. (EDESTADDRREQ, EADDRNOTAVAIL)
-        /// - `invalid-argument`:        The socket is in "connected" mode and `remote-address` is `some` value that does not match the address passed to `stream`. (EISCONN)
-        /// - `invalid-argument`:        The socket is not "connected" and no value for `remote-address` was provided. (EDESTADDRREQ)
-        /// - `remote-unreachable`:      The remote address is not reachable. (ECONNREFUSED, ECONNRESET, ENETRESET on Windows, EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN)
-        /// - `datagram-too-large`:      The datagram is too large. (EMSGSIZE)
-        ///
-        /// # References
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/sendto.html>
-        /// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/sendmsg.html>
-        /// - <https://man7.org/linux/man-pages/man2/send.2.html>
-        /// - <https://man7.org/linux/man-pages/man2/sendmmsg.2.html>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-send>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-sendto>
-        /// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasendmsg>
-        /// - <https://man.freebsd.org/cgi/man.cgi?query=send&sektion=2>
-        send: func(datagrams: list<outgoing-datagram>) -> result<u64, error-code>;
-        
-        /// Create a `pollable` which will resolve once the stream is ready to send again.
-        ///
-        /// Note: this function is here for WASI Preview2 only.
-        /// It's planned to be removed when `future` is natively supported in Preview3.
-        subscribe: func() -> pollable;
-    }
+	use wasi:poll/poll.{pollable}
+	use network.{network, error-code, ip-socket-address, ip-address-family}
+
+
+	/// A UDP socket handle.
+	type udp-socket = u32
+
+
+	record datagram {
+		data: list<u8>, // Theoretical max size: ~64 KiB. In practice, typically less than 1500 bytes.
+		remote-address: ip-socket-address,
+
+		/// Possible future additions:
+		/// local-address: ip-socket-address, // IP_PKTINFO / IP_RECVDSTADDR / IPV6_PKTINFO
+		/// local-interface: u32, // IP_PKTINFO / IP_RECVIF
+		/// ttl: u8, // IP_RECVTTL
+		/// dscp: u6, // IP_RECVTOS
+		/// ecn: u2, // IP_RECVTOS
+	}
+
+
+
+	/// Bind the socket to a specific network on the provided IP address and port.
+	///
+	/// If the IP address is zero (`0.0.0.0` in IPv4, `::` in IPv6), it is left to the implementation to decide which
+	/// network interface(s) to bind to.
+	/// If the TCP/UDP port is zero, the socket will be bound to a random free port.
+	/// 
+	/// When a socket is not explicitly bound, the first invocation to connect will implicitly bind the socket.
+	/// 
+	/// Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.
+	/// 
+	/// # Typical `start` errors
+	/// - `address-family-mismatch`:   The `local-address` has the wrong address family. (EINVAL)
+	/// - `already-bound`:             The socket is already bound. (EINVAL)
+	/// - `concurrency-conflict`:      Another `bind` or `connect` operation is already in progress. (EALREADY)
+	/// 
+	/// # Typical `finish` errors
+	/// - `ephemeral-ports-exhausted`: No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows)
+	/// - `address-in-use`:            Address is already in use. (EADDRINUSE)
+	/// - `address-not-bindable`:      `local-address` is not an address that the `network` can bind to. (EADDRNOTAVAIL)
+	/// - `not-in-progress`:           A `bind` operation is not in progress.
+	/// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html>
+	/// - <https://man7.org/linux/man-pages/man2/bind.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-bind>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=bind&sektion=2&format=html>
+	start-bind: func(this: udp-socket, network: network, local-address: ip-socket-address) -> result<_, error-code>
+	finish-bind: func(this: udp-socket) -> result<_, error-code>
+
+	/// Set the destination address.
+	/// 
+	/// The local-address is updated based on the best network path to `remote-address`.
+	/// 
+	/// When a destination address is set:
+	/// - all receive operations will only return datagrams sent from the provided `remote-address`.
+	/// - the `send` function can only be used to send to this destination.
+	/// 
+	/// Note that this function does not generate any network traffic and the peer is not aware of this "connection".
+	/// 
+	/// Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.
+	/// 
+	/// # Typical `start` errors
+	/// - `address-family-mismatch`:   The `remote-address` has the wrong address family. (EAFNOSUPPORT)
+	/// - `invalid-remote-address`:    The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EDESTADDRREQ, EADDRNOTAVAIL)
+	/// - `invalid-remote-address`:    The port in `remote-address` is set to 0. (EDESTADDRREQ, EADDRNOTAVAIL)
+	/// - `already-attached`:          The socket is already bound to a different network. The `network` passed to `connect` must be identical to the one passed to `bind`.
+	/// - `concurrency-conflict`:      Another `bind` or `connect` operation is already in progress. (EALREADY)
+	/// 
+	/// # Typical `finish` errors
+	/// - `ephemeral-ports-exhausted`: Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE, EADDRNOTAVAIL on Linux, EAGAIN on BSD)
+	/// - `not-in-progress`:           A `connect` operation is not in progress.
+	/// - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/connect.html>
+	/// - <https://man7.org/linux/man-pages/man2/connect.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-connect>
+	/// - <https://man.freebsd.org/cgi/man.cgi?connect>
+	start-connect: func(this: udp-socket, network: network, remote-address: ip-socket-address) -> result<_, error-code>
+	finish-connect: func(this: udp-socket) -> result<_, error-code>
+
+	/// Receive messages on the socket.
+	/// 
+	/// This function attempts to receive up to `max-results` datagrams on the socket without blocking.
+	/// The returned list may contain fewer elements than requested, but never more.
+	/// If `max-results` is 0, this function returns successfully with an empty list.
+	/// 
+	/// # Typical errors
+	/// - `not-bound`:          The socket is not bound to any local address. (EINVAL)
+	/// - `remote-unreachable`: The remote address is not reachable. (ECONNREFUSED, ECONNRESET, ENETRESET on Windows, EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN)
+	/// - `would-block`:        There is no pending data available to be read at the moment. (EWOULDBLOCK, EAGAIN)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/recvfrom.html>
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/recvmsg.html>
+	/// - <https://man7.org/linux/man-pages/man2/recv.2.html>
+	/// - <https://man7.org/linux/man-pages/man2/recvmmsg.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-recv>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-recvfrom>
+	/// - <https://learn.microsoft.com/en-us/previous-versions/windows/desktop/legacy/ms741687(v=vs.85)>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=recv&sektion=2>
+	receive: func(this: udp-socket, max-results: u64) -> result<list<datagram>, error-code>
+
+	/// Send messages on the socket.
+	/// 
+	/// This function attempts to send all provided `datagrams` on the socket without blocking and
+	/// returns how many messages were actually sent (or queued for sending).
+	/// 
+	/// This function semantically behaves the same as iterating the `datagrams` list and sequentially
+	/// sending each individual datagram until either the end of the list has been reached or the first error occurred.
+	/// If at least one datagram has been sent successfully, this function never returns an error.
+	/// 
+	/// If the input list is empty, the function returns `ok(0)`.
+	/// 
+	/// The remote address option is required. To send a message to the "connected" peer,
+	/// call `remote-address` to get their address.
+	/// 
+	/// # Typical errors
+	/// - `address-family-mismatch`: The `remote-address` has the wrong address family. (EAFNOSUPPORT)
+	/// - `invalid-remote-address`:  The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EDESTADDRREQ, EADDRNOTAVAIL)
+	/// - `invalid-remote-address`:  The port in `remote-address` is set to 0. (EDESTADDRREQ, EADDRNOTAVAIL)
+	/// - `already-connected`:       The socket is in "connected" mode and the `datagram.remote-address` does not match the address passed to `connect`. (EISCONN)
+	/// - `not-bound`:               The socket is not bound to any local address. Unlike POSIX, this function does not perform an implicit bind.
+	/// - `remote-unreachable`:      The remote address is not reachable. (ECONNREFUSED, ECONNRESET, ENETRESET on Windows, EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN)
+	/// - `datagram-too-large`:      The datagram is too large. (EMSGSIZE)
+	/// - `would-block`:             The send buffer is currently full. (EWOULDBLOCK, EAGAIN)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/sendto.html>
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/sendmsg.html>
+	/// - <https://man7.org/linux/man-pages/man2/send.2.html>
+	/// - <https://man7.org/linux/man-pages/man2/sendmmsg.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-send>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-sendto>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasendmsg>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=send&sektion=2>
+	send: func(this: udp-socket, datagrams: list<datagram>) -> result<u64, error-code>
+
+	/// Get the current bound address.
+	/// 
+	/// # Typical errors
+	/// - `not-bound`: The socket is not bound to any local address.
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockname.html>
+	/// - <https://man7.org/linux/man-pages/man2/getsockname.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getsockname>
+	/// - <https://man.freebsd.org/cgi/man.cgi?getsockname>
+	local-address: func(this: udp-socket) -> result<ip-socket-address, error-code>
+
+	/// Get the address set with `connect`.
+	/// 
+	/// # Typical errors
+	/// - `not-connected`: The socket is not connected to a remote address. (ENOTCONN)
+	/// 
+	/// # References
+	/// - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getpeername.html>
+	/// - <https://man7.org/linux/man-pages/man2/getpeername.2.html>
+	/// - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getpeername>
+	/// - <https://man.freebsd.org/cgi/man.cgi?query=getpeername&sektion=2&n=1>
+	remote-address: func(this: udp-socket) -> result<ip-socket-address, error-code>
+
+	/// Whether this is a IPv4 or IPv6 socket.
+	/// 
+	/// Equivalent to the SO_DOMAIN socket option.
+	address-family: func(this: udp-socket) -> ip-address-family
+
+	/// Whether IPv4 compatibility (dual-stack) mode is disabled or not.
+	/// 
+	/// Equivalent to the IPV6_V6ONLY socket option.
+	/// 
+	/// # Typical errors
+	/// - `ipv6-only-operation`:  (get/set) `this` socket is an IPv4 socket.
+	/// - `already-bound`:        (set) The socket is already bound.
+	/// - `not-supported`:        (set) Host does not support dual-stack sockets. (Implementations are not required to.)
+	/// - `concurrency-conflict`: (set) Another `bind` or `connect` operation is already in progress. (EALREADY)
+	ipv6-only: func(this: udp-socket) -> result<bool, error-code>
+	set-ipv6-only: func(this: udp-socket, value: bool) -> result<_, error-code>
+
+	/// Equivalent to the IP_TTL & IPV6_UNICAST_HOPS socket options.
+	/// 
+	/// # Typical errors
+	/// - `concurrency-conflict`: (set) Another `bind` or `connect` operation is already in progress. (EALREADY)
+	unicast-hop-limit: func(this: udp-socket) -> result<u8, error-code>
+	set-unicast-hop-limit: func(this: udp-socket, value: u8) -> result<_, error-code>
+
+	/// The kernel buffer space reserved for sends/receives on this socket.
+	/// 
+	/// Note #1: an implementation may choose to cap or round the buffer size when setting the value.
+	/// 	In other words, after setting a value, reading the same setting back may return a different value.
+	/// 
+	/// Note #2: there is not necessarily a direct relationship between the kernel buffer size and the bytes of
+	/// 	actual data to be sent/received by the application, because the kernel might also use the buffer space
+	/// 	for internal metadata structures.
+	/// 
+	/// Equivalent to the SO_RCVBUF and SO_SNDBUF socket options.
+	/// 
+	/// # Typical errors
+	/// - `concurrency-conflict`: (set) Another `bind` or `connect` operation is already in progress. (EALREADY)
+	receive-buffer-size: func(this: udp-socket) -> result<u64, error-code>
+	set-receive-buffer-size: func(this: udp-socket, value: u64) -> result<_, error-code>
+	send-buffer-size: func(this: udp-socket) -> result<u64, error-code>
+	set-send-buffer-size: func(this: udp-socket, value: u64) -> result<_, error-code>
+
+	/// Create a `pollable` which will resolve once the socket is ready for I/O.
+	/// 
+	/// Note: this function is here for WASI Preview2 only.
+	/// It's planned to be removed when `future` is natively supported in Preview3.
+	subscribe: func(this: udp-socket) -> pollable
+
+	/// Dispose of the specified `udp-socket`, after which it may no longer be used.
+	/// 
+	/// Note: this function is scheduled to be removed when Resources are natively supported in Wit.
+	drop-udp-socket: func(this: udp-socket)
 }
diff --git a/crates/wasi/wit/deps/sockets/world.wit b/crates/wasi/wit/deps/sockets/world.wit
deleted file mode 100644
index 979703869c06..000000000000
--- a/crates/wasi/wit/deps/sockets/world.wit
+++ /dev/null
@@ -1,11 +0,0 @@
-package wasi:sockets@0.2.0-rc-2023-11-05;
-
-world imports {
-    import instance-network;
-    import network;
-    import udp;
-    import udp-create-socket;
-    import tcp;
-    import tcp-create-socket;
-    import ip-name-lookup;
-}
diff --git a/crates/wasi/wit/main.wit b/crates/wasi/wit/main.wit
index 90aa28ad3c42..753770ad22ab 100644
--- a/crates/wasi/wit/main.wit
+++ b/crates/wasi/wit/main.wit
@@ -1,33 +1,33 @@
-package wasmtime:wasi;
+package wasmtime:wasi
 
 // All of the same imports available in the wasi:cli/command world, but no
 // export required:
 world preview1-adapter-reactor {
-  import wasi:clocks/wall-clock@0.2.0-rc-2023-11-05;
-  import wasi:clocks/monotonic-clock@0.2.0-rc-2023-11-05;
-  import wasi:clocks/timezone@0.2.0-rc-2023-11-05;
-  import wasi:filesystem/types@0.2.0-rc-2023-11-05;
-  import wasi:filesystem/preopens@0.2.0-rc-2023-11-05;
-  import wasi:sockets/instance-network@0.2.0-rc-2023-11-05;
-  import wasi:sockets/ip-name-lookup@0.2.0-rc-2023-11-05;
-  import wasi:sockets/network@0.2.0-rc-2023-11-05;
-  import wasi:sockets/tcp-create-socket@0.2.0-rc-2023-11-05;
-  import wasi:sockets/tcp@0.2.0-rc-2023-11-05;
-  import wasi:sockets/udp-create-socket@0.2.0-rc-2023-11-05;
-  import wasi:sockets/udp@0.2.0-rc-2023-11-05;
-  import wasi:random/random@0.2.0-rc-2023-11-05;
-  import wasi:random/insecure@0.2.0-rc-2023-11-05;
-  import wasi:random/insecure-seed@0.2.0-rc-2023-11-05;
-  import wasi:io/poll@0.2.0-rc-2023-11-05;
-  import wasi:io/streams@0.2.0-rc-2023-11-05;
-  import wasi:cli/environment@0.2.0-rc-2023-11-05;
-  import wasi:cli/exit@0.2.0-rc-2023-11-05;
-  import wasi:cli/stdin@0.2.0-rc-2023-11-05;
-  import wasi:cli/stdout@0.2.0-rc-2023-11-05;
-  import wasi:cli/stderr@0.2.0-rc-2023-11-05;
-  import wasi:cli/terminal-input@0.2.0-rc-2023-11-05;
-  import wasi:cli/terminal-output@0.2.0-rc-2023-11-05;
-  import wasi:cli/terminal-stdin@0.2.0-rc-2023-11-05;
-  import wasi:cli/terminal-stdout@0.2.0-rc-2023-11-05;
-  import wasi:cli/terminal-stderr@0.2.0-rc-2023-11-05;
+  import wasi:clocks/wall-clock
+  import wasi:clocks/monotonic-clock
+  import wasi:clocks/timezone
+  import wasi:filesystem/types
+  import wasi:filesystem/preopens
+  import wasi:sockets/instance-network
+  import wasi:sockets/ip-name-lookup
+  import wasi:sockets/network
+  import wasi:sockets/tcp-create-socket
+  import wasi:sockets/tcp
+  import wasi:sockets/udp-create-socket
+  import wasi:sockets/udp
+  import wasi:random/random
+  import wasi:random/insecure
+  import wasi:random/insecure-seed
+  import wasi:poll/poll
+  import wasi:io/streams
+  import wasi:cli/environment
+  import wasi:cli/exit
+  import wasi:cli/stdin
+  import wasi:cli/stdout
+  import wasi:cli/stderr
+  import wasi:cli/terminal-input
+  import wasi:cli/terminal-output
+  import wasi:cli/terminal-stdin
+  import wasi:cli/terminal-stdout
+  import wasi:cli/terminal-stderr
 }
diff --git a/crates/wasi/wit/test.wit b/crates/wasi/wit/test.wit
index 5e7557ed6d30..4543cb194af1 100644
--- a/crates/wasi/wit/test.wit
+++ b/crates/wasi/wit/test.wit
@@ -1,20 +1,41 @@
 // only used as part of `test-programs`
 world test-reactor {
-  include wasi:cli/reactor@0.2.0-rc-2023-11-05;
 
-  export add-strings: func(s: list<string>) -> u32;
-  export get-strings: func() -> list<string>;
+  import wasi:cli/environment
+  import wasi:io/streams
+  import wasi:filesystem/types
+  import wasi:filesystem/preopens
+  import wasi:cli/exit
 
-  use wasi:io/streams@0.2.0-rc-2023-11-05.{output-stream};
+  export add-strings: func(s: list<string>) -> u32
+  export get-strings: func() -> list<string>
 
-  export write-strings-to: func(o: output-stream) -> result;
+  use wasi:io/streams.{output-stream}
 
-  use wasi:filesystem/types@0.2.0-rc-2023-11-05.{descriptor-stat};
-  export pass-an-imported-record: func(d: descriptor-stat) -> string;
+  export write-strings-to: func(o: output-stream) -> result
+
+  use wasi:filesystem/types.{descriptor-stat}
+  export pass-an-imported-record: func(d: descriptor-stat) -> string
 }
 
 world test-command {
-  include wasi:cli/reactor@0.2.0-rc-2023-11-05;
-  import wasi:http/types@0.2.0-rc-2023-11-05;
-  import wasi:http/outgoing-handler@0.2.0-rc-2023-11-05;
+  import wasi:poll/poll
+  import wasi:io/streams
+  import wasi:cli/environment
+  import wasi:cli/stdin
+  import wasi:cli/stdout
+  import wasi:cli/stderr
+}
+
+world test-command-with-sockets {
+  import wasi:poll/poll
+  import wasi:io/streams
+  import wasi:cli/environment
+  import wasi:cli/stdin
+  import wasi:cli/stdout
+  import wasi:cli/stderr
+  import wasi:sockets/tcp
+  import wasi:sockets/tcp-create-socket
+  import wasi:sockets/network
+  import wasi:sockets/instance-network
 }
diff --git a/crates/wasmtime/Cargo.toml b/crates/wasmtime/Cargo.toml
index dd4a10e69c73..6aa56e8f54f1 100644
--- a/crates/wasmtime/Cargo.toml
+++ b/crates/wasmtime/Cargo.toml
@@ -29,7 +29,7 @@ wasmtime-component-macro = { workspace = true, optional = true }
 wasmtime-component-util = { workspace = true, optional = true }
 target-lexicon = { workspace = true }
 wasmparser = { workspace = true }
-wasm-encoder = { workspace = true, optional = true }
+wasm-encoder = { workspace = true }
 anyhow = { workspace = true }
 libc = "0.2"
 cfg-if = { workspace = true }
@@ -41,13 +41,14 @@ serde_json = { workspace = true }
 bincode = "1.2.1"
 indexmap = { workspace = true }
 paste = "1.0.3"
+psm = "0.1.11"
 once_cell = { workspace = true }
 rayon = { version = "1.0", optional = true }
 object = { workspace = true }
 async-trait = { workspace = true, optional = true }
 encoding_rs = { version = "0.8.31", optional = true }
 bumpalo = "3.11.0"
-fxprof-processed-profile = { version = "0.6.0", optional = true }
+fxprof-processed-profile = "0.6.0"
 
 [target.'cfg(target_os = "windows")'.dependencies.windows-sys]
 workspace = true
@@ -55,36 +56,21 @@ features = [
   "Win32_System_Diagnostics_Debug",
 ]
 
-[target.'cfg(target_arch = "s390x")'.dependencies]
-psm = "0.1.11"
-
 [dev-dependencies]
 tempfile = "3.0"
 wasmtime-wasi = { path = "../wasi", default-features = true }
 wasi-cap-std-sync = { path = "../wasi-common/cap-std-sync" }
 
-# =============================================================================
-#
-# Features for the Wasmtime crate.
-#
-# This section contains the compile-time features of the `wasmtime` crate. These
-# features can be used to add more functionality and APIs exposed from the
-# crate's API. Most of them are enabled by default. Disabling features can be
-# done to cut down on binary size by disabling features that are not required
-# for a particular embedding.
 [features]
 default = [
   'async',
   'cache',
   'wat',
-  'profiling',
+  'jitdump',
   'parallel-compilation',
   'cranelift',
   'pooling-allocator',
-  'demangle',
-  'addr2line',
-  'coredump',
-  'debug-builtins',
+  'vtune',
 ]
 
 # An on-by-default feature enabling runtime compilation of WebAssembly modules
@@ -101,8 +87,11 @@ winch = ["dep:wasmtime-winch"]
 # Enables support for incremental compilation cache to be enabled in `Config`.
 incremental-cache = ["wasmtime-cranelift?/incremental-cache"]
 
-# Enables support for profiling guest modules.
-profiling = ["wasmtime-jit/profiling", "dep:fxprof-processed-profile"]
+# Enables support for the `perf` jitdump profiler
+jitdump = ["wasmtime-jit/jitdump"]
+
+# Enables support for the `VTune` profiler
+vtune = ["wasmtime-jit/vtune"]
 
 # Enables parallel compilation of WebAssembly code.
 parallel-compilation = ["dep:rayon"]
@@ -144,18 +133,3 @@ component-model = [
 ]
 
 wmemcheck = ["wasmtime-runtime/wmemcheck", "wasmtime-cranelift?/wmemcheck"]
-
-# Enables support for demangling WebAssembly function names at runtime in
-# errors such as backtraces.
-demangle = ["wasmtime-jit/demangle"]
-
-# Enable support for generating core dumps on traps.
-coredump = ["dep:wasm-encoder"]
-
-# Support address-to-file/line information in traps when wasm files have DWARF
-# debugging information.
-addr2line = ["wasmtime-jit/addr2line"]
-
-# Export some symbols from the final binary to assist in debugging
-# Cranelift-generated code with native debuggers like GDB and LLDB.
-debug-builtins = ["wasmtime-runtime/debug-builtins"]
diff --git a/crates/wasmtime/src/component/mod.rs b/crates/wasmtime/src/component/mod.rs
index e2028a2bebb5..618f829b2540 100644
--- a/crates/wasmtime/src/component/mod.rs
+++ b/crates/wasmtime/src/component/mod.rs
@@ -74,11 +74,11 @@ pub(crate) use self::store::ComponentStoreData;
 /// ```text,ignore
 /// // wit/my-component.wit
 ///
-/// package my:project;
+/// package my:project
 ///
 /// world hello-world {
-///     import name: func() -> string;
-///     export greet: func();
+///     import name: func() -> string
+///     export greet: func()
 /// }
 /// ```
 ///
@@ -153,18 +153,18 @@ pub(crate) use self::store::ComponentStoreData;
 /// ```text,ignore
 /// // wit/my-component.wit
 ///
-/// package my:project;
+/// package my:project
 ///
 /// interface host {
-///     gen-random-integer: func() -> u32;
-///     sha256: func(bytes: list<u8>) -> string;
+///     gen-random-integer: func() -> u32
+///     sha256: func(bytes: list<u8>) -> string
 /// }
 ///
 /// default world hello-world {
-///     import host;
+///     import host
 ///
 ///     export demo: interface {
-///         run: func();
+///         run: func()
 ///     }
 /// }
 /// ```
@@ -258,7 +258,7 @@ pub(crate) use self::store::ComponentStoreData;
 ///     // Instead of `path` the WIT document can be provided inline if
 ///     // desired.
 ///     inline: "
-///         package my:inline;
+///         package my:inline
 ///
 ///         world foo {
 ///             // ...
@@ -299,15 +299,14 @@ pub(crate) use self::store::ComponentStoreData;
 ///
 ///     // This can be used to translate WIT return values of the form
 ///     // `result<T, error-type>` into `Result<T, RustErrorType>` in Rust.
-///     // Users must define `RustErrorType` and the `Host` trait for the
-///     // interface which defines `error-type` will have a method
-///     // called `convert_error_type` which converts `RustErrorType`
-///     // into `wasmtime::Result<ErrorType>`. This conversion can either
-///     // return the raw WIT error (`ErrorType` here) or a trap.
+///     // The `RustErrorType` structure will have an automatically generated
+///     // implementation of `From<ErrorType> for RustErrorType`. The
+///     // `RustErrorType` additionally can also represent a trap to
+///     // conveniently flatten all errors into one container.
 ///     //
 ///     // By default this option is not specified.
 ///     trappable_error_type: {
-///         "wasi:io/streams/stream-error" => RustErrorType,
+///         interface::ErrorType: RustErrorType,
 ///     },
 ///
 ///     // All generated bindgen types are "owned" meaning types like `String`
@@ -327,20 +326,16 @@ pub(crate) use self::store::ComponentStoreData;
 ///     // Restrict the code generated to what's needed for the interface
 ///     // imports in the inlined WIT document fragment.
 ///     interfaces: "
-///         import wasi:cli/command;
+///         import package.foo
 ///     ",
 ///
-///     // Remap imported interfaces or resources to types defined in Rust
-///     // elsewhere. Using this option will prevent any code from being
-///     // generated for interfaces mentioned here. Resources named here will
-///     // not have a type generated to represent the resource.
-///     //
-///     // Interfaces mapped with this option should be previously generated
-///     // with an invocation of this macro. Resources need to be mapped to a
-///     // Rust type name.
+///     // Remap interface names to module names, imported from elsewhere.
+///     // Using this option will prevent any code from being generated
+///     // for the names mentioned in the mapping, assuming instead that the
+///     // names mentioned come from a previous use of the `bindgen!` macro
+///     // with `only_interfaces: true`.
 ///     with: {
-///         "wasi:random/random": some::other::wasi::random::random,
-///         "wasi:filesystem/types/descriptor": MyDescriptorType,
+///         "a": somewhere::else::a,
 ///     },
 /// });
 /// ```
diff --git a/crates/wasmtime/src/component/resources.rs b/crates/wasmtime/src/component/resources.rs
index 9ed13faf3208..ded0665a66a1 100644
--- a/crates/wasmtime/src/component/resources.rs
+++ b/crates/wasmtime/src/component/resources.rs
@@ -208,7 +208,7 @@ pub struct Resource<T> {
     ///   discard this resource when the borrow duration has finished.
     ///
     /// * `NOT_IN_TABLE` / `u32::MAX - 1` - this indicates that this is an owned
-    ///   resource not present in any store's table. This resource is not lent
+    ///   resource not present in any store's stable. This resource is not lent
     ///   out. It can be passed as an `(own $t)` directly into a guest's table
     ///   or it can be passed as a borrow to a guest which will insert it into
     ///   a host store's table for dynamic borrow tracking.
@@ -451,16 +451,7 @@ unsafe impl<T: 'static> Lift for Resource<T> {
 
 impl<T> fmt::Debug for Resource<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let state = match self.state.load(Relaxed) {
-            BORROW => "borrow",
-            NOT_IN_TABLE => "own (not in table)",
-            TAKEN => "taken",
-            _ => "own",
-        };
-        f.debug_struct("Resource")
-            .field("rep", &self.rep)
-            .field("state", &state)
-            .finish()
+        f.debug_struct("Resource").field("rep", &self.rep).finish()
     }
 }
 
diff --git a/crates/wasmtime/src/component/types.rs b/crates/wasmtime/src/component/types.rs
index f751079fa037..43b25a13c388 100644
--- a/crates/wasmtime/src/component/types.rs
+++ b/crates/wasmtime/src/component/types.rs
@@ -9,8 +9,8 @@ use std::ops::Deref;
 use std::sync::Arc;
 use wasmtime_environ::component::{
     CanonicalAbiInfo, ComponentTypes, InterfaceType, ResourceIndex, TypeEnumIndex, TypeFlagsIndex,
-    TypeListIndex, TypeOptionIndex, TypeRecordIndex, TypeResourceTableIndex, TypeResultIndex,
-    TypeTupleIndex, TypeVariantIndex,
+    TypeListIndex, TypeOptionIndex, TypeRecordIndex, TypeResultIndex, TypeTupleIndex,
+    TypeVariantIndex,
 };
 use wasmtime_environ::PrimaryMap;
 
@@ -56,29 +56,6 @@ impl<T> Handle<T> {
             resources: &self.resources,
         }
     }
-
-    fn equivalent<'a>(
-        &'a self,
-        other: &'a Self,
-        type_check: fn(&TypeChecker<'a>, T, T) -> bool,
-    ) -> bool
-    where
-        T: PartialEq + Copy,
-    {
-        (self.index == other.index
-            && Arc::ptr_eq(&self.types, &other.types)
-            && Arc::ptr_eq(&self.resources, &other.resources))
-            || type_check(
-                &TypeChecker {
-                    a_types: &self.types,
-                    b_types: &other.types,
-                    a_resource: &self.resources,
-                    b_resource: &other.resources,
-                },
-                self.index,
-                other.index,
-            )
-    }
 }
 
 impl<T: fmt::Debug> fmt::Debug for Handle<T> {
@@ -89,173 +66,23 @@ impl<T: fmt::Debug> fmt::Debug for Handle<T> {
     }
 }
 
-/// Type checker between two `Handle`s
-struct TypeChecker<'a> {
-    a_types: &'a ComponentTypes,
-    a_resource: &'a PrimaryMap<ResourceIndex, ResourceType>,
-    b_types: &'a ComponentTypes,
-    b_resource: &'a PrimaryMap<ResourceIndex, ResourceType>,
-}
-
-impl TypeChecker<'_> {
-    fn interface_types_equal(&self, a: InterfaceType, b: InterfaceType) -> bool {
-        match (a, b) {
-            (InterfaceType::Own(o1), InterfaceType::Own(o2)) => self.resources_equal(o1, o2),
-            (InterfaceType::Own(_), _) => false,
-            (InterfaceType::Borrow(b1), InterfaceType::Borrow(b2)) => self.resources_equal(b1, b2),
-            (InterfaceType::Borrow(_), _) => false,
-            (InterfaceType::List(l1), InterfaceType::List(l2)) => self.lists_equal(l1, l2),
-            (InterfaceType::List(_), _) => false,
-            (InterfaceType::Record(r1), InterfaceType::Record(r2)) => self.records_equal(r1, r2),
-            (InterfaceType::Record(_), _) => false,
-            (InterfaceType::Variant(v1), InterfaceType::Variant(v2)) => self.variants_equal(v1, v2),
-            (InterfaceType::Variant(_), _) => false,
-            (InterfaceType::Result(r1), InterfaceType::Result(r2)) => self.results_equal(r1, r2),
-            (InterfaceType::Result(_), _) => false,
-            (InterfaceType::Option(o1), InterfaceType::Option(o2)) => self.options_equal(o1, o2),
-            (InterfaceType::Option(_), _) => false,
-            (InterfaceType::Enum(e1), InterfaceType::Enum(e2)) => self.enums_equal(e1, e2),
-            (InterfaceType::Enum(_), _) => false,
-            (InterfaceType::Tuple(t1), InterfaceType::Tuple(t2)) => self.tuples_equal(t1, t2),
-            (InterfaceType::Tuple(_), _) => false,
-            (InterfaceType::Flags(f1), InterfaceType::Flags(f2)) => self.flags_equal(f1, f2),
-            (InterfaceType::Flags(_), _) => false,
-            (InterfaceType::Bool, InterfaceType::Bool) => true,
-            (InterfaceType::Bool, _) => false,
-            (InterfaceType::U8, InterfaceType::U8) => true,
-            (InterfaceType::U8, _) => false,
-            (InterfaceType::U16, InterfaceType::U16) => true,
-            (InterfaceType::U16, _) => false,
-            (InterfaceType::U32, InterfaceType::U32) => true,
-            (InterfaceType::U32, _) => false,
-            (InterfaceType::U64, InterfaceType::U64) => true,
-            (InterfaceType::U64, _) => false,
-            (InterfaceType::S8, InterfaceType::S8) => true,
-            (InterfaceType::S8, _) => false,
-            (InterfaceType::S16, InterfaceType::S16) => true,
-            (InterfaceType::S16, _) => false,
-            (InterfaceType::S32, InterfaceType::S32) => true,
-            (InterfaceType::S32, _) => false,
-            (InterfaceType::S64, InterfaceType::S64) => true,
-            (InterfaceType::S64, _) => false,
-            (InterfaceType::Float32, InterfaceType::Float32) => true,
-            (InterfaceType::Float32, _) => false,
-            (InterfaceType::Float64, InterfaceType::Float64) => true,
-            (InterfaceType::Float64, _) => false,
-            (InterfaceType::String, InterfaceType::String) => true,
-            (InterfaceType::String, _) => false,
-            (InterfaceType::Char, InterfaceType::Char) => true,
-            (InterfaceType::Char, _) => false,
-        }
-    }
-
-    fn lists_equal(&self, l1: TypeListIndex, l2: TypeListIndex) -> bool {
-        let a = &self.a_types[l1];
-        let b = &self.b_types[l2];
-        self.interface_types_equal(a.element, b.element)
-    }
-
-    fn resources_equal(&self, o1: TypeResourceTableIndex, o2: TypeResourceTableIndex) -> bool {
-        let a = &self.a_types[o1];
-        let b = &self.b_types[o2];
-        self.a_resource[a.ty] == self.b_resource[b.ty]
-    }
-
-    fn records_equal(&self, r1: TypeRecordIndex, r2: TypeRecordIndex) -> bool {
-        let a = &self.a_types[r1];
-        let b = &self.b_types[r2];
-        if a.fields.len() != b.fields.len() {
-            return false;
-        }
-        a.fields
-            .iter()
-            .zip(b.fields.iter())
-            .all(|(a_field, b_field)| {
-                a_field.name == b_field.name && self.interface_types_equal(a_field.ty, b_field.ty)
-            })
-    }
-
-    fn variants_equal(&self, v1: TypeVariantIndex, v2: TypeVariantIndex) -> bool {
-        let a = &self.a_types[v1];
-        let b = &self.b_types[v2];
-        if a.cases.len() != b.cases.len() {
-            return false;
-        }
-        a.cases.iter().zip(b.cases.iter()).all(|(a_case, b_case)| {
-            if a_case.name != b_case.name {
-                return false;
-            }
-            match (a_case.ty, b_case.ty) {
-                (Some(a_case_ty), Some(b_case_ty)) => {
-                    self.interface_types_equal(a_case_ty, b_case_ty)
-                }
-                (None, None) => true,
-                _ => false,
-            }
-        })
-    }
-
-    fn results_equal(&self, r1: TypeResultIndex, r2: TypeResultIndex) -> bool {
-        let a = &self.a_types[r1];
-        let b = &self.b_types[r2];
-        let oks = match (a.ok, b.ok) {
-            (Some(ok1), Some(ok2)) => self.interface_types_equal(ok1, ok2),
-            (None, None) => true,
-            _ => false,
-        };
-        if !oks {
-            return false;
-        }
-        match (a.err, b.err) {
-            (Some(err1), Some(err2)) => self.interface_types_equal(err1, err2),
-            (None, None) => true,
-            _ => false,
-        }
-    }
-
-    fn options_equal(&self, o1: TypeOptionIndex, o2: TypeOptionIndex) -> bool {
-        let a = &self.a_types[o1];
-        let b = &self.b_types[o2];
-        self.interface_types_equal(a.ty, b.ty)
-    }
-
-    fn enums_equal(&self, e1: TypeEnumIndex, e2: TypeEnumIndex) -> bool {
-        let a = &self.a_types[e1];
-        let b = &self.b_types[e2];
-        a.names == b.names
-    }
-
-    fn tuples_equal(&self, t1: TypeTupleIndex, t2: TypeTupleIndex) -> bool {
-        let a = &self.a_types[t1];
-        let b = &self.b_types[t2];
-        if a.types.len() != b.types.len() {
-            return false;
-        }
-        a.types
-            .iter()
-            .zip(b.types.iter())
-            .all(|(&a, &b)| self.interface_types_equal(a, b))
-    }
-
-    fn flags_equal(&self, f1: TypeFlagsIndex, f2: TypeFlagsIndex) -> bool {
-        let a = &self.a_types[f1];
-        let b = &self.b_types[f2];
-        a.names == b.names
+impl<T: PartialEq> PartialEq for Handle<T> {
+    fn eq(&self, other: &Self) -> bool {
+        // FIXME: This is an overly-restrictive definition of equality in that it doesn't consider types to be
+        // equal unless they refer to the same declaration in the same component.  It's a good shortcut for the
+        // common case, but we should also do a recursive structural equality test if the shortcut test fails.
+        self.index == other.index
+            && Arc::ptr_eq(&self.types, &other.types)
+            && Arc::ptr_eq(&self.resources, &other.resources)
     }
 }
 
+impl<T: Eq> Eq for Handle<T> {}
+
 /// A `list` interface type
-#[derive(Clone, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 pub struct List(Handle<TypeListIndex>);
 
-impl PartialEq for List {
-    fn eq(&self, other: &Self) -> bool {
-        self.0.equivalent(&other.0, TypeChecker::lists_equal)
-    }
-}
-
-impl Eq for List {}
-
 impl List {
     /// Instantiate this type with the specified `values`.
     pub fn new_val(&self, values: Box<[Val]>) -> Result<Val> {
@@ -281,7 +108,7 @@ pub struct Field<'a> {
 }
 
 /// A `record` interface type
-#[derive(Clone, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 pub struct Record(Handle<TypeRecordIndex>);
 
 impl Record {
@@ -303,16 +130,8 @@ impl Record {
     }
 }
 
-impl PartialEq for Record {
-    fn eq(&self, other: &Self) -> bool {
-        self.0.equivalent(&other.0, TypeChecker::records_equal)
-    }
-}
-
-impl Eq for Record {}
-
 /// A `tuple` interface type
-#[derive(Clone, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 pub struct Tuple(Handle<TypeTupleIndex>);
 
 impl Tuple {
@@ -334,14 +153,6 @@ impl Tuple {
     }
 }
 
-impl PartialEq for Tuple {
-    fn eq(&self, other: &Self) -> bool {
-        self.0.equivalent(&other.0, TypeChecker::tuples_equal)
-    }
-}
-
-impl Eq for Tuple {}
-
 /// A case declaration belonging to a `variant`
 pub struct Case<'a> {
     /// The name of the case
@@ -351,7 +162,7 @@ pub struct Case<'a> {
 }
 
 /// A `variant` interface type
-#[derive(Clone, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 pub struct Variant(Handle<TypeVariantIndex>);
 
 impl Variant {
@@ -376,16 +187,8 @@ impl Variant {
     }
 }
 
-impl PartialEq for Variant {
-    fn eq(&self, other: &Self) -> bool {
-        self.0.equivalent(&other.0, TypeChecker::variants_equal)
-    }
-}
-
-impl Eq for Variant {}
-
 /// An `enum` interface type
-#[derive(Clone, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 pub struct Enum(Handle<TypeEnumIndex>);
 
 impl Enum {
@@ -407,16 +210,8 @@ impl Enum {
     }
 }
 
-impl PartialEq for Enum {
-    fn eq(&self, other: &Self) -> bool {
-        self.0.equivalent(&other.0, TypeChecker::enums_equal)
-    }
-}
-
-impl Eq for Enum {}
-
 /// An `option` interface type
-#[derive(Clone, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 pub struct OptionType(Handle<TypeOptionIndex>);
 
 impl OptionType {
@@ -435,16 +230,8 @@ impl OptionType {
     }
 }
 
-impl PartialEq for OptionType {
-    fn eq(&self, other: &Self) -> bool {
-        self.0.equivalent(&other.0, TypeChecker::options_equal)
-    }
-}
-
-impl Eq for OptionType {}
-
 /// An `expected` interface type
-#[derive(Clone, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 pub struct ResultType(Handle<TypeResultIndex>);
 
 impl ResultType {
@@ -474,16 +261,8 @@ impl ResultType {
     }
 }
 
-impl PartialEq for ResultType {
-    fn eq(&self, other: &Self) -> bool {
-        self.0.equivalent(&other.0, TypeChecker::results_equal)
-    }
-}
-
-impl Eq for ResultType {}
-
 /// A `flags` interface type
-#[derive(Clone, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 pub struct Flags(Handle<TypeFlagsIndex>);
 
 impl Flags {
@@ -509,14 +288,6 @@ impl Flags {
     }
 }
 
-impl PartialEq for Flags {
-    fn eq(&self, other: &Self) -> bool {
-        self.0.equivalent(&other.0, TypeChecker::flags_equal)
-    }
-}
-
-impl Eq for Flags {}
-
 /// Represents a component model interface type
 #[derive(Clone, PartialEq, Eq, Debug)]
 #[allow(missing_docs)]
diff --git a/crates/wasmtime/src/config.rs b/crates/wasmtime/src/config.rs
index 9f6e634cbdc2..2f657e462cd6 100644
--- a/crates/wasmtime/src/config.rs
+++ b/crates/wasmtime/src/config.rs
@@ -14,15 +14,9 @@ use wasmparser::WasmFeatures;
 use wasmtime_cache::CacheConfig;
 use wasmtime_environ::Tunables;
 use wasmtime_jit::profiling::{self, ProfilingAgent};
-use wasmtime_runtime::{mpk, InstanceAllocator, OnDemandInstanceAllocator, RuntimeMemoryCreator};
-
-#[cfg(feature = "async")]
-use crate::stack::{StackCreator, StackCreatorProxy};
-#[cfg(feature = "async")]
-use wasmtime_fiber::RuntimeFiberStackCreator;
+use wasmtime_runtime::{InstanceAllocator, OnDemandInstanceAllocator, RuntimeMemoryCreator};
 
 pub use wasmtime_environ::CacheStore;
-pub use wasmtime_runtime::MpkEnabled;
 
 /// Represents the module instance allocation strategy to use.
 #[derive(Clone)]
@@ -110,8 +104,6 @@ pub struct Config {
     pub(crate) native_unwind_info: Option<bool>,
     #[cfg(feature = "async")]
     pub(crate) async_stack_size: usize,
-    #[cfg(feature = "async")]
-    pub(crate) stack_creator: Option<Arc<dyn RuntimeFiberStackCreator>>,
     pub(crate) async_support: bool,
     pub(crate) module_version: ModuleVersionStrategy,
     pub(crate) parallel_compilation: bool,
@@ -206,8 +198,6 @@ impl Config {
             features: WasmFeatures::default(),
             #[cfg(feature = "async")]
             async_stack_size: 2 << 20,
-            #[cfg(feature = "async")]
-            stack_creator: None,
             async_support: false,
             module_version: ModuleVersionStrategy::default(),
             parallel_compilation: !cfg!(miri),
@@ -338,7 +328,7 @@ impl Config {
     ///
     /// * Alternatively you can enable the
     ///   [`Config::consume_fuel`](crate::Config::consume_fuel) method as well
-    ///   as [`crate::Store::fuel_async_yield_interval`] When doing so this will
+    ///   as [`crate::Store::out_of_fuel_async_yield`] When doing so this will
     ///   configure Wasmtime futures to yield periodically while they're
     ///   executing WebAssembly code. After consuming the specified amount of
     ///   fuel wasm futures will return `Poll::Pending` from their `poll`
@@ -456,9 +446,8 @@ impl Config {
     ///
     /// This can be used to deterministically prevent infinitely-executing
     /// WebAssembly code by instrumenting generated code to consume fuel as it
-    /// executes. When fuel runs out a trap is raised, however [`Store`] can be
-    /// configured to yield execution periodically via
-    /// [`crate::Store::fuel_async_yield_interval`].
+    /// executes. When fuel runs out the behavior is defined by configuration
+    /// within a [`Store`], and by default a trap is raised.
     ///
     /// Note that a [`Store`] starts with no fuel, so if you enable this option
     /// you'll have to be sure to pour some fuel into [`Store`] before
@@ -657,23 +646,31 @@ impl Config {
         self
     }
 
-    /// Configures whether the WebAssembly [threads] proposal will be enabled
-    /// for compilation.
+    /// Configures whether the WebAssembly threads proposal will be enabled for
+    /// compilation.
+    ///
+    /// The [WebAssembly threads proposal][threads] is not currently fully
+    /// standardized and is undergoing development. Additionally the support in
+    /// wasmtime itself is still being worked on. Support for this feature can
+    /// be enabled through this method for appropriate wasm modules.
     ///
     /// This feature gates items such as shared memories and atomic
-    /// instructions. Note that the threads feature depends on the bulk memory
-    /// feature, which is enabled by default. Additionally note that while the
-    /// wasm feature is called "threads" it does not actually include the
-    /// ability to spawn threads. Spawning threads is part of the [wasi-threads]
-    /// proposal which is a separately gated feature in Wasmtime.
+    /// instructions. Note that the threads feature depends on the
+    /// bulk memory feature, which is enabled by default.
     ///
-    /// Embeddings of Wasmtime are able to build their own custom threading
-    /// scheme on top of the core wasm threads proposal, however.
+    /// This is `false` by default.
     ///
-    /// This is `true` by default.
+    /// > **Note**: Wasmtime does not implement everything for the wasm threads
+    /// > spec at this time, so bugs, panics, and possibly segfaults should be
+    /// > expected. This should not be enabled in a production setting right
+    /// > now.
+    ///
+    /// # Errors
+    ///
+    /// The validation of this feature are deferred until the engine is being built,
+    /// and thus may cause `Engine::new` fail if the `bulk_memory` feature is disabled.
     ///
     /// [threads]: https://github.com/webassembly/threads
-    /// [wasi-threads]: https://github.com/webassembly/wasi-threads
     pub fn wasm_threads(&mut self, enable: bool) -> &mut Self {
         self.features.threads = enable;
         self
@@ -739,13 +736,15 @@ impl Config {
     /// Configures whether the WebAssembly Relaxed SIMD proposal will be
     /// enabled for compilation.
     ///
-    /// The relaxed SIMD proposal adds new instructions to WebAssembly which,
-    /// for some specific inputs, are allowed to produce different results on
-    /// different hosts. More-or-less this proposal enables exposing
-    /// platform-specific semantics of SIMD instructions in a controlled
-    /// fashion to a WebAssembly program. From an embedder's perspective this
-    /// means that WebAssembly programs may execute differently depending on
-    /// whether the host is x86_64 or AArch64, for example.
+    /// The [WebAssembly Relaxed SIMD proposal][proposal] is not, at the time of
+    /// this writing, at stage 4. The relaxed SIMD proposal adds new
+    /// instructions to WebAssembly which, for some specific inputs, are allowed
+    /// to produce different results on different hosts. More-or-less this
+    /// proposal enables exposing platform-specific semantics of SIMD
+    /// instructions in a controlled fashion to a WebAssembly program. From an
+    /// embedder's perspective this means that WebAssembly programs may execute
+    /// differently depending on whether the host is x86_64 or AArch64, for
+    /// example.
     ///
     /// By default Wasmtime lowers relaxed SIMD instructions to the fastest
     /// lowering for the platform it's running on. This means that, by default,
@@ -755,7 +754,7 @@ impl Config {
     /// deterministic behavior across all platforms, as classified by the
     /// specification, at the cost of performance.
     ///
-    /// This is `true` by default.
+    /// This is `false` by default.
     ///
     /// [proposal]: https://github.com/webassembly/relaxed-simd
     pub fn wasm_relaxed_simd(&mut self, enable: bool) -> &mut Self {
@@ -827,7 +826,7 @@ impl Config {
     /// This feature gates modules having more than one linear memory
     /// declaration or import.
     ///
-    /// This is `true` by default.
+    /// This is `false` by default.
     ///
     /// [proposal]: https://github.com/webassembly/multi-memory
     pub fn wasm_multi_memory(&mut self, enable: bool) -> &mut Self {
@@ -954,29 +953,6 @@ impl Config {
         self
     }
 
-    /// Controls whether proof-carrying code (PCC) is used to validate
-    /// lowering of Wasm sandbox checks.
-    ///
-    /// Proof-carrying code carries "facts" about program values from
-    /// the IR all the way to machine code, and checks those facts
-    /// against known machine-instruction semantics. This guards
-    /// against bugs in instruction lowering that might create holes
-    /// in the Wasm sandbox.
-    ///
-    /// PCC is designed to be fast: it does not require complex
-    /// solvers or logic engines to verify, but only a linear pass
-    /// over a trail of "breadcrumbs" or facts at each intermediate
-    /// value. Thus, it is appropriate to enable in production.
-    #[cfg(any(feature = "cranelift", feature = "winch"))]
-    #[cfg_attr(nightlydoc, doc(cfg(any(feature = "cranelift", feature = "winch"))))]
-    pub fn cranelift_pcc(&mut self, enable: bool) -> &mut Self {
-        let val = if enable { "true" } else { "false" };
-        self.compiler_config
-            .settings
-            .insert("enable_pcc".to_string(), val.to_string());
-        self
-    }
-
     /// Allows setting a Cranelift boolean flag or preset. This allows
     /// fine-tuning of Cranelift settings.
     ///
@@ -1107,17 +1083,6 @@ impl Config {
         self
     }
 
-    /// Sets a custom stack creator.
-    ///
-    /// Custom memory creators are used when creating creating async instance stacks for
-    /// the on-demand instance allocation strategy.
-    #[cfg(feature = "async")]
-    #[cfg_attr(nightlydoc, doc(cfg(feature = "async")))]
-    pub fn with_host_stack(&mut self, stack_creator: Arc<dyn StackCreator>) -> &mut Self {
-        self.stack_creator = Some(Arc::new(StackCreatorProxy(stack_creator)));
-        self
-    }
-
     /// Sets the instance allocation strategy to use.
     ///
     /// When using the pooling instance allocation strategy, all linear memories
@@ -1218,10 +1183,6 @@ impl Config {
     /// always be static memories, they are never dynamic. This setting
     /// configures the size of linear memory to reserve for each memory in the
     /// pooling allocator.
-    ///
-    /// Note that the pooling allocator can reduce the amount of memory needed
-    /// for pooling allocation by using memory protection; see
-    /// `PoolingAllocatorConfig::memory_protection_keys` for details.
     pub fn static_memory_maximum_size(&mut self, max_size: u64) -> &mut Self {
         let max_pages = max_size / u64::from(wasmtime_environ::WASM_PAGE_SIZE);
         self.tunables.static_memory_bound = max_pages;
@@ -1234,7 +1195,7 @@ impl Config {
     /// linear memories created within this `Config`. This means that all
     /// memories will be allocated up-front and will never move. Additionally
     /// this means that all memories are synthetically limited by the
-    /// [`Config::static_memory_maximum_size`] option, regardless of what the
+    /// [`Config::static_memory_maximum_size`] option, irregardless of what the
     /// actual maximum size is on the memory's original type.
     ///
     /// For the difference between static and dynamic memories, see the
@@ -1276,7 +1237,7 @@ impl Config {
     /// immediate offsets will generate bounds checks based on how big the guard
     /// page is.
     ///
-    /// For 32-bit wasm memories a 4GB static memory is required to even start
+    /// For 32-bit memories a 4GB static memory is required to even start
     /// removing bounds checks. A 4GB guard size will guarantee that the module
     /// has zero bounds checks for memory accesses. A 2GB guard size will
     /// eliminate all bounds checks with an immediate offset less than 2GB. A
@@ -1517,8 +1478,6 @@ impl Config {
     /// the anyhow::Error when a trap is raised.
     ///
     /// This option is disabled by default.
-    #[cfg(feature = "coredump")]
-    #[cfg_attr(nightlydoc, doc(cfg(feature = "coredump")))]
     pub fn coredump_on_trap(&mut self, enable: bool) -> &mut Self {
         self.coredump_on_trap = enable;
         self
@@ -1609,18 +1568,10 @@ impl Config {
         let stack_size = 0;
 
         match &self.allocation_strategy {
-            InstanceAllocationStrategy::OnDemand => {
-                #[allow(unused_mut)]
-                let mut allocator = Box::new(OnDemandInstanceAllocator::new(
-                    self.mem_creator.clone(),
-                    stack_size,
-                ));
-                #[cfg(feature = "async")]
-                if let Some(stack_creator) = &self.stack_creator {
-                    allocator.set_stack_creator(stack_creator.clone());
-                }
-                Ok(allocator)
-            }
+            InstanceAllocationStrategy::OnDemand => Ok(Box::new(OnDemandInstanceAllocator::new(
+                self.mem_creator.clone(),
+                stack_size,
+            ))),
             #[cfg(feature = "pooling-allocator")]
             InstanceAllocationStrategy::Pooling(config) => {
                 let mut config = config.config;
@@ -2352,66 +2303,6 @@ impl PoolingAllocationConfig {
         self.config.limits.memory_pages = pages;
         self
     }
-
-    /// Configures whether memory protection keys (MPK) should be used for more
-    /// efficient layout of pool-allocated memories.
-    ///
-    /// When using the pooling allocator (see [`Config::allocation_strategy`],
-    /// [`InstanceAllocationStrategy::Pooling`]), memory protection keys can
-    /// reduce the total amount of allocated virtual memory by eliminating guard
-    /// regions between WebAssembly memories in the pool. It does so by
-    /// "coloring" memory regions with different memory keys and setting which
-    /// regions are accessible each time executions switches from host to guest
-    /// (or vice versa).
-    ///
-    /// MPK is only available on Linux (called `pku` there) and recent x86
-    /// systems; we check for MPK support at runtime by examining the `CPUID`
-    /// register. This configuration setting can be in three states:
-    ///
-    /// - `auto`: if MPK support is available the guard regions are removed; if
-    ///   not, the guard regions remain
-    /// - `enable`: use MPK to eliminate guard regions; fail if MPK is not
-    ///   supported
-    /// - `disable`: never use MPK
-    ///
-    /// By default this value is `disabled`, but may become `auto` in future
-    /// releases.
-    ///
-    /// __WARNING__: this configuration options is still experimental--use at
-    /// your own risk! MPK uses kernel and CPU features to protect memory
-    /// regions; you may observe segmentation faults if anything is
-    /// misconfigured.
-    pub fn memory_protection_keys(&mut self, enable: MpkEnabled) -> &mut Self {
-        self.config.memory_protection_keys = enable;
-        self
-    }
-
-    /// Sets an upper limit on how many memory protection keys (MPK) Wasmtime
-    /// will use.
-    ///
-    /// This setting is only applicable when
-    /// [`PoolingAllocationConfig::memory_protection_keys`] is set to `enable`
-    /// or `auto`. Configuring this above the HW and OS limits (typically 15)
-    /// has no effect.
-    ///
-    /// If multiple Wasmtime engines are used in the same process, note that all
-    /// engines will share the same set of allocated keys; this setting will
-    /// limit how many keys are allocated initially and thus available to all
-    /// other engines.
-    pub fn max_memory_protection_keys(&mut self, max: usize) -> &mut Self {
-        self.config.max_memory_protection_keys = max;
-        self
-    }
-
-    /// Check if memory protection keys (MPK) are available on the current host.
-    ///
-    /// This is a convenience method for determining MPK availability using the
-    /// same method that [`MpkEnabled::Auto`] does. See
-    /// [`PoolingAllocationConfig::memory_protection_keys`] for more
-    /// information.
-    pub fn are_memory_protection_keys_available(&self) -> bool {
-        mpk::is_supported()
-    }
 }
 
 pub(crate) fn probestack_supported(arch: Architecture) -> bool {
diff --git a/crates/wasmtime/src/coredump.rs b/crates/wasmtime/src/coredump.rs
index 3193364eae89..d7047c5102dc 100644
--- a/crates/wasmtime/src/coredump.rs
+++ b/crates/wasmtime/src/coredump.rs
@@ -1,9 +1,6 @@
-use std::{collections::HashMap, fmt};
+use std::fmt;
 
-use crate::{
-    store::StoreOpaque, AsContextMut, FrameInfo, Global, Instance, Memory, Module, StoreContextMut,
-    Val, ValType, WasmBacktrace,
-};
+use crate::{store::StoreOpaque, FrameInfo, Global, Instance, Memory, Module, WasmBacktrace};
 
 /// Representation of a core dump of a WebAssembly module
 ///
@@ -31,13 +28,13 @@ pub struct WasmCoreDump {
     name: String,
     modules: Vec<Module>,
     instances: Vec<Instance>,
-    memories: Vec<Memory>,
-    globals: Vec<Global>,
+    store_memories: Vec<Memory>,
+    store_globals: Vec<Global>,
     backtrace: WasmBacktrace,
 }
 
 impl WasmCoreDump {
-    pub(crate) fn new(store: &mut StoreOpaque, backtrace: WasmBacktrace) -> WasmCoreDump {
+    pub(crate) fn new(store: &StoreOpaque, backtrace: WasmBacktrace) -> WasmCoreDump {
         let modules: Vec<_> = store.modules().all_modules().cloned().collect();
         let instances: Vec<Instance> = store.all_instances().collect();
         let store_memories: Vec<Memory> = store.all_memories().collect();
@@ -47,232 +44,37 @@ impl WasmCoreDump {
             name: String::from("store_name"),
             modules,
             instances,
-            memories: store_memories,
-            globals: store_globals,
+            store_memories,
+            store_globals,
             backtrace,
         }
     }
 
-    /// The stack frames for this core dump.
-    ///
-    /// Frames appear in callee to caller order, that is youngest to oldest
-    /// frames.
+    /// The stack frames for the CoreDump
     pub fn frames(&self) -> &[FrameInfo] {
         self.backtrace.frames()
     }
 
-    /// All modules instantiated inside the store when the core dump was
-    /// created.
+    /// The names of the modules involved in the CoreDump
     pub fn modules(&self) -> &[Module] {
         self.modules.as_ref()
     }
 
-    /// All instances within the store when the core dump was created.
+    /// The instances involved in the CoreDump
     pub fn instances(&self) -> &[Instance] {
         self.instances.as_ref()
     }
 
-    /// All globals, instance- or host-defined, within the store when the core
-    /// dump was created.
-    pub fn globals(&self) -> &[Global] {
-        self.globals.as_ref()
+    /// The imported globals that belong to the store, rather than a specific
+    /// instance
+    pub fn store_globals(&self) -> &[Global] {
+        self.store_globals.as_ref()
     }
 
-    /// All memories, instance- or host-defined, within the store when the core
-    /// dump was created.
-    pub fn memories(&self) -> &[Memory] {
-        self.memories.as_ref()
-    }
-
-    /// Serialize this core dump into [the standard core dump binary
-    /// format][spec].
-    ///
-    /// The `name` parameter may be a file path, URL, or arbitrary name for the
-    /// "main" Wasm service or executable that was running in this store.
-    ///
-    /// Once serialized, you can write this core dump to disk, send it over the
-    /// network, or pass it to other debugging tools that consume Wasm core
-    /// dumps.
-    ///
-    /// [spec]: https://github.com/WebAssembly/tool-conventions/blob/main/Coredump.md
-    pub fn serialize(&self, mut store: impl AsContextMut, name: &str) -> Vec<u8> {
-        let store = store.as_context_mut();
-        self._serialize(store, name)
-    }
-
-    fn _serialize<T>(&self, mut store: StoreContextMut<'_, T>, name: &str) -> Vec<u8> {
-        let mut core_dump = wasm_encoder::Module::new();
-
-        core_dump.section(&wasm_encoder::CoreDumpSection::new(name));
-
-        // A map from each memory to its index in the core dump's memories
-        // section.
-        let mut memory_to_idx = HashMap::new();
-
-        let mut data = wasm_encoder::DataSection::new();
-
-        {
-            let mut memories = wasm_encoder::MemorySection::new();
-            for mem in self.memories() {
-                let memory_idx = memories.len();
-                memory_to_idx.insert(mem.hash_key(&store.0), memory_idx);
-                let ty = mem.ty(&store);
-                memories.memory(wasm_encoder::MemoryType {
-                    minimum: mem.size(&store),
-                    maximum: ty.maximum(),
-                    memory64: ty.is_64(),
-                    shared: ty.is_shared(),
-                });
-
-                // Attach the memory data, balancing number of data segments and
-                // binary size. We don't want to attach the whole memory in one
-                // big segment, since it likely contains a bunch of large runs
-                // of zeroes. But we can't encode the data without any potential
-                // runs of zeroes (i.e. including only non-zero data in our
-                // segments) because we can run up against the implementation
-                // limits for number of segments in a Wasm module this way. So
-                // to balance these conflicting desires, we break the memory up
-                // into reasonably-sized chunks and then trim runs of zeroes
-                // from the start and end of each chunk.
-                const CHUNK_SIZE: u32 = 4096;
-                for (i, chunk) in mem
-                    .data(&store)
-                    .chunks_exact(CHUNK_SIZE as usize)
-                    .enumerate()
-                {
-                    if let Some(start) = chunk.iter().position(|byte| *byte != 0) {
-                        let end = chunk.iter().rposition(|byte| *byte != 0).unwrap() + 1;
-                        let offset = (i as u32) * CHUNK_SIZE + (start as u32);
-                        let offset = wasm_encoder::ConstExpr::i32_const(offset as i32);
-                        data.active(memory_idx, &offset, chunk[start..end].iter().copied());
-                    }
-                }
-            }
-            core_dump.section(&memories);
-        }
-
-        // A map from each global to its index in the core dump's globals
-        // section.
-        let mut global_to_idx = HashMap::new();
-
-        {
-            let mut globals = wasm_encoder::GlobalSection::new();
-            for g in self.globals() {
-                global_to_idx.insert(g.hash_key(&store.0), globals.len());
-                let ty = g.ty(&store);
-                let mutable = matches!(ty.mutability(), crate::Mutability::Var);
-                let val_type = match ty.content() {
-                    ValType::I32 => wasm_encoder::ValType::I32,
-                    ValType::I64 => wasm_encoder::ValType::I64,
-                    ValType::F32 => wasm_encoder::ValType::F32,
-                    ValType::F64 => wasm_encoder::ValType::F64,
-                    ValType::V128 => wasm_encoder::ValType::V128,
-                    ValType::FuncRef => wasm_encoder::ValType::FUNCREF,
-                    ValType::ExternRef => wasm_encoder::ValType::EXTERNREF,
-                };
-                let init = match g.get(&mut store) {
-                    Val::I32(x) => wasm_encoder::ConstExpr::i32_const(x),
-                    Val::I64(x) => wasm_encoder::ConstExpr::i64_const(x),
-                    Val::F32(x) => {
-                        wasm_encoder::ConstExpr::f32_const(unsafe { std::mem::transmute(x) })
-                    }
-                    Val::F64(x) => {
-                        wasm_encoder::ConstExpr::f64_const(unsafe { std::mem::transmute(x) })
-                    }
-                    Val::V128(x) => wasm_encoder::ConstExpr::v128_const(x.as_u128() as i128),
-                    Val::FuncRef(_) => {
-                        wasm_encoder::ConstExpr::ref_null(wasm_encoder::HeapType::Func)
-                    }
-                    Val::ExternRef(_) => {
-                        wasm_encoder::ConstExpr::ref_null(wasm_encoder::HeapType::Extern)
-                    }
-                };
-                globals.global(wasm_encoder::GlobalType { val_type, mutable }, &init);
-            }
-            core_dump.section(&globals);
-        }
-
-        core_dump.section(&data);
-        drop(data);
-
-        // A map from module id to its index within the core dump's modules
-        // section.
-        let mut module_to_index = HashMap::new();
-
-        {
-            let mut modules = wasm_encoder::CoreDumpModulesSection::new();
-            for module in self.modules() {
-                module_to_index.insert(module.id(), modules.len());
-                match module.name() {
-                    Some(name) => modules.module(name),
-                    None => modules.module(&format!("<anonymous-module-{}>", modules.len())),
-                };
-            }
-            core_dump.section(&modules);
-        }
-
-        // TODO: We can't currently recover instances from stack frames. We can
-        // recover module via the frame's PC, but if there are multiple
-        // instances of the same module, we don't know which instance the frame
-        // is associated with. Therefore, we do a best effort job: remember the
-        // last instance of each module and always choose that one. We record
-        // that information here.
-        let mut module_to_instance = HashMap::new();
-
-        {
-            let mut instances = wasm_encoder::CoreDumpInstancesSection::new();
-            for instance in self.instances() {
-                let module = instance.module(&store);
-                module_to_instance.insert(module.id(), instances.len());
-
-                let module_index = module_to_index[&module.id()];
-
-                let memories = instance
-                    .all_memories(&mut store.0)
-                    .collect::<Vec<_>>()
-                    .into_iter()
-                    .map(|(_i, memory)| memory_to_idx[&memory.hash_key(&store.0)])
-                    .collect::<Vec<_>>();
-
-                let globals = instance
-                    .all_globals(&mut store.0)
-                    .collect::<Vec<_>>()
-                    .into_iter()
-                    .map(|(_i, global)| global_to_idx[&global.hash_key(&store.0)])
-                    .collect::<Vec<_>>();
-
-                instances.instance(module_index, memories, globals);
-            }
-            core_dump.section(&instances);
-        }
-
-        {
-            let thread_name = "main";
-            let mut stack = wasm_encoder::CoreDumpStackSection::new(thread_name);
-            for frame in self.frames() {
-                // This isn't necessarily the right instance if there are
-                // multiple instances of the same module. See comment above
-                // `module_to_instance` for details.
-                let instance = module_to_instance[&frame.module().id()];
-
-                let func = frame.func_index();
-
-                let offset = frame
-                    .func_offset()
-                    .and_then(|o| u32::try_from(o).ok())
-                    .unwrap_or(0);
-
-                // We can't currently recover locals and the operand stack. We
-                // should eventually be able to do that with Winch though.
-                let locals = [];
-                let operand_stack = [];
-
-                stack.frame(instance, func, offset, locals, operand_stack);
-            }
-            core_dump.section(&stack);
-        }
-
-        core_dump.finish()
+    /// The imported memories that belong to the store, rather than a specific
+    /// instance.
+    pub fn store_memories(&self) -> &[Memory] {
+        self.store_memories.as_ref()
     }
 }
 
@@ -290,12 +92,12 @@ impl fmt::Display for WasmCoreDump {
         }
 
         writeln!(f, "memories:")?;
-        for memory in self.memories.iter() {
+        for memory in self.store_memories.iter() {
             writeln!(f, "  {:?}", memory)?;
         }
 
         writeln!(f, "globals:")?;
-        for global in self.globals.iter() {
+        for global in self.store_globals.iter() {
             writeln!(f, "  {:?}", global)?;
         }
 
diff --git a/crates/wasmtime/src/engine.rs b/crates/wasmtime/src/engine.rs
index 88ccb3e4c549..82dd651e093d 100644
--- a/crates/wasmtime/src/engine.rs
+++ b/crates/wasmtime/src/engine.rs
@@ -14,7 +14,7 @@ use wasmtime_cache::CacheConfig;
 use wasmtime_environ::obj;
 use wasmtime_environ::{FlagValue, ObjectKind};
 use wasmtime_jit::{profiling::ProfilingAgent, CodeMemory};
-use wasmtime_runtime::{CompiledModuleIdAllocator, InstanceAllocator, MmapVec};
+use wasmtime_runtime::{debug_builtins, CompiledModuleIdAllocator, InstanceAllocator, MmapVec};
 
 mod serialization;
 
@@ -78,8 +78,7 @@ impl Engine {
         // is the per-program initialization required for handling traps, such
         // as configuring signals, vectored exception handlers, etc.
         wasmtime_runtime::init_traps(crate::module::is_wasm_trap_pc, config.macos_use_mach_ports);
-        #[cfg(feature = "debug-builtins")]
-        wasmtime_runtime::debug_builtins::ensure_exported();
+        debug_builtins::ensure_exported();
 
         let registry = SignatureRegistry::new();
         let config = config.clone();
@@ -417,7 +416,6 @@ impl Engine {
             | "enable_jump_tables"
             | "enable_float"
             | "enable_verifier"
-            | "enable_pcc"
             | "regalloc_checker"
             | "regalloc_verbose_logs"
             | "is_pic"
diff --git a/crates/wasmtime/src/engine/serialization.rs b/crates/wasmtime/src/engine/serialization.rs
index d6d0f4291ffb..86cc6cb8e373 100644
--- a/crates/wasmtime/src/engine/serialization.rs
+++ b/crates/wasmtime/src/engine/serialization.rs
@@ -26,6 +26,7 @@ use anyhow::{anyhow, bail, Context, Result};
 use object::write::{Object, StandardSegment};
 use object::{File, FileFlags, Object as _, ObjectSection, SectionKind};
 use serde_derive::{Deserialize, Serialize};
+use std::collections::BTreeMap;
 use std::str::FromStr;
 use wasmtime_environ::obj;
 use wasmtime_environ::{FlagValue, ObjectKind, Tunables};
@@ -141,7 +142,7 @@ pub fn check_compatible(engine: &Engine, mmap: &MmapVec, expected: ObjectKind) -
         }
         ModuleVersionStrategy::None => { /* ignore the version info, accept all */ }
     }
-    bincode::deserialize::<Metadata<'_>>(data)?.check_compatible(engine)
+    bincode::deserialize::<Metadata>(data)?.check_compatible(engine)
 }
 
 fn detect_precompiled<'data, R: object::ReadRef<'data>>(
@@ -173,12 +174,10 @@ pub fn detect_precompiled_file(path: impl AsRef<std::path::Path>) -> Result<Opti
 }
 
 #[derive(Serialize, Deserialize)]
-struct Metadata<'a> {
+struct Metadata {
     target: String,
-    #[serde(borrow)]
-    shared_flags: Vec<(&'a str, FlagValue<'a>)>,
-    #[serde(borrow)]
-    isa_flags: Vec<(&'a str, FlagValue<'a>)>,
+    shared_flags: BTreeMap<String, FlagValue>,
+    isa_flags: BTreeMap<String, FlagValue>,
     tunables: Tunables,
     features: WasmFeatures,
 }
@@ -201,9 +200,9 @@ struct WasmFeatures {
     function_references: bool,
 }
 
-impl Metadata<'_> {
+impl Metadata {
     #[cfg(any(feature = "cranelift", feature = "winch"))]
-    fn new(engine: &Engine) -> Metadata<'static> {
+    fn new(engine: &Engine) -> Metadata {
         let wasmparser::WasmFeatures {
             reference_types,
             multi_value,
@@ -534,9 +533,10 @@ mod test {
         let engine = Engine::default();
         let mut metadata = Metadata::new(&engine);
 
-        metadata
-            .shared_flags
-            .push(("preserve_frame_pointers", FlagValue::Bool(false)));
+        metadata.shared_flags.insert(
+            "preserve_frame_pointers".to_string(),
+            FlagValue::Bool(false),
+        );
 
         match metadata.check_compatible(&engine) {
             Ok(_) => unreachable!(),
@@ -559,7 +559,7 @@ Caused by:
 
         metadata
             .isa_flags
-            .push(("not_a_flag", FlagValue::Bool(true)));
+            .insert("not_a_flag".to_string(), FlagValue::Bool(true));
 
         match metadata.check_compatible(&engine) {
             Ok(_) => unreachable!(),
@@ -629,27 +629,27 @@ Caused by:
     #[test]
     fn test_feature_mismatch() -> Result<()> {
         let mut config = Config::new();
-        config.wasm_threads(true);
+        config.wasm_simd(true);
 
         let engine = Engine::new(&config)?;
         let mut metadata = Metadata::new(&engine);
-        metadata.features.threads = false;
+        metadata.features.simd = false;
 
         match metadata.check_compatible(&engine) {
             Ok(_) => unreachable!(),
-            Err(e) => assert_eq!(e.to_string(), "Module was compiled without WebAssembly threads support but it is enabled for the host"),
+            Err(e) => assert_eq!(e.to_string(), "Module was compiled without WebAssembly SIMD support but it is enabled for the host"),
         }
 
         let mut config = Config::new();
-        config.wasm_threads(false);
+        config.wasm_simd(false);
 
         let engine = Engine::new(&config)?;
         let mut metadata = Metadata::new(&engine);
-        metadata.features.threads = true;
+        metadata.features.simd = true;
 
         match metadata.check_compatible(&engine) {
             Ok(_) => unreachable!(),
-            Err(e) => assert_eq!(e.to_string(), "Module was compiled with WebAssembly threads support but it is not enabled for the host"),
+            Err(e) => assert_eq!(e.to_string(), "Module was compiled with WebAssembly SIMD support but it is not enabled for the host"),
         }
 
         Ok(())
diff --git a/crates/wasmtime/src/externals.rs b/crates/wasmtime/src/externals.rs
index c627f38e2040..1757a688720f 100644
--- a/crates/wasmtime/src/externals.rs
+++ b/crates/wasmtime/src/externals.rs
@@ -1,11 +1,14 @@
-use crate::store::StoreOpaque;
-use crate::{AsContext, Engine, ExternType, Func, Memory, SharedMemory};
-
-mod global;
-mod table;
-
-pub use global::Global;
-pub use table::Table;
+use crate::store::{StoreData, StoreOpaque, Stored};
+use crate::trampoline::{generate_global_export, generate_table_export};
+use crate::{
+    AsContext, AsContextMut, Engine, ExternRef, ExternType, Func, GlobalType, Memory, Mutability,
+    SharedMemory, TableType, Val, ValType,
+};
+use anyhow::{anyhow, bail, Result};
+use runtime::ExportGlobal;
+use std::mem;
+use std::ptr;
+use wasmtime_runtime::{self as runtime};
 
 // Externals
 
@@ -168,6 +171,535 @@ impl From<Table> for Extern {
     }
 }
 
+/// A WebAssembly `global` value which can be read and written to.
+///
+/// A `global` in WebAssembly is sort of like a global variable within an
+/// [`Instance`](crate::Instance). The `global.get` and `global.set`
+/// instructions will modify and read global values in a wasm module. Globals
+/// can either be imported or exported from wasm modules.
+///
+/// A [`Global`] "belongs" to the store that it was originally created within
+/// (either via [`Global::new`] or via instantiating a
+/// [`Module`](crate::Module)). Operations on a [`Global`] only work with the
+/// store it belongs to, and if another store is passed in by accident then
+/// methods will panic.
+#[derive(Copy, Clone, Debug)]
+#[repr(transparent)] // here for the C API
+pub struct Global(Stored<wasmtime_runtime::ExportGlobal>);
+
+impl Global {
+    /// Creates a new WebAssembly `global` value with the provide type `ty` and
+    /// initial value `val`.
+    ///
+    /// The `store` argument will be the owner of the [`Global`] returned. Using
+    /// the returned [`Global`] other items in the store may access this global.
+    /// For example this could be provided as an argument to
+    /// [`Instance::new`](crate::Instance::new) or
+    /// [`Linker::define`](crate::Linker::define).
+    ///
+    /// # Errors
+    ///
+    /// Returns an error if the `ty` provided does not match the type of the
+    /// value `val`, or if `val` comes from a different store than `store`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use wasmtime::*;
+    /// # fn main() -> anyhow::Result<()> {
+    /// let engine = Engine::default();
+    /// let mut store = Store::new(&engine, ());
+    ///
+    /// let ty = GlobalType::new(ValType::I32, Mutability::Const);
+    /// let i32_const = Global::new(&mut store, ty, 1i32.into())?;
+    /// let ty = GlobalType::new(ValType::F64, Mutability::Var);
+    /// let f64_mut = Global::new(&mut store, ty, 2.0f64.into())?;
+    ///
+    /// let module = Module::new(
+    ///     &engine,
+    ///     "(module
+    ///         (global (import \"\" \"i32-const\") i32)
+    ///         (global (import \"\" \"f64-mut\") (mut f64))
+    ///     )"
+    /// )?;
+    ///
+    /// let mut linker = Linker::new(&engine);
+    /// linker.define(&store, "", "i32-const", i32_const)?;
+    /// linker.define(&store, "", "f64-mut", f64_mut)?;
+    ///
+    /// let instance = linker.instantiate(&mut store, &module)?;
+    /// // ...
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub fn new(mut store: impl AsContextMut, ty: GlobalType, val: Val) -> Result<Global> {
+        Global::_new(store.as_context_mut().0, ty, val)
+    }
+
+    fn _new(store: &mut StoreOpaque, ty: GlobalType, val: Val) -> Result<Global> {
+        if !val.comes_from_same_store(store) {
+            bail!("cross-`Store` globals are not supported");
+        }
+        if val.ty() != *ty.content() {
+            bail!("value provided does not match the type of this global");
+        }
+        unsafe {
+            let wasmtime_export = generate_global_export(store, ty, val);
+            Ok(Global::from_wasmtime_global(wasmtime_export, store))
+        }
+    }
+
+    pub(crate) fn from_stored(stored: Stored<ExportGlobal>) -> Global {
+        Global(stored)
+    }
+
+    /// Returns the underlying type of this `global`.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `store` does not own this global.
+    pub fn ty(&self, store: impl AsContext) -> GlobalType {
+        let store = store.as_context();
+        let ty = &store[self.0].global;
+        GlobalType::from_wasmtime_global(&ty)
+    }
+
+    /// Returns the current [`Val`] of this global.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `store` does not own this global.
+    pub fn get(&self, mut store: impl AsContextMut) -> Val {
+        unsafe {
+            let store = store.as_context_mut();
+            let definition = &*store[self.0].definition;
+            match self.ty(&store).content() {
+                ValType::I32 => Val::from(*definition.as_i32()),
+                ValType::I64 => Val::from(*definition.as_i64()),
+                ValType::F32 => Val::F32(*definition.as_u32()),
+                ValType::F64 => Val::F64(*definition.as_u64()),
+                ValType::ExternRef => Val::ExternRef(
+                    definition
+                        .as_externref()
+                        .clone()
+                        .map(|inner| ExternRef { inner }),
+                ),
+                ValType::FuncRef => {
+                    Val::FuncRef(Func::from_raw(store, definition.as_func_ref().cast()))
+                }
+                ValType::V128 => Val::V128((*definition.as_u128()).into()),
+            }
+        }
+    }
+
+    /// Attempts to set the current value of this global to [`Val`].
+    ///
+    /// # Errors
+    ///
+    /// Returns an error if this global has a different type than `Val`, if
+    /// it's not a mutable global, or if `val` comes from a different store than
+    /// the one provided.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `store` does not own this global.
+    pub fn set(&self, mut store: impl AsContextMut, val: Val) -> Result<()> {
+        let store = store.as_context_mut().0;
+        let ty = self.ty(&store);
+        if ty.mutability() != Mutability::Var {
+            bail!("immutable global cannot be set");
+        }
+        let ty = ty.content();
+        if val.ty() != *ty {
+            bail!("global of type {:?} cannot be set to {:?}", ty, val.ty());
+        }
+        if !val.comes_from_same_store(store) {
+            bail!("cross-`Store` values are not supported");
+        }
+        unsafe {
+            let definition = &mut *store[self.0].definition;
+            match val {
+                Val::I32(i) => *definition.as_i32_mut() = i,
+                Val::I64(i) => *definition.as_i64_mut() = i,
+                Val::F32(f) => *definition.as_u32_mut() = f,
+                Val::F64(f) => *definition.as_u64_mut() = f,
+                Val::FuncRef(f) => {
+                    *definition.as_func_ref_mut() = f.map_or(ptr::null_mut(), |f| {
+                        f.caller_checked_func_ref(store).as_ptr().cast()
+                    });
+                }
+                Val::ExternRef(x) => {
+                    let old = mem::replace(definition.as_externref_mut(), x.map(|x| x.inner));
+                    drop(old);
+                }
+                Val::V128(i) => *definition.as_u128_mut() = i.into(),
+            }
+        }
+        Ok(())
+    }
+
+    pub(crate) unsafe fn from_wasmtime_global(
+        wasmtime_export: wasmtime_runtime::ExportGlobal,
+        store: &mut StoreOpaque,
+    ) -> Global {
+        Global(store.store_data_mut().insert(wasmtime_export))
+    }
+
+    pub(crate) fn wasmtime_ty<'a>(&self, data: &'a StoreData) -> &'a wasmtime_environ::Global {
+        &data[self.0].global
+    }
+
+    pub(crate) fn vmimport(&self, store: &StoreOpaque) -> wasmtime_runtime::VMGlobalImport {
+        wasmtime_runtime::VMGlobalImport {
+            from: store[self.0].definition,
+        }
+    }
+}
+
+/// A WebAssembly `table`, or an array of values.
+///
+/// Like [`Memory`] a table is an indexed array of values, but unlike [`Memory`]
+/// it's an array of WebAssembly reference type values rather than bytes. One of
+/// the most common usages of a table is a function table for wasm modules (a
+/// `funcref` table), where each element has the `ValType::FuncRef` type.
+///
+/// A [`Table`] "belongs" to the store that it was originally created within
+/// (either via [`Table::new`] or via instantiating a
+/// [`Module`](crate::Module)). Operations on a [`Table`] only work with the
+/// store it belongs to, and if another store is passed in by accident then
+/// methods will panic.
+#[derive(Copy, Clone, Debug)]
+#[repr(transparent)] // here for the C API
+pub struct Table(Stored<wasmtime_runtime::ExportTable>);
+
+impl Table {
+    /// Creates a new [`Table`] with the given parameters.
+    ///
+    /// * `store` - the owner of the resulting [`Table`]
+    /// * `ty` - the type of this table, containing both the element type as
+    ///   well as the initial size and maximum size, if any.
+    /// * `init` - the initial value to fill all table entries with, if the
+    ///   table starts with an initial size.
+    ///
+    /// # Errors
+    ///
+    /// Returns an error if `init` does not match the element type of the table,
+    /// or if `init` does not belong to the `store` provided.
+    ///
+    /// # Panics
+    ///
+    /// This function will panic when used with a [`Store`](`crate::Store`)
+    /// which has a [`ResourceLimiterAsync`](`crate::ResourceLimiterAsync`)
+    /// (see also: [`Store::limiter_async`](`crate::Store::limiter_async`).
+    /// When using an async resource limiter, use [`Table::new_async`]
+    /// instead.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # use wasmtime::*;
+    /// # fn main() -> anyhow::Result<()> {
+    /// let engine = Engine::default();
+    /// let mut store = Store::new(&engine, ());
+    ///
+    /// let ty = TableType::new(ValType::FuncRef, 2, None);
+    /// let table = Table::new(&mut store, ty, Val::FuncRef(None))?;
+    ///
+    /// let module = Module::new(
+    ///     &engine,
+    ///     "(module
+    ///         (table (import \"\" \"\") 2 funcref)
+    ///         (func $f (result i32)
+    ///             i32.const 10)
+    ///         (elem (i32.const 0) $f)
+    ///     )"
+    /// )?;
+    ///
+    /// let instance = Instance::new(&mut store, &module, &[table.into()])?;
+    /// // ...
+    /// # Ok(())
+    /// # }
+    /// ```
+    pub fn new(mut store: impl AsContextMut, ty: TableType, init: Val) -> Result<Table> {
+        Table::_new(store.as_context_mut().0, ty, init)
+    }
+
+    #[cfg_attr(nightlydoc, doc(cfg(feature = "async")))]
+    /// Async variant of [`Table::new`]. You must use this variant with
+    /// [`Store`](`crate::Store`)s which have a
+    /// [`ResourceLimiterAsync`](`crate::ResourceLimiterAsync`).
+    ///
+    /// # Panics
+    ///
+    /// This function will panic when used with a non-async
+    /// [`Store`](`crate::Store`)
+    #[cfg(feature = "async")]
+    pub async fn new_async<T>(
+        mut store: impl AsContextMut<Data = T>,
+        ty: TableType,
+        init: Val,
+    ) -> Result<Table>
+    where
+        T: Send,
+    {
+        let mut store = store.as_context_mut();
+        assert!(
+            store.0.async_support(),
+            "cannot use `new_async` without enabling async support on the config"
+        );
+        store
+            .on_fiber(|store| Table::_new(store.0, ty, init))
+            .await?
+    }
+
+    fn _new(store: &mut StoreOpaque, ty: TableType, init: Val) -> Result<Table> {
+        let wasmtime_export = generate_table_export(store, &ty)?;
+        let init = init.into_table_element(store, ty.element())?;
+        unsafe {
+            let table = Table::from_wasmtime_table(wasmtime_export, store);
+            (*table.wasmtime_table(store, std::iter::empty())).fill(0, init, ty.minimum())?;
+
+            Ok(table)
+        }
+    }
+
+    /// Returns the underlying type of this table, including its element type as
+    /// well as the maximum/minimum lower bounds.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `store` does not own this table.
+    pub fn ty(&self, store: impl AsContext) -> TableType {
+        let store = store.as_context();
+        let ty = &store[self.0].table.table;
+        TableType::from_wasmtime_table(ty)
+    }
+
+    fn wasmtime_table(
+        &self,
+        store: &mut StoreOpaque,
+        lazy_init_range: impl Iterator<Item = u32>,
+    ) -> *mut runtime::Table {
+        unsafe {
+            let export = &store[self.0];
+            wasmtime_runtime::Instance::from_vmctx(export.vmctx, |handle| {
+                let idx = handle.table_index(&*export.definition);
+                handle.get_defined_table_with_lazy_init(idx, lazy_init_range)
+            })
+        }
+    }
+
+    /// Returns the table element value at `index`.
+    ///
+    /// Returns `None` if `index` is out of bounds.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `store` does not own this table.
+    pub fn get(&self, mut store: impl AsContextMut, index: u32) -> Option<Val> {
+        let store = store.as_context_mut().0;
+        let table = self.wasmtime_table(store, std::iter::once(index));
+        unsafe {
+            match (*table).get(index)? {
+                runtime::TableElement::FuncRef(f) => {
+                    let func = Func::from_caller_checked_func_ref(store, f);
+                    Some(Val::FuncRef(func))
+                }
+                runtime::TableElement::ExternRef(None) => Some(Val::ExternRef(None)),
+                runtime::TableElement::ExternRef(Some(x)) => {
+                    Some(Val::ExternRef(Some(ExternRef { inner: x })))
+                }
+                runtime::TableElement::UninitFunc => {
+                    unreachable!("lazy init above should have converted UninitFunc")
+                }
+            }
+        }
+    }
+
+    /// Writes the `val` provided into `index` within this table.
+    ///
+    /// # Errors
+    ///
+    /// Returns an error if `index` is out of bounds, if `val` does not have
+    /// the right type to be stored in this table, or if `val` belongs to a
+    /// different store.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `store` does not own this table.
+    pub fn set(&self, mut store: impl AsContextMut, index: u32, val: Val) -> Result<()> {
+        let store = store.as_context_mut().0;
+        let ty = self.ty(&store).element().clone();
+        let val = val.into_table_element(store, ty)?;
+        let table = self.wasmtime_table(store, std::iter::empty());
+        unsafe {
+            (*table)
+                .set(index, val)
+                .map_err(|()| anyhow!("table element index out of bounds"))
+        }
+    }
+
+    /// Returns the current size of this table.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `store` does not own this table.
+    pub fn size(&self, store: impl AsContext) -> u32 {
+        self.internal_size(store.as_context().0)
+    }
+
+    pub(crate) fn internal_size(&self, store: &StoreOpaque) -> u32 {
+        unsafe { (*store[self.0].definition).current_elements }
+    }
+
+    /// Grows the size of this table by `delta` more elements, initialization
+    /// all new elements to `init`.
+    ///
+    /// Returns the previous size of this table if successful.
+    ///
+    /// # Errors
+    ///
+    /// Returns an error if the table cannot be grown by `delta`, for example
+    /// if it would cause the table to exceed its maximum size. Also returns an
+    /// error if `init` is not of the right type or if `init` does not belong to
+    /// `store`.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `store` does not own this table.
+    ///
+    /// This function will panic when used with a [`Store`](`crate::Store`)
+    /// which has a [`ResourceLimiterAsync`](`crate::ResourceLimiterAsync`)
+    /// (see also: [`Store::limiter_async`](`crate::Store::limiter_async`)).
+    /// When using an async resource limiter, use [`Table::grow_async`]
+    /// instead.
+    pub fn grow(&self, mut store: impl AsContextMut, delta: u32, init: Val) -> Result<u32> {
+        let store = store.as_context_mut().0;
+        let ty = self.ty(&store).element().clone();
+        let init = init.into_table_element(store, ty)?;
+        let table = self.wasmtime_table(store, std::iter::empty());
+        unsafe {
+            match (*table).grow(delta, init, store)? {
+                Some(size) => {
+                    let vm = (*table).vmtable();
+                    *store[self.0].definition = vm;
+                    Ok(size)
+                }
+                None => bail!("failed to grow table by `{}`", delta),
+            }
+        }
+    }
+
+    #[cfg_attr(nightlydoc, doc(cfg(feature = "async")))]
+    /// Async variant of [`Table::grow`]. Required when using a
+    /// [`ResourceLimiterAsync`](`crate::ResourceLimiterAsync`).
+    ///
+    /// # Panics
+    ///
+    /// This function will panic when used with a non-async
+    /// [`Store`](`crate::Store`).
+    #[cfg(feature = "async")]
+    pub async fn grow_async<T>(
+        &self,
+        mut store: impl AsContextMut<Data = T>,
+        delta: u32,
+        init: Val,
+    ) -> Result<u32>
+    where
+        T: Send,
+    {
+        let mut store = store.as_context_mut();
+        assert!(
+            store.0.async_support(),
+            "cannot use `grow_async` without enabling async support on the config"
+        );
+        store
+            .on_fiber(|store| self.grow(store, delta, init))
+            .await?
+    }
+
+    /// Copy `len` elements from `src_table[src_index..]` into
+    /// `dst_table[dst_index..]`.
+    ///
+    /// # Errors
+    ///
+    /// Returns an error if the range is out of bounds of either the source or
+    /// destination tables.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `store` does not own either `dst_table` or `src_table`.
+    pub fn copy(
+        mut store: impl AsContextMut,
+        dst_table: &Table,
+        dst_index: u32,
+        src_table: &Table,
+        src_index: u32,
+        len: u32,
+    ) -> Result<()> {
+        let store = store.as_context_mut().0;
+        if dst_table.ty(&store).element() != src_table.ty(&store).element() {
+            bail!("tables do not have the same element type");
+        }
+
+        let dst_table = dst_table.wasmtime_table(store, std::iter::empty());
+        let src_range = src_index..(src_index.checked_add(len).unwrap_or(u32::MAX));
+        let src_table = src_table.wasmtime_table(store, src_range);
+        unsafe {
+            runtime::Table::copy(dst_table, src_table, dst_index, src_index, len)?;
+        }
+        Ok(())
+    }
+
+    /// Fill `table[dst..(dst + len)]` with the given value.
+    ///
+    /// # Errors
+    ///
+    /// Returns an error if
+    ///
+    /// * `val` is not of the same type as this table's
+    ///   element type,
+    ///
+    /// * the region to be filled is out of bounds, or
+    ///
+    /// * `val` comes from a different `Store` from this table.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `store` does not own either `dst_table` or `src_table`.
+    pub fn fill(&self, mut store: impl AsContextMut, dst: u32, val: Val, len: u32) -> Result<()> {
+        let store = store.as_context_mut().0;
+        let ty = self.ty(&store).element().clone();
+        let val = val.into_table_element(store, ty)?;
+
+        let table = self.wasmtime_table(store, std::iter::empty());
+        unsafe {
+            (*table).fill(dst, val, len)?;
+        }
+
+        Ok(())
+    }
+
+    pub(crate) unsafe fn from_wasmtime_table(
+        wasmtime_export: wasmtime_runtime::ExportTable,
+        store: &mut StoreOpaque,
+    ) -> Table {
+        Table(store.store_data_mut().insert(wasmtime_export))
+    }
+
+    pub(crate) fn wasmtime_ty<'a>(&self, data: &'a StoreData) -> &'a wasmtime_environ::Table {
+        &data[self.0].table.table
+    }
+
+    pub(crate) fn vmimport(&self, store: &StoreOpaque) -> wasmtime_runtime::VMTableImport {
+        let export = &store[self.0];
+        wasmtime_runtime::VMTableImport {
+            from: export.definition,
+            vmctx: export.vmctx,
+        }
+    }
+}
+
 // Exports
 
 /// An exported WebAssembly value.
diff --git a/crates/wasmtime/src/externals/global.rs b/crates/wasmtime/src/externals/global.rs
deleted file mode 100644
index fb089ba9f52b..000000000000
--- a/crates/wasmtime/src/externals/global.rs
+++ /dev/null
@@ -1,238 +0,0 @@
-use crate::store::{StoreData, StoreOpaque, Stored};
-use crate::trampoline::generate_global_export;
-use crate::{AsContext, AsContextMut, ExternRef, Func, GlobalType, Mutability, Val, ValType};
-use anyhow::{bail, Result};
-use std::mem;
-use std::ptr;
-
-/// A WebAssembly `global` value which can be read and written to.
-///
-/// A `global` in WebAssembly is sort of like a global variable within an
-/// [`Instance`](crate::Instance). The `global.get` and `global.set`
-/// instructions will modify and read global values in a wasm module. Globals
-/// can either be imported or exported from wasm modules.
-///
-/// A [`Global`] "belongs" to the store that it was originally created within
-/// (either via [`Global::new`] or via instantiating a
-/// [`Module`](crate::Module)). Operations on a [`Global`] only work with the
-/// store it belongs to, and if another store is passed in by accident then
-/// methods will panic.
-#[derive(Copy, Clone, Debug)]
-#[repr(transparent)] // here for the C API
-pub struct Global(pub(super) Stored<wasmtime_runtime::ExportGlobal>);
-
-impl Global {
-    /// Creates a new WebAssembly `global` value with the provide type `ty` and
-    /// initial value `val`.
-    ///
-    /// The `store` argument will be the owner of the [`Global`] returned. Using
-    /// the returned [`Global`] other items in the store may access this global.
-    /// For example this could be provided as an argument to
-    /// [`Instance::new`](crate::Instance::new) or
-    /// [`Linker::define`](crate::Linker::define).
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if the `ty` provided does not match the type of the
-    /// value `val`, or if `val` comes from a different store than `store`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use wasmtime::*;
-    /// # fn main() -> anyhow::Result<()> {
-    /// let engine = Engine::default();
-    /// let mut store = Store::new(&engine, ());
-    ///
-    /// let ty = GlobalType::new(ValType::I32, Mutability::Const);
-    /// let i32_const = Global::new(&mut store, ty, 1i32.into())?;
-    /// let ty = GlobalType::new(ValType::F64, Mutability::Var);
-    /// let f64_mut = Global::new(&mut store, ty, 2.0f64.into())?;
-    ///
-    /// let module = Module::new(
-    ///     &engine,
-    ///     "(module
-    ///         (global (import \"\" \"i32-const\") i32)
-    ///         (global (import \"\" \"f64-mut\") (mut f64))
-    ///     )"
-    /// )?;
-    ///
-    /// let mut linker = Linker::new(&engine);
-    /// linker.define(&store, "", "i32-const", i32_const)?;
-    /// linker.define(&store, "", "f64-mut", f64_mut)?;
-    ///
-    /// let instance = linker.instantiate(&mut store, &module)?;
-    /// // ...
-    /// # Ok(())
-    /// # }
-    /// ```
-    pub fn new(mut store: impl AsContextMut, ty: GlobalType, val: Val) -> Result<Global> {
-        Global::_new(store.as_context_mut().0, ty, val)
-    }
-
-    fn _new(store: &mut StoreOpaque, ty: GlobalType, val: Val) -> Result<Global> {
-        if !val.comes_from_same_store(store) {
-            bail!("cross-`Store` globals are not supported");
-        }
-        if val.ty() != *ty.content() {
-            bail!("value provided does not match the type of this global");
-        }
-        unsafe {
-            let wasmtime_export = generate_global_export(store, ty, val);
-            Ok(Global::from_wasmtime_global(wasmtime_export, store))
-        }
-    }
-
-    /// Returns the underlying type of this `global`.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `store` does not own this global.
-    pub fn ty(&self, store: impl AsContext) -> GlobalType {
-        let store = store.as_context();
-        let ty = &store[self.0].global;
-        GlobalType::from_wasmtime_global(&ty)
-    }
-
-    /// Returns the current [`Val`] of this global.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `store` does not own this global.
-    pub fn get(&self, mut store: impl AsContextMut) -> Val {
-        unsafe {
-            let store = store.as_context_mut();
-            let definition = &*store[self.0].definition;
-            match self.ty(&store).content() {
-                ValType::I32 => Val::from(*definition.as_i32()),
-                ValType::I64 => Val::from(*definition.as_i64()),
-                ValType::F32 => Val::F32(*definition.as_u32()),
-                ValType::F64 => Val::F64(*definition.as_u64()),
-                ValType::ExternRef => Val::ExternRef(
-                    definition
-                        .as_externref()
-                        .clone()
-                        .map(|inner| ExternRef { inner }),
-                ),
-                ValType::FuncRef => {
-                    Val::FuncRef(Func::from_raw(store, definition.as_func_ref().cast()))
-                }
-                ValType::V128 => Val::V128((*definition.as_u128()).into()),
-            }
-        }
-    }
-
-    /// Attempts to set the current value of this global to [`Val`].
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if this global has a different type than `Val`, if
-    /// it's not a mutable global, or if `val` comes from a different store than
-    /// the one provided.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `store` does not own this global.
-    pub fn set(&self, mut store: impl AsContextMut, val: Val) -> Result<()> {
-        let store = store.as_context_mut().0;
-        let ty = self.ty(&store);
-        if ty.mutability() != Mutability::Var {
-            bail!("immutable global cannot be set");
-        }
-        let ty = ty.content();
-        if val.ty() != *ty {
-            bail!("global of type {:?} cannot be set to {:?}", ty, val.ty());
-        }
-        if !val.comes_from_same_store(store) {
-            bail!("cross-`Store` values are not supported");
-        }
-        unsafe {
-            let definition = &mut *store[self.0].definition;
-            match val {
-                Val::I32(i) => *definition.as_i32_mut() = i,
-                Val::I64(i) => *definition.as_i64_mut() = i,
-                Val::F32(f) => *definition.as_u32_mut() = f,
-                Val::F64(f) => *definition.as_u64_mut() = f,
-                Val::FuncRef(f) => {
-                    *definition.as_func_ref_mut() =
-                        f.map_or(ptr::null_mut(), |f| f.vm_func_ref(store).as_ptr().cast());
-                }
-                Val::ExternRef(x) => {
-                    let old = mem::replace(definition.as_externref_mut(), x.map(|x| x.inner));
-                    drop(old);
-                }
-                Val::V128(i) => *definition.as_u128_mut() = i.into(),
-            }
-        }
-        Ok(())
-    }
-
-    pub(crate) unsafe fn from_wasmtime_global(
-        wasmtime_export: wasmtime_runtime::ExportGlobal,
-        store: &mut StoreOpaque,
-    ) -> Global {
-        Global(store.store_data_mut().insert(wasmtime_export))
-    }
-
-    pub(crate) fn wasmtime_ty<'a>(&self, data: &'a StoreData) -> &'a wasmtime_environ::Global {
-        &data[self.0].global
-    }
-
-    pub(crate) fn vmimport(&self, store: &StoreOpaque) -> wasmtime_runtime::VMGlobalImport {
-        wasmtime_runtime::VMGlobalImport {
-            from: store[self.0].definition,
-        }
-    }
-
-    /// Get a stable hash key for this global.
-    ///
-    /// Even if the same underlying global definition is added to the
-    /// `StoreData` multiple times and becomes multiple `wasmtime::Global`s,
-    /// this hash key will be consistent across all of these globals.
-    pub(crate) fn hash_key(&self, store: &StoreOpaque) -> impl std::hash::Hash + Eq {
-        store[self.0].definition as usize
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{Instance, Module, Store};
-
-    #[test]
-    fn hash_key_is_stable_across_duplicate_store_data_entries() -> Result<()> {
-        let mut store = Store::<()>::default();
-        let module = Module::new(
-            store.engine(),
-            r#"
-                (module
-                    (global (export "g") (mut i32) (i32.const 0))
-                )
-            "#,
-        )?;
-        let instance = Instance::new(&mut store, &module, &[])?;
-
-        // Each time we `get_global`, we call `Global::from_wasmtime` which adds
-        // a new entry to `StoreData`, so `g1` and `g2` will have different
-        // indices into `StoreData`.
-        let g1 = instance.get_global(&mut store, "g").unwrap();
-        let g2 = instance.get_global(&mut store, "g").unwrap();
-
-        // That said, they really point to the same global.
-        assert_eq!(g1.get(&mut store).unwrap_i32(), 0);
-        assert_eq!(g2.get(&mut store).unwrap_i32(), 0);
-        g1.set(&mut store, Val::I32(42))?;
-        assert_eq!(g1.get(&mut store).unwrap_i32(), 42);
-        assert_eq!(g2.get(&mut store).unwrap_i32(), 42);
-
-        // And therefore their hash keys are the same.
-        assert!(g1.hash_key(&store.as_context().0) == g2.hash_key(&store.as_context().0));
-
-        // But the hash keys are different from different globals.
-        let instance2 = Instance::new(&mut store, &module, &[])?;
-        let g3 = instance2.get_global(&mut store, "g").unwrap();
-        assert!(g1.hash_key(&store.as_context().0) != g3.hash_key(&store.as_context().0));
-
-        Ok(())
-    }
-}
diff --git a/crates/wasmtime/src/externals/table.rs b/crates/wasmtime/src/externals/table.rs
deleted file mode 100644
index cbd688207d5d..000000000000
--- a/crates/wasmtime/src/externals/table.rs
+++ /dev/null
@@ -1,403 +0,0 @@
-use crate::store::{StoreData, StoreOpaque, Stored};
-use crate::trampoline::generate_table_export;
-use crate::{AsContext, AsContextMut, ExternRef, Func, TableType, Val};
-use anyhow::{anyhow, bail, Result};
-use wasmtime_runtime::{self as runtime};
-
-/// A WebAssembly `table`, or an array of values.
-///
-/// Like [`Memory`][crate::Memory] a table is an indexed array of values, but
-/// unlike [`Memory`][crate::Memory] it's an array of WebAssembly reference type
-/// values rather than bytes. One of the most common usages of a table is a
-/// function table for wasm modules (a `funcref` table), where each element has
-/// the `ValType::FuncRef` type.
-///
-/// A [`Table`] "belongs" to the store that it was originally created within
-/// (either via [`Table::new`] or via instantiating a
-/// [`Module`](crate::Module)). Operations on a [`Table`] only work with the
-/// store it belongs to, and if another store is passed in by accident then
-/// methods will panic.
-#[derive(Copy, Clone, Debug)]
-#[repr(transparent)] // here for the C API
-pub struct Table(pub(super) Stored<wasmtime_runtime::ExportTable>);
-
-impl Table {
-    /// Creates a new [`Table`] with the given parameters.
-    ///
-    /// * `store` - the owner of the resulting [`Table`]
-    /// * `ty` - the type of this table, containing both the element type as
-    ///   well as the initial size and maximum size, if any.
-    /// * `init` - the initial value to fill all table entries with, if the
-    ///   table starts with an initial size.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if `init` does not match the element type of the table,
-    /// or if `init` does not belong to the `store` provided.
-    ///
-    /// # Panics
-    ///
-    /// This function will panic when used with a [`Store`](`crate::Store`)
-    /// which has a [`ResourceLimiterAsync`](`crate::ResourceLimiterAsync`)
-    /// (see also: [`Store::limiter_async`](`crate::Store::limiter_async`).
-    /// When using an async resource limiter, use [`Table::new_async`]
-    /// instead.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use wasmtime::*;
-    /// # fn main() -> anyhow::Result<()> {
-    /// let engine = Engine::default();
-    /// let mut store = Store::new(&engine, ());
-    ///
-    /// let ty = TableType::new(ValType::FuncRef, 2, None);
-    /// let table = Table::new(&mut store, ty, Val::FuncRef(None))?;
-    ///
-    /// let module = Module::new(
-    ///     &engine,
-    ///     "(module
-    ///         (table (import \"\" \"\") 2 funcref)
-    ///         (func $f (result i32)
-    ///             i32.const 10)
-    ///         (elem (i32.const 0) $f)
-    ///     )"
-    /// )?;
-    ///
-    /// let instance = Instance::new(&mut store, &module, &[table.into()])?;
-    /// // ...
-    /// # Ok(())
-    /// # }
-    /// ```
-    pub fn new(mut store: impl AsContextMut, ty: TableType, init: Val) -> Result<Table> {
-        Table::_new(store.as_context_mut().0, ty, init)
-    }
-
-    #[cfg_attr(nightlydoc, doc(cfg(feature = "async")))]
-    /// Async variant of [`Table::new`]. You must use this variant with
-    /// [`Store`](`crate::Store`)s which have a
-    /// [`ResourceLimiterAsync`](`crate::ResourceLimiterAsync`).
-    ///
-    /// # Panics
-    ///
-    /// This function will panic when used with a non-async
-    /// [`Store`](`crate::Store`)
-    #[cfg(feature = "async")]
-    pub async fn new_async<T>(
-        mut store: impl AsContextMut<Data = T>,
-        ty: TableType,
-        init: Val,
-    ) -> Result<Table>
-    where
-        T: Send,
-    {
-        let mut store = store.as_context_mut();
-        assert!(
-            store.0.async_support(),
-            "cannot use `new_async` without enabling async support on the config"
-        );
-        store
-            .on_fiber(|store| Table::_new(store.0, ty, init))
-            .await?
-    }
-
-    fn _new(store: &mut StoreOpaque, ty: TableType, init: Val) -> Result<Table> {
-        let wasmtime_export = generate_table_export(store, &ty)?;
-        let init = init.into_table_element(store, ty.element())?;
-        unsafe {
-            let table = Table::from_wasmtime_table(wasmtime_export, store);
-            (*table.wasmtime_table(store, std::iter::empty())).fill(0, init, ty.minimum())?;
-
-            Ok(table)
-        }
-    }
-
-    /// Returns the underlying type of this table, including its element type as
-    /// well as the maximum/minimum lower bounds.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `store` does not own this table.
-    pub fn ty(&self, store: impl AsContext) -> TableType {
-        let store = store.as_context();
-        let ty = &store[self.0].table.table;
-        TableType::from_wasmtime_table(ty)
-    }
-
-    fn wasmtime_table(
-        &self,
-        store: &mut StoreOpaque,
-        lazy_init_range: impl Iterator<Item = u32>,
-    ) -> *mut runtime::Table {
-        unsafe {
-            let export = &store[self.0];
-            wasmtime_runtime::Instance::from_vmctx(export.vmctx, |handle| {
-                let idx = handle.table_index(&*export.definition);
-                handle.get_defined_table_with_lazy_init(idx, lazy_init_range)
-            })
-        }
-    }
-
-    /// Returns the table element value at `index`.
-    ///
-    /// Returns `None` if `index` is out of bounds.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `store` does not own this table.
-    pub fn get(&self, mut store: impl AsContextMut, index: u32) -> Option<Val> {
-        let store = store.as_context_mut().0;
-        let table = self.wasmtime_table(store, std::iter::once(index));
-        unsafe {
-            match (*table).get(index)? {
-                runtime::TableElement::FuncRef(f) => {
-                    let func = Func::from_caller_checked_func_ref(store, f);
-                    Some(Val::FuncRef(func))
-                }
-                runtime::TableElement::ExternRef(None) => Some(Val::ExternRef(None)),
-                runtime::TableElement::ExternRef(Some(x)) => {
-                    Some(Val::ExternRef(Some(ExternRef { inner: x })))
-                }
-                runtime::TableElement::UninitFunc => {
-                    unreachable!("lazy init above should have converted UninitFunc")
-                }
-            }
-        }
-    }
-
-    /// Writes the `val` provided into `index` within this table.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if `index` is out of bounds, if `val` does not have
-    /// the right type to be stored in this table, or if `val` belongs to a
-    /// different store.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `store` does not own this table.
-    pub fn set(&self, mut store: impl AsContextMut, index: u32, val: Val) -> Result<()> {
-        let store = store.as_context_mut().0;
-        let ty = self.ty(&store).element().clone();
-        let val = val.into_table_element(store, ty)?;
-        let table = self.wasmtime_table(store, std::iter::empty());
-        unsafe {
-            (*table)
-                .set(index, val)
-                .map_err(|()| anyhow!("table element index out of bounds"))
-        }
-    }
-
-    /// Returns the current size of this table.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `store` does not own this table.
-    pub fn size(&self, store: impl AsContext) -> u32 {
-        self.internal_size(store.as_context().0)
-    }
-
-    pub(crate) fn internal_size(&self, store: &StoreOpaque) -> u32 {
-        unsafe { (*store[self.0].definition).current_elements }
-    }
-
-    /// Grows the size of this table by `delta` more elements, initialization
-    /// all new elements to `init`.
-    ///
-    /// Returns the previous size of this table if successful.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if the table cannot be grown by `delta`, for example
-    /// if it would cause the table to exceed its maximum size. Also returns an
-    /// error if `init` is not of the right type or if `init` does not belong to
-    /// `store`.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `store` does not own this table.
-    ///
-    /// This function will panic when used with a [`Store`](`crate::Store`)
-    /// which has a [`ResourceLimiterAsync`](`crate::ResourceLimiterAsync`)
-    /// (see also: [`Store::limiter_async`](`crate::Store::limiter_async`)).
-    /// When using an async resource limiter, use [`Table::grow_async`]
-    /// instead.
-    pub fn grow(&self, mut store: impl AsContextMut, delta: u32, init: Val) -> Result<u32> {
-        let store = store.as_context_mut().0;
-        let ty = self.ty(&store).element().clone();
-        let init = init.into_table_element(store, ty)?;
-        let table = self.wasmtime_table(store, std::iter::empty());
-        unsafe {
-            match (*table).grow(delta, init, store)? {
-                Some(size) => {
-                    let vm = (*table).vmtable();
-                    *store[self.0].definition = vm;
-                    Ok(size)
-                }
-                None => bail!("failed to grow table by `{}`", delta),
-            }
-        }
-    }
-
-    #[cfg_attr(nightlydoc, doc(cfg(feature = "async")))]
-    /// Async variant of [`Table::grow`]. Required when using a
-    /// [`ResourceLimiterAsync`](`crate::ResourceLimiterAsync`).
-    ///
-    /// # Panics
-    ///
-    /// This function will panic when used with a non-async
-    /// [`Store`](`crate::Store`).
-    #[cfg(feature = "async")]
-    pub async fn grow_async<T>(
-        &self,
-        mut store: impl AsContextMut<Data = T>,
-        delta: u32,
-        init: Val,
-    ) -> Result<u32>
-    where
-        T: Send,
-    {
-        let mut store = store.as_context_mut();
-        assert!(
-            store.0.async_support(),
-            "cannot use `grow_async` without enabling async support on the config"
-        );
-        store
-            .on_fiber(|store| self.grow(store, delta, init))
-            .await?
-    }
-
-    /// Copy `len` elements from `src_table[src_index..]` into
-    /// `dst_table[dst_index..]`.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if the range is out of bounds of either the source or
-    /// destination tables.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `store` does not own either `dst_table` or `src_table`.
-    pub fn copy(
-        mut store: impl AsContextMut,
-        dst_table: &Table,
-        dst_index: u32,
-        src_table: &Table,
-        src_index: u32,
-        len: u32,
-    ) -> Result<()> {
-        let store = store.as_context_mut().0;
-        if dst_table.ty(&store).element() != src_table.ty(&store).element() {
-            bail!("tables do not have the same element type");
-        }
-
-        let dst_table = dst_table.wasmtime_table(store, std::iter::empty());
-        let src_range = src_index..(src_index.checked_add(len).unwrap_or(u32::MAX));
-        let src_table = src_table.wasmtime_table(store, src_range);
-        unsafe {
-            runtime::Table::copy(dst_table, src_table, dst_index, src_index, len)?;
-        }
-        Ok(())
-    }
-
-    /// Fill `table[dst..(dst + len)]` with the given value.
-    ///
-    /// # Errors
-    ///
-    /// Returns an error if
-    ///
-    /// * `val` is not of the same type as this table's
-    ///   element type,
-    ///
-    /// * the region to be filled is out of bounds, or
-    ///
-    /// * `val` comes from a different `Store` from this table.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `store` does not own either `dst_table` or `src_table`.
-    pub fn fill(&self, mut store: impl AsContextMut, dst: u32, val: Val, len: u32) -> Result<()> {
-        let store = store.as_context_mut().0;
-        let ty = self.ty(&store).element().clone();
-        let val = val.into_table_element(store, ty)?;
-
-        let table = self.wasmtime_table(store, std::iter::empty());
-        unsafe {
-            (*table).fill(dst, val, len)?;
-        }
-
-        Ok(())
-    }
-
-    pub(crate) unsafe fn from_wasmtime_table(
-        wasmtime_export: wasmtime_runtime::ExportTable,
-        store: &mut StoreOpaque,
-    ) -> Table {
-        Table(store.store_data_mut().insert(wasmtime_export))
-    }
-
-    pub(crate) fn wasmtime_ty<'a>(&self, data: &'a StoreData) -> &'a wasmtime_environ::Table {
-        &data[self.0].table.table
-    }
-
-    pub(crate) fn vmimport(&self, store: &StoreOpaque) -> wasmtime_runtime::VMTableImport {
-        let export = &store[self.0];
-        wasmtime_runtime::VMTableImport {
-            from: export.definition,
-            vmctx: export.vmctx,
-        }
-    }
-
-    /// Get a stable hash key for this table.
-    ///
-    /// Even if the same underlying table definition is added to the
-    /// `StoreData` multiple times and becomes multiple `wasmtime::Table`s,
-    /// this hash key will be consistent across all of these tables.
-    #[allow(dead_code)] // Not used yet, but added for consistency.
-    pub(crate) fn hash_key(&self, store: &StoreOpaque) -> impl std::hash::Hash + Eq {
-        store[self.0].definition as usize
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{Instance, Module, Store};
-
-    #[test]
-    fn hash_key_is_stable_across_duplicate_store_data_entries() -> Result<()> {
-        let mut store = Store::<()>::default();
-        let module = Module::new(
-            store.engine(),
-            r#"
-                (module
-                    (table (export "t") 1 1 externref)
-                )
-            "#,
-        )?;
-        let instance = Instance::new(&mut store, &module, &[])?;
-
-        // Each time we `get_table`, we call `Table::from_wasmtime` which adds
-        // a new entry to `StoreData`, so `t1` and `t2` will have different
-        // indices into `StoreData`.
-        let t1 = instance.get_table(&mut store, "t").unwrap();
-        let t2 = instance.get_table(&mut store, "t").unwrap();
-
-        // That said, they really point to the same table.
-        assert!(t1.get(&mut store, 0).unwrap().unwrap_externref().is_none());
-        assert!(t2.get(&mut store, 0).unwrap().unwrap_externref().is_none());
-        t1.set(&mut store, 0, Val::ExternRef(Some(ExternRef::new(42))))?;
-        assert!(t1.get(&mut store, 0).unwrap().unwrap_externref().is_some());
-        assert!(t2.get(&mut store, 0).unwrap().unwrap_externref().is_some());
-
-        // And therefore their hash keys are the same.
-        assert!(t1.hash_key(&store.as_context().0) == t2.hash_key(&store.as_context().0));
-
-        // But the hash keys are different from different tables.
-        let instance2 = Instance::new(&mut store, &module, &[])?;
-        let t3 = instance2.get_table(&mut store, "t").unwrap();
-        assert!(t1.hash_key(&store.as_context().0) != t3.hash_key(&store.as_context().0));
-
-        Ok(())
-    }
-}
diff --git a/crates/wasmtime/src/func.rs b/crates/wasmtime/src/func.rs
index 3a23d51d4da7..60e2a5047903 100644
--- a/crates/wasmtime/src/func.rs
+++ b/crates/wasmtime/src/func.rs
@@ -946,7 +946,9 @@ impl Func {
     /// this function is properly rooted within it. Additionally this function
     /// should not be liberally used since it's a very low-level knob.
     pub unsafe fn to_raw(&self, mut store: impl AsContextMut) -> *mut c_void {
-        self.vm_func_ref(store.as_context_mut().0).as_ptr().cast()
+        self.caller_checked_func_ref(store.as_context_mut().0)
+            .as_ptr()
+            .cast()
     }
 
     /// Invokes this function with the `params` given, returning the results
@@ -1078,7 +1080,7 @@ impl Func {
     }
 
     #[inline]
-    pub(crate) fn vm_func_ref(&self, store: &mut StoreOpaque) -> NonNull<VMFuncRef> {
+    pub(crate) fn caller_checked_func_ref(&self, store: &mut StoreOpaque) -> NonNull<VMFuncRef> {
         let func_data = &mut store.store_data_mut()[self.0];
         if let Some(in_store) = func_data.in_store_func_ref {
             in_store.as_non_null()
@@ -1337,16 +1339,6 @@ impl Func {
         // (unsafely), which should be safe since we just did the type check above.
         unsafe { Ok(TypedFunc::new_unchecked(*self)) }
     }
-
-    /// Get a stable hash key for this function.
-    ///
-    /// Even if the same underlying function is added to the `StoreData`
-    /// multiple times and becomes multiple `wasmtime::Func`s, this hash key
-    /// will be consistent across all of these functions.
-    #[allow(dead_code)] // Not used yet, but added for consistency.
-    pub(crate) fn hash_key(&self, store: &mut StoreOpaque) -> impl std::hash::Hash + Eq {
-        self.vm_func_ref(store).as_ptr() as usize
-    }
 }
 
 /// Prepares for entrance into WebAssembly.
@@ -1416,7 +1408,7 @@ fn enter_wasm<T>(store: &mut StoreContextMut<'_, T>) -> Option<usize> {
         return None;
     }
 
-    let stack_pointer = stack_pointer();
+    let stack_pointer = psm::stack_pointer() as usize;
 
     // Determine the stack pointer where, after which, any wasm code will
     // immediately trap. This is checked on the entry to all wasm functions.
@@ -1443,43 +1435,6 @@ fn enter_wasm<T>(store: &mut StoreContextMut<'_, T>) -> Option<usize> {
     Some(prev_stack)
 }
 
-#[inline]
-fn stack_pointer() -> usize {
-    let stack_pointer: usize;
-    cfg_if::cfg_if! {
-        if #[cfg(target_arch = "x86_64")] {
-            unsafe {
-                std::arch::asm!(
-                    "mov {}, rsp",
-                    out(reg) stack_pointer,
-                    options(nostack,nomem),
-                );
-            }
-        } else if #[cfg(target_arch = "aarch64")] {
-            unsafe {
-                std::arch::asm!(
-                    "mov {}, sp",
-                    out(reg) stack_pointer,
-                    options(nostack,nomem),
-                );
-            }
-        } else if #[cfg(target_arch = "riscv64")] {
-            unsafe {
-                std::arch::asm!(
-                    "mv {}, sp",
-                    out(reg) stack_pointer,
-                    options(nostack,nomem),
-                );
-            }
-        } else if #[cfg(target_arch = "s390x")] {
-            stack_pointer = psm::stack_pointer() as usize;
-        } else {
-            compile_error!("unsupported platform");
-        }
-    }
-    stack_pointer
-}
-
 fn exit_wasm<T>(store: &mut StoreContextMut<'_, T>, prev_stack: Option<usize>) {
     // If we don't have a previous stack pointer to restore, then there's no
     // cleanup we need to perform here.
@@ -1895,26 +1850,43 @@ impl<T> Caller<'_, T> {
         self.store.gc()
     }
 
-    /// Returns the remaining fuel in the store.
+    /// Returns the fuel consumed by this store.
+    ///
+    /// For more information see [`Store::fuel_consumed`](crate::Store::fuel_consumed)
+    pub fn fuel_consumed(&self) -> Option<u64> {
+        self.store.fuel_consumed()
+    }
+
+    /// Inject more fuel into this store to be consumed when executing wasm code.
     ///
-    /// For more information see [`Store::get_fuel`](crate::Store::get_fuel)
-    pub fn get_fuel(&self) -> Result<u64> {
-        self.store.get_fuel()
+    /// For more information see [`Store::add_fuel`](crate::Store::add_fuel)
+    pub fn add_fuel(&mut self, fuel: u64) -> Result<()> {
+        self.store.add_fuel(fuel)
     }
 
-    /// Set the amount of fuel in this store to be consumed when executing wasm code.
+    /// Synthetically consumes fuel from the store.
     ///
-    /// For more information see [`Store::set_fuel`](crate::Store::set_fuel)
-    pub fn set_fuel(&mut self, fuel: u64) -> Result<()> {
-        self.store.set_fuel(fuel)
+    /// For more information see [`Store::consume_fuel`](crate::Store::consume_fuel)
+    pub fn consume_fuel(&mut self, fuel: u64) -> Result<u64> {
+        self.store.consume_fuel(fuel)
+    }
+
+    /// Configures this `Store` to trap whenever fuel runs out.
+    ///
+    /// For more information see
+    /// [`Store::out_of_fuel_trap`](crate::Store::out_of_fuel_trap)
+    pub fn out_of_fuel_trap(&mut self) {
+        self.store.out_of_fuel_trap()
     }
 
-    /// Configures this `Store` to yield while executing futures every N units of fuel.
+    /// Configures this `Store` to yield while executing futures whenever fuel
+    /// runs out.
     ///
     /// For more information see
-    /// [`Store::fuel_async_yield_interval`](crate::Store::fuel_async_yield_interval)
-    pub fn fuel_async_yield_interval(&mut self, interval: Option<u64>) -> Result<()> {
-        self.store.fuel_async_yield_interval(interval)
+    /// [`Store::out_of_fuel_async_yield`](crate::Store::out_of_fuel_async_yield)
+    pub fn out_of_fuel_async_yield(&mut self, injection_count: u64, fuel_to_inject: u64) {
+        self.store
+            .out_of_fuel_async_yield(injection_count, fuel_to_inject)
     }
 }
 
@@ -2382,47 +2354,3 @@ mod rooted {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{Instance, Module, Store};
-
-    #[test]
-    fn hash_key_is_stable_across_duplicate_store_data_entries() -> Result<()> {
-        let mut store = Store::<()>::default();
-        let module = Module::new(
-            store.engine(),
-            r#"
-                (module
-                    (func (export "f")
-                        nop
-                    )
-                )
-            "#,
-        )?;
-        let instance = Instance::new(&mut store, &module, &[])?;
-
-        // Each time we `get_func`, we call `Func::from_wasmtime` which adds a
-        // new entry to `StoreData`, so `f1` and `f2` will have different
-        // indices into `StoreData`.
-        let f1 = instance.get_func(&mut store, "f").unwrap();
-        let f2 = instance.get_func(&mut store, "f").unwrap();
-
-        // But their hash keys are the same.
-        assert!(
-            f1.hash_key(&mut store.as_context_mut().0)
-                == f2.hash_key(&mut store.as_context_mut().0)
-        );
-
-        // But the hash keys are different from different funcs.
-        let instance2 = Instance::new(&mut store, &module, &[])?;
-        let f3 = instance2.get_func(&mut store, "f").unwrap();
-        assert!(
-            f1.hash_key(&mut store.as_context_mut().0)
-                != f3.hash_key(&mut store.as_context_mut().0)
-        );
-
-        Ok(())
-    }
-}
diff --git a/crates/wasmtime/src/func/typed.rs b/crates/wasmtime/src/func/typed.rs
index f1188faad4aa..8229e14585b3 100644
--- a/crates/wasmtime/src/func/typed.rs
+++ b/crates/wasmtime/src/func/typed.rs
@@ -84,7 +84,7 @@ where
             !store.0.async_support(),
             "must use `call_async` with async stores"
         );
-        let func = self.func.vm_func_ref(store.0);
+        let func = self.func.caller_checked_func_ref(store.0);
         unsafe { Self::call_raw(&mut store, func, params) }
     }
 
@@ -122,7 +122,7 @@ where
         );
         store
             .on_fiber(|store| {
-                let func = self.func.vm_func_ref(store.0);
+                let func = self.func.caller_checked_func_ref(store.0);
                 unsafe { Self::call_raw(store, func, params) }
             })
             .await?
@@ -439,7 +439,7 @@ unsafe impl WasmTy for Option<Func> {
     #[inline]
     fn into_abi(self, store: &mut StoreOpaque) -> Self::Abi {
         if let Some(f) = self {
-            f.vm_func_ref(store).as_ptr()
+            f.caller_checked_func_ref(store).as_ptr()
         } else {
             ptr::null_mut()
         }
diff --git a/crates/wasmtime/src/instance.rs b/crates/wasmtime/src/instance.rs
index af070727af1b..1489903012ab 100644
--- a/crates/wasmtime/src/instance.rs
+++ b/crates/wasmtime/src/instance.rs
@@ -2,7 +2,7 @@ use crate::linker::{Definition, DefinitionType};
 use crate::store::{InstanceId, StoreOpaque, Stored};
 use crate::types::matching;
 use crate::{
-    AsContextMut, Engine, Export, Extern, Func, Global, Memory, Module, SharedMemory, StoreContext,
+    AsContextMut, Engine, Export, Extern, Func, Global, Memory, Module, SharedMemory,
     StoreContextMut, Table, TypedFunc,
 };
 use anyhow::{anyhow, bail, Context, Result};
@@ -42,15 +42,6 @@ pub(crate) struct InstanceData {
     exports: Vec<Option<Extern>>,
 }
 
-impl InstanceData {
-    pub fn from_id(id: InstanceId) -> InstanceData {
-        InstanceData {
-            id,
-            exports: vec![],
-        }
-    }
-}
-
 impl Instance {
     /// Creates a new [`Instance`] from the previously compiled [`Module`] and
     /// list of `imports` specified.
@@ -260,7 +251,7 @@ impl Instance {
 
         // Register the module just before instantiation to ensure we keep the module
         // properly referenced while in use by the store.
-        let module_id = store.modules_mut().register_module(module);
+        store.modules_mut().register_module(module);
         store.fill_func_refs();
 
         // The first thing we do is issue an instance allocation request
@@ -284,7 +275,6 @@ impl Instance {
                     host_state: Box::new(Instance(instance_to_be)),
                     store: StorePtr::new(store.traitobj()),
                     wmemcheck: store.engine().config().wmemcheck,
-                    pkey: store.get_pkey(),
                 })?;
 
         // The instance still has lots of setup, for example
@@ -299,7 +289,7 @@ impl Instance {
         // conflicts with the borrow on `store.engine`) but this doesn't
         // matter in practice since initialization isn't even running any
         // code here anyway.
-        let id = store.add_instance(instance_handle.clone(), module_id);
+        let id = store.add_instance(instance_handle.clone(), false);
 
         // Additionally, before we start doing fallible instantiation, we
         // do one more step which is to insert an `InstanceData`
@@ -340,6 +330,9 @@ impl Instance {
 
         Ok((instance, compiled_module.module().start_func))
     }
+    pub(crate) fn from_stored(stored: Stored<InstanceData>) -> Instance {
+        Instance(stored)
+    }
 
     pub(crate) fn from_wasmtime(handle: InstanceData, store: &mut StoreOpaque) -> Instance {
         Instance(store.store_data_mut().insert(handle))
@@ -364,16 +357,6 @@ impl Instance {
         Ok(())
     }
 
-    /// Get this instance's module.
-    pub fn module<'a, T: 'a>(&self, store: impl Into<StoreContext<'a, T>>) -> &'a Module {
-        self._module(store.into().0)
-    }
-
-    fn _module<'a>(&self, store: &'a StoreOpaque) -> &'a Module {
-        let InstanceData { id, .. } = store[self.0];
-        store.module_for_instance(id).unwrap()
-    }
-
     /// Returns the list of exported items from this [`Instance`].
     ///
     /// # Panics
@@ -547,46 +530,6 @@ impl Instance {
     pub(crate) fn id(&self, store: &StoreOpaque) -> InstanceId {
         store[self.0].id
     }
-
-    /// Get all globals within this instance.
-    ///
-    /// Returns both import and defined globals.
-    ///
-    /// Returns both exported and non-exported globals.
-    ///
-    /// Gives access to the full globals space.
-    pub(crate) fn all_globals<'a>(
-        &'a self,
-        store: &'a mut StoreOpaque,
-    ) -> impl ExactSizeIterator<Item = (GlobalIndex, Global)> + 'a {
-        let data = &store[self.0];
-        let instance = store.instance_mut(data.id);
-        instance
-            .all_globals()
-            .collect::<Vec<_>>()
-            .into_iter()
-            .map(|(i, g)| (i, unsafe { Global::from_wasmtime_global(g, store) }))
-    }
-
-    /// Get all memories within this instance.
-    ///
-    /// Returns both import and defined memories.
-    ///
-    /// Returns both exported and non-exported memories.
-    ///
-    /// Gives access to the full memories space.
-    pub(crate) fn all_memories<'a>(
-        &'a self,
-        store: &'a mut StoreOpaque,
-    ) -> impl ExactSizeIterator<Item = (MemoryIndex, Memory)> + 'a {
-        let data = &store[self.0];
-        let instance = store.instance_mut(data.id);
-        instance
-            .all_memories()
-            .collect::<Vec<_>>()
-            .into_iter()
-            .map(|(i, m)| (i, unsafe { Memory::from_wasmtime_memory(m, store) }))
-    }
 }
 
 pub(crate) struct OwnedImports {
diff --git a/crates/wasmtime/src/lib.rs b/crates/wasmtime/src/lib.rs
index 712d627a5561..1abfd28c0e04 100644
--- a/crates/wasmtime/src/lib.rs
+++ b/crates/wasmtime/src/lib.rs
@@ -288,23 +288,6 @@
 //!   run-time via [`Config::memory_init_cow`] (which is also enabled by
 //!   default).
 //!
-//! * `demangle` - Enabled by default, this will affect how backtraces are
-//!   printed and whether symbol names from WebAssembly are attempted to be
-//!   demangled. Rust and C++ demanglings are currently supported.
-//!
-//! * `coredump` - Enabled by default, this will provide support for generating
-//!   a core dump when a trap happens. This can be configured via
-//!   [`Config::coredump_on_trap`].
-//!
-//! * `addr2line` - Enabled by default, this feature configures whether traps
-//!   will attempt to parse DWARF debug information and convert WebAssembly
-//!   addresses to source filenames and line numbers.
-//!
-//! More crate features can be found in the [manifest] of Wasmtime itself for
-//! seeing what can be enabled and disabled.
-//!
-//! [manifest]: https://github.com/bytecodealliance/wasmtime/blob/main/crates/wasmtime/Cargo.toml
-//!
 //! ## Examples
 //!
 //! In addition to the examples below be sure to check out the [online embedding
@@ -412,6 +395,7 @@ mod compiler;
 
 mod code;
 mod config;
+mod coredump;
 mod engine;
 mod externals;
 mod instance;
@@ -419,7 +403,6 @@ mod limits;
 mod linker;
 mod memory;
 mod module;
-#[cfg(feature = "profiling")]
 mod profiling;
 mod r#ref;
 mod resources;
@@ -431,10 +414,8 @@ mod types;
 mod v128;
 mod values;
 
-#[cfg(feature = "async")]
-mod stack;
-
 pub use crate::config::*;
+pub use crate::coredump::*;
 pub use crate::engine::*;
 pub use crate::externals::*;
 pub use crate::func::*;
@@ -443,7 +424,6 @@ pub use crate::limits::*;
 pub use crate::linker::*;
 pub use crate::memory::*;
 pub use crate::module::Module;
-#[cfg(feature = "profiling")]
 pub use crate::profiling::GuestProfiler;
 pub use crate::r#ref::ExternRef;
 pub use crate::resources::*;
@@ -457,14 +437,6 @@ pub use crate::types::*;
 pub use crate::v128::V128;
 pub use crate::values::*;
 
-#[cfg(feature = "async")]
-pub use crate::stack::*;
-
-#[cfg(feature = "coredump")]
-mod coredump;
-#[cfg(feature = "coredump")]
-pub use crate::coredump::*;
-
 /// A convenience wrapper for `Result<T, anyhow::Error>`.
 ///
 /// This type can be used to interact with `wasmtimes`'s extensive use
@@ -476,7 +448,9 @@ pub use anyhow::{Error, Result};
 pub mod component;
 
 cfg_if::cfg_if! {
-    if #[cfg(unix)] {
+    if #[cfg(all(target_os = "macos", not(feature = "posix-signals-on-macos")))] {
+        // no extensions for macOS at this time
+    } else if #[cfg(unix)] {
         pub mod unix;
     } else if #[cfg(windows)] {
         pub mod windows;
diff --git a/crates/wasmtime/src/memory.rs b/crates/wasmtime/src/memory.rs
index 94cb354d4246..7548091005c9 100644
--- a/crates/wasmtime/src/memory.rs
+++ b/crates/wasmtime/src/memory.rs
@@ -9,7 +9,7 @@ use std::ops::Range;
 use std::slice;
 use std::time::Instant;
 use wasmtime_environ::MemoryPlan;
-use wasmtime_runtime::{RuntimeLinearMemory, VMMemoryImport};
+use wasmtime_runtime::{ExportMemory, RuntimeLinearMemory, VMMemoryImport};
 
 pub use wasmtime_runtime::WaitResult;
 
@@ -271,6 +271,10 @@ impl Memory {
         }
     }
 
+    pub(crate) fn from_stored(stored: Stored<ExportMemory>) -> Memory {
+        Memory(stored)
+    }
+
     /// Returns the underlying type of this memory.
     ///
     /// # Panics
@@ -577,15 +581,6 @@ impl Memory {
     pub(crate) fn comes_from_same_store(&self, store: &StoreOpaque) -> bool {
         store.store_data().contains(self.0)
     }
-
-    /// Get a stable hash key for this memory.
-    ///
-    /// Even if the same underlying memory definition is added to the
-    /// `StoreData` multiple times and becomes multiple `wasmtime::Memory`s,
-    /// this hash key will be consistent across all of these memories.
-    pub(crate) fn hash_key(&self, store: &StoreOpaque) -> impl std::hash::Hash + Eq {
-        store[self.0].definition as usize
-    }
 }
 
 /// A linear memory. This trait provides an interface for raw memory buffers
@@ -956,41 +951,4 @@ mod tests {
             other => panic!("unexpected style {:?}", other),
         }
     }
-
-    #[test]
-    fn hash_key_is_stable_across_duplicate_store_data_entries() -> Result<()> {
-        let mut store = Store::<()>::default();
-        let module = Module::new(
-            store.engine(),
-            r#"
-                (module
-                    (memory (export "m") 1 1)
-                )
-            "#,
-        )?;
-        let instance = Instance::new(&mut store, &module, &[])?;
-
-        // Each time we `get_memory`, we call `Memory::from_wasmtime` which adds
-        // a new entry to `StoreData`, so `g1` and `g2` will have different
-        // indices into `StoreData`.
-        let m1 = instance.get_memory(&mut store, "m").unwrap();
-        let m2 = instance.get_memory(&mut store, "m").unwrap();
-
-        // That said, they really point to the same memory.
-        assert_eq!(m1.data(&store)[0], 0);
-        assert_eq!(m2.data(&store)[0], 0);
-        m1.data_mut(&mut store)[0] = 42;
-        assert_eq!(m1.data(&mut store)[0], 42);
-        assert_eq!(m2.data(&mut store)[0], 42);
-
-        // And therefore their hash keys are the same.
-        assert!(m1.hash_key(&store.as_context().0) == m2.hash_key(&store.as_context().0));
-
-        // But the hash keys are different from different memories.
-        let instance2 = Instance::new(&mut store, &module, &[])?;
-        let m3 = instance2.get_memory(&mut store, "m").unwrap();
-        assert!(m1.hash_key(&store.as_context().0) != m3.hash_key(&store.as_context().0));
-
-        Ok(())
-    }
 }
diff --git a/crates/wasmtime/src/module.rs b/crates/wasmtime/src/module.rs
index 38a51fcd7ea0..3e812cfc8543 100644
--- a/crates/wasmtime/src/module.rs
+++ b/crates/wasmtime/src/module.rs
@@ -26,9 +26,7 @@ use wasmtime_runtime::{
 
 mod registry;
 
-pub use registry::{
-    is_wasm_trap_pc, register_code, unregister_code, ModuleRegistry, RegisteredModuleId,
-};
+pub use registry::{is_wasm_trap_pc, register_code, unregister_code, ModuleRegistry};
 
 /// A compiled WebAssembly module, ready to be instantiated.
 ///
@@ -132,14 +130,6 @@ struct ModuleInner {
     offsets: VMOffsets<HostPtr>,
 }
 
-impl std::fmt::Debug for Module {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Module")
-            .field("name", &self.name())
-            .finish_non_exhaustive()
-    }
-}
-
 impl Module {
     /// Creates a new WebAssembly `Module` from the given in-memory `bytes`.
     ///
@@ -1104,10 +1094,6 @@ impl Module {
             (loc.start as usize, loc.length as usize)
         })
     }
-
-    pub(crate) fn id(&self) -> CompiledModuleId {
-        self.inner.module.unique_id()
-    }
 }
 
 impl ModuleInner {
diff --git a/crates/wasmtime/src/module/registry.rs b/crates/wasmtime/src/module/registry.rs
index 65de4bf22536..46fb18262be9 100644
--- a/crates/wasmtime/src/module/registry.rs
+++ b/crates/wasmtime/src/module/registry.rs
@@ -44,33 +44,10 @@ struct LoadedCode {
     modules: BTreeMap<usize, Module>,
 }
 
-/// An identifier of a module that has previously been inserted into a
-/// `ModuleRegistry`.
-#[derive(Clone, Copy)]
-pub enum RegisteredModuleId {
-    /// Index into `ModuleRegistry::modules_without_code`.
-    WithoutCode(usize),
-    /// Start address of the module's code so that we can get it again via
-    /// `ModuleRegistry::lookup_module`.
-    LoadedCode(usize),
-}
-
 impl ModuleRegistry {
-    /// Get a previously-registered module by id.
-    pub fn lookup_module_by_id(&self, id: RegisteredModuleId) -> Option<&Module> {
-        match id {
-            RegisteredModuleId::WithoutCode(idx) => self.modules_without_code.get(idx),
-            RegisteredModuleId::LoadedCode(pc) => {
-                let (module, _) = self.module_and_offset(pc)?;
-                Some(module)
-            }
-        }
-    }
-
     /// Fetches information about a registered module given a program counter value.
-    pub fn lookup_module_info(&self, pc: usize) -> Option<&dyn ModuleInfo> {
-        let (module, _) = self.module_and_offset(pc)?;
-        Some(module.module_info())
+    pub fn lookup_module(&self, pc: usize) -> Option<&dyn ModuleInfo> {
+        self.module(pc).map(|(m, _)| m.module_info())
     }
 
     fn code(&self, pc: usize) -> Option<(&LoadedCode, usize)> {
@@ -81,7 +58,7 @@ impl ModuleRegistry {
         Some((code, pc - *start))
     }
 
-    fn module_and_offset(&self, pc: usize) -> Option<(&Module, usize)> {
+    fn module(&self, pc: usize) -> Option<(&Module, usize)> {
         let (code, offset) = self.code(pc)?;
         Some((code.module(pc)?, offset))
     }
@@ -95,21 +72,17 @@ impl ModuleRegistry {
     }
 
     /// Registers a new module with the registry.
-    pub fn register_module(&mut self, module: &Module) -> RegisteredModuleId {
-        self.register(module.code_object(), Some(module)).unwrap()
+    pub fn register_module(&mut self, module: &Module) {
+        self.register(module.code_object(), Some(module))
     }
 
     #[cfg(feature = "component-model")]
     pub fn register_component(&mut self, component: &Component) {
-        self.register(component.code_object(), None);
+        self.register(component.code_object(), None)
     }
 
     /// Registers a new module with the registry.
-    fn register(
-        &mut self,
-        code: &Arc<CodeObject>,
-        module: Option<&Module>,
-    ) -> Option<RegisteredModuleId> {
+    fn register(&mut self, code: &Arc<CodeObject>, module: Option<&Module>) {
         let text = code.code_memory().text();
 
         // If there's not actually any functions in this module then we may
@@ -119,18 +92,14 @@ impl ModuleRegistry {
         // module in the future. For that reason we continue to register empty
         // modules and retain them.
         if text.is_empty() {
-            return module.map(|module| {
-                let id = RegisteredModuleId::WithoutCode(self.modules_without_code.len());
-                self.modules_without_code.push(module.clone());
-                id
-            });
+            self.modules_without_code.extend(module.cloned());
+            return;
         }
 
         // The module code range is exclusive for end, so make it inclusive as
         // it may be a valid PC value
         let start_addr = text.as_ptr() as usize;
         let end_addr = start_addr + text.len() - 1;
-        let id = module.map(|_| RegisteredModuleId::LoadedCode(start_addr));
 
         // If this module is already present in the registry then that means
         // it's either an overlapping image, for example for two modules
@@ -141,7 +110,7 @@ impl ModuleRegistry {
             if let Some(module) = module {
                 prev.push_module(module);
             }
-            return id;
+            return;
         }
 
         // Assert that this module's code doesn't collide with any other
@@ -162,7 +131,6 @@ impl ModuleRegistry {
         }
         let prev = self.loaded_code.insert(end_addr, (start_addr, item));
         assert!(prev.is_none());
-        id
     }
 
     /// Fetches trap information about a program counter in a backtrace.
@@ -180,8 +148,8 @@ impl ModuleRegistry {
     /// boolean indicates whether the engine used to compile this module is
     /// using environment variables to control debuginfo parsing.
     pub(crate) fn lookup_frame_info(&self, pc: usize) -> Option<(FrameInfo, &Module)> {
-        let (module, offset) = self.module_and_offset(pc)?;
-        let info = FrameInfo::new(module.clone(), offset)?;
+        let (module, offset) = self.module(pc)?;
+        let info = FrameInfo::new(module, offset)?;
         Some((info, module))
     }
 
diff --git a/crates/wasmtime/src/signatures.rs b/crates/wasmtime/src/signatures.rs
index 6ce6b0150423..e34de4638842 100644
--- a/crates/wasmtime/src/signatures.rs
+++ b/crates/wasmtime/src/signatures.rs
@@ -45,7 +45,6 @@ impl SignatureCollection {
     }
 
     /// Gets the shared signature index given a module signature index.
-    #[inline]
     pub fn shared_signature(&self, index: SignatureIndex) -> Option<VMSharedSignatureIndex> {
         self.signatures.get(index).copied()
     }
diff --git a/crates/wasmtime/src/stack.rs b/crates/wasmtime/src/stack.rs
deleted file mode 100644
index fde7dd7568d2..000000000000
--- a/crates/wasmtime/src/stack.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use std::{ops::Range, sync::Arc};
-
-use anyhow::Error;
-use wasmtime_fiber::{RuntimeFiberStack, RuntimeFiberStackCreator};
-
-/// A stack creator. Can be used to provide a stack creator to wasmtime
-/// which supplies stacks for async support.
-///
-/// # Safety
-///
-/// This trait is unsafe, as memory safety depends on a proper implementation
-/// of memory management. Stacks created by the StackCreator should always be
-/// treated as owned by an wasmtime instance, and any modification of them
-/// outside of wasmtime invoked routines is unsafe and may lead to corruption.
-///
-/// Note that this is a relatively new and experimental feature and it is
-/// recommended to be familiar with wasmtime runtime code to use it.
-pub unsafe trait StackCreator: Send + Sync {
-    /// Create a new `StackMemory` object with the specified size.
-    ///
-    /// The `size` parameter is the expected size of the stack without any guard pages.
-    ///
-    /// Note there should be at least one guard page of protected memory at the bottom
-    /// of the stack to catch potential stack overflow scenarios. Additionally, stacks should be
-    /// page aligned.
-    fn new_stack(&self, size: usize) -> Result<Box<dyn StackMemory>, Error>;
-}
-
-#[derive(Clone)]
-pub(crate) struct StackCreatorProxy(pub Arc<dyn StackCreator>);
-
-unsafe impl RuntimeFiberStackCreator for StackCreatorProxy {
-    fn new_stack(&self, size: usize) -> Result<Box<dyn RuntimeFiberStack>, Error> {
-        let stack = self.0.new_stack(size)?;
-        Ok(Box::new(FiberStackProxy(stack)) as Box<dyn RuntimeFiberStack>)
-    }
-}
-
-/// A stack memory. This trait provides an interface for raw memory buffers
-/// which are used by wasmtime inside of stacks which wasmtime executes
-/// WebAssembly in for async support. By implementing this trait together
-/// with StackCreator, one can supply wasmtime with custom allocated host
-/// managed stacks.
-///
-/// # Safety
-///
-/// The memory should be page aligned and a multiple of page size.
-/// To prevent possible silent overflows, the memory should be protected by a
-/// guard page. Additionally the safety concerns explained in ['Memory'], for
-/// accessing the memory apply here as well.
-///
-/// Note that this is a relatively new and experimental feature and it is
-/// recommended to be familiar with wasmtime runtime code to use it.
-pub unsafe trait StackMemory: Send + Sync {
-    /// The top of the allocated stack.
-    ///
-    /// This address should be page aligned.
-    fn top(&self) -> *mut u8;
-    /// The range of where this stack resides in memory, excluding guard pages.
-    fn range(&self) -> Range<usize>;
-}
-
-pub(crate) struct FiberStackProxy(pub Box<dyn StackMemory>);
-
-unsafe impl RuntimeFiberStack for FiberStackProxy {
-    fn top(&self) -> *mut u8 {
-        self.0.top()
-    }
-
-    fn range(&self) -> Range<usize> {
-        self.0.range()
-    }
-}
diff --git a/crates/wasmtime/src/store.rs b/crates/wasmtime/src/store.rs
index edc6d2107644..0f78c579c7d1 100644
--- a/crates/wasmtime/src/store.rs
+++ b/crates/wasmtime/src/store.rs
@@ -78,17 +78,17 @@
 
 use crate::instance::InstanceData;
 use crate::linker::Definition;
-use crate::module::{BareModuleInfo, RegisteredModuleId};
+use crate::module::BareModuleInfo;
 use crate::trampoline::VMHostGlobalContext;
 use crate::{module::ModuleRegistry, Engine, Module, Trap, Val, ValRaw};
 use crate::{Global, Instance, Memory};
 use anyhow::{anyhow, bail, Result};
 use std::cell::UnsafeCell;
+use std::convert::TryFrom;
 use std::fmt;
 use std::future::Future;
 use std::marker;
 use std::mem::{self, ManuallyDrop};
-use std::num::NonZeroU64;
 use std::ops::{Deref, DerefMut};
 use std::pin::Pin;
 use std::ptr;
@@ -96,7 +96,7 @@ use std::sync::atomic::AtomicU64;
 use std::sync::Arc;
 use std::task::{Context, Poll};
 use wasmtime_runtime::{
-    mpk::ProtectionKey, ExportGlobal, InstanceAllocationRequest, InstanceAllocator, InstanceHandle,
+    ExportGlobal, ExportMemory, InstanceAllocationRequest, InstanceAllocator, InstanceHandle,
     ModuleInfo, OnDemandInstanceAllocator, SignalHandler, StoreBox, StorePtr, VMContext,
     VMExternRef, VMExternRefActivationsTable, VMFuncRef, VMRuntimeLimits, WasmFault,
 };
@@ -306,14 +306,12 @@ pub struct StoreOpaque {
     memory_limit: usize,
     table_count: usize,
     table_limit: usize,
+    /// An adjustment to add to the fuel consumed value in `runtime_limits` above
+    /// to get the true amount of fuel consumed.
+    fuel_adj: i64,
     #[cfg(feature = "async")]
     async_state: AsyncState,
-    // If fuel_yield_interval is enabled, then we store the remaining fuel (that isn't in
-    // runtime_limits) here. The total amount of fuel is the runtime limits and reserve added
-    // together. Then when we run out of gas, we inject the yield amount from the reserve
-    // until the reserve is empty.
-    fuel_reserve: u64,
-    fuel_yield_interval: Option<NonZeroU64>,
+    out_of_gas_behavior: OutOfGas,
     /// Indexed data within this `Store`, used to store information about
     /// globals, functions, memories, etc.
     ///
@@ -345,11 +343,6 @@ pub struct StoreOpaque {
     /// `store_data` above, where the function pointers are stored.
     rooted_host_funcs: ManuallyDrop<Vec<Arc<[Definition]>>>,
 
-    /// Keep track of what protection key is being used during allocation so
-    /// that the right memory pages can be enabled when entering WebAssembly
-    /// guest code.
-    pkey: Option<ProtectionKey>,
-
     /// Runtime state for components used in the handling of resources, borrow,
     /// and calls. These also interact with the `ResourceAny` type and its
     /// internal representation.
@@ -440,24 +433,17 @@ where
 /// instance allocator.
 struct StoreInstance {
     handle: InstanceHandle,
-    kind: StoreInstanceKind,
+    // Stores whether or not to use the on-demand allocator to deallocate the instance
+    ondemand: bool,
 }
 
-enum StoreInstanceKind {
-    /// An actual, non-dummy instance.
-    Real {
-        /// The id of this instance's module inside our owning store's
-        /// `ModuleRegistry`.
-        module_id: RegisteredModuleId,
+#[derive(Copy, Clone)]
+enum OutOfGas {
+    Trap,
+    InjectFuel {
+        injection_count: u64,
+        fuel_to_inject: u64,
     },
-
-    /// This is a dummy instance that is just an implementation detail for
-    /// something else. For example, host-created memories internally create a
-    /// dummy instance.
-    ///
-    /// Regardless of the configured instance allocator for the engine, dummy
-    /// instances always use the on-demand allocator to deallocate the instance.
-    Dummy,
 }
 
 impl<T> Store<T> {
@@ -471,7 +457,6 @@ impl<T> Store<T> {
     /// tables created to 10,000. This can be overridden with the
     /// [`Store::limiter`] configuration method.
     pub fn new(engine: &Engine, data: T) -> Self {
-        let pkey = engine.allocator().next_available_pkey();
         let mut inner = Box::new(StoreInner {
             inner: StoreOpaque {
                 _marker: marker::PhantomPinned,
@@ -491,19 +476,18 @@ impl<T> Store<T> {
                 memory_limit: crate::DEFAULT_MEMORY_LIMIT,
                 table_count: 0,
                 table_limit: crate::DEFAULT_TABLE_LIMIT,
+                fuel_adj: 0,
                 #[cfg(feature = "async")]
                 async_state: AsyncState {
                     current_suspend: UnsafeCell::new(ptr::null()),
                     current_poll_cx: UnsafeCell::new(ptr::null_mut()),
                 },
-                fuel_reserve: 0,
-                fuel_yield_interval: None,
+                out_of_gas_behavior: OutOfGas::Trap,
                 store_data: ManuallyDrop::new(StoreData::new()),
                 default_caller: InstanceHandle::null(),
                 hostcall_val_storage: Vec::new(),
                 wasm_val_raw_storage: Vec::new(),
                 rooted_host_funcs: ManuallyDrop::new(Vec::new()),
-                pkey,
                 #[cfg(feature = "component-model")]
                 component_host_table: Default::default(),
                 #[cfg(feature = "component-model")]
@@ -537,7 +521,6 @@ impl<T> Store<T> {
                         store: StorePtr::empty(),
                         runtime_info: &shim,
                         wmemcheck: engine.config().wmemcheck,
-                        pkey: None,
                     })
                     .expect("failed to allocate default callee")
             };
@@ -780,17 +763,27 @@ impl<T> Store<T> {
         self.inner.gc()
     }
 
-    /// Returns the amount fuel in this [`Store`].
+    /// Returns the amount of fuel consumed by this store's execution so far.
+    ///
+    /// If fuel consumption is not enabled via
+    /// [`Config::consume_fuel`](crate::Config::consume_fuel) then this
+    /// function will return `None`. Also note that fuel, if enabled, must be
+    /// originally configured via [`Store::add_fuel`].
+    pub fn fuel_consumed(&self) -> Option<u64> {
+        self.inner.fuel_consumed()
+    }
+
+    /// Returns remaining fuel in this [`Store`].
     ///
     /// If fuel consumption is not enabled via
     /// [`Config::consume_fuel`](crate::Config::consume_fuel) then this
     /// function will return `None`. Also note that fuel, if enabled, must be
-    /// originally configured via [`Store::set_fuel`].
-    pub fn get_fuel(&self) -> Result<u64> {
-        self.inner.get_fuel()
+    /// originally configured via [`Store::add_fuel`].
+    pub fn fuel_remaining(&mut self) -> Option<u64> {
+        self.inner.fuel_remaining()
     }
 
-    /// Set the fuel to this [`Store`] for wasm to consume while executing.
+    /// Adds fuel to this [`Store`] for wasm to consume while executing.
     ///
     /// For this method to work fuel consumption must be enabled via
     /// [`Config::consume_fuel`](crate::Config::consume_fuel). By default a
@@ -803,14 +796,52 @@ impl<T> Store<T> {
     /// units, as any execution cost associated with them involves other
     /// instructions which do consume fuel.
     ///
-    /// Note that when fuel is entirely consumed it will cause wasm to trap.
+    /// Note that at this time when fuel is entirely consumed it will cause
+    /// wasm to trap. More usages of fuel are planned for the future.
     ///
     /// # Errors
     ///
     /// This function will return an error if fuel consumption is not enabled via
     /// [`Config::consume_fuel`](crate::Config::consume_fuel).
-    pub fn set_fuel(&mut self, fuel: u64) -> Result<()> {
-        self.inner.set_fuel(fuel)
+    pub fn add_fuel(&mut self, fuel: u64) -> Result<()> {
+        self.inner.add_fuel(fuel)
+    }
+
+    /// Synthetically consumes fuel from this [`Store`].
+    ///
+    /// For this method to work fuel consumption must be enabled via
+    /// [`Config::consume_fuel`](crate::Config::consume_fuel).
+    ///
+    /// WebAssembly execution will automatically consume fuel but if so desired
+    /// the embedder can also consume fuel manually to account for relative
+    /// costs of host functions, for example.
+    ///
+    /// This function will attempt to consume `fuel` units of fuel from within
+    /// this store. If the remaining amount of fuel allows this then `Ok(N)` is
+    /// returned where `N` is the amount of remaining fuel. Otherwise an error
+    /// is returned and no fuel is consumed.
+    ///
+    /// # Errors
+    ///
+    /// This function will return an error either if fuel consumption is not
+    /// enabled via [`Config::consume_fuel`](crate::Config::consume_fuel) or if
+    /// `fuel` exceeds the amount of remaining fuel within this store.
+    pub fn consume_fuel(&mut self, fuel: u64) -> Result<u64> {
+        self.inner.consume_fuel(fuel)
+    }
+
+    /// Configures a [`Store`] to generate a [`Trap`] whenever it runs out of
+    /// fuel.
+    ///
+    /// When a [`Store`] is configured to consume fuel with
+    /// [`Config::consume_fuel`](crate::Config::consume_fuel) this method will
+    /// configure what happens when fuel runs out. Specifically a WebAssembly
+    /// trap will be raised and the current execution of WebAssembly will be
+    /// aborted.
+    ///
+    /// This is the default behavior for running out of fuel.
+    pub fn out_of_fuel_trap(&mut self) {
+        self.inner.out_of_fuel_trap()
     }
 
     /// Configures a [`Store`] to yield execution of async WebAssembly code
@@ -818,10 +849,11 @@ impl<T> Store<T> {
     ///
     /// When a [`Store`] is configured to consume fuel with
     /// [`Config::consume_fuel`](crate::Config::consume_fuel) this method will
-    /// configure WebAssembly to be suspended and control will be yielded back to the
-    /// caller every `interval` units of fuel consumed. This is only suitable with use of
-    /// a store associated with an [async config](crate::Config::async_support) because
-    /// only then are futures used and yields are possible.
+    /// configure what happens when fuel runs out. Specifically executing
+    /// WebAssembly will be suspended and control will be yielded back to the
+    /// caller. This is only suitable with use of a store associated with an [async
+    /// config](crate::Config::async_support) because only then are futures used and yields
+    /// are possible.
     ///
     /// The purpose of this behavior is to ensure that futures which represent
     /// execution of WebAssembly do not execute too long inside their
@@ -834,15 +866,21 @@ impl<T> Store<T> {
     /// WebAssembly will continue to execute, just after giving the host an
     /// opportunity to do something else.
     ///
-    /// The `interval` parameter indicates how much fuel should be
-    /// consumed between yields of an async future. When fuel runs out wasm will trap.
+    /// The `fuel_to_inject` parameter indicates how much fuel should be
+    /// automatically re-injected after fuel runs out. This is how much fuel
+    /// will be consumed between yields of an async future.
     ///
-    /// # Error
+    /// The `injection_count` parameter indicates how many times this fuel will
+    /// be injected. Multiplying the two parameters is the total amount of fuel
+    /// this store is allowed before wasm traps.
     ///
-    /// This method will error if it is not called on a store associated with an [async
+    /// # Panics
+    ///
+    /// This method will panic if it is not called on a store associated with an [async
     /// config](crate::Config::async_support).
-    pub fn fuel_async_yield_interval(&mut self, interval: Option<u64>) -> Result<()> {
-        self.inner.fuel_async_yield_interval(interval)
+    pub fn out_of_fuel_async_yield(&mut self, injection_count: u64, fuel_to_inject: u64) {
+        self.inner
+            .out_of_fuel_async_yield(injection_count, fuel_to_inject)
     }
 
     /// Sets the epoch deadline to a certain number of ticks in the future.
@@ -986,11 +1024,18 @@ impl<'a, T> StoreContext<'a, T> {
         self.0.data()
     }
 
-    /// Returns the remaining fuel in this store.
+    /// Returns the fuel consumed by this store.
     ///
-    /// For more information see [`Store::get_fuel`].
-    pub fn get_fuel(&self) -> Result<u64> {
-        self.0.get_fuel()
+    /// For more information see [`Store::fuel_consumed`].
+    pub fn fuel_consumed(&self) -> Option<u64> {
+        self.0.fuel_consumed()
+    }
+
+    /// Returns remaining fuel in this store.
+    ///
+    /// For more information see [`Store::fuel_remaining`]
+    pub fn fuel_remaining(&mut self) -> Option<u64> {
+        self.0.fuel_remaining()
     }
 }
 
@@ -1021,25 +1066,48 @@ impl<'a, T> StoreContextMut<'a, T> {
         self.0.gc()
     }
 
+    /// Returns the fuel consumed by this store.
+    ///
+    /// For more information see [`Store::fuel_consumed`].
+    pub fn fuel_consumed(&self) -> Option<u64> {
+        self.0.fuel_consumed()
+    }
+
     /// Returns remaining fuel in this store.
     ///
-    /// For more information see [`Store::get_fuel`]
-    pub fn get_fuel(&self) -> Result<u64> {
-        self.0.get_fuel()
+    /// For more information see [`Store::fuel_remaining`]
+    pub fn fuel_remaining(&self) -> Option<u64> {
+        self.0.fuel_remaining()
+    }
+
+    /// Inject more fuel into this store to be consumed when executing wasm code.
+    ///
+    /// For more information see [`Store::add_fuel`]
+    pub fn add_fuel(&mut self, fuel: u64) -> Result<()> {
+        self.0.add_fuel(fuel)
     }
 
-    /// Set the amount of fuel in this store.
+    /// Synthetically consume fuel from this store.
     ///
-    /// For more information see [`Store::set_fuel`]
-    pub fn set_fuel(&mut self, fuel: u64) -> Result<()> {
-        self.0.set_fuel(fuel)
+    /// For more information see [`Store::consume_fuel`]
+    pub fn consume_fuel(&mut self, fuel: u64) -> Result<u64> {
+        self.0.consume_fuel(fuel)
     }
 
-    /// Configures this `Store` to periodically yield while executing futures.
+    /// Configures this `Store` to trap whenever fuel runs out.
     ///
-    /// For more information see [`Store::fuel_async_yield_interval`]
-    pub fn fuel_async_yield_interval(&mut self, interval: Option<u64>) -> Result<()> {
-        self.0.fuel_async_yield_interval(interval)
+    /// For more information see [`Store::out_of_fuel_trap`]
+    pub fn out_of_fuel_trap(&mut self) {
+        self.0.out_of_fuel_trap()
+    }
+
+    /// Configures this `Store` to yield while executing futures whenever fuel
+    /// runs out.
+    ///
+    /// For more information see [`Store::out_of_fuel_async_yield`]
+    pub fn out_of_fuel_async_yield(&mut self, injection_count: u64, fuel_to_inject: u64) {
+        self.0
+            .out_of_fuel_async_yield(injection_count, fuel_to_inject)
     }
 
     /// Sets the epoch deadline to a certain number of ticks in the future.
@@ -1080,16 +1148,6 @@ impl<T> StoreInner<T> {
     }
 
     pub fn call_hook(&mut self, s: CallHook) -> Result<()> {
-        if let Some(pkey) = &self.inner.pkey {
-            let allocator = self.engine().allocator();
-            match s {
-                CallHook::CallingWasm | CallHook::ReturningFromHost => {
-                    allocator.restrict_to_pkey(*pkey)
-                }
-                CallHook::ReturningFromWasm | CallHook::CallingHost => allocator.allow_all_pkeys(),
-            }
-        }
-
         match &mut self.call_hook {
             Some(CallHookInner::Sync(hook)) => hook(&mut self.data, s),
 
@@ -1107,45 +1165,6 @@ impl<T> StoreInner<T> {
     }
 }
 
-fn get_fuel(injected_fuel: i64, fuel_reserve: u64) -> u64 {
-    fuel_reserve.saturating_add_signed(-injected_fuel)
-}
-
-// Add remaining fuel from the reserve into the active fuel if there is any left.
-fn refuel(
-    injected_fuel: &mut i64,
-    fuel_reserve: &mut u64,
-    yield_interval: Option<NonZeroU64>,
-) -> bool {
-    let fuel = get_fuel(*injected_fuel, *fuel_reserve);
-    if fuel > 0 {
-        set_fuel(injected_fuel, fuel_reserve, yield_interval, fuel);
-        true
-    } else {
-        false
-    }
-}
-
-fn set_fuel(
-    injected_fuel: &mut i64,
-    fuel_reserve: &mut u64,
-    yield_interval: Option<NonZeroU64>,
-    new_fuel_amount: u64,
-) {
-    let interval = yield_interval.unwrap_or(NonZeroU64::MAX).get();
-    // If we're yielding periodically we only store the "active" amount of fuel into consumed_ptr
-    // for the VM to use.
-    let injected = std::cmp::min(interval, new_fuel_amount);
-    // Fuel in the VM is stored as an i64, so we have to cap the amount of fuel we inject into the
-    // VM at once to be i64 range.
-    let injected = std::cmp::min(injected, i64::MAX as u64);
-    // Add whatever is left over after injection to the reserve for later use.
-    *fuel_reserve = new_fuel_amount - injected;
-    // Within the VM we increment to count fuel, so inject a negative amount. The VM will halt when
-    // this counter is positive.
-    *injected_fuel = -(injected as i64);
-}
-
 #[doc(hidden)]
 impl StoreOpaque {
     pub fn id(&self) -> StoreId {
@@ -1228,40 +1247,10 @@ impl StoreOpaque {
         &mut self.host_globals
     }
 
-    pub fn module_for_instance(&self, instance: InstanceId) -> Option<&'_ Module> {
-        match self.instances[instance.0].kind {
-            StoreInstanceKind::Dummy => None,
-            StoreInstanceKind::Real { module_id } => {
-                let module = self
-                    .modules()
-                    .lookup_module_by_id(module_id)
-                    .expect("should always have a registered module for real instances");
-                Some(module)
-            }
-        }
-    }
-
-    pub unsafe fn add_instance(
-        &mut self,
-        handle: InstanceHandle,
-        module_id: RegisteredModuleId,
-    ) -> InstanceId {
-        self.instances.push(StoreInstance {
-            handle: handle.clone(),
-            kind: StoreInstanceKind::Real { module_id },
-        });
-        InstanceId(self.instances.len() - 1)
-    }
-
-    /// Add a dummy instance that to the store.
-    ///
-    /// These are instances that are just implementation details of something
-    /// else (e.g. host-created memories that are not actually defined in any
-    /// Wasm module) and therefore shouldn't show up in things like core dumps.
-    pub unsafe fn add_dummy_instance(&mut self, handle: InstanceHandle) -> InstanceId {
+    pub unsafe fn add_instance(&mut self, handle: InstanceHandle, ondemand: bool) -> InstanceId {
         self.instances.push(StoreInstance {
             handle: handle.clone(),
-            kind: StoreInstanceKind::Dummy,
+            ondemand,
         });
         InstanceId(self.instances.len() - 1)
     }
@@ -1274,65 +1263,22 @@ impl StoreOpaque {
         &mut self.instances[id.0].handle
     }
 
-    /// Get all instances (ignoring dummy instances) within this store.
-    pub fn all_instances<'a>(&'a mut self) -> impl ExactSizeIterator<Item = Instance> + 'a {
-        let instances = self
-            .instances
-            .iter()
-            .enumerate()
-            .filter_map(|(idx, inst)| {
-                let id = InstanceId::from_index(idx);
-                if let StoreInstanceKind::Dummy = inst.kind {
-                    None
-                } else {
-                    Some(InstanceData::from_id(id))
-                }
-            })
-            .collect::<Vec<_>>();
-        instances
-            .into_iter()
-            .map(|i| Instance::from_wasmtime(i, self))
-    }
-
-    /// Get all memories (host- or Wasm-defined) within this store.
-    pub fn all_memories<'a>(&'a mut self) -> impl Iterator<Item = Memory> + 'a {
-        // NB: Host-created memories have dummy instances. Therefore, we can get
-        // all memories in the store by iterating over all instances (including
-        // dummy instances) and getting each of their defined memories.
-        let mems = self
-            .instances
-            .iter_mut()
-            .flat_map(|instance| instance.handle.defined_memories())
-            .collect::<Vec<_>>();
-        mems.into_iter()
-            .map(|memory| unsafe { Memory::from_wasmtime_memory(memory, self) })
-    }
-
-    /// Iterate over all globals (host- or Wasm-defined) within this store.
-    pub fn all_globals<'a>(&'a mut self) -> impl Iterator<Item = Global> + 'a {
-        unsafe {
-            // First gather all the host-created globals.
-            let mut globals = self
-                .host_globals()
-                .iter()
-                .map(|global| ExportGlobal {
-                    definition: &mut (*global.get()).global as *mut _,
-                    global: (*global.get()).ty.to_wasm_type(),
-                })
-                .collect::<Vec<_>>();
-
-            // Then iterate over all instances and yield each of their defined
-            // globals.
-            globals.extend(
-                self.instances.iter_mut().flat_map(|instance| {
-                    instance.handle.defined_globals().map(|(_i, global)| global)
-                }),
-            );
-
-            globals
-                .into_iter()
-                .map(|g| Global::from_wasmtime_global(g, self))
-        }
+    pub fn all_instances(&self) -> impl ExactSizeIterator<Item = Instance> {
+        self.store_data()
+            .iter::<InstanceData>()
+            .map(Instance::from_stored)
+    }
+
+    pub fn all_memories(&self) -> impl ExactSizeIterator<Item = Memory> {
+        self.store_data()
+            .iter::<ExportMemory>()
+            .map(Memory::from_stored)
+    }
+
+    pub fn all_globals(&self) -> impl ExactSizeIterator<Item = Global> {
+        self.store_data()
+            .iter::<ExportGlobal>()
+            .map(Global::from_stored)
     }
 
     #[cfg_attr(not(target_os = "linux"), allow(dead_code))] // not used on all platforms
@@ -1387,55 +1333,35 @@ impl StoreOpaque {
         })
     }
 
-    pub fn get_fuel(&self) -> Result<u64> {
-        anyhow::ensure!(
-            self.engine().config().tunables.consume_fuel,
-            "fuel is not configured in this store"
-        );
-        let injected_fuel = unsafe { *self.runtime_limits.fuel_consumed.get() };
-        Ok(get_fuel(injected_fuel, self.fuel_reserve))
+    pub fn fuel_consumed(&self) -> Option<u64> {
+        if !self.engine.config().tunables.consume_fuel {
+            return None;
+        }
+        let consumed = unsafe { *self.runtime_limits.fuel_consumed.get() };
+        Some(u64::try_from(self.fuel_adj + consumed).unwrap())
     }
 
-    fn refuel(&mut self) -> bool {
-        let injected_fuel = unsafe { &mut *self.runtime_limits.fuel_consumed.get() };
-        refuel(
-            injected_fuel,
-            &mut self.fuel_reserve,
-            self.fuel_yield_interval,
-        )
+    fn fuel_remaining(&self) -> Option<u64> {
+        if !self.engine.config().tunables.consume_fuel {
+            return None;
+        }
+        let consumed = unsafe { *self.runtime_limits.fuel_consumed.get() };
+        Some(u64::try_from(-consumed).unwrap())
     }
 
-    pub fn set_fuel(&mut self, fuel: u64) -> Result<()> {
-        anyhow::ensure!(
-            self.engine().config().tunables.consume_fuel,
-            "fuel is not configured in this store"
-        );
-        let injected_fuel = unsafe { &mut *self.runtime_limits.fuel_consumed.get() };
-        set_fuel(
-            injected_fuel,
-            &mut self.fuel_reserve,
-            self.fuel_yield_interval,
-            fuel,
-        );
-        Ok(())
+    fn out_of_fuel_trap(&mut self) {
+        self.out_of_gas_behavior = OutOfGas::Trap;
     }
 
-    pub fn fuel_async_yield_interval(&mut self, interval: Option<u64>) -> Result<()> {
-        anyhow::ensure!(
-            self.engine().config().tunables.consume_fuel,
-            "fuel is not configured in this store"
-        );
-        anyhow::ensure!(
-            self.engine().config().async_support,
-            "async support is not configured in this store"
-        );
-        anyhow::ensure!(
-            interval != Some(0),
-            "fuel_async_yield_interval must not be 0"
+    fn out_of_fuel_async_yield(&mut self, injection_count: u64, fuel_to_inject: u64) {
+        assert!(
+            self.async_support(),
+            "cannot use `out_of_fuel_async_yield` without enabling async support in the config"
         );
-        self.fuel_yield_interval = interval.and_then(|i| NonZeroU64::new(i));
-        // Reset the fuel active + reserve states by resetting the amount.
-        self.set_fuel(self.get_fuel()?)
+        self.out_of_gas_behavior = OutOfGas::InjectFuel {
+            injection_count,
+            fuel_to_inject,
+        };
     }
 
     /// Yields execution to the caller on out-of-gas or epoch interruption.
@@ -1483,6 +1409,54 @@ impl StoreOpaque {
         }
     }
 
+    fn add_fuel(&mut self, fuel: u64) -> Result<()> {
+        anyhow::ensure!(
+            self.engine().config().tunables.consume_fuel,
+            "fuel is not configured in this store"
+        );
+
+        // Fuel is stored as an i64, so we need to cast it. If the provided fuel
+        // value overflows that just assume that i64::max will suffice. Wasm
+        // execution isn't fast enough to burn through i64::max fuel in any
+        // reasonable amount of time anyway.
+        let fuel = i64::try_from(fuel).unwrap_or(i64::max_value());
+        let adj = self.fuel_adj;
+        let consumed_ptr = unsafe { &mut *self.runtime_limits.fuel_consumed.get() };
+
+        match (consumed_ptr.checked_sub(fuel), adj.checked_add(fuel)) {
+            // If we succesfully did arithmetic without overflowing then we can
+            // just update our fields.
+            (Some(consumed), Some(adj)) => {
+                self.fuel_adj = adj;
+                *consumed_ptr = consumed;
+            }
+
+            // Otherwise something overflowed. Make sure that we preserve the
+            // amount of fuel that's already consumed, but otherwise assume that
+            // we were given infinite fuel.
+            _ => {
+                self.fuel_adj = i64::max_value();
+                *consumed_ptr = (*consumed_ptr + adj) - i64::max_value();
+            }
+        }
+
+        Ok(())
+    }
+
+    fn consume_fuel(&mut self, fuel: u64) -> Result<u64> {
+        let consumed_ptr = unsafe { &mut *self.runtime_limits.fuel_consumed.get() };
+        match i64::try_from(fuel)
+            .ok()
+            .and_then(|fuel| consumed_ptr.checked_add(fuel))
+        {
+            Some(consumed) if consumed <= 0 => {
+                *consumed_ptr = consumed;
+                Ok(u64::try_from(-consumed).unwrap())
+            }
+            _ => bail!("not enough fuel remaining in store"),
+        }
+    }
+
     #[inline]
     pub fn signal_handler(&self) -> Option<*const SignalHandler<'static>> {
         let handler = self.signal_handler.as_ref()?;
@@ -1606,12 +1580,6 @@ at https://bytecodealliance.org/security.
         std::process::abort();
     }
 
-    /// Retrieve the store's protection key.
-    #[inline]
-    pub(crate) fn get_pkey(&self) -> Option<ProtectionKey> {
-        self.pkey.clone()
-    }
-
     #[inline]
     #[cfg(feature = "component-model")]
     pub(crate) fn component_calls_and_host_table(
@@ -2091,15 +2059,28 @@ unsafe impl<T> wasmtime_runtime::Store for StoreInner<T> {
         }
     }
 
-    fn out_of_gas(&mut self) -> Result<()> {
-        if !self.refuel() {
-            return Err(Trap::OutOfFuel.into());
-        }
-        #[cfg(feature = "async")]
-        if self.fuel_yield_interval.is_some() {
-            self.async_yield_impl()?;
-        }
-        Ok(())
+    fn out_of_gas(&mut self) -> Result<(), anyhow::Error> {
+        return match &mut self.out_of_gas_behavior {
+            OutOfGas::Trap => Err(Trap::OutOfFuel.into()),
+            #[cfg(feature = "async")]
+            OutOfGas::InjectFuel {
+                injection_count,
+                fuel_to_inject,
+            } => {
+                if *injection_count == 0 {
+                    return Err(Trap::OutOfFuel.into());
+                }
+                *injection_count -= 1;
+                let fuel = *fuel_to_inject;
+                self.async_yield_impl()?;
+                if fuel > 0 {
+                    self.add_fuel(fuel).unwrap();
+                }
+                Ok(())
+            }
+            #[cfg(not(feature = "async"))]
+            OutOfGas::InjectFuel { .. } => unreachable!(),
+        };
     }
 
     fn new_epoch(&mut self) -> Result<u64, anyhow::Error> {
@@ -2226,7 +2207,7 @@ impl Drop for StoreOpaque {
             let allocator = self.engine.allocator();
             let ondemand = OnDemandInstanceAllocator::default();
             for instance in self.instances.iter_mut() {
-                if let StoreInstanceKind::Dummy = instance.kind {
+                if instance.ondemand {
                     ondemand.deallocate_module(&mut instance.handle);
                 } else {
                     allocator.deallocate_module(&mut instance.handle);
@@ -2251,7 +2232,7 @@ impl Drop for StoreOpaque {
 
 impl wasmtime_runtime::ModuleInfoLookup for ModuleRegistry {
     fn lookup(&self, pc: usize) -> Option<&dyn ModuleInfo> {
-        self.lookup_module_info(pc)
+        self.lookup_module(pc)
     }
 }
 
@@ -2264,125 +2245,3 @@ impl<T: Copy> Drop for Reset<T> {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::{get_fuel, refuel, set_fuel};
-    use std::num::NonZeroU64;
-
-    struct FuelTank {
-        pub consumed_fuel: i64,
-        pub reserve_fuel: u64,
-        pub yield_interval: Option<NonZeroU64>,
-    }
-
-    impl FuelTank {
-        fn new() -> Self {
-            FuelTank {
-                consumed_fuel: 0,
-                reserve_fuel: 0,
-                yield_interval: None,
-            }
-        }
-        fn get_fuel(&self) -> u64 {
-            get_fuel(self.consumed_fuel, self.reserve_fuel)
-        }
-        fn refuel(&mut self) -> bool {
-            refuel(
-                &mut self.consumed_fuel,
-                &mut self.reserve_fuel,
-                self.yield_interval,
-            )
-        }
-        fn set_fuel(&mut self, fuel: u64) {
-            set_fuel(
-                &mut self.consumed_fuel,
-                &mut self.reserve_fuel,
-                self.yield_interval,
-                fuel,
-            );
-        }
-    }
-
-    #[test]
-    fn smoke() {
-        let mut tank = FuelTank::new();
-        tank.set_fuel(10);
-        assert_eq!(tank.consumed_fuel, -10);
-        assert_eq!(tank.reserve_fuel, 0);
-
-        tank.yield_interval = NonZeroU64::new(10);
-        tank.set_fuel(25);
-        assert_eq!(tank.consumed_fuel, -10);
-        assert_eq!(tank.reserve_fuel, 15);
-    }
-
-    #[test]
-    fn does_not_lose_precision() {
-        let mut tank = FuelTank::new();
-        tank.set_fuel(u64::MAX);
-        assert_eq!(tank.get_fuel(), u64::MAX);
-
-        tank.set_fuel(i64::MAX as u64);
-        assert_eq!(tank.get_fuel(), i64::MAX as u64);
-
-        tank.set_fuel(i64::MAX as u64 + 1);
-        assert_eq!(tank.get_fuel(), i64::MAX as u64 + 1);
-    }
-
-    #[test]
-    fn yielding_does_not_lose_precision() {
-        let mut tank = FuelTank::new();
-
-        tank.yield_interval = NonZeroU64::new(10);
-        tank.set_fuel(u64::MAX);
-        assert_eq!(tank.get_fuel(), u64::MAX);
-        assert_eq!(tank.consumed_fuel, -10);
-        assert_eq!(tank.reserve_fuel, u64::MAX - 10);
-
-        tank.yield_interval = NonZeroU64::new(u64::MAX);
-        tank.set_fuel(u64::MAX);
-        assert_eq!(tank.get_fuel(), u64::MAX);
-        assert_eq!(tank.consumed_fuel, -i64::MAX);
-        assert_eq!(tank.reserve_fuel, u64::MAX - (i64::MAX as u64));
-
-        tank.yield_interval = NonZeroU64::new((i64::MAX as u64) + 1);
-        tank.set_fuel(u64::MAX);
-        assert_eq!(tank.get_fuel(), u64::MAX);
-        assert_eq!(tank.consumed_fuel, -i64::MAX);
-        assert_eq!(tank.reserve_fuel, u64::MAX - (i64::MAX as u64));
-    }
-
-    #[test]
-    fn refueling() {
-        // It's possible to fuel to have consumed over the limit as some instructions can consume
-        // multiple units of fuel at once. Refueling should be strict in it's consumption and not
-        // add more fuel than there is.
-        let mut tank = FuelTank::new();
-
-        tank.yield_interval = NonZeroU64::new(10);
-        tank.reserve_fuel = 42;
-        tank.consumed_fuel = 4;
-        assert!(tank.refuel());
-        assert_eq!(tank.reserve_fuel, 28);
-        assert_eq!(tank.consumed_fuel, -10);
-
-        tank.yield_interval = NonZeroU64::new(1);
-        tank.reserve_fuel = 8;
-        tank.consumed_fuel = 4;
-        assert_eq!(tank.get_fuel(), 4);
-        assert!(tank.refuel());
-        assert_eq!(tank.reserve_fuel, 3);
-        assert_eq!(tank.consumed_fuel, -1);
-        assert_eq!(tank.get_fuel(), 4);
-
-        tank.yield_interval = NonZeroU64::new(10);
-        tank.reserve_fuel = 3;
-        tank.consumed_fuel = 4;
-        assert_eq!(tank.get_fuel(), 0);
-        assert!(!tank.refuel());
-        assert_eq!(tank.reserve_fuel, 3);
-        assert_eq!(tank.consumed_fuel, 4);
-        assert_eq!(tank.get_fuel(), 0);
-    }
-}
diff --git a/crates/wasmtime/src/store/data.rs b/crates/wasmtime/src/store/data.rs
index 390374985f90..08764d293258 100644
--- a/crates/wasmtime/src/store/data.rs
+++ b/crates/wasmtime/src/store/data.rs
@@ -13,12 +13,6 @@ use std::sync::atomic::{AtomicU64, Ordering::Relaxed};
 #[derive(Copy, Clone)]
 pub struct InstanceId(pub(super) usize);
 
-impl InstanceId {
-    pub fn from_index(idx: usize) -> InstanceId {
-        InstanceId(idx)
-    }
-}
-
 pub struct StoreData {
     id: StoreId,
     funcs: Vec<crate::func::FuncData>,
diff --git a/crates/wasmtime/src/trampoline.rs b/crates/wasmtime/src/trampoline.rs
index 2c28509c8f81..928cc2cc2974 100644
--- a/crates/wasmtime/src/trampoline.rs
+++ b/crates/wasmtime/src/trampoline.rs
@@ -41,17 +41,16 @@ fn create_handle(
         let module = Arc::new(module);
         let runtime_info =
             &BareModuleInfo::maybe_imported_func(module, one_signature).into_traitobj();
-        let allocator = OnDemandInstanceAllocator::new(config.mem_creator.clone(), 0);
-        let handle = allocator.allocate_module(InstanceAllocationRequest {
-            imports,
-            host_state,
-            store: StorePtr::new(store.traitobj()),
-            runtime_info,
-            wmemcheck: false,
-            pkey: None,
-        })?;
+        let handle = OnDemandInstanceAllocator::new(config.mem_creator.clone(), 0)
+            .allocate_module(InstanceAllocationRequest {
+                imports,
+                host_state,
+                store: StorePtr::new(store.traitobj()),
+                runtime_info,
+                wmemcheck: false,
+            })?;
 
-        Ok(store.add_dummy_instance(handle))
+        Ok(store.add_instance(handle, true))
     }
 }
 
diff --git a/crates/wasmtime/src/trampoline/global.rs b/crates/wasmtime/src/trampoline/global.rs
index 50a77811d1e4..2aa49a6bd1c6 100644
--- a/crates/wasmtime/src/trampoline/global.rs
+++ b/crates/wasmtime/src/trampoline/global.rs
@@ -5,8 +5,8 @@ use wasmtime_runtime::{StoreBox, VMGlobalDefinition};
 
 #[repr(C)]
 pub struct VMHostGlobalContext {
-    pub(crate) ty: GlobalType,
-    pub(crate) global: VMGlobalDefinition,
+    ty: GlobalType,
+    global: VMGlobalDefinition,
 }
 
 impl Drop for VMHostGlobalContext {
@@ -53,8 +53,9 @@ pub fn generate_global_export(
             Val::F64(x) => *global.as_f64_bits_mut() = x,
             Val::V128(x) => *global.as_u128_mut() = x.into(),
             Val::FuncRef(f) => {
-                *global.as_func_ref_mut() =
-                    f.map_or(ptr::null_mut(), |f| f.vm_func_ref(store).as_ptr())
+                *global.as_func_ref_mut() = f.map_or(ptr::null_mut(), |f| {
+                    f.caller_checked_func_ref(store).as_ptr()
+                })
             }
             Val::ExternRef(x) => *global.as_externref_mut() = x.map(|x| x.inner),
         }
diff --git a/crates/wasmtime/src/trampoline/memory.rs b/crates/wasmtime/src/trampoline/memory.rs
index 72c7eb891f81..a4ef32097960 100644
--- a/crates/wasmtime/src/trampoline/memory.rs
+++ b/crates/wasmtime/src/trampoline/memory.rs
@@ -10,7 +10,6 @@ use wasmtime_environ::{
     DefinedMemoryIndex, DefinedTableIndex, EntityIndex, HostPtr, MemoryPlan, MemoryStyle, Module,
     VMOffsets, WASM_PAGE_SIZE,
 };
-use wasmtime_runtime::mpk::ProtectionKey;
 use wasmtime_runtime::{
     CompiledModuleId, Imports, InstanceAllocationRequest, InstanceAllocator, InstanceAllocatorImpl,
     Memory, MemoryAllocationIndex, MemoryImage, OnDemandInstanceAllocator, RuntimeLinearMemory,
@@ -64,7 +63,6 @@ pub fn create_memory(
         store: StorePtr::new(store.traitobj()),
         runtime_info,
         wmemcheck: false,
-        pkey: None,
     };
 
     unsafe {
@@ -73,7 +71,7 @@ pub fn create_memory(
             ondemand: OnDemandInstanceAllocator::default(),
         }
         .allocate_module(request)?;
-        let instance_id = store.add_dummy_instance(handle.clone());
+        let instance_id = store.add_instance(handle.clone(), true);
         Ok(instance_id)
     }
 }
@@ -254,16 +252,4 @@ unsafe impl InstanceAllocatorImpl for SingleMemoryInstance<'_> {
     fn purge_module(&self, _: CompiledModuleId) {
         unreachable!()
     }
-
-    fn next_available_pkey(&self) -> Option<ProtectionKey> {
-        unreachable!()
-    }
-
-    fn restrict_to_pkey(&self, _: ProtectionKey) {
-        unreachable!()
-    }
-
-    fn allow_all_pkeys(&self) {
-        unreachable!()
-    }
 }
diff --git a/crates/wasmtime/src/trap.rs b/crates/wasmtime/src/trap.rs
index af85c9a04e09..e62ba73b1f46 100644
--- a/crates/wasmtime/src/trap.rs
+++ b/crates/wasmtime/src/trap.rs
@@ -1,4 +1,3 @@
-#[cfg(feature = "coredump")]
 use crate::coredump::WasmCoreDump;
 use crate::store::StoreOpaque;
 use crate::{AsContext, Module};
@@ -78,7 +77,7 @@ pub(crate) unsafe fn raise(error: anyhow::Error) -> ! {
 
 #[cold] // traps are exceptional, this helps move handling off the main path
 pub(crate) fn from_runtime_box(
-    store: &mut StoreOpaque,
+    store: &StoreOpaque,
     runtime_trap: Box<wasmtime_runtime::Trap>,
 ) -> Error {
     let wasmtime_runtime::Trap {
@@ -135,14 +134,11 @@ pub(crate) fn from_runtime_box(
         }
     }
 
-    let _ = &coredumpstack;
-    #[cfg(feature = "coredump")]
     if let Some(coredump) = coredumpstack {
         let bt = WasmBacktrace::from_captured(store, coredump.bt, pc);
         let cd = WasmCoreDump::new(store, bt);
         error = error.context(cd);
     }
-
     error
 }
 
@@ -377,7 +373,7 @@ impl fmt::Display for WasmBacktrace {
             } else {
                 needs_newline = true;
             }
-            let name = frame.module().name().unwrap_or("<unknown>");
+            let name = frame.module_name().unwrap_or("<unknown>");
             write!(f, "  {:>3}: ", i)?;
 
             if let Some(offset) = frame.module_offset() {
@@ -429,7 +425,7 @@ impl fmt::Display for WasmBacktrace {
 /// to acquire this `FrameInfo`. For more information see [`WasmBacktrace`].
 #[derive(Debug)]
 pub struct FrameInfo {
-    module: Module,
+    module_name: Option<String>,
     func_index: u32,
     func_name: Option<String>,
     func_start: FilePos,
@@ -442,18 +438,12 @@ impl FrameInfo {
     ///
     /// Returns an object if this `pc` is known to this module, or returns `None`
     /// if no information can be found.
-    pub(crate) fn new(module: Module, text_offset: usize) -> Option<FrameInfo> {
-        let compiled_module = module.compiled_module();
-        let (index, _func_offset) = compiled_module.func_by_text_offset(text_offset)?;
-        let info = compiled_module.wasm_func_info(index);
-        let func_start = info.start_srcloc;
-        let instr = wasmtime_environ::lookup_file_pos(
-            compiled_module.code_memory().address_map_data(),
-            text_offset,
-        );
-        let index = compiled_module.module().func_index(index);
-        let func_index = index.index() as u32;
-        let func_name = compiled_module.func_name(index).map(|s| s.to_string());
+    pub(crate) fn new(module: &Module, text_offset: usize) -> Option<FrameInfo> {
+        let module = module.compiled_module();
+        let (index, _func_offset) = module.func_by_text_offset(text_offset)?;
+        let info = module.wasm_func_info(index);
+        let instr =
+            wasmtime_environ::lookup_file_pos(module.code_memory().address_map_data(), text_offset);
 
         // In debug mode for now assert that we found a mapping for `pc` within
         // the function, because otherwise something is buggy along the way and
@@ -463,7 +453,7 @@ impl FrameInfo {
         // Note that if the module doesn't even have an address map due to
         // compilation settings then it's expected that `instr` is `None`.
         debug_assert!(
-            instr.is_some() || !compiled_module.has_address_map(),
+            instr.is_some() || !module.has_address_map(),
             "failed to find instruction for {:#x}",
             text_offset
         );
@@ -478,9 +468,7 @@ impl FrameInfo {
         // custom section contents.
         let mut symbols = Vec::new();
 
-        let _ = &mut symbols;
-        #[cfg(feature = "addr2line")]
-        if let Some(s) = &compiled_module.symbolize_context().ok().and_then(|c| c) {
+        if let Some(s) = &module.symbolize_context().ok().and_then(|c| c) {
             if let Some(offset) = instr.and_then(|i| i.file_offset()) {
                 let to_lookup = u64::from(offset) - s.code_section_offset();
                 if let Ok(mut frames) = s.addr2line().find_frames(to_lookup).skip_all_loads() {
@@ -504,12 +492,14 @@ impl FrameInfo {
             }
         }
 
+        let index = module.module().func_index(index);
+
         Some(FrameInfo {
-            module,
-            func_index,
-            func_name,
+            module_name: module.module().name.clone(),
+            func_index: index.index() as u32,
+            func_name: module.func_name(index).map(|s| s.to_string()),
             instr,
-            func_start,
+            func_start: info.start_srcloc,
             symbols,
         })
     }
@@ -522,11 +512,17 @@ impl FrameInfo {
         self.func_index
     }
 
-    /// Returns the module for this frame.
+    /// Returns the identifer of the module that this frame is for.
+    ///
+    /// Module identifiers are present in the `name` section of a WebAssembly
+    /// binary, but this may not return the exact item in the `name` section.
+    /// Module names can be overwritten at construction time or perhaps inferred
+    /// from file names. The primary purpose of this function is to assist in
+    /// debugging and therefore may be tweaked over time.
     ///
-    /// This is the module who's code was being run in this frame.
-    pub fn module(&self) -> &Module {
-        &self.module
+    /// This function returns `None` when no name can be found or inferred.
+    pub fn module_name(&self) -> Option<&str> {
+        self.module_name.as_deref()
     }
 
     /// Returns a descriptive name of the function for this frame, if one is
diff --git a/crates/wasmtime/src/types.rs b/crates/wasmtime/src/types.rs
index 98b3ca73a67b..b1d33709417a 100644
--- a/crates/wasmtime/src/types.rs
+++ b/crates/wasmtime/src/types.rs
@@ -272,15 +272,6 @@ impl GlobalType {
         self.mutability
     }
 
-    pub(crate) fn to_wasm_type(&self) -> Global {
-        let wasm_ty = self.content().to_wasm_type();
-        let mutability = matches!(self.mutability(), Mutability::Var);
-        Global {
-            wasm_ty,
-            mutability,
-        }
-    }
-
     /// Returns `None` if the wasmtime global has a type that we can't
     /// represent, but that should only very rarely happen and indicate a bug.
     pub(crate) fn from_wasmtime_global(global: &Global) -> GlobalType {
diff --git a/crates/wasmtime/src/values.rs b/crates/wasmtime/src/values.rs
index d5605e962dda..87040ec6850f 100644
--- a/crates/wasmtime/src/values.rs
+++ b/crates/wasmtime/src/values.rs
@@ -194,7 +194,9 @@ impl Val {
                 if !f.comes_from_same_store(store) {
                     bail!("cross-`Store` values are not supported in tables");
                 }
-                Ok(TableElement::FuncRef(f.vm_func_ref(store).as_ptr()))
+                Ok(TableElement::FuncRef(
+                    f.caller_checked_func_ref(store).as_ptr(),
+                ))
             }
             (Val::FuncRef(None), ValType::FuncRef) => Ok(TableElement::FuncRef(ptr::null_mut())),
             (Val::ExternRef(Some(x)), ValType::ExternRef) => {
diff --git a/crates/wast/src/wast.rs b/crates/wast/src/wast.rs
index 559ac32da937..32d4cc2d02ee 100644
--- a/crates/wast/src/wast.rs
+++ b/crates/wast/src/wast.rs
@@ -3,10 +3,8 @@ use crate::component;
 use crate::core;
 use crate::spectest::*;
 use anyhow::{anyhow, bail, Context as _, Error, Result};
-use std::collections::HashMap;
 use std::path::Path;
 use std::str;
-use std::thread;
 use wasmtime::*;
 use wast::lexer::Lexer;
 use wast::parser::{self, ParseBuffer};
@@ -64,10 +62,7 @@ enum Export {
     Component(component::Func),
 }
 
-impl<T> WastContext<T>
-where
-    T: Clone + Send + 'static,
-{
+impl<T> WastContext<T> {
     /// Construct a new instance of `WastContext`.
     pub fn new(store: Store<T>) -> Self {
         // Spec tests will redefine the same module/name sometimes, so we need
@@ -366,54 +361,26 @@ where
         let buf = ParseBuffer::new_with_lexer(lexer).map_err(adjust_wast)?;
         let ast = parser::parse::<Wast>(&buf).map_err(adjust_wast)?;
 
-        self.run_directives(ast.directives, filename, wast)
-    }
-
-    fn run_directives(
-        &mut self,
-        directives: Vec<WastDirective<'_>>,
-        filename: &str,
-        wast: &str,
-    ) -> Result<()> {
-        let adjust_wast = |mut err: wast::Error| {
-            err.set_path(filename.as_ref());
-            err.set_text(wast);
-            err
-        };
-
-        thread::scope(|scope| {
-            let mut threads = HashMap::new();
-            for directive in directives {
-                let sp = directive.span();
-                if log::log_enabled!(log::Level::Debug) {
-                    let (line, col) = sp.linecol_in(wast);
-                    log::debug!("running directive on {}:{}:{}", filename, line + 1, col);
-                }
-                self.run_directive(directive, filename, wast, &scope, &mut threads)
-                    .map_err(|e| match e.downcast() {
-                        Ok(err) => adjust_wast(err).into(),
-                        Err(e) => e,
-                    })
-                    .with_context(|| {
-                        let (line, col) = sp.linecol_in(wast);
-                        format!("failed directive on {}:{}:{}", filename, line + 1, col)
-                    })?;
+        for directive in ast.directives {
+            let sp = directive.span();
+            if log::log_enabled!(log::Level::Debug) {
+                let (line, col) = sp.linecol_in(wast);
+                log::debug!("running directive on {}:{}:{}", filename, line + 1, col);
             }
-            Ok(())
-        })
+            self.run_directive(directive)
+                .map_err(|e| match e.downcast() {
+                    Ok(err) => adjust_wast(err).into(),
+                    Err(e) => e,
+                })
+                .with_context(|| {
+                    let (line, col) = sp.linecol_in(wast);
+                    format!("failed directive on {}:{}:{}", filename, line + 1, col)
+                })?;
+        }
+        Ok(())
     }
 
-    fn run_directive<'a>(
-        &mut self,
-        directive: WastDirective<'a>,
-        filename: &'a str,
-        wast: &'a str,
-        scope: &'a thread::Scope<'a, '_>,
-        threads: &mut HashMap<&'a str, thread::ScopedJoinHandle<'a, Result<()>>>,
-    ) -> Result<()>
-    where
-        T: 'a,
-    {
+    fn run_directive(&mut self, directive: WastDirective) -> Result<()> {
         use wast::WastDirective::*;
 
         match directive {
@@ -498,40 +465,6 @@ where
                 }
             }
             AssertException { .. } => bail!("unimplemented assert_exception"),
-
-            Thread(thread) => {
-                let mut core_linker = Linker::new(self.store.engine());
-                if let Some(id) = thread.shared_module {
-                    let items = self
-                        .core_linker
-                        .iter(&mut self.store)
-                        .filter(|(module, _, _)| *module == id.name())
-                        .collect::<Vec<_>>();
-                    for (module, name, item) in items {
-                        core_linker.define(&mut self.store, module, name, item)?;
-                    }
-                }
-                let mut child_cx = WastContext {
-                    current: None,
-                    core_linker,
-                    #[cfg(feature = "component-model")]
-                    component_linker: component::Linker::new(self.store.engine()),
-                    store: Store::new(self.store.engine(), self.store.data().clone()),
-                };
-                let name = thread.name.name();
-                let child =
-                    scope.spawn(move || child_cx.run_directives(thread.directives, filename, wast));
-                threads.insert(name, child);
-            }
-
-            Wait { thread, .. } => {
-                let name = thread.name();
-                threads
-                    .remove(name)
-                    .ok_or_else(|| anyhow!("no thread named `{name}`"))?
-                    .join()
-                    .unwrap()?;
-            }
         }
 
         Ok(())
diff --git a/crates/winch/src/compiler.rs b/crates/winch/src/compiler.rs
index 89e4a775d3c3..73605c2c3761 100644
--- a/crates/winch/src/compiler.rs
+++ b/crates/winch/src/compiler.rs
@@ -1,29 +1,18 @@
 use anyhow::Result;
 use object::write::{Object, SymbolId};
 use std::any::Any;
-use std::mem;
 use std::sync::Mutex;
 use wasmparser::FuncValidatorAllocations;
 use wasmtime_cranelift_shared::{CompiledFunction, ModuleTextBuilder};
 use wasmtime_environ::{
     CompileError, DefinedFuncIndex, FilePos, FuncIndex, FunctionBodyData, FunctionLoc,
-    ModuleTranslation, ModuleTypes, PrimaryMap, TrapEncodingBuilder, VMOffsets, WasmFunctionInfo,
+    ModuleTranslation, ModuleTypes, PrimaryMap, TrapEncodingBuilder, WasmFunctionInfo,
 };
-use winch_codegen::{BuiltinFunctions, TargetIsa, TrampolineKind};
-
-/// Function compilation context.
-/// This struct holds information that can be shared globally across
-/// all function compilations.
-struct CompilationContext {
-    /// Validator allocations.
-    allocations: FuncValidatorAllocations,
-    /// Builtin functions available to JIT code.
-    builtins: BuiltinFunctions,
-}
+use winch_codegen::{TargetIsa, TrampolineKind};
 
 pub(crate) struct Compiler {
     isa: Box<dyn TargetIsa>,
-    contexts: Mutex<Vec<CompilationContext>>,
+    allocations: Mutex<Vec<FuncValidatorAllocations>>,
 }
 
 /// The compiled function environment.
@@ -41,26 +30,20 @@ impl Compiler {
     pub fn new(isa: Box<dyn TargetIsa>) -> Self {
         Self {
             isa,
-            contexts: Mutex::new(Vec::new()),
+            allocations: Mutex::new(Vec::new()),
         }
     }
 
-    /// Get a compilation context or create a new one if none available.
-    fn get_context(&self, translation: &ModuleTranslation) -> CompilationContext {
-        self.contexts.lock().unwrap().pop().unwrap_or_else(|| {
-            let pointer_size = self.isa.pointer_bytes();
-            let vmoffsets = VMOffsets::new(pointer_size, &translation.module);
-            CompilationContext {
-                allocations: Default::default(),
-                builtins: BuiltinFunctions::new(&vmoffsets, self.isa.wasmtime_call_conv()),
-            }
-        })
+    fn take_allocations(&self) -> FuncValidatorAllocations {
+        self.allocations
+            .lock()
+            .unwrap()
+            .pop()
+            .unwrap_or_else(Default::default)
     }
 
-    /// Save a compilation context.
-    fn save_context(&self, mut context: CompilationContext, allocs: FuncValidatorAllocations) {
-        context.allocations = allocs;
-        self.contexts.lock().unwrap().push(context);
+    fn save_allocations(&self, allocs: FuncValidatorAllocations) {
+        self.allocations.lock().unwrap().push(allocs)
     }
 }
 
@@ -82,20 +65,12 @@ impl wasmtime_environ::Compiler for Compiler {
                 .try_into()
                 .unwrap(),
         );
-        let mut context = self.get_context(translation);
-        let mut validator = validator.into_validator(mem::take(&mut context.allocations));
+        let mut validator = validator.into_validator(self.take_allocations());
         let buffer = self
             .isa
-            .compile_function(
-                ty,
-                &body,
-                translation,
-                types,
-                &mut context.builtins,
-                &mut validator,
-            )
+            .compile_function(ty, &body, &translation, &mut validator)
             .map_err(|e| CompileError::Codegen(format!("{e:?}")));
-        self.save_context(context, validator.into_allocations());
+        self.save_allocations(validator.into_allocations());
         let buffer = buffer?;
         let compiled_function =
             CompiledFunction::new(buffer, CompiledFuncEnv {}, self.isa.function_alignment());
@@ -210,11 +185,11 @@ impl wasmtime_environ::Compiler for Compiler {
         self.isa.triple()
     }
 
-    fn flags(&self) -> Vec<(&'static str, wasmtime_environ::FlagValue<'static>)> {
+    fn flags(&self) -> std::collections::BTreeMap<String, wasmtime_environ::FlagValue> {
         wasmtime_cranelift_shared::clif_flags_to_wasmtime(self.isa.flags().iter())
     }
 
-    fn isa_flags(&self) -> Vec<(&'static str, wasmtime_environ::FlagValue<'static>)> {
+    fn isa_flags(&self) -> std::collections::BTreeMap<String, wasmtime_environ::FlagValue> {
         wasmtime_cranelift_shared::clif_flags_to_wasmtime(self.isa.isa_flags())
     }
 
diff --git a/crates/wit-bindgen/src/lib.rs b/crates/wit-bindgen/src/lib.rs
index eca7fd3916cd..2a0d6d68b8aa 100644
--- a/crates/wit-bindgen/src/lib.rs
+++ b/crates/wit-bindgen/src/lib.rs
@@ -2,7 +2,7 @@ use crate::rust::{to_rust_ident, to_rust_upper_camel_case, RustGenerator, TypeMo
 use crate::types::{TypeInfo, Types};
 use anyhow::{anyhow, bail, Context};
 use heck::*;
-use indexmap::{IndexMap, IndexSet};
+use indexmap::IndexMap;
 use std::collections::{BTreeMap, HashMap, HashSet};
 use std::fmt::Write as _;
 use std::io::{Read, Write};
@@ -27,22 +27,20 @@ mod source;
 mod types;
 use source::Source;
 
-#[derive(Clone)]
-enum InterfaceName {
-    /// This interface was remapped using `with` to some other Rust code.
-    Remapped {
-        name_at_root: String,
-        local_path: Vec<String>,
-    },
-    /// This interface is generated in the module hierarchy specified.
-    Path(Vec<String>),
+struct InterfaceName {
+    /// True when this interface name has been remapped through the use of `with` in the `bindgen!`
+    /// macro invocation.
+    remapped: bool,
+
+    /// The string name for this interface.
+    path: String,
 }
 
 #[derive(Default)]
 struct Wasmtime {
     src: Source,
     opts: Opts,
-    import_interfaces: Vec<(String, InterfaceName)>,
+    import_interfaces: BTreeMap<Option<PackageName>, Vec<ImportInterface>>,
     import_functions: Vec<ImportFunction>,
     exports: Exports,
     types: Types,
@@ -50,9 +48,12 @@ struct Wasmtime {
     interface_names: HashMap<InterfaceId, InterfaceName>,
     with_name_counter: usize,
     interface_last_seen_as_import: HashMap<InterfaceId, bool>,
-    trappable_errors: IndexMap<TypeId, String>,
 }
 
+struct ImportInterface {
+    snake: String,
+    module: String,
+}
 struct ImportFunction {
     add_to_linker: String,
     sig: String,
@@ -61,7 +62,7 @@ struct ImportFunction {
 #[derive(Default)]
 struct Exports {
     fields: BTreeMap<String, (String, String)>,
-    modules: Vec<(String, InterfaceName)>,
+    modules: BTreeMap<Option<PackageName>, Vec<String>>,
     funcs: Vec<String>,
 }
 
@@ -112,8 +113,11 @@ pub struct Opts {
 
 #[derive(Debug, Clone)]
 pub struct TrappableError {
-    /// Full path to the error, such as `wasi:io/streams/error`.
-    pub wit_path: String,
+    /// The package and interface that define the error type being mapped.
+    pub wit_package_path: String,
+
+    /// The name of the error type in WIT that is being mapped.
+    pub wit_type_name: String,
 
     /// The name, in Rust, of the error type to generate.
     pub rust_type_name: String,
@@ -172,104 +176,54 @@ impl Wasmtime {
         name: &WorldKey,
         is_export: bool,
     ) -> bool {
-        let mut path = Vec::new();
-        if is_export {
-            path.push("exports".to_string());
-        }
-        match name {
-            WorldKey::Name(name) => {
-                path.push(name.to_snake_case());
-            }
-            WorldKey::Interface(_) => {
-                let iface = &resolve.interfaces[id];
-                let pkgname = &resolve.packages[iface.package.unwrap()].name;
-                path.push(pkgname.namespace.to_snake_case());
-                path.push(self.name_package_module(resolve, iface.package.unwrap()));
-                path.push(iface.name.as_ref().unwrap().to_snake_case());
-            }
-        }
-        let entry = if let Some(remapped_path) = self.lookup_replacement(resolve, name, None) {
-            let remapped_path = remapped_path.to_string();
+        let with_name = resolve.name_world_key(name);
+        let entry = if let Some(remapped_path) = self.opts.with.get(&with_name) {
             let name = format!("__with_name{}", self.with_name_counter);
             self.with_name_counter += 1;
             uwriteln!(self.src, "use {remapped_path} as {name};");
-            InterfaceName::Remapped {
-                name_at_root: name,
-                local_path: path,
+            InterfaceName {
+                remapped: true,
+                path: name,
             }
         } else {
-            InterfaceName::Path(path)
+            let path = match name {
+                WorldKey::Name(name) => name.to_snake_case(),
+                WorldKey::Interface(_) => {
+                    let iface = &resolve.interfaces[id];
+                    let pkgname = &resolve.packages[iface.package.unwrap()].name;
+                    format!(
+                        "{}::{}::{}",
+                        pkgname.namespace.to_snake_case(),
+                        pkgname.name.to_snake_case(),
+                        iface.name.as_ref().unwrap().to_snake_case()
+                    )
+                }
+            };
+            let path = if is_export {
+                format!("exports::{path}")
+            } else {
+                path
+            };
+            InterfaceName {
+                remapped: false,
+                path,
+            }
         };
 
-        let remapped = matches!(entry, InterfaceName::Remapped { .. });
+        let remapped = entry.remapped;
         self.interface_names.insert(id, entry);
-        remapped
-    }
-
-    /// If the package `id` is the only package with its namespace/name combo
-    /// then pass through the name unmodified. If, however, there are multiple
-    /// versions of this package then the package module is going to get version
-    /// information.
-    fn name_package_module(&self, resolve: &Resolve, id: PackageId) -> String {
-        let pkg = &resolve.packages[id];
-        let versions_with_same_name = resolve
-            .packages
-            .iter()
-            .filter_map(|(_, p)| {
-                if p.name.namespace == pkg.name.namespace && p.name.name == pkg.name.name {
-                    Some(&p.name.version)
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<_>>();
-        let base = pkg.name.name.to_snake_case();
-        if versions_with_same_name.len() == 1 {
-            return base;
-        }
-
-        let version = match &pkg.name.version {
-            Some(version) => version,
-            // If this package didn't have a version then don't mangle its name
-            // and other packages with the same name but with versions present
-            // will have their names mangled.
-            None => return base,
-        };
 
-        // Here there's multiple packages with the same name that differ only in
-        // version, so the version needs to be mangled into the Rust module name
-        // that we're generating. This in theory could look at all of
-        // `versions_with_same_name` and produce a minimal diff, e.g. for 0.1.0
-        // and 0.2.0 this could generate "foo1" and "foo2", but for now
-        // a simpler path is chosen to generate "foo0_1_0" and "foo0_2_0".
-        let version = version
-            .to_string()
-            .replace('.', "_")
-            .replace('-', "_")
-            .replace('+', "_")
-            .to_snake_case();
-        format!("{base}{version}")
+        remapped
     }
 
     fn generate(&mut self, resolve: &Resolve, id: WorldId) -> String {
         self.types.analyze(resolve, id);
-        for (i, te) in self.opts.trappable_error_type.iter().enumerate() {
-            let id = resolve_type_in_package(resolve, &te.wit_path)
-                .context(format!("resolving {:?}", te))
-                .unwrap();
-            let name = format!("_TrappableError{i}");
-            uwriteln!(self.src, "type {name} = {};", te.rust_type_name);
-            let prev = self.trappable_errors.insert(id, name);
-            assert!(prev.is_none());
-        }
-
         let world = &resolve.worlds[id];
         for (name, import) in world.imports.iter() {
             if !self.opts.only_interfaces || matches!(import, WorldItem::Interface(_)) {
                 self.import(resolve, id, name, import);
             }
         }
-
         for (name, export) in world.exports.iter() {
             if !self.opts.only_interfaces || matches!(export, WorldItem::Interface(_)) {
                 self.export(resolve, name, export);
@@ -326,8 +280,15 @@ impl Wasmtime {
                         }}
                     "
                 );
+                let pkg = resolve.interfaces[*id].package.unwrap();
+                let pkgname = match name {
+                    WorldKey::Name(_) => None,
+                    WorldKey::Interface(_) => Some(resolve.packages[pkg].name.clone()),
+                };
                 self.import_interfaces
-                    .push((module, self.interface_names[id].clone()));
+                    .entry(pkgname)
+                    .or_insert(Vec::new())
+                    .push(ImportInterface { snake, module });
             }
             WorldItem::Type(ty) => {
                 let name = match name {
@@ -461,7 +422,9 @@ impl Wasmtime {
                 };
                 self.exports
                     .modules
-                    .push((module, self.interface_names[id].clone()));
+                    .entry(pkgname.clone())
+                    .or_insert(Vec::new())
+                    .push(module);
 
                 let name = resolve.name_world_key(name);
                 let (path, method_name) = match pkgname {
@@ -469,7 +432,7 @@ impl Wasmtime {
                         format!(
                             "exports::{}::{}::{snake}::{camel}",
                             pkgname.namespace.to_snake_case(),
-                            self.name_package_module(resolve, iface.package.unwrap()),
+                            pkgname.name.to_snake_case(),
                         ),
                         format!(
                             "{}_{}_{snake}",
@@ -591,10 +554,18 @@ impl Wasmtime {
         }
 
         let imports = mem::take(&mut self.import_interfaces);
-        self.emit_modules(imports);
-
-        let exports = mem::take(&mut self.exports.modules);
-        self.emit_modules(exports);
+        self.emit_modules(
+            &imports
+                .into_iter()
+                .map(|(k, v)| (k, v.into_iter().map(|m| m.module).collect()))
+                .collect(),
+        );
+        if !self.exports.modules.is_empty() {
+            uwriteln!(self.src, "pub mod exports {{");
+            let exports = mem::take(&mut self.exports.modules);
+            self.emit_modules(&exports);
+            uwriteln!(self.src, "}}");
+        }
 
         let mut src = mem::take(&mut self.src);
         if self.opts.rustfmt {
@@ -624,79 +595,36 @@ impl Wasmtime {
         src.into()
     }
 
-    fn emit_modules(&mut self, modules: Vec<(String, InterfaceName)>) {
-        #[derive(Default)]
-        struct Module {
-            submodules: BTreeMap<String, Module>,
-            contents: Vec<String>,
-        }
-        let mut map = Module::default();
-        for (module, name) in modules {
-            let path = match name {
-                InterfaceName::Remapped { local_path, .. } => local_path,
-                InterfaceName::Path(path) => path,
-            };
-            let mut cur = &mut map;
-            for name in path[..path.len() - 1].iter() {
-                cur = cur
-                    .submodules
-                    .entry(name.clone())
-                    .or_insert(Module::default());
+    fn emit_modules(&mut self, modules: &BTreeMap<Option<PackageName>, Vec<String>>) {
+        let mut map = BTreeMap::new();
+        for (pkg, modules) in modules {
+            match pkg {
+                Some(pkg) => {
+                    let prev = map
+                        .entry(&pkg.namespace)
+                        .or_insert(BTreeMap::new())
+                        .insert(&pkg.name, modules);
+                    assert!(prev.is_none());
+                }
+                None => {
+                    for module in modules {
+                        uwriteln!(self.src, "{module}");
+                    }
+                }
             }
-            cur.contents.push(module);
         }
-
-        emit(&mut self.src, map);
-
-        fn emit(me: &mut Source, module: Module) {
-            for (name, submodule) in module.submodules {
-                uwriteln!(me, "pub mod {name} {{");
-                emit(me, submodule);
-                uwriteln!(me, "}}");
-            }
-            for submodule in module.contents {
-                uwriteln!(me, "{submodule}");
+        for (ns, pkgs) in map {
+            uwriteln!(self.src, "pub mod {} {{", ns.to_snake_case());
+            for (pkg, modules) in pkgs {
+                uwriteln!(self.src, "pub mod {} {{", pkg.to_snake_case());
+                for module in modules {
+                    uwriteln!(self.src, "{module}");
+                }
+                uwriteln!(self.src, "}}");
             }
+            uwriteln!(self.src, "}}");
         }
     }
-
-    fn lookup_replacement(
-        &self,
-        resolve: &Resolve,
-        key: &WorldKey,
-        item: Option<&str>,
-    ) -> Option<&str> {
-        // First try to lookup the exact name of the interface as specified
-        // via `name_world_key`.
-        let name = resolve.name_world_key(key);
-        let candidate1 = match item {
-            Some(item) => format!("{name}/{item}"),
-            None => name.clone(),
-        };
-        if let Some(ret) = self.opts.with.get(&candidate1) {
-            return Some(ret);
-        }
-
-        // .. if the above failed allow omitting the `@...` version information
-        // and see if there's a `with` key for that.
-        //
-        // NB: this means that in a scenario where there's packages with the
-        // same name/namespace where one has a version and one doesn't there's
-        // no way to use `with` to specify just one and not the other. That
-        // should be ok for now, but this should ideally detect a situation like
-        // that and omit this fallback in such a situation.
-        let version_start = name.find('@')?;
-        let name = &name[..version_start];
-        let candidate2 = match item {
-            Some(item) => format!("{name}/{item}"),
-            None => name.to_string(),
-        };
-        if let Some(ret) = self.opts.with.get(&candidate2) {
-            return Some(ret);
-        }
-
-        None
-    }
 }
 
 impl Wasmtime {
@@ -736,12 +664,19 @@ impl Wasmtime {
             return;
         }
         let mut interfaces = Vec::new();
-        for (_, name) in self.import_interfaces.iter() {
-            let path = match name {
-                InterfaceName::Remapped { .. } => unreachable!("imported a remapped module"),
-                InterfaceName::Path(path) => path,
-            };
-            interfaces.push(path.join("::"));
+        for (pkg, imports) in self.import_interfaces.iter() {
+            for import in imports {
+                let mut path = String::new();
+                if let Some(pkg) = pkg {
+                    path.push_str(&pkg.namespace.to_snake_case());
+                    path.push_str("::");
+                    path.push_str(&pkg.name.to_snake_case());
+                    path.push_str("::");
+                }
+
+                path.push_str(&import.snake);
+                interfaces.push(path);
+            }
         }
 
         uwrite!(
@@ -824,66 +759,77 @@ impl Wasmtime {
     }
 }
 
-fn resolve_type_in_package(resolve: &Resolve, wit_path: &str) -> anyhow::Result<TypeId> {
-    // Build a map, `packages_to_omit_version`, where that package can be
-    // uniquely identified by its name/namespace combo and as such version
-    // information is not required.
-    let mut packages_with_same_name = HashMap::new();
-    for (id, pkg) in resolve.packages.iter() {
-        packages_with_same_name
-            .entry(PackageName {
-                version: None,
-                ..pkg.name.clone()
-            })
-            .or_insert(Vec::new())
-            .push(id)
+fn resolve_type_in_package(
+    resolve: &Resolve,
+    package_path: &str,
+    type_name: &str,
+) -> anyhow::Result<TypeId> {
+    // foo:bar/baz
+
+    let (namespace, rest) = package_path
+        .split_once(':')
+        .ok_or_else(|| anyhow!("Invalid package path: missing package identifier"))?;
+
+    let (package_name, iface_name) = rest
+        .split_once('/')
+        .ok_or_else(|| anyhow!("Invalid package path: missing namespace separator"))?;
+
+    // TODO: we should handle version annotations
+    if package_name.contains('@') {
+        bail!("Invalid package path: version parsing is not currently handled");
     }
-    let packages_to_omit_version = packages_with_same_name
-        .iter()
-        .filter_map(
-            |(_name, list)| {
-                if list.len() == 1 {
-                    Some(list)
-                } else {
-                    None
-                }
-            },
-        )
-        .flat_map(|l| l)
-        .collect::<HashSet<_>>();
-
-    // Look for an interface whose assigned prefix starts `wit_path`. Not
-    // exactly the most efficient thing ever but is sufficient for now.
-    for (id, interface) in resolve.interfaces.iter() {
-        let iface_name = match &interface.name {
-            Some(name) => name,
-            None => continue,
-        };
-        let pkgid = interface.package.unwrap();
-        let pkgname = &resolve.packages[pkgid].name;
-        let prefix = if packages_to_omit_version.contains(&pkgid) {
-            let mut name = pkgname.clone();
-            name.version = None;
-            format!("{name}/{iface_name}")
+
+    let packages = Vec::from_iter(
+        resolve
+            .package_names
+            .iter()
+            .filter(|(pname, _)| pname.namespace == namespace && pname.name == package_name),
+    );
+
+    if packages.len() != 1 {
+        if packages.is_empty() {
+            bail!("No package named `{}`", namespace);
         } else {
-            resolve.id_of(id).unwrap()
-        };
-        let wit_path = match wit_path.strip_prefix(&prefix) {
-            Some(rest) => rest,
-            None => continue,
-        };
-        let wit_path = wit_path
-            .strip_prefix('/')
-            .ok_or_else(|| anyhow!("expected `/` after interface name"))?;
-
-        return interface
-            .types
-            .get(wit_path)
-            .copied()
-            .ok_or_else(|| anyhow!("no types found to match `{wit_path}` in interface"));
+            // Getting here is a bug, parsing version identifiers would disambiguate the intended
+            // package.
+            bail!(
+                "Multiple packages named `{}` found ({:?})",
+                namespace,
+                packages
+            );
+        }
     }
 
-    bail!("no package/interface found to match `{wit_path}`")
+    let (_, &package_id) = packages[0];
+    let package = &resolve.packages[package_id];
+
+    let (_, &iface_id) = package
+        .interfaces
+        .iter()
+        .find(|(name, _)| name.as_str() == iface_name)
+        .ok_or_else(|| {
+            anyhow!(
+                "Unknown interface `{}` in package `{}`",
+                iface_name,
+                package_path
+            )
+        })?;
+
+    let iface = &resolve.interfaces[iface_id];
+
+    let (_, &type_id) = iface
+        .types
+        .iter()
+        .find(|(n, _)| n.as_str() == type_name)
+        .ok_or_else(|| {
+            anyhow!(
+                "No type named `{}` in package `{}`",
+                package_name,
+                package_path
+            )
+        })?;
+
+    Ok(type_id)
 }
 
 struct InterfaceGenerator<'a> {
@@ -891,15 +837,32 @@ struct InterfaceGenerator<'a> {
     gen: &'a mut Wasmtime,
     resolve: &'a Resolve,
     current_interface: Option<(InterfaceId, &'a WorldKey, bool)>,
+
+    /// A mapping of wit types to their rust type name equivalent. This is the pre-processed
+    /// version of `gen.opts.trappable_error_types`, where the types have been eagerly resolved.
+    trappable_errors: IndexMap<TypeId, String>,
 }
 
 impl<'a> InterfaceGenerator<'a> {
     fn new(gen: &'a mut Wasmtime, resolve: &'a Resolve) -> InterfaceGenerator<'a> {
+        let trappable_errors = gen
+            .opts
+            .trappable_error_type
+            .iter()
+            .map(|te| {
+                let id = resolve_type_in_package(resolve, &te.wit_package_path, &te.wit_type_name)
+                    .context(format!("resolving {:?}", te))?;
+                Ok((id, te.rust_type_name.clone()))
+            })
+            .collect::<anyhow::Result<IndexMap<_, _>>>()
+            .unwrap();
+
         InterfaceGenerator {
             src: Source::default(),
             gen,
             resolve,
             current_interface: None,
+            trappable_errors,
         }
     }
 
@@ -913,6 +876,10 @@ impl<'a> InterfaceGenerator<'a> {
     fn types(&mut self, id: InterfaceId) {
         for (name, id) in self.resolve.interfaces[id].types.iter() {
             self.define_type(name, *id);
+
+            if let Some(rust_name) = self.trappable_errors.get(id) {
+                self.define_trappable_error_type(*id, rust_name.clone())
+            }
         }
     }
 
@@ -945,28 +912,16 @@ impl<'a> InterfaceGenerator<'a> {
         self.assert_type(id, &name);
     }
 
-    fn type_resource(&mut self, id: TypeId, name: &str, resource: &TypeDef, docs: &Docs) {
-        let camel = name.to_upper_camel_case();
+    fn type_resource(&mut self, id: TypeId, _name: &str, resource: &TypeDef, docs: &Docs) {
+        let camel = resource
+            .name
+            .as_ref()
+            .expect("resources are required to be named")
+            .to_upper_camel_case();
 
         if self.types_imported() {
             self.rustdoc(docs);
-
-            let replacement = match self.current_interface {
-                Some((_, key, _)) => self.gen.lookup_replacement(self.resolve, key, Some(name)),
-                None => self.gen.opts.with.get(name).map(|s| s.as_str()),
-            };
-            match replacement {
-                Some(path) => {
-                    uwriteln!(
-                        self.src,
-                        "pub use {}{path} as {camel};",
-                        self.path_to_root()
-                    );
-                }
-                None => {
-                    uwriteln!(self.src, "pub enum {camel} {{}}");
-                }
-            }
+            uwriteln!(self.src, "pub enum {camel} {{}}");
 
             if self.gen.opts.async_.maybe_async() {
                 uwriteln!(self.src, "#[wasmtime::component::__internal::async_trait]")
@@ -1500,11 +1455,9 @@ impl<'a> InterfaceGenerator<'a> {
             _ => return None,
         };
 
-        let name = self.gen.trappable_errors.get(&error_typeid)?;
+        let rust_type = self.trappable_errors.get(&error_typeid)?;
 
-        let mut path = self.path_to_root();
-        uwrite!(path, "{name}");
-        Some((result, error_typeid, path))
+        Some((result, error_typeid, rust_type.clone()))
     }
 
     fn generate_add_to_linker(&mut self, id: InterfaceId, name: &str) {
@@ -1534,59 +1487,14 @@ impl<'a> InterfaceGenerator<'a> {
             }
             self.generate_function_trait_sig(func);
         }
-
-        // Generate `convert_*` functions to convert custom trappable errors
-        // into the representation required by Wasmtime's component API.
-        let mut required_conversion_traits = IndexSet::new();
-        let mut errors_converted = IndexSet::new();
-        let my_error_types = iface
-            .types
-            .iter()
-            .filter(|(_, id)| self.gen.trappable_errors.contains_key(*id))
-            .map(|(_, id)| *id);
-        let used_error_types = iface
-            .functions
-            .iter()
-            .filter_map(|(_, func)| self.special_case_trappable_error(&func.results))
-            .map(|(_, id, _)| id);
-        for err in my_error_types.chain(used_error_types).collect::<Vec<_>>() {
-            let custom_name = &self.gen.trappable_errors[&err];
-            let err = &self.resolve.types[resolve_type_definition_id(self.resolve, err)];
-            let err_name = err.name.as_ref().unwrap();
-            let err_snake = err_name.to_snake_case();
-            let err_camel = err_name.to_upper_camel_case();
-            let owner = match err.owner {
-                TypeOwner::Interface(i) => i,
-                _ => unimplemented!(),
-            };
-            match self.path_to_interface(owner) {
-                Some(path) => {
-                    required_conversion_traits.insert(format!("{path}::Host"));
-                }
-                None => {
-                    if errors_converted.insert(err_name) {
-                        let root = self.path_to_root();
-                        uwriteln!(
-                            self.src,
-                            "fn convert_{err_snake}(&mut self, err: {root}{custom_name}) -> wasmtime::Result<{err_camel}>;"
-                        );
-                    }
-                }
-            }
-        }
         uwriteln!(self.src, "}}");
 
-        let mut where_clause = if self.gen.opts.async_.maybe_async() {
+        let where_clause = if self.gen.opts.async_.maybe_async() {
             "T: Send, U: Host + Send".to_string()
         } else {
             "U: Host".to_string()
         };
 
-        for t in required_conversion_traits {
-            where_clause.push_str(" + ");
-            where_clause.push_str(&t);
-        }
-
         uwriteln!(
             self.src,
             "
@@ -1735,24 +1643,16 @@ impl<'a> InterfaceGenerator<'a> {
             );
         }
 
-        if let Some((_, err, _)) = self.special_case_trappable_error(&func.results) {
-            let err = &self.resolve.types[resolve_type_definition_id(self.resolve, err)];
-            let err_name = err.name.as_ref().unwrap();
-            let owner = match err.owner {
-                TypeOwner::Interface(i) => i,
-                _ => unimplemented!(),
-            };
-            let convert_trait = match self.path_to_interface(owner) {
-                Some(path) => format!("{path}::Host"),
-                None => format!("Host"),
-            };
-            let convert = format!("{}::convert_{}", convert_trait, err_name.to_snake_case());
+        if self.special_case_trappable_error(&func.results).is_some() {
             uwrite!(
                 self.src,
-                "Ok((match r {{
-                    Ok(a) => Ok(a),
-                    Err(e) => Err({convert}(host, e)?),
-                }},))"
+                "match r {{
+                    Ok(a) => Ok((Ok(a),)),
+                    Err(e) => match e.downcast() {{
+                        Ok(api_error) => Ok((Err(api_error),)),
+                        Err(anyhow_error) => Err(anyhow_error),
+                    }}
+                }}"
             );
         } else if func.results.iter_types().len() == 1 {
             uwrite!(self.src, "Ok((r?,))\n");
@@ -1787,7 +1687,9 @@ impl<'a> InterfaceGenerator<'a> {
         self.push_str(")");
         self.push_str(" -> ");
 
-        if let Some((r, _id, error_typename)) = self.special_case_trappable_error(&func.results) {
+        if let Some((r, error_id, error_typename)) =
+            self.special_case_trappable_error(&func.results)
+        {
             // Functions which have a single result `result<ok,err>` get special
             // cased to use the host_wasmtime_rust::Error<err>, making it possible
             // for them to trap or use `?` to propogate their errors
@@ -1798,6 +1700,12 @@ impl<'a> InterfaceGenerator<'a> {
                 self.push_str("()");
             }
             self.push_str(",");
+            if let TypeOwner::Interface(id) = self.resolve.types[error_id].owner {
+                if let Some(path) = self.path_to_interface(id) {
+                    self.push_str(&path);
+                    self.push_str("::");
+                }
+            }
             self.push_str(&error_typename);
             self.push_str(">");
         } else {
@@ -1947,6 +1855,53 @@ impl<'a> InterfaceGenerator<'a> {
         self.src.push_str("}\n");
     }
 
+    fn define_trappable_error_type(&mut self, id: TypeId, rust_name: String) {
+        let info = self.info(id);
+        if self.lifetime_for(&info, TypeMode::Owned).is_some() {
+            panic!("wit error for {rust_name} is not 'static")
+        }
+        let abi_type = self.param_name(id);
+
+        uwriteln!(
+            self.src,
+            "
+                #[derive(Debug)]
+                pub struct {rust_name} {{
+                    inner: anyhow::Error,
+                }}
+                impl std::fmt::Display for {rust_name} {{
+                    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {{
+                        write!(f, \"{{}}\", self.inner)
+                    }}
+                }}
+                impl std::error::Error for {rust_name} {{
+                    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {{
+                        self.inner.source()
+                    }}
+                }}
+                impl {rust_name} {{
+                    pub fn trap(inner: anyhow::Error) -> Self {{
+                        Self {{ inner }}
+                    }}
+                    pub fn downcast(self) -> Result<{abi_type}, anyhow::Error> {{
+                        self.inner.downcast()
+                    }}
+                    pub fn downcast_ref(&self) -> Option<&{abi_type}> {{
+                        self.inner.downcast_ref()
+                    }}
+                    pub fn context(self, s: impl Into<String>) -> Self {{
+                        Self {{ inner: self.inner.context(s.into()) }}
+                    }}
+                }}
+                impl From<{abi_type}> for {rust_name} {{
+                    fn from(abi: {abi_type}) -> {rust_name} {{
+                        {rust_name} {{ inner: anyhow::Error::from(abi) }}
+                    }}
+                }}
+           "
+        );
+    }
+
     fn rustdoc(&mut self, docs: &Docs) {
         let docs = match &docs.contents {
             Some(docs) => docs,
@@ -1958,24 +1913,6 @@ impl<'a> InterfaceGenerator<'a> {
             self.push_str("\n");
         }
     }
-
-    fn path_to_root(&self) -> String {
-        let mut path_to_root = String::new();
-        if let Some((_, key, is_export)) = self.current_interface {
-            match key {
-                WorldKey::Name(_) => {
-                    path_to_root.push_str("super::");
-                }
-                WorldKey::Interface(_) => {
-                    path_to_root.push_str("super::super::super::");
-                }
-            }
-            if is_export {
-                path_to_root.push_str("super::");
-            }
-        }
-        path_to_root
-    }
 }
 
 impl<'a> RustGenerator<'a> for InterfaceGenerator<'a> {
@@ -1988,23 +1925,25 @@ impl<'a> RustGenerator<'a> for InterfaceGenerator<'a> {
     }
 
     fn path_to_interface(&self, interface: InterfaceId) -> Option<String> {
-        if let Some((cur, _, _)) = self.current_interface {
+        let mut path_to_root = String::new();
+        if let Some((cur, key, is_export)) = self.current_interface {
             if cur == interface {
                 return None;
             }
-        }
-        let mut path_to_root = self.path_to_root();
-        match &self.gen.interface_names[&interface] {
-            InterfaceName::Remapped { name_at_root, .. } => path_to_root.push_str(name_at_root),
-            InterfaceName::Path(path) => {
-                for (i, name) in path.iter().enumerate() {
-                    if i > 0 {
-                        path_to_root.push_str("::");
-                    }
-                    path_to_root.push_str(name);
+            match key {
+                WorldKey::Name(_) => {
+                    path_to_root.push_str("super::");
+                }
+                WorldKey::Interface(_) => {
+                    path_to_root.push_str("super::super::super::");
                 }
             }
+            if is_export {
+                path_to_root.push_str("super::");
+            }
         }
+        let InterfaceName { path, .. } = &self.gen.interface_names[&interface];
+        path_to_root.push_str(path);
         Some(path_to_root)
     }
 
diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
index 73ff7f807516..21c1061f2031 100644
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@@ -3,8 +3,6 @@
 - [Introduction](./introduction.md)
 - [Examples](./examples.md)
   - [Debugging WebAssembly](./examples-debugging.md)
-    - [Debugging with `gdb` and `lldb`](./examples-debugging-native-debugger.md)
-    - [Debugging with Core Dumps](./examples-debugging-core-dumps.md)
   - [Profiling WebAssembly](./examples-profiling.md)
     - [Profiling with Perf](./examples-profiling-perf.md)
     - [Profiling with VTune](./examples-profiling-vtune.md)
@@ -17,7 +15,6 @@
     - [WASI](./examples-rust-wasi.md)
     - [Linking Modules](./examples-rust-linking.md)
     - [Debugging](./examples-rust-debugging.md)
-    - [Core Dumps](./examples-rust-core-dumps.md)
     - [Using Multi-Value](./examples-rust-multi-value.md)
   - [Embedding in C](./examples-c-embed.md)
     - [Hello, World!](./examples-c-hello-world.md)
@@ -28,7 +25,6 @@
     - [Debugging](./examples-c-debugging.md)
     - [Using Multi-Value](./examples-c-multi-value.md)
   - [Checking Guests' Memory Accesses](./wmemcheck.md)
-  - [Building a minimal embedding](./examples-minimal.md)
 - [Using WebAssembly from your language](./lang.md)
   - [Rust](./lang-rust.md)
   - [C](./lang-c.md)
diff --git a/docs/WASI-intro.md b/docs/WASI-intro.md
index 8e2507dbdb14..187f3003c44e 100644
--- a/docs/WASI-intro.md
+++ b/docs/WASI-intro.md
@@ -40,7 +40,7 @@ Currently the options are [Wasmtime] and the [browser polyfill], though we
 intend WASI to be implementable in many wasm VMs.
 
 [Wasmtime]: https://github.com/bytecodealliance/wasmtime
-[browser polyfill]: https://github.com/bjorn3/browser_wasi_shim
+[browser polyfill]: https://wasi.dev/polyfill/
 
 ### Wasmtime
 
@@ -52,7 +52,9 @@ or `cargo run --bin wasmtime foo.wasm`.
 
 ### The browser polyfill
 
-The source is [here](https://github.com/bjorn3/browser_wasi_shim).
+The polyfill is online [here](https://wasi.dev/polyfill/).
+
+The source is [here](https://github.com/bytecodealliance/wasmtime/tree/main/crates/wasi-c/js-polyfill).
 
 ## Where can I learn more?
 
diff --git a/docs/WASI-tutorial.md b/docs/WASI-tutorial.md
index 1ca52be105a5..e1e83faebbc7 100644
--- a/docs/WASI-tutorial.md
+++ b/docs/WASI-tutorial.md
@@ -240,7 +240,7 @@ links as well.
 `wasmtime` also has the ability to remap directories:
 
 ```
-$ wasmtime --dir=. --dir=/var/tmp::/tmp demo.wasm test.txt /tmp/somewhere.txt
+$ wasmtime --dir=. --dir=/tmp::/var/tmp demo.wasm test.txt /tmp/somewhere.txt
 $ cat /var/tmp/somewhere.txt
 hello world
 ```
diff --git a/docs/cli-install.md b/docs/cli-install.md
index b6f98b42b778..510170e33974 100644
--- a/docs/cli-install.md
+++ b/docs/cli-install.md
@@ -11,7 +11,7 @@ script. Linux and macOS users can execute the following:
 $ curl https://wasmtime.dev/install.sh -sSf | bash
 ```
 
-This will download a precompiled version of `wasmtime`, place it in
+This will download a precompiled version of `wasmtime` and place it in
 `$HOME/.wasmtime`, and update your shell configuration to place the right
 directory in `PATH`.
 
diff --git a/docs/contributing-architecture.md b/docs/contributing-architecture.md
index 935d1fefbfbe..fc7ff3033970 100644
--- a/docs/contributing-architecture.md
+++ b/docs/contributing-architecture.md
@@ -47,7 +47,7 @@ their implications in Wasmtime:
   involves acquiring a lock, whereas for `Store` below no locks are necessary.
 
 * `wasmtime::Store` - this is the concept of a "store" in WebAssembly. While
-  there's also a formal definition to go off of, it can be thought of as a bag
+  there's also a formal definition to go of this it can be thought of as a bag
   of related WebAssembly objects. This includes instances, globals, memories,
   tables, etc. A `Store` does not implement any form of garbage collection of
   the internal items (there is a `gc` function but that's just for `externref`
@@ -65,7 +65,7 @@ their implications in Wasmtime:
 
 * `wasmtime_runtime::InstanceHandle` - this is the low-level representation of a
   WebAssembly instance. At the same time this is also used as the representation
-  for all host-defined objects. For example if you call `wasmtime::Memory::new`
+  for all host-defined object. For example if you call `wasmtime::Memory::new`
   it'll create an `InstanceHandle` under the hood. This is a very `unsafe` type
   that should probably have all of its functions marked `unsafe` or otherwise
   have more strict guarantees documented about it, but it's an internal type
@@ -180,7 +180,7 @@ Compilation is roughly broken down into a few phases:
    point the module is ready to be instantiated.
 
 A `wasmtime::Module` is an atomically-reference-counted object where upon
-instantiation into a `Store`, the `Store` will hold a strong reference to the
+instantiation into a `Store` the `Store` will hold a strong reference to the
 internals of the module. This means that all instances of a `wasmtime::Module`
 share the same compiled code. Additionally a `wasmtime::Module` is one of the
 few objects that lives outside of a `wasmtime::Store`. This means that
diff --git a/docs/contributing-ci.md b/docs/contributing-ci.md
index fc69f243b0fd..5b7306f66160 100644
--- a/docs/contributing-ci.md
+++ b/docs/contributing-ci.md
@@ -13,32 +13,14 @@ directory][dir] of the repository.
 
 ## PRs and CI
 
-Currently on sample of the full CI test suite is run on every Pull Request. CI
-on PRs is intended to be relatively quick and catch the majority of mistakes and
-errors. By default the test suite is run on x86\_64 Linux but this may change
-depending on what files the PR is modifying. The intention is to run "mostly
-relevant" CI on a PR by default.
+Currently the full CI test suite runs on every Pull Request. All PRs need to
+have that lovely green checkmark before being candidates for being merged. If a
+test is failing you'll want to check out the logs on CI and fix it before the PR
+can be merged.
 
 PR authors are expected to fix CI failures in their PR, unless the CI failure is
 systemic and unrelated to the PR. In that case other maintainers should be
-alerted to ensure that the problem can be addressed. Some reviewers may also
-wait to perform a review until CI is green on the PR as otherwise it may
-indicate changes are needed.
-
-The Wasmtime repository uses GitHub's Merge Queue feature to merge PRs which.
-Entry in to the merge queue requires green CI on the PR beforehand. Maintainers
-who have approved a PR will flag it for entry into the merge queue, and the PR
-will automatically enter the merge queue once CI is green.
-
-When entering the merge queue a PR will have the full test suite executed which
-may include tests that weren't previously run on the PR. This may surface new
-failures, and contributors are expected to fix these failures as well.
-
-To force PRs to execute the full test suite, which takes longer than the default
-test suite for PRs, then contributors can place the string "prtest:full"
-somewhere in any commit of the PR. From that point on the PR will automatically
-run the full test suite as-if it were in the merge queue. Note that when going
-through the merge queue this will rerun tests.
+alerted to ensure that the problem can be addressed.
 
 ## Tests run on CI
 
@@ -82,23 +64,22 @@ documentation of Wasmtime and Cranelift. Currently this consists of:
   Linux build in a really old CentOS container to have a very low glibc
   requirement.
 
-* Tarballs of the Wasmtime C API - produced for the same set of platforms as the
-  CLI above.
+* Tarballs of the Python extension - also produced on the main three platforms
+  these wheels are compiled on each commit.
 
 * Book and API documentation - the book is rendered with `mdbook` and we also
   build all documentation with `cargo doc`.
 
-* A source code tarball which is entirely self-contained. This source tarball
-  has all dependencies vendored so the network is not needed to build it.
-
-* WebAssembly adapters for the component model to translate
-  `wasi_snapshot_preview1` to WASI Preview 2.
-
-Artifacts are produced as part of the full CI suite. This means that artifacts
-are not produced on a PR by default but can be requested via "prtest:full". All
-runs through the merge queue though, which means all merges to `main`, will
-produce a full suite of artifacts. The latest artifacts are available through
-Wasmtime's [`dev` release][dev] and downloads are also available for recent CI
-runs through the CI page in GitHub Actions.
-
-[dev]: https://github.com/bytecodealliance/wasmtime/releases/tag/dev
+Artifacts are produced for every single commit and every single PR. You should
+be able to find a downloadable version of all artifacts produced on the "runs"
+page in GitHub Actions. For example [here's an example
+job](https://github.com/bytecodealliance/wasmtime/actions/runs/50372673), and if
+you're looking at [a specific
+builder](https://github.com/bytecodealliance/wasmtime/runs/488719677?check_suite_focus=true)
+you can see the artifacts link in the top right. Note that artifacts don't
+become available until the whole run finishes.
+
+Commits merged into the `main` branch will rerun CI and will also produce
+artifacts as usual. On the `main` branch, however, documentation is pushed to
+the `gh-pages` branch as well, and binaries are pushed to the `dev` release on
+GitHub. Finally, tagged commits get a whole dedicated release to them too.
diff --git a/docs/contributing-implementing-wasm-proposals.md b/docs/contributing-implementing-wasm-proposals.md
index 13fc927be173..ce42e7e8fbb1 100644
--- a/docs/contributing-implementing-wasm-proposals.md
+++ b/docs/contributing-implementing-wasm-proposals.md
@@ -124,31 +124,3 @@ default in Wasmtime, and can be used as a review checklist.
 
 [phases]: https://github.com/WebAssembly/meetings/blob/master/process/phases.md
 [WABT]: https://github.com/WebAssembly/wabt/
-
-## Adding component functionality to WASI
-The [cap-std](https://github.com/bytecodealliance/cap-std) repository contains
-crates which implement the capability-based version of the Rust standard library
-and extensions to that functionality. Once the functionality has been added to
-the relevant crates of that repository, they can be added into wasmtime by
-including them in the preview2 directory of the [wasi crate](https://github.com/bytecodealliance/wasmtime/tree/main/crates/wasi). 
-
-Currently, WebAssembly modules which rely on preview2 ABI cannot be directly
-executed by the wasmtime command. The following steps allow for testing such
-changes.
-
-1. Build wasmtime with the changes `cargo build --release`
-
-2. Create a simple Webassembly module to test the new component functionality by
-compiling your test code to the `wasm32-wasi` build target.
-
-3. Build the [wasi-preview1-component-adapter](https://github.com/bytecodealliance/wasmtime/tree/main/crates/wasi-preview1-component-adapter)
-as a command adapter. `cargo build -p wasi-preview1-component-adapter --target
-wasm32-wasi --release --features command --no-default-features`
-
-4. Use [wasm-tools](https://github.com/bytecodealliance/wasm-tools) to convert
-the test module to a component. `wasm-tools component new --adapt
-wasi_snapshot_preview1=wasi_snapshot_preview1.command.wasm -o component.wasm
-path/to/test/module`
-
-5. Run the test component created in the previous step with the locally built
-wasmtime. `wasmtime -W component-model=y -S preview2=y component.wasm`
diff --git a/docs/examples-debugging-core-dumps.md b/docs/examples-debugging-core-dumps.md
deleted file mode 100644
index 5f03f368aae9..000000000000
--- a/docs/examples-debugging-core-dumps.md
+++ /dev/null
@@ -1,90 +0,0 @@
-# Debugging WebAssembly with Core Dumps
-
-Wasmtime can be configured to generate [the standard Wasm core dump
-format][spec] whenever guest Wasm programs trap. These core dumps can then be
-consumed by external tooling (such as [`wasmgdb`][wasmgdb]) for post-mortem analysis.
-
-This page focuses on generating and inspecting core dumps via the Wasmtime
-command-line interface. For details on how to generate core dumps via the
-`wasmtime` embedding API, see [Core Dumps in a Rust
-Embedding](./examples-rust-core-dumps.md).
-
-First, we need to compile some code to Wasm that can trap. Consider the
-following Rust code:
-
-```rust,no_run
-// trap.rs
-
-fn main() {
-    foo(42);
-}
-
-fn foo(x: u32) {
-    bar(x);
-}
-
-fn bar(x: u32) {
-    baz(x);
-}
-
-fn baz(x: u32) {
-    assert!(x != 42);
-}
-```
-
-We can compile it to Wasm with the following command:
-
-```shell-session
-$ rustc --target wasm32-wasi -o ./trap.wasm ./trap.rs
-```
-
-Next, we can run it in Wasmtime and capture a core dump when it traps:
-
-```shell-session
-$ wasmtime -D coredump=./trap.coredump ./trap.wasm
-thread 'main' panicked at /home/nick/scratch/trap.rs:14:5:
-assertion failed: x != 42
-note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
-Error: failed to run main module `/home/nick/scratch/trap.wasm`
-
-Caused by:
-    0: core dumped at /home/nick/scratch/trap.coredump
-    1: failed to invoke command default
-    2: wasm coredump generated while executing store_name:
-       modules:
-         <module>
-       instances:
-         Instance(store=1, index=1)
-       memories:
-         Memory(store=1, index=1)
-       globals:
-         Global(store=1, index=0)
-       backtrace:
-       error while executing at wasm backtrace:
-           0: 0x5961 - <unknown>!__rust_start_panic
-           1: 0x562a - <unknown>!rust_panic
-           2: 0x555d - <unknown>!std::panicking::rust_panic_with_hook::h58e7d0b3d70e95b6
-           3: 0x485d - <unknown>!std::panicking::begin_panic_handler::{{closure}}::h1853004619879cfd
-           4: 0x47bd - <unknown>!std::sys_common::backtrace::__rust_end_short_backtrace::hed32bc5557405634
-           5: 0x4f02 - <unknown>!rust_begin_unwind
-           6: 0xac01 - <unknown>!core::panicking::panic_fmt::h53ca5bf48b428895
-           7: 0xb1c5 - <unknown>!core::panicking::panic::h62c2c2bb054da7e1
-           8:  0x661 - <unknown>!trap::baz::h859f39b65389c077
-           9:  0x616 - <unknown>!trap::bar::h7ad12f9c5b730d17
-          10:  0x60a - <unknown>!trap::foo::ha69c95723611c1a0
-          11:  0x5fe - <unknown>!trap::main::hdfcd9f2d150fc3dc
-          12:  0x434 - <unknown>!core::ops::function::FnOnce::call_once::h24336e950fb97d1e
-          13:  0x40b - <unknown>!std::sys_common::backtrace::__rust_begin_short_backtrace::h2b37384d2b1a57ff
-          14:  0x4ec - <unknown>!std::rt::lang_start::{{closure}}::he86eb1b6ac6d7501
-          15: 0x24f7 - <unknown>!std::rt::lang_start_internal::h21f6a1d8f3633b54
-          16:  0x497 - <unknown>!std::rt::lang_start::h7d256f21902ff32b
-          17:  0x687 - <unknown>!__main_void
-          18:  0x3e6 - <unknown>!_start
-       note: using the `WASMTIME_BACKTRACE_DETAILS=1` environment variable may show more debugging information
-```
-
-You now have a core dump at `./trap.coredump` that can be consumed by external
-tooling to do post-mortem analysis of the failure.
-
-[spec]: https://github.com/WebAssembly/tool-conventions/blob/main/Coredump.md
-[wasmgdb]: https://github.com/xtuc/wasm-coredump/blob/main/bin/wasmgdb/README.md
diff --git a/docs/examples-debugging-native-debugger.md b/docs/examples-debugging-native-debugger.md
deleted file mode 100644
index b61fe494fef3..000000000000
--- a/docs/examples-debugging-native-debugger.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# Debugging with `gdb` and `lldb`
-
-The following steps describe how to use `gdb` or `lldb` to debug both the Wasm
-guest and the host (i.e. the Wasmtime CLI or your Wasmtime-embedding program) at
-the same time:
-
-1. Compile your WebAssembly with debug info enabled, usually `-g`; for
-   example:
-
-    ```sh
-    clang foo.c -g -o foo.wasm
-    ```
-
-2. Run Wasmtime with the debug info enabled; this is `-D debug-info` from the
-   CLI and `Config::debug_info(true)` in an embedding (e.g. see [debugging in a
-   Rust embedding](./examples-rust-debugging.md))
-
-3. Use a supported debugger:
-
-    ```sh
-    lldb -- wasmtime run -D debug-info foo.wasm
-    ```
-    ```sh
-    gdb --args wasmtime run -D debug-info foo.wasm
-    ```
-
-If you run into trouble, the following discussions might help:
-
-- On MacOS with LLDB you may need to run: `settings set
-  plugin.jit-loader.gdb.enable on`
-  ([#1953](https://github.com/bytecodealliance/wasmtime/issues/1953))
-
-- With LLDB, call `__vmctx.set()` to set the current context before calling any
-  dereference operators
-  ([#1482](https://github.com/bytecodealliance/wasmtime/issues/1482)):
-  ```sh
-  (lldb) p __vmctx->set()
-  (lldb) p *foo
-  ```
-
-- The address of the start of instance memory can be found in `__vmctx->memory`
-
-- On Windows you may experience degraded WASM compilation throughput due to the
-  enablement of additional native heap checks when under the debugger by default.
-  You can set the environment variable `_NO_DEBUG_HEAP` to `1` to disable them.
diff --git a/docs/examples-debugging.md b/docs/examples-debugging.md
index b5301f05e6c7..c373e05c76de 100644
--- a/docs/examples-debugging.md
+++ b/docs/examples-debugging.md
@@ -1,11 +1,41 @@
 # Debugging WebAssembly
 
-Wasmtime currently provides the following support for debugging misbehaving
-WebAssembly:
+The following steps describe a common way to debug a WebAssembly module in
+Wasmtime:
 
-* We can [live debug and step through the guest Wasm and the host at the same
-  time with `gdb` or `lldb`.](./examples-debugging-native-debugger.md)
+1. Compile your WebAssembly with debug info enabled, usually `-g`; for
+   example:
 
-* When a Wasm guest traps, we can [generate Wasm core
-  dumps](./examples-debugging-core-dumps.md), that can be consumed by other
-  tools for post-mortem analysis.
+    ```sh
+    clang foo.c -g -o foo.wasm
+    ```
+
+2. Run Wasmtime with the debug info enabled; this is `-g` from the CLI and
+   `Config::debug_info(true)` in an embedding (e.g. see [debugging in a Rust
+   embedding](./examples-rust-debugging.md))
+
+3. Use a supported debugger:
+
+    ```sh
+    lldb -- wasmtime run -D debug-info foo.wasm
+    ```
+    ```sh
+    gdb --args wasmtime run -D debug-info foo.wasm
+    ```
+
+If you run into trouble, the following discussions might help:
+
+- On MacOS with LLDB you may need to run: `settings set
+  plugin.jit-loader.gdb.enable on`
+  ([#1953](https://github.com/bytecodealliance/wasmtime/issues/1953))
+- With LLDB, call `__vmctx.set()` to set the current context before calling any
+  dereference operators
+  ([#1482](https://github.com/bytecodealliance/wasmtime/issues/1482)):
+  ```sh
+  (lldb) p __vmctx->set()
+  (lldb) p *foo
+  ```
+- The address of the start of instance memory can be found in `__vmctx->memory`
+- On Windows you may experience degraded WASM compilation throughput due to the
+  enablement of additional native heap checks when under the debugger by default.
+  You can set the environment variable `_NO_DEBUG_HEAP` to `1` to disable them.
diff --git a/docs/examples-minimal.md b/docs/examples-minimal.md
deleted file mode 100644
index e007e701c1e8..000000000000
--- a/docs/examples-minimal.md
+++ /dev/null
@@ -1,281 +0,0 @@
-# Building a Minimal Wasmtime embedding
-
-Wasmtime embeddings may wish to optimize for binary size and runtime footprint
-to fit on a small system. This documentation is intended to guide some features
-of Wasmtime and how to best produce a minimal build of Wasmtime.
-
-## Building a minimal CLI
-
-> *Note*: the exact numbers in this section were last updated on 2023-10-18 on a
-> macOS aarch64 host. For up-to-date numbers consult the artifacts in the [`dev`
-> release of Wasmtime][dev] where the `wasmtime-min` executable represents the
-> culmination of these steps.
-
-[dev]: https://github.com/bytecodealliance/wasmtime/releases/tag/dev
-
-Many Wasmtime embeddings go through the `wasmtime` crate as opposed to the
-`wasmtime` CLI executable, but to start out let's take a look at minimizing the
-command line executable. By default the wasmtime command line executable is
-relatively large:
-
-```shell
-$ cargo build
-$ ls -l ./target/debug/wasmtime
--rwxr-xr-x@ 1 root  root    140M Oct 18 08:33 target/debug/wasmtime
-```
-
-The easiest size optimization is to compile with optimizations. This will strip
-lots of dead code and additionally generate much less debug information by
-default
-
-```shell
-$ cargo build --release
-$ ls -l ./target/release/wasmtime
--rwxr-xr-x@ 1 root  root     33M Oct 18 08:34 target/release/wasmtime
-```
-
-Much better, but still relatively large! The next thing that can be done is to
-disable the default features of the `wasmtime-cli` crate. This will remove all
-optional functionality from the crate and strip it down to the bare bones
-functionality.
-
-```shell
-$ cargo build --release --no-default-features
-$ ls -l ./target/release/wasmtime
--rwxr-xr-x@ 1 root  root    6.7M Oct 18 08:37 target/release/wasmtime
-```
-
-Note that this executable is stripped to the bare minimum of functionality which
-notably means it does not have a compiler for WebAssembly files. This means that
-`wasmtime compile` is no longer supported meaning that `*.cwasm` files must be
-fed to `wasmtime run` to execute files. Additionally error messages will be
-worse in this mode as less contextual information is provided.
-
-The final Wasmtime-specific optimization you can apply is to disable logging
-statements. Wasmtime and its dependencies make use of the [`log`
-crate](https://docs.rs/log) and [`tracing` crate](https://docs.rs/tracing) for
-debugging and diagnosing. For a minimal build this isn't needed though so this
-can all be disabled through Cargo features to shave off a small amount of code.
-Note that for custom embeddings you'd need to replicate the `disable-logging`
-feature which sets the `max_level_off` feature for the `log` and `tracing`
-crate.
-
-```shell
-$ cargo build --release --no-default-features --features disable-logging
-$ ls -l ./target/release/wasmtime
--rwxr-xr-x@ 1 root  root    6.7M Oct 18 08:37 target/release/wasmtime
-```
-
-At this point the next line of tricks to apply to minimize binary size are
-[general tricks-of-the-trade for Rust
-programs](https://github.com/johnthagen/min-sized-rust) and are no longer
-specific to Wasmtime. For example the first thing that can be done is to
-optimize for size rather than speed via rustc's `s` optimization level.
-This uses Cargo's [environment-variable based configuration][cargo-env-config]
-via the `CARGO_PROFILE_RELEASE_OPT_LEVEL=s` environment variable to configure
-this.
-
-[cargo-env-config]: https://doc.rust-lang.org/cargo/reference/config.html#profile
-
-```shell
-$ export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
-$ cargo build --release --no-default-features --features disable-logging
-$ ls -l ./target/release/wasmtime
--rwxr-xr-x@ 1 root  root    6.8M Oct 18 08:40 target/release/wasmtime
-```
-
-Note that the size has increased here slightly instead of going down. Optimizing
-for speed-vs-size can affect a number of heuristics in LLVM so it's best to test
-out locally what's best for your embedding. Further examples below continue to
-pass this flag since by the end it will produce a smaller binary than the
-default optimization level of "3" for release mode. You may wish to also try an
-optimization level of "2" and see which produces a smaller build for you.
-
-After optimizations levels the next compilation setting to configure is
-Rust's "panic=abort" mode where panics translate to process aborts rather than
-unwinding. This removes landing pads from code as well as unwind tables from the
-executable.
-
-```shell
-$ export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
-$ export CARGO_PROFILE_RELEASE_PANIC=abort
-$ cargo build --release --no-default-features --features disable-logging
-$ ls -l ./target/release/wasmtime
--rwxr-xr-x@ 1 root  root    5.0M Oct 18 08:40 target/release/wasmtime
-```
-
-Next, if the compile time hit is acceptable, LTO can be enabled to provide
-deeper opportunities for compiler optimizations to remove dead code and
-deduplicate. Do note that this will take a significantly longer amount of time
-to compile than previously. Here LTO is configured with
-`CARGO_PROFILE_RELEASE_LTO=true`.
-
-```shell
-$ export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
-$ export CARGO_PROFILE_RELEASE_PANIC=abort
-$ export CARGO_PROFILE_RELEASE_LTO=true
-$ cargo build --release --no-default-features --features disable-logging
-$ ls -l ./target/release/wasmtime
--rwxr-xr-x@ 1 root  root    3.3M Oct 18 08:42 target/release/wasmtime
-```
-
-Similar to LTO above rustc can be further instructed to place all crates into
-their own single object file instead of multiple by default. This again
-increases compile times. Here that's done with
-`CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1`.
-
-```shell
-$ export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
-$ export CARGO_PROFILE_RELEASE_PANIC=abort
-$ export CARGO_PROFILE_RELEASE_LTO=true
-$ export CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1
-$ cargo build --release --no-default-features --features disable-logging
-$ ls -l ./target/release/wasmtime
--rwxr-xr-x@ 1 root  root    3.3M Oct 18 08:43 target/release/wasmtime
-```
-
-Note that with LTO using a single codegen unit may only have marginal benefit.
-If not using LTO, however, a single codegen unit will likely provide benefit
-over the default 16 codegen units.
-
-One final flag before getting to nightly features is to strip debug information
-from the standard library. In `--release` mode Cargo by default doesn't generate
-debug information for local crates, but the Rust standard library may have debug
-information still included with it. This is configured via
-`CARGO_PROFILE_RELEASE_STRIP=debuginfo`
-
-```shell
-$ export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
-$ export CARGO_PROFILE_RELEASE_PANIC=abort
-$ export CARGO_PROFILE_RELEASE_LTO=true
-$ export CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1
-$ export CARGO_PROFILE_RELEASE_STRIP=debuginfo
-$ cargo build --release --no-default-features --features disable-logging
-$ ls -l ./target/release/wasmtime
--rwxr-xr-x@ 1 root  root    2.4M Oct 18 08:44 target/release/wasmtime
-```
-
-Next, if your use case allows it, the Nightly Rust toolchain provides a number
-of other options to minimize the size of binaries. Note the usage of `+nightly` here
-to the `cargo` command to use a Nightly toolchain (assuming your local toolchain
-is installed with rustup). Also note that due to the nature of nightly the exact
-flags here may not work in the future. Please open an issue with Wasmtime if
-these commands don't work and we'll update the documentation.
-
-The first nightly feature we can leverage is to remove filename and line number
-information in panics with `-Zlocation-detail=none`
-
-```shell
-$ export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
-$ export CARGO_PROFILE_RELEASE_PANIC=abort
-$ export CARGO_PROFILE_RELEASE_LTO=true
-$ export CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1
-$ export CARGO_PROFILE_RELEASE_STRIP=debuginfo
-$ export RUSTFLAGS="-Zlocation-detail=none"
-$ cargo +nightly build --release --no-default-features --features disable-logging
-$ ls -l ./target/release/wasmtime
--rwxr-xr-x@ 1 root  root    2.4M Oct 18 08:43 target/release/wasmtime
-```
-
-Further along the line of nightly features the next optimization will recompile
-the standard library without unwinding information, trimming out a bit more from
-the standard library. This uses the `-Zbuild-std` flag to Cargo. Note that this
-additionally requires `--target` as well which will need to be configured for
-your particular platform.
-
-```shell
-$ export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
-$ export CARGO_PROFILE_RELEASE_PANIC=abort
-$ export CARGO_PROFILE_RELEASE_LTO=true
-$ export CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1
-$ export CARGO_PROFILE_RELEASE_STRIP=debuginfo
-$ export RUSTFLAGS="-Zlocation-detail=none"
-$ cargo +nightly build --release --no-default-features --features disable-logging \
-    -Z build-std=std,panic_abort --target aarch64-apple-darwin
-$ ls -l ./target/aarch64-apple-darwin/release/wasmtime
--rwxr-xr-x@ 1 root  root    2.3M Oct 18 09:39 target/aarch64-apple-darwin/release/wasmtime
-```
-
-Next the Rust standard library has some optional features in addition to
-Wasmtime, such as printing of backtraces. This may not be required in minimal
-environments so the features of the standard library can be disabled with the
-`-Zbuild-std-features=` flag which configures the set of enabled features to be
-empty.
-
-```shell
-$ export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
-$ export CARGO_PROFILE_RELEASE_PANIC=abort
-$ export CARGO_PROFILE_RELEASE_LTO=true
-$ export CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1
-$ export CARGO_PROFILE_RELEASE_STRIP=debuginfo
-$ export RUSTFLAGS="-Zlocation-detail=none"
-$ cargo +nightly build --release --no-default-features --features disable-logging \
-    -Z build-std=std,panic_abort --target aarch64-apple-darwin \
-    -Z build-std-features=
-$ ls -l ./target/aarch64-apple-darwin/release/wasmtime
--rwxr-xr-x@ 1 root  root    2.1M Oct 18 09:39 target/aarch64-apple-darwin/release/wasmtime
-```
-
-## Minimizing further
-
-Above shows an example of taking the default `cargo build` result of 130M down
-to a 2.1M binary for the `wasmtime` executable. Similar steps can be done to
-reduce the size of the C API binary artifact as well which currently produces a
-~2.8M dynamic library. This is currently the smallest size with the source code
-as-is, but there are more size reductions which haven't been implemented yet.
-
-This is a listing of some example sources of binary size. Some sources of binary
-size may not apply to custom embeddings since, for example, your custom
-embedding might already not use WASI and might already not be included.
-
-* WASI in the Wasmtime CLI - currently the CLI includes all of WASI. This
-  includes two separate implementations of WASI - one for preview2 and one for
-  preview1. This accounts for 1M+ of space which is a significant chunk of the
-  remaining 2.1M.  While removing just preview2 or preview1 would be easy enough
-  with a Cargo feature, the resulting executable wouldn't be able to do
-  anything. Something like a [plugin feature for the
-  CLI](https://github.com/bytecodealliance/wasmtime/issues/7348), however, would
-  enable removing WASI while still being a usable executable.
-
-* Argument parsing in the Wasmtime CLI - as a command line executable `wasmtime`
-  contains parsing of command line arguments which currently uses the `clap`
-  crate. This contributes ~200k of binary size to the final executable which
-  would likely not be present in a custom embedding of Wasmtime. While this
-  can't be removed from Wasmtime it's something to consider when evaluating the
-  size of CI artifacts.
-
-* Cranelift in the C API - one of the features of Wasmtime is the ability to
-  have a runtime without Cranelift that only supports precompiled (AOT) wasm
-  modules. It's [not possible to build the C API without
-  Cranelift](https://github.com/bytecodealliance/wasmtime/issues/7349) though
-  because defining host functions requires Cranelift at this time to emit some
-  stubs.  This means that the C API is significantly larger than a custom Rust
-  embedding which doesn't suffer from the same restriction. This means that
-  while it's still possible to build an embedding of Wasmtime which doesn't have
-  Cranelift it's not easy to see what it might look like size-wise from
-  looking at the C API artifacts.
-
-* Formatting strings in Wasmtime - Wasmtime makes extensive use of formatting
-  strings for error messages and other purposes throughout the implementation.
-  Most of this is intended for debugging and understanding more when something
-  goes wrong, but much of this is not necessary for a truly minimal embedding.
-  In theory much of this could be conditionally compiled out of the Wasmtime
-  project to produce a smaller executable. Just how much of the final binary
-  size is accounted for by formatting string is unknown, but it's well known in
-  Rust that `std::fmt` is not the slimmest of modules.
-
-* Cranelift vs Winch - the "min" builds on CI try to exclude Cranelift from
-  their binary footprint (e.g. the CLI excludes it) but this comes at a cost of
-  the final executable not supporting compilation of wasm modules. If this is
-  required then no effort has yet been put into minimizing the code size of
-  Cranelift itself. One possible tradeoff that can be made though is to choose
-  between the Winch baseline compiler vs Cranelift. Winch should be much smaller
-  from a compiled footprint point of view while not sacrificing everything in
-  terms of performance. Note though that Winch is still under development.
-
-Above are some future avenues to take in terms of reducing the binary size of
-Wasmtime and various tradeoffs that can be made. The Wasmtime project is eager
-to hear embedder use cases/profiles if Wasmtime is not suitable for binary size
-reasons today. Please feel free to [open an
-issue](https://github.com/bytecodealliance/wasmtime/issues/new) and let us know
-and we'd be happy to discuss more how best to handle a particular use case.
diff --git a/docs/examples-profiling-perf.md b/docs/examples-profiling-perf.md
index 2c4605db69cb..63317aeddf10 100644
--- a/docs/examples-profiling-perf.md
+++ b/docs/examples-profiling-perf.md
@@ -123,7 +123,7 @@ have any problems, please don't hesitate to [file an issue]!
 If the jitdump profile doesn't give you enough information by default, you can
 also enable dwarf debug information to be generated for JIT code which should
 give the `perf` profiler more information about what's being profiled. This can
-include information like more descriptive function names, filenames, and line
+include information like more desriptive function names, filenames, and line
 numbers.
 
 Enabling dwarf debug information for JIT code depends on how you're using
@@ -170,7 +170,7 @@ fib(42) = 267914296
 $ perf inject --jit --input perf.data --output perf.jit.data
 ```
 
-And we should have all our information now! We can execute `perf report` for
+And we should have all out information now! We can execute `perf report` for
 example to see that 99% of our runtime (as expected) is spent in our `fib`
 function. Note that the symbol has been demangled to `fib::fib` which is what
 the Rust symbol is:
diff --git a/docs/examples-rust-core-dumps.md b/docs/examples-rust-core-dumps.md
deleted file mode 100644
index a1169fe58e1a..000000000000
--- a/docs/examples-rust-core-dumps.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Core Dumps
-
-You can also [browse this source code online][code] and clone the wasmtime
-repository to run the example locally.
-
-[code]: https://github.com/bytecodealliance/wasmtime/blob/main/examples/fib-debug/main.rs
-
-This examples shows how to configure capturing [core dumps] when a Wasm guest
-traps that can then be passed to external tools (like [`wasmgdb`]) for
-post-mortem analysis.
-
-[core dumps]: https://github.com/WebAssembly/tool-conventions/blob/main/Coredump.md
-[`wasmgdb`]: https://github.com/xtuc/wasm-coredump/blob/main/bin/wasmgdb/README.md
-
-## `main.rs`
-
-```rust,ignore
-{{#include ../examples/coredump.rs}}
-```
diff --git a/docs/lang-python.md b/docs/lang-python.md
index baef9de08581..04be40d7a77f 100644
--- a/docs/lang-python.md
+++ b/docs/lang-python.md
@@ -11,7 +11,7 @@ started!
 
 ## Getting started and simple example
 
-First, copy this example WebAssembly text module into your project with the filename `gcd.wat`. It exports a
+First, copy this example WebAssembly text module into your project. It exports a
 function for calculating the greatest common denominator of two numbers.
 
 ```wat
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 32343ddae679..8e61cff315c7 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.10)
 project(wasmtime-examples)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(CMAKE_CXX_STANDARD 11)
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../crates/c-api ${CMAKE_CURRENT_BINARY_DIR}/wasmtime)
 
@@ -40,7 +38,6 @@ endfunction()
 enable_testing()
 
 # Add all examples
-create_target(async async.cpp)
 create_target(externref externref.c)
 create_target(fib-debug fib-debug/main.c)
 create_target(fuel fuel.c)
@@ -73,4 +70,4 @@ create_rust_test(multimemory)
 create_rust_test(serialize)
 create_rust_test(threads)
 create_rust_test(wasi)
-create_rust_test(tokio wasmtime-wasi/tokio)
+create_rust_test(tokio wasmtime-wasi/tokio)
\ No newline at end of file
diff --git a/examples/async.cpp b/examples/async.cpp
deleted file mode 100644
index a5feae1152da..000000000000
--- a/examples/async.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
-Example of instantiating of the WebAssembly module and invoking its exported
-function.
-
-You can compile and run this example on Linux with:
-
-   cargo build --release -p wasmtime-c-api
-   c++ examples/async.cpp \
-       -I crates/c-api/include \
-       -I crates/c-api/wasm-c-api/include \
-       target/release/libwasmtime.a \
-       -std=c++11 \
-       -lpthread -ldl -lm \
-       -o async
-   ./async
-
-Note that on Windows and macOS the command will be similar, but you'll need
-to tweak the `-lpthread` and such annotations.
-
-You can also build using cmake:
-
-mkdir build && cd build && cmake .. && cmake --build . --target wasmtime-async
-*/
-
-#include <array>
-#include <assert.h>
-#include <chrono>
-#include <cstdlib>
-#include <fstream>
-#include <future>
-#include <iostream>
-#include <memory>
-#include <optional>
-#include <sstream>
-#include <streambuf>
-#include <string>
-#include <thread>
-#include <wasmtime.h>
-
-namespace {
-
-template <typename T, void (*fn)(T *)> struct deleter {
-  void operator()(T *ptr) { fn(ptr); }
-};
-template <typename T, void (*fn)(T *)>
-using handle = std::unique_ptr<T, deleter<T, fn>>;
-
-void exit_with_error(std::string msg, wasmtime_error_t *err,
-                     wasm_trap_t *trap) {
-  std::cerr << "error: " << msg << std::endl;
-  wasm_byte_vec_t error_message;
-  if (err) {
-    wasmtime_error_message(err, &error_message);
-  } else {
-    wasm_trap_message(trap, &error_message);
-  }
-  std::cerr << std::string(error_message.data, error_message.size) << std::endl;
-  wasm_byte_vec_delete(&error_message);
-  std::exit(1);
-}
-
-handle<wasm_engine_t, wasm_engine_delete> create_engine() {
-  wasm_config_t *config = wasm_config_new();
-  assert(config != nullptr);
-  wasmtime_config_async_support_set(config, true);
-  wasmtime_config_consume_fuel_set(config, true);
-  handle<wasm_engine_t, wasm_engine_delete> engine;
-  // this takes ownership of config
-  engine.reset(wasm_engine_new_with_config(config));
-  assert(engine);
-  return engine;
-}
-
-handle<wasmtime_store_t, wasmtime_store_delete>
-create_store(wasm_engine_t *engine) {
-  handle<wasmtime_store_t, wasmtime_store_delete> store;
-  store.reset(wasmtime_store_new(engine, nullptr, nullptr));
-  assert(store);
-  return store;
-}
-
-handle<wasmtime_linker_t, wasmtime_linker_delete>
-create_linker(wasm_engine_t *engine) {
-  handle<wasmtime_linker_t, wasmtime_linker_delete> linker;
-  linker.reset(wasmtime_linker_new(engine));
-  assert(linker);
-  return linker;
-}
-
-handle<wasmtime_module_t, wasmtime_module_delete>
-compile_wat_module_from_file(wasm_engine_t *engine,
-                             const std::string &filename) {
-  std::ifstream t(filename);
-  std::stringstream buffer;
-  buffer << t.rdbuf();
-  if (t.bad()) {
-    std::cerr << "error reading file: " << filename << std::endl;
-    std::exit(1);
-  }
-  const std::string &content = buffer.str();
-  wasm_byte_vec_t wasm_bytes;
-  handle<wasmtime_error_t, wasmtime_error_delete> error{
-      wasmtime_wat2wasm(content.data(), content.size(), &wasm_bytes)};
-  if (error) {
-    exit_with_error("failed to parse wat", error.get(), nullptr);
-  }
-  wasmtime_module_t *mod_ptr = nullptr;
-  error.reset(wasmtime_module_new(engine,
-                                  reinterpret_cast<uint8_t *>(wasm_bytes.data),
-                                  wasm_bytes.size, &mod_ptr));
-  wasm_byte_vec_delete(&wasm_bytes);
-  handle<wasmtime_module_t, wasmtime_module_delete> mod{mod_ptr};
-  if (!mod) {
-    exit_with_error("failed to compile module", error.get(), nullptr);
-  }
-  return mod;
-}
-
-class printer_thread_state {
-public:
-  void set_value_to_print(int32_t v) {
-    _print_finished_future = _print_finished.get_future();
-    _value_to_print.set_value(v);
-  }
-  int32_t get_value_to_print() { return _value_to_print.get_future().get(); }
-
-  bool print_is_pending() const {
-    return _print_finished_future.valid() &&
-           _print_finished_future.wait_for(std::chrono::seconds(0)) !=
-               std::future_status::ready;
-  }
-  void wait_for_print_result() const { _print_finished_future.wait(); }
-  void get_print_result() { _print_finished_future.get(); }
-  void set_print_success() { _print_finished.set_value(); }
-
-private:
-  std::promise<int32_t> _value_to_print;
-  std::promise<void> _print_finished;
-  std::future<void> _print_finished_future;
-};
-
-printer_thread_state printer_state;
-
-struct async_call_env {
-  wasm_trap_t **trap_ret;
-};
-
-bool poll_print_finished_state(void *env) {
-  std::cout << "polling async host function result" << std::endl;
-  auto *async_env = static_cast<async_call_env *>(env);
-  // Don't block, just poll the future state.
-  if (printer_state.print_is_pending()) {
-    return false;
-  }
-  try {
-    printer_state.get_print_result();
-  } catch (const std::exception &ex) {
-    std::string msg = ex.what();
-    *async_env->trap_ret = wasmtime_trap_new(msg.data(), msg.size());
-  }
-  return true;
-}
-} // namespace
-
-int main() {
-  // A thread that will async perform host function calls.
-  std::thread printer_thread([]() {
-    int32_t value_to_print = printer_state.get_value_to_print();
-    std::cout << "recieved value to print!" << std::endl;
-    std::this_thread::sleep_for(std::chrono::milliseconds(500));
-    std::cout << "printing: " << value_to_print << std::endl;
-    std::this_thread::sleep_for(std::chrono::milliseconds(500));
-    std::cout << "signaling that value is printed" << std::endl;
-    printer_state.set_print_success();
-  });
-
-  handle<wasmtime_error_t, wasmtime_error_delete> error;
-
-  auto engine = create_engine();
-  auto store = create_store(engine.get());
-  // This pointer is unowned.
-  auto *context = wasmtime_store_context(store.get());
-  // Configure the store to periodically yield control
-  wasmtime_context_set_fuel(context, 100000);
-  wasmtime_context_fuel_async_yield_interval(context, /*interval=*/10000);
-
-  auto compiled_module =
-      compile_wat_module_from_file(engine.get(), "examples/async.wat");
-
-  auto linker = create_linker(engine.get());
-  static std::string host_module_name = "host";
-  static std::string host_func_name = "print";
-
-  // Declare our async host function's signature and definition.
-  wasm_valtype_vec_t arg_types;
-  wasm_valtype_vec_t result_types;
-  wasm_valtype_vec_new_uninitialized(&arg_types, 1);
-  arg_types.data[0] = wasm_valtype_new_i32();
-  wasm_valtype_vec_new_empty(&result_types);
-  handle<wasm_functype_t, wasm_functype_delete> functype{
-      wasm_functype_new(&arg_types, &result_types)};
-
-  error.reset(wasmtime_linker_define_async_func(
-      linker.get(), host_module_name.data(), host_module_name.size(),
-      host_func_name.data(), host_func_name.size(), functype.get(),
-      [](void *, wasmtime_caller_t *, const wasmtime_val_t *args, size_t,
-         wasmtime_val_t *, size_t, wasm_trap_t **trap_ret,
-         wasmtime_async_continuation_t *continutation_ret) {
-        std::cout << "invoking async host function" << std::endl;
-        printer_state.set_value_to_print(args[0].of.i32);
-
-        continutation_ret->callback = &poll_print_finished_state;
-        continutation_ret->env = new async_call_env{trap_ret};
-        continutation_ret->finalizer = [](void *env) {
-          std::cout << "deleting async_call_env" << std::endl;
-          delete static_cast<async_call_env *>(env);
-        };
-      },
-      /*env=*/nullptr, /*finalizer=*/nullptr));
-  if (error) {
-    exit_with_error("failed to define host function", error.get(), nullptr);
-  }
-
-  // Now instantiate our module using the linker.
-  handle<wasmtime_call_future_t, wasmtime_call_future_delete> call_future;
-  wasm_trap_t *trap_ptr = nullptr;
-  wasmtime_error_t *error_ptr = nullptr;
-  wasmtime_instance_t instance;
-  call_future.reset(wasmtime_linker_instantiate_async(
-      linker.get(), context, compiled_module.get(), &instance, &trap_ptr,
-      &error_ptr));
-  while (!wasmtime_call_future_poll(call_future.get())) {
-    std::cout << "yielding instantiation!" << std::endl;
-  }
-  error.reset(error_ptr);
-  handle<wasm_trap_t, wasm_trap_delete> trap{trap_ptr};
-  if (error || trap) {
-    exit_with_error("failed to instantiate module", error.get(), trap.get());
-  }
-  // delete call future - it's no longer needed
-  call_future = nullptr;
-  // delete the linker now that we've created our instance
-  linker = nullptr;
-
-  // Grab our exported function
-  static std::string guest_func_name = "print_fibonacci";
-  wasmtime_extern_t guest_func_extern;
-  bool found =
-      wasmtime_instance_export_get(context, &instance, guest_func_name.data(),
-                                   guest_func_name.size(), &guest_func_extern);
-  assert(found);
-  assert(guest_func_extern.kind == WASMTIME_EXTERN_FUNC);
-
-  // Now call our print_fibonacci function with n=15
-  std::array<wasmtime_val_t, 1> args;
-  args[0].kind = WASMTIME_I32;
-  args[0].of.i32 = 15;
-  std::array<wasmtime_val_t, 0> results;
-  call_future.reset(wasmtime_func_call_async(
-      context, &guest_func_extern.of.func, args.data(), args.size(),
-      results.data(), results.size(), &trap_ptr, &error_ptr));
-  // Poll the execution of the call. This can yield control back if there is an
-  // async host call or if we ran out of fuel.
-  while (!wasmtime_call_future_poll(call_future.get())) {
-    // if we have an async host call pending then wait for that future to finish
-    // before continuing.
-    if (printer_state.print_is_pending()) {
-      std::cout << "waiting for async host function to complete" << std::endl;
-      printer_state.wait_for_print_result();
-      std::cout << "async host function completed" << std::endl;
-      continue;
-    }
-    // Otherwise we ran out of fuel and yielded.
-    std::cout << "yield!" << std::endl;
-  }
-  // Extract if there were failures or traps after poll returns that execution
-  // completed.
-  error.reset(error_ptr);
-  trap.reset(trap_ptr);
-  if (error || trap) {
-    exit_with_error("running guest function failed", error.get(), trap.get());
-  }
-  call_future = nullptr;
-  // At this point, if our host function returned results they would be
-  // available in the `results` array.
-  std::cout << "async function call complete!" << std::endl;
-
-  // Join our thread and exit.
-  printer_thread.join();
-  return 0;
-}
diff --git a/examples/async.wat b/examples/async.wat
deleted file mode 100644
index 14f129892603..000000000000
--- a/examples/async.wat
+++ /dev/null
@@ -1,18 +0,0 @@
-(module
-  (import "host" "print" (func $print (param i32)))
-  (func $fibonacci (param $n i32) (result i32)
-    (if
-      (i32.lt_s (local.get $n) (i32.const 2))
-      (then (return (local.get $n)))
-    )
-    (i32.add
-      (call $fibonacci (i32.sub (local.get $n) (i32.const 1)))
-      (call $fibonacci (i32.sub (local.get $n) (i32.const 2)))
-    )
-  )
-  (func $print_fibonacci (param $n i32)
-    (call $fibonacci (local.get $n))
-    (call $print)
-  )
-  (export "print_fibonacci" (func $print_fibonacci))
-)
diff --git a/examples/coredump.rs b/examples/coredump.rs
deleted file mode 100644
index cd4405476696..000000000000
--- a/examples/coredump.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-//! An example of how to configure capturing core dumps when the guest Wasm
-//! traps that can then be passed to external tools for post-mortem analysis.
-
-// You can execute this example with `cargo run --example coredump`.
-
-use anyhow::Result;
-use wasmtime::*;
-
-fn main() -> Result<()> {
-    println!("Configure core dumps to be captured on trap.");
-    let mut config = Config::new();
-    config.coredump_on_trap(true);
-    let engine = Engine::new(&config)?;
-    let mut store = Store::new(&engine, ());
-
-    println!("Define a Wasm module that will mutate local state and then trap.");
-    let module = Module::new(
-        store.engine(),
-        r#"
-            (module $trapper
-                (memory 10)
-                (global $g (mut i32) (i32.const 0))
-
-                (func (export "run")
-                    call $a
-                )
-
-                (func $a
-                    i32.const 0x1234
-                    i64.const 42
-                    i64.store
-                    call $b
-                )
-
-                (func $b
-                    i32.const 36
-                    global.set $g
-                    call $c
-                )
-
-                (func $c
-                    unreachable
-                )
-            )
-        "#,
-    )?;
-
-    println!("Instantiate the module.");
-    let instance = Instance::new(&mut store, &module, &[])?;
-
-    println!("Invoke its 'run' function.");
-    let run = instance
-        .get_func(&mut store, "run")
-        .expect("should have 'run' export");
-    let args = &[];
-    let results = &mut [];
-    let ok = run.call(&mut store, args, results);
-
-    println!("Calling that function trapped.");
-    assert!(ok.is_err());
-    let err = ok.unwrap_err();
-    assert!(err.is::<Trap>());
-
-    println!("Extract the captured core dump.");
-    let dump = err
-        .downcast_ref::<WasmCoreDump>()
-        .expect("should have an attached core dump, since we configured core dumps on");
-
-    println!(
-        "Number of memories in the core dump: {}",
-        dump.memories().len()
-    );
-    for (i, mem) in dump.memories().iter().enumerate() {
-        if let Some(addr) = mem.data(&store).iter().position(|byte| *byte != 0) {
-            let val = mem.data(&store)[addr];
-            println!("  First nonzero byte for memory {i}: {val} @ {addr:#x}");
-        } else {
-            println!("  Memory {i} is all zeroes.");
-        }
-    }
-
-    println!(
-        "Number of globals in the core dump: {}",
-        dump.globals().len()
-    );
-    for (i, global) in dump.globals().iter().enumerate() {
-        let val = global.get(&mut store);
-        println!("  Global {i} = {val:?}");
-    }
-
-    println!("Serialize the core dump and write it to ./example.coredump");
-    let serialized = dump.serialize(&mut store, "trapper.wasm");
-    std::fs::write("./example.coredump", serialized)?;
-
-    Ok(())
-}
diff --git a/examples/fuel.c b/examples/fuel.c
index 173bdcf58d77..9b0eaa6b09ac 100644
--- a/examples/fuel.c
+++ b/examples/fuel.c
@@ -43,9 +43,9 @@ int main() {
   assert(store != NULL);
   wasmtime_context_t *context = wasmtime_store_context(store);
 
-  error = wasmtime_context_set_fuel(context, 10000);
+  error = wasmtime_context_add_fuel(context, 10000);
   if (error != NULL)
-    exit_with_error("failed to set fuel", error, NULL);
+    exit_with_error("failed to add fuel", error, NULL);
 
   // Load our input file to parse it next
   FILE* file = fopen("examples/fuel.wat", "r");
@@ -93,7 +93,7 @@ int main() {
   // Call it repeatedly until it fails
   for (int n = 1; ; n++) {
     uint64_t fuel_before;
-    wasmtime_context_get_fuel(context, &fuel_before);
+    wasmtime_context_fuel_consumed(context, &fuel_before);
     wasmtime_val_t params[1];
     params[0].kind = WASMTIME_I32;
     params[0].of.i32 = n;
@@ -110,13 +110,13 @@ int main() {
     }
 
     uint64_t fuel_after;
-    wasmtime_context_get_fuel(context, &fuel_after);
+    wasmtime_context_fuel_consumed(context, &fuel_after);
     assert(results[0].kind == WASMTIME_I32);
-    printf("fib(%d) = %d [consumed %lu fuel]\n", n, results[0].of.i32, fuel_after - fuel_before);
+    printf("fib(%d) = %d [consumed %lld fuel]\n", n, results[0].of.i32, fuel_after - fuel_before);
 
-    error = wasmtime_context_set_fuel(context, 10000);
+    error = wasmtime_context_add_fuel(context, fuel_after - fuel_before);
     if (error != NULL)
-      exit_with_error("failed to set fuel", error, NULL);
+      exit_with_error("failed to add fuel", error, NULL);
   }
 
   // Clean up after ourselves at this point
diff --git a/examples/fuel.rs b/examples/fuel.rs
index 179c68d1ce83..e6f4c74ecb37 100644
--- a/examples/fuel.rs
+++ b/examples/fuel.rs
@@ -10,14 +10,14 @@ fn main() -> Result<()> {
     config.consume_fuel(true);
     let engine = Engine::new(&config)?;
     let mut store = Store::new(&engine, ());
-    store.set_fuel(10_000)?;
+    store.add_fuel(10_000)?;
     let module = Module::from_file(store.engine(), "examples/fuel.wat")?;
     let instance = Instance::new(&mut store, &module, &[])?;
 
     // Invoke `fibonacci` export with higher and higher numbers until we exhaust our fuel.
     let fibonacci = instance.get_typed_func::<i32, i32>(&mut store, "fibonacci")?;
     for n in 1.. {
-        let fuel_before = store.get_fuel().unwrap();
+        let fuel_before = store.fuel_consumed().unwrap();
         let output = match fibonacci.call(&mut store, n) {
             Ok(v) => v,
             Err(e) => {
@@ -26,9 +26,9 @@ fn main() -> Result<()> {
                 break;
             }
         };
-        let fuel_consumed = fuel_before - store.get_fuel().unwrap();
+        let fuel_consumed = store.fuel_consumed().unwrap() - fuel_before;
         println!("fib({}) = {} [consumed {} fuel]", n, output, fuel_consumed);
-        store.set_fuel(10_000)?;
+        store.add_fuel(fuel_consumed)?;
     }
     Ok(())
 }
diff --git a/examples/fuel.wat b/examples/fuel.wat
index f7d312925b24..48622c2e219a 100644
--- a/examples/fuel.wat
+++ b/examples/fuel.wat
@@ -2,7 +2,7 @@
   (func $fibonacci (param $n i32) (result i32)
     (if
       (i32.lt_s (local.get $n) (i32.const 2))
-      (then (return (local.get $n)))
+      (return (local.get $n))
     )
     (i32.add
       (call $fibonacci (i32.sub (local.get $n) (i32.const 1)))
diff --git a/examples/threads.rs b/examples/threads.rs
index 1c75bd16710a..3c3564833e76 100644
--- a/examples/threads.rs
+++ b/examples/threads.rs
@@ -15,7 +15,7 @@ const N_REPS: i32 = 3;
 fn main() -> Result<()> {
     println!("Initializing...");
 
-    // Initialize global per-process state. This state will be shared amongst all
+    // Initialize global per-process state. This state will be shared amonst all
     // threads. Notably this includes the compiled module as well as a `Linker`,
     // which contains all our host functions we want to define.
     let engine = Engine::default();
diff --git a/examples/tokio/main.rs b/examples/tokio/main.rs
index 2073f38886fa..e90f6de9727c 100644
--- a/examples/tokio/main.rs
+++ b/examples/tokio/main.rs
@@ -94,11 +94,9 @@ async fn run_wasm(inputs: Inputs) -> Result<(), Error> {
         .build();
     let mut store = Store::new(&inputs.env.engine, wasi);
 
-    // Put effectively unlimited fuel so it can run forever.
-    store.set_fuel(u64::MAX)?;
     // WebAssembly execution will be paused for an async yield every time it
-    // consumes 10000 fuel.
-    store.fuel_async_yield_interval(Some(10000))?;
+    // consumes 10000 fuel. Fuel will be refilled u64::MAX times.
+    store.out_of_fuel_async_yield(u64::MAX, 10000);
 
     // Instantiate into our own unique store using the shared linker, afterwards
     // acquiring the `_start` function for the module and executing it.
diff --git a/examples/wasi/main.c b/examples/wasi/main.c
index f55715aa6202..2a2ab07324c2 100644
--- a/examples/wasi/main.c
+++ b/examples/wasi/main.c
@@ -3,7 +3,7 @@ Example of instantiating a WebAssembly which uses WASI imports.
 
 You can compile and run this example on Linux with:
 
-   cmake examples/
+   cmake example/
    cargo build --release -p wasmtime-c-api
    cc examples/wasi/main.c \
        -I crates/c-api/include \
diff --git a/examples/wasi/main.rs b/examples/wasi/main.rs
index 69ff61756980..30d8e1f2aed7 100644
--- a/examples/wasi/main.rs
+++ b/examples/wasi/main.rs
@@ -2,7 +2,7 @@
 
 /*
 You can execute this example with:
-    cmake examples/
+    cmake example/
     cargo run --example wasi
 */
 
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index 5e290c3f265c..ef6f2ded09a4 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -30,7 +30,7 @@ component-fuzz-util = { workspace = true }
 [build-dependencies]
 anyhow = { workspace = true }
 proc-macro2 = "1.0"
-arbitrary = { workspace = true, features = ["derive"] }
+arbitrary = { version = "1.1.0", features = ["derive"] }
 rand = { version = "0.8.0" }
 quote = "1.0"
 component-fuzz-util = { workspace = true }
diff --git a/fuzz/fuzz_targets/differential.rs b/fuzz/fuzz_targets/differential.rs
index a884a8430ce0..9cbf7c608389 100644
--- a/fuzz/fuzz_targets/differential.rs
+++ b/fuzz/fuzz_targets/differential.rs
@@ -371,47 +371,10 @@ fn winch_supports_module(module: &[u8]) -> bool {
                         | Return { .. }
                         | F32Const { .. }
                         | F64Const { .. }
-                        | F32Add { .. }
-                        | F64Add { .. }
-                        | F32Sub { .. }
-                        | F64Sub { .. }
-                        | F32Mul { .. }
-                        | F64Mul { .. }
-                        | F32Div { .. }
-                        | F64Div { .. }
-                        | F32Min { .. }
-                        | F64Min { .. }
-                        | F32Max { .. }
-                        | F64Max { .. }
-                        | F32Copysign { .. }
-                        | F64Copysign { .. }
                         | F32Abs { .. }
                         | F64Abs { .. }
                         | F32Neg { .. }
-                        | F64Neg { .. }
-                        | F32Sqrt { .. }
-                        | F64Sqrt { .. }
-                        | F32Eq { .. }
-                        | F64Eq { .. }
-                        | F32Ne { .. }
-                        | F64Ne { .. }
-                        | F32Lt { .. }
-                        | F64Lt { .. }
-                        | F32Gt { .. }
-                        | F64Gt { .. }
-                        | F32Le { .. }
-                        | F64Le { .. }
-                        | F32Ge { .. }
-                        | F64Ge { .. }
-                        | CallIndirect { .. }
-                        | ElemDrop { .. }
-                        | TableCopy { .. }
-                        | TableSet { .. }
-                        | TableGet { .. }
-                        | TableFill { .. }
-                        | TableGrow { .. }
-                        | TableSize { .. }
-                        | TableInit { .. } => {}
+                        | F64Neg { .. } => {}
                         _ => {
                             supported = false;
                             break 'main;
diff --git a/src/bin/wasmtime.rs b/src/bin/wasmtime.rs
index 32fcd040b0c9..d32a0b63f373 100644
--- a/src/bin/wasmtime.rs
+++ b/src/bin/wasmtime.rs
@@ -5,6 +5,9 @@
 
 use anyhow::Result;
 use clap::Parser;
+use wasmtime_cli::commands::{
+    CompileCommand, ConfigCommand, ExploreCommand, RunCommand, SettingsCommand, WastCommand,
+};
 
 /// Wasmtime WebAssembly Runtime
 #[derive(Parser)]
@@ -37,37 +40,23 @@ struct Wasmtime {
     #[clap(subcommand)]
     subcommand: Option<Subcommand>,
     #[clap(flatten)]
-    run: wasmtime_cli::commands::RunCommand,
+    run: RunCommand,
 }
 
 #[derive(Parser)]
 enum Subcommand {
-    /// Runs a WebAssembly module
-    Run(wasmtime_cli::commands::RunCommand),
-
     /// Controls Wasmtime configuration settings
-    #[cfg(feature = "cache")]
-    Config(wasmtime_cli::commands::ConfigCommand),
-
+    Config(ConfigCommand),
     /// Compiles a WebAssembly module.
-    #[cfg(feature = "cranelift")]
-    Compile(wasmtime_cli::commands::CompileCommand),
-
+    Compile(CompileCommand),
     /// Explore the compilation of a WebAssembly module to native code.
-    #[cfg(feature = "explore")]
-    Explore(wasmtime_cli::commands::ExploreCommand),
-
-    /// Serves requests from a wasi-http proxy component.
-    #[cfg(feature = "serve")]
-    Serve(wasmtime_cli::commands::ServeCommand),
-
+    Explore(ExploreCommand),
+    /// Runs a WebAssembly module
+    Run(RunCommand),
     /// Displays available Cranelift settings for a target.
-    #[cfg(feature = "cranelift")]
-    Settings(wasmtime_cli::commands::SettingsCommand),
-
+    Settings(SettingsCommand),
     /// Runs a WebAssembly test script file
-    #[cfg(feature = "wast")]
-    Wast(wasmtime_cli::commands::WastCommand),
+    Wast(WastCommand),
 }
 
 impl Wasmtime {
@@ -75,24 +64,11 @@ impl Wasmtime {
     pub fn execute(self) -> Result<()> {
         let subcommand = self.subcommand.unwrap_or(Subcommand::Run(self.run));
         match subcommand {
-            Subcommand::Run(c) => c.execute(),
-
-            #[cfg(feature = "cache")]
             Subcommand::Config(c) => c.execute(),
-
-            #[cfg(feature = "cranelift")]
             Subcommand::Compile(c) => c.execute(),
-
-            #[cfg(feature = "explore")]
             Subcommand::Explore(c) => c.execute(),
-
-            #[cfg(feature = "serve")]
-            Subcommand::Serve(c) => c.execute(),
-
-            #[cfg(feature = "cranelift")]
+            Subcommand::Run(c) => c.execute(),
             Subcommand::Settings(c) => c.execute(),
-
-            #[cfg(feature = "wast")]
             Subcommand::Wast(c) => c.execute(),
         }
     }
diff --git a/src/commands.rs b/src/commands.rs
index 86ed4e90c377..764f01e936cd 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -1,34 +1,10 @@
 //! The module for the Wasmtime CLI commands.
 
-mod run;
-pub use self::run::*;
-
-#[cfg(feature = "serve")]
-mod serve;
-#[cfg(feature = "serve")]
-pub use self::serve::*;
-
-#[cfg(feature = "explore")]
+mod compile;
+mod config;
 mod explore;
-#[cfg(feature = "explore")]
-pub use self::explore::*;
-
-#[cfg(feature = "wast")]
+mod run;
+mod settings;
 mod wast;
-#[cfg(feature = "wast")]
-pub use self::wast::*;
-
-#[cfg(feature = "cache")]
-mod config;
-#[cfg(feature = "cache")]
-pub use self::config::*;
 
-#[cfg(feature = "compile")]
-mod compile;
-#[cfg(feature = "compile")]
-pub use self::compile::*;
-
-#[cfg(feature = "cranelift")]
-mod settings;
-#[cfg(feature = "cranelift")]
-pub use self::settings::*;
+pub use self::{compile::*, config::*, explore::*, run::*, settings::*, wast::*};
diff --git a/src/commands/compile.rs b/src/commands/compile.rs
index d4309d01d357..a26fee670702 100644
--- a/src/commands/compile.rs
+++ b/src/commands/compile.rs
@@ -59,7 +59,7 @@ pub struct CompileCommand {
 impl CompileCommand {
     /// Executes the command.
     pub fn execute(mut self) -> Result<()> {
-        self.common.init_logging()?;
+        self.common.init_logging();
 
         let mut config = self.common.config(self.target.as_deref())?;
 
@@ -87,11 +87,7 @@ impl CompileCommand {
             );
         }
 
-        #[cfg(feature = "wat")]
         let input = wat::parse_file(&self.module).with_context(|| "failed to read input file")?;
-        #[cfg(not(feature = "wat"))]
-        let input = std::fs::read(&self.module)
-            .with_context(|| format!("failed to read input file: {:?}", self.module))?;
 
         let output = self.output.take().unwrap_or_else(|| {
             let mut output: PathBuf = self.module.file_name().unwrap().into();
diff --git a/src/commands/explore.rs b/src/commands/explore.rs
index ff03dc4a8d03..59ca4baa6ed6 100644
--- a/src/commands/explore.rs
+++ b/src/commands/explore.rs
@@ -29,7 +29,7 @@ pub struct ExploreCommand {
 impl ExploreCommand {
     /// Executes the command.
     pub fn execute(mut self) -> Result<()> {
-        self.common.init_logging()?;
+        self.common.init_logging();
 
         let config = self.common.config(self.target.as_deref())?;
 
diff --git a/src/commands/run.rs b/src/commands/run.rs
index df2fd673de72..1c1bfe281799 100644
--- a/src/commands/run.rs
+++ b/src/commands/run.rs
@@ -5,19 +5,27 @@
     allow(irrefutable_let_patterns, unreachable_patterns)
 )]
 
-use crate::common::{Profile, RunCommon, RunTarget};
-
 use anyhow::{anyhow, bail, Context as _, Error, Result};
 use clap::Parser;
-use std::ffi::OsString;
+use std::fs::File;
+use std::io::Write;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::thread;
-use wasmtime::{Engine, Func, Module, Store, StoreLimits, Val, ValType};
+use std::time::Duration;
+use wasmtime::{
+    AsContextMut, Engine, Func, GuestProfiler, Module, Precompiled, Store, StoreLimits,
+    StoreLimitsBuilder, UpdateDeadline, Val, ValType,
+};
+use wasmtime_cli_flags::opt::WasmtimeOptionValue;
+use wasmtime_cli_flags::CommonOptions;
 use wasmtime_wasi::maybe_exit_on_error;
 use wasmtime_wasi::preview2;
 use wasmtime_wasi::sync::{ambient_authority, Dir, TcpListener, WasiCtxBuilder};
 
+#[cfg(feature = "component-model")]
+use wasmtime::component::Component;
+
 #[cfg(feature = "wasi-nn")]
 use wasmtime_wasi_nn::WasiNnCtx;
 
@@ -37,12 +45,12 @@ fn parse_env_var(s: &str) -> Result<(String, Option<String>)> {
 
 fn parse_dirs(s: &str) -> Result<(String, String)> {
     let mut parts = s.split("::");
-    let host = parts.next().unwrap();
-    let guest = match parts.next() {
-        Some(guest) => guest,
-        None => host,
+    let guest = parts.next().unwrap();
+    let host = match parts.next() {
+        Some(host) => host,
+        None => guest,
     };
-    Ok((host.into(), guest.into()))
+    Ok((guest.into(), host.into()))
 }
 
 fn parse_preloads(s: &str) -> Result<(String, PathBuf)> {
@@ -53,20 +61,51 @@ fn parse_preloads(s: &str) -> Result<(String, PathBuf)> {
     Ok((parts[0].into(), parts[1].into()))
 }
 
+fn parse_profile(s: &str) -> Result<Profile> {
+    let parts = s.split(',').collect::<Vec<_>>();
+    match &parts[..] {
+        ["perfmap"] => Ok(Profile::Native(wasmtime::ProfilingStrategy::PerfMap)),
+        ["jitdump"] => Ok(Profile::Native(wasmtime::ProfilingStrategy::JitDump)),
+        ["vtune"] => Ok(Profile::Native(wasmtime::ProfilingStrategy::VTune)),
+        ["guest"] => Ok(Profile::Guest {
+            path: "wasmtime-guest-profile.json".to_string(),
+            interval: Duration::from_millis(10),
+        }),
+        ["guest", path] => Ok(Profile::Guest {
+            path: path.to_string(),
+            interval: Duration::from_millis(10),
+        }),
+        ["guest", path, dur] => Ok(Profile::Guest {
+            path: path.to_string(),
+            interval: WasmtimeOptionValue::parse(Some(dur))?,
+        }),
+        _ => bail!("unknown profiling strategy: {s}"),
+    }
+}
+
 /// Runs a WebAssembly module
 #[derive(Parser)]
 #[structopt(name = "run")]
 pub struct RunCommand {
     #[clap(flatten)]
-    run: RunCommon,
+    common: CommonOptions,
+
+    /// Allow executing precompiled WebAssembly modules as `*.cwasm` files.
+    ///
+    /// Note that this option is not safe to pass if the module being passed in
+    /// is arbitrary user input. Only `wasmtime`-precompiled modules generated
+    /// via the `wasmtime compile` command or equivalent should be passed as an
+    /// argument with this option specified.
+    #[clap(long = "allow-precompiled")]
+    allow_precompiled: bool,
 
     /// Grant access of a host directory to a guest.
     ///
-    /// If specified as just `HOST_DIR` then the same directory name on the
-    /// host is made available within the guest. If specified as `HOST::GUEST`
+    /// If specified as just `GUEST_DIR` then the same directory name on the
+    /// host is made available within the guest. If specified as `GUEST::HOST`
     /// then the `HOST` directory is opened and made available as the name
     /// `GUEST` in the guest.
-    #[clap(long = "dir", value_name = "HOST_DIR[::GUEST_DIR]", value_parser = parse_dirs)]
+    #[clap(long = "dir", value_name = "GUEST_DIR[::HOST_DIR]", value_parser = parse_dirs)]
     dirs: Vec<(String, String)>,
 
     /// Pass an environment variable to the program.
@@ -92,13 +131,41 @@ pub struct RunCommand {
     )]
     preloads: Vec<(String, PathBuf)>,
 
+    /// Profiling strategy (valid options are: perfmap, jitdump, vtune, guest)
+    ///
+    /// The perfmap, jitdump, and vtune profiling strategies integrate Wasmtime
+    /// with external profilers such as `perf`. The guest profiling strategy
+    /// enables in-process sampling and will write the captured profile to
+    /// `wasmtime-guest-profile.json` by default which can be viewed at
+    /// https://profiler.firefox.com/.
+    ///
+    /// The `guest` option can be additionally configured as:
+    ///
+    ///     --profile=guest[,path[,interval]]
+    ///
+    /// where `path` is where to write the profile and `interval` is the
+    /// duration between samples. When used with `--wasm-timeout` the timeout
+    /// will be rounded up to the nearest multiple of this interval.
+    #[clap(
+        long,
+        value_name = "STRATEGY",
+        value_parser = parse_profile,
+    )]
+    profile: Option<Profile>,
+
     /// The WebAssembly module to run and arguments to pass to it.
     ///
     /// Arguments passed to the wasm module will be configured as WASI CLI
     /// arguments unless the `--invoke` CLI argument is passed in which case
     /// arguments will be interpreted as arguments to the function specified.
     #[clap(value_name = "WASM", trailing_var_arg = true, required = true)]
-    module_and_args: Vec<OsString>,
+    module_and_args: Vec<PathBuf>,
+}
+
+#[derive(Clone)]
+enum Profile {
+    Native(wasmtime::ProfilingStrategy),
+    Guest { path: String, interval: Duration },
 }
 
 enum CliLinker {
@@ -107,17 +174,41 @@ enum CliLinker {
     Component(wasmtime::component::Linker<Host>),
 }
 
+enum CliModule {
+    Core(wasmtime::Module),
+    #[cfg(feature = "component-model")]
+    Component(Component),
+}
+
+impl CliModule {
+    fn unwrap_core(&self) -> &Module {
+        match self {
+            CliModule::Core(module) => module,
+            #[cfg(feature = "component-model")]
+            CliModule::Component(_) => panic!("expected a core wasm module, not a component"),
+        }
+    }
+
+    #[cfg(feature = "component-model")]
+    fn unwrap_component(&self) -> &Component {
+        match self {
+            CliModule::Component(c) => c,
+            CliModule::Core(_) => panic!("expected a component, not a core wasm module"),
+        }
+    }
+}
+
 impl RunCommand {
     /// Executes the command.
     pub fn execute(mut self) -> Result<()> {
-        self.run.common.init_logging()?;
+        self.common.init_logging();
 
-        let mut config = self.run.common.config(None)?;
+        let mut config = self.common.config(None)?;
 
-        if self.run.common.wasm.timeout.is_some() {
+        if self.common.wasm.timeout.is_some() {
             config.epoch_interruption(true);
         }
-        match self.run.profile {
+        match self.profile {
             Some(Profile::Native(s)) => {
                 config.profiler(s);
             }
@@ -131,25 +222,23 @@ impl RunCommand {
         let engine = Engine::new(&config)?;
 
         // Read the wasm module binary either as `*.wat` or a raw binary.
-        let main = self
-            .run
-            .load_module(&engine, self.module_and_args[0].as_ref())?;
+        let main = self.load_module(&engine, &self.module_and_args[0])?;
 
         // Validate coredump-on-trap argument
-        if let Some(path) = &self.run.common.debug.coredump {
-            if path.contains("%") {
+        if let Some(coredump_path) = &self.common.debug.coredump {
+            if coredump_path.contains("%") {
                 bail!("the coredump-on-trap path does not support patterns yet.")
             }
         }
 
         let mut linker = match &main {
-            RunTarget::Core(_) => CliLinker::Core(wasmtime::Linker::new(&engine)),
+            CliModule::Core(_) => CliLinker::Core(wasmtime::Linker::new(&engine)),
             #[cfg(feature = "component-model")]
-            RunTarget::Component(_) => {
+            CliModule::Component(_) => {
                 CliLinker::Component(wasmtime::component::Linker::new(&engine))
             }
         };
-        if let Some(enable) = self.run.common.wasm.unknown_exports_allow {
+        if let Some(enable) = self.common.wasm.unknown_exports_allow {
             match &mut linker {
                 CliLinker::Core(l) => {
                     l.allow_unknown_exports(enable);
@@ -165,32 +254,50 @@ impl RunCommand {
         let mut store = Store::new(&engine, host);
         self.populate_with_wasi(&mut linker, &mut store, &main)?;
 
-        store.data_mut().limits = self.run.store_limits();
+        let mut limits = StoreLimitsBuilder::new();
+        if let Some(max) = self.common.wasm.max_memory_size {
+            limits = limits.memory_size(max);
+        }
+        if let Some(max) = self.common.wasm.max_table_elements {
+            limits = limits.table_elements(max);
+        }
+        if let Some(max) = self.common.wasm.max_instances {
+            limits = limits.instances(max);
+        }
+        if let Some(max) = self.common.wasm.max_tables {
+            limits = limits.tables(max);
+        }
+        if let Some(max) = self.common.wasm.max_memories {
+            limits = limits.memories(max);
+        }
+        if let Some(enable) = self.common.wasm.trap_on_grow_failure {
+            limits = limits.trap_on_grow_failure(enable);
+        }
+        store.data_mut().limits = limits.build();
         store.limiter(|t| &mut t.limits);
 
         // If fuel has been configured, we want to add the configured
         // fuel amount to this store.
-        if let Some(fuel) = self.run.common.wasm.fuel {
-            store.set_fuel(fuel)?;
+        if let Some(fuel) = self.common.wasm.fuel {
+            store.add_fuel(fuel)?;
         }
 
         // Load the preload wasm modules.
         let mut modules = Vec::new();
-        if let RunTarget::Core(m) = &main {
+        if let CliModule::Core(m) = &main {
             modules.push((String::new(), m.clone()));
         }
         for (name, path) in self.preloads.iter() {
             // Read the wasm module binary either as `*.wat` or a raw binary
-            let module = match self.run.load_module(&engine, path)? {
-                RunTarget::Core(m) => m,
+            let module = match self.load_module(&engine, path)? {
+                CliModule::Core(m) => m,
                 #[cfg(feature = "component-model")]
-                RunTarget::Component(_) => bail!("components cannot be loaded with `--preload`"),
+                CliModule::Component(_) => bail!("components cannot be loaded with `--preload`"),
             };
             modules.push((name.clone(), module.clone()));
 
             // Add the module's functions to the linker.
             match &mut linker {
-                #[cfg(feature = "cranelift")]
                 CliLinker::Core(linker) => {
                     linker.module(&mut store, name, &module).context(format!(
                         "failed to process preload `{}` at `{}`",
@@ -198,10 +305,6 @@ impl RunCommand {
                         path.display()
                     ))?;
                 }
-                #[cfg(not(feature = "cranelift"))]
-                CliLinker::Core(_) => {
-                    bail!("support for --preload disabled at compile time");
-                }
                 #[cfg(feature = "component-model")]
                 CliLinker::Component(_) => {
                     bail!("--preload cannot be used with components");
@@ -215,7 +318,7 @@ impl RunCommand {
             .with_context(|| {
                 format!(
                     "failed to run main module `{}`",
-                    self.module_and_args[0].to_string_lossy()
+                    self.module_and_args[0].display()
                 )
             }) {
             Ok(()) => (),
@@ -233,7 +336,7 @@ impl RunCommand {
     fn compute_preopen_dirs(&self) -> Result<Vec<(String, Dir)>> {
         let mut preopen_dirs = Vec::new();
 
-        for (host, guest) in self.dirs.iter() {
+        for (guest, host) in self.dirs.iter() {
             preopen_dirs.push((
                 guest.clone(),
                 Dir::open_ambient_dir(host, ambient_authority())
@@ -247,7 +350,7 @@ impl RunCommand {
     fn compute_preopen_sockets(&self) -> Result<Vec<TcpListener>> {
         let mut listeners = vec![];
 
-        for address in &self.run.common.wasi.tcplisten {
+        for address in &self.common.wasi.tcplisten {
             let stdlistener = std::net::TcpListener::bind(address)
                 .with_context(|| format!("failed to bind to address '{}'", address))?;
 
@@ -265,7 +368,7 @@ impl RunCommand {
             // For argv[0], which is the program name. Only include the base
             // name of the main wasm module, to avoid leaking path information.
             let arg = if i == 0 {
-                Path::new(arg).components().next_back().unwrap().as_os_str()
+                arg.components().next_back().unwrap().as_os_str()
             } else {
                 arg.as_ref()
             };
@@ -283,166 +386,134 @@ impl RunCommand {
         &self,
         store: &mut Store<Host>,
         modules: Vec<(String, Module)>,
-    ) -> Result<Box<dyn FnOnce(&mut Store<Host>)>> {
-        if let Some(Profile::Guest { path, interval }) = &self.run.profile {
-            #[cfg(feature = "profiling")]
-            return Ok(self.setup_guest_profiler(store, modules, path, *interval));
-            #[cfg(not(feature = "profiling"))]
-            {
-                let _ = (modules, path, interval);
-                bail!("support for profiling disabled at compile time");
+    ) -> Box<dyn FnOnce(&mut Store<Host>)> {
+        if let Some(Profile::Guest { path, interval }) = &self.profile {
+            let module_name = self.module_and_args[0].to_str().unwrap_or("<main module>");
+            let interval = *interval;
+            store.data_mut().guest_profiler =
+                Some(Arc::new(GuestProfiler::new(module_name, interval, modules)));
+
+            fn sample(mut store: impl AsContextMut<Data = Host>) {
+                let mut profiler = store
+                    .as_context_mut()
+                    .data_mut()
+                    .guest_profiler
+                    .take()
+                    .unwrap();
+                Arc::get_mut(&mut profiler)
+                    .expect("profiling doesn't support threads yet")
+                    .sample(&store);
+                store.as_context_mut().data_mut().guest_profiler = Some(profiler);
+            }
+
+            if let Some(timeout) = self.common.wasm.timeout {
+                let mut timeout = (timeout.as_secs_f64() / interval.as_secs_f64()).ceil() as u64;
+                assert!(timeout > 0);
+                store.epoch_deadline_callback(move |mut store| {
+                    sample(&mut store);
+                    timeout -= 1;
+                    if timeout == 0 {
+                        bail!("timeout exceeded");
+                    }
+                    Ok(UpdateDeadline::Continue(1))
+                });
+            } else {
+                store.epoch_deadline_callback(move |mut store| {
+                    sample(&mut store);
+                    Ok(UpdateDeadline::Continue(1))
+                });
             }
-        }
 
-        if let Some(timeout) = self.run.common.wasm.timeout {
             store.set_epoch_deadline(1);
             let engine = store.engine().clone();
-            thread::spawn(move || {
-                thread::sleep(timeout);
+            thread::spawn(move || loop {
+                thread::sleep(interval);
                 engine.increment_epoch();
             });
-        }
 
-        Ok(Box::new(|_store| {}))
-    }
-
-    #[cfg(feature = "profiling")]
-    fn setup_guest_profiler(
-        &self,
-        store: &mut Store<Host>,
-        modules: Vec<(String, Module)>,
-        path: &str,
-        interval: std::time::Duration,
-    ) -> Box<dyn FnOnce(&mut Store<Host>)> {
-        use wasmtime::{AsContextMut, GuestProfiler, UpdateDeadline};
-
-        let module_name = self.module_and_args[0].to_str().unwrap_or("<main module>");
-        store.data_mut().guest_profiler =
-            Some(Arc::new(GuestProfiler::new(module_name, interval, modules)));
-
-        fn sample(mut store: impl AsContextMut<Data = Host>) {
-            let mut profiler = store
-                .as_context_mut()
-                .data_mut()
-                .guest_profiler
-                .take()
-                .unwrap();
-            Arc::get_mut(&mut profiler)
-                .expect("profiling doesn't support threads yet")
-                .sample(&store);
-            store.as_context_mut().data_mut().guest_profiler = Some(profiler);
-        }
-
-        if let Some(timeout) = self.run.common.wasm.timeout {
-            let mut timeout = (timeout.as_secs_f64() / interval.as_secs_f64()).ceil() as u64;
-            assert!(timeout > 0);
-            store.epoch_deadline_callback(move |mut store| {
-                sample(&mut store);
-                timeout -= 1;
-                if timeout == 0 {
-                    bail!("timeout exceeded");
+            let path = path.clone();
+            return Box::new(move |store| {
+                let profiler = Arc::try_unwrap(store.data_mut().guest_profiler.take().unwrap())
+                    .expect("profiling doesn't support threads yet");
+                if let Err(e) = std::fs::File::create(&path)
+                    .map_err(anyhow::Error::new)
+                    .and_then(|output| profiler.finish(std::io::BufWriter::new(output)))
+                {
+                    eprintln!("failed writing profile at {path}: {e:#}");
+                } else {
+                    eprintln!();
+                    eprintln!("Profile written to: {path}");
+                    eprintln!("View this profile at https://profiler.firefox.com/.");
                 }
-                Ok(UpdateDeadline::Continue(1))
-            });
-        } else {
-            store.epoch_deadline_callback(move |mut store| {
-                sample(&mut store);
-                Ok(UpdateDeadline::Continue(1))
             });
         }
 
-        store.set_epoch_deadline(1);
-        let engine = store.engine().clone();
-        thread::spawn(move || loop {
-            thread::sleep(interval);
-            engine.increment_epoch();
-        });
+        if let Some(timeout) = self.common.wasm.timeout {
+            store.set_epoch_deadline(1);
+            let engine = store.engine().clone();
+            thread::spawn(move || {
+                thread::sleep(timeout);
+                engine.increment_epoch();
+            });
+        }
 
-        let path = path.to_string();
-        return Box::new(move |store| {
-            let profiler = Arc::try_unwrap(store.data_mut().guest_profiler.take().unwrap())
-                .expect("profiling doesn't support threads yet");
-            if let Err(e) = std::fs::File::create(&path)
-                .map_err(anyhow::Error::new)
-                .and_then(|output| profiler.finish(std::io::BufWriter::new(output)))
-            {
-                eprintln!("failed writing profile at {path}: {e:#}");
-            } else {
-                eprintln!();
-                eprintln!("Profile written to: {path}");
-                eprintln!("View this profile at https://profiler.firefox.com/.");
-            }
-        });
+        Box::new(|_store| {})
     }
 
     fn load_main_module(
         &self,
         store: &mut Store<Host>,
         linker: &mut CliLinker,
-        module: &RunTarget,
+        module: &CliModule,
         modules: Vec<(String, Module)>,
     ) -> Result<()> {
         // The main module might be allowed to have unknown imports, which
         // should be defined as traps:
-        if self.run.common.wasm.unknown_imports_trap == Some(true) {
-            #[cfg(feature = "cranelift")]
+        if self.common.wasm.unknown_imports_trap == Some(true) {
             match linker {
                 CliLinker::Core(linker) => {
                     linker.define_unknown_imports_as_traps(module.unwrap_core())?;
                 }
                 _ => bail!("cannot use `--trap-unknown-imports` with components"),
             }
-            #[cfg(not(feature = "cranelift"))]
-            bail!("support for `unknown-imports-trap` disabled at compile time");
         }
 
         // ...or as default values.
-        if self.run.common.wasm.unknown_imports_default == Some(true) {
-            #[cfg(feature = "cranelift")]
+        if self.common.wasm.unknown_imports_default == Some(true) {
             match linker {
                 CliLinker::Core(linker) => {
                     linker.define_unknown_imports_as_default_values(module.unwrap_core())?;
                 }
                 _ => bail!("cannot use `--default-values-unknown-imports` with components"),
             }
-            #[cfg(not(feature = "cranelift"))]
-            bail!("support for `unknown-imports-trap` disabled at compile time");
         }
 
-        let finish_epoch_handler = self.setup_epoch_handler(store, modules)?;
+        let finish_epoch_handler = self.setup_epoch_handler(store, modules);
 
         let result = match linker {
             CliLinker::Core(linker) => {
+                // Use "" as a default module name.
                 let module = module.unwrap_core();
-                let instance = linker.instantiate(&mut *store, &module).context(format!(
+                linker.module(&mut *store, "", &module).context(format!(
                     "failed to instantiate {:?}",
                     self.module_and_args[0]
                 ))?;
 
-                // If `_initialize` is present, meaning a reactor, then invoke
-                // the function.
-                if let Some(func) = instance.get_func(&mut *store, "_initialize") {
-                    func.typed::<(), ()>(&store)?.call(&mut *store, ())?;
-                }
-
-                // Look for the specific function provided or otherwise look for
-                // "" or "_start" exports to run as a "main" function.
+                // If a function to invoke was given, invoke it.
                 let func = if let Some(name) = &self.invoke {
-                    Some(
-                        instance
-                            .get_func(&mut *store, name)
-                            .ok_or_else(|| anyhow!("no func export named `{}` found", name))?,
-                    )
+                    match linker
+                        .get(&mut *store, "", name)
+                        .ok_or_else(|| anyhow!("no export named `{}` found", name))?
+                        .into_func()
+                    {
+                        Some(func) => func,
+                        None => bail!("export of `{}` wasn't a function", name),
+                    }
                 } else {
-                    instance
-                        .get_func(&mut *store, "")
-                        .or_else(|| instance.get_func(&mut *store, "_start"))
+                    linker.get_default(&mut *store, "")?
                 };
 
-                match func {
-                    Some(func) => self.invoke_func(store, func),
-                    None => Ok(()),
-                }
+                self.invoke_func(store, func)
             }
             #[cfg(feature = "component-model")]
             CliLinker::Component(linker) => {
@@ -458,7 +529,7 @@ impl RunCommand {
                     .wasi_cli_run()
                     .call_run(&mut *store)
                     .context("failed to invoke `run` function")
-                    .map_err(|e| self.handle_core_dump(&mut *store, e));
+                    .map_err(|e| self.handle_coredump(e));
 
                 // Translate the `Result<(),()>` produced by wasm into a feigned
                 // explicit exit here with status 1 if `Err(())` is returned.
@@ -512,18 +583,16 @@ impl RunCommand {
         // Invoke the function and then afterwards print all the results that came
         // out, if there are any.
         let mut results = vec![Val::null(); ty.results().len()];
-        let invoke_res = func
-            .call(&mut *store, &values, &mut results)
-            .with_context(|| {
-                if let Some(name) = &self.invoke {
-                    format!("failed to invoke `{}`", name)
-                } else {
-                    format!("failed to invoke command default")
-                }
-            });
+        let invoke_res = func.call(store, &values, &mut results).with_context(|| {
+            if let Some(name) = &self.invoke {
+                format!("failed to invoke `{}`", name)
+            } else {
+                format!("failed to invoke command default")
+            }
+        });
 
         if let Err(err) = invoke_res {
-            return Err(self.handle_core_dump(&mut *store, err));
+            return Err(self.handle_coredump(err));
         }
 
         if !results.is_empty() {
@@ -548,9 +617,8 @@ impl RunCommand {
         Ok(())
     }
 
-    #[cfg(feature = "coredump")]
-    fn handle_core_dump(&self, store: &mut Store<Host>, err: Error) -> Error {
-        let coredump_path = match &self.run.common.debug.coredump {
+    fn handle_coredump(&self, err: Error) -> Error {
+        let coredump_path = match &self.common.debug.coredump {
             Some(path) => path,
             None => return err,
         };
@@ -561,7 +629,7 @@ impl RunCommand {
             .to_str()
             .unwrap_or_else(|| "unknown");
 
-        if let Err(coredump_err) = write_core_dump(store, &err, &source_name, coredump_path) {
+        if let Err(coredump_err) = generate_coredump(&err, &source_name, coredump_path) {
             eprintln!("warning: coredump failed to generate: {}", coredump_err);
             err
         } else {
@@ -569,9 +637,117 @@ impl RunCommand {
         }
     }
 
-    #[cfg(not(feature = "coredump"))]
-    fn handle_core_dump(&self, _store: &mut Store<Host>, err: Error) -> Error {
-        err
+    fn load_module(&self, engine: &Engine, path: &Path) -> Result<CliModule> {
+        let path = match path.to_str() {
+            #[cfg(unix)]
+            Some("-") => "/dev/stdin".as_ref(),
+            _ => path,
+        };
+
+        // First attempt to load the module as an mmap. If this succeeds then
+        // detection can be done with the contents of the mmap and if a
+        // precompiled module is detected then `deserialize_file` can be used
+        // which is a slightly more optimal version than `deserialize` since we
+        // can leave most of the bytes on disk until they're referenced.
+        //
+        // If the mmap fails, for example if stdin is a pipe, then fall back to
+        // `std::fs::read` to load the contents. At that point precompiled
+        // modules must go through the `deserialize` functions.
+        //
+        // Note that this has the unfortunate side effect for precompiled
+        // modules on disk that they're opened once to detect what they are and
+        // then again internally in Wasmtime as part of the `deserialize_file`
+        // API. Currently there's no way to pass the `MmapVec` here through to
+        // Wasmtime itself (that'd require making `wasmtime-runtime` a public
+        // dependency or `MmapVec` a public type, both of which aren't ready to
+        // happen at this time). It's hoped though that opening a file twice
+        // isn't too bad in the grand scheme of things with respect to the CLI.
+        match wasmtime_runtime::MmapVec::from_file(path) {
+            Ok(map) => self.load_module_contents(
+                engine,
+                path,
+                &map,
+                || unsafe { Module::deserialize_file(engine, path) },
+                #[cfg(feature = "component-model")]
+                || unsafe { Component::deserialize_file(engine, path) },
+            ),
+            Err(_) => {
+                let bytes = std::fs::read(path)
+                    .with_context(|| format!("failed to read file: {}", path.display()))?;
+                self.load_module_contents(
+                    engine,
+                    path,
+                    &bytes,
+                    || unsafe { Module::deserialize(engine, &bytes) },
+                    #[cfg(feature = "component-model")]
+                    || unsafe { Component::deserialize(engine, &bytes) },
+                )
+            }
+        }
+    }
+
+    fn load_module_contents(
+        &self,
+        engine: &Engine,
+        path: &Path,
+        bytes: &[u8],
+        deserialize_module: impl FnOnce() -> Result<Module>,
+        #[cfg(feature = "component-model")] deserialize_component: impl FnOnce() -> Result<Component>,
+    ) -> Result<CliModule> {
+        Ok(match engine.detect_precompiled(bytes) {
+            Some(Precompiled::Module) => {
+                self.ensure_allow_precompiled()?;
+                CliModule::Core(deserialize_module()?)
+            }
+            #[cfg(feature = "component-model")]
+            Some(Precompiled::Component) => {
+                self.ensure_allow_precompiled()?;
+                self.ensure_allow_components()?;
+                CliModule::Component(deserialize_component()?)
+            }
+            #[cfg(not(feature = "component-model"))]
+            Some(Precompiled::Component) => {
+                bail!("support for components was not enabled at compile time");
+            }
+            None => {
+                // Parse the text format here specifically to add the `path` to
+                // the error message if there's a syntax error.
+                let wasm = wat::parse_bytes(bytes).map_err(|mut e| {
+                    e.set_path(path);
+                    e
+                })?;
+                if wasmparser::Parser::is_component(&wasm) {
+                    #[cfg(feature = "component-model")]
+                    {
+                        self.ensure_allow_components()?;
+                        CliModule::Component(Component::new(engine, &wasm)?)
+                    }
+                    #[cfg(not(feature = "component-model"))]
+                    {
+                        bail!("support for components was not enabled at compile time");
+                    }
+                } else {
+                    CliModule::Core(Module::new(engine, &wasm)?)
+                }
+            }
+        })
+    }
+
+    fn ensure_allow_precompiled(&self) -> Result<()> {
+        if self.allow_precompiled {
+            Ok(())
+        } else {
+            bail!("running a precompiled module requires the `--allow-precompiled` flag")
+        }
+    }
+
+    #[cfg(feature = "component-model")]
+    fn ensure_allow_components(&self) -> Result<()> {
+        if self.common.wasm.component_model != Some(true) {
+            bail!("cannot execute a component without `--wasm-features component-model`");
+        }
+
+        Ok(())
     }
 
     /// Populates the given `Linker` with WASI APIs.
@@ -579,12 +755,12 @@ impl RunCommand {
         &self,
         linker: &mut CliLinker,
         store: &mut Store<Host>,
-        module: &RunTarget,
+        module: &CliModule,
     ) -> Result<()> {
-        if self.run.common.wasi.common != Some(false) {
+        if self.common.wasi.common != Some(false) {
             match linker {
                 CliLinker::Core(linker) => {
-                    if self.run.common.wasi.preview2 == Some(true) {
+                    if self.common.wasi.preview2 == Some(true) {
                         preview2::preview1::add_to_linker_sync(linker)?;
                         self.set_preview2_ctx(store)?;
                     } else {
@@ -602,7 +778,7 @@ impl RunCommand {
             }
         }
 
-        if self.run.common.wasi.nn == Some(true) {
+        if self.common.wasi.nn == Some(true) {
             #[cfg(not(feature = "wasi-nn"))]
             {
                 bail!("Cannot enable wasi-nn when the binary is not compiled with this feature.");
@@ -632,7 +808,6 @@ impl RunCommand {
                     }
                 }
                 let graphs = self
-                    .run
                     .common
                     .wasi
                     .nn_graph
@@ -644,12 +819,12 @@ impl RunCommand {
             }
         }
 
-        if self.run.common.wasi.threads == Some(true) {
+        if self.common.wasi.threads == Some(true) {
             #[cfg(not(feature = "wasi-threads"))]
             {
                 // Silence the unused warning for `module` as it is only used in the
                 // conditionally-compiled wasi-threads.
-                let _ = &module;
+                drop(&module);
 
                 bail!(
                     "Cannot enable wasi-threads when the binary is not compiled with this feature."
@@ -672,23 +847,23 @@ impl RunCommand {
             }
         }
 
-        if self.run.common.wasi.http == Some(true) {
-            #[cfg(not(all(feature = "wasi-http", feature = "component-model")))]
+        if self.common.wasi.http == Some(true) {
+            #[cfg(not(feature = "wasi-http"))]
             {
                 bail!("Cannot enable wasi-http when the binary is not compiled with this feature.");
             }
-            #[cfg(all(feature = "wasi-http", feature = "component-model"))]
+            #[cfg(feature = "wasi-http")]
             {
                 match linker {
-                    CliLinker::Core(_) => {
-                        bail!("Cannot enable wasi-http for core wasm modules");
+                    CliLinker::Core(linker) => {
+                        wasmtime_wasi_http::sync::add_to_linker(linker)?;
                     }
+                    #[cfg(feature = "component-model")]
                     CliLinker::Component(linker) => {
-                        wasmtime_wasi_http::proxy::sync::add_only_http_to_linker(linker)?;
+                        wasmtime_wasi_http::proxy::sync::add_to_linker(linker)?;
                     }
                 }
-
-                store.data_mut().wasi_http = Some(Arc::new(WasiHttpCtx {}));
+                store.data_mut().wasi_http = Some(Arc::new(WasiHttpCtx::new()));
             }
         }
 
@@ -710,7 +885,7 @@ impl RunCommand {
 
         let mut num_fd: usize = 3;
 
-        if self.run.common.wasi.listenfd == Some(true) {
+        if self.common.wasi.listenfd == Some(true) {
             num_fd = ctx_set_listenfd(num_fd, &mut builder)?;
         }
 
@@ -740,7 +915,7 @@ impl RunCommand {
             builder.env(key, &value);
         }
 
-        if self.run.common.wasi.listenfd == Some(true) {
+        if self.common.wasi.listenfd == Some(true) {
             bail!("components do not support --listenfd");
         }
         for _ in self.compute_preopen_sockets()? {
@@ -756,14 +931,14 @@ impl RunCommand {
             );
         }
 
-        if self.run.common.wasi.inherit_network == Some(true) {
+        if self.common.wasi.inherit_network == Some(true) {
             builder.inherit_network(ambient_authority());
         }
-        if let Some(enable) = self.run.common.wasi.allow_ip_name_lookup {
-            builder.allow_ip_name_lookup(enable);
-        }
 
-        store.data_mut().preview2_ctx = Some(Arc::new(builder.build()));
+        let data = store.data_mut();
+        let table = Arc::get_mut(&mut data.preview2_table).unwrap();
+        let ctx = builder.build(table)?;
+        data.preview2_ctx = Some(Arc::new(ctx));
         Ok(())
     }
 }
@@ -789,8 +964,7 @@ struct Host {
     #[cfg(feature = "wasi-http")]
     wasi_http: Option<Arc<WasiHttpCtx>>,
     limits: StoreLimits,
-    #[cfg(feature = "profiling")]
-    guest_profiler: Option<Arc<wasmtime::GuestProfiler>>,
+    guest_profiler: Option<Arc<GuestProfiler>>,
 }
 
 impl preview2::WasiView for Host {
@@ -824,13 +998,13 @@ impl preview2::preview1::WasiPreview1View for Host {
 
 #[cfg(feature = "wasi-http")]
 impl wasmtime_wasi_http::types::WasiHttpView for Host {
-    fn ctx(&mut self) -> &mut WasiHttpCtx {
-        let ctx = self.wasi_http.as_mut().unwrap();
-        Arc::get_mut(ctx).expect("preview2 is not compatible with threads")
+    fn http_ctx(&self) -> &WasiHttpCtx {
+        self.wasi_http.as_ref().unwrap()
     }
 
-    fn table(&mut self) -> &mut preview2::Table {
-        Arc::get_mut(&mut self.preview2_table).expect("preview2 is not compatible with threads")
+    fn http_ctx_mut(&mut self) -> &mut WasiHttpCtx {
+        let ctx = self.wasi_http.as_mut().unwrap();
+        Arc::get_mut(ctx).expect("wasi-http is not compatible with threads")
     }
 }
 
@@ -863,26 +1037,36 @@ fn ctx_set_listenfd(mut num_fd: usize, builder: &mut WasiCtxBuilder) -> Result<u
     Ok(num_fd)
 }
 
-#[cfg(feature = "coredump")]
-fn write_core_dump(
-    store: &mut Store<Host>,
-    err: &anyhow::Error,
-    name: &str,
-    path: &str,
-) -> Result<()> {
-    use std::fs::File;
-    use std::io::Write;
-
-    let core_dump = err
-        .downcast_ref::<wasmtime::WasmCoreDump>()
-        .expect("should have been configured to capture core dumps");
-
-    let core_dump = core_dump.serialize(store, name);
-
-    let mut core_dump_file =
-        File::create(path).context(format!("failed to create file at `{}`", path))?;
-    core_dump_file
-        .write_all(&core_dump)
-        .with_context(|| format!("failed to write core dump file at `{}`", path))?;
+fn generate_coredump(err: &anyhow::Error, source_name: &str, coredump_path: &str) -> Result<()> {
+    let bt = err
+        .downcast_ref::<wasmtime::WasmBacktrace>()
+        .ok_or_else(|| anyhow!("no wasm backtrace found to generate coredump with"))?;
+
+    let coredump = wasm_encoder::CoreDumpSection::new(source_name);
+    let mut stacksection = wasm_encoder::CoreDumpStackSection::new("main");
+    for f in bt.frames() {
+        // We don't have the information at this point to map frames to
+        // individual instances of a module, so we won't be able to create the
+        // "frame ∈ instance ∈ module" hierarchy described in the core dump spec
+        // until we move core dump generation into the runtime. So for now
+        // instanceidx will be 0 for all frames
+        let instanceidx = 0;
+        stacksection.frame(
+            instanceidx,
+            f.func_index(),
+            u32::try_from(f.func_offset().unwrap_or(0)).unwrap(),
+            // We don't currently have access to locals/stack values
+            [],
+            [],
+        );
+    }
+    let mut module = wasm_encoder::Module::new();
+    module.section(&coredump);
+    module.section(&stacksection);
+
+    let mut f = File::create(coredump_path)
+        .context(format!("failed to create file at `{}`", coredump_path))?;
+    f.write_all(module.as_slice())
+        .with_context(|| format!("failed to write coredump file at `{}`", coredump_path))?;
     Ok(())
 }
diff --git a/src/commands/serve.rs b/src/commands/serve.rs
deleted file mode 100644
index fc95f7add304..000000000000
--- a/src/commands/serve.rs
+++ /dev/null
@@ -1,457 +0,0 @@
-use crate::common::{Profile, RunCommon, RunTarget};
-use anyhow::{anyhow, bail, Result};
-use clap::Parser;
-use std::{
-    path::PathBuf,
-    pin::Pin,
-    sync::{
-        atomic::{AtomicBool, AtomicU64, Ordering},
-        Arc,
-    },
-};
-use wasmtime::component::{InstancePre, Linker};
-use wasmtime::{Engine, Store, StoreLimits};
-use wasmtime_wasi::preview2::{
-    self, StreamError, StreamResult, Table, WasiCtx, WasiCtxBuilder, WasiView,
-};
-use wasmtime_wasi_http::{body::HyperOutgoingBody, WasiHttpCtx, WasiHttpView};
-
-#[cfg(feature = "wasi-nn")]
-use wasmtime_wasi_nn::WasiNnCtx;
-
-struct Host {
-    table: Table,
-    ctx: WasiCtx,
-    http: WasiHttpCtx,
-
-    limits: StoreLimits,
-
-    #[cfg(feature = "wasi-nn")]
-    nn: Option<WasiNnCtx>,
-}
-
-impl WasiView for Host {
-    fn table(&self) -> &Table {
-        &self.table
-    }
-
-    fn table_mut(&mut self) -> &mut Table {
-        &mut self.table
-    }
-
-    fn ctx(&self) -> &WasiCtx {
-        &self.ctx
-    }
-
-    fn ctx_mut(&mut self) -> &mut WasiCtx {
-        &mut self.ctx
-    }
-}
-
-impl WasiHttpView for Host {
-    fn table(&mut self) -> &mut Table {
-        &mut self.table
-    }
-
-    fn ctx(&mut self) -> &mut WasiHttpCtx {
-        &mut self.http
-    }
-}
-
-const DEFAULT_ADDR: std::net::SocketAddr = std::net::SocketAddr::new(
-    std::net::IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)),
-    8080,
-);
-
-/// Runs a WebAssembly module
-#[derive(Parser)]
-#[structopt(name = "serve")]
-pub struct ServeCommand {
-    #[clap(flatten)]
-    run: RunCommon,
-
-    /// Socket address for the web server to bind to.
-    #[clap(long = "addr", value_name = "SOCKADDR", default_value_t = DEFAULT_ADDR )]
-    addr: std::net::SocketAddr,
-
-    /// The WebAssembly component to run.
-    #[clap(value_name = "WASM", required = true)]
-    component: PathBuf,
-}
-
-impl ServeCommand {
-    /// Start a server to run the given wasi-http proxy component
-    pub fn execute(mut self) -> Result<()> {
-        self.run.common.init_logging()?;
-
-        // We force cli errors before starting to listen for connections so tha we don't
-        // accidentally delay them to the first request.
-        if self.run.common.wasi.nn == Some(true) {
-            #[cfg(not(feature = "wasi-nn"))]
-            {
-                bail!("Cannot enable wasi-nn when the binary is not compiled with this feature.");
-            }
-        }
-
-        if let Some(Profile::Guest { .. }) = &self.run.profile {
-            bail!("Cannot use the guest profiler with components");
-        }
-
-        if self.run.common.wasi.nn == Some(true) {
-            #[cfg(not(feature = "wasi-nn"))]
-            {
-                bail!("Cannot enable wasi-nn when the binary is not compiled with this feature.");
-            }
-        }
-
-        if self.run.common.wasi.threads == Some(true) {
-            bail!("wasi-threads does not support components yet")
-        }
-
-        // The serve command requires both wasi-http and the component model, so we enable those by
-        // default here.
-        if self.run.common.wasi.http.replace(true) == Some(false) {
-            bail!("wasi-http is required for the serve command, and must not be disabled");
-        }
-        if self.run.common.wasm.component_model.replace(true) == Some(false) {
-            bail!("components are required for the serve command, and must not be disabled");
-        }
-
-        let runtime = tokio::runtime::Builder::new_multi_thread()
-            .enable_time()
-            .enable_io()
-            .build()?;
-
-        runtime.block_on(async move {
-            tokio::select! {
-                _ = tokio::signal::ctrl_c() => {
-                    Ok::<_, anyhow::Error>(())
-                }
-
-                res = self.serve() => {
-                    res
-                }
-            }
-        })?;
-
-        Ok(())
-    }
-
-    fn new_store(&self, engine: &Engine, req_id: u64) -> Result<Store<Host>> {
-        let mut builder = WasiCtxBuilder::new();
-
-        builder.envs(&[("REQUEST_ID", req_id.to_string())]);
-
-        builder.stdout(LogStream {
-            prefix: format!("stdout [{req_id}] :: "),
-            output: Output::Stdout,
-        });
-
-        builder.stderr(LogStream {
-            prefix: format!("stderr [{req_id}] :: "),
-            output: Output::Stderr,
-        });
-
-        let mut host = Host {
-            table: Table::new(),
-            ctx: builder.build(),
-            http: WasiHttpCtx,
-
-            limits: StoreLimits::default(),
-
-            #[cfg(feature = "wasi-nn")]
-            nn: None,
-        };
-
-        if self.run.common.wasi.nn == Some(true) {
-            #[cfg(feature = "wasi-nn")]
-            {
-                let graphs = self
-                    .run
-                    .common
-                    .wasi
-                    .nn_graph
-                    .iter()
-                    .map(|g| (g.format.clone(), g.dir.clone()))
-                    .collect::<Vec<_>>();
-                let (backends, registry) = wasmtime_wasi_nn::preload(&graphs)?;
-                host.nn.replace(WasiNnCtx::new(backends, registry));
-            }
-        }
-
-        let mut store = Store::new(engine, host);
-
-        if self.run.common.wasm.timeout.is_some() {
-            store.set_epoch_deadline(1);
-        }
-
-        store.data_mut().limits = self.run.store_limits();
-        store.limiter(|t| &mut t.limits);
-
-        // If fuel has been configured, we want to add the configured
-        // fuel amount to this store.
-        if let Some(fuel) = self.run.common.wasm.fuel {
-            store.set_fuel(fuel)?;
-        }
-
-        Ok(store)
-    }
-
-    fn add_to_linker(&self, linker: &mut Linker<Host>) -> Result<()> {
-        // wasi-http and the component model are implicitly enabled for `wasmtime serve`, so we
-        // don't test for `self.run.common.wasi.common` or `self.run.common.wasi.http` in this
-        // function.
-
-        wasmtime_wasi_http::proxy::add_to_linker(linker)?;
-
-        if self.run.common.wasi.nn == Some(true) {
-            #[cfg(feature = "wasi-nn")]
-            {
-                wasmtime_wasi_nn::wit::ML::add_to_linker(linker, |host| host.nn.as_mut().unwrap())?;
-            }
-        }
-
-        Ok(())
-    }
-
-    async fn serve(mut self) -> Result<()> {
-        use hyper::server::conn::http1;
-
-        let mut config = self.run.common.config(None)?;
-        config.wasm_component_model(true);
-        config.async_support(true);
-
-        if self.run.common.wasm.timeout.is_some() {
-            config.epoch_interruption(true);
-        }
-
-        match self.run.profile {
-            Some(Profile::Native(s)) => {
-                config.profiler(s);
-            }
-
-            // We bail early in `execute` if the guest profiler is configured.
-            Some(Profile::Guest { .. }) => unreachable!(),
-
-            None => {}
-        }
-
-        let engine = Engine::new(&config)?;
-        let mut linker = Linker::new(&engine);
-
-        self.add_to_linker(&mut linker)?;
-
-        let component = match self.run.load_module(&engine, &self.component)? {
-            RunTarget::Core(_) => bail!("The serve command currently requires a component"),
-            RunTarget::Component(c) => c,
-        };
-
-        let instance = linker.instantiate_pre(&component)?;
-
-        let listener = tokio::net::TcpListener::bind(self.addr).await?;
-
-        let _epoch_thread = if let Some(timeout) = self.run.common.wasm.timeout {
-            Some(EpochThread::spawn(timeout, engine.clone()))
-        } else {
-            None
-        };
-
-        log::info!("Listening on {}", self.addr);
-
-        let handler = ProxyHandler::new(self, engine, instance);
-
-        loop {
-            let (stream, _) = listener.accept().await?;
-            let h = handler.clone();
-            tokio::task::spawn(async move {
-                if let Err(e) = http1::Builder::new()
-                    .keep_alive(true)
-                    .serve_connection(stream, h)
-                    .await
-                {
-                    eprintln!("error: {e:?}");
-                }
-            });
-        }
-    }
-}
-
-struct EpochThread {
-    shutdown: Arc<AtomicBool>,
-    handle: Option<std::thread::JoinHandle<()>>,
-}
-
-impl EpochThread {
-    fn spawn(timeout: std::time::Duration, engine: Engine) -> Self {
-        let shutdown = Arc::new(AtomicBool::new(false));
-        let handle = {
-            let shutdown = Arc::clone(&shutdown);
-            let handle = std::thread::spawn(move || {
-                while !shutdown.load(Ordering::Relaxed) {
-                    std::thread::sleep(timeout);
-                    engine.increment_epoch();
-                }
-            });
-            Some(handle)
-        };
-
-        EpochThread { shutdown, handle }
-    }
-}
-
-impl Drop for EpochThread {
-    fn drop(&mut self) {
-        if let Some(handle) = self.handle.take() {
-            self.shutdown.store(true, Ordering::Relaxed);
-            handle.join().unwrap();
-        }
-    }
-}
-
-struct ProxyHandlerInner {
-    cmd: ServeCommand,
-    engine: Engine,
-    instance_pre: InstancePre<Host>,
-    next_id: AtomicU64,
-}
-
-impl ProxyHandlerInner {
-    fn next_req_id(&self) -> u64 {
-        self.next_id.fetch_add(1, Ordering::Relaxed)
-    }
-}
-
-#[derive(Clone)]
-struct ProxyHandler(Arc<ProxyHandlerInner>);
-
-impl ProxyHandler {
-    fn new(cmd: ServeCommand, engine: Engine, instance_pre: InstancePre<Host>) -> Self {
-        Self(Arc::new(ProxyHandlerInner {
-            cmd,
-            engine,
-            instance_pre,
-            next_id: AtomicU64::from(0),
-        }))
-    }
-}
-
-type Request = hyper::Request<hyper::body::Incoming>;
-
-impl hyper::service::Service<Request> for ProxyHandler {
-    type Response = hyper::Response<HyperOutgoingBody>;
-    type Error = anyhow::Error;
-    type Future = Pin<Box<dyn std::future::Future<Output = Result<Self::Response>> + Send>>;
-
-    fn call(&mut self, req: Request) -> Self::Future {
-        use http_body_util::BodyExt;
-
-        let ProxyHandler(inner) = self.clone();
-
-        let (sender, receiver) = tokio::sync::oneshot::channel();
-
-        // TODO: need to track the join handle, but don't want to block the response on it
-        tokio::task::spawn(async move {
-            let req_id = inner.next_req_id();
-
-            log::info!(
-                "Request {req_id} handling {} to {}",
-                req.method(),
-                req.uri()
-            );
-
-            let mut store = inner.cmd.new_store(&inner.engine, req_id)?;
-
-            let req = store.data_mut().new_incoming_request(
-                req.map(|body| body.map_err(|e| anyhow::anyhow!(e)).boxed()),
-            )?;
-
-            let out = store.data_mut().new_response_outparam(sender)?;
-
-            let (proxy, _inst) =
-                wasmtime_wasi_http::proxy::Proxy::instantiate_pre(&mut store, &inner.instance_pre)
-                    .await?;
-
-            proxy
-                .wasi_http_incoming_handler()
-                .call_handle(store, req, out)
-                .await?;
-
-            Ok::<_, anyhow::Error>(())
-        });
-
-        Box::pin(async move {
-            let resp = receiver.await.unwrap()?;
-            Ok(resp)
-        })
-    }
-}
-
-#[derive(Clone)]
-enum Output {
-    Stdout,
-    Stderr,
-}
-
-impl Output {
-    fn write_all(&self, buf: &[u8]) -> anyhow::Result<()> {
-        use std::io::Write;
-
-        match self {
-            Output::Stdout => std::io::stdout().write_all(buf),
-            Output::Stderr => std::io::stderr().write_all(buf),
-        }
-        .map_err(|e| anyhow!(e))
-    }
-}
-
-#[derive(Clone)]
-struct LogStream {
-    prefix: String,
-    output: Output,
-}
-
-impl preview2::StdoutStream for LogStream {
-    fn stream(&self) -> Box<dyn preview2::HostOutputStream> {
-        Box::new(self.clone())
-    }
-
-    fn isatty(&self) -> bool {
-        use std::io::IsTerminal;
-
-        match &self.output {
-            Output::Stdout => std::io::stdout().is_terminal(),
-            Output::Stderr => std::io::stderr().is_terminal(),
-        }
-    }
-}
-
-impl preview2::HostOutputStream for LogStream {
-    fn write(&mut self, bytes: bytes::Bytes) -> StreamResult<()> {
-        let mut msg = Vec::new();
-
-        for line in bytes.split(|c| *c == b'\n') {
-            if !line.is_empty() {
-                msg.extend_from_slice(&self.prefix.as_bytes());
-                msg.extend_from_slice(line);
-                msg.push(b'\n');
-            }
-        }
-
-        self.output
-            .write_all(&msg)
-            .map_err(StreamError::LastOperationFailed)
-    }
-
-    fn flush(&mut self) -> StreamResult<()> {
-        Ok(())
-    }
-
-    fn check_write(&mut self) -> StreamResult<usize> {
-        Ok(1024 * 1024)
-    }
-}
-
-#[async_trait::async_trait]
-impl preview2::Subscribe for LogStream {
-    async fn ready(&mut self) {}
-}
diff --git a/src/commands/settings.rs b/src/commands/settings.rs
index 058909f8d381..b51475d90554 100644
--- a/src/commands/settings.rs
+++ b/src/commands/settings.rs
@@ -45,7 +45,7 @@ struct Settings {
     bools: Vec<SettingData>,
     presets: Vec<SettingData>,
 
-    inferred: Option<Vec<&'static str>>,
+    inferred: Option<Vec<String>>,
 }
 
 impl Settings {
diff --git a/src/commands/wast.rs b/src/commands/wast.rs
index a3ac85f689ba..9e02ebd0ae89 100644
--- a/src/commands/wast.rs
+++ b/src/commands/wast.rs
@@ -22,7 +22,7 @@ pub struct WastCommand {
 impl WastCommand {
     /// Executes the command.
     pub fn execute(mut self) -> Result<()> {
-        self.common.init_logging()?;
+        self.common.init_logging();
 
         let config = self.common.config(None)?;
         let store = Store::new(&Engine::new(&config)?, ());
diff --git a/src/common.rs b/src/common.rs
deleted file mode 100644
index 00c04cfb18b9..000000000000
--- a/src/common.rs
+++ /dev/null
@@ -1,248 +0,0 @@
-//! Common functionality shared between command implementations.
-
-use anyhow::{bail, Context, Result};
-use clap::Parser;
-use std::{path::Path, time::Duration};
-use wasmtime::{Engine, Module, Precompiled, StoreLimits, StoreLimitsBuilder};
-use wasmtime_cli_flags::{opt::WasmtimeOptionValue, CommonOptions};
-
-#[cfg(feature = "component-model")]
-use wasmtime::component::Component;
-
-pub enum RunTarget {
-    Core(Module),
-
-    #[cfg(feature = "component-model")]
-    Component(Component),
-}
-
-impl RunTarget {
-    pub fn unwrap_core(&self) -> &Module {
-        match self {
-            RunTarget::Core(module) => module,
-            #[cfg(feature = "component-model")]
-            RunTarget::Component(_) => panic!("expected a core wasm module, not a component"),
-        }
-    }
-
-    #[cfg(feature = "component-model")]
-    pub fn unwrap_component(&self) -> &Component {
-        match self {
-            RunTarget::Component(c) => c,
-            RunTarget::Core(_) => panic!("expected a component, not a core wasm module"),
-        }
-    }
-}
-
-/// Common command line arguments for run commands.
-#[derive(Parser)]
-pub struct RunCommon {
-    #[clap(flatten)]
-    pub common: CommonOptions,
-
-    /// Allow executing precompiled WebAssembly modules as `*.cwasm` files.
-    ///
-    /// Note that this option is not safe to pass if the module being passed in
-    /// is arbitrary user input. Only `wasmtime`-precompiled modules generated
-    /// via the `wasmtime compile` command or equivalent should be passed as an
-    /// argument with this option specified.
-    #[clap(long = "allow-precompiled")]
-    pub allow_precompiled: bool,
-
-    /// Profiling strategy (valid options are: perfmap, jitdump, vtune, guest)
-    ///
-    /// The perfmap, jitdump, and vtune profiling strategies integrate Wasmtime
-    /// with external profilers such as `perf`. The guest profiling strategy
-    /// enables in-process sampling and will write the captured profile to
-    /// `wasmtime-guest-profile.json` by default which can be viewed at
-    /// https://profiler.firefox.com/.
-    ///
-    /// The `guest` option can be additionally configured as:
-    ///
-    ///     --profile=guest[,path[,interval]]
-    ///
-    /// where `path` is where to write the profile and `interval` is the
-    /// duration between samples. When used with `--wasm-timeout` the timeout
-    /// will be rounded up to the nearest multiple of this interval.
-    #[clap(
-        long,
-        value_name = "STRATEGY",
-        value_parser = Profile::parse,
-    )]
-    pub profile: Option<Profile>,
-}
-
-impl RunCommon {
-    pub fn store_limits(&self) -> StoreLimits {
-        let mut limits = StoreLimitsBuilder::new();
-        if let Some(max) = self.common.wasm.max_memory_size {
-            limits = limits.memory_size(max);
-        }
-        if let Some(max) = self.common.wasm.max_table_elements {
-            limits = limits.table_elements(max);
-        }
-        if let Some(max) = self.common.wasm.max_instances {
-            limits = limits.instances(max);
-        }
-        if let Some(max) = self.common.wasm.max_tables {
-            limits = limits.tables(max);
-        }
-        if let Some(max) = self.common.wasm.max_memories {
-            limits = limits.memories(max);
-        }
-        if let Some(enable) = self.common.wasm.trap_on_grow_failure {
-            limits = limits.trap_on_grow_failure(enable);
-        }
-
-        limits.build()
-    }
-
-    pub fn ensure_allow_precompiled(&self) -> Result<()> {
-        if self.allow_precompiled {
-            Ok(())
-        } else {
-            bail!("running a precompiled module requires the `--allow-precompiled` flag")
-        }
-    }
-
-    #[cfg(feature = "component-model")]
-    fn ensure_allow_components(&self) -> Result<()> {
-        if self.common.wasm.component_model != Some(true) {
-            bail!("cannot execute a component without `--wasm component-model`");
-        }
-
-        Ok(())
-    }
-
-    pub fn load_module(&self, engine: &Engine, path: &Path) -> Result<RunTarget> {
-        let path = match path.to_str() {
-            #[cfg(unix)]
-            Some("-") => "/dev/stdin".as_ref(),
-            _ => path,
-        };
-
-        // First attempt to load the module as an mmap. If this succeeds then
-        // detection can be done with the contents of the mmap and if a
-        // precompiled module is detected then `deserialize_file` can be used
-        // which is a slightly more optimal version than `deserialize` since we
-        // can leave most of the bytes on disk until they're referenced.
-        //
-        // If the mmap fails, for example if stdin is a pipe, then fall back to
-        // `std::fs::read` to load the contents. At that point precompiled
-        // modules must go through the `deserialize` functions.
-        //
-        // Note that this has the unfortunate side effect for precompiled
-        // modules on disk that they're opened once to detect what they are and
-        // then again internally in Wasmtime as part of the `deserialize_file`
-        // API. Currently there's no way to pass the `MmapVec` here through to
-        // Wasmtime itself (that'd require making `wasmtime-runtime` a public
-        // dependency or `MmapVec` a public type, both of which aren't ready to
-        // happen at this time). It's hoped though that opening a file twice
-        // isn't too bad in the grand scheme of things with respect to the CLI.
-        match wasmtime_runtime::MmapVec::from_file(path) {
-            Ok(map) => self.load_module_contents(
-                engine,
-                path,
-                &map,
-                || unsafe { Module::deserialize_file(engine, path) },
-                #[cfg(feature = "component-model")]
-                || unsafe { Component::deserialize_file(engine, path) },
-            ),
-            Err(_) => {
-                let bytes = std::fs::read(path)
-                    .with_context(|| format!("failed to read file: {}", path.display()))?;
-                self.load_module_contents(
-                    engine,
-                    path,
-                    &bytes,
-                    || unsafe { Module::deserialize(engine, &bytes) },
-                    #[cfg(feature = "component-model")]
-                    || unsafe { Component::deserialize(engine, &bytes) },
-                )
-            }
-        }
-    }
-
-    pub fn load_module_contents(
-        &self,
-        engine: &Engine,
-        path: &Path,
-        bytes: &[u8],
-        deserialize_module: impl FnOnce() -> Result<Module>,
-        #[cfg(feature = "component-model")] deserialize_component: impl FnOnce() -> Result<Component>,
-    ) -> Result<RunTarget> {
-        Ok(match engine.detect_precompiled(bytes) {
-            Some(Precompiled::Module) => {
-                self.ensure_allow_precompiled()?;
-                RunTarget::Core(deserialize_module()?)
-            }
-            #[cfg(feature = "component-model")]
-            Some(Precompiled::Component) => {
-                self.ensure_allow_precompiled()?;
-                self.ensure_allow_components()?;
-                RunTarget::Component(deserialize_component()?)
-            }
-            #[cfg(not(feature = "component-model"))]
-            Some(Precompiled::Component) => {
-                bail!("support for components was not enabled at compile time");
-            }
-            None => {
-                // Parse the text format here specifically to add the `path` to
-                // the error message if there's a syntax error.
-                #[cfg(feature = "wat")]
-                let bytes = wat::parse_bytes(bytes).map_err(|mut e| {
-                    e.set_path(path);
-                    e
-                })?;
-                let _ = path;
-                if wasmparser::Parser::is_component(&bytes) {
-                    #[cfg(feature = "component-model")]
-                    {
-                        self.ensure_allow_components()?;
-                        RunTarget::Component(Component::new(engine, &bytes)?)
-                    }
-                    #[cfg(not(feature = "component-model"))]
-                    {
-                        bail!("support for components was not enabled at compile time");
-                    }
-                } else {
-                    #[cfg(feature = "cranelift")]
-                    return Ok(RunTarget::Core(Module::new(engine, &bytes)?));
-                    #[cfg(not(feature = "cranelift"))]
-                    bail!("support for compiling modules was disabled at compile time");
-                }
-            }
-        })
-    }
-}
-
-#[derive(Clone)]
-pub enum Profile {
-    Native(wasmtime::ProfilingStrategy),
-    Guest { path: String, interval: Duration },
-}
-
-impl Profile {
-    /// Parse the `profile` argument to either the `run` or `serve` commands.
-    pub fn parse(s: &str) -> Result<Profile> {
-        let parts = s.split(',').collect::<Vec<_>>();
-        match &parts[..] {
-            ["perfmap"] => Ok(Profile::Native(wasmtime::ProfilingStrategy::PerfMap)),
-            ["jitdump"] => Ok(Profile::Native(wasmtime::ProfilingStrategy::JitDump)),
-            ["vtune"] => Ok(Profile::Native(wasmtime::ProfilingStrategy::VTune)),
-            ["guest"] => Ok(Profile::Guest {
-                path: "wasmtime-guest-profile.json".to_string(),
-                interval: Duration::from_millis(10),
-            }),
-            ["guest", path] => Ok(Profile::Guest {
-                path: path.to_string(),
-                interval: Duration::from_millis(10),
-            }),
-            ["guest", path, dur] => Ok(Profile::Guest {
-                path: path.to_string(),
-                interval: WasmtimeOptionValue::parse(Some(dur))?,
-            }),
-            _ => bail!("unknown profiling strategy: {s}"),
-        }
-    }
-}
diff --git a/src/lib.rs b/src/lib.rs
index 11473981a467..5cf21f6fe768 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,5 +11,3 @@
 #![warn(unused_import_braces)]
 
 pub mod commands;
-
-pub(crate) mod common;
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index 8c06bd9eaddf..ee4eb95a1245 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -497,14 +497,6 @@ start = "2023-01-20"
 end = "2024-06-26"
 notes = "The Bytecode Alliance is the author of this crate."
 
-[[wildcard-audits.wasmtime-wmemcheck]]
-who = "Pat Hickey <pat@moreproductive.org>"
-criteria = "safe-to-deploy"
-user-id = 73222 # wasmtime-publish
-start = "2022-11-27"
-end = "2024-06-26"
-notes = "The Bytecode Alliance is the author of this crate."
-
 [[wildcard-audits.wast]]
 who = "Alex Crichton <alex@alexcrichton.com>"
 criteria = "safe-to-deploy"
@@ -1162,15 +1154,6 @@ this crate has to do with iterators and `Result` and such. No `unsafe` or
 anything like that, all looks good.
 """
 
-[[audits.fastrand]]
-who = "Alex Crichton <alex@alexcrichton.com>"
-criteria = "safe-to-deploy"
-delta = "2.0.0 -> 2.0.1"
-notes = """
-This update had a few doc updates but no otherwise-substantial source code
-updates.
-"""
-
 [[audits.fd-lock]]
 who = "Pat Hickey <phickey@fastly.com>"
 criteria = "safe-to-deploy"
@@ -1455,38 +1438,18 @@ criteria = "safe-to-deploy"
 delta = "0.4.1 -> 0.4.3"
 notes = "The Bytecode Alliance is the author of this crate."
 
-[[audits.ittapi]]
-who = "Andrew Brown <andrew.brown@intel.com>"
-criteria = "safe-to-deploy"
-version = "0.3.4"
-
 [[audits.ittapi]]
 who = "Andrew Brown <andrew.brown@intel.com>"
 criteria = "safe-to-deploy"
 delta = "0.3.1 -> 0.3.3"
 notes = "I am the author of this crate."
 
-[[audits.ittapi]]
-who = "rahulchaphalkar <rahul.s.chaphalkar@intel.com>"
-criteria = "safe-to-deploy"
-delta = "0.3.4 -> 0.4.0"
-
-[[audits.ittapi-sys]]
-who = "Andrew Brown <andrew.brown@intel.com>"
-criteria = "safe-to-deploy"
-version = "0.3.4"
-
 [[audits.ittapi-sys]]
 who = "Andrew Brown <andrew.brown@intel.com>"
 criteria = "safe-to-deploy"
 delta = "0.3.1 -> 0.3.3"
 notes = "Unsafe code is due to auto-generated bindings to a widely-deployed C library."
 
-[[audits.ittapi-sys]]
-who = "rahulchaphalkar <rahul.s.chaphalkar@intel.com>"
-criteria = "safe-to-deploy"
-delta = "0.3.4 -> 0.4.0"
-
 [[audits.leb128]]
 who = "Nick Fitzgerald <fitzgen@gmail.com>"
 criteria = "safe-to-deploy"
@@ -1588,12 +1551,6 @@ criteria = "safe-to-deploy"
 delta = "0.6.2 -> 0.6.3"
 notes = "Just a dependency version bump and documentation update"
 
-[[audits.memfd]]
-who = "Alex Crichton <alex@alexcrichton.com>"
-criteria = "safe-to-deploy"
-delta = "0.6.3 -> 0.6.4"
-notes = "This commit only updated the dependency `rustix`, so same as before."
-
 [[audits.memoffset]]
 who = "Alex Crichton <alex@alexcrichton.com>"
 criteria = "safe-to-deploy"
@@ -1651,12 +1608,6 @@ criteria = "safe-to-deploy"
 version = "0.2.11"
 notes = "build is only looking for environment variables to set cfg. only two minor uses of unsafe,on macos, with ffi bindings to digest primitives and libc atexit. otherwise, this is an abstraction over three very complex systems (schannel, security-framework, and openssl) which may end up having subtle differences, but none of those are apparent from the implementation of this crate"
 
-[[audits.nu-ansi-term]]
-who = "Pat Hickey <phickey@fastly.com>"
-criteria = "safe-to-deploy"
-version = "0.46.0"
-notes = "one use of unsafe to call windows specific api to get console handle."
-
 [[audits.object]]
 who = "Chris Fallin <chris@cfallin.org>"
 criteria = "safe-to-deploy"
@@ -1738,12 +1689,6 @@ who = "Andrew Brown <andrew.brown@intel.com>"
 criteria = "safe-to-deploy"
 delta = "0.4.2 -> 0.5.0"
 
-[[audits.overload]]
-who = "Pat Hickey <phickey@fastly.com>"
-criteria = "safe-to-deploy"
-version = "0.1.1"
-notes = "small crate, only defines macro-rules!, nicely documented as well"
-
 [[audits.peeking_take_while]]
 who = "Nick Fitzgerald <fitzgen@gmail.com>"
 criteria = "safe-to-deploy"
@@ -1941,17 +1886,6 @@ criteria = "safe-to-deploy"
 delta = "0.9.9 -> 0.10.2"
 notes = "This upgrade is mostly a code refactor, as far as I can tell. No new uses of unsafe nor any new ambient capabilities usage."
 
-[[audits.sharded-slab]]
-who = "Pat Hickey <phickey@fastly.com>"
-criteria = "safe-to-deploy"
-version = "0.1.4"
-notes = "I always really enjoy reading eliza's code, she left perfect comments at every use of unsafe."
-
-[[audits.signal-hook-registry]]
-who = "Pat Hickey <phickey@fastly.com>"
-criteria = "safe-to-deploy"
-version = "1.4.1"
-
 [[audits.slab]]
 who = "Pat Hickey <phickey@fastly.com>"
 criteria = "safe-to-deploy"
@@ -2060,12 +1994,6 @@ who = "Pat Hickey <phickey@fastly.com>"
 criteria = "safe-to-deploy"
 version = "0.2.11"
 
-[[audits.thread_local]]
-who = "Pat Hickey <phickey@fastly.com>"
-criteria = "safe-to-deploy"
-version = "1.1.4"
-notes = "uses unsafe to implement thread local storage of objects"
-
 [[audits.tinyvec]]
 who = "Alex Crichton <alex@alexcrichton.com>"
 criteria = "safe-to-deploy"
@@ -2145,20 +2073,6 @@ This is a relatively minor set of releases with minor refactorings and bug
 fixes. Nothing fundamental was added in these changes.
 """
 
-[[audits.tracing-log]]
-who = "Alex Crichton <alex@alexcrichton.com>"
-criteria = "safe-to-deploy"
-version = "0.1.3"
-notes = """
-This is a standard adapter between the `log` ecosystem and the `tracing`
-ecosystem. There's one `unsafe` block in this crate and it's well-scoped.
-"""
-
-[[audits.tracing-subscriber]]
-who = "Pat Hickey <phickey@fastly.com>"
-criteria = "safe-to-deploy"
-version = "0.3.17"
-
 [[audits.tracing-subscriber]]
 who = "Alex Crichton <alex@alexcrichton.com>"
 criteria = "safe-to-run"
@@ -3340,12 +3254,6 @@ user-id = 1 # Alex Crichton (alexcrichton)
 start = "2019-03-04"
 end = "2024-07-14"
 
-[[trusted.wasmtime-wmemcheck]]
-criteria = "safe-to-deploy"
-user-id = 73222 # wasmtime-publish
-start = "2023-09-20"
-end = "2024-09-27"
-
 [[trusted.winapi-util]]
 criteria = "safe-to-deploy"
 user-id = 189 # Andrew Gallant (BurntSushi)
@@ -3411,9 +3319,3 @@ criteria = "safe-to-deploy"
 user-id = 6825 # Dan Gohman (sunfishcode)
 start = "2019-08-20"
 end = "2024-07-14"
-
-[[trusted.wit-parser]]
-criteria = "safe-to-deploy"
-user-id = 696 # Nick Fitzgerald (fitzgen)
-start = "2023-10-12"
-end = "2024-10-17"
diff --git a/supply-chain/config.toml b/supply-chain/config.toml
index a1f88774dde1..8a5686a9fa6f 100644
--- a/supply-chain/config.toml
+++ b/supply-chain/config.toml
@@ -169,9 +169,6 @@ audit-as-crates-io = true
 [policy.wasmtime-wit-bindgen]
 audit-as-crates-io = true
 
-[policy.wasmtime-wmemcheck]
-audit-as-crates-io = true
-
 [policy.wiggle]
 audit-as-crates-io = true
 
@@ -380,6 +377,10 @@ notes = "we are exempting tokio, hyper, and their tightly coupled dependencies b
 version = "0.13.0"
 criteria = "safe-to-deploy"
 
+[[exemptions.instant]]
+version = "0.1.12"
+criteria = "safe-to-deploy"
+
 [[exemptions.ipnet]]
 version = "2.5.0"
 criteria = "safe-to-deploy"
@@ -502,6 +503,10 @@ criteria = "safe-to-deploy"
 version = "0.8.5"
 criteria = "safe-to-deploy"
 
+[[exemptions.rand_chacha]]
+version = "0.3.1"
+criteria = "safe-to-deploy"
+
 [[exemptions.rand_xorshift]]
 version = "0.3.0"
 criteria = "safe-to-deploy"
@@ -510,6 +515,10 @@ criteria = "safe-to-deploy"
 version = "0.2.13"
 criteria = "safe-to-deploy"
 
+[[exemptions.redox_syscall]]
+version = "0.3.5"
+criteria = "safe-to-deploy"
+
 [[exemptions.redox_users]]
 version = "0.4.3"
 criteria = "safe-to-deploy"
@@ -527,6 +536,10 @@ notes = "contains assembly language and object file implementations of crypto pr
 version = "0.3.0"
 criteria = "safe-to-deploy"
 
+[[exemptions.sharded-slab]]
+version = "0.1.4"
+criteria = "safe-to-run"
+
 [[exemptions.shellexpand]]
 version = "2.1.0"
 criteria = "safe-to-deploy"
@@ -575,6 +588,10 @@ criteria = "safe-to-deploy"
 version = "0.1.17"
 criteria = "safe-to-deploy"
 
+[[exemptions.thread_local]]
+version = "1.1.4"
+criteria = "safe-to-run"
+
 [[exemptions.tinytemplate]]
 version = "1.2.1"
 criteria = "safe-to-run"
@@ -600,6 +617,10 @@ criteria = "safe-to-deploy"
 version = "0.1.28"
 criteria = "safe-to-deploy"
 
+[[exemptions.tracing-subscriber]]
+version = "0.3.11"
+criteria = "safe-to-run"
+
 [[exemptions.typenum]]
 version = "1.15.0"
 criteria = "safe-to-deploy"
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 93435881fadd..29747fbcc690 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -2,204 +2,392 @@
 # cargo-vet imports lock
 
 [[unpublished.cranelift]]
-version = "0.102.0"
-audited_as = "0.101.2"
+version = "0.100.0"
+audited_as = "0.98.1"
+
+[[unpublished.cranelift]]
+version = "0.101.0"
+audited_as = "0.99.1"
+
+[[unpublished.cranelift-bforest]]
+version = "0.100.0"
+audited_as = "0.98.1"
 
 [[unpublished.cranelift-bforest]]
-version = "0.102.0"
-audited_as = "0.101.2"
+version = "0.101.0"
+audited_as = "0.99.1"
 
 [[unpublished.cranelift-codegen]]
-version = "0.102.0"
-audited_as = "0.101.2"
+version = "0.100.0"
+audited_as = "0.98.1"
+
+[[unpublished.cranelift-codegen]]
+version = "0.101.0"
+audited_as = "0.99.1"
+
+[[unpublished.cranelift-codegen-meta]]
+version = "0.100.0"
+audited_as = "0.98.1"
 
 [[unpublished.cranelift-codegen-meta]]
-version = "0.102.0"
-audited_as = "0.101.2"
+version = "0.101.0"
+audited_as = "0.99.1"
 
 [[unpublished.cranelift-codegen-shared]]
-version = "0.102.0"
-audited_as = "0.101.2"
+version = "0.100.0"
+audited_as = "0.98.1"
+
+[[unpublished.cranelift-codegen-shared]]
+version = "0.101.0"
+audited_as = "0.99.1"
+
+[[unpublished.cranelift-control]]
+version = "0.100.0"
+audited_as = "0.98.1"
 
 [[unpublished.cranelift-control]]
-version = "0.102.0"
-audited_as = "0.101.2"
+version = "0.101.0"
+audited_as = "0.99.1"
 
 [[unpublished.cranelift-entity]]
-version = "0.102.0"
-audited_as = "0.101.2"
+version = "0.100.0"
+audited_as = "0.98.1"
+
+[[unpublished.cranelift-entity]]
+version = "0.101.0"
+audited_as = "0.99.1"
+
+[[unpublished.cranelift-frontend]]
+version = "0.100.0"
+audited_as = "0.98.1"
 
 [[unpublished.cranelift-frontend]]
-version = "0.102.0"
-audited_as = "0.101.2"
+version = "0.101.0"
+audited_as = "0.99.1"
 
 [[unpublished.cranelift-interpreter]]
-version = "0.102.0"
-audited_as = "0.101.2"
+version = "0.100.0"
+audited_as = "0.98.1"
+
+[[unpublished.cranelift-interpreter]]
+version = "0.101.0"
+audited_as = "0.99.1"
+
+[[unpublished.cranelift-isle]]
+version = "0.100.0"
+audited_as = "0.98.1"
 
 [[unpublished.cranelift-isle]]
-version = "0.102.0"
-audited_as = "0.101.2"
+version = "0.101.0"
+audited_as = "0.99.1"
 
 [[unpublished.cranelift-jit]]
-version = "0.102.0"
-audited_as = "0.101.2"
+version = "0.100.0"
+audited_as = "0.98.1"
+
+[[unpublished.cranelift-jit]]
+version = "0.101.0"
+audited_as = "0.99.1"
+
+[[unpublished.cranelift-module]]
+version = "0.100.0"
+audited_as = "0.98.1"
 
 [[unpublished.cranelift-module]]
-version = "0.102.0"
-audited_as = "0.101.2"
+version = "0.101.0"
+audited_as = "0.99.1"
 
 [[unpublished.cranelift-native]]
-version = "0.102.0"
-audited_as = "0.101.2"
+version = "0.100.0"
+audited_as = "0.98.1"
+
+[[unpublished.cranelift-native]]
+version = "0.101.0"
+audited_as = "0.99.1"
+
+[[unpublished.cranelift-object]]
+version = "0.100.0"
+audited_as = "0.98.1"
 
 [[unpublished.cranelift-object]]
-version = "0.102.0"
-audited_as = "0.101.2"
+version = "0.101.0"
+audited_as = "0.99.1"
 
 [[unpublished.cranelift-reader]]
-version = "0.102.0"
-audited_as = "0.101.2"
+version = "0.100.0"
+audited_as = "0.98.1"
+
+[[unpublished.cranelift-reader]]
+version = "0.101.0"
+audited_as = "0.99.1"
+
+[[unpublished.cranelift-serde]]
+version = "0.100.0"
+audited_as = "0.98.1"
 
 [[unpublished.cranelift-serde]]
-version = "0.102.0"
-audited_as = "0.101.2"
+version = "0.101.0"
+audited_as = "0.99.1"
 
 [[unpublished.cranelift-wasm]]
-version = "0.102.0"
-audited_as = "0.101.2"
+version = "0.100.0"
+audited_as = "0.98.1"
+
+[[unpublished.cranelift-wasm]]
+version = "0.101.0"
+audited_as = "0.99.1"
+
+[[unpublished.wasi-cap-std-sync]]
+version = "13.0.0"
+audited_as = "11.0.1"
 
 [[unpublished.wasi-cap-std-sync]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "14.0.0"
+audited_as = "12.0.1"
 
 [[unpublished.wasi-common]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "13.0.0"
+audited_as = "11.0.1"
+
+[[unpublished.wasi-common]]
+version = "14.0.0"
+audited_as = "12.0.1"
+
+[[unpublished.wasi-tokio]]
+version = "13.0.0"
+audited_as = "11.0.1"
 
 [[unpublished.wasi-tokio]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "14.0.0"
+audited_as = "12.0.1"
 
 [[unpublished.wasmtime]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "13.0.0"
+audited_as = "11.0.1"
+
+[[unpublished.wasmtime]]
+version = "14.0.0"
+audited_as = "12.0.1"
+
+[[unpublished.wasmtime-asm-macros]]
+version = "13.0.0"
+audited_as = "11.0.1"
 
 [[unpublished.wasmtime-asm-macros]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "14.0.0"
+audited_as = "12.0.1"
 
 [[unpublished.wasmtime-cache]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "13.0.0"
+audited_as = "11.0.1"
+
+[[unpublished.wasmtime-cache]]
+version = "14.0.0"
+audited_as = "12.0.1"
+
+[[unpublished.wasmtime-cli]]
+version = "13.0.0"
+audited_as = "11.0.1"
 
 [[unpublished.wasmtime-cli]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "14.0.0"
+audited_as = "12.0.1"
 
 [[unpublished.wasmtime-cli-flags]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "13.0.0"
+audited_as = "11.0.1"
+
+[[unpublished.wasmtime-cli-flags]]
+version = "14.0.0"
+audited_as = "12.0.1"
+
+[[unpublished.wasmtime-component-macro]]
+version = "13.0.0"
+audited_as = "11.0.1"
 
 [[unpublished.wasmtime-component-macro]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "14.0.0"
+audited_as = "12.0.1"
 
 [[unpublished.wasmtime-component-util]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "13.0.0"
+audited_as = "11.0.1"
+
+[[unpublished.wasmtime-component-util]]
+version = "14.0.0"
+audited_as = "12.0.1"
+
+[[unpublished.wasmtime-cranelift]]
+version = "13.0.0"
+audited_as = "11.0.1"
 
 [[unpublished.wasmtime-cranelift]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "14.0.0"
+audited_as = "12.0.1"
 
 [[unpublished.wasmtime-cranelift-shared]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "13.0.0"
+audited_as = "11.0.1"
+
+[[unpublished.wasmtime-cranelift-shared]]
+version = "14.0.0"
+audited_as = "12.0.1"
+
+[[unpublished.wasmtime-environ]]
+version = "13.0.0"
+audited_as = "11.0.1"
 
 [[unpublished.wasmtime-environ]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "14.0.0"
+audited_as = "12.0.1"
 
 [[unpublished.wasmtime-explorer]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "13.0.0"
+audited_as = "11.0.1"
+
+[[unpublished.wasmtime-explorer]]
+version = "14.0.0"
+audited_as = "12.0.1"
+
+[[unpublished.wasmtime-fiber]]
+version = "13.0.0"
+audited_as = "11.0.1"
 
 [[unpublished.wasmtime-fiber]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "14.0.0"
+audited_as = "12.0.1"
 
 [[unpublished.wasmtime-jit]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "13.0.0"
+audited_as = "11.0.1"
+
+[[unpublished.wasmtime-jit]]
+version = "14.0.0"
+audited_as = "12.0.1"
+
+[[unpublished.wasmtime-jit-debug]]
+version = "13.0.0"
+audited_as = "11.0.1"
 
 [[unpublished.wasmtime-jit-debug]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "14.0.0"
+audited_as = "12.0.1"
 
 [[unpublished.wasmtime-jit-icache-coherence]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "13.0.0"
+audited_as = "11.0.1"
+
+[[unpublished.wasmtime-jit-icache-coherence]]
+version = "14.0.0"
+audited_as = "12.0.1"
+
+[[unpublished.wasmtime-runtime]]
+version = "13.0.0"
+audited_as = "11.0.1"
 
 [[unpublished.wasmtime-runtime]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "14.0.0"
+audited_as = "12.0.1"
 
 [[unpublished.wasmtime-types]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "13.0.0"
+audited_as = "11.0.1"
+
+[[unpublished.wasmtime-types]]
+version = "14.0.0"
+audited_as = "12.0.1"
+
+[[unpublished.wasmtime-wasi]]
+version = "13.0.0"
+audited_as = "11.0.1"
 
 [[unpublished.wasmtime-wasi]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "14.0.0"
+audited_as = "12.0.1"
 
 [[unpublished.wasmtime-wasi-http]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "13.0.0"
+audited_as = "11.0.1"
+
+[[unpublished.wasmtime-wasi-http]]
+version = "14.0.0"
+audited_as = "12.0.1"
+
+[[unpublished.wasmtime-wasi-nn]]
+version = "13.0.0"
+audited_as = "11.0.1"
 
 [[unpublished.wasmtime-wasi-nn]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "14.0.0"
+audited_as = "12.0.1"
 
 [[unpublished.wasmtime-wasi-threads]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "13.0.0"
+audited_as = "11.0.1"
+
+[[unpublished.wasmtime-wasi-threads]]
+version = "14.0.0"
+audited_as = "12.0.1"
+
+[[unpublished.wasmtime-wast]]
+version = "13.0.0"
+audited_as = "11.0.1"
 
 [[unpublished.wasmtime-wast]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "14.0.0"
+audited_as = "12.0.1"
 
 [[unpublished.wasmtime-winch]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "13.0.0"
+audited_as = "11.0.1"
+
+[[unpublished.wasmtime-winch]]
+version = "14.0.0"
+audited_as = "12.0.1"
+
+[[unpublished.wasmtime-wit-bindgen]]
+version = "13.0.0"
+audited_as = "11.0.1"
 
 [[unpublished.wasmtime-wit-bindgen]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "14.0.0"
+audited_as = "12.0.1"
 
-[[unpublished.wasmtime-wmemcheck]]
-version = "15.0.0"
-audited_as = "14.0.2"
+[[unpublished.wiggle]]
+version = "13.0.0"
+audited_as = "11.0.1"
 
 [[unpublished.wiggle]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "14.0.0"
+audited_as = "12.0.1"
+
+[[unpublished.wiggle-generate]]
+version = "13.0.0"
+audited_as = "11.0.1"
 
 [[unpublished.wiggle-generate]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "14.0.0"
+audited_as = "12.0.1"
+
+[[unpublished.wiggle-macro]]
+version = "13.0.0"
+audited_as = "11.0.1"
 
 [[unpublished.wiggle-macro]]
-version = "15.0.0"
-audited_as = "14.0.2"
+version = "14.0.0"
+audited_as = "12.0.1"
 
 [[unpublished.wiggle-test]]
 version = "0.0.0"
 audited_as = "0.1.0"
 
 [[unpublished.winch-codegen]]
-version = "0.13.0"
-audited_as = "0.12.2"
+version = "0.11.0"
+audited_as = "0.9.1"
+
+[[unpublished.winch-codegen]]
+version = "0.12.0"
+audited_as = "0.10.1"
 
 [[publisher.aho-corasick]]
 version = "1.0.2"
@@ -251,8 +439,8 @@ user-login = "dtolnay"
 user-name = "David Tolnay"
 
 [[publisher.arbitrary]]
-version = "1.3.1"
-when = "2023-10-11"
+version = "1.3.0"
+when = "2023-03-13"
 user-id = 696
 user-login = "fitzgen"
 user-name = "Nick Fitzgerald"
@@ -264,6 +452,13 @@ user-id = 3618
 user-login = "dtolnay"
 user-name = "David Tolnay"
 
+[[publisher.backtrace]]
+version = "0.3.68"
+when = "2023-06-29"
+user-id = 2915
+user-login = "Amanieu"
+user-name = "Amanieu d'Antras"
+
 [[publisher.backtrace]]
 version = "0.3.69"
 when = "2023-08-22"
@@ -370,104 +565,206 @@ user-login = "epage"
 user-name = "Ed Page"
 
 [[publisher.cranelift]]
-version = "0.101.2"
-when = "2023-10-26"
+version = "0.98.1"
+when = "2023-07-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.cranelift]]
+version = "0.99.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.cranelift-bforest]]
+version = "0.98.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.cranelift-bforest]]
-version = "0.101.2"
-when = "2023-10-26"
+version = "0.99.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.cranelift-codegen]]
+version = "0.98.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.cranelift-codegen]]
-version = "0.101.2"
-when = "2023-10-26"
+version = "0.99.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.cranelift-codegen-meta]]
+version = "0.98.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.cranelift-codegen-meta]]
-version = "0.101.2"
-when = "2023-10-26"
+version = "0.99.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.cranelift-codegen-shared]]
+version = "0.98.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.cranelift-codegen-shared]]
-version = "0.101.2"
-when = "2023-10-26"
+version = "0.99.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.cranelift-control]]
+version = "0.98.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.cranelift-control]]
-version = "0.101.2"
-when = "2023-10-26"
+version = "0.99.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.cranelift-entity]]
+version = "0.98.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.cranelift-entity]]
-version = "0.101.2"
-when = "2023-10-26"
+version = "0.99.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.cranelift-frontend]]
+version = "0.98.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.cranelift-frontend]]
-version = "0.101.2"
-when = "2023-10-26"
+version = "0.99.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.cranelift-interpreter]]
+version = "0.98.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.cranelift-interpreter]]
-version = "0.101.2"
-when = "2023-10-26"
+version = "0.99.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.cranelift-isle]]
+version = "0.98.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.cranelift-isle]]
-version = "0.101.2"
-when = "2023-10-26"
+version = "0.99.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.cranelift-jit]]
+version = "0.98.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.cranelift-jit]]
-version = "0.101.2"
-when = "2023-10-26"
+version = "0.99.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.cranelift-module]]
+version = "0.98.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.cranelift-module]]
-version = "0.101.2"
-when = "2023-10-26"
+version = "0.99.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.cranelift-native]]
+version = "0.98.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.cranelift-native]]
-version = "0.101.2"
-when = "2023-10-26"
+version = "0.99.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.cranelift-object]]
+version = "0.98.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.cranelift-object]]
-version = "0.101.2"
-when = "2023-10-26"
+version = "0.99.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.cranelift-reader]]
+version = "0.98.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.cranelift-reader]]
-version = "0.101.2"
-when = "2023-10-26"
+version = "0.99.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.cranelift-serde]]
+version = "0.98.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.cranelift-serde]]
-version = "0.101.2"
-when = "2023-10-26"
+version = "0.99.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.cranelift-wasm]]
+version = "0.98.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.cranelift-wasm]]
-version = "0.101.2"
-when = "2023-10-26"
+version = "0.99.1"
+when = "2023-08-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
@@ -541,13 +838,6 @@ user-id = 6825
 user-login = "sunfishcode"
 user-name = "Dan Gohman"
 
-[[publisher.is-terminal]]
-version = "0.4.9"
-when = "2023-07-06"
-user-id = 6825
-user-login = "sunfishcode"
-user-name = "Dan Gohman"
-
 [[publisher.itoa]]
 version = "1.0.1"
 when = "2021-12-12"
@@ -570,8 +860,8 @@ user-login = "Amanieu"
 user-name = "Amanieu d'Antras"
 
 [[publisher.linux-raw-sys]]
-version = "0.4.10"
-when = "2023-10-09"
+version = "0.4.3"
+when = "2023-06-14"
 user-id = 6825
 user-login = "sunfishcode"
 user-name = "Dan Gohman"
@@ -598,8 +888,8 @@ user-login = "dtolnay"
 user-name = "David Tolnay"
 
 [[publisher.regalloc2]]
-version = "0.9.3"
-when = "2023-10-05"
+version = "0.9.2"
+when = "2023-07-14"
 user-id = 3726
 user-login = "cfallin"
 user-name = "Chris Fallin"
@@ -640,8 +930,15 @@ user-login = "BurntSushi"
 user-name = "Andrew Gallant"
 
 [[publisher.rustix]]
-version = "0.38.21"
-when = "2023-10-26"
+version = "0.38.4"
+when = "2023-07-11"
+user-id = 6825
+user-login = "sunfishcode"
+user-name = "Dan Gohman"
+
+[[publisher.rustix]]
+version = "0.38.8"
+when = "2023-08-10"
 user-id = 6825
 user-login = "sunfishcode"
 user-name = "Dan Gohman"
@@ -667,6 +964,13 @@ user-id = 2915
 user-login = "Amanieu"
 user-name = "Amanieu d'Antras"
 
+[[publisher.serde]]
+version = "1.0.171"
+when = "2023-07-10"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
 [[publisher.serde]]
 version = "1.0.188"
 when = "2023-08-26"
@@ -674,6 +978,13 @@ user-id = 3618
 user-login = "dtolnay"
 user-name = "David Tolnay"
 
+[[publisher.serde_derive]]
+version = "1.0.171"
+when = "2023-07-10"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
 [[publisher.serde_derive]]
 version = "1.0.188"
 when = "2023-08-26"
@@ -681,6 +992,13 @@ user-id = 3618
 user-login = "dtolnay"
 user-name = "David Tolnay"
 
+[[publisher.serde_json]]
+version = "1.0.80"
+when = "2022-04-30"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
 [[publisher.serde_json]]
 version = "1.0.107"
 when = "2023-09-13"
@@ -701,6 +1019,13 @@ user-id = 3618
 user-login = "dtolnay"
 user-name = "David Tolnay"
 
+[[publisher.syn]]
+version = "2.0.25"
+when = "2023-07-09"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
 [[publisher.syn]]
 version = "2.0.29"
 when = "2023-08-17"
@@ -779,20 +1104,38 @@ user-login = "BurntSushi"
 user-name = "Andrew Gallant"
 
 [[publisher.wasi-cap-std-sync]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "11.0.1"
+when = "2023-07-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasi-cap-std-sync]]
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasi-common]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasi-common]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasi-tokio]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasi-tokio]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
@@ -832,226 +1175,564 @@ user-login = "alexcrichton"
 user-name = "Alex Crichton"
 
 [[publisher.wasm-encoder]]
-version = "0.35.0"
-when = "2023-10-14"
+version = "0.30.0"
+when = "2023-07-11"
 user-id = 1
 user-login = "alexcrichton"
 user-name = "Alex Crichton"
 
-[[publisher.wasm-metadata]]
-version = "0.10.9"
-when = "2023-10-14"
+[[publisher.wasm-encoder]]
+version = "0.31.1"
+when = "2023-07-26"
 user-id = 1
 user-login = "alexcrichton"
 user-name = "Alex Crichton"
 
-[[publisher.wasm-mutate]]
-version = "0.2.38"
-when = "2023-10-14"
+[[publisher.wasm-encoder]]
+version = "0.32.0"
+when = "2023-08-25"
 user-id = 1
 user-login = "alexcrichton"
 user-name = "Alex Crichton"
 
-[[publisher.wasm-smith]]
-version = "0.12.21"
-when = "2023-10-14"
+[[publisher.wasm-encoder]]
+version = "0.33.1"
+when = "2023-09-18"
 user-id = 1
 user-login = "alexcrichton"
 user-name = "Alex Crichton"
 
-[[publisher.wasmparser]]
-version = "0.115.0"
-when = "2023-10-14"
+[[publisher.wasm-metadata]]
+version = "0.9.0"
+when = "2023-07-11"
 user-id = 1
 user-login = "alexcrichton"
 user-name = "Alex Crichton"
 
-[[publisher.wasmprinter]]
-version = "0.2.70"
-when = "2023-10-14"
+[[publisher.wasm-metadata]]
+version = "0.10.1"
+when = "2023-07-26"
 user-id = 1
 user-login = "alexcrichton"
 user-name = "Alex Crichton"
 
-[[publisher.wasmtime]]
-version = "14.0.2"
-when = "2023-10-26"
-user-id = 73222
-user-login = "wasmtime-publish"
+[[publisher.wasm-metadata]]
+version = "0.10.2"
+when = "2023-08-18"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
 
-[[publisher.wasmtime-asm-macros]]
-version = "14.0.2"
-when = "2023-10-26"
-user-id = 73222
-user-login = "wasmtime-publish"
+[[publisher.wasm-metadata]]
+version = "0.10.3"
+when = "2023-08-25"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
 
-[[publisher.wasmtime-cache]]
-version = "14.0.2"
-when = "2023-10-26"
-user-id = 73222
-user-login = "wasmtime-publish"
+[[publisher.wasm-metadata]]
+version = "0.10.5"
+when = "2023-09-18"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
 
-[[publisher.wasmtime-cli]]
-version = "14.0.2"
-when = "2023-10-26"
-user-id = 73222
+[[publisher.wasm-mutate]]
+version = "0.2.30"
+when = "2023-07-26"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wasm-mutate]]
+version = "0.2.31"
+when = "2023-08-18"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wasm-mutate]]
+version = "0.2.32"
+when = "2023-08-25"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wasm-mutate]]
+version = "0.2.34"
+when = "2023-09-18"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wasm-smith]]
+version = "0.12.13"
+when = "2023-07-26"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wasm-smith]]
+version = "0.12.14"
+when = "2023-08-18"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wasm-smith]]
+version = "0.12.15"
+when = "2023-08-25"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wasm-smith]]
+version = "0.12.17"
+when = "2023-09-18"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wasmparser]]
+version = "0.108.0"
+when = "2023-07-11"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wasmparser]]
+version = "0.110.0"
+when = "2023-07-26"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wasmparser]]
+version = "0.111.0"
+when = "2023-08-18"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wasmparser]]
+version = "0.112.0"
+when = "2023-08-25"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wasmparser]]
+version = "0.113.1"
+when = "2023-09-18"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wasmprinter]]
+version = "0.2.62"
+when = "2023-07-26"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wasmprinter]]
+version = "0.2.63"
+when = "2023-08-18"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wasmprinter]]
+version = "0.2.64"
+when = "2023-08-25"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wasmprinter]]
+version = "0.2.66"
+when = "2023-09-18"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wasmtime]]
+version = "11.0.1"
+when = "2023-07-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime]]
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-asm-macros]]
+version = "11.0.1"
+when = "2023-07-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-asm-macros]]
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-cache]]
+version = "11.0.1"
+when = "2023-07-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-cache]]
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-cli]]
+version = "11.0.1"
+when = "2023-07-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-cli]]
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-cli-flags]]
+version = "11.0.1"
+when = "2023-07-24"
+user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-cli-flags]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-component-macro]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-component-macro]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-component-util]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-component-util]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-cranelift]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-cranelift]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-cranelift-shared]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-cranelift-shared]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-environ]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-environ]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-explorer]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-explorer]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-fiber]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-fiber]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-jit]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-jit]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-jit-debug]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-jit-debug]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-jit-icache-coherence]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-jit-icache-coherence]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-runtime]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-runtime]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-types]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-types]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-wasi]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-wasi]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-wasi-http]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-wasi-http]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-wasi-nn]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-wasi-nn]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-wasi-threads]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-wasi-threads]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-wast]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-wast]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wasmtime-winch]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-winch]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wasmtime-wit-bindgen]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
-[[publisher.wasmtime-wmemcheck]]
-version = "14.0.2"
-when = "2023-10-26"
+[[publisher.wasmtime-wit-bindgen]]
+version = "12.0.1"
+when = "2023-08-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wast]]
-version = "66.0.2"
-when = "2023-10-14"
+version = "62.0.1"
+when = "2023-07-26"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wast]]
+version = "63.0.0"
+when = "2023-08-18"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wast]]
+version = "64.0.0"
+when = "2023-08-25"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wast]]
+version = "65.0.1"
+when = "2023-09-18"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wat]]
+version = "1.0.69"
+when = "2023-07-26"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wat]]
+version = "1.0.70"
+when = "2023-08-18"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wat]]
+version = "1.0.71"
+when = "2023-08-25"
 user-id = 1
 user-login = "alexcrichton"
 user-name = "Alex Crichton"
 
 [[publisher.wat]]
-version = "1.0.77"
-when = "2023-10-14"
+version = "1.0.73"
+when = "2023-09-18"
 user-id = 1
 user-login = "alexcrichton"
 user-name = "Alex Crichton"
 
 [[publisher.wiggle]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "11.0.1"
+when = "2023-07-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wiggle]]
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wiggle-generate]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wiggle-generate]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.wiggle-macro]]
+version = "11.0.1"
+when = "2023-07-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
 [[publisher.wiggle-macro]]
-version = "14.0.2"
-when = "2023-10-26"
+version = "12.0.1"
+when = "2023-08-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
@@ -1070,8 +1751,14 @@ user-login = "BurntSushi"
 user-name = "Andrew Gallant"
 
 [[publisher.winch-codegen]]
-version = "0.12.2"
-when = "2023-10-26"
+version = "0.9.1"
+when = "2023-07-24"
+user-id = 73222
+user-login = "wasmtime-publish"
+
+[[publisher.winch-codegen]]
+version = "0.10.1"
+when = "2023-08-24"
 user-id = 73222
 user-login = "wasmtime-publish"
 
@@ -1146,43 +1833,134 @@ user-login = "sunfishcode"
 user-name = "Dan Gohman"
 
 [[publisher.wit-bindgen]]
-version = "0.13.0"
-when = "2023-10-18"
+version = "0.9.0"
+when = "2023-07-15"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wit-bindgen]]
+version = "0.11.0"
+when = "2023-08-28"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wit-bindgen-core]]
+version = "0.9.0"
+when = "2023-07-15"
 user-id = 1
 user-login = "alexcrichton"
 user-name = "Alex Crichton"
 
 [[publisher.wit-bindgen-core]]
-version = "0.13.0"
-when = "2023-10-18"
+version = "0.11.0"
+when = "2023-08-28"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wit-bindgen-rust]]
+version = "0.9.0"
+when = "2023-07-15"
 user-id = 1
 user-login = "alexcrichton"
 user-name = "Alex Crichton"
 
 [[publisher.wit-bindgen-rust]]
-version = "0.13.0"
-when = "2023-10-18"
+version = "0.11.0"
+when = "2023-08-28"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wit-bindgen-rust-lib]]
+version = "0.9.0"
+when = "2023-07-15"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wit-bindgen-rust-lib]]
+version = "0.11.0"
+when = "2023-08-28"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wit-bindgen-rust-macro]]
+version = "0.9.0"
+when = "2023-07-15"
 user-id = 1
 user-login = "alexcrichton"
 user-name = "Alex Crichton"
 
 [[publisher.wit-bindgen-rust-macro]]
-version = "0.13.0"
-when = "2023-10-18"
+version = "0.11.0"
+when = "2023-08-28"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wit-component]]
+version = "0.12.0"
+when = "2023-07-11"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wit-component]]
+version = "0.13.1"
+when = "2023-07-26"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wit-component]]
+version = "0.13.2"
+when = "2023-08-18"
 user-id = 1
 user-login = "alexcrichton"
 user-name = "Alex Crichton"
 
 [[publisher.wit-component]]
-version = "0.16.0"
-when = "2023-10-18"
+version = "0.14.0"
+when = "2023-08-25"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wit-component]]
+version = "0.14.2"
+when = "2023-09-18"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wit-parser]]
+version = "0.9.2"
+when = "2023-07-26"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wit-parser]]
+version = "0.10.0"
+when = "2023-08-18"
+user-id = 1
+user-login = "alexcrichton"
+user-name = "Alex Crichton"
+
+[[publisher.wit-parser]]
+version = "0.11.0"
+when = "2023-08-25"
 user-id = 1
 user-login = "alexcrichton"
 user-name = "Alex Crichton"
 
 [[publisher.wit-parser]]
-version = "0.12.1"
-when = "2023-10-18"
+version = "0.11.1"
+when = "2023-09-18"
 user-id = 1
 user-login = "alexcrichton"
 user-name = "Alex Crichton"
@@ -1195,6 +1973,11 @@ start = "2020-01-01"
 end = "2024-05-23"
 notes = "Maintained by Embark. No unsafe usage or ambient capabilities"
 
+[[audits.embark-studios.audits.anyhow]]
+who = "Johan Andersson <opensource@embark-studios.com>"
+criteria = "safe-to-deploy"
+version = "1.0.58"
+
 [[audits.embark-studios.audits.colorchoice]]
 who = "Johan Andersson <opensource@embark-studios.com>"
 criteria = "safe-to-deploy"
@@ -1207,17 +1990,27 @@ criteria = "safe-to-deploy"
 version = "0.2.2"
 notes = "Inspected it and is a tiny crate with just type definitions"
 
-[[audits.embark-studios.audits.utf8parse]]
+[[audits.embark-studios.audits.ittapi]]
 who = "Johan Andersson <opensource@embark-studios.com>"
 criteria = "safe-to-deploy"
-version = "0.2.1"
-notes = "Single unsafe usage that looks sound, no ambient capabilities"
+version = "0.3.3"
+notes = "Lots of unsafe code for calling into C FFI functions, looks pretty simple and sound though. No ambient capabilities"
 
-[[audits.embark-studios.audits.valuable]]
+[[audits.embark-studios.audits.ittapi-sys]]
 who = "Johan Andersson <opensource@embark-studios.com>"
 criteria = "safe-to-deploy"
-version = "0.1.0"
-notes = "No unsafe usage or ambient capabilities, sane build script"
+version = "0.3.3"
+notes = """
+Builds C/asm dependency which this review has not audited in detail, but is well established from Intel. 
+Exposes FFI types & functions generated through bindgen. No other logic.
+No ambient capabilities
+"""
+
+[[audits.embark-studios.audits.utf8parse]]
+who = "Johan Andersson <opensource@embark-studios.com>"
+criteria = "safe-to-deploy"
+version = "0.2.1"
+notes = "Single unsafe usage that looks sound, no ambient capabilities"
 
 [[audits.embark-studios.audits.webpki-roots]]
 who = "Johan Andersson <opensource@embark-studios.com>"
@@ -1246,12 +2039,6 @@ criteria = "safe-to-deploy"
 version = "0.3.1"
 aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/main/cargo-vet/audits.toml?format=TEXT"
 
-[[audits.google.audits.instant]]
-who = "George Burgess IV <gbiv@google.com>"
-criteria = "safe-to-run"
-version = "0.1.12"
-aggregated-from = "https://chromium.googlesource.com/chromiumos/third_party/rust_crates/+/main/cargo-vet/audits.toml?format=TEXT"
-
 [[audits.google.audits.libfuzzer-sys]]
 who = "ChromeOS"
 criteria = "safe-to-run"
@@ -1297,11 +2084,6 @@ who = "David Cook <dcook@divviup.org>"
 criteria = "safe-to-deploy"
 delta = "1.17.2 -> 1.18.0"
 
-[[audits.isrg.audits.rand_chacha]]
-who = "David Cook <dcook@divviup.org>"
-criteria = "safe-to-deploy"
-version = "0.3.1"
-
 [[audits.isrg.audits.rand_core]]
 who = "David Cook <dcook@divviup.org>"
 criteria = "safe-to-deploy"
@@ -1344,6 +2126,37 @@ end = "2024-05-03"
 notes = "All code written or reviewed by Manish"
 aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
 
+[[audits.mozilla.audits.anyhow]]
+who = "Mike Hommey <mh+mozilla@glandium.org>"
+criteria = "safe-to-deploy"
+delta = "1.0.57 -> 1.0.61"
+aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
+
+[[audits.mozilla.audits.anyhow]]
+who = "Bobby Holley <bobbyholley@gmail.com>"
+criteria = "safe-to-deploy"
+delta = "1.0.58 -> 1.0.57"
+notes = "No functional differences, just CI config and docs."
+aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
+
+[[audits.mozilla.audits.anyhow]]
+who = "Mike Hommey <mh+mozilla@glandium.org>"
+criteria = "safe-to-deploy"
+delta = "1.0.61 -> 1.0.62"
+aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
+
+[[audits.mozilla.audits.anyhow]]
+who = "Mike Hommey <mh+mozilla@glandium.org>"
+criteria = "safe-to-deploy"
+delta = "1.0.62 -> 1.0.68"
+aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
+
+[[audits.mozilla.audits.anyhow]]
+who = "Mike Hommey <mh+mozilla@glandium.org>"
+criteria = "safe-to-deploy"
+delta = "1.0.68 -> 1.0.69"
+aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
+
 [[audits.mozilla.audits.autocfg]]
 who = "Josh Stone <jistone@redhat.com>"
 criteria = "safe-to-deploy"
@@ -1384,19 +2197,6 @@ criteria = "safe-to-deploy"
 delta = "2.2.1 -> 2.3.2"
 aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
 
-[[audits.mozilla.audits.bitflags]]
-who = "Mike Hommey <mh+mozilla@glandium.org>"
-criteria = "safe-to-deploy"
-delta = "2.3.3 -> 2.4.0"
-aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
-
-[[audits.mozilla.audits.bitflags]]
-who = "Jan-Erik Rediger <jrediger@mozilla.com>"
-criteria = "safe-to-deploy"
-delta = "2.4.0 -> 2.4.1"
-notes = "Only allowing new clippy lints"
-aggregated-from = "https://github.com/raw/mozilla/glean/main/supply-chain/audits.toml"
-
 [[audits.mozilla.audits.bytes]]
 who = "Mike Hommey <mh+mozilla@glandium.org>"
 criteria = "safe-to-deploy"
@@ -1457,12 +2257,6 @@ criteria = "safe-to-deploy"
 delta = "0.9.3 -> 0.10.0"
 aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
 
-[[audits.mozilla.audits.fastrand]]
-who = "Mike Hommey <mh+mozilla@glandium.org>"
-criteria = "safe-to-deploy"
-delta = "1.9.0 -> 2.0.0"
-aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
-
 [[audits.mozilla.audits.flagset]]
 who = "Ryan Hunt <rhunt@eqrion.net>"
 criteria = "safe-to-deploy"
@@ -1539,19 +2333,6 @@ version = "1.4.0"
 notes = "I have read over the macros, and audited the unsafe code."
 aggregated-from = "https://github.com/raw/mozilla/cargo-vet/main/supply-chain/audits.toml"
 
-[[audits.mozilla.audits.libc]]
-who = "Mike Hommey <mh+mozilla@glandium.org>"
-criteria = "safe-to-deploy"
-delta = "0.2.147 -> 0.2.148"
-aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
-
-[[audits.mozilla.audits.libc]]
-who = "Jan-Erik Rediger <jrediger@mozilla.com>"
-criteria = "safe-to-deploy"
-delta = "0.2.148 -> 0.2.149"
-notes = "New defintions for a new target we don't use"
-aggregated-from = "https://github.com/raw/mozilla/glean/main/supply-chain/audits.toml"
-
 [[audits.mozilla.audits.log]]
 who = "Mike Hommey <mh+mozilla@glandium.org>"
 criteria = "safe-to-deploy"
@@ -1670,18 +2451,6 @@ version = "1.9.3"
 notes = "All code written or reviewed by Josh Stone or Niko Matsakis."
 aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
 
-[[audits.mozilla.audits.redox_syscall]]
-who = "Mike Hommey <mh+mozilla@glandium.org>"
-criteria = "safe-to-deploy"
-delta = "0.2.13 -> 0.2.16"
-aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
-
-[[audits.mozilla.audits.redox_syscall]]
-who = "Jan-Erik Rediger <jrediger@mozilla.com>"
-criteria = "safe-to-deploy"
-delta = "0.2.16 -> 0.3.5"
-aggregated-from = "https://github.com/raw/mozilla/glean/main/supply-chain/audits.toml"
-
 [[audits.mozilla.audits.rustc-hash]]
 who = "Bobby Holley <bobbyholley@gmail.com>"
 criteria = "safe-to-deploy"
@@ -1705,10 +2474,10 @@ criteria = "safe-to-deploy"
 delta = "0.4.6 -> 0.4.7"
 aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
 
-[[audits.mozilla.audits.tempfile]]
+[[audits.mozilla.audits.socket2]]
 who = "Mike Hommey <mh+mozilla@glandium.org>"
 criteria = "safe-to-deploy"
-delta = "3.6.0 -> 3.8.0"
+delta = "0.4.4 -> 0.4.7"
 aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
 
 [[audits.mozilla.audits.toml]]
diff --git a/tests/all/async_functions.rs b/tests/all/async_functions.rs
index 3796c9b05585..f2cac9ffdd77 100644
--- a/tests/all/async_functions.rs
+++ b/tests/all/async_functions.rs
@@ -311,8 +311,7 @@ async fn cancel_during_run() {
 async fn iloop_with_fuel() {
     let engine = Engine::new(Config::new().async_support(true).consume_fuel(true)).unwrap();
     let mut store = Store::new(&engine, ());
-    store.set_fuel(10_000).unwrap();
-    store.fuel_async_yield_interval(Some(100)).unwrap();
+    store.out_of_fuel_async_yield(1_000, 10);
     let module = Module::new(
         &engine,
         "
@@ -327,15 +326,14 @@ async fn iloop_with_fuel() {
 
     // This should yield a bunch of times but eventually finish
     let (_, pending) = CountPending::new(Box::pin(instance)).await;
-    assert_eq!(pending, 99);
+    assert!(pending > 100);
 }
 
 #[tokio::test]
 async fn fuel_eventually_finishes() {
     let engine = Engine::new(Config::new().async_support(true).consume_fuel(true)).unwrap();
     let mut store = Store::new(&engine, ());
-    store.set_fuel(u64::MAX).unwrap();
-    store.fuel_async_yield_interval(Some(10)).unwrap();
+    store.out_of_fuel_async_yield(u64::max_value(), 10);
     let module = Module::new(
         &engine,
         "
diff --git a/tests/all/cli_tests.rs b/tests/all/cli_tests.rs
index 2c8aa81222a1..de5f2cb06a03 100644
--- a/tests/all/cli_tests.rs
+++ b/tests/all/cli_tests.rs
@@ -737,7 +737,7 @@ fn component_missing_feature() -> Result<()> {
     assert!(!output.status.success());
     let stderr = String::from_utf8_lossy(&output.stderr);
     assert!(
-        stderr.contains("cannot execute a component without `--wasm component-model`"),
+        stderr.contains("cannot execute a component without `--wasm-features component-model`"),
         "bad stderr: {stderr}"
     );
 
@@ -749,7 +749,7 @@ fn component_missing_feature() -> Result<()> {
     assert!(!output.status.success());
     let stderr = String::from_utf8_lossy(&output.stderr);
     assert!(
-        stderr.contains("cannot execute a component without `--wasm component-model`"),
+        stderr.contains("cannot execute a component without `--wasm-features component-model`"),
         "bad stderr: {stderr}"
     );
 
@@ -790,6 +790,25 @@ fn run_basic_component() -> Result<()> {
     Ok(())
 }
 
+#[cfg(feature = "wasi-http")]
+#[test]
+fn run_wasi_http_module() -> Result<()> {
+    let output = run_wasmtime_for_output(
+        &[
+            "-Shttp,preview2",
+            "-Ccache=no",
+            "tests/all/cli_tests/wasi-http.wat",
+        ],
+        None,
+    )?;
+    println!("{}", String::from_utf8_lossy(&output.stderr));
+    assert!(String::from_utf8(output.stdout)
+        .unwrap()
+        .starts_with("Called _start\n"));
+    assert!(!output.status.success());
+    Ok(())
+}
+
 #[test]
 #[cfg_attr(not(feature = "component-model"), ignore)]
 fn run_precompiled_component() -> Result<()> {
@@ -997,259 +1016,3 @@ fn preview2_stdin() -> Result<()> {
     }
     Ok(())
 }
-
-mod test_programs {
-    use super::{get_wasmtime_command, run_wasmtime};
-    use anyhow::Result;
-    use std::io::Write;
-    use std::process::Stdio;
-    use test_programs_artifacts::*;
-
-    macro_rules! assert_test_exists {
-        ($name:ident) => {
-            #[allow(unused_imports)]
-            use self::$name as _;
-        };
-    }
-    foreach_cli!(assert_test_exists);
-
-    #[test]
-    fn cli_hello_stdout() -> Result<()> {
-        run_wasmtime(&[
-            "run",
-            "-Wcomponent-model",
-            CLI_HELLO_STDOUT_COMPONENT,
-            "gussie",
-            "sparky",
-            "willa",
-        ])?;
-        Ok(())
-    }
-
-    #[test]
-    fn cli_args() -> Result<()> {
-        run_wasmtime(&[
-            "run",
-            "-Wcomponent-model",
-            CLI_ARGS_COMPONENT,
-            "hello",
-            "this",
-            "",
-            "is an argument",
-            "with 🚩 emoji",
-        ])?;
-        Ok(())
-    }
-
-    #[test]
-    fn cli_stdin() -> Result<()> {
-        let mut child = get_wasmtime_command()?
-            .args(&["run", "-Wcomponent-model", CLI_STDIN_COMPONENT])
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .stdin(Stdio::piped())
-            .spawn()?;
-        child
-            .stdin
-            .take()
-            .unwrap()
-            .write_all(b"So rested he by the Tumtum tree")
-            .unwrap();
-        let output = child.wait_with_output()?;
-        println!("stdout: {}", String::from_utf8_lossy(&output.stdout));
-        println!("stderr: {}", String::from_utf8_lossy(&output.stderr));
-        assert!(output.status.success());
-        Ok(())
-    }
-
-    #[test]
-    fn cli_splice_stdin() -> Result<()> {
-        let mut child = get_wasmtime_command()?
-            .args(&["run", "-Wcomponent-model", CLI_SPLICE_STDIN_COMPONENT])
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
-            .stdin(Stdio::piped())
-            .spawn()?;
-        let msg = "So rested he by the Tumtum tree";
-        child
-            .stdin
-            .take()
-            .unwrap()
-            .write_all(msg.as_bytes())
-            .unwrap();
-        let output = child.wait_with_output()?;
-        assert!(output.status.success());
-        let stdout = String::from_utf8_lossy(&output.stdout);
-        let stderr = String::from_utf8_lossy(&output.stderr);
-        if !stderr.is_empty() {
-            eprintln!("{stderr}");
-        }
-
-        assert_eq!(
-            format!(
-                "before splice\n{msg}\ncompleted splicing {} bytes\n",
-                msg.as_bytes().len()
-            ),
-            stdout
-        );
-        Ok(())
-    }
-
-    #[test]
-    fn cli_env() -> Result<()> {
-        run_wasmtime(&[
-            "run",
-            "-Wcomponent-model",
-            "--env=frabjous=day",
-            "--env=callooh=callay",
-            CLI_ENV_COMPONENT,
-        ])?;
-        Ok(())
-    }
-
-    #[test]
-    fn cli_file_read() -> Result<()> {
-        let dir = tempfile::tempdir()?;
-
-        std::fs::write(dir.path().join("bar.txt"), b"And stood awhile in thought")?;
-
-        run_wasmtime(&[
-            "run",
-            "-Wcomponent-model",
-            &format!("--dir={}::/", dir.path().to_str().unwrap()),
-            CLI_FILE_READ_COMPONENT,
-        ])?;
-        Ok(())
-    }
-
-    #[test]
-    fn cli_file_append() -> Result<()> {
-        let dir = tempfile::tempdir()?;
-
-        std::fs::File::create(dir.path().join("bar.txt"))?
-            .write_all(b"'Twas brillig, and the slithy toves.\n")?;
-
-        run_wasmtime(&[
-            "run",
-            "-Wcomponent-model",
-            &format!("--dir={}::/", dir.path().to_str().unwrap()),
-            CLI_FILE_APPEND_COMPONENT,
-        ])?;
-
-        let contents = std::fs::read(dir.path().join("bar.txt"))?;
-        assert_eq!(
-            std::str::from_utf8(&contents).unwrap(),
-            "'Twas brillig, and the slithy toves.\n\
-                   Did gyre and gimble in the wabe;\n\
-                   All mimsy were the borogoves,\n\
-                   And the mome raths outgrabe.\n"
-        );
-        Ok(())
-    }
-
-    #[test]
-    fn cli_file_dir_sync() -> Result<()> {
-        let dir = tempfile::tempdir()?;
-
-        std::fs::File::create(dir.path().join("bar.txt"))?
-            .write_all(b"'Twas brillig, and the slithy toves.\n")?;
-
-        run_wasmtime(&[
-            "run",
-            "-Wcomponent-model",
-            &format!("--dir={}::/", dir.path().to_str().unwrap()),
-            CLI_FILE_DIR_SYNC_COMPONENT,
-        ])?;
-
-        Ok(())
-    }
-
-    #[test]
-    fn cli_exit_success() -> Result<()> {
-        run_wasmtime(&["run", "-Wcomponent-model", CLI_EXIT_SUCCESS_COMPONENT])?;
-        Ok(())
-    }
-
-    #[test]
-    fn cli_exit_default() -> Result<()> {
-        run_wasmtime(&["run", "-Wcomponent-model", CLI_EXIT_DEFAULT_COMPONENT])?;
-        Ok(())
-    }
-
-    #[test]
-    fn cli_exit_failure() -> Result<()> {
-        let output = get_wasmtime_command()?
-            .args(&["run", "-Wcomponent-model", CLI_EXIT_FAILURE_COMPONENT])
-            .output()?;
-        assert!(!output.status.success());
-        assert_eq!(output.status.code(), Some(1));
-        Ok(())
-    }
-
-    #[test]
-    fn cli_exit_panic() -> Result<()> {
-        let output = get_wasmtime_command()?
-            .args(&["run", "-Wcomponent-model", CLI_EXIT_PANIC_COMPONENT])
-            .output()?;
-        assert!(!output.status.success());
-        let stderr = String::from_utf8_lossy(&output.stderr);
-        assert!(stderr.contains("Curiouser and curiouser!"));
-        Ok(())
-    }
-
-    #[test]
-    fn cli_directory_list() -> Result<()> {
-        let dir = tempfile::tempdir()?;
-
-        std::fs::File::create(dir.path().join("foo.txt"))?;
-        std::fs::File::create(dir.path().join("bar.txt"))?;
-        std::fs::File::create(dir.path().join("baz.txt"))?;
-        std::fs::create_dir(dir.path().join("sub"))?;
-        std::fs::File::create(dir.path().join("sub").join("wow.txt"))?;
-        std::fs::File::create(dir.path().join("sub").join("yay.txt"))?;
-
-        run_wasmtime(&[
-            "run",
-            "-Wcomponent-model",
-            &format!("--dir={}::/", dir.path().to_str().unwrap()),
-            CLI_DIRECTORY_LIST_COMPONENT,
-        ])?;
-        Ok(())
-    }
-
-    #[test]
-    fn cli_default_clocks() -> Result<()> {
-        run_wasmtime(&["run", "-Wcomponent-model", CLI_DEFAULT_CLOCKS_COMPONENT])?;
-        Ok(())
-    }
-
-    #[test]
-    fn cli_export_cabi_realloc() -> Result<()> {
-        run_wasmtime(&[
-            "run",
-            "-Wcomponent-model",
-            CLI_EXPORT_CABI_REALLOC_COMPONENT,
-        ])?;
-        Ok(())
-    }
-
-    #[test]
-    fn run_wasi_http_component() -> Result<()> {
-        let output = super::run_wasmtime_for_output(
-            &[
-                "-Ccache=no",
-                "-Wcomponent-model",
-                "-Scommon,http,preview2",
-                HTTP_OUTBOUND_REQUEST_RESPONSE_BUILD_COMPONENT,
-            ],
-            None,
-        )?;
-        println!("{}", String::from_utf8_lossy(&output.stderr));
-        let stdout = String::from_utf8_lossy(&output.stdout);
-        println!("{}", stdout);
-        assert!(stdout.starts_with("Called _start\n"));
-        assert!(stdout.ends_with("Done\n"));
-        assert!(output.status.success());
-        Ok(())
-    }
-}
diff --git a/tests/all/cli_tests/component-basic.wat b/tests/all/cli_tests/component-basic.wat
index fbbaffcb6d9c..19a5fb2c6f50 100644
--- a/tests/all/cli_tests/component-basic.wat
+++ b/tests/all/cli_tests/component-basic.wat
@@ -7,6 +7,6 @@
   (func $run (result (result))
     (canon lift (core func $i "run")))
 
-  (instance (export (interface "wasi:cli/run@0.2.0-rc-2023-11-05"))
+  (instance (export (interface "wasi:cli/run"))
     (export "run" (func $run)))
 )
diff --git a/tests/all/cli_tests/print-arguments.wat b/tests/all/cli_tests/print-arguments.wat
index 59835de37b95..93e4558c46f0 100644
--- a/tests/all/cli_tests/print-arguments.wat
+++ b/tests/all/cli_tests/print-arguments.wat
@@ -18,12 +18,12 @@
     (if (i32.ne
           (call $args_get (local.get $argptrs) (local.get $argmem))
           (i32.const 0))
-        (then (unreachable)))
+        (unreachable))
 
     (loop
       (local.set $arg (i32.load (local.get $argptrs)))
       (local.set $argptrs (i32.add (local.get $argptrs) (i32.const 4)))
-      (if (i32.eq (local.get $arg) (i32.const 0)) (then (return)))
+      (if (i32.eq (local.get $arg) (i32.const 0)) (return))
 
       (call $write_all (local.get $arg) (call $strlen (local.get $arg)))
       (call $write_all (i32.const 10) (i32.const 1))
@@ -50,7 +50,7 @@
             (local.get $iov)
             (i32.const 1)
             (local.get $written)))
-        (if (i32.ne (local.get $rc) (i32.const 0)) (then (unreachable)))
+        (if (i32.ne (local.get $rc) (i32.const 0)) (unreachable))
 
         (local.set $len (i32.sub (local.get $len) (i32.load (local.get $written))))
         (local.set $ptr (i32.add (local.get $ptr) (i32.load (local.get $written))))
diff --git a/tests/all/cli_tests/print_env.wat b/tests/all/cli_tests/print_env.wat
index 5b649e562adc..ddbe6f2f564b 100644
--- a/tests/all/cli_tests/print_env.wat
+++ b/tests/all/cli_tests/print_env.wat
@@ -18,12 +18,12 @@
     (if (i32.ne
           (call $environ_get (local.get $envptrs) (local.get $envmem))
           (i32.const 0))
-        (then (unreachable)))
+        (unreachable))
 
     (loop
       (local.set $env (i32.load (local.get $envptrs)))
       (local.set $envptrs (i32.add (local.get $envptrs) (i32.const 4)))
-      (if (i32.eq (local.get $env) (i32.const 0)) (then (return)))
+      (if (i32.eq (local.get $env) (i32.const 0)) (return))
 
       (call $write_all (local.get $env) (call $strlen (local.get $env)))
       (call $write_all (i32.const 10) (i32.const 1))
@@ -50,7 +50,7 @@
             (local.get $iov)
             (i32.const 1)
             (local.get $written)))
-        (if (i32.ne (local.get $rc) (i32.const 0)) (then (unreachable)))
+        (if (i32.ne (local.get $rc) (i32.const 0)) (unreachable))
 
         (local.set $len (i32.sub (local.get $len) (i32.load (local.get $written))))
         (local.set $ptr (i32.add (local.get $ptr) (i32.load (local.get $written))))
diff --git a/tests/all/cli_tests/wasi-http.wat b/tests/all/cli_tests/wasi-http.wat
new file mode 100644
index 000000000000..8893c3ca4584
--- /dev/null
+++ b/tests/all/cli_tests/wasi-http.wat
@@ -0,0 +1,93 @@
+(module
+  (import "wasi_snapshot_preview1" "proc_exit"
+    (func $__wasi_proc_exit (param i32)))
+  (import "wasi:io/streams" "write"
+    (func $__wasi_io_streams_write (param i32 i32 i32 i32)))
+  (import "wasi:io/streams" "blocking-write-and-flush"
+    (func $__wasi_io_streams_blocking_write_and_flush (param i32 i32 i32 i32)))
+  (import "wasi:io/streams" "subscribe-to-output-stream"
+    (func $__wasi_io_streams_subscribe_to_output_stream (param i32) (result i32)))
+  (import "wasi:http/types" "new-fields"
+    (func $__wasi_http_types_new_fields (param i32 i32) (result i32)))
+  (import "wasi:http/types" "drop-fields"
+    (func $__wasi_http_types_drop_fields (param i32)))
+  (import "wasi:http/types" "new-outgoing-request"
+    (func $__wasi_http_types_new_outgoing_request (param i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32) (result i32)))
+  (import "wasi:http/types" "outgoing-request-write"
+    (func $__wasi_http_types_outgoing_request_write (param i32 i32)))
+  (import "wasi:http/types" "drop-outgoing-request"
+    (func $__wasi_http_types_drop_outgoing_request (param i32)))
+  (func $_start
+    (local i32)
+    (local $headers_id i32)
+    (local $request_id i32)
+    (local $body_stream_id i32)
+
+    ;; Print "Called _start".
+    (call $print (i32.const 32) (i32.const 14))
+
+    (local.set $headers_id (call $__wasi_http_types_new_fields
+      i32.const 0 ;; base pointer
+      i32.const 0 ;; length
+    ))
+    (local.set $request_id (call $__wasi_http_types_new_outgoing_request
+      i32.const 0 ;; method = Method::Get
+      i32.const 0 ;; method pointer
+      i32.const 0 ;; method length
+      i32.const 0 ;; path is some = None
+      i32.const 0 ;; path pointer
+      i32.const 0 ;; path length
+      i32.const 1 ;; scheme is some = Some
+      i32.const 1 ;; scheme = Scheme::Https
+      i32.const 0 ;; scheme pointer
+      i32.const 0 ;; scheme length
+      i32.const 1 ;; authority is some = Some
+      i32.const 96 ;; authority pointer = Constant value
+      i32.const 15 ;; authority length
+      local.get $headers_id ;; headers id
+    ))
+    (call $__wasi_http_types_outgoing_request_write (local.get $request_id) (local.get 0))
+    local.get 0
+    i32.const 4
+    i32.add
+    i32.load
+    local.set $body_stream_id
+    (call $__wasi_io_streams_write
+      (local.get $body_stream_id) ;; body stream id (usually 8)
+      (i32.const 128) ;; body stream pointer
+      (i32.const 4) ;; body stream length
+      (i32.const 0)
+    )
+    (drop (call $__wasi_io_streams_subscribe_to_output_stream (local.get $body_stream_id)))
+    (call $__wasi_http_types_drop_fields (local.get $headers_id))
+    (call $__wasi_http_types_drop_outgoing_request (local.get $request_id))
+
+    (call $print (i32.const 64) (i32.const 5))
+    (drop (call $__wasi_io_streams_subscribe_to_output_stream (i32.const 4)))
+
+    (call $__wasi_proc_exit (i32.const 1))
+  )
+
+  ;; A helper function for printing ptr-len strings.
+  (func $print (param $ptr i32) (param $len i32)
+    (call $__wasi_io_streams_blocking_write_and_flush
+      i32.const 4 ;; Value for stdout
+      local.get $ptr
+      local.get $len
+      i32.const 0
+    )
+  )
+
+  (func $cabi_realloc (param i32 i32 i32 i32) (result i32)
+    i32.const 0
+  )
+
+  (memory 1)
+  (export "memory" (memory 0))
+  (export "_start" (func $_start))
+  (export "cabi_realloc" (func $cabi_realloc))
+  (data (i32.const 32) "Called _start\0a")
+  (data (i32.const 64) "Done\0a")
+  (data (i32.const 96) "www.example.com")
+  (data (i32.const 128) "body")
+)
diff --git a/tests/all/code_too_large.rs b/tests/all/code_too_large.rs
deleted file mode 100644
index c7c5080dcbce..000000000000
--- a/tests/all/code_too_large.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-#![cfg(not(miri))]
-
-use anyhow::Result;
-use wasmtime::*;
-
-#[test]
-fn code_too_large_without_panic() -> Result<()> {
-    const N: usize = 120000;
-
-    // Build a module with a function whose body will allocate too many
-    // temporaries for our current (Cranelift-based) compiler backend to
-    // handle. This test ensures that we propagate the failure upward
-    // and return it programmatically, rather than panic'ing. If we ever
-    // improve our compiler backend to actually handle such a large
-    // function body, we'll need to increase the limits here too!
-    let mut s = String::new();
-    s.push_str("(module\n");
-    s.push_str("(table 1 1 funcref)\n");
-    s.push_str("(func (export \"\") (result i32)\n");
-    s.push_str("i32.const 0\n");
-    for _ in 0..N {
-        s.push_str("table.get 0\n");
-        s.push_str("ref.is_null\n");
-    }
-    s.push_str("))\n");
-
-    let store = Store::<()>::default();
-    let result = Module::new(store.engine(), &s);
-    match result {
-        Err(e) => assert!(e
-            .to_string()
-            .starts_with("Compilation error: Code for function is too large")),
-        Ok(_) => panic!("Please adjust limits to make the module too large to compile!"),
-    }
-    Ok(())
-}
diff --git a/tests/all/component_model/async.rs b/tests/all/component_model/async.rs
index cbb398fdd3f8..116ced19cc14 100644
--- a/tests/all/component_model/async.rs
+++ b/tests/all/component_model/async.rs
@@ -155,8 +155,7 @@ async fn resume_separate_thread() -> Result<()> {
 
     execute_across_threads(async move {
         let mut store = Store::new(&engine, ());
-        store.set_fuel(u64::MAX).unwrap();
-        store.fuel_async_yield_interval(Some(1)).unwrap();
+        store.out_of_fuel_async_yield(u64::MAX, 1);
         linker.instantiate_async(&mut store, &component).await?;
         Ok::<_, anyhow::Error>(())
     })
@@ -208,8 +207,7 @@ async fn poll_through_wasm_activation() -> Result<()> {
         let engine = engine.clone();
         async move {
             let mut store = Store::new(&engine, ());
-            store.set_fuel(u64::MAX).unwrap();
-            store.fuel_async_yield_interval(Some(1)).unwrap();
+            store.out_of_fuel_async_yield(u64::MAX, 1);
             let instance = linker.instantiate_async(&mut store, &component).await?;
             let func = instance.get_typed_func::<(Vec<u8>,), ()>(&mut store, "run")?;
             func.call_async(&mut store, (vec![1, 2, 3],)).await?;
diff --git a/tests/all/component_model/bindgen.rs b/tests/all/component_model/bindgen.rs
index 1c0b713a1c6e..583e1b32bf59 100644
--- a/tests/all/component_model/bindgen.rs
+++ b/tests/all/component_model/bindgen.rs
@@ -15,14 +15,14 @@ mod no_imports {
 
     wasmtime::component::bindgen!({
         inline: "
-            package foo:foo;
+            package foo:foo
 
             world no-imports {
                 export foo: interface {
-                    foo: func();
+                    foo: func()
                 }
 
-                export bar: func();
+                export bar: func()
             }
         ",
     });
@@ -62,14 +62,14 @@ mod one_import {
 
     wasmtime::component::bindgen!({
         inline: "
-            package foo:foo;
+            package foo:foo
 
             world one-import {
                 import foo: interface {
-                    foo: func();
+                    foo: func()
                 }
 
-                export bar: func();
+                export bar: func()
             }
         ",
     });
@@ -127,14 +127,14 @@ mod resources_at_world_level {
 
     wasmtime::component::bindgen!({
         inline: "
-            package foo:foo;
+            package foo:foo
 
             world resources {
                 resource x {
-                    constructor();
+                    constructor()
                 }
 
-                export y: func(x: x);
+                export y: func(x: x)
             }
         ",
     });
@@ -216,22 +216,22 @@ mod resources_at_interface_level {
 
     wasmtime::component::bindgen!({
         inline: "
-            package foo:foo;
+            package foo:foo
 
             interface def {
                 resource x {
-                    constructor();
+                    constructor()
                 }
             }
 
             interface user {
-                use def.{x};
+                use def.{x}
 
-                y: func(x: x);
+                y: func(x: x)
             }
 
             world resources {
-                export user;
+                export user
             }
         ",
     });
@@ -322,12 +322,12 @@ mod async_config {
 
     wasmtime::component::bindgen!({
         inline: "
-            package foo:foo;
+            package foo:foo
 
             world t1 {
-                import x: func();
-                import y: func();
-                export z: func();
+                import x: func()
+                import y: func()
+                export z: func()
             }
         ",
         async: true,
@@ -352,12 +352,12 @@ mod async_config {
 
     wasmtime::component::bindgen!({
         inline: "
-            package foo:foo;
+            package foo:foo
 
             world t2 {
-                import x: func();
-                import y: func();
-                export z: func();
+                import x: func()
+                import y: func()
+                export z: func()
             }
         ",
         async: {
@@ -382,12 +382,12 @@ mod async_config {
 
     wasmtime::component::bindgen!({
         inline: "
-            package foo:foo;
+            package foo:foo
 
             world t3 {
-                import x: func();
-                import y: func();
-                export z: func();
+                import x: func()
+                import y: func()
+                export z: func()
             }
         ",
         async: {
@@ -418,27 +418,27 @@ mod exported_resources {
 
     wasmtime::component::bindgen!({
         inline: "
-            package foo:foo;
+            package foo:foo
 
             interface a {
                 resource x {
-                    constructor();
+                    constructor()
                 }
             }
 
             world resources {
                 export b: interface {
-                    use a.{x as y};
+                    use a.{x as y}
 
                     resource x {
-                        constructor(y: y);
-                        foo: func() -> u32;
+                        constructor(y: y)
+                        foo: func() -> u32
                     }
                 }
 
-                resource x;
+                resource x
 
-                export f: func(x1: x, x2: x) -> x;
+                export f: func(x1: x, x2: x) -> x
             }
         ",
     });
diff --git a/tests/all/component_model/bindgen/ownership.rs b/tests/all/component_model/bindgen/ownership.rs
index 68ebab8573bf..fd0dd89da269 100644
--- a/tests/all/component_model/bindgen/ownership.rs
+++ b/tests/all/component_model/bindgen/ownership.rs
@@ -118,10 +118,10 @@ fn component() -> String {
 fn owning() -> Result<()> {
     wasmtime::component::bindgen!({
         inline: "
-        package inline:inline;
+        package inline:inline
         world test {
             export lists: interface {
-                foo: func(a: list<list<string>>) -> list<list<string>>;
+                foo: func(a: list<list<string>>) -> list<list<string>>
             }
 
             export thing-in: interface {
@@ -130,7 +130,7 @@ fn owning() -> Result<()> {
                     value: list<string>
                 }
 
-                bar: func(a: thing);
+                bar: func(a: thing)
             }
 
             export thing-in-and-out: interface {
@@ -139,7 +139,7 @@ fn owning() -> Result<()> {
                     value: list<string>
                 }
 
-                baz: func(a: thing) -> thing;
+                baz: func(a: thing) -> thing
             }
         }",
         ownership: Owning
@@ -186,10 +186,10 @@ fn owning() -> Result<()> {
 fn borrowing_no_duplication() -> Result<()> {
     wasmtime::component::bindgen!({
         inline: "
-        package inline:inline;
+        package inline:inline
         world test {
             export lists: interface {
-                foo: func(a: list<list<string>>) -> list<list<string>>;
+                foo: func(a: list<list<string>>) -> list<list<string>>
             }
 
             export thing-in: interface {
@@ -198,7 +198,7 @@ fn borrowing_no_duplication() -> Result<()> {
                     value: list<string>
                 }
 
-                bar: func(a: thing);
+                bar: func(a: thing)
             }
 
             export thing-in-and-out: interface {
@@ -207,7 +207,7 @@ fn borrowing_no_duplication() -> Result<()> {
                     value: list<string>
                 }
 
-                baz: func(a: thing) -> thing;
+                baz: func(a: thing) -> thing
             }
         }",
         ownership: Borrowing {
@@ -256,10 +256,10 @@ fn borrowing_no_duplication() -> Result<()> {
 fn borrowing_with_duplication() -> Result<()> {
     wasmtime::component::bindgen!({
         inline: "
-        package inline:inline;
+        package inline:inline
         world test {
             export lists: interface {
-                foo: func(a: list<list<string>>) -> list<list<string>>;
+                foo: func(a: list<list<string>>) -> list<list<string>>
             }
 
             export thing-in: interface {
@@ -268,7 +268,7 @@ fn borrowing_with_duplication() -> Result<()> {
                     value: list<string>
                 }
 
-                bar: func(a: thing);
+                bar: func(a: thing)
             }
 
             export thing-in-and-out: interface {
@@ -277,7 +277,7 @@ fn borrowing_with_duplication() -> Result<()> {
                     value: list<string>
                 }
 
-                baz: func(a: thing) -> thing;
+                baz: func(a: thing) -> thing
             }
         }",
         ownership: Borrowing {
diff --git a/tests/all/component_model/bindgen/results.rs b/tests/all/component_model/bindgen/results.rs
index 29f60fe8b45a..6c0b3f8b6472 100644
--- a/tests/all/component_model/bindgen/results.rs
+++ b/tests/all/component_model/bindgen/results.rs
@@ -9,13 +9,13 @@ mod empty_error {
     use super::*;
     wasmtime::component::bindgen!({
         inline: "
-        package inline:inline;
+        package inline:inline
         world result-playground {
             import imports: interface {
-                empty-error: func(a: float64) -> result<float64>;
+                empty-error: func(a: float64) -> result<float64>
             }
 
-            export empty-error: func(a: float64) -> result<float64>;
+            export empty-error: func(a: float64) -> result<float64>
         }",
     });
 
@@ -110,13 +110,13 @@ mod string_error {
     use super::*;
     wasmtime::component::bindgen!({
         inline: "
-        package inline:inline;
+        package inline:inline
         world result-playground {
             import imports: interface {
-                string-error: func(a: float64) -> result<float64, string>;
+                string-error: func(a: float64) -> result<float64, string>
             }
 
-            export string-error: func(a: float64) -> result<float64, string>;
+            export string-error: func(a: float64) -> result<float64, string>
         }",
     });
 
@@ -226,54 +226,21 @@ mod enum_error {
 
     wasmtime::component::bindgen!({
         inline: "
-        package inline:inline;
+        package inline:inline
         interface imports {
             enum e1 { a, b, c }
-            enum-error: func(a: float64) -> result<float64, e1>;
+            enum-error: func(a: float64) -> result<float64, e1>
         }
         world result-playground {
-            import imports;
+            import imports
             export foo: interface {
                 enum e1 { a, b, c }
-                enum-error: func(a: float64) -> result<float64, e1>;
+                enum-error: func(a: float64) -> result<float64, e1>
             }
         }",
-        trappable_error_type: { "inline:inline/imports/e1" => TrappableE1 }
+        trappable_error_type: { "inline:inline/imports"::e1: TrappableE1 }
     });
 
-    // You can create concrete trap types which make it all the way out to the
-    // host caller, via downcast_ref below.
-    #[derive(Debug)]
-    pub struct MyTrap;
-
-    impl std::fmt::Display for MyTrap {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self)
-        }
-    }
-    impl std::error::Error for MyTrap {}
-
-    pub enum TrappableE1 {
-        Normal(imports::E1),
-        MyTrap(MyTrap),
-    }
-
-    // It is possible to define From impls that target these generated trappable
-    // types. This allows you to integrate libraries with other error types, or
-    // use your own more descriptive error types, and use ? to convert them at
-    // their throw site.
-    impl From<MyTrap> for TrappableE1 {
-        fn from(t: MyTrap) -> TrappableE1 {
-            TrappableE1::MyTrap(t)
-        }
-    }
-
-    impl From<imports::E1> for TrappableE1 {
-        fn from(t: imports::E1) -> TrappableE1 {
-            TrappableE1::Normal(t)
-        }
-    }
-
     #[test]
     fn run() -> Result<(), Error> {
         let engine = engine();
@@ -338,18 +305,33 @@ mod enum_error {
             ),
         )?;
 
+        // You can create concrete trap types which make it all the way out to the
+        // host caller, via downcast_ref below.
+        #[derive(Debug)]
+        struct MyTrap;
+
+        impl std::fmt::Display for MyTrap {
+            fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                write!(f, "{:?}", self)
+            }
+        }
+        impl std::error::Error for MyTrap {}
+
+        // It is possible to define From impls that target these generated trappable
+        // types. This allows you to integrate libraries with other error types, or
+        // use your own more descriptive error types, and use ? to convert them at
+        // their throw site.
+        impl From<MyTrap> for imports::TrappableE1 {
+            fn from(t: MyTrap) -> imports::TrappableE1 {
+                imports::TrappableE1::trap(anyhow!(t))
+            }
+        }
+
         #[derive(Default)]
         struct MyImports {}
 
         impl imports::Host for MyImports {
-            fn convert_e1(&mut self, err: TrappableE1) -> anyhow::Result<imports::E1> {
-                match err {
-                    TrappableE1::Normal(e) => Ok(e),
-                    TrappableE1::MyTrap(e) => Err(e.into()),
-                }
-            }
-
-            fn enum_error(&mut self, a: f64) -> Result<f64, TrappableE1> {
+            fn enum_error(&mut self, a: f64) -> Result<f64, imports::TrappableE1> {
                 if a == 0.0 {
                     Ok(a)
                 } else if a == 1.0 {
@@ -406,32 +388,23 @@ mod record_error {
 
     wasmtime::component::bindgen!({
         inline: "
-        package inline:inline;
+        package inline:inline
         interface imports {
             record e2 { line: u32, col: u32 }
-            record-error: func(a: float64) -> result<float64, e2>;
+            record-error: func(a: float64) -> result<float64, e2>
         }
         world result-playground {
-            import imports;
+            import imports
             export foo: interface {
                 record e2 { line: u32, col: u32 }
-                record-error: func(a: float64) -> result<float64, e2>;
+                record-error: func(a: float64) -> result<float64, e2>
             }
         }",
-        trappable_error_type: { "inline:inline/imports/e2" => TrappableE2 }
+        // Literal strings can be used for the interface and typename fields instead of
+        // identifiers, because wit identifiers arent always Rust identifiers.
+        trappable_error_type: { "inline:inline/imports"::"e2": TrappableE2 }
     });
 
-    pub enum TrappableE2 {
-        Normal(imports::E2),
-        Trap(anyhow::Error),
-    }
-
-    impl From<imports::E2> for TrappableE2 {
-        fn from(t: imports::E2) -> TrappableE2 {
-            TrappableE2::Normal(t)
-        }
-    }
-
     #[test]
     fn run() -> Result<(), Error> {
         let engine = engine();
@@ -503,13 +476,7 @@ mod record_error {
         struct MyImports {}
 
         impl imports::Host for MyImports {
-            fn convert_e2(&mut self, err: TrappableE2) -> anyhow::Result<imports::E2> {
-                match err {
-                    TrappableE2::Normal(e) => Ok(e),
-                    TrappableE2::Trap(e) => Err(e.into()),
-                }
-            }
-            fn record_error(&mut self, a: f64) -> Result<f64, TrappableE2> {
+            fn record_error(&mut self, a: f64) -> Result<f64, imports::TrappableE2> {
                 if a == 0.0 {
                     Ok(a)
                 } else if a == 1.0 {
@@ -518,7 +485,7 @@ mod record_error {
                         col: 1312,
                     })?
                 } else {
-                    Err(TrappableE2::Trap(anyhow!("record_error: trap")))
+                    Err(imports::TrappableE2::trap(anyhow!("record_error: trap")))
                 }
             }
         }
@@ -573,36 +540,25 @@ mod variant_error {
 
     wasmtime::component::bindgen!({
         inline: "
-        package inline:inline;
+        package inline:inline
         interface imports {
             enum e1 { a, b, c }
             record e2 { line: u32, col: u32 }
             variant e3 { E1(e1), E2(e2) }
-            variant-error: func(a: float64) -> result<float64, e3>;
+            variant-error: func(a: float64) -> result<float64, e3>
         }
         world result-playground {
-            import imports;
+            import imports
             export foo: interface {
                 enum e1 { a, b, c }
                 record e2 { line: u32, col: u32 }
                 variant e3 { E1(e1), E2(e2) }
-                variant-error: func(a: float64) -> result<float64, e3>;
+                variant-error: func(a: float64) -> result<float64, e3>
             }
         }",
-        trappable_error_type: { "inline:inline/imports/e3" => TrappableE3 }
+        trappable_error_type: { "inline:inline/imports"::e3: TrappableE3 }
     });
 
-    pub enum TrappableE3 {
-        Normal(imports::E3),
-        Trap(anyhow::Error),
-    }
-
-    impl From<imports::E3> for TrappableE3 {
-        fn from(t: imports::E3) -> TrappableE3 {
-            TrappableE3::Normal(t)
-        }
-    }
-
     #[test]
     fn run() -> Result<(), Error> {
         let engine = engine();
@@ -697,13 +653,7 @@ mod variant_error {
         struct MyImports {}
 
         impl imports::Host for MyImports {
-            fn convert_e3(&mut self, err: TrappableE3) -> anyhow::Result<imports::E3> {
-                match err {
-                    TrappableE3::Normal(e) => Ok(e),
-                    TrappableE3::Trap(e) => Err(e.into()),
-                }
-            }
-            fn variant_error(&mut self, a: f64) -> Result<f64, TrappableE3> {
+            fn variant_error(&mut self, a: f64) -> Result<f64, imports::TrappableE3> {
                 if a == 0.0 {
                     Ok(a)
                 } else if a == 1.0 {
@@ -712,7 +662,7 @@ mod variant_error {
                         col: 1312,
                     }))?
                 } else {
-                    Err(TrappableE3::Trap(anyhow!("variant_error: trap")))
+                    Err(imports::TrappableE3::trap(anyhow!("variant_error: trap")))
                 }
             }
         }
@@ -768,36 +718,25 @@ mod multiple_interfaces_error {
 
     wasmtime::component::bindgen!({
         inline: "
-        package inline:inline;
+        package inline:inline
         interface types {
             enum e1 { a, b, c }
-            enum-error: func(a: float64) -> result<float64, e1>;
+            enum-error: func(a: float64) -> result<float64, e1>
         }
         interface imports {
-            use types.{e1};
-            enum-error: func(a: float64) -> result<float64, e1>;
+            use types.{e1}
+            enum-error: func(a: float64) -> result<float64, e1>
         }
         world result-playground {
-            import imports;
+            import imports
             export foo: interface {
                 enum e1 { a, b, c }
-                enum-error: func(a: float64) -> result<float64, e1>;
+                enum-error: func(a: float64) -> result<float64, e1>
             }
         }",
-        trappable_error_type: { "inline:inline/types/e1" => TrappableE1 }
+        trappable_error_type: { "inline:inline/types"::e1: TrappableE1 }
     });
 
-    pub enum TrappableE1 {
-        Normal(types::E1),
-        Trap(anyhow::Error),
-    }
-
-    impl From<types::E1> for TrappableE1 {
-        fn from(t: imports::E1) -> TrappableE1 {
-            TrappableE1::Normal(t)
-        }
-    }
-
     #[test]
     fn run() -> Result<(), Error> {
         let engine = engine();
@@ -880,9 +819,9 @@ mod multiple_interfaces_error {
         // types. This allows you to integrate libraries with other error types, or
         // use your own more descriptive error types, and use ? to convert them at
         // their throw site.
-        impl From<MyTrap> for TrappableE1 {
-            fn from(t: MyTrap) -> TrappableE1 {
-                TrappableE1::Trap(anyhow!(t))
+        impl From<MyTrap> for types::TrappableE1 {
+            fn from(t: MyTrap) -> types::TrappableE1 {
+                types::TrappableE1::trap(anyhow!(t))
             }
         }
 
@@ -890,13 +829,7 @@ mod multiple_interfaces_error {
         struct MyImports {}
 
         impl types::Host for MyImports {
-            fn convert_e1(&mut self, err: TrappableE1) -> anyhow::Result<imports::E1> {
-                match err {
-                    TrappableE1::Normal(e) => Ok(e),
-                    TrappableE1::Trap(e) => Err(e.into()),
-                }
-            }
-            fn enum_error(&mut self, a: f64) -> Result<f64, TrappableE1> {
+            fn enum_error(&mut self, a: f64) -> Result<f64, types::TrappableE1> {
                 if a == 0.0 {
                     Ok(a)
                 } else if a == 1.0 {
@@ -908,7 +841,7 @@ mod multiple_interfaces_error {
         }
 
         impl imports::Host for MyImports {
-            fn enum_error(&mut self, a: f64) -> Result<f64, TrappableE1> {
+            fn enum_error(&mut self, a: f64) -> Result<f64, types::TrappableE1> {
                 if a == 0.0 {
                     Ok(a)
                 } else if a == 1.0 {
@@ -965,20 +898,20 @@ mod with_remapping {
         wasmtime::component::bindgen!({
             interfaces: "
             import imports: interface {
-                empty-error: func(a: float64) -> result<float64>;
+                empty-error: func(a: float64) -> result<float64>
             }",
         });
     }
 
     wasmtime::component::bindgen!({
         inline: "
-        package inline:inline;
+        package inline:inline
         world result-playground {
             import imports: interface {
-                empty-error: func(a: float64) -> result<float64>;
+                empty-error: func(a: float64) -> result<float64>
             }
 
-            export empty-error: func(a: float64) -> result<float64>;
+            export empty-error: func(a: float64) -> result<float64>
         }",
         with: {
             "imports": interfaces::imports,
diff --git a/tests/all/component_model/import.rs b/tests/all/component_model/import.rs
index 9f8ae09f0a7c..38e23edd4f95 100644
--- a/tests/all/component_model/import.rs
+++ b/tests/all/component_model/import.rs
@@ -373,23 +373,23 @@ fn attempt_to_leave_during_malloc() -> Result<()> {
     assert_eq!(trace.len(), 4);
 
     // This was our entry point...
-    assert_eq!(trace[3].module().name(), Some("m"));
+    assert_eq!(trace[3].module_name(), Some("m"));
     assert_eq!(trace[3].func_name(), Some("run"));
 
     // ... which called an imported function which ends up being originally
     // defined by the shim instance. The shim instance then does an indirect
     // call through a table which goes to the `canon.lower`'d host function
-    assert_eq!(trace[2].module().name(), Some("host_shim"));
+    assert_eq!(trace[2].module_name(), Some("host_shim"));
     assert_eq!(trace[2].func_name(), Some("shim_ret_string"));
 
     // ... and the lowered host function will call realloc to allocate space for
     // the result
-    assert_eq!(trace[1].module().name(), Some("m"));
+    assert_eq!(trace[1].module_name(), Some("m"));
     assert_eq!(trace[1].func_name(), Some("realloc"));
 
     // ... but realloc calls the shim instance and tries to exit the
     // component, triggering a dynamic trap
-    assert_eq!(trace[0].module().name(), Some("host_shim"));
+    assert_eq!(trace[0].module_name(), Some("host_shim"));
     assert_eq!(trace[0].func_name(), Some("shim_thunk"));
 
     // In addition to the above trap also ensure that when we enter a wasm
@@ -924,64 +924,3 @@ fn no_actual_wasm_code() -> Result<()> {
 
     Ok(())
 }
-
-#[test]
-fn use_types_across_component_boundaries() -> Result<()> {
-    // Create a component that exports a function that returns a record
-    let engine = super::engine();
-    let component = Component::new(
-        &engine,
-        r#"(component
-            (type (;0;) (record (field "a" u8) (field "b" string)))
-            (import "my-record" (type $my-record (eq 0)))
-            (core module $m
-                (memory $memory 17)
-                (export "memory" (memory $memory))
-                (func (export "my-func") (result i32)
-                    i32.const 4
-                    return))
-            (core instance $instance (instantiate $m))
-            (type $func-type (func (result $my-record)))
-            (alias core export $instance "my-func" (core func $my-func))
-            (alias core export $instance "memory" (core memory $memory))
-            (func $my-func (type $func-type) (canon lift (core func $my-func) (memory $memory) string-encoding=utf8))
-            (export $export "my-func" (func $my-func))
-        )"#,
-    )?;
-    let mut store = Store::new(&engine, 0);
-    let linker = Linker::new(&engine);
-    let instance = linker.instantiate(&mut store, &component)?;
-    let my_func = instance.get_func(&mut store, "my-func").unwrap();
-    let mut results = vec![Val::Bool(false)];
-    my_func.call(&mut store, &[], &mut results)?;
-
-    // Create another component that exports a function that takes that record as an argument
-    let component = Component::new(
-        &engine,
-        format!(
-            r#"(component
-            (type (;0;) (record (field "a" u8) (field "b" string)))
-            (import "my-record" (type $my-record (eq 0)))
-            (core module $m
-                (memory $memory 17)
-                (export "memory" (memory $memory))
-                {REALLOC_AND_FREE}
-                (func (export "my-func") (param i32 i32 i32)))
-            (core instance $instance (instantiate $m))
-            (type $func-type (func (param "my-record" $my-record)))
-            (alias core export $instance "my-func" (core func $my-func))
-            (alias core export $instance "memory" (core memory $memory))
-            (func $my-func (type $func-type) (canon lift (core func $my-func) (memory $memory) string-encoding=utf8 (realloc (func $instance "realloc"))))
-            (export $export "my-func" (func $my-func))
-        )"#
-        ),
-    )?;
-    let mut store = Store::new(&engine, 0);
-    let linker = Linker::new(&engine);
-    let instance = linker.instantiate(&mut store, &component)?;
-    let my_func = instance.get_func(&mut store, "my-func").unwrap();
-    // Call the exported function with the return values of the call to the previous component's exported function
-    my_func.call(&mut store, &results, &mut [])?;
-
-    Ok(())
-}
diff --git a/tests/all/component_model/resources.rs b/tests/all/component_model/resources.rs
index ba821251f79c..24487785cf91 100644
--- a/tests/all/component_model/resources.rs
+++ b/tests/all/component_model/resources.rs
@@ -1038,7 +1038,7 @@ fn pass_guest_back_as_borrow() -> Result<()> {
                     )
 
                     (func (export "take") (param i32)
-                        (if (i32.ne (local.get 0) (i32.const 100)) (then (unreachable)))
+                        (if (i32.ne (local.get 0) (i32.const 100)) (unreachable))
                     )
                 )
                 (core instance $i (instantiate $m
@@ -1228,8 +1228,8 @@ fn guest_different_host_same() -> Result<()> {
 
                     (func (export "f") (param i32 i32)
                         ;; separate tables both have initial index of 0
-                        (if (i32.ne (local.get 0) (i32.const 0)) (then (unreachable)))
-                        (if (i32.ne (local.get 1) (i32.const 0)) (then (unreachable)))
+                        (if (i32.ne (local.get 0) (i32.const 0)) (unreachable))
+                        (if (i32.ne (local.get 1) (i32.const 0)) (unreachable))
 
                         ;; host should end up getting the same resource
                         (call $f (local.get 0) (local.get 1))
diff --git a/tests/all/coredump.rs b/tests/all/coredump.rs
index 492bce76db64..d372965ccef1 100644
--- a/tests/all/coredump.rs
+++ b/tests/all/coredump.rs
@@ -3,17 +3,17 @@ use wasmtime::*;
 
 #[test]
 #[cfg_attr(miri, ignore)]
-fn coredump_attached_to_error() -> Result<()> {
+fn test_coredump_attached_to_error() -> Result<()> {
     let mut config = Config::default();
     config.coredump_on_trap(true);
     let engine = Engine::new(&config).unwrap();
     let mut store = Store::<()>::new(&engine, ());
 
     let wat = r#"
-        (module
-            (func $hello (import "" "hello"))
-            (func (export "run") (call $hello))
-        )
+      (module
+      (func $hello (import "" "hello"))
+      (func (export "run") (call $hello))
+      )
     "#;
 
     let module = Module::new(store.engine(), wat)?;
@@ -36,7 +36,7 @@ fn coredump_attached_to_error() -> Result<()> {
 
 #[test]
 #[cfg_attr(miri, ignore)]
-fn coredump_has_stack() -> Result<()> {
+fn test_coredump_has_stack() -> Result<()> {
     let mut config = Config::default();
     config.coredump_on_trap(true);
     let engine = Engine::new(&config).unwrap();
@@ -44,15 +44,15 @@ fn coredump_has_stack() -> Result<()> {
 
     let wat = r#"
       (module
-          (func $a (export "a")
-              call $b
-          )
-          (func $b
-              call $c
-          )
-          (func $c
-              unreachable
-          )
+        (func $a (export "a")
+            call $b
+        )
+        (func $b
+            call $c
+        )
+        (func $c 
+            unreachable
+        )
       )
     "#;
 
@@ -66,13 +66,12 @@ fn coredump_has_stack() -> Result<()> {
     assert_eq!(cd.frames()[0].func_name().unwrap(), "c");
     assert_eq!(cd.frames()[1].func_name().unwrap(), "b");
     assert_eq!(cd.frames()[2].func_name().unwrap(), "a");
-    let _ = cd.serialize(&mut store, "stack");
     Ok(())
 }
 
 #[test]
 #[cfg_attr(miri, ignore)]
-fn coredump_has_modules_and_instances() -> Result<()> {
+fn test_coredump_has_modules_and_instances() -> Result<()> {
     let mut config = Config::default();
     config.coredump_on_trap(true);
     let engine = Engine::new(&config).unwrap();
@@ -80,19 +79,19 @@ fn coredump_has_modules_and_instances() -> Result<()> {
     let mut store = Store::<()>::new(&engine, ());
 
     let wat1 = r#"
-        (module $foo
-            (import "bar" "b" (func $b))
-            (func (export "a")
-                call $b
-            )
+      (module $foo
+        (import "bar" "b" (func $b))
+        (func (export "a")
+            call $b
         )
+      )
     "#;
     let wat2 = r#"
-        (module $bar
-            (func (export "b")
-                unreachable
-            )
+      (module $bar
+        (func (export "b")
+            unreachable
         )
+      )
     "#;
     let module1 = Module::new(store.engine(), wat1)?;
     let module2 = Module::new(store.engine(), wat2)?;
@@ -106,155 +105,43 @@ fn coredump_has_modules_and_instances() -> Result<()> {
     let cd = e.downcast_ref::<WasmCoreDump>().unwrap();
     assert_eq!(cd.modules().len(), 2);
     assert_eq!(cd.instances().len(), 2);
-    let _ = cd.serialize(&mut store, "modules-and-instances");
     Ok(())
 }
 
 #[test]
 #[cfg_attr(miri, ignore)]
-fn coredump_has_host_globals_and_memory() -> Result<()> {
+fn test_coredump_has_import_globals_and_memory() -> Result<()> {
     let mut config = Config::default();
     config.coredump_on_trap(true);
     let engine = Engine::new(&config).unwrap();
-
-    let module = Module::new(
-        &engine,
-        r#"
-            (module
-                (import "memory" "memory" (memory 1))
-                (global $myglobal (import "global" "global") (mut i32))
-                (func (export "a") (result i32)
-                    unreachable
-                )
-                (export "memory" (memory 0))
-                (export "global" (global 0))
-            )
-        "#,
-    )?;
-
     let mut store = Store::<()>::new(&engine, ());
     let mut linker = Linker::new(&engine);
 
-    let memory = Memory::new(&mut store, MemoryType::new(1, None))?;
-    linker.define(&mut store, "memory", "memory", memory)?;
+    let wat = r#"
+      (module
+        (import "memory" "memory" (memory 1))
+        (global $myglobal (import "js" "global") (mut i32))
+        (func (export "a") (result i32)
+          unreachable
+        )
+      )
+    "#;
 
-    let global = Global::new(
+    let module = Module::new(store.engine(), wat)?;
+    let m = wasmtime::Memory::new(&mut store, MemoryType::new(1, None))?;
+    linker.define(&mut store, "memory", "memory", m)?;
+    let g = wasmtime::Global::new(
         &mut store,
         GlobalType::new(ValType::I32, Mutability::Var),
         Val::I32(0),
     )?;
-    linker.define(&mut store, "global", "global", global)?;
-
+    linker.define(&mut store, "js", "global", g)?;
     let instance = linker.instantiate(&mut store, &module)?;
-
-    // Each time we extract the exports, it puts them in the `StoreData`. Our
-    // core dumps need to be robust to duplicate entries in the `StoreData`.
-    for _ in 0..10 {
-        let _ = instance.get_global(&mut store, "global").unwrap();
-        let _ = instance.get_memory(&mut store, "memory").unwrap();
-    }
-
     let a_func = instance.get_typed_func::<(), i32>(&mut store, "a")?;
-    let err = a_func.call(&mut store, ()).unwrap_err();
-    let core_dump = err.downcast_ref::<WasmCoreDump>().unwrap();
-    assert_eq!(core_dump.globals().len(), 1);
-    assert_eq!(core_dump.memories().len(), 1);
-    assert_eq!(core_dump.instances().len(), 1);
-    let _ = core_dump.serialize(&mut store, "host-globals-and-memory");
-
-    Ok(())
-}
-
-#[test]
-#[cfg_attr(miri, ignore)]
-fn coredump_has_defined_globals_and_memory() -> Result<()> {
-    let mut config = Config::default();
-    config.coredump_on_trap(true);
-    let engine = Engine::new(&config).unwrap();
-
-    let module = Module::new(
-        &engine,
-        r#"
-            (module
-                (global (mut i32) (i32.const 42))
-                (memory 1)
-                (func (export "a")
-                    unreachable
-                )
-            )
-        "#,
-    )?;
-
-    let mut store = Store::<()>::new(&engine, ());
-    let instance = Instance::new(&mut store, &module, &[])?;
-
-    let a_func = instance.get_typed_func::<(), ()>(&mut store, "a")?;
-    let err = a_func.call(&mut store, ()).unwrap_err();
-    let core_dump = err.downcast_ref::<WasmCoreDump>().unwrap();
-    assert_eq!(core_dump.globals().len(), 1);
-    assert_eq!(core_dump.memories().len(), 1);
-    assert_eq!(core_dump.instances().len(), 1);
-    let _ = core_dump.serialize(&mut store, "defined-globals-and-memory");
-
-    Ok(())
-}
-
-#[test]
-#[cfg_attr(miri, ignore)]
-fn multiple_globals_memories_and_instances() -> Result<()> {
-    let mut config = Config::default();
-    config.wasm_multi_memory(true);
-    config.coredump_on_trap(true);
-    let engine = Engine::new(&config).unwrap();
-    let mut store = Store::<()>::new(&engine, ());
-    let mut linker = Linker::new(&engine);
-
-    let memory = Memory::new(&mut store, MemoryType::new(1, None))?;
-    linker.define(&mut store, "host", "memory", memory)?;
-
-    let global = Global::new(
-        &mut store,
-        GlobalType::new(ValType::I32, Mutability::Var),
-        Val::I32(0),
-    )?;
-    linker.define(&mut store, "host", "global", global)?;
-
-    let module_a = Module::new(
-        &engine,
-        r#"
-            (module
-                (memory (export "memory") 1)
-                (global (export "global") (mut i32) (i32.const 0))
-            )
-        "#,
-    )?;
-    let instance_a = linker.instantiate(&mut store, &module_a)?;
-    linker.instance(&mut store, "a", instance_a)?;
-
-    let module_b = Module::new(
-        &engine,
-        r#"
-            (module
-                (import "host" "memory" (memory 1))
-                (import "host" "global" (global (mut i32)))
-                (import "a" "memory" (memory 1))
-                (import "a" "global" (global (mut i32)))
-
-                (func (export "trap")
-                    unreachable
-                )
-            )
-        "#,
-    )?;
-    let instance_b = linker.instantiate(&mut store, &module_b)?;
-
-    let trap_func = instance_b.get_typed_func::<(), ()>(&mut store, "trap")?;
-    let err = trap_func.call(&mut store, ()).unwrap_err();
-    let core_dump = err.downcast_ref::<WasmCoreDump>().unwrap();
-    assert_eq!(core_dump.globals().len(), 2);
-    assert_eq!(core_dump.memories().len(), 2);
-    assert_eq!(core_dump.instances().len(), 2);
-    let _ = core_dump.serialize(&mut store, "multi");
+    let e = a_func.call(&mut store, ()).unwrap_err();
+    let cd = e.downcast_ref::<WasmCoreDump>().unwrap();
+    assert_eq!(cd.store_globals().len(), 1);
+    assert_eq!(cd.store_memories().len(), 1);
 
     Ok(())
 }
diff --git a/tests/all/fuel.rs b/tests/all/fuel.rs
index 6686daf5cbc0..c3f300d09a33 100644
--- a/tests/all/fuel.rs
+++ b/tests/all/fuel.rs
@@ -53,9 +53,9 @@ fn fuel_consumed(wasm: &[u8]) -> u64 {
     let engine = Engine::new(&config).unwrap();
     let module = Module::new(&engine, wasm).unwrap();
     let mut store = Store::new(&engine, ());
-    store.set_fuel(u64::MAX).unwrap();
+    store.add_fuel(u64::max_value()).unwrap();
     drop(Instance::new(&mut store, &module, &[]));
-    u64::MAX - store.get_fuel().unwrap()
+    store.fuel_consumed().unwrap()
 }
 
 #[test]
@@ -116,7 +116,7 @@ fn iloop() {
         let engine = Engine::new(&config).unwrap();
         let module = Module::new(&engine, wat).unwrap();
         let mut store = Store::new(&engine, ());
-        store.set_fuel(10_000).unwrap();
+        store.add_fuel(10_000).unwrap();
         let error = Instance::new(&mut store, &module, &[]).err().unwrap();
         assert_eq!(error.downcast::<Trap>().unwrap(), Trap::OutOfFuel);
     }
@@ -128,10 +128,21 @@ fn manual_fuel() {
     config.consume_fuel(true);
     let engine = Engine::new(&config).unwrap();
     let mut store = Store::new(&engine, ());
-    store.set_fuel(10_000).unwrap();
-    assert_eq!(store.get_fuel().ok(), Some(10_000));
-    assert_eq!(store.set_fuel(1).ok(), Some(()));
-    assert_eq!(store.get_fuel().ok(), Some(1));
+    store.add_fuel(10_000).unwrap();
+    assert_eq!(store.fuel_consumed(), Some(0));
+    assert_eq!(store.fuel_remaining(), Some(10_000));
+    assert_eq!(store.consume_fuel(1).unwrap(), 9_999);
+    assert_eq!(store.fuel_consumed(), Some(1));
+    assert_eq!(store.fuel_remaining(), Some(9_999));
+    assert!(store.consume_fuel(10_000).is_err());
+    assert_eq!(store.consume_fuel(999).unwrap(), 9_000);
+    assert!(store.consume_fuel(10_000).is_err());
+    assert_eq!(store.consume_fuel(8998).unwrap(), 2);
+    assert!(store.consume_fuel(3).is_err());
+    assert_eq!(store.consume_fuel(1).unwrap(), 1);
+    assert_eq!(store.consume_fuel(1).unwrap(), 0);
+    assert_eq!(store.consume_fuel(0).unwrap(), 0);
+    assert_eq!(store.fuel_remaining(), Some(0));
 }
 
 #[test]
@@ -154,11 +165,10 @@ fn host_function_consumes_all() {
     )
     .unwrap();
     let mut store = Store::new(&engine, ());
-    store.set_fuel(FUEL).unwrap();
+    store.add_fuel(FUEL).unwrap();
     let func = Func::wrap(&mut store, |mut caller: Caller<'_, ()>| {
-        let remaining = caller.get_fuel().unwrap();
-        assert_eq!(remaining, FUEL - 2);
-        assert!(caller.set_fuel(1).is_ok());
+        let consumed = caller.fuel_consumed().unwrap();
+        assert_eq!(caller.consume_fuel((FUEL - consumed) - 1).unwrap(), 1);
     });
 
     let instance = Instance::new(&mut store, &module, &[func.into()]).unwrap();
@@ -173,8 +183,11 @@ fn manual_edge_cases() {
     config.consume_fuel(true);
     let engine = Engine::new(&config).unwrap();
     let mut store = Store::new(&engine, ());
-    store.set_fuel(u64::MAX).unwrap();
-    assert_eq!(store.get_fuel().unwrap(), u64::MAX);
+    store.add_fuel(u64::MAX).unwrap();
+    assert_eq!(store.fuel_consumed(), Some(0));
+    assert!(store.consume_fuel(u64::MAX).is_err());
+    assert!(store.consume_fuel(i64::MAX as u64 + 1).is_err());
+    assert_eq!(store.consume_fuel(i64::MAX as u64).unwrap(), 0);
 }
 
 #[test]
@@ -204,8 +217,8 @@ fn unconditionally_trapping_memory_accesses_save_fuel_before_trapping() {
 
     let mut store = Store::new(&engine, ());
     let init_fuel = 1_000;
-    store.set_fuel(init_fuel).unwrap();
-    assert_eq!(init_fuel, store.get_fuel().unwrap());
+    store.add_fuel(init_fuel).unwrap();
+    assert_eq!(init_fuel, store.fuel_remaining().unwrap());
 
     let instance = Instance::new(&mut store, &module, &[]).unwrap();
     let f = instance
@@ -217,6 +230,7 @@ fn unconditionally_trapping_memory_accesses_save_fuel_before_trapping() {
 
     // The `i32.add` consumed some fuel before the unconditionally trapping
     // memory access.
-    let consumed_fuel = init_fuel - store.get_fuel().unwrap();
+    let consumed_fuel = store.fuel_consumed().unwrap();
     assert!(consumed_fuel > 0);
+    assert_eq!(init_fuel, consumed_fuel + store.fuel_remaining().unwrap());
 }
diff --git a/tests/all/limits.rs b/tests/all/limits.rs
index bb8640af8a27..cd357d5dc78f 100644
--- a/tests/all/limits.rs
+++ b/tests/all/limits.rs
@@ -1,6 +1,5 @@
 use anyhow::Result;
 use wasmtime::*;
-use wasmtime_runtime::MpkEnabled;
 
 const WASM_PAGE_SIZE: usize = wasmtime_environ::WASM_PAGE_SIZE as usize;
 
@@ -356,8 +355,7 @@ fn test_pooling_allocator_initial_limits_exceeded() -> Result<()> {
     let mut pool = crate::small_pool_config();
     pool.total_memories(2)
         .max_memories_per_module(2)
-        .memory_pages(5)
-        .memory_protection_keys(MpkEnabled::Disable);
+        .memory_pages(5);
     let mut config = Config::new();
     config.wasm_multi_memory(true);
     config.allocation_strategy(InstanceAllocationStrategy::Pooling(pool));
diff --git a/tests/all/main.rs b/tests/all/main.rs
index 79ad24c60c38..1c3e6d4af483 100644
--- a/tests/all/main.rs
+++ b/tests/all/main.rs
@@ -3,7 +3,6 @@
 mod async_functions;
 mod call_hook;
 mod cli_tests;
-mod code_too_large;
 mod component_model;
 mod coredump;
 mod custom_signal_handler;
@@ -30,7 +29,6 @@ mod module_serialize;
 mod name;
 mod pooling_allocator;
 mod relocs;
-mod stack_creator;
 mod stack_overflow;
 mod store;
 mod table;
diff --git a/tests/all/memory.rs b/tests/all/memory.rs
index 4e2920200136..3acdfc2c69c2 100644
--- a/tests/all/memory.rs
+++ b/tests/all/memory.rs
@@ -3,7 +3,6 @@ use rayon::prelude::*;
 use std::sync::atomic::{AtomicU32, Ordering::SeqCst};
 use std::time::{Duration, Instant};
 use wasmtime::*;
-use wasmtime_runtime::{mpk, MpkEnabled};
 
 fn module(engine: &Engine) -> Result<Module> {
     let mut wat = format!("(module\n");
@@ -193,72 +192,7 @@ fn guards_present_pooling() -> Result<()> {
     const GUARD_SIZE: u64 = 65536;
 
     let mut pool = crate::small_pool_config();
-    pool.total_memories(2)
-        .memory_pages(10)
-        .memory_protection_keys(MpkEnabled::Disable);
-    let mut config = Config::new();
-    config.static_memory_maximum_size(1 << 20);
-    config.dynamic_memory_guard_size(GUARD_SIZE);
-    config.static_memory_guard_size(GUARD_SIZE);
-    config.guard_before_linear_memory(true);
-    config.allocation_strategy(InstanceAllocationStrategy::Pooling(pool));
-    let engine = Engine::new(&config)?;
-
-    let mut store = Store::new(&engine, ());
-
-    let mem1 = {
-        let m = Module::new(&engine, "(module (memory (export \"\") 1 2))")?;
-        Instance::new(&mut store, &m, &[])?
-            .get_memory(&mut store, "")
-            .unwrap()
-    };
-    let mem2 = {
-        let m = Module::new(&engine, "(module (memory (export \"\") 1))")?;
-        Instance::new(&mut store, &m, &[])?
-            .get_memory(&mut store, "")
-            .unwrap()
-    };
-
-    unsafe fn assert_guards(store: &Store<()>, mem: &Memory) {
-        // guards before
-        println!("check pre-mem");
-        assert_faults(mem.data_ptr(&store).offset(-(GUARD_SIZE as isize)));
-
-        // unmapped just after memory
-        println!("check mem");
-        assert_faults(mem.data_ptr(&store).add(mem.data_size(&store)));
-
-        // guards after memory
-        println!("check post-mem");
-        assert_faults(mem.data_ptr(&store).add(1 << 20));
-    }
-    unsafe {
-        assert_guards(&store, &mem1);
-        assert_guards(&store, &mem2);
-        println!("growing");
-        mem1.grow(&mut store, 1).unwrap();
-        mem2.grow(&mut store, 1).unwrap();
-        assert_guards(&store, &mem1);
-        assert_guards(&store, &mem2);
-    }
-
-    Ok(())
-}
-
-#[test]
-#[cfg_attr(miri, ignore)]
-fn guards_present_pooling_mpk() -> Result<()> {
-    if !mpk::is_supported() {
-        println!("skipping `guards_present_pooling_mpk` test; mpk is not supported");
-        return Ok(());
-    }
-
-    const GUARD_SIZE: u64 = 65536;
-    let mut pool = crate::small_pool_config();
-    pool.total_memories(4)
-        .memory_pages(10)
-        .memory_protection_keys(MpkEnabled::Enable)
-        .max_memory_protection_keys(2);
+    pool.total_memories(2).memory_pages(10);
     let mut config = Config::new();
     config.static_memory_maximum_size(1 << 20);
     config.dynamic_memory_guard_size(GUARD_SIZE);
@@ -412,7 +346,7 @@ fn tiny_static_heap() -> Result<()> {
 
                     (loop
                         (if (i32.eq (local.get $i) (i32.const 65536))
-                            (then (return)))
+                            (return))
                         (drop (i32.load8_u (local.get $i)))
                         (local.set $i (i32.add (local.get $i) (i32.const 1)))
                         br 0
diff --git a/tests/all/module.rs b/tests/all/module.rs
index 78baec39d6b2..9efedb94bde6 100644
--- a/tests/all/module.rs
+++ b/tests/all/module.rs
@@ -43,7 +43,7 @@ fn caches_across_engines() {
         // differ in wasm features enabled (which can affect
         // runtime/compilation settings)
         let res = Module::deserialize(
-            &Engine::new(Config::new().wasm_threads(false)).unwrap(),
+            &Engine::new(Config::new().wasm_simd(false)).unwrap(),
             &bytes,
         );
         assert!(res.is_err());
@@ -182,7 +182,7 @@ fn serialize_not_overly_massive() -> Result<()> {
 #[cfg_attr(any(not(target_arch = "x86_64"), miri), ignore)]
 fn missing_sse_and_floats_still_works() -> Result<()> {
     let mut config = Config::new();
-    config.wasm_simd(false).wasm_relaxed_simd(false);
+    config.wasm_simd(false);
     unsafe {
         config.cranelift_flag_set("has_sse41", "false");
     }
diff --git a/tests/all/pooling_allocator.rs b/tests/all/pooling_allocator.rs
index b79f10d6a6e9..f6fcc2a541c0 100644
--- a/tests/all/pooling_allocator.rs
+++ b/tests/all/pooling_allocator.rs
@@ -1,7 +1,6 @@
 use super::skip_pooling_allocator_tests;
 use anyhow::Result;
 use wasmtime::*;
-use wasmtime_runtime::MpkEnabled;
 
 #[test]
 fn successful_instantiation() -> Result<()> {
@@ -1152,8 +1151,7 @@ fn total_memories_limit() -> Result<()> {
 
     let mut pool = crate::small_pool_config();
     pool.total_memories(TOTAL_MEMORIES)
-        .total_core_instances(TOTAL_MEMORIES + 1)
-        .memory_protection_keys(MpkEnabled::Disable);
+        .total_core_instances(TOTAL_MEMORIES + 1);
     let mut config = Config::new();
     config.allocation_strategy(InstanceAllocationStrategy::Pooling(pool));
 
@@ -1171,7 +1169,7 @@ fn total_memories_limit() -> Result<()> {
         Err(e) => assert_eq!(
             e.to_string(),
             format!(
-                "maximum concurrent memory limit of {} reached for stripe 0",
+                "maximum concurrent memory limit of {} reached",
                 TOTAL_MEMORIES
             ),
         ),
diff --git a/tests/all/stack_creator.rs b/tests/all/stack_creator.rs
deleted file mode 100644
index 5b46d8942a2c..000000000000
--- a/tests/all/stack_creator.rs
+++ /dev/null
@@ -1,155 +0,0 @@
-#![cfg(all(not(target_os = "windows"), not(miri)))]
-use anyhow::{bail, Context};
-use std::{
-    alloc::{GlobalAlloc, Layout, System},
-    ops::Range,
-    ptr::NonNull,
-    sync::Arc,
-};
-use wasmtime::*;
-
-fn align_up(v: usize, align: usize) -> usize {
-    return (v + (align - 1)) & (!(align - 1));
-}
-
-struct CustomStack {
-    base: NonNull<u8>,
-    len: usize,
-}
-unsafe impl Send for CustomStack {}
-unsafe impl Sync for CustomStack {}
-impl CustomStack {
-    fn new(base: NonNull<u8>, len: usize) -> Self {
-        CustomStack { base, len }
-    }
-}
-unsafe impl StackMemory for CustomStack {
-    fn top(&self) -> *mut u8 {
-        unsafe { self.base.as_ptr().add(self.len) }
-    }
-    fn range(&self) -> Range<usize> {
-        let base = self.base.as_ptr() as usize;
-        base..base + self.len
-    }
-}
-
-// A creator that allocates stacks on the heap instead of mmap'ing.
-struct CustomStackCreator {
-    memory: NonNull<u8>,
-    size: usize,
-    layout: Layout,
-}
-
-unsafe impl Send for CustomStackCreator {}
-unsafe impl Sync for CustomStackCreator {}
-impl CustomStackCreator {
-    fn new() -> Result<Self> {
-        // 1MB
-        const MINIMUM_STACK_SIZE: usize = 1 * 1_024 * 1_024;
-        let page_size = rustix::param::page_size();
-        let size = align_up(MINIMUM_STACK_SIZE, page_size);
-        // Add an extra page for the guard page
-        let layout = Layout::from_size_align(size + page_size, page_size)
-            .context("unable to compute stack layout")?;
-        let memory = unsafe {
-            let mem = System.alloc(layout);
-            let notnull = NonNull::new(mem);
-            if let Some(mem) = notnull {
-                // Mark guard page as protected
-                rustix::mm::mprotect(
-                    mem.as_ptr().cast(),
-                    page_size,
-                    rustix::mm::MprotectFlags::empty(),
-                )?;
-            }
-            notnull
-        }
-        .context("unable to allocate stack memory")?;
-        Ok(CustomStackCreator {
-            memory,
-            size,
-            layout,
-        })
-    }
-    fn range(&self) -> Range<usize> {
-        let page_size = rustix::param::page_size();
-        let base = unsafe { self.memory.as_ptr().add(page_size) as usize };
-        base..base + self.size
-    }
-}
-impl Drop for CustomStackCreator {
-    fn drop(&mut self) {
-        let page_size = rustix::param::page_size();
-        unsafe {
-            // Unprotect the guard page as the allocator could reuse it.
-            rustix::mm::mprotect(
-                self.memory.as_ptr().cast(),
-                page_size,
-                rustix::mm::MprotectFlags::READ | rustix::mm::MprotectFlags::WRITE,
-            )
-            .unwrap();
-            System.dealloc(self.memory.as_ptr(), self.layout);
-        }
-    }
-}
-unsafe impl StackCreator for CustomStackCreator {
-    fn new_stack(&self, size: usize) -> Result<Box<dyn StackMemory>> {
-        if size != self.size {
-            bail!("must use the size we allocated for this stack memory creator");
-        }
-        let page_size = rustix::param::page_size();
-        // skip over the page size
-        let base_ptr = unsafe { self.memory.as_ptr().add(page_size) };
-        let base = NonNull::new(base_ptr).context("unable to compute stack base")?;
-        Ok(Box::new(CustomStack::new(base, self.size)))
-    }
-}
-
-fn config() -> (Store<()>, Arc<CustomStackCreator>) {
-    let stack_creator = Arc::new(CustomStackCreator::new().unwrap());
-    let mut config = Config::new();
-    config
-        .async_support(true)
-        .max_wasm_stack(stack_creator.size / 2)
-        .async_stack_size(stack_creator.size)
-        .with_host_stack(stack_creator.clone());
-    (
-        Store::new(&Engine::new(&config).unwrap(), ()),
-        stack_creator,
-    )
-}
-
-#[tokio::test]
-async fn called_on_custom_heap_stack() -> Result<()> {
-    let (mut store, stack_creator) = config();
-    let module = Module::new(
-        store.engine(),
-        r#"
-            (module
-                (import "host" "callback" (func $callback (result i64)))
-                (func $f (result i64) (call $callback))
-                (export "f" (func $f))
-            )
-        "#,
-    )?;
-
-    let ty = FuncType::new([], [ValType::I64]);
-    let host_func = Func::new(&mut store, ty, move |_caller, _params, results| {
-        let foo = 42;
-        // output an address on the stack
-        results[0] = Val::I64((&foo as *const i32) as usize as i64);
-        Ok(())
-    });
-    let export = wasmtime::Extern::Func(host_func);
-    let instance = Instance::new_async(&mut store, &module, &[export]).await?;
-    let mut results = [Val::I64(0)];
-    instance
-        .get_func(&mut store, "f")
-        .context("missing function export")?
-        .call_async(&mut store, &[], &mut results)
-        .await?;
-    // Make sure the stack address we wrote was within our custom stack range
-    let stack_address = results[0].i64().unwrap() as usize;
-    assert!(stack_creator.range().contains(&stack_address));
-    Ok(())
-}
diff --git a/tests/all/traps.rs b/tests/all/traps.rs
index cb33af235b49..5b7377fa1537 100644
--- a/tests/all/traps.rs
+++ b/tests/all/traps.rs
@@ -130,12 +130,12 @@ fn test_trap_trace() -> Result<()> {
 
     let trace = e.downcast_ref::<WasmBacktrace>().unwrap().frames();
     assert_eq!(trace.len(), 2);
-    assert_eq!(trace[0].module().name().unwrap(), "hello_mod");
+    assert_eq!(trace[0].module_name().unwrap(), "hello_mod");
     assert_eq!(trace[0].func_index(), 1);
     assert_eq!(trace[0].func_name(), Some("hello"));
     assert_eq!(trace[0].func_offset(), Some(1));
     assert_eq!(trace[0].module_offset(), Some(0x26));
-    assert_eq!(trace[1].module().name().unwrap(), "hello_mod");
+    assert_eq!(trace[1].module_name().unwrap(), "hello_mod");
     assert_eq!(trace[1].func_index(), 0);
     assert_eq!(trace[1].func_name(), None);
     assert_eq!(trace[1].func_offset(), Some(1));
@@ -254,9 +254,9 @@ fn test_trap_trace_cb() -> Result<()> {
 
     let trace = e.downcast_ref::<WasmBacktrace>().unwrap().frames();
     assert_eq!(trace.len(), 2);
-    assert_eq!(trace[0].module().name().unwrap(), "hello_mod");
+    assert_eq!(trace[0].module_name().unwrap(), "hello_mod");
     assert_eq!(trace[0].func_index(), 2);
-    assert_eq!(trace[1].module().name().unwrap(), "hello_mod");
+    assert_eq!(trace[1].module_name().unwrap(), "hello_mod");
     assert_eq!(trace[1].func_index(), 1);
     assert!(format!("{e:?}").contains("cb throw"));
 
@@ -281,7 +281,7 @@ fn test_trap_stack_overflow() -> Result<()> {
     let trace = e.downcast_ref::<WasmBacktrace>().unwrap().frames();
     assert!(trace.len() >= 32);
     for i in 0..trace.len() {
-        assert_eq!(trace[i].module().name().unwrap(), "rec_mod");
+        assert_eq!(trace[i].module_name().unwrap(), "rec_mod");
         assert_eq!(trace[i].func_index(), 0);
         assert_eq!(trace[i].func_name(), Some("run"));
     }
@@ -1347,18 +1347,23 @@ fn wasm_fault_address_reported_by_default() -> Result<()> {
     )?;
     let err = Instance::new(&mut store, &module, &[]).unwrap_err();
 
+    // On s390x faulting addressess are rounded to the nearest page boundary
+    // instead of having the precise address reported.
+    let mut expected_addr = 0xdeadbeef_u32;
+    if cfg!(target_arch = "s390x") {
+        expected_addr &= 0xfffff000;
+    }
+
     // NB: at this time there's no programmatic access to the fault address
     // because it's not always available for load/store traps. Only static
     // memories on 32-bit have this information, but bounds-checked memories
     // use manual trapping instructions and otherwise don't have a means of
     // communicating the faulting address at this time.
-    //
-    // It looks like the exact reported fault address may not be deterministic,
-    // so assert that we have the right error message, but not the exact address.
     let err = format!("{err:?}");
     assert!(
-        err.contains("memory fault at wasm address ")
-            && err.contains(" in linear memory of size 0x10000"),
+        err.contains(&format!(
+            "memory fault at wasm address 0x{expected_addr:x} in linear memory of size 0x10000"
+        )),
         "bad error: {err}"
     );
     Ok(())
diff --git a/tests/all/wasi_testsuite.rs b/tests/all/wasi_testsuite.rs
index 9928182b005f..093a633c9826 100644
--- a/tests/all/wasi_testsuite.rs
+++ b/tests/all/wasi_testsuite.rs
@@ -110,7 +110,7 @@ fn build_command<P: AsRef<Path>>(module: P, extra_flags: &[&str], spec: &Spec) -
     if let Some(dirs) = &spec.dirs {
         for dir in dirs {
             cmd.arg("--dir");
-            cmd.arg(format!("{}::{}", parent_dir.join(dir).display(), dir));
+            cmd.arg(format!("{}::{}", dir, parent_dir.join(dir).display()));
         }
     }
     // Add environment variables as CLI arguments.
diff --git a/tests/all/wast.rs b/tests/all/wast.rs
index 5b93799aba9e..8f2f357be67d 100644
--- a/tests/all/wast.rs
+++ b/tests/all/wast.rs
@@ -123,13 +123,11 @@ fn run_wast(wast: &str, strategy: Strategy, pooling: bool) -> anyhow::Result<()>
         }
 
         // The limits here are crafted such that the wast tests should pass.
-        // However, these limits may become insufficient in the future as the
-        // wast tests change. If a wast test fails because of a limit being
-        // "exceeded" or if memory/table fails to grow, the values here will
-        // need to be adjusted.
+        // However, these limits may become insufficient in the future as the wast tests change.
+        // If a wast test fails because of a limit being "exceeded" or if memory/table
+        // fails to grow, the values here will need to be adjusted.
         let mut pool = PoolingAllocationConfig::default();
-        pool.total_memories(450 * 2)
-            .max_memory_protection_keys(2)
+        pool.total_memories(450)
             .memory_pages(805)
             .max_memories_per_module(if multi_memory { 9 } else { 1 })
             .max_tables_per_module(4);
@@ -182,7 +180,7 @@ fn feature_found_src(bytes: &[u8], name: &str) -> bool {
 // specified maximum we can put a cap on the virtual address space reservations
 // made.
 fn lock_pooling() -> impl Drop {
-    const MAX_CONCURRENT_POOLING: u32 = 4;
+    const MAX_CONCURRENT_POOLING: u32 = 8;
 
     static ACTIVE: Lazy<MyState> = Lazy::new(MyState::default);
 
diff --git a/tests/misc_testsuite/component-model/fused.wast b/tests/misc_testsuite/component-model/fused.wast
index 4ce18faef8c3..4e6add9fb2ba 100644
--- a/tests/misc_testsuite/component-model/fused.wast
+++ b/tests/misc_testsuite/component-model/fused.wast
@@ -64,13 +64,13 @@
         (call $assert_false (i32.const 0))
 
         (if (i32.ne (call $ret_bool (i32.const 1)) (i32.const 1))
-          (then (unreachable)))
+          (unreachable))
         (if (i32.ne (call $ret_bool (i32.const 2)) (i32.const 1))
-          (then (unreachable)))
+          (unreachable))
         (if (i32.ne (call $ret_bool (i32.const -1)) (i32.const 1))
-          (then (unreachable)))
+          (unreachable))
         (if (i32.ne (call $ret_bool (i32.const 0)) (i32.const 0))
-          (then (unreachable)))
+          (unreachable))
       )
       (start $start)
     )
@@ -108,28 +108,28 @@
     (func (export "roundtrip") (param $src i32) (result i32)
       (local $dst i32)
       (if (i32.ne (local.get $src) (i32.const 16))
-        (then (unreachable)))
-
-      (if (i32.ne (i32.load offset=0 (local.get $src)) (i32.const 1)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=4 (local.get $src)) (i32.const 2)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=8 (local.get $src)) (i32.const 3)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=12 (local.get $src)) (i32.const 4)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=16 (local.get $src)) (i32.const 5)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=20 (local.get $src)) (i32.const 6)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=24 (local.get $src)) (i32.const 7)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=28 (local.get $src)) (i32.const 8)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=32 (local.get $src)) (i32.const 9)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=36 (local.get $src)) (i32.const 10)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=40 (local.get $src)) (i32.const 11)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=44 (local.get $src)) (i32.const 12)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=48 (local.get $src)) (i32.const 13)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=52 (local.get $src)) (i32.const 14)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=56 (local.get $src)) (i32.const 15)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=60 (local.get $src)) (i32.const 16)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=64 (local.get $src)) (i32.const 17)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=68 (local.get $src)) (i32.const 18)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=72 (local.get $src)) (i32.const 19)) (then (unreachable)))
-      (if (i32.ne (i32.load offset=76 (local.get $src)) (i32.const 20)) (then (unreachable)))
+        (unreachable))
+
+      (if (i32.ne (i32.load offset=0 (local.get $src)) (i32.const 1)) (unreachable))
+      (if (i32.ne (i32.load offset=4 (local.get $src)) (i32.const 2)) (unreachable))
+      (if (i32.ne (i32.load offset=8 (local.get $src)) (i32.const 3)) (unreachable))
+      (if (i32.ne (i32.load offset=12 (local.get $src)) (i32.const 4)) (unreachable))
+      (if (i32.ne (i32.load offset=16 (local.get $src)) (i32.const 5)) (unreachable))
+      (if (i32.ne (i32.load offset=20 (local.get $src)) (i32.const 6)) (unreachable))
+      (if (i32.ne (i32.load offset=24 (local.get $src)) (i32.const 7)) (unreachable))
+      (if (i32.ne (i32.load offset=28 (local.get $src)) (i32.const 8)) (unreachable))
+      (if (i32.ne (i32.load offset=32 (local.get $src)) (i32.const 9)) (unreachable))
+      (if (i32.ne (i32.load offset=36 (local.get $src)) (i32.const 10)) (unreachable))
+      (if (i32.ne (i32.load offset=40 (local.get $src)) (i32.const 11)) (unreachable))
+      (if (i32.ne (i32.load offset=44 (local.get $src)) (i32.const 12)) (unreachable))
+      (if (i32.ne (i32.load offset=48 (local.get $src)) (i32.const 13)) (unreachable))
+      (if (i32.ne (i32.load offset=52 (local.get $src)) (i32.const 14)) (unreachable))
+      (if (i32.ne (i32.load offset=56 (local.get $src)) (i32.const 15)) (unreachable))
+      (if (i32.ne (i32.load offset=60 (local.get $src)) (i32.const 16)) (unreachable))
+      (if (i32.ne (i32.load offset=64 (local.get $src)) (i32.const 17)) (unreachable))
+      (if (i32.ne (i32.load offset=68 (local.get $src)) (i32.const 18)) (unreachable))
+      (if (i32.ne (i32.load offset=72 (local.get $src)) (i32.const 19)) (unreachable))
+      (if (i32.ne (i32.load offset=76 (local.get $src)) (i32.const 20)) (unreachable))
 
       (local.set $dst (i32.const 500))
 
@@ -186,16 +186,16 @@
         (local.set $retaddr (i32.const 200))
         (call $roundtrip (local.get $addr) (local.get $retaddr))
 
-        (if (i32.ne (i32.load offset=0 (local.get $retaddr)) (i32.const 21)) (then (unreachable)))
-        (if (i32.ne (i32.load offset=4 (local.get $retaddr)) (i32.const 22)) (then (unreachable)))
-        (if (i32.ne (i32.load offset=8 (local.get $retaddr)) (i32.const 23)) (then (unreachable)))
-        (if (i32.ne (i32.load offset=12 (local.get $retaddr)) (i32.const 24)) (then (unreachable)))
-        (if (i32.ne (i32.load offset=16 (local.get $retaddr)) (i32.const 25)) (then (unreachable)))
-        (if (i32.ne (i32.load offset=20 (local.get $retaddr)) (i32.const 26)) (then (unreachable)))
-        (if (i32.ne (i32.load offset=24 (local.get $retaddr)) (i32.const 27)) (then (unreachable)))
-        (if (i32.ne (i32.load offset=28 (local.get $retaddr)) (i32.const 28)) (then (unreachable)))
-        (if (i32.ne (i32.load offset=32 (local.get $retaddr)) (i32.const 29)) (then (unreachable)))
-        (if (i32.ne (i32.load offset=36 (local.get $retaddr)) (i32.const 30)) (then (unreachable)))
+        (if (i32.ne (i32.load offset=0 (local.get $retaddr)) (i32.const 21)) (unreachable))
+        (if (i32.ne (i32.load offset=4 (local.get $retaddr)) (i32.const 22)) (unreachable))
+        (if (i32.ne (i32.load offset=8 (local.get $retaddr)) (i32.const 23)) (unreachable))
+        (if (i32.ne (i32.load offset=12 (local.get $retaddr)) (i32.const 24)) (unreachable))
+        (if (i32.ne (i32.load offset=16 (local.get $retaddr)) (i32.const 25)) (unreachable))
+        (if (i32.ne (i32.load offset=20 (local.get $retaddr)) (i32.const 26)) (unreachable))
+        (if (i32.ne (i32.load offset=24 (local.get $retaddr)) (i32.const 27)) (unreachable))
+        (if (i32.ne (i32.load offset=28 (local.get $retaddr)) (i32.const 28)) (unreachable))
+        (if (i32.ne (i32.load offset=32 (local.get $retaddr)) (i32.const 29)) (unreachable))
+        (if (i32.ne (i32.load offset=36 (local.get $retaddr)) (i32.const 30)) (unreachable))
       )
 
       (func $store_many (param $amt i32) (param $addr i32)
@@ -205,7 +205,7 @@
           (i32.store (local.get $addr) (local.get $c))
           (local.set $addr (i32.add (local.get $addr) (i32.const 4)))
 
-          (if (i32.ne (local.get $amt) (local.get $c)) (then (br $loop)))
+          (if (i32.ne (local.get $amt) (local.get $c)) (br $loop))
         )
       )
       (start $start)
@@ -439,7 +439,7 @@
   (core module $m
     (func (export "foo") (result i32) i32.const 100)
     (func (export "foo-post") (param i32)
-      (if (i32.ne (local.get 0) (i32.const 100)) (then (unreachable))))
+      (if (i32.ne (local.get 0) (i32.const 100)) (unreachable)))
   )
   (core instance $m (instantiate $m))
   (func $foo (result u32)
@@ -452,7 +452,7 @@
     (core module $something
       (import "" "foo" (func $foo (result i32)))
       (func $start
-        (if (i32.ne (call $foo) (i32.const 100)) (then (unreachable))))
+        (if (i32.ne (call $foo) (i32.const 100)) (unreachable)))
       (start $start)
     )
     (core instance (instantiate $something
@@ -645,7 +645,7 @@
 
     (core module $m
       (func (export "r") (param i32) (result i32)
-        (if (i32.ne (local.get 0) (i32.const 0)) (then (unreachable)))
+        (if (i32.ne (local.get 0) (i32.const 0)) (unreachable))
         i32.const 0
       )
     )
@@ -763,10 +763,10 @@
   (component $c1
     (core module $m
       (func (export "u") (param i32)
-        (if (i32.ne (local.get 0) (i32.const 0)) (then (unreachable)))
+        (if (i32.ne (local.get 0) (i32.const 0)) (unreachable))
       )
       (func (export "s") (param i32)
-        (if (i32.ne (local.get 0) (i32.const -1)) (then (unreachable)))
+        (if (i32.ne (local.get 0) (i32.const -1)) (unreachable))
       )
     )
     (core instance $m (instantiate $m))
@@ -846,51 +846,51 @@
       (func (export "a") (param i32 i32 i32)
         (i32.eqz (local.get 0))
         if
-          (if (i32.ne (local.get 1) (i32.const 0)) (then (unreachable)))
-          (if (i32.ne (local.get 2) (i32.const 2)) (then (unreachable)))
+          (if (i32.ne (local.get 1) (i32.const 0)) (unreachable))
+          (if (i32.ne (local.get 2) (i32.const 2)) (unreachable))
         else
-          (if (i32.ne (local.get 1) (i32.const 1)) (then (unreachable)))
-          (if (f32.ne (f32.reinterpret_i32 (local.get 2)) (f32.const 3)) (then (unreachable)))
+          (if (i32.ne (local.get 1) (i32.const 1)) (unreachable))
+          (if (f32.ne (f32.reinterpret_i32 (local.get 2)) (f32.const 3)) (unreachable))
         end
       )
       (func (export "b") (param i32 i32 i64)
         (i32.eqz (local.get 0))
         if
-          (if (i32.ne (local.get 1) (i32.const 0)) (then (unreachable)))
-          (if (i64.ne (local.get 2) (i64.const 4)) (then (unreachable)))
+          (if (i32.ne (local.get 1) (i32.const 0)) (unreachable))
+          (if (i64.ne (local.get 2) (i64.const 4)) (unreachable))
         else
-          (if (i32.ne (local.get 1) (i32.const 1)) (then (unreachable)))
-          (if (i64.ne (local.get 2) (i64.const 5)) (then (unreachable)))
+          (if (i32.ne (local.get 1) (i32.const 1)) (unreachable))
+          (if (i64.ne (local.get 2) (i64.const 5)) (unreachable))
         end
       )
       (func (export "c") (param i32 i32 i64)
         (i32.eqz (local.get 0))
         if
-          (if (i32.ne (local.get 1) (i32.const 0)) (then (unreachable)))
-          (if (i64.ne (local.get 2) (i64.const 6)) (then (unreachable)))
+          (if (i32.ne (local.get 1) (i32.const 0)) (unreachable))
+          (if (i64.ne (local.get 2) (i64.const 6)) (unreachable))
         else
-          (if (i32.ne (local.get 1) (i32.const 1)) (then (unreachable)))
-          (if (f64.ne (f64.reinterpret_i64 (local.get 2)) (f64.const 7)) (then (unreachable)))
+          (if (i32.ne (local.get 1) (i32.const 1)) (unreachable))
+          (if (f64.ne (f64.reinterpret_i64 (local.get 2)) (f64.const 7)) (unreachable))
         end
       )
       (func (export "d") (param i32 i32 i64)
         (i32.eqz (local.get 0))
         if
-          (if (i32.ne (local.get 1) (i32.const 0)) (then (unreachable)))
-          (if (f32.ne (f32.reinterpret_i32 (i32.wrap_i64 (local.get 2))) (f32.const 8)) (then (unreachable)))
+          (if (i32.ne (local.get 1) (i32.const 0)) (unreachable))
+          (if (f32.ne (f32.reinterpret_i32 (i32.wrap_i64 (local.get 2))) (f32.const 8)) (unreachable))
         else
-          (if (i32.ne (local.get 1) (i32.const 1)) (then (unreachable)))
-          (if (f64.ne (f64.reinterpret_i64 (local.get 2)) (f64.const 9)) (then (unreachable)))
+          (if (i32.ne (local.get 1) (i32.const 1)) (unreachable))
+          (if (f64.ne (f64.reinterpret_i64 (local.get 2)) (f64.const 9)) (unreachable))
         end
       )
       (func (export "e") (param i32 i32 i64)
         (i32.eqz (local.get 0))
         if
-          (if (i32.ne (local.get 1) (i32.const 0)) (then (unreachable)))
-          (if (f32.ne (f32.reinterpret_i32 (i32.wrap_i64 (local.get 2))) (f32.const 10)) (then (unreachable)))
+          (if (i32.ne (local.get 1) (i32.const 0)) (unreachable))
+          (if (f32.ne (f32.reinterpret_i32 (i32.wrap_i64 (local.get 2))) (f32.const 10)) (unreachable))
         else
-          (if (i32.ne (local.get 1) (i32.const 1)) (then (unreachable)))
-          (if (i64.ne (local.get 2) (i64.const 11)) (then (unreachable)))
+          (if (i32.ne (local.get 1) (i32.const 1)) (unreachable))
+          (if (i64.ne (local.get 2) (i64.const 11)) (unreachable))
         end
       )
     )
@@ -987,39 +987,39 @@
     (core module $m
       (func (export "a") (param i32 i32 f32 i64 i32)
         (if (i32.eq (local.get 0) (i32.const 0))
-          (then (block
-            (if (i32.ne (local.get 1) (i32.const 0)) (then (unreachable)))
-            (if (f32.ne (local.get 2) (f32.const 0)) (then (unreachable)))
-            (if (i64.ne (local.get 3) (i64.const 0)) (then (unreachable)))
-            (if (i32.ne (local.get 4) (i32.const 0)) (then (unreachable)))
-          ))
+          (block
+            (if (i32.ne (local.get 1) (i32.const 0)) (unreachable))
+            (if (f32.ne (local.get 2) (f32.const 0)) (unreachable))
+            (if (i64.ne (local.get 3) (i64.const 0)) (unreachable))
+            (if (i32.ne (local.get 4) (i32.const 0)) (unreachable))
+          )
         )
         (if (i32.eq (local.get 0) (i32.const 1))
-          (then (block
-            (if (i32.ne (local.get 1) (i32.const 1)) (then (unreachable)))
-            (if (f32.ne (local.get 2) (f32.const 1)) (then (unreachable)))
-            (if (i64.ne (local.get 3) (i64.const 0)) (then (unreachable)))
-            (if (i32.ne (local.get 4) (i32.const 0)) (then (unreachable)))
-          ))
+          (block
+            (if (i32.ne (local.get 1) (i32.const 1)) (unreachable))
+            (if (f32.ne (local.get 2) (f32.const 1)) (unreachable))
+            (if (i64.ne (local.get 3) (i64.const 0)) (unreachable))
+            (if (i32.ne (local.get 4) (i32.const 0)) (unreachable))
+          )
         )
         (if (i32.eq (local.get 0) (i32.const 2))
-          (then (block
-            (if (i32.ne (local.get 1) (i32.const 2)) (then (unreachable)))
-            (if (f32.ne (local.get 2) (f32.const 2)) (then (unreachable)))
-            (if (i64.ne (local.get 3) (i64.const 2)) (then (unreachable)))
-            (if (i32.ne (local.get 4) (i32.const 0)) (then (unreachable)))
-          ))
+          (block
+            (if (i32.ne (local.get 1) (i32.const 2)) (unreachable))
+            (if (f32.ne (local.get 2) (f32.const 2)) (unreachable))
+            (if (i64.ne (local.get 3) (i64.const 2)) (unreachable))
+            (if (i32.ne (local.get 4) (i32.const 0)) (unreachable))
+          )
         )
         (if (i32.eq (local.get 0) (i32.const 3))
-          (then (block
-            (if (i32.ne (local.get 1) (i32.const 3)) (then (unreachable)))
-            (if (f32.ne (local.get 2) (f32.const 3)) (then (unreachable)))
-            (if (i64.ne (local.get 3) (i64.const 3)) (then (unreachable)))
-            (if (i32.ne (local.get 4) (i32.const 3)) (then (unreachable)))
-          ))
+          (block
+            (if (i32.ne (local.get 1) (i32.const 3)) (unreachable))
+            (if (f32.ne (local.get 2) (f32.const 3)) (unreachable))
+            (if (i64.ne (local.get 3) (i64.const 3)) (unreachable))
+            (if (i32.ne (local.get 4) (i32.const 3)) (unreachable))
+          )
         )
         (if (i32.gt_u (local.get 0) (i32.const 3))
-          (then (unreachable)))
+          (unreachable))
       )
     )
     (core instance $m (instantiate $m))
@@ -1263,35 +1263,35 @@
     (export $f65 "t-f65" (type $f65'))
     (core module $m
       (func (export "f1") (param i32)
-        (if (i32.ne (local.get 0) (i32.const 0x1)) (then (unreachable)))
+        (if (i32.ne (local.get 0) (i32.const 0x1)) (unreachable))
       )
       (func (export "f8") (param i32)
-        (if (i32.ne (local.get 0) (i32.const 0x11)) (then (unreachable)))
+        (if (i32.ne (local.get 0) (i32.const 0x11)) (unreachable))
       )
       (func (export "f9") (param i32)
-        (if (i32.ne (local.get 0) (i32.const 0x111)) (then (unreachable)))
+        (if (i32.ne (local.get 0) (i32.const 0x111)) (unreachable))
       )
       (func (export "f16") (param i32)
-        (if (i32.ne (local.get 0) (i32.const 0x1111)) (then (unreachable)))
+        (if (i32.ne (local.get 0) (i32.const 0x1111)) (unreachable))
       )
       (func (export "f17") (param i32)
-        (if (i32.ne (local.get 0) (i32.const 0x11111)) (then (unreachable)))
+        (if (i32.ne (local.get 0) (i32.const 0x11111)) (unreachable))
       )
       (func (export "f32") (param i32)
-        (if (i32.ne (local.get 0) (i32.const 0x11111111)) (then (unreachable)))
+        (if (i32.ne (local.get 0) (i32.const 0x11111111)) (unreachable))
       )
       (func (export "f33") (param i32 i32)
-        (if (i32.ne (local.get 0) (i32.const 0x11111111)) (then (unreachable)))
-        (if (i32.ne (local.get 1) (i32.const 0x1)) (then (unreachable)))
+        (if (i32.ne (local.get 0) (i32.const 0x11111111)) (unreachable))
+        (if (i32.ne (local.get 1) (i32.const 0x1)) (unreachable))
       )
       (func (export "f64") (param i32 i32)
-        (if (i32.ne (local.get 0) (i32.const 0x11111111)) (then (unreachable)))
-        (if (i32.ne (local.get 1) (i32.const 0x11111111)) (then (unreachable)))
+        (if (i32.ne (local.get 0) (i32.const 0x11111111)) (unreachable))
+        (if (i32.ne (local.get 1) (i32.const 0x11111111)) (unreachable))
       )
       (func (export "f65") (param i32 i32 i32)
-        (if (i32.ne (local.get 0) (i32.const 0x11111111)) (then (unreachable)))
-        (if (i32.ne (local.get 1) (i32.const 0x11111111)) (then (unreachable)))
-        (if (i32.ne (local.get 2) (i32.const 0x1)) (then (unreachable)))
+        (if (i32.ne (local.get 0) (i32.const 0x11111111)) (unreachable))
+        (if (i32.ne (local.get 1) (i32.const 0x11111111)) (unreachable))
+        (if (i32.ne (local.get 2) (i32.const 0x1)) (unreachable))
       )
     )
     (core instance $m (instantiate $m))
diff --git a/tests/misc_testsuite/component-model/resources.wast b/tests/misc_testsuite/component-model/resources.wast
index 89b97536aebc..decb9554e85e 100644
--- a/tests/misc_testsuite/component-model/resources.wast
+++ b/tests/misc_testsuite/component-model/resources.wast
@@ -14,8 +14,8 @@
        (local $r i32)
        (local.set $r (call $new (i32.const 100)))
 
-       (if (i32.ne (local.get $r) (i32.const 0)) (then (unreachable)))
-       (if (i32.ne (call $rep (local.get $r)) (i32.const 100)) (then (unreachable)))
+       (if (i32.ne (local.get $r) (i32.const 0)) (unreachable))
+       (if (i32.ne (call $rep (local.get $r)) (i32.const 100)) (unreachable))
 
        (call $drop (local.get $r))
      )
@@ -95,30 +95,30 @@
 
        ;; resources assigned sequentially
        (local.set $r1 (call $new (i32.const 100)))
-       (if (i32.ne (local.get $r1) (i32.const 0)) (then (unreachable)))
+       (if (i32.ne (local.get $r1) (i32.const 0)) (unreachable))
 
        (local.set $r2 (call $new (i32.const 200)))
-       (if (i32.ne (local.get $r2) (i32.const 1)) (then (unreachable)))
+       (if (i32.ne (local.get $r2) (i32.const 1)) (unreachable))
 
        (local.set $r3 (call $new (i32.const 300)))
-       (if (i32.ne (local.get $r3) (i32.const 2)) (then (unreachable)))
+       (if (i32.ne (local.get $r3) (i32.const 2)) (unreachable))
 
        ;; representations all look good
-       (if (i32.ne (call $rep (local.get $r1)) (i32.const 100)) (then (unreachable)))
-       (if (i32.ne (call $rep (local.get $r2)) (i32.const 200)) (then (unreachable)))
-       (if (i32.ne (call $rep (local.get $r3)) (i32.const 300)) (then (unreachable)))
+       (if (i32.ne (call $rep (local.get $r1)) (i32.const 100)) (unreachable))
+       (if (i32.ne (call $rep (local.get $r2)) (i32.const 200)) (unreachable))
+       (if (i32.ne (call $rep (local.get $r3)) (i32.const 300)) (unreachable))
 
        ;; reallocate r2
        (call $drop (local.get $r2))
        (local.set $r2 (call $new (i32.const 400)))
 
        ;; should have reused index 1
-       (if (i32.ne (local.get $r2) (i32.const 1)) (then (unreachable)))
+       (if (i32.ne (local.get $r2) (i32.const 1)) (unreachable))
 
        ;; representations all look good
-       (if (i32.ne (call $rep (local.get $r1)) (i32.const 100)) (then (unreachable)))
-       (if (i32.ne (call $rep (local.get $r2)) (i32.const 400)) (then (unreachable)))
-       (if (i32.ne (call $rep (local.get $r3)) (i32.const 300)) (then (unreachable)))
+       (if (i32.ne (call $rep (local.get $r1)) (i32.const 100)) (unreachable))
+       (if (i32.ne (call $rep (local.get $r2)) (i32.const 400)) (unreachable))
+       (if (i32.ne (call $rep (local.get $r3)) (i32.const 300)) (unreachable))
 
        ;; deallocate, then reallocate
        (call $drop (local.get $r1))
@@ -130,18 +130,18 @@
        (local.set $r3 (call $new (i32.const 700)))
 
        ;; representations all look good
-       (if (i32.ne (call $rep (local.get $r1)) (i32.const 500)) (then (unreachable)))
-       (if (i32.ne (call $rep (local.get $r2)) (i32.const 600)) (then (unreachable)))
-       (if (i32.ne (call $rep (local.get $r3)) (i32.const 700)) (then (unreachable)))
+       (if (i32.ne (call $rep (local.get $r1)) (i32.const 500)) (unreachable))
+       (if (i32.ne (call $rep (local.get $r2)) (i32.const 600)) (unreachable))
+       (if (i32.ne (call $rep (local.get $r3)) (i32.const 700)) (unreachable))
 
        ;; indices should be lifo
-       (if (i32.ne (local.get $r1) (i32.const 2)) (then (unreachable)))
-       (if (i32.ne (local.get $r2) (i32.const 1)) (then (unreachable)))
-       (if (i32.ne (local.get $r3) (i32.const 0)) (then (unreachable)))
+       (if (i32.ne (local.get $r1) (i32.const 2)) (unreachable))
+       (if (i32.ne (local.get $r2) (i32.const 1)) (unreachable))
+       (if (i32.ne (local.get $r3) (i32.const 0)) (unreachable))
 
        ;; bump one more time
        (local.set $r4 (call $new (i32.const 800)))
-       (if (i32.ne (local.get $r4) (i32.const 3)) (then (unreachable)))
+       (if (i32.ne (local.get $r4) (i32.const 3)) (unreachable))
 
        ;; deallocate everything
        (call $drop (local.get $r1))
@@ -241,13 +241,13 @@
        (local.set $r2 (call $ctor (i32.const 200)))
 
        ;; assert r1/r2 are sequential
-       (if (i32.ne (local.get $r1) (i32.const 0)) (then (unreachable)))
-       (if (i32.ne (local.get $r2) (i32.const 1)) (then (unreachable)))
+       (if (i32.ne (local.get $r1) (i32.const 0)) (unreachable))
+       (if (i32.ne (local.get $r2) (i32.const 1)) (unreachable))
 
        ;; reallocate r1 and it should be reassigned the same index
        (call $drop (local.get $r1))
        (local.set $r1 (call $ctor (i32.const 300)))
-       (if (i32.ne (local.get $r1) (i32.const 0)) (then (unreachable)))
+       (if (i32.ne (local.get $r1) (i32.const 0)) (unreachable))
 
        ;; internal values should match
        (call $assert (local.get $r1) (i32.const 300))
@@ -399,7 +399,7 @@
       (import "" "ctor" (func $ctor (param i32) (result i32)))
 
       (func $start
-        (if (i32.ne (call $ctor (i32.const 100)) (i32.const 0)) (then (unreachable)))
+        (if (i32.ne (call $ctor (i32.const 100)) (i32.const 0)) (unreachable))
       )
     )
     (core instance $i (instantiate $m
@@ -443,7 +443,7 @@
       (import "" "ctor" (func $ctor (param i32) (result i32)))
 
       (func $start
-        (if (i32.ne (call $ctor (i32.const 100)) (i32.const 0)) (then (unreachable)))
+        (if (i32.ne (call $ctor (i32.const 100)) (i32.const 0)) (unreachable))
       )
       (start $start)
     )
@@ -492,7 +492,7 @@
       (import "" "drop" (func $drop (param i32)))
 
       (func (export "alloc")
-        (if (i32.ne (call $ctor (i32.const 100)) (i32.const 0)) (then (unreachable)))
+        (if (i32.ne (call $ctor (i32.const 100)) (i32.const 0)) (unreachable))
       )
       (func (export "dealloc")
         (call $drop (i32.const 0))
@@ -552,7 +552,7 @@
       (import "" "drop" (func $drop (param i32)))
 
       (func (export "alloc")
-        (if (i32.ne (call $ctor (i32.const 100)) (i32.const 0)) (then (unreachable)))
+        (if (i32.ne (call $ctor (i32.const 100)) (i32.const 0)) (unreachable))
       )
       (func (export "dealloc")
         (call $drop (i32.const 0))
@@ -617,8 +617,8 @@
       (call $drop2 (call $new2 (i32.const 104)))
 
       ;; should be referencing the same namespace
-      (if (i32.ne (call $new1 (i32.const 105)) (i32.const 0)) (then (unreachable)))
-      (if (i32.ne (call $new2 (i32.const 105)) (i32.const 1)) (then (unreachable)))
+      (if (i32.ne (call $new1 (i32.const 105)) (i32.const 0)) (unreachable))
+      (if (i32.ne (call $new2 (i32.const 105)) (i32.const 1)) (unreachable))
 
       ;; use different drops out of order
       (call $drop2 (i32.const 0))
@@ -701,30 +701,30 @@
       (local.set $r2 (call $new2 (i32.const 200)))
 
       ;; both should be index 0
-      (if (i32.ne (local.get $r1) (i32.const 0)) (then (unreachable)))
-      (if (i32.ne (local.get $r2) (i32.const 0)) (then (unreachable)))
+      (if (i32.ne (local.get $r1) (i32.const 0)) (unreachable))
+      (if (i32.ne (local.get $r2) (i32.const 0)) (unreachable))
 
       ;; nothing should be dropped yet
-      (if (i32.ne (call $drops) (i32.const 0)) (then (unreachable)))
-      (if (i32.ne (call $last-drop) (i32.const -1)) (then (unreachable)))
+      (if (i32.ne (call $drops) (i32.const 0)) (unreachable))
+      (if (i32.ne (call $last-drop) (i32.const -1)) (unreachable))
 
       ;; dropping a resource without a destructor is ok, but shouldn't tamper
       ;; with anything.
       (call $drop1 (local.get $r1))
-      (if (i32.ne (call $drops) (i32.const 0)) (then (unreachable)))
-      (if (i32.ne (call $last-drop) (i32.const -1)) (then (unreachable)))
+      (if (i32.ne (call $drops) (i32.const 0)) (unreachable))
+      (if (i32.ne (call $last-drop) (i32.const -1)) (unreachable))
 
       ;; drop r2 which should record a drop and additionally record the private
       ;; representation value which was dropped
       (call $drop2 (local.get $r2))
-      (if (i32.ne (call $drops) (i32.const 1)) (then (unreachable)))
-      (if (i32.ne (call $last-drop) (i32.const 200)) (then (unreachable)))
+      (if (i32.ne (call $drops) (i32.const 1)) (unreachable))
+      (if (i32.ne (call $last-drop) (i32.const 200)) (unreachable))
 
       ;; do it all over again
       (local.set $r2 (call $new2 (i32.const 300)))
       (call $drop2 (local.get $r2))
-      (if (i32.ne (call $drops) (i32.const 2)) (then (unreachable)))
-      (if (i32.ne (call $last-drop) (i32.const 300)) (then (unreachable)))
+      (if (i32.ne (call $drops) (i32.const 2)) (unreachable))
+      (if (i32.ne (call $last-drop) (i32.const 300)) (unreachable))
     )
 
     (start $start)
@@ -779,18 +779,18 @@
       (local.set $r1 (call $ctor (i32.const 100)))
 
       ;; should be no drops yet
-      (if (i32.ne (call $drops) (i32.const 0)) (then (unreachable)))
+      (if (i32.ne (call $drops) (i32.const 0)) (unreachable))
 
       ;; should count a drop
       (call $drop (local.get $r1))
-      (if (i32.ne (call $drops) (i32.const 1)) (then (unreachable)))
-      (if (i32.ne (call $last-drop) (i32.const 100)) (then (unreachable)))
+      (if (i32.ne (call $drops) (i32.const 1)) (unreachable))
+      (if (i32.ne (call $last-drop) (i32.const 100)) (unreachable))
 
       ;; do it again to be sure
       (local.set $r1 (call $ctor (i32.const 200)))
       (call $drop (local.get $r1))
-      (if (i32.ne (call $drops) (i32.const 2)) (then (unreachable)))
-      (if (i32.ne (call $last-drop) (i32.const 200)) (then (unreachable)))
+      (if (i32.ne (call $drops) (i32.const 2)) (unreachable))
+      (if (i32.ne (call $last-drop) (i32.const 200)) (unreachable))
     )
 
     (start $start)
@@ -866,7 +866,7 @@
 
       ;; table should be empty at this point, so a fresh allocation should get
       ;; index 0
-      (if (i32.ne (call $ctor (i32.const 600)) (i32.const 0)) (then (unreachable)))
+      (if (i32.ne (call $ctor (i32.const 600)) (i32.const 0)) (unreachable))
     )
 
     (start $start)
@@ -971,10 +971,10 @@
       (import "" "rep" (func $rep (param i32) (result i32)))
 
       (func (export "[method]t.assert") (param i32 i32)
-        (if (i32.ne (local.get 0) (local.get 1)) (then (unreachable)))
+        (if (i32.ne (local.get 0) (local.get 1)) (unreachable))
       )
       (func (export "[static]t.assert-own") (param i32 i32)
-        (if (i32.ne (call $rep (local.get 0)) (local.get 1)) (then (unreachable)))
+        (if (i32.ne (call $rep (local.get 0)) (local.get 1)) (unreachable))
         (call $dtor (local.get 0))
       )
     )
@@ -1024,8 +1024,8 @@
         (local.set $r1 (call $ctor (i32.const 100)))
         (local.set $r2 (call $ctor (i32.const 200)))
 
-        (if (i32.ne (local.get $r1) (i32.const 0)) (then (unreachable)))
-        (if (i32.ne (local.get $r2) (i32.const 1)) (then (unreachable)))
+        (if (i32.ne (local.get $r1) (i32.const 0)) (unreachable))
+        (if (i32.ne (local.get $r2) (i32.const 1)) (unreachable))
 
         (call $assert-borrow (local.get $r2) (i32.const 200))
         (call $assert-borrow (local.get $r1) (i32.const 100))
diff --git a/tests/misc_testsuite/many_table_gets_lead_to_gc.wast b/tests/misc_testsuite/many_table_gets_lead_to_gc.wast
index d911eb3844e7..b0827dbdabbc 100644
--- a/tests/misc_testsuite/many_table_gets_lead_to_gc.wast
+++ b/tests/misc_testsuite/many_table_gets_lead_to_gc.wast
@@ -9,7 +9,7 @@
     (loop $continue
       ;; Exit when our loop counter `$i` reaches zero.
       (if (i32.eqz (local.get $i))
-        (then (return))
+        (return)
       )
 
       ;; Get an `externref` out of the table. This could cause the
diff --git a/tests/misc_testsuite/threads/LB.wast b/tests/misc_testsuite/threads/LB.wast
deleted file mode 100644
index b92eb4488030..000000000000
--- a/tests/misc_testsuite/threads/LB.wast
+++ /dev/null
@@ -1,62 +0,0 @@
-(module $Mem
-  (memory (export "shared") 1 1 shared)
-)
-
-(thread $T1 (shared (module $Mem))
-  (register "mem" $Mem)
-  (module
-    (memory (import "mem" "shared") 1 10 shared)
-    (func (export "run")
-      (local i32)
-      (i32.load (i32.const 4))
-      (local.set 0)
-      (i32.store (i32.const 0) (i32.const 1))
-
-      ;; store results for checking
-      (i32.store (i32.const 24) (local.get 0))
-    )
-  )
-  (invoke "run")
-)
-
-(thread $T2 (shared (module $Mem))
-  (register "mem" $Mem)
-  (module
-    (memory (import "mem" "shared") 1 1 shared)
-    (func (export "run")
-      (local i32)
-      (i32.load (i32.const 0))
-      (local.set 0)
-      (i32.store (i32.const 4) (i32.const 1))
-
-      ;; store results for checking
-      (i32.store (i32.const 32) (local.get 0))
-    )
-  )
-
-  (invoke "run")
-)
-
-(wait $T1)
-(wait $T2)
-
-(module $Check
-  (memory (import "Mem" "shared") 1 1 shared)
-
-  (func (export "check") (result i32)
-    (local i32 i32)
-    (i32.load (i32.const 24))
-    (local.set 0)
-    (i32.load (i32.const 32))
-    (local.set 1)
-
-    ;; allowed results: (L_0 = 0 || L_0 = 1) && (L_1 = 0 || L_1 = 1)
-
-    (i32.or (i32.eq (local.get 0) (i32.const 1)) (i32.eq (local.get 0) (i32.const 0)))
-    (i32.or (i32.eq (local.get 1) (i32.const 1)) (i32.eq (local.get 1) (i32.const 0)))
-    (i32.and)
-    (return)
-  )
-)
-
-(assert_return (invoke $Check "check") (i32.const 1))
diff --git a/tests/misc_testsuite/threads/LB_atomic.wast b/tests/misc_testsuite/threads/LB_atomic.wast
deleted file mode 100644
index c13f948a12be..000000000000
--- a/tests/misc_testsuite/threads/LB_atomic.wast
+++ /dev/null
@@ -1,64 +0,0 @@
-(module $Mem
-  (memory (export "shared") 1 1 shared)
-)
-
-(thread $T1 (shared (module $Mem))
-  (register "mem" $Mem)
-  (module
-    (memory (import "mem" "shared") 1 10 shared)
-    (func (export "run")
-      (local i32)
-      (i32.atomic.load (i32.const 4))
-      (local.set 0)
-      (i32.atomic.store (i32.const 0) (i32.const 1))
-
-      ;; store results for checking
-      (i32.store (i32.const 24) (local.get 0))
-    )
-  )
-  (invoke "run")
-)
-
-(thread $T2 (shared (module $Mem))
-  (register "mem" $Mem)
-  (module
-    (memory (import "mem" "shared") 1 1 shared)
-    (func (export "run")
-      (local i32)
-      (i32.atomic.load (i32.const 0))
-      (local.set 0)
-      (i32.atomic.store (i32.const 4) (i32.const 1))
-
-      ;; store results for checking
-      (i32.store (i32.const 32) (local.get 0))
-    )
-  )
-
-  (invoke "run")
-)
-
-(wait $T1)
-(wait $T2)
-
-(module $Check
-  (memory (import "Mem" "shared") 1 1 shared)
-
-  (func (export "check") (result i32)
-    (local i32 i32)
-    (i32.load (i32.const 24))
-    (local.set 0)
-    (i32.load (i32.const 32))
-    (local.set 1)
-
-    ;; allowed results: (L_0 = 0 && L_1 = 0) || (L_0 = 0 && L_1 = 1) || (L_0 = 1 && L_1 = 0)
-
-    (i32.and (i32.eq (local.get 0) (i32.const 0)) (i32.eq (local.get 1) (i32.const 0)))
-    (i32.and (i32.eq (local.get 0) (i32.const 0)) (i32.eq (local.get 1) (i32.const 1)))
-    (i32.and (i32.eq (local.get 0) (i32.const 1)) (i32.eq (local.get 1) (i32.const 0)))
-    (i32.or)
-    (i32.or)
-    (return)
-  )
-)
-
-(assert_return (invoke $Check "check") (i32.const 1))
diff --git a/tests/misc_testsuite/threads/MP.wast b/tests/misc_testsuite/threads/MP.wast
deleted file mode 100644
index 8ae62a4c2597..000000000000
--- a/tests/misc_testsuite/threads/MP.wast
+++ /dev/null
@@ -1,59 +0,0 @@
-(module $Mem
-  (memory (export "shared") 1 1 shared)
-)
-
-(thread $T1 (shared (module $Mem))
-  (register "mem" $Mem)
-  (module
-    (memory (import "mem" "shared") 1 10 shared)
-    (func (export "run")
-      (i32.store (i32.const 0) (i32.const 42))
-      (i32.store (i32.const 4) (i32.const 1))
-    )
-  )
-  (invoke "run")
-)
-
-(thread $T2 (shared (module $Mem))
-  (register "mem" $Mem)
-  (module
-    (memory (import "mem" "shared") 1 1 shared)
-    (func (export "run")
-      (local i32 i32)
-      (i32.load (i32.const 4))
-      (local.set 0)
-      (i32.load (i32.const 0))
-      (local.set 1)
-
-      ;; store results for checking
-      (i32.store (i32.const 24) (local.get 0))
-      (i32.store (i32.const 32) (local.get 1))
-    )
-  )
-
-  (invoke "run")
-)
-
-(wait $T1)
-(wait $T2)
-
-(module $Check
-  (memory (import "Mem" "shared") 1 1 shared)
-
-  (func (export "check") (result i32)
-    (local i32 i32)
-    (i32.load (i32.const 24))
-    (local.set 0)
-    (i32.load (i32.const 32))
-    (local.set 1)
-
-    ;; allowed results: (L_0 = 0 || L_0 = 1) && (L_1 = 0 || L_1 = 42)
-
-    (i32.or (i32.eq (local.get 0) (i32.const 1)) (i32.eq (local.get 0) (i32.const 0)))
-    (i32.or (i32.eq (local.get 1) (i32.const 42)) (i32.eq (local.get 1) (i32.const 0)))
-    (i32.and)
-    (return)
-  )
-)
-
-(assert_return (invoke $Check "check") (i32.const 1))
diff --git a/tests/misc_testsuite/threads/MP_atomic.wast b/tests/misc_testsuite/threads/MP_atomic.wast
deleted file mode 100644
index 1af863441b91..000000000000
--- a/tests/misc_testsuite/threads/MP_atomic.wast
+++ /dev/null
@@ -1,61 +0,0 @@
-(module $Mem
-  (memory (export "shared") 1 1 shared)
-)
-
-(thread $T1 (shared (module $Mem))
-  (register "mem" $Mem)
-  (module
-    (memory (import "mem" "shared") 1 10 shared)
-    (func (export "run")
-      (i32.atomic.store (i32.const 0) (i32.const 42))
-      (i32.atomic.store (i32.const 4) (i32.const 1))
-    )
-  )
-  (invoke "run")
-)
-
-(thread $T2 (shared (module $Mem))
-  (register "mem" $Mem)
-  (module
-    (memory (import "mem" "shared") 1 1 shared)
-    (func (export "run")
-      (local i32 i32)
-      (i32.atomic.load (i32.const 4))
-      (local.set 0)
-      (i32.atomic.load (i32.const 0))
-      (local.set 1)
-
-      ;; store results for checking
-      (i32.store (i32.const 24) (local.get 0))
-      (i32.store (i32.const 32) (local.get 1))
-    )
-  )
-
-  (invoke "run")
-)
-
-(wait $T1)
-(wait $T2)
-
-(module $Check
-  (memory (import "Mem" "shared") 1 1 shared)
-
-  (func (export "check") (result i32)
-    (local i32 i32)
-    (i32.load (i32.const 24))
-    (local.set 0)
-    (i32.load (i32.const 32))
-    (local.set 1)
-
-    ;; allowed results: (L_0 = 1 && L_1 = 42) || (L_0 = 0 && L_1 = 0) || (L_0 = 0 && L_1 = 42)
-
-    (i32.and (i32.eq (local.get 0) (i32.const 1)) (i32.eq (local.get 1) (i32.const 42)))
-    (i32.and (i32.eq (local.get 0) (i32.const 0)) (i32.eq (local.get 1) (i32.const 0)))
-    (i32.and (i32.eq (local.get 0) (i32.const 0)) (i32.eq (local.get 1) (i32.const 42)))
-    (i32.or)
-    (i32.or)
-    (return)
-  )
-)
-
-(assert_return (invoke $Check "check") (i32.const 1))
diff --git a/tests/misc_testsuite/threads/MP_wait.wast b/tests/misc_testsuite/threads/MP_wait.wast
deleted file mode 100644
index 1af863441b91..000000000000
--- a/tests/misc_testsuite/threads/MP_wait.wast
+++ /dev/null
@@ -1,61 +0,0 @@
-(module $Mem
-  (memory (export "shared") 1 1 shared)
-)
-
-(thread $T1 (shared (module $Mem))
-  (register "mem" $Mem)
-  (module
-    (memory (import "mem" "shared") 1 10 shared)
-    (func (export "run")
-      (i32.atomic.store (i32.const 0) (i32.const 42))
-      (i32.atomic.store (i32.const 4) (i32.const 1))
-    )
-  )
-  (invoke "run")
-)
-
-(thread $T2 (shared (module $Mem))
-  (register "mem" $Mem)
-  (module
-    (memory (import "mem" "shared") 1 1 shared)
-    (func (export "run")
-      (local i32 i32)
-      (i32.atomic.load (i32.const 4))
-      (local.set 0)
-      (i32.atomic.load (i32.const 0))
-      (local.set 1)
-
-      ;; store results for checking
-      (i32.store (i32.const 24) (local.get 0))
-      (i32.store (i32.const 32) (local.get 1))
-    )
-  )
-
-  (invoke "run")
-)
-
-(wait $T1)
-(wait $T2)
-
-(module $Check
-  (memory (import "Mem" "shared") 1 1 shared)
-
-  (func (export "check") (result i32)
-    (local i32 i32)
-    (i32.load (i32.const 24))
-    (local.set 0)
-    (i32.load (i32.const 32))
-    (local.set 1)
-
-    ;; allowed results: (L_0 = 1 && L_1 = 42) || (L_0 = 0 && L_1 = 0) || (L_0 = 0 && L_1 = 42)
-
-    (i32.and (i32.eq (local.get 0) (i32.const 1)) (i32.eq (local.get 1) (i32.const 42)))
-    (i32.and (i32.eq (local.get 0) (i32.const 0)) (i32.eq (local.get 1) (i32.const 0)))
-    (i32.and (i32.eq (local.get 0) (i32.const 0)) (i32.eq (local.get 1) (i32.const 42)))
-    (i32.or)
-    (i32.or)
-    (return)
-  )
-)
-
-(assert_return (invoke $Check "check") (i32.const 1))
diff --git a/tests/misc_testsuite/threads/SB.wast b/tests/misc_testsuite/threads/SB.wast
deleted file mode 100644
index f94abab035d8..000000000000
--- a/tests/misc_testsuite/threads/SB.wast
+++ /dev/null
@@ -1,62 +0,0 @@
-(module $Mem
-  (memory (export "shared") 1 1 shared)
-)
-
-(thread $T1 (shared (module $Mem))
-  (register "mem" $Mem)
-  (module
-    (memory (import "mem" "shared") 1 10 shared)
-    (func (export "run")
-      (local i32)
-      (i32.store (i32.const 0) (i32.const 1))
-      (i32.load (i32.const 4))
-      (local.set 0)
-
-      ;; store results for checking
-      (i32.store (i32.const 24) (local.get 0))
-    )
-  )
-  (invoke "run")
-)
-
-(thread $T2 (shared (module $Mem))
-  (register "mem" $Mem)
-  (module
-    (memory (import "mem" "shared") 1 1 shared)
-    (func (export "run")
-      (local i32)
-      (i32.store (i32.const 4) (i32.const 1))
-      (i32.load (i32.const 0))
-      (local.set 0)
-
-      ;; store results for checking
-      (i32.store (i32.const 32) (local.get 0))
-    )
-  )
-
-  (invoke "run")
-)
-
-(wait $T1)
-(wait $T2)
-
-(module $Check
-  (memory (import "Mem" "shared") 1 1 shared)
-
-  (func (export "check") (result i32)
-    (local i32 i32)
-    (i32.load (i32.const 24))
-    (local.set 0)
-    (i32.load (i32.const 32))
-    (local.set 1)
-
-    ;; allowed results: (L_0 = 0 || L_0 = 1) && (L_1 = 0 || L_1 = 1)
-
-    (i32.or (i32.eq (local.get 0) (i32.const 1)) (i32.eq (local.get 0) (i32.const 0)))
-    (i32.or (i32.eq (local.get 1) (i32.const 1)) (i32.eq (local.get 1) (i32.const 0)))
-    (i32.and)
-    (return)
-  )
-)
-
-(assert_return (invoke $Check "check") (i32.const 1))
diff --git a/tests/misc_testsuite/threads/SB_atomic.wast b/tests/misc_testsuite/threads/SB_atomic.wast
deleted file mode 100644
index 3cedaed55db5..000000000000
--- a/tests/misc_testsuite/threads/SB_atomic.wast
+++ /dev/null
@@ -1,64 +0,0 @@
-(module $Mem
-  (memory (export "shared") 1 1 shared)
-)
-
-(thread $T1 (shared (module $Mem))
-  (register "mem" $Mem)
-  (module
-    (memory (import "mem" "shared") 1 10 shared)
-    (func (export "run")
-      (local i32)
-      (i32.atomic.store (i32.const 0) (i32.const 1))
-      (i32.atomic.load (i32.const 4))
-      (local.set 0)
-
-      ;; store results for checking
-      (i32.store (i32.const 24) (local.get 0))
-    )
-  )
-  (invoke "run")
-)
-
-(thread $T2 (shared (module $Mem))
-  (register "mem" $Mem)
-  (module
-    (memory (import "mem" "shared") 1 1 shared)
-    (func (export "run")
-      (local i32)
-      (i32.atomic.store (i32.const 4) (i32.const 1))
-      (i32.atomic.load (i32.const 0))
-      (local.set 0)
-
-      ;; store results for checking
-      (i32.store (i32.const 32) (local.get 0))
-    )
-  )
-
-  (invoke "run")
-)
-
-(wait $T1)
-(wait $T2)
-
-(module $Check
-  (memory (import "Mem" "shared") 1 1 shared)
-
-  (func (export "check") (result i32)
-    (local i32 i32)
-    (i32.load (i32.const 24))
-    (local.set 0)
-    (i32.load (i32.const 32))
-    (local.set 1)
-
-    ;; allowed results: (L_0 = 1 && L_1 = 1) || (L_0 = 0 && L_1 = 1) || (L_0 = 1 && L_1 = 0)
-
-    (i32.and (i32.eq (local.get 0) (i32.const 1)) (i32.eq (local.get 1) (i32.const 1)))
-    (i32.and (i32.eq (local.get 0) (i32.const 0)) (i32.eq (local.get 1) (i32.const 1)))
-    (i32.and (i32.eq (local.get 0) (i32.const 1)) (i32.eq (local.get 1) (i32.const 0)))
-    (i32.or)
-    (i32.or)
-    (return)
-  )
-)
-
-(assert_return (invoke $Check "check") (i32.const 1))
diff --git a/tests/misc_testsuite/threads/wait_notify.wast b/tests/misc_testsuite/threads/wait_notify.wast
deleted file mode 100644
index 270509a92dae..000000000000
--- a/tests/misc_testsuite/threads/wait_notify.wast
+++ /dev/null
@@ -1,41 +0,0 @@
-;; test that looping notify eventually unblocks a parallel waiting thread
-(module $Mem
-  (memory (export "shared") 1 1 shared)
-)
-
-(thread $T1 (shared (module $Mem))
-  (register "mem" $Mem)
-  (module
-    (memory (import "mem" "shared") 1 10 shared)
-    (func (export "run") (result i32)
-      (memory.atomic.wait32 (i32.const 0) (i32.const 0) (i64.const -1))
-    )
-  )
-  ;; test that this thread eventually gets unblocked
-  (assert_return (invoke "run") (i32.const 0))
-)
-
-(thread $T2 (shared (module $Mem))
-  (register "mem" $Mem)
-  (module
-    (memory (import "mem" "shared") 1 1 shared)
-    (func (export "notify-0") (result i32)
-      (memory.atomic.notify (i32.const 0) (i32.const 0))
-    )
-    (func (export "notify-1-while")
-      (loop
-        (i32.const 1)
-        (memory.atomic.notify (i32.const 0) (i32.const 1))
-        (i32.ne)
-        (br_if 0)
-      )
-    )
-  )
-  ;; notifying with a count of 0 will not unblock
-  (assert_return (invoke "notify-0") (i32.const 0))
-  ;; loop until something is notified
-  (assert_return (invoke "notify-1-while"))
-)
-
-(wait $T1)
-(wait $T2)
diff --git a/tests/misc_testsuite/winch/call_indirect.wast b/tests/misc_testsuite/winch/call_indirect.wast
deleted file mode 100644
index a432415aa6c6..000000000000
--- a/tests/misc_testsuite/winch/call_indirect.wast
+++ /dev/null
@@ -1,413 +0,0 @@
-;; Test `call_indirect` operator
-
-(module
-  ;; Auxiliary definitions
-  (type $proc (func))
-  (type $out-i32 (func (result i32)))
-  (type $out-i64 (func (result i64)))
-  (type $out-f32 (func (result f32)))
-  (type $out-f64 (func (result f64)))
-  (type $over-i32 (func (param i32) (result i32)))
-  (type $over-i64 (func (param i64) (result i64)))
-  (type $over-f32 (func (param f32) (result f32)))
-  (type $over-f64 (func (param f64) (result f64)))
-  (type $f32-i32 (func (param f32 i32) (result i32)))
-  (type $i32-i64 (func (param i32 i64) (result i64)))
-  (type $f64-f32 (func (param f64 f32) (result f32)))
-  (type $i64-f64 (func (param i64 f64) (result f64)))
-  (type $over-i32-duplicate (func (param i32) (result i32)))
-  (type $over-i64-duplicate (func (param i64) (result i64)))
-  (type $over-f32-duplicate (func (param f32) (result f32)))
-  (type $over-f64-duplicate (func (param f64) (result f64)))
-
-  (func $const-i32 (type $out-i32) (i32.const 0x132))
-  (func $const-i64 (type $out-i64) (i64.const 0x164))
-  (func $const-f32 (type $out-f32) (f32.const 0xf32))
-  (func $const-f64 (type $out-f64) (f64.const 0xf64))
-
-  (func $id-i32 (type $over-i32) (local.get 0))
-  (func $id-i64 (type $over-i64) (local.get 0))
-  (func $id-f32 (type $over-f32) (local.get 0))
-  (func $id-f64 (type $over-f64) (local.get 0))
-
-  (func $i32-i64 (type $i32-i64) (local.get 1))
-  (func $i64-f64 (type $i64-f64) (local.get 1))
-  (func $f32-i32 (type $f32-i32) (local.get 1))
-  (func $f64-f32 (type $f64-f32) (local.get 1))
-
-  (func $over-i32-duplicate (type $over-i32-duplicate) (local.get 0))
-  (func $over-i64-duplicate (type $over-i64-duplicate) (local.get 0))
-  (func $over-f32-duplicate (type $over-f32-duplicate) (local.get 0))
-  (func $over-f64-duplicate (type $over-f64-duplicate) (local.get 0))
-
-  (table funcref
-    (elem
-      $const-i32 $const-i64 $const-f32 $const-f64  ;; 0..3
-      $id-i32 $id-i64 $id-f32 $id-f64              ;; 4..7
-      $f32-i32 $i32-i64 $f64-f32 $i64-f64          ;; 8..11
-      $fac-i64 $fib-i64 $even $odd                 ;; 12..15
-      $over-i32-duplicate $over-i64-duplicate      ;; 16..17
-      $over-f32-duplicate $over-f64-duplicate      ;; 18..19
-      $fac-i32 $fib-i32                            ;; 20..21
-    )
-  )
-
-  ;; Typing
-
-  (func (export "type-i32") (result i32)
-    (call_indirect (type $out-i32) (i32.const 0))
-  )
-  (func (export "type-i64") (result i64)
-    (call_indirect (type $out-i64) (i32.const 1))
-  )
-  (func (export "type-f32") (result f32)
-    (call_indirect (type $out-f32) (i32.const 2))
-  )
-  (func (export "type-f64") (result f64)
-    (call_indirect (type $out-f64) (i32.const 3))
-  )
-
-  (func (export "type-index") (result i64)
-    (call_indirect (type $over-i64) (i64.const 100) (i32.const 5))
-  )
-
-  (func (export "type-first-i32") (result i32)
-    (call_indirect (type $over-i32) (i32.const 32) (i32.const 4))
-  )
-  (func (export "type-first-i64") (result i64)
-    (call_indirect (type $over-i64) (i64.const 64) (i32.const 5))
-  )
-  (func (export "type-first-f32") (result f32)
-    (call_indirect (type $over-f32) (f32.const 1.32) (i32.const 6))
-  )
-  (func (export "type-first-f64") (result f64)
-    (call_indirect (type $over-f64) (f64.const 1.64) (i32.const 7))
-  )
-
-  (func (export "type-second-i32") (result i32)
-    (call_indirect (type $f32-i32) (f32.const 32.1) (i32.const 32) (i32.const 8))
-  )
-  (func (export "type-second-i64") (result i64)
-    (call_indirect (type $i32-i64) (i32.const 32) (i64.const 64) (i32.const 9))
-  )
-  (func (export "type-second-f32") (result f32)
-    (call_indirect (type $f64-f32) (f64.const 64) (f32.const 32) (i32.const 10))
-  )
-  (func (export "type-second-f64") (result f64)
-    (call_indirect (type $i64-f64) (i64.const 64) (f64.const 64.1) (i32.const 11))
-  )
-
-  ;; Dispatch
-
-  (func (export "dispatch") (param i32 i64) (result i64)
-    (call_indirect (type $over-i64) (local.get 1) (local.get 0))
-  )
-
-  (func (export "dispatch-structural-i64") (param i32) (result i64)
-    (call_indirect (type $over-i64-duplicate) (i64.const 9) (local.get 0))
-  )
-  (func (export "dispatch-structural-i32") (param i32) (result i32)
-    (call_indirect (type $over-i32-duplicate) (i32.const 9) (local.get 0))
-  )
-  (func (export "dispatch-structural-f32") (param i32) (result f32)
-    (call_indirect (type $over-f32-duplicate) (f32.const 9.0) (local.get 0))
-  )
-  (func (export "dispatch-structural-f64") (param i32) (result f64)
-    (call_indirect (type $over-f64-duplicate) (f64.const 9.0) (local.get 0))
-  )
-
-  ;; Recursion
-
-  (func $fac-i64 (export "fac-i64") (type $over-i64)
-    (if (result i64) (i64.eqz (local.get 0))
-      (then (i64.const 1))
-      (else
-        (i64.mul
-          (local.get 0)
-          (call_indirect (type $over-i64)
-            (i64.sub (local.get 0) (i64.const 1))
-            (i32.const 12)
-          )
-        )
-      )
-    )
-  )
-
-  (func $fib-i64 (export "fib-i64") (type $over-i64)
-    (if (result i64) (i64.le_u (local.get 0) (i64.const 1))
-      (then (i64.const 1))
-      (else
-        (i64.add
-          (call_indirect (type $over-i64)
-            (i64.sub (local.get 0) (i64.const 2))
-            (i32.const 13)
-          )
-          (call_indirect (type $over-i64)
-            (i64.sub (local.get 0) (i64.const 1))
-            (i32.const 13)
-          )
-        )
-      )
-    )
-  )
-
-  (func $fac-i32 (export "fac-i32") (type $over-i32)
-    (if (result i32) (i32.eqz (local.get 0))
-      (then (i32.const 1))
-      (else
-        (i32.mul
-          (local.get 0)
-          (call_indirect (type $over-i32)
-            (i32.sub (local.get 0) (i32.const 1))
-            (i32.const 20)
-          )
-        )
-      )
-    )
-  )
-
-  (func $fib-i32 (export "fib-i32") (type $over-i32)
-    (if (result i32) (i32.le_u (local.get 0) (i32.const 1))
-      (then (i32.const 1))
-      (else
-        (i32.add
-          (call_indirect (type $over-i32)
-            (i32.sub (local.get 0) (i32.const 2))
-            (i32.const 21)
-          )
-          (call_indirect (type $over-i32)
-            (i32.sub (local.get 0) (i32.const 1))
-            (i32.const 21)
-          )
-        )
-      )
-    )
-  )
-
-  (func $even (export "even") (param i32) (result i32)
-    (if (result i32) (i32.eqz (local.get 0))
-      (then (i32.const 44))
-      (else
-        (call_indirect (type $over-i32)
-          (i32.sub (local.get 0) (i32.const 1))
-          (i32.const 15)
-        )
-      )
-    )
-  )
-  (func $odd (export "odd") (param i32) (result i32)
-    (if (result i32) (i32.eqz (local.get 0))
-      (then (i32.const 99))
-      (else
-        (call_indirect (type $over-i32)
-          (i32.sub (local.get 0) (i32.const 1))
-          (i32.const 14)
-        )
-      )
-    )
-  )
-
-  ;; As parameter of control constructs and instructions
-
-  (memory 1)
-
-  (func (export "as-select-first") (result i32)
-    (select (call_indirect (type $out-i32) (i32.const 0)) (i32.const 2) (i32.const 3))
-  )
-  (func (export "as-select-mid") (result i32)
-    (select (i32.const 2) (call_indirect (type $out-i32) (i32.const 0)) (i32.const 3))
-  )
-  (func (export "as-select-last") (result i32)
-    (select (i32.const 2) (i32.const 3) (call_indirect (type $out-i32) (i32.const 0)))
-  )
-
-  (func (export "as-if-condition") (result i32)
-    (if (result i32) (call_indirect (type $out-i32) (i32.const 0)) (then (i32.const 1)) (else (i32.const 2)))
-  )
-
-  (func (export "as-br_if-first") (result i64)
-    (block (result i64) (br_if 0 (call_indirect (type $out-i64) (i32.const 1)) (i32.const 2)))
-  )
-  (func (export "as-br_if-last") (result i32)
-    (block (result i32) (br_if 0 (i32.const 2) (call_indirect (type $out-i32) (i32.const 0))))
-  )
-
-  (func (export "as-br_table-first") (result f32)
-    (block (result f32) (call_indirect (type $out-f32) (i32.const 2)) (i32.const 2) (br_table 0 0))
-  )
-  (func (export "as-br_table-last") (result i32)
-    (block (result i32) (i32.const 2) (call_indirect (type $out-i32) (i32.const 0)) (br_table 0 0))
-  )
-
-  (func (export "as-return-value") (result i32)
-    (call_indirect (type $over-i32) (i32.const 1) (i32.const 4)) (return)
-  )
-  (func (export "as-drop-operand")
-    (call_indirect (type $over-i64) (i64.const 1) (i32.const 5)) (drop)
-  )
-  (func (export "as-br-value") (result f32)
-    (block (result f32) (br 0 (call_indirect (type $over-f32) (f32.const 1) (i32.const 6))))
-  )
-  (func (export "as-local.set-value") (result f64)
-    (local f64) (local.set 0 (call_indirect (type $over-f64) (f64.const 1) (i32.const 7))) (local.get 0)
-  )
-  (func (export "as-local.tee-value") (result f64)
-    (local f64) (local.tee 0 (call_indirect (type $over-f64) (f64.const 1) (i32.const 7)))
-  )
-  (global $a (mut f64) (f64.const 10.0))
-  (func (export "as-global.set-value") (result f64)
-    (global.set $a (call_indirect (type $over-f64) (f64.const 1.0) (i32.const 7)))
-    (global.get $a)
-  )
-
-  (func (export "as-binary-left") (result i32)
-    (block (result i32)
-      (i32.add
-        (call_indirect (type $over-i32) (i32.const 1) (i32.const 4))
-        (i32.const 10)
-      )
-    )
-  )
-  (func (export "as-binary-right") (result i32)
-    (block (result i32)
-      (i32.sub
-        (i32.const 10)
-        (call_indirect (type $over-i32) (i32.const 1) (i32.const 4))
-      )
-    )
-  )
-
-  (func (export "as-test-operand") (result i32)
-    (block (result i32)
-      (i32.eqz
-        (call_indirect (type $over-i32) (i32.const 1) (i32.const 4))
-      )
-    )
-  )
-
-  (func (export "as-compare-left") (result i32)
-    (block (result i32)
-      (i32.le_u
-        (call_indirect (type $over-i32) (i32.const 1) (i32.const 4))
-        (i32.const 10)
-      )
-    )
-  )
-  (func (export "as-compare-right") (result i32)
-    (block (result i32)
-      (i32.ne
-        (i32.const 10)
-        (call_indirect (type $over-i32) (i32.const 1) (i32.const 4))
-      )
-    )
-  )
-)
-
-(assert_return (invoke "type-i32") (i32.const 0x132))
-(assert_return (invoke "type-i64") (i64.const 0x164))
-(assert_return (invoke "type-f32") (f32.const 0xf32))
-(assert_return (invoke "type-f64") (f64.const 0xf64))
-
-(assert_return (invoke "type-index") (i64.const 100))
-
-(assert_return (invoke "type-first-i32") (i32.const 32))
-(assert_return (invoke "type-first-i64") (i64.const 64))
-(assert_return (invoke "type-first-f32") (f32.const 1.32))
-(assert_return (invoke "type-first-f64") (f64.const 1.64))
-
-(assert_return (invoke "type-second-i32") (i32.const 32))
-(assert_return (invoke "type-second-i64") (i64.const 64))
-(assert_return (invoke "type-second-f32") (f32.const 32))
-(assert_return (invoke "type-second-f64") (f64.const 64.1))
-
-(assert_return (invoke "dispatch" (i32.const 5) (i64.const 2)) (i64.const 2))
-(assert_return (invoke "dispatch" (i32.const 5) (i64.const 5)) (i64.const 5))
-(assert_return (invoke "dispatch" (i32.const 12) (i64.const 5)) (i64.const 120))
-(assert_return (invoke "dispatch" (i32.const 13) (i64.const 5)) (i64.const 8))
-(assert_return (invoke "dispatch" (i32.const 17) (i64.const 2)) (i64.const 2))
-(assert_trap (invoke "dispatch" (i32.const 0) (i64.const 2)) "indirect call type mismatch")
-(assert_trap (invoke "dispatch" (i32.const 15) (i64.const 2)) "indirect call type mismatch")
-(assert_trap (invoke "dispatch" (i32.const 32) (i64.const 2)) "undefined element")
-(assert_trap (invoke "dispatch" (i32.const -1) (i64.const 2)) "undefined element")
-(assert_trap (invoke "dispatch" (i32.const 1213432423) (i64.const 2)) "undefined element")
-
-(assert_return (invoke "dispatch-structural-i64" (i32.const 5)) (i64.const 9))
-(assert_return (invoke "dispatch-structural-i64" (i32.const 12)) (i64.const 362880))
-(assert_return (invoke "dispatch-structural-i64" (i32.const 13)) (i64.const 55))
-(assert_return (invoke "dispatch-structural-i64" (i32.const 17)) (i64.const 9))
-(assert_trap (invoke "dispatch-structural-i64" (i32.const 11)) "indirect call type mismatch")
-(assert_trap (invoke "dispatch-structural-i64" (i32.const 19)) "indirect call type mismatch")
-
-(assert_return (invoke "dispatch-structural-i32" (i32.const 4)) (i32.const 9))
-(assert_return (invoke "dispatch-structural-i32" (i32.const 20)) (i32.const 362880))
-(assert_return (invoke "dispatch-structural-i32" (i32.const 21)) (i32.const 55))
-(assert_return (invoke "dispatch-structural-i32" (i32.const 16)) (i32.const 9))
-(assert_trap (invoke "dispatch-structural-i32" (i32.const 8)) "indirect call type mismatch")
-(assert_trap (invoke "dispatch-structural-i32" (i32.const 18)) "indirect call type mismatch")
-
-(assert_return (invoke "dispatch-structural-f32" (i32.const 6)) (f32.const 9.0))
-(assert_return (invoke "dispatch-structural-f32" (i32.const 18)) (f32.const 9.0))
-(assert_trap (invoke "dispatch-structural-f32" (i32.const 8)) "indirect call type mismatch")
-(assert_trap (invoke "dispatch-structural-f32" (i32.const 19)) "indirect call type mismatch")
-
-(assert_return (invoke "dispatch-structural-f64" (i32.const 7)) (f64.const 9.0))
-(assert_return (invoke "dispatch-structural-f64" (i32.const 19)) (f64.const 9.0))
-(assert_trap (invoke "dispatch-structural-f64" (i32.const 10)) "indirect call type mismatch")
-(assert_trap (invoke "dispatch-structural-f64" (i32.const 18)) "indirect call type mismatch")
-
-(assert_return (invoke "fac-i64" (i64.const 0)) (i64.const 1))
-(assert_return (invoke "fac-i64" (i64.const 1)) (i64.const 1))
-(assert_return (invoke "fac-i64" (i64.const 5)) (i64.const 120))
-(assert_return (invoke "fac-i64" (i64.const 25)) (i64.const 7034535277573963776))
-
-(assert_return (invoke "fac-i32" (i32.const 0)) (i32.const 1))
-(assert_return (invoke "fac-i32" (i32.const 1)) (i32.const 1))
-(assert_return (invoke "fac-i32" (i32.const 5)) (i32.const 120))
-(assert_return (invoke "fac-i32" (i32.const 10)) (i32.const 3628800))
-
-(assert_return (invoke "fib-i64" (i64.const 0)) (i64.const 1))
-(assert_return (invoke "fib-i64" (i64.const 1)) (i64.const 1))
-(assert_return (invoke "fib-i64" (i64.const 2)) (i64.const 2))
-(assert_return (invoke "fib-i64" (i64.const 5)) (i64.const 8))
-(assert_return (invoke "fib-i64" (i64.const 20)) (i64.const 10946))
-
-(assert_return (invoke "fib-i32" (i32.const 0)) (i32.const 1))
-(assert_return (invoke "fib-i32" (i32.const 1)) (i32.const 1))
-(assert_return (invoke "fib-i32" (i32.const 2)) (i32.const 2))
-(assert_return (invoke "fib-i32" (i32.const 5)) (i32.const 8))
-(assert_return (invoke "fib-i32" (i32.const 20)) (i32.const 10946))
-
-(assert_return (invoke "even" (i32.const 0)) (i32.const 44))
-(assert_return (invoke "even" (i32.const 1)) (i32.const 99))
-(assert_return (invoke "even" (i32.const 100)) (i32.const 44))
-(assert_return (invoke "even" (i32.const 77)) (i32.const 99))
-(assert_return (invoke "odd" (i32.const 0)) (i32.const 99))
-(assert_return (invoke "odd" (i32.const 1)) (i32.const 44))
-(assert_return (invoke "odd" (i32.const 200)) (i32.const 99))
-(assert_return (invoke "odd" (i32.const 77)) (i32.const 44))
-
-(assert_return (invoke "as-select-first") (i32.const 0x132))
-(assert_return (invoke "as-select-mid") (i32.const 2))
-(assert_return (invoke "as-select-last") (i32.const 2))
-
-(assert_return (invoke "as-if-condition") (i32.const 1))
-
-(assert_return (invoke "as-br_if-first") (i64.const 0x164))
-(assert_return (invoke "as-br_if-last") (i32.const 2))
-
-(assert_return (invoke "as-br_table-first") (f32.const 0xf32))
-(assert_return (invoke "as-br_table-last") (i32.const 2))
-
-(assert_return (invoke "as-return-value") (i32.const 1))
-(assert_return (invoke "as-drop-operand"))
-(assert_return (invoke "as-br-value") (f32.const 1))
-(assert_return (invoke "as-local.set-value") (f64.const 1))
-(assert_return (invoke "as-local.tee-value") (f64.const 1))
-(assert_return (invoke "as-global.set-value") (f64.const 1.0))
-
-(assert_return (invoke "as-binary-left") (i32.const 11))
-(assert_return (invoke "as-binary-right") (i32.const 9))
-(assert_return (invoke "as-test-operand") (i32.const 0))
-(assert_return (invoke "as-compare-left") (i32.const 1))
-(assert_return (invoke "as-compare-right") (i32.const 1))
-
diff --git a/tests/misc_testsuite/winch/f32.wast b/tests/misc_testsuite/winch/f32.wast
index ea5ad759ce7c..5d8497461f4f 100644
--- a/tests/misc_testsuite/winch/f32.wast
+++ b/tests/misc_testsuite/winch/f32.wast
@@ -306,2439 +306,12 @@
 
 
 (module
-  (func (export "add") (param $x f32) (param $y f32) (result f32) (f32.add (local.get $x) (local.get $y)))
-  (func (export "sub") (param $x f32) (param $y f32) (result f32) (f32.sub (local.get $x) (local.get $y)))
-  (func (export "mul") (param $x f32) (param $y f32) (result f32) (f32.mul (local.get $x) (local.get $y)))
-  (func (export "div") (param $x f32) (param $y f32) (result f32) (f32.div (local.get $x) (local.get $y)))
-  (func (export "sqrt") (param $x f32) (result f32) (f32.sqrt (local.get $x)))
-  (func (export "min") (param $x f32) (param $y f32) (result f32) (f32.min (local.get $x) (local.get $y)))
-  (func (export "max") (param $x f32) (param $y f32) (result f32) (f32.max (local.get $x) (local.get $y)))
   (func (export "ceil") (param $x f32) (result f32) (f32.ceil (local.get $x)))
   (func (export "floor") (param $x f32) (result f32) (f32.floor (local.get $x)))
   (func (export "trunc") (param $x f32) (result f32) (f32.trunc (local.get $x)))
   (func (export "nearest") (param $x f32) (result f32) (f32.nearest (local.get $x)))
 )
 
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const -0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -0x0p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const 0x0p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const -0x0p+0)) (f32.const -0x1p-149))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const 0x0p+0)) (f32.const -0x1p-149))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const -0x0p+0)) (f32.const 0x1p-149))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const 0x0p+0)) (f32.const 0x1p-149))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const -0x1p-149)) (f32.const -0x1p-148))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const 0x1p-149)) (f32.const 0x0p+0))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const -0x1p-149)) (f32.const 0x0p+0))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const 0x1p-149)) (f32.const 0x1p-148))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const -0x1p-126)) (f32.const -0x1.000002p-126))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const 0x1p-126)) (f32.const 0x1.fffffcp-127))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const -0x1p-126)) (f32.const -0x1.fffffcp-127))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const 0x1p-126)) (f32.const 0x1.000002p-126))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -0x1p-149) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const 0x1p-149) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const -0x0p+0)) (f32.const -0x1p-126))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const 0x0p+0)) (f32.const -0x1p-126))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const -0x0p+0)) (f32.const 0x1p-126))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const 0x0p+0)) (f32.const 0x1p-126))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const -0x1p-149)) (f32.const -0x1.000002p-126))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const 0x1p-149)) (f32.const -0x1.fffffcp-127))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const -0x1p-149)) (f32.const 0x1.fffffcp-127))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const 0x1p-149)) (f32.const 0x1.000002p-126))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const -0x1p-126)) (f32.const -0x1p-125))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const 0x1p-126)) (f32.const 0x0p+0))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const -0x1p-126)) (f32.const 0x0p+0))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const 0x1p-126)) (f32.const 0x1p-125))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -0x1p-126) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const 0x1p-126) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const -0x0p+0)) (f32.const -0x1p-1))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const 0x0p+0)) (f32.const -0x1p-1))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const -0x0p+0)) (f32.const 0x1p-1))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const 0x0p+0)) (f32.const 0x1p-1))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const -0x1p-149)) (f32.const -0x1p-1))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const 0x1p-149)) (f32.const -0x1p-1))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const -0x1p-149)) (f32.const 0x1p-1))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const 0x1p-149)) (f32.const 0x1p-1))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const -0x1p-126)) (f32.const -0x1p-1))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const 0x1p-126)) (f32.const -0x1p-1))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const -0x1p-126)) (f32.const 0x1p-1))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const 0x1p-126)) (f32.const 0x1p-1))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const -0x1p-1)) (f32.const -0x1p+0))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const 0x1p-1)) (f32.const 0x0p+0))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const -0x1p-1)) (f32.const 0x0p+0))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const 0x1p-1)) (f32.const 0x1p+0))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const -0x1p+0)) (f32.const -0x1.8p+0))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const 0x1p+0)) (f32.const 0x1p-1))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const -0x1p+0)) (f32.const -0x1p-1))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const 0x1p+0)) (f32.const 0x1.8p+0))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.b21fb6p+2))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.721fb6p+2))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.721fb6p+2))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.b21fb6p+2))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -0x1p-1) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const 0x1p-1) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const -0x0p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const 0x0p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const -0x0p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const 0x0p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const -0x1p-149)) (f32.const -0x1p+0))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const 0x1p-149)) (f32.const -0x1p+0))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const -0x1p-149)) (f32.const 0x1p+0))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const 0x1p-149)) (f32.const 0x1p+0))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const -0x1p-126)) (f32.const -0x1p+0))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const 0x1p-126)) (f32.const -0x1p+0))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const -0x1p-126)) (f32.const 0x1p+0))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const 0x1p-126)) (f32.const 0x1p+0))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const -0x1p-1)) (f32.const -0x1.8p+0))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const 0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const -0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const 0x1p-1)) (f32.const 0x1.8p+0))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const -0x1p+0)) (f32.const -0x1p+1))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const 0x1p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const -0x1p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const 0x1p+0)) (f32.const 0x1p+1))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.d21fb6p+2))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.521fb6p+2))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.521fb6p+2))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.d21fb6p+2))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -0x1p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const 0x1p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const -0x0p+0)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const 0x0p+0)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const -0x0p+0)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const 0x0p+0)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-149)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-149)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-149)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-149)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-126)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-126)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-126)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-126)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-1)) (f32.const -0x1.b21fb6p+2))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-1)) (f32.const -0x1.721fb6p+2))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-1)) (f32.const 0x1.721fb6p+2))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-1)) (f32.const 0x1.b21fb6p+2))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const -0x1p+0)) (f32.const -0x1.d21fb6p+2))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const 0x1p+0)) (f32.const -0x1.521fb6p+2))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const -0x1p+0)) (f32.const 0x1.521fb6p+2))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const 0x1p+0)) (f32.const 0x1.d21fb6p+2))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+3))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (f32.const 0x0p+0))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (f32.const 0x0p+0))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+3))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -0x1.921fb6p+2) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const 0x1.921fb6p+2) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const -0x0p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const 0x0p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const -0x0p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const 0x0p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const -0x1p-149)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const 0x1p-149)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const -0x1p-149)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const 0x1p-149)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const -0x1p-126)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const 0x1p-126)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const -0x1p-126)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const 0x1p-126)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const -0x1p-1)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const 0x1p-1)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const -0x1p-1)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const 0x1p-1)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const -0x1p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const 0x1p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const -0x1p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const 0x1p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (f32.const 0x0p+0))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (f32.const 0x0p+0))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (f32.const inf))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -0x1.fffffep+127) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const 0x1.fffffep+127) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -inf) (f32.const -0x0p+0)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const -inf) (f32.const 0x0p+0)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const inf) (f32.const -0x0p+0)) (f32.const inf))
-(assert_return (invoke "add" (f32.const inf) (f32.const 0x0p+0)) (f32.const inf))
-(assert_return (invoke "add" (f32.const -inf) (f32.const -0x1p-149)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const -inf) (f32.const 0x1p-149)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const inf) (f32.const -0x1p-149)) (f32.const inf))
-(assert_return (invoke "add" (f32.const inf) (f32.const 0x1p-149)) (f32.const inf))
-(assert_return (invoke "add" (f32.const -inf) (f32.const -0x1p-126)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const -inf) (f32.const 0x1p-126)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const inf) (f32.const -0x1p-126)) (f32.const inf))
-(assert_return (invoke "add" (f32.const inf) (f32.const 0x1p-126)) (f32.const inf))
-(assert_return (invoke "add" (f32.const -inf) (f32.const -0x1p-1)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const -inf) (f32.const 0x1p-1)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const inf) (f32.const -0x1p-1)) (f32.const inf))
-(assert_return (invoke "add" (f32.const inf) (f32.const 0x1p-1)) (f32.const inf))
-(assert_return (invoke "add" (f32.const -inf) (f32.const -0x1p+0)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const -inf) (f32.const 0x1p+0)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const inf) (f32.const -0x1p+0)) (f32.const inf))
-(assert_return (invoke "add" (f32.const inf) (f32.const 0x1p+0)) (f32.const inf))
-(assert_return (invoke "add" (f32.const -inf) (f32.const -0x1.921fb6p+2)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const -inf) (f32.const 0x1.921fb6p+2)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const inf) (f32.const -0x1.921fb6p+2)) (f32.const inf))
-(assert_return (invoke "add" (f32.const inf) (f32.const 0x1.921fb6p+2)) (f32.const inf))
-(assert_return (invoke "add" (f32.const -inf) (f32.const -0x1.fffffep+127)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const -inf) (f32.const 0x1.fffffep+127)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const inf) (f32.const -0x1.fffffep+127)) (f32.const inf))
-(assert_return (invoke "add" (f32.const inf) (f32.const 0x1.fffffep+127)) (f32.const inf))
-(assert_return (invoke "add" (f32.const -inf) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "add" (f32.const -inf) (f32.const inf)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const inf) (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const inf) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "add" (f32.const -inf) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -inf) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -inf) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -inf) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const inf) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const inf) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const inf) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const inf) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const -0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const -0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const 0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const 0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const -0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const -0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const 0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const 0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const -0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const -0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const 0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const 0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const -0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const -0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const 0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const 0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const -0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const -0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const 0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const 0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const -0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const -0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const 0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const 0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const -0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const -0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const 0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const 0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const -0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const -0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const 0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const 0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const -0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const -0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const 0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const 0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const -0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const -0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const 0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const 0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const -0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const -0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const 0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const 0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const -0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const -0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const 0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const 0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const -0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const -0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const 0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const 0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const -0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const -0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const 0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const 0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const -inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const inf)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const -inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const inf)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const -nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const -nan:0x200000) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const -nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "add" (f32.const nan:0x200000) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const -0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const 0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const -0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const -0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const 0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const -0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const 0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const -0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const 0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const -0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const 0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const -0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const 0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const -0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const 0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const -0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const 0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const -0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const 0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const -0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const 0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const -0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const 0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -0x0p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const 0x0p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const -0x0p+0)) (f32.const -0x1p-149))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const 0x0p+0)) (f32.const -0x1p-149))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const -0x0p+0)) (f32.const 0x1p-149))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const 0x0p+0)) (f32.const 0x1p-149))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const -0x1p-149)) (f32.const 0x0p+0))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const 0x1p-149)) (f32.const -0x1p-148))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const -0x1p-149)) (f32.const 0x1p-148))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const 0x1p-149)) (f32.const 0x0p+0))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const -0x1p-126)) (f32.const 0x1.fffffcp-127))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const 0x1p-126)) (f32.const -0x1.000002p-126))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const -0x1p-126)) (f32.const 0x1.000002p-126))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const 0x1p-126)) (f32.const -0x1.fffffcp-127))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const -0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const 0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const -0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const 0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const -0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const 0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const -0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const 0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const -0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const 0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const -0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const 0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -0x1p-149) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const 0x1p-149) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const -0x0p+0)) (f32.const -0x1p-126))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const 0x0p+0)) (f32.const -0x1p-126))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const -0x0p+0)) (f32.const 0x1p-126))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const 0x0p+0)) (f32.const 0x1p-126))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const -0x1p-149)) (f32.const -0x1.fffffcp-127))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const 0x1p-149)) (f32.const -0x1.000002p-126))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const -0x1p-149)) (f32.const 0x1.000002p-126))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const 0x1p-149)) (f32.const 0x1.fffffcp-127))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const -0x1p-126)) (f32.const 0x0p+0))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const 0x1p-126)) (f32.const -0x1p-125))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const -0x1p-126)) (f32.const 0x1p-125))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const 0x1p-126)) (f32.const 0x0p+0))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const -0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const 0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const -0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const 0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const -0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const 0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const -0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const 0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const -0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const 0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const -0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const 0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -0x1p-126) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const 0x1p-126) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const -0x0p+0)) (f32.const -0x1p-1))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const 0x0p+0)) (f32.const -0x1p-1))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const -0x0p+0)) (f32.const 0x1p-1))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const 0x0p+0)) (f32.const 0x1p-1))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const -0x1p-149)) (f32.const -0x1p-1))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const 0x1p-149)) (f32.const -0x1p-1))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const -0x1p-149)) (f32.const 0x1p-1))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const 0x1p-149)) (f32.const 0x1p-1))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const -0x1p-126)) (f32.const -0x1p-1))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const 0x1p-126)) (f32.const -0x1p-1))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const -0x1p-126)) (f32.const 0x1p-1))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const 0x1p-126)) (f32.const 0x1p-1))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const -0x1p-1)) (f32.const 0x0p+0))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const 0x1p-1)) (f32.const -0x1p+0))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const -0x1p-1)) (f32.const 0x1p+0))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const 0x1p-1)) (f32.const 0x0p+0))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const -0x1p+0)) (f32.const 0x1p-1))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const 0x1p+0)) (f32.const -0x1.8p+0))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const -0x1p+0)) (f32.const 0x1.8p+0))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const 0x1p+0)) (f32.const -0x1p-1))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.721fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.b21fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.b21fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.721fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const -0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const 0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const -0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const 0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -0x1p-1) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const 0x1p-1) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const -0x0p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const 0x0p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const -0x0p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const 0x0p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const -0x1p-149)) (f32.const -0x1p+0))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const 0x1p-149)) (f32.const -0x1p+0))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const -0x1p-149)) (f32.const 0x1p+0))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const 0x1p-149)) (f32.const 0x1p+0))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const -0x1p-126)) (f32.const -0x1p+0))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const 0x1p-126)) (f32.const -0x1p+0))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const -0x1p-126)) (f32.const 0x1p+0))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const 0x1p-126)) (f32.const 0x1p+0))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const 0x1p-1)) (f32.const -0x1.8p+0))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const -0x1p-1)) (f32.const 0x1.8p+0))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const -0x1p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const 0x1p+0)) (f32.const -0x1p+1))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const -0x1p+0)) (f32.const 0x1p+1))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const 0x1p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.521fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.d21fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.d21fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.521fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const -0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const 0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const -0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const 0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -0x1p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const 0x1p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const -0x0p+0)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const 0x0p+0)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const -0x0p+0)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const 0x0p+0)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-149)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-149)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-149)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-149)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-126)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-126)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-126)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-126)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-1)) (f32.const -0x1.721fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-1)) (f32.const -0x1.b21fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-1)) (f32.const 0x1.b21fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-1)) (f32.const 0x1.721fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const -0x1p+0)) (f32.const -0x1.521fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const 0x1p+0)) (f32.const -0x1.d21fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const -0x1p+0)) (f32.const 0x1.d21fb6p+2))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const 0x1p+0)) (f32.const 0x1.521fb6p+2))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (f32.const 0x0p+0))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.921fb6p+3))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.921fb6p+3))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (f32.const 0x0p+0))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -0x1.921fb6p+2) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const 0x1.921fb6p+2) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const -0x0p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const 0x0p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const -0x0p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const 0x0p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const -0x1p-149)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const 0x1p-149)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const -0x1p-149)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const 0x1p-149)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const -0x1p-126)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const 0x1p-126)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const -0x1p-126)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const 0x1p-126)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const -0x1p-1)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const 0x1p-1)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const -0x1p-1)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const 0x1p-1)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const -0x1p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const 0x1p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const -0x1p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const 0x1p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (f32.const 0x0p+0))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (f32.const 0x0p+0))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -0x1.fffffep+127) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const 0x1.fffffep+127) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const -0x0p+0)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const 0x0p+0)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const inf) (f32.const -0x0p+0)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const inf) (f32.const 0x0p+0)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const -0x1p-149)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const 0x1p-149)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const inf) (f32.const -0x1p-149)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const inf) (f32.const 0x1p-149)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const -0x1p-126)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const 0x1p-126)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const inf) (f32.const -0x1p-126)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const inf) (f32.const 0x1p-126)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const -0x1p-1)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const 0x1p-1)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const inf) (f32.const -0x1p-1)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const inf) (f32.const 0x1p-1)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const -0x1p+0)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const 0x1p+0)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const inf) (f32.const -0x1p+0)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const inf) (f32.const 0x1p+0)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const -0x1.921fb6p+2)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const 0x1.921fb6p+2)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const inf) (f32.const -0x1.921fb6p+2)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const inf) (f32.const 0x1.921fb6p+2)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const -0x1.fffffep+127)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const 0x1.fffffep+127)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const inf) (f32.const -0x1.fffffep+127)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const inf) (f32.const 0x1.fffffep+127)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "sub" (f32.const inf) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "sub" (f32.const inf) (f32.const inf)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -inf) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const inf) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const inf) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const inf) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const inf) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const -0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const -0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const 0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const 0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const -0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const -0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const 0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const 0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const -0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const -0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const 0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const 0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const -0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const -0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const 0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const 0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const -0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const -0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const 0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const 0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const -0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const -0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const 0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const 0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const -0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const -0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const 0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const 0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const -0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const -0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const 0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const 0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const -0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const -0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const 0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const 0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const -0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const -0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const 0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const 0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const -0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const -0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const 0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const 0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const -0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const -0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const 0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const 0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const -0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const -0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const 0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const 0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const -0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const -0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const 0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const 0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const -inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const inf)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const -inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const inf)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const -nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const -nan:0x200000) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const -nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sub" (f32.const nan:0x200000) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const -0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const 0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const -0x1p-149)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const 0x1p-149)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const -0x1p-149)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const 0x1p-149)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const -0x1p-126)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const 0x1p-126)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const -0x1p-126)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const 0x1p-126)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const -0x1p-1)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const 0x1p-1)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const -0x1p-1)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const 0x1p-1)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const -0x1p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const 0x1p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const -0x1p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const 0x1p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const -0x1.921fb6p+2)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const 0x1.921fb6p+2)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const -0x1.921fb6p+2)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const 0x1.921fb6p+2)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const -0x1.fffffep+127)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const 0x1.fffffep+127)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const -0x1.fffffep+127)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const 0x1.fffffep+127)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const inf)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const inf)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -0x0p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const 0x0p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const -0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const 0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const -0x1p-149)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const 0x1p-149)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const -0x1p-149)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const 0x1p-149)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const -0x1p-126)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const 0x1p-126)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const -0x1p-126)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const 0x1p-126)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const -0x1p-1)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const 0x1p-1)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const -0x1p-1)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const 0x1p-1)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const -0x1p+0)) (f32.const 0x1p-149))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const 0x1p+0)) (f32.const -0x1p-149))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const -0x1p+0)) (f32.const -0x1p-149))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const 0x1p+0)) (f32.const 0x1p-149))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.8p-147))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.8p-147))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.8p-147))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.8p-147))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const -0x1.fffffep+127)) (f32.const 0x1.fffffep-22))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const 0x1.fffffep+127)) (f32.const -0x1.fffffep-22))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep-22))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep-22))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -0x1p-149) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const 0x1p-149) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const -0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const 0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const -0x1p-149)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const 0x1p-149)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const -0x1p-149)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const 0x1p-149)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const -0x1p-126)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const 0x1p-126)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const -0x1p-126)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const 0x1p-126)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const -0x1p-1)) (f32.const 0x1p-127))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const 0x1p-1)) (f32.const -0x1p-127))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const -0x1p-1)) (f32.const -0x1p-127))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const 0x1p-1)) (f32.const 0x1p-127))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const -0x1p+0)) (f32.const 0x1p-126))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const 0x1p+0)) (f32.const -0x1p-126))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const -0x1p+0)) (f32.const -0x1p-126))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const 0x1p+0)) (f32.const 0x1p-126))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.921fb6p-124))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.921fb6p-124))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p-124))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p-124))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const -0x1.fffffep+127)) (f32.const 0x1.fffffep+1))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const 0x1.fffffep+127)) (f32.const -0x1.fffffep+1))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+1))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+1))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -0x1p-126) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const 0x1p-126) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const -0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const 0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const -0x1p-149)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const 0x1p-149)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const -0x1p-149)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const 0x1p-149)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const -0x1p-126)) (f32.const 0x1p-127))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const 0x1p-126)) (f32.const -0x1p-127))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const -0x1p-126)) (f32.const -0x1p-127))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const 0x1p-126)) (f32.const 0x1p-127))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const -0x1p-1)) (f32.const 0x1p-2))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const 0x1p-1)) (f32.const -0x1p-2))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const -0x1p-1)) (f32.const -0x1p-2))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const 0x1p-1)) (f32.const 0x1p-2))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const -0x1p+0)) (f32.const 0x1p-1))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const 0x1p+0)) (f32.const -0x1p-1))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const -0x1p+0)) (f32.const -0x1p-1))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const 0x1p+0)) (f32.const 0x1p-1))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.921fb6p+1))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.921fb6p+1))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+1))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+1))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const -0x1.fffffep+127)) (f32.const 0x1.fffffep+126))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const 0x1.fffffep+127)) (f32.const -0x1.fffffep+126))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+126))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+126))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -0x1p-1) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const 0x1p-1) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const -0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const 0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const -0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const 0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const -0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const 0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const -0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const 0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const -0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const 0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const -0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const 0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -0x1p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const 0x1p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const -0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const 0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-149)) (f32.const 0x1.8p-147))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-149)) (f32.const -0x1.8p-147))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-149)) (f32.const -0x1.8p-147))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-149)) (f32.const 0x1.8p-147))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-126)) (f32.const 0x1.921fb6p-124))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-126)) (f32.const -0x1.921fb6p-124))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-126)) (f32.const -0x1.921fb6p-124))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-126)) (f32.const 0x1.921fb6p-124))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-1)) (f32.const 0x1.921fb6p+1))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-1)) (f32.const -0x1.921fb6p+1))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-1)) (f32.const -0x1.921fb6p+1))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-1)) (f32.const 0x1.921fb6p+1))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const -0x1p+0)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const 0x1p+0)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const -0x1p+0)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const 0x1p+0)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.3bd3cep+5))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.3bd3cep+5))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.3bd3cep+5))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.3bd3cep+5))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -0x1.921fb6p+2) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const 0x1.921fb6p+2) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const -0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const 0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const -0x1p-149)) (f32.const 0x1.fffffep-22))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const 0x1p-149)) (f32.const -0x1.fffffep-22))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const -0x1p-149)) (f32.const -0x1.fffffep-22))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const 0x1p-149)) (f32.const 0x1.fffffep-22))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const -0x1p-126)) (f32.const 0x1.fffffep+1))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const 0x1p-126)) (f32.const -0x1.fffffep+1))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const -0x1p-126)) (f32.const -0x1.fffffep+1))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const 0x1p-126)) (f32.const 0x1.fffffep+1))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const -0x1p-1)) (f32.const 0x1.fffffep+126))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const 0x1p-1)) (f32.const -0x1.fffffep+126))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const -0x1p-1)) (f32.const -0x1.fffffep+126))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const 0x1p-1)) (f32.const 0x1.fffffep+126))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const -0x1p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const 0x1p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const -0x1p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const 0x1p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -0x1.fffffep+127) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const 0x1.fffffep+127) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const -0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const 0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const inf) (f32.const -0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const inf) (f32.const 0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const -0x1p-149)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const 0x1p-149)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const inf) (f32.const -0x1p-149)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const inf) (f32.const 0x1p-149)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const -0x1p-126)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const 0x1p-126)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const inf) (f32.const -0x1p-126)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const inf) (f32.const 0x1p-126)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const -0x1p-1)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const 0x1p-1)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const inf) (f32.const -0x1p-1)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const inf) (f32.const 0x1p-1)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const -0x1p+0)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const 0x1p+0)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const inf) (f32.const -0x1p+0)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const inf) (f32.const 0x1p+0)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const -0x1.921fb6p+2)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const 0x1.921fb6p+2)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const inf) (f32.const -0x1.921fb6p+2)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const inf) (f32.const 0x1.921fb6p+2)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const -0x1.fffffep+127)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const 0x1.fffffep+127)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const inf) (f32.const -0x1.fffffep+127)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const inf) (f32.const 0x1.fffffep+127)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const inf) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "mul" (f32.const inf) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -inf) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const inf) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const inf) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const inf) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const inf) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const -0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const -0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const 0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const 0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const -0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const -0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const 0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const 0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const -0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const -0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const 0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const 0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const -0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const -0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const 0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const 0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const -0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const -0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const 0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const 0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const -0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const -0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const 0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const 0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const -0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const -0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const 0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const 0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const -0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const -0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const 0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const 0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const -0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const -0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const 0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const 0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const -0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const -0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const 0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const 0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const -0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const -0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const 0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const 0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const -0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const -0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const 0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const 0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const -0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const -0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const 0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const 0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const -0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const -0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const 0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const 0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const -inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const inf)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const -inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const inf)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const -nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const -nan:0x200000) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const -nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "mul" (f32.const nan:0x200000) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const -0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const 0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const -0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const 0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const -0x1p-149)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const 0x1p-149)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const -0x1p-149)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const 0x1p-149)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const -0x1p-126)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const 0x1p-126)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const -0x1p-126)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const 0x1p-126)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const -0x1p-1)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const 0x1p-1)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const -0x1p-1)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const 0x1p-1)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const -0x1p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const 0x1p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const -0x1p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const 0x1p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const -0x1.921fb6p+2)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const 0x1.921fb6p+2)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const -0x1.921fb6p+2)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const 0x1.921fb6p+2)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const -0x1.fffffep+127)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const 0x1.fffffep+127)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const -0x1.fffffep+127)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const 0x1.fffffep+127)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const -inf)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const inf)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const -inf)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const inf)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -0x0p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const 0x0p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const -0x0p+0)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const 0x0p+0)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const -0x0p+0)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const 0x0p+0)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const -0x1p-149)) (f32.const 0x1p+0))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const 0x1p-149)) (f32.const -0x1p+0))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const -0x1p-149)) (f32.const -0x1p+0))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const 0x1p-149)) (f32.const 0x1p+0))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const -0x1p-126)) (f32.const 0x1p-23))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const 0x1p-126)) (f32.const -0x1p-23))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const -0x1p-126)) (f32.const -0x1p-23))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const 0x1p-126)) (f32.const 0x1p-23))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const -0x1p-1)) (f32.const 0x1p-148))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const 0x1p-1)) (f32.const -0x1p-148))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const -0x1p-1)) (f32.const -0x1p-148))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const 0x1p-1)) (f32.const 0x1p-148))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const -0x1p+0)) (f32.const 0x1p-149))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const 0x1p+0)) (f32.const -0x1p-149))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const -0x1p+0)) (f32.const -0x1p-149))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const 0x1p+0)) (f32.const 0x1p-149))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const -0x1.921fb6p+2)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const 0x1.921fb6p+2)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const -0x1.921fb6p+2)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const 0x1.921fb6p+2)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const -0x1.fffffep+127)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const 0x1.fffffep+127)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const -0x1.fffffep+127)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const 0x1.fffffep+127)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const -inf)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const inf)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const -inf)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const inf)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -0x1p-149) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const 0x1p-149) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const -0x0p+0)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const 0x0p+0)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const -0x0p+0)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const 0x0p+0)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const -0x1p-149)) (f32.const 0x1p+23))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const 0x1p-149)) (f32.const -0x1p+23))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const -0x1p-149)) (f32.const -0x1p+23))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const 0x1p-149)) (f32.const 0x1p+23))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const -0x1p-126)) (f32.const 0x1p+0))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const 0x1p-126)) (f32.const -0x1p+0))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const -0x1p-126)) (f32.const -0x1p+0))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const 0x1p-126)) (f32.const 0x1p+0))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const -0x1p-1)) (f32.const 0x1p-125))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const 0x1p-1)) (f32.const -0x1p-125))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const -0x1p-1)) (f32.const -0x1p-125))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const 0x1p-1)) (f32.const 0x1p-125))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const -0x1p+0)) (f32.const 0x1p-126))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const 0x1p+0)) (f32.const -0x1p-126))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const -0x1p+0)) (f32.const -0x1p-126))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const 0x1p+0)) (f32.const 0x1p-126))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.45f3p-129))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.45f3p-129))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.45f3p-129))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.45f3p-129))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const -0x1.fffffep+127)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const 0x1.fffffep+127)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const -0x1.fffffep+127)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const 0x1.fffffep+127)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const -inf)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const inf)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const -inf)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const inf)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -0x1p-126) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const 0x1p-126) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const -0x0p+0)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const 0x0p+0)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const -0x0p+0)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const 0x0p+0)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const -0x1p-149)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const 0x1p-149)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const -0x1p-149)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const 0x1p-149)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const -0x1p-126)) (f32.const 0x1p+125))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const 0x1p-126)) (f32.const -0x1p+125))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const -0x1p-126)) (f32.const -0x1p+125))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const 0x1p-126)) (f32.const 0x1p+125))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const -0x1p-1)) (f32.const 0x1p+0))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const 0x1p-1)) (f32.const -0x1p+0))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const -0x1p-1)) (f32.const -0x1p+0))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const 0x1p-1)) (f32.const 0x1p+0))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const -0x1p+0)) (f32.const 0x1p-1))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const 0x1p+0)) (f32.const -0x1p-1))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const -0x1p+0)) (f32.const -0x1p-1))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const 0x1p+0)) (f32.const 0x1p-1))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.45f306p-4))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.45f306p-4))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.45f306p-4))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.45f306p-4))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const -0x1.fffffep+127)) (f32.const 0x1p-129))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const 0x1.fffffep+127)) (f32.const -0x1p-129))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const -0x1.fffffep+127)) (f32.const -0x1p-129))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const 0x1.fffffep+127)) (f32.const 0x1p-129))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const -inf)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const inf)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const -inf)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const inf)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -0x1p-1) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const 0x1p-1) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const -0x0p+0)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const 0x0p+0)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const -0x0p+0)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const 0x0p+0)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const -0x1p-149)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const 0x1p-149)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const -0x1p-149)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const 0x1p-149)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const -0x1p-126)) (f32.const 0x1p+126))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const 0x1p-126)) (f32.const -0x1p+126))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const -0x1p-126)) (f32.const -0x1p+126))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const 0x1p-126)) (f32.const 0x1p+126))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const -0x1p-1)) (f32.const 0x1p+1))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const 0x1p-1)) (f32.const -0x1p+1))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const -0x1p-1)) (f32.const -0x1p+1))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const 0x1p-1)) (f32.const 0x1p+1))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const -0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const 0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.45f306p-3))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.45f306p-3))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.45f306p-3))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.45f306p-3))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const -0x1.fffffep+127)) (f32.const 0x1p-128))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const 0x1.fffffep+127)) (f32.const -0x1p-128))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const -0x1.fffffep+127)) (f32.const -0x1p-128))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const 0x1.fffffep+127)) (f32.const 0x1p-128))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const -inf)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const inf)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const -inf)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const inf)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -0x1p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const 0x1p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const -0x0p+0)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const 0x0p+0)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const -0x0p+0)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const 0x0p+0)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-149)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-149)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-149)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-149)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-126)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-126)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-126)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-126)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-1)) (f32.const 0x1.921fb6p+3))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-1)) (f32.const -0x1.921fb6p+3))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-1)) (f32.const -0x1.921fb6p+3))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-1)) (f32.const 0x1.921fb6p+3))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const -0x1p+0)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const 0x1p+0)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const -0x1p+0)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const 0x1p+0)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (f32.const 0x1p+0))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (f32.const -0x1p+0))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (f32.const -0x1p+0))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (f32.const 0x1p+0))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (f32.const 0x1.921fb8p-126))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (f32.const -0x1.921fb8p-126))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (f32.const -0x1.921fb8p-126))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (f32.const 0x1.921fb8p-126))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const -inf)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const inf)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const -inf)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const inf)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -0x1.921fb6p+2) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const 0x1.921fb6p+2) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const -0x0p+0)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const 0x0p+0)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const -0x0p+0)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const 0x0p+0)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const -0x1p-149)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const 0x1p-149)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const -0x1p-149)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const 0x1p-149)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const -0x1p-126)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const 0x1p-126)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const -0x1p-126)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const 0x1p-126)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const -0x1p-1)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const 0x1p-1)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const -0x1p-1)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const 0x1p-1)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const -0x1p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const 0x1p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const -0x1p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const 0x1p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.45f304p+125))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.45f304p+125))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.45f304p+125))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.45f304p+125))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (f32.const 0x1p+0))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (f32.const -0x1p+0))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (f32.const -0x1p+0))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (f32.const 0x1p+0))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const -inf)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const inf)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const -inf)) (f32.const -0x0p+0))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const inf)) (f32.const 0x0p+0))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -0x1.fffffep+127) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const 0x1.fffffep+127) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -inf) (f32.const -0x0p+0)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -inf) (f32.const 0x0p+0)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const inf) (f32.const -0x0p+0)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const inf) (f32.const 0x0p+0)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -inf) (f32.const -0x1p-149)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -inf) (f32.const 0x1p-149)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const inf) (f32.const -0x1p-149)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const inf) (f32.const 0x1p-149)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -inf) (f32.const -0x1p-126)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -inf) (f32.const 0x1p-126)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const inf) (f32.const -0x1p-126)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const inf) (f32.const 0x1p-126)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -inf) (f32.const -0x1p-1)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -inf) (f32.const 0x1p-1)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const inf) (f32.const -0x1p-1)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const inf) (f32.const 0x1p-1)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -inf) (f32.const -0x1p+0)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -inf) (f32.const 0x1p+0)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const inf) (f32.const -0x1p+0)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const inf) (f32.const 0x1p+0)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -inf) (f32.const -0x1.921fb6p+2)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -inf) (f32.const 0x1.921fb6p+2)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const inf) (f32.const -0x1.921fb6p+2)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const inf) (f32.const 0x1.921fb6p+2)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -inf) (f32.const -0x1.fffffep+127)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -inf) (f32.const 0x1.fffffep+127)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const inf) (f32.const -0x1.fffffep+127)) (f32.const -inf))
-(assert_return (invoke "div" (f32.const inf) (f32.const 0x1.fffffep+127)) (f32.const inf))
-(assert_return (invoke "div" (f32.const -inf) (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -inf) (f32.const inf)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const inf) (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const inf) (f32.const inf)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -inf) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -inf) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -inf) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -inf) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const inf) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const inf) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const inf) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const inf) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const -0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const -0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const 0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const 0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const -0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const -0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const 0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const 0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const -0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const -0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const 0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const 0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const -0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const -0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const 0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const 0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const -0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const -0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const 0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const 0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const -0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const -0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const 0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const 0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const -0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const -0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const 0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const 0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const -0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const -0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const 0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const 0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const -0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const -0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const 0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const 0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const -0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const -0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const 0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const 0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const -0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const -0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const 0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const 0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const -0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const -0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const 0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const 0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const -0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const -0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const 0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const 0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const -0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const -0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const 0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const 0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const -inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const inf)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const -inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const inf)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const -nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const -nan:0x200000) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const -nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "div" (f32.const nan:0x200000) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const 0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const 0x1p-149)) (f32.const -0x0p+0))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const 0x1p-149)) (f32.const 0x0p+0))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const 0x1p-126)) (f32.const -0x0p+0))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const 0x1p-126)) (f32.const 0x0p+0))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const 0x1p-1)) (f32.const -0x0p+0))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const 0x1p-1)) (f32.const 0x0p+0))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const 0x1p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const 0x1p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const 0x1.921fb6p+2)) (f32.const -0x0p+0))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const 0x1.921fb6p+2)) (f32.const 0x0p+0))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const 0x1.fffffep+127)) (f32.const -0x0p+0))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const 0x1.fffffep+127)) (f32.const 0x0p+0))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const inf)) (f32.const -0x0p+0))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const inf)) (f32.const 0x0p+0))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const -0x0p+0)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const 0x0p+0)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const 0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const 0x1p-126)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const 0x1p-126)) (f32.const 0x1p-149))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const 0x1p-1)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const 0x1p-1)) (f32.const 0x1p-149))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const 0x1p+0)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const 0x1p+0)) (f32.const 0x1p-149))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const 0x1.921fb6p+2)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const 0x1.921fb6p+2)) (f32.const 0x1p-149))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const 0x1.fffffep+127)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const 0x1.fffffep+127)) (f32.const 0x1p-149))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const inf)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const inf)) (f32.const 0x1p-149))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const -0x0p+0)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const 0x0p+0)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const -0x1p-149)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const 0x1p-149)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const 0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const 0x1p-1)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const 0x1p-1)) (f32.const 0x1p-126))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const 0x1p+0)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const 0x1p+0)) (f32.const 0x1p-126))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const 0x1.921fb6p+2)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const 0x1.921fb6p+2)) (f32.const 0x1p-126))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const 0x1.fffffep+127)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const 0x1.fffffep+127)) (f32.const 0x1p-126))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const inf)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const inf)) (f32.const 0x1p-126))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const -0x0p+0)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const 0x0p+0)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const -0x1p-149)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const 0x1p-149)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const -0x1p-126)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const 0x1p-126)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const 0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const 0x1p+0)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const 0x1p+0)) (f32.const 0x1p-1))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const 0x1.921fb6p+2)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const 0x1.921fb6p+2)) (f32.const 0x1p-1))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const 0x1.fffffep+127)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const 0x1.fffffep+127)) (f32.const 0x1p-1))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const inf)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const inf)) (f32.const 0x1p-1))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const -0x0p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const 0x0p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const -0x1p-149)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const 0x1p-149)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const -0x1p-126)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const 0x1p-126)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const -0x1p-1)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const 0x1p-1)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const 0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const 0x1.921fb6p+2)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const 0x1.921fb6p+2)) (f32.const 0x1p+0))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const 0x1.fffffep+127)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const 0x1.fffffep+127)) (f32.const 0x1p+0))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const inf)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const inf)) (f32.const 0x1p+0))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const -0x0p+0)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const 0x0p+0)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-149)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-149)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-126)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-126)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-1)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-1)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const -0x1p+0)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const 0x1p+0)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const inf)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const inf)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const -0x0p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const 0x0p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const -0x1p-149)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const 0x1p-149)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const -0x1p-126)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const 0x1p-126)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const -0x1p-1)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const 0x1p-1)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const -0x1p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const 0x1p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const inf)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const inf)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -inf) (f32.const -0x0p+0)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const -inf) (f32.const 0x0p+0)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const inf) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "min" (f32.const inf) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "min" (f32.const -inf) (f32.const -0x1p-149)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const -inf) (f32.const 0x1p-149)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const inf) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "min" (f32.const inf) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "min" (f32.const -inf) (f32.const -0x1p-126)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const -inf) (f32.const 0x1p-126)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const inf) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "min" (f32.const inf) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "min" (f32.const -inf) (f32.const -0x1p-1)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const -inf) (f32.const 0x1p-1)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const inf) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "min" (f32.const inf) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "min" (f32.const -inf) (f32.const -0x1p+0)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const -inf) (f32.const 0x1p+0)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const inf) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "min" (f32.const inf) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "min" (f32.const -inf) (f32.const -0x1.921fb6p+2)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const -inf) (f32.const 0x1.921fb6p+2)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const inf) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const inf) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const -inf) (f32.const -0x1.fffffep+127)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const -inf) (f32.const 0x1.fffffep+127)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const inf) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const inf) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const -inf) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const -inf) (f32.const inf)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const inf) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "min" (f32.const inf) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "min" (f32.const -inf) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -inf) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -inf) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -inf) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const inf) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const inf) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const inf) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const inf) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const -0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const 0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const 0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const -0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const -0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const 0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const 0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const -0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const 0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const 0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const -0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const -0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const 0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const 0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const -0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const 0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const 0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const -0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const -0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const 0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const 0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const -0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const 0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const 0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const -0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const -0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const 0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const 0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const -0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const 0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const 0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const -0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const -0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const 0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const 0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const -0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const 0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const 0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const -0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const -0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const 0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const 0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const -0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const 0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const 0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const -0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const -0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const 0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const 0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const -inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const inf)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const -inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const inf)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const -nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const -nan:0x200000) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const -nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "min" (f32.const nan:0x200000) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const -0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const -0x1p-149)) (f32.const -0x0p+0))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const -0x1p-149)) (f32.const 0x0p+0))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const -0x1p-126)) (f32.const -0x0p+0))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const -0x1p-126)) (f32.const 0x0p+0))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const -0x1p-1)) (f32.const -0x0p+0))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const -0x1p-1)) (f32.const 0x0p+0))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const -0x1p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const -0x1p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const -0x1.921fb6p+2)) (f32.const -0x0p+0))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const -0x1.921fb6p+2)) (f32.const 0x0p+0))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const -0x1.fffffep+127)) (f32.const -0x0p+0))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const -0x1.fffffep+127)) (f32.const 0x0p+0))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const -inf)) (f32.const -0x0p+0))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const -inf)) (f32.const 0x0p+0))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const -0x0p+0)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const 0x0p+0)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const -0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const -0x1p-126)) (f32.const -0x1p-149))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const -0x1p-126)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const -0x1p-1)) (f32.const -0x1p-149))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const -0x1p-1)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const -0x1p+0)) (f32.const -0x1p-149))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const -0x1p+0)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const -0x1.921fb6p+2)) (f32.const -0x1p-149))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const -0x1.921fb6p+2)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const -0x1.fffffep+127)) (f32.const -0x1p-149))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const -0x1.fffffep+127)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const -inf)) (f32.const -0x1p-149))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const -inf)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const -0x0p+0)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const 0x0p+0)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const -0x1p-149)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const 0x1p-149)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const -0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const -0x1p-1)) (f32.const -0x1p-126))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const -0x1p-1)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const -0x1p+0)) (f32.const -0x1p-126))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const -0x1p+0)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const -0x1.921fb6p+2)) (f32.const -0x1p-126))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const -0x1.921fb6p+2)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const -0x1.fffffep+127)) (f32.const -0x1p-126))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const -0x1.fffffep+127)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const -inf)) (f32.const -0x1p-126))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const -inf)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const -0x0p+0)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const 0x0p+0)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const -0x1p-149)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const 0x1p-149)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const -0x1p-126)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const 0x1p-126)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const -0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const -0x1p+0)) (f32.const -0x1p-1))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const -0x1p+0)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const -0x1.921fb6p+2)) (f32.const -0x1p-1))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const -0x1.921fb6p+2)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const -0x1.fffffep+127)) (f32.const -0x1p-1))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const -0x1.fffffep+127)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const -inf)) (f32.const -0x1p-1))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const -inf)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const -0x0p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const 0x0p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const -0x1p-149)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const 0x1p-149)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const -0x1p-126)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const 0x1p-126)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const -0x1p-1)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const 0x1p-1)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const -0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const -0x1.921fb6p+2)) (f32.const -0x1p+0))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const -0x1.921fb6p+2)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const -0x1.fffffep+127)) (f32.const -0x1p+0))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const -0x1.fffffep+127)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const -inf)) (f32.const -0x1p+0))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const -inf)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const -0x0p+0)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const 0x0p+0)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-149)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-149)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-126)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-126)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-1)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-1)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const -0x1p+0)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const 0x1p+0)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const -inf)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const -inf)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const -0x0p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const 0x0p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const -0x1p-149)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const 0x1p-149)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const -0x1p-126)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const 0x1p-126)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const -0x1p-1)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const 0x1p-1)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const -0x1p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const 0x1p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const -inf)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const -inf)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -inf) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "max" (f32.const -inf) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "max" (f32.const inf) (f32.const -0x0p+0)) (f32.const inf))
-(assert_return (invoke "max" (f32.const inf) (f32.const 0x0p+0)) (f32.const inf))
-(assert_return (invoke "max" (f32.const -inf) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "max" (f32.const -inf) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "max" (f32.const inf) (f32.const -0x1p-149)) (f32.const inf))
-(assert_return (invoke "max" (f32.const inf) (f32.const 0x1p-149)) (f32.const inf))
-(assert_return (invoke "max" (f32.const -inf) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "max" (f32.const -inf) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "max" (f32.const inf) (f32.const -0x1p-126)) (f32.const inf))
-(assert_return (invoke "max" (f32.const inf) (f32.const 0x1p-126)) (f32.const inf))
-(assert_return (invoke "max" (f32.const -inf) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "max" (f32.const -inf) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "max" (f32.const inf) (f32.const -0x1p-1)) (f32.const inf))
-(assert_return (invoke "max" (f32.const inf) (f32.const 0x1p-1)) (f32.const inf))
-(assert_return (invoke "max" (f32.const -inf) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "max" (f32.const -inf) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "max" (f32.const inf) (f32.const -0x1p+0)) (f32.const inf))
-(assert_return (invoke "max" (f32.const inf) (f32.const 0x1p+0)) (f32.const inf))
-(assert_return (invoke "max" (f32.const -inf) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const -inf) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "max" (f32.const inf) (f32.const -0x1.921fb6p+2)) (f32.const inf))
-(assert_return (invoke "max" (f32.const inf) (f32.const 0x1.921fb6p+2)) (f32.const inf))
-(assert_return (invoke "max" (f32.const -inf) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const -inf) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "max" (f32.const inf) (f32.const -0x1.fffffep+127)) (f32.const inf))
-(assert_return (invoke "max" (f32.const inf) (f32.const 0x1.fffffep+127)) (f32.const inf))
-(assert_return (invoke "max" (f32.const -inf) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "max" (f32.const -inf) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "max" (f32.const inf) (f32.const -inf)) (f32.const inf))
-(assert_return (invoke "max" (f32.const inf) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "max" (f32.const -inf) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -inf) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -inf) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -inf) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const inf) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const inf) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const inf) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const inf) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const -0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const 0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const 0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const -0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const -0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const 0x0p+0)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const 0x0p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const -0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const 0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const 0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const -0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const -0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const 0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const 0x1p-149)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const -0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const 0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const 0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const -0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const -0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const 0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const 0x1p-126)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const -0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const 0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const 0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const -0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const -0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const 0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const 0x1p-1)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const -0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const 0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const 0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const -0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const -0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const 0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const 0x1p+0)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const -0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const 0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const 0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const -0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const -0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const 0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const 0x1.921fb6p+2)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const -0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const 0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const 0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const -0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const -0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const 0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const 0x1.fffffep+127)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const -inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const inf)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const -inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const inf)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const inf)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const -nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const -nan:0x200000) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const -nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const nan)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "max" (f32.const nan:0x200000) (f32.const nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sqrt" (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "sqrt" (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "sqrt" (f32.const -0x1p-149)) (f32.const nan:canonical))
-(assert_return (invoke "sqrt" (f32.const 0x1p-149)) (f32.const 0x1.6a09e6p-75))
-(assert_return (invoke "sqrt" (f32.const -0x1p-126)) (f32.const nan:canonical))
-(assert_return (invoke "sqrt" (f32.const 0x1p-126)) (f32.const 0x1p-63))
-(assert_return (invoke "sqrt" (f32.const -0x1p-1)) (f32.const nan:canonical))
-(assert_return (invoke "sqrt" (f32.const 0x1p-1)) (f32.const 0x1.6a09e6p-1))
-(assert_return (invoke "sqrt" (f32.const -0x1p+0)) (f32.const nan:canonical))
-(assert_return (invoke "sqrt" (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "sqrt" (f32.const -0x1.921fb6p+2)) (f32.const nan:canonical))
-(assert_return (invoke "sqrt" (f32.const 0x1.921fb6p+2)) (f32.const 0x1.40d932p+1))
-(assert_return (invoke "sqrt" (f32.const -0x1.fffffep+127)) (f32.const nan:canonical))
-(assert_return (invoke "sqrt" (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+63))
-(assert_return (invoke "sqrt" (f32.const -inf)) (f32.const nan:canonical))
-(assert_return (invoke "sqrt" (f32.const inf)) (f32.const inf))
-(assert_return (invoke "sqrt" (f32.const -nan)) (f32.const nan:canonical))
-(assert_return (invoke "sqrt" (f32.const -nan:0x200000)) (f32.const nan:arithmetic))
-(assert_return (invoke "sqrt" (f32.const nan)) (f32.const nan:canonical))
-(assert_return (invoke "sqrt" (f32.const nan:0x200000)) (f32.const nan:arithmetic))
 (assert_return (invoke "floor" (f32.const -0x0p+0)) (f32.const -0x0p+0))
 (assert_return (invoke "floor" (f32.const 0x0p+0)) (f32.const 0x0p+0))
 (assert_return (invoke "floor" (f32.const -0x1p-149)) (f32.const -0x1p+0))
diff --git a/tests/misc_testsuite/winch/f32_bitwise.wast b/tests/misc_testsuite/winch/f32_bitwise.wast
index d63c62c96261..4816fceb43ea 100644
--- a/tests/misc_testsuite/winch/f32_bitwise.wast
+++ b/tests/misc_testsuite/winch/f32_bitwise.wast
@@ -4,333 +4,8 @@
 (module
   (func (export "abs") (param $x f32) (result f32) (f32.abs (local.get $x)))
   (func (export "neg") (param $x f32) (result f32) (f32.neg (local.get $x)))
-  (func (export "copysign") (param $x f32) (param $y f32) (result f32) (f32.copysign (local.get $x) (local.get $y)))
 )
 
-(assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const -0x0p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const 0x0p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const -0x1p-149)) (f32.const -0x0p+0))
-(assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const 0x1p-149)) (f32.const 0x0p+0))
-(assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const -0x1p-149)) (f32.const -0x0p+0))
-(assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const 0x1p-149)) (f32.const 0x0p+0))
-(assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const -0x1p-126)) (f32.const -0x0p+0))
-(assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const 0x1p-126)) (f32.const 0x0p+0))
-(assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const -0x1p-126)) (f32.const -0x0p+0))
-(assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const 0x1p-126)) (f32.const 0x0p+0))
-(assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const -0x1p-1)) (f32.const -0x0p+0))
-(assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const 0x1p-1)) (f32.const 0x0p+0))
-(assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const -0x1p-1)) (f32.const -0x0p+0))
-(assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const 0x1p-1)) (f32.const 0x0p+0))
-(assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const -0x1p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const 0x1p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const -0x1p+0)) (f32.const -0x0p+0))
-(assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const 0x1p+0)) (f32.const 0x0p+0))
-(assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const -0x1.921fb6p+2)) (f32.const -0x0p+0))
-(assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const 0x1.921fb6p+2)) (f32.const 0x0p+0))
-(assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const -0x1.921fb6p+2)) (f32.const -0x0p+0))
-(assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const 0x1.921fb6p+2)) (f32.const 0x0p+0))
-(assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const -0x1.fffffep+127)) (f32.const -0x0p+0))
-(assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const 0x1.fffffep+127)) (f32.const 0x0p+0))
-(assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const -0x1.fffffep+127)) (f32.const -0x0p+0))
-(assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const 0x1.fffffep+127)) (f32.const 0x0p+0))
-(assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const -inf)) (f32.const -0x0p+0))
-(assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const inf)) (f32.const 0x0p+0))
-(assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const -inf)) (f32.const -0x0p+0))
-(assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const inf)) (f32.const 0x0p+0))
-(assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const -nan)) (f32.const -0x0p+0))
-(assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const nan)) (f32.const 0x0p+0))
-(assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const -nan)) (f32.const -0x0p+0))
-(assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const nan)) (f32.const 0x0p+0))
-(assert_return (invoke "copysign" (f32.const -0x1p-149) (f32.const -0x0p+0)) (f32.const -0x1p-149))
-(assert_return (invoke "copysign" (f32.const -0x1p-149) (f32.const 0x0p+0)) (f32.const 0x1p-149))
-(assert_return (invoke "copysign" (f32.const 0x1p-149) (f32.const -0x0p+0)) (f32.const -0x1p-149))
-(assert_return (invoke "copysign" (f32.const 0x1p-149) (f32.const 0x0p+0)) (f32.const 0x1p-149))
-(assert_return (invoke "copysign" (f32.const -0x1p-149) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "copysign" (f32.const -0x1p-149) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "copysign" (f32.const 0x1p-149) (f32.const -0x1p-149)) (f32.const -0x1p-149))
-(assert_return (invoke "copysign" (f32.const 0x1p-149) (f32.const 0x1p-149)) (f32.const 0x1p-149))
-(assert_return (invoke "copysign" (f32.const -0x1p-149) (f32.const -0x1p-126)) (f32.const -0x1p-149))
-(assert_return (invoke "copysign" (f32.const -0x1p-149) (f32.const 0x1p-126)) (f32.const 0x1p-149))
-(assert_return (invoke "copysign" (f32.const 0x1p-149) (f32.const -0x1p-126)) (f32.const -0x1p-149))
-(assert_return (invoke "copysign" (f32.const 0x1p-149) (f32.const 0x1p-126)) (f32.const 0x1p-149))
-(assert_return (invoke "copysign" (f32.const -0x1p-149) (f32.const -0x1p-1)) (f32.const -0x1p-149))
-(assert_return (invoke "copysign" (f32.const -0x1p-149) (f32.const 0x1p-1)) (f32.const 0x1p-149))
-(assert_return (invoke "copysign" (f32.const 0x1p-149) (f32.const -0x1p-1)) (f32.const -0x1p-149))
-(assert_return (invoke "copysign" (f32.const 0x1p-149) (f32.const 0x1p-1)) (f32.const 0x1p-149))
-(assert_return (invoke "copysign" (f32.const -0x1p-149) (f32.const -0x1p+0)) (f32.const -0x1p-149))
-(assert_return (invoke "copysign" (f32.const -0x1p-149) (f32.const 0x1p+0)) (f32.const 0x1p-149))
-(assert_return (invoke "copysign" (f32.const 0x1p-149) (f32.const -0x1p+0)) (f32.const -0x1p-149))
-(assert_return (invoke "copysign" (f32.const 0x1p-149) (f32.const 0x1p+0)) (f32.const 0x1p-149))
-(assert_return (invoke "copysign" (f32.const -0x1p-149) (f32.const -0x1.921fb6p+2)) (f32.const -0x1p-149))
-(assert_return (invoke "copysign" (f32.const -0x1p-149) (f32.const 0x1.921fb6p+2)) (f32.const 0x1p-149))
-(assert_return (invoke "copysign" (f32.const 0x1p-149) (f32.const -0x1.921fb6p+2)) (f32.const -0x1p-149))
-(assert_return (invoke "copysign" (f32.const 0x1p-149) (f32.const 0x1.921fb6p+2)) (f32.const 0x1p-149))
-(assert_return (invoke "copysign" (f32.const -0x1p-149) (f32.const -0x1.fffffep+127)) (f32.const -0x1p-149))
-(assert_return (invoke "copysign" (f32.const -0x1p-149) (f32.const 0x1.fffffep+127)) (f32.const 0x1p-149))
-(assert_return (invoke "copysign" (f32.const 0x1p-149) (f32.const -0x1.fffffep+127)) (f32.const -0x1p-149))
-(assert_return (invoke "copysign" (f32.const 0x1p-149) (f32.const 0x1.fffffep+127)) (f32.const 0x1p-149))
-(assert_return (invoke "copysign" (f32.const -0x1p-149) (f32.const -inf)) (f32.const -0x1p-149))
-(assert_return (invoke "copysign" (f32.const -0x1p-149) (f32.const inf)) (f32.const 0x1p-149))
-(assert_return (invoke "copysign" (f32.const 0x1p-149) (f32.const -inf)) (f32.const -0x1p-149))
-(assert_return (invoke "copysign" (f32.const 0x1p-149) (f32.const inf)) (f32.const 0x1p-149))
-(assert_return (invoke "copysign" (f32.const -0x1p-149) (f32.const -nan)) (f32.const -0x1p-149))
-(assert_return (invoke "copysign" (f32.const -0x1p-149) (f32.const nan)) (f32.const 0x1p-149))
-(assert_return (invoke "copysign" (f32.const 0x1p-149) (f32.const -nan)) (f32.const -0x1p-149))
-(assert_return (invoke "copysign" (f32.const 0x1p-149) (f32.const nan)) (f32.const 0x1p-149))
-(assert_return (invoke "copysign" (f32.const -0x1p-126) (f32.const -0x0p+0)) (f32.const -0x1p-126))
-(assert_return (invoke "copysign" (f32.const -0x1p-126) (f32.const 0x0p+0)) (f32.const 0x1p-126))
-(assert_return (invoke "copysign" (f32.const 0x1p-126) (f32.const -0x0p+0)) (f32.const -0x1p-126))
-(assert_return (invoke "copysign" (f32.const 0x1p-126) (f32.const 0x0p+0)) (f32.const 0x1p-126))
-(assert_return (invoke "copysign" (f32.const -0x1p-126) (f32.const -0x1p-149)) (f32.const -0x1p-126))
-(assert_return (invoke "copysign" (f32.const -0x1p-126) (f32.const 0x1p-149)) (f32.const 0x1p-126))
-(assert_return (invoke "copysign" (f32.const 0x1p-126) (f32.const -0x1p-149)) (f32.const -0x1p-126))
-(assert_return (invoke "copysign" (f32.const 0x1p-126) (f32.const 0x1p-149)) (f32.const 0x1p-126))
-(assert_return (invoke "copysign" (f32.const -0x1p-126) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "copysign" (f32.const -0x1p-126) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "copysign" (f32.const 0x1p-126) (f32.const -0x1p-126)) (f32.const -0x1p-126))
-(assert_return (invoke "copysign" (f32.const 0x1p-126) (f32.const 0x1p-126)) (f32.const 0x1p-126))
-(assert_return (invoke "copysign" (f32.const -0x1p-126) (f32.const -0x1p-1)) (f32.const -0x1p-126))
-(assert_return (invoke "copysign" (f32.const -0x1p-126) (f32.const 0x1p-1)) (f32.const 0x1p-126))
-(assert_return (invoke "copysign" (f32.const 0x1p-126) (f32.const -0x1p-1)) (f32.const -0x1p-126))
-(assert_return (invoke "copysign" (f32.const 0x1p-126) (f32.const 0x1p-1)) (f32.const 0x1p-126))
-(assert_return (invoke "copysign" (f32.const -0x1p-126) (f32.const -0x1p+0)) (f32.const -0x1p-126))
-(assert_return (invoke "copysign" (f32.const -0x1p-126) (f32.const 0x1p+0)) (f32.const 0x1p-126))
-(assert_return (invoke "copysign" (f32.const 0x1p-126) (f32.const -0x1p+0)) (f32.const -0x1p-126))
-(assert_return (invoke "copysign" (f32.const 0x1p-126) (f32.const 0x1p+0)) (f32.const 0x1p-126))
-(assert_return (invoke "copysign" (f32.const -0x1p-126) (f32.const -0x1.921fb6p+2)) (f32.const -0x1p-126))
-(assert_return (invoke "copysign" (f32.const -0x1p-126) (f32.const 0x1.921fb6p+2)) (f32.const 0x1p-126))
-(assert_return (invoke "copysign" (f32.const 0x1p-126) (f32.const -0x1.921fb6p+2)) (f32.const -0x1p-126))
-(assert_return (invoke "copysign" (f32.const 0x1p-126) (f32.const 0x1.921fb6p+2)) (f32.const 0x1p-126))
-(assert_return (invoke "copysign" (f32.const -0x1p-126) (f32.const -0x1.fffffep+127)) (f32.const -0x1p-126))
-(assert_return (invoke "copysign" (f32.const -0x1p-126) (f32.const 0x1.fffffep+127)) (f32.const 0x1p-126))
-(assert_return (invoke "copysign" (f32.const 0x1p-126) (f32.const -0x1.fffffep+127)) (f32.const -0x1p-126))
-(assert_return (invoke "copysign" (f32.const 0x1p-126) (f32.const 0x1.fffffep+127)) (f32.const 0x1p-126))
-(assert_return (invoke "copysign" (f32.const -0x1p-126) (f32.const -inf)) (f32.const -0x1p-126))
-(assert_return (invoke "copysign" (f32.const -0x1p-126) (f32.const inf)) (f32.const 0x1p-126))
-(assert_return (invoke "copysign" (f32.const 0x1p-126) (f32.const -inf)) (f32.const -0x1p-126))
-(assert_return (invoke "copysign" (f32.const 0x1p-126) (f32.const inf)) (f32.const 0x1p-126))
-(assert_return (invoke "copysign" (f32.const -0x1p-126) (f32.const -nan)) (f32.const -0x1p-126))
-(assert_return (invoke "copysign" (f32.const -0x1p-126) (f32.const nan)) (f32.const 0x1p-126))
-(assert_return (invoke "copysign" (f32.const 0x1p-126) (f32.const -nan)) (f32.const -0x1p-126))
-(assert_return (invoke "copysign" (f32.const 0x1p-126) (f32.const nan)) (f32.const 0x1p-126))
-(assert_return (invoke "copysign" (f32.const -0x1p-1) (f32.const -0x0p+0)) (f32.const -0x1p-1))
-(assert_return (invoke "copysign" (f32.const -0x1p-1) (f32.const 0x0p+0)) (f32.const 0x1p-1))
-(assert_return (invoke "copysign" (f32.const 0x1p-1) (f32.const -0x0p+0)) (f32.const -0x1p-1))
-(assert_return (invoke "copysign" (f32.const 0x1p-1) (f32.const 0x0p+0)) (f32.const 0x1p-1))
-(assert_return (invoke "copysign" (f32.const -0x1p-1) (f32.const -0x1p-149)) (f32.const -0x1p-1))
-(assert_return (invoke "copysign" (f32.const -0x1p-1) (f32.const 0x1p-149)) (f32.const 0x1p-1))
-(assert_return (invoke "copysign" (f32.const 0x1p-1) (f32.const -0x1p-149)) (f32.const -0x1p-1))
-(assert_return (invoke "copysign" (f32.const 0x1p-1) (f32.const 0x1p-149)) (f32.const 0x1p-1))
-(assert_return (invoke "copysign" (f32.const -0x1p-1) (f32.const -0x1p-126)) (f32.const -0x1p-1))
-(assert_return (invoke "copysign" (f32.const -0x1p-1) (f32.const 0x1p-126)) (f32.const 0x1p-1))
-(assert_return (invoke "copysign" (f32.const 0x1p-1) (f32.const -0x1p-126)) (f32.const -0x1p-1))
-(assert_return (invoke "copysign" (f32.const 0x1p-1) (f32.const 0x1p-126)) (f32.const 0x1p-1))
-(assert_return (invoke "copysign" (f32.const -0x1p-1) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "copysign" (f32.const -0x1p-1) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "copysign" (f32.const 0x1p-1) (f32.const -0x1p-1)) (f32.const -0x1p-1))
-(assert_return (invoke "copysign" (f32.const 0x1p-1) (f32.const 0x1p-1)) (f32.const 0x1p-1))
-(assert_return (invoke "copysign" (f32.const -0x1p-1) (f32.const -0x1p+0)) (f32.const -0x1p-1))
-(assert_return (invoke "copysign" (f32.const -0x1p-1) (f32.const 0x1p+0)) (f32.const 0x1p-1))
-(assert_return (invoke "copysign" (f32.const 0x1p-1) (f32.const -0x1p+0)) (f32.const -0x1p-1))
-(assert_return (invoke "copysign" (f32.const 0x1p-1) (f32.const 0x1p+0)) (f32.const 0x1p-1))
-(assert_return (invoke "copysign" (f32.const -0x1p-1) (f32.const -0x1.921fb6p+2)) (f32.const -0x1p-1))
-(assert_return (invoke "copysign" (f32.const -0x1p-1) (f32.const 0x1.921fb6p+2)) (f32.const 0x1p-1))
-(assert_return (invoke "copysign" (f32.const 0x1p-1) (f32.const -0x1.921fb6p+2)) (f32.const -0x1p-1))
-(assert_return (invoke "copysign" (f32.const 0x1p-1) (f32.const 0x1.921fb6p+2)) (f32.const 0x1p-1))
-(assert_return (invoke "copysign" (f32.const -0x1p-1) (f32.const -0x1.fffffep+127)) (f32.const -0x1p-1))
-(assert_return (invoke "copysign" (f32.const -0x1p-1) (f32.const 0x1.fffffep+127)) (f32.const 0x1p-1))
-(assert_return (invoke "copysign" (f32.const 0x1p-1) (f32.const -0x1.fffffep+127)) (f32.const -0x1p-1))
-(assert_return (invoke "copysign" (f32.const 0x1p-1) (f32.const 0x1.fffffep+127)) (f32.const 0x1p-1))
-(assert_return (invoke "copysign" (f32.const -0x1p-1) (f32.const -inf)) (f32.const -0x1p-1))
-(assert_return (invoke "copysign" (f32.const -0x1p-1) (f32.const inf)) (f32.const 0x1p-1))
-(assert_return (invoke "copysign" (f32.const 0x1p-1) (f32.const -inf)) (f32.const -0x1p-1))
-(assert_return (invoke "copysign" (f32.const 0x1p-1) (f32.const inf)) (f32.const 0x1p-1))
-(assert_return (invoke "copysign" (f32.const -0x1p-1) (f32.const -nan)) (f32.const -0x1p-1))
-(assert_return (invoke "copysign" (f32.const -0x1p-1) (f32.const nan)) (f32.const 0x1p-1))
-(assert_return (invoke "copysign" (f32.const 0x1p-1) (f32.const -nan)) (f32.const -0x1p-1))
-(assert_return (invoke "copysign" (f32.const 0x1p-1) (f32.const nan)) (f32.const 0x1p-1))
-(assert_return (invoke "copysign" (f32.const -0x1p+0) (f32.const -0x0p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "copysign" (f32.const -0x1p+0) (f32.const 0x0p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "copysign" (f32.const 0x1p+0) (f32.const -0x0p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "copysign" (f32.const 0x1p+0) (f32.const 0x0p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "copysign" (f32.const -0x1p+0) (f32.const -0x1p-149)) (f32.const -0x1p+0))
-(assert_return (invoke "copysign" (f32.const -0x1p+0) (f32.const 0x1p-149)) (f32.const 0x1p+0))
-(assert_return (invoke "copysign" (f32.const 0x1p+0) (f32.const -0x1p-149)) (f32.const -0x1p+0))
-(assert_return (invoke "copysign" (f32.const 0x1p+0) (f32.const 0x1p-149)) (f32.const 0x1p+0))
-(assert_return (invoke "copysign" (f32.const -0x1p+0) (f32.const -0x1p-126)) (f32.const -0x1p+0))
-(assert_return (invoke "copysign" (f32.const -0x1p+0) (f32.const 0x1p-126)) (f32.const 0x1p+0))
-(assert_return (invoke "copysign" (f32.const 0x1p+0) (f32.const -0x1p-126)) (f32.const -0x1p+0))
-(assert_return (invoke "copysign" (f32.const 0x1p+0) (f32.const 0x1p-126)) (f32.const 0x1p+0))
-(assert_return (invoke "copysign" (f32.const -0x1p+0) (f32.const -0x1p-1)) (f32.const -0x1p+0))
-(assert_return (invoke "copysign" (f32.const -0x1p+0) (f32.const 0x1p-1)) (f32.const 0x1p+0))
-(assert_return (invoke "copysign" (f32.const 0x1p+0) (f32.const -0x1p-1)) (f32.const -0x1p+0))
-(assert_return (invoke "copysign" (f32.const 0x1p+0) (f32.const 0x1p-1)) (f32.const 0x1p+0))
-(assert_return (invoke "copysign" (f32.const -0x1p+0) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "copysign" (f32.const -0x1p+0) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "copysign" (f32.const 0x1p+0) (f32.const -0x1p+0)) (f32.const -0x1p+0))
-(assert_return (invoke "copysign" (f32.const 0x1p+0) (f32.const 0x1p+0)) (f32.const 0x1p+0))
-(assert_return (invoke "copysign" (f32.const -0x1p+0) (f32.const -0x1.921fb6p+2)) (f32.const -0x1p+0))
-(assert_return (invoke "copysign" (f32.const -0x1p+0) (f32.const 0x1.921fb6p+2)) (f32.const 0x1p+0))
-(assert_return (invoke "copysign" (f32.const 0x1p+0) (f32.const -0x1.921fb6p+2)) (f32.const -0x1p+0))
-(assert_return (invoke "copysign" (f32.const 0x1p+0) (f32.const 0x1.921fb6p+2)) (f32.const 0x1p+0))
-(assert_return (invoke "copysign" (f32.const -0x1p+0) (f32.const -0x1.fffffep+127)) (f32.const -0x1p+0))
-(assert_return (invoke "copysign" (f32.const -0x1p+0) (f32.const 0x1.fffffep+127)) (f32.const 0x1p+0))
-(assert_return (invoke "copysign" (f32.const 0x1p+0) (f32.const -0x1.fffffep+127)) (f32.const -0x1p+0))
-(assert_return (invoke "copysign" (f32.const 0x1p+0) (f32.const 0x1.fffffep+127)) (f32.const 0x1p+0))
-(assert_return (invoke "copysign" (f32.const -0x1p+0) (f32.const -inf)) (f32.const -0x1p+0))
-(assert_return (invoke "copysign" (f32.const -0x1p+0) (f32.const inf)) (f32.const 0x1p+0))
-(assert_return (invoke "copysign" (f32.const 0x1p+0) (f32.const -inf)) (f32.const -0x1p+0))
-(assert_return (invoke "copysign" (f32.const 0x1p+0) (f32.const inf)) (f32.const 0x1p+0))
-(assert_return (invoke "copysign" (f32.const -0x1p+0) (f32.const -nan)) (f32.const -0x1p+0))
-(assert_return (invoke "copysign" (f32.const -0x1p+0) (f32.const nan)) (f32.const 0x1p+0))
-(assert_return (invoke "copysign" (f32.const 0x1p+0) (f32.const -nan)) (f32.const -0x1p+0))
-(assert_return (invoke "copysign" (f32.const 0x1p+0) (f32.const nan)) (f32.const 0x1p+0))
-(assert_return (invoke "copysign" (f32.const -0x1.921fb6p+2) (f32.const -0x0p+0)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const -0x1.921fb6p+2) (f32.const 0x0p+0)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const 0x1.921fb6p+2) (f32.const -0x0p+0)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const 0x1.921fb6p+2) (f32.const 0x0p+0)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-149)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-149)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-149)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-149)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-126)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-126)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-126)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-126)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-1)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-1)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-1)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-1)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const -0x1.921fb6p+2) (f32.const -0x1p+0)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const -0x1.921fb6p+2) (f32.const 0x1p+0)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const 0x1.921fb6p+2) (f32.const -0x1p+0)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const 0x1.921fb6p+2) (f32.const 0x1p+0)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const -0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const -0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const 0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const 0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const -0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const -0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const 0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const 0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const -0x1.921fb6p+2) (f32.const -inf)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const -0x1.921fb6p+2) (f32.const inf)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const 0x1.921fb6p+2) (f32.const -inf)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const 0x1.921fb6p+2) (f32.const inf)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const -0x1.921fb6p+2) (f32.const -nan)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const -0x1.921fb6p+2) (f32.const nan)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const 0x1.921fb6p+2) (f32.const -nan)) (f32.const -0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const 0x1.921fb6p+2) (f32.const nan)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "copysign" (f32.const -0x1.fffffep+127) (f32.const -0x0p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const -0x1.fffffep+127) (f32.const 0x0p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const 0x1.fffffep+127) (f32.const -0x0p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const 0x1.fffffep+127) (f32.const 0x0p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const -0x1.fffffep+127) (f32.const -0x1p-149)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const -0x1.fffffep+127) (f32.const 0x1p-149)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const 0x1.fffffep+127) (f32.const -0x1p-149)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const 0x1.fffffep+127) (f32.const 0x1p-149)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const -0x1.fffffep+127) (f32.const -0x1p-126)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const -0x1.fffffep+127) (f32.const 0x1p-126)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const 0x1.fffffep+127) (f32.const -0x1p-126)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const 0x1.fffffep+127) (f32.const 0x1p-126)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const -0x1.fffffep+127) (f32.const -0x1p-1)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const -0x1.fffffep+127) (f32.const 0x1p-1)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const 0x1.fffffep+127) (f32.const -0x1p-1)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const 0x1.fffffep+127) (f32.const 0x1p-1)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const -0x1.fffffep+127) (f32.const -0x1p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const -0x1.fffffep+127) (f32.const 0x1p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const 0x1.fffffep+127) (f32.const -0x1p+0)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const 0x1.fffffep+127) (f32.const 0x1p+0)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const -0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const -0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const 0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const 0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const -0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const -0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const 0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const 0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const -0x1.fffffep+127) (f32.const -inf)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const -0x1.fffffep+127) (f32.const inf)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const 0x1.fffffep+127) (f32.const -inf)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const 0x1.fffffep+127) (f32.const inf)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const -0x1.fffffep+127) (f32.const -nan)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const -0x1.fffffep+127) (f32.const nan)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const 0x1.fffffep+127) (f32.const -nan)) (f32.const -0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const 0x1.fffffep+127) (f32.const nan)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "copysign" (f32.const -inf) (f32.const -0x0p+0)) (f32.const -inf))
-(assert_return (invoke "copysign" (f32.const -inf) (f32.const 0x0p+0)) (f32.const inf))
-(assert_return (invoke "copysign" (f32.const inf) (f32.const -0x0p+0)) (f32.const -inf))
-(assert_return (invoke "copysign" (f32.const inf) (f32.const 0x0p+0)) (f32.const inf))
-(assert_return (invoke "copysign" (f32.const -inf) (f32.const -0x1p-149)) (f32.const -inf))
-(assert_return (invoke "copysign" (f32.const -inf) (f32.const 0x1p-149)) (f32.const inf))
-(assert_return (invoke "copysign" (f32.const inf) (f32.const -0x1p-149)) (f32.const -inf))
-(assert_return (invoke "copysign" (f32.const inf) (f32.const 0x1p-149)) (f32.const inf))
-(assert_return (invoke "copysign" (f32.const -inf) (f32.const -0x1p-126)) (f32.const -inf))
-(assert_return (invoke "copysign" (f32.const -inf) (f32.const 0x1p-126)) (f32.const inf))
-(assert_return (invoke "copysign" (f32.const inf) (f32.const -0x1p-126)) (f32.const -inf))
-(assert_return (invoke "copysign" (f32.const inf) (f32.const 0x1p-126)) (f32.const inf))
-(assert_return (invoke "copysign" (f32.const -inf) (f32.const -0x1p-1)) (f32.const -inf))
-(assert_return (invoke "copysign" (f32.const -inf) (f32.const 0x1p-1)) (f32.const inf))
-(assert_return (invoke "copysign" (f32.const inf) (f32.const -0x1p-1)) (f32.const -inf))
-(assert_return (invoke "copysign" (f32.const inf) (f32.const 0x1p-1)) (f32.const inf))
-(assert_return (invoke "copysign" (f32.const -inf) (f32.const -0x1p+0)) (f32.const -inf))
-(assert_return (invoke "copysign" (f32.const -inf) (f32.const 0x1p+0)) (f32.const inf))
-(assert_return (invoke "copysign" (f32.const inf) (f32.const -0x1p+0)) (f32.const -inf))
-(assert_return (invoke "copysign" (f32.const inf) (f32.const 0x1p+0)) (f32.const inf))
-(assert_return (invoke "copysign" (f32.const -inf) (f32.const -0x1.921fb6p+2)) (f32.const -inf))
-(assert_return (invoke "copysign" (f32.const -inf) (f32.const 0x1.921fb6p+2)) (f32.const inf))
-(assert_return (invoke "copysign" (f32.const inf) (f32.const -0x1.921fb6p+2)) (f32.const -inf))
-(assert_return (invoke "copysign" (f32.const inf) (f32.const 0x1.921fb6p+2)) (f32.const inf))
-(assert_return (invoke "copysign" (f32.const -inf) (f32.const -0x1.fffffep+127)) (f32.const -inf))
-(assert_return (invoke "copysign" (f32.const -inf) (f32.const 0x1.fffffep+127)) (f32.const inf))
-(assert_return (invoke "copysign" (f32.const inf) (f32.const -0x1.fffffep+127)) (f32.const -inf))
-(assert_return (invoke "copysign" (f32.const inf) (f32.const 0x1.fffffep+127)) (f32.const inf))
-(assert_return (invoke "copysign" (f32.const -inf) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "copysign" (f32.const -inf) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "copysign" (f32.const inf) (f32.const -inf)) (f32.const -inf))
-(assert_return (invoke "copysign" (f32.const inf) (f32.const inf)) (f32.const inf))
-(assert_return (invoke "copysign" (f32.const -inf) (f32.const -nan)) (f32.const -inf))
-(assert_return (invoke "copysign" (f32.const -inf) (f32.const nan)) (f32.const inf))
-(assert_return (invoke "copysign" (f32.const inf) (f32.const -nan)) (f32.const -inf))
-(assert_return (invoke "copysign" (f32.const inf) (f32.const nan)) (f32.const inf))
-(assert_return (invoke "copysign" (f32.const -nan) (f32.const -0x0p+0)) (f32.const -nan))
-(assert_return (invoke "copysign" (f32.const -nan) (f32.const 0x0p+0)) (f32.const nan))
-(assert_return (invoke "copysign" (f32.const nan) (f32.const -0x0p+0)) (f32.const -nan))
-(assert_return (invoke "copysign" (f32.const nan) (f32.const 0x0p+0)) (f32.const nan))
-(assert_return (invoke "copysign" (f32.const -nan) (f32.const -0x1p-149)) (f32.const -nan))
-(assert_return (invoke "copysign" (f32.const -nan) (f32.const 0x1p-149)) (f32.const nan))
-(assert_return (invoke "copysign" (f32.const nan) (f32.const -0x1p-149)) (f32.const -nan))
-(assert_return (invoke "copysign" (f32.const nan) (f32.const 0x1p-149)) (f32.const nan))
-(assert_return (invoke "copysign" (f32.const -nan) (f32.const -0x1p-126)) (f32.const -nan))
-(assert_return (invoke "copysign" (f32.const -nan) (f32.const 0x1p-126)) (f32.const nan))
-(assert_return (invoke "copysign" (f32.const nan) (f32.const -0x1p-126)) (f32.const -nan))
-(assert_return (invoke "copysign" (f32.const nan) (f32.const 0x1p-126)) (f32.const nan))
-(assert_return (invoke "copysign" (f32.const -nan) (f32.const -0x1p-1)) (f32.const -nan))
-(assert_return (invoke "copysign" (f32.const -nan) (f32.const 0x1p-1)) (f32.const nan))
-(assert_return (invoke "copysign" (f32.const nan) (f32.const -0x1p-1)) (f32.const -nan))
-(assert_return (invoke "copysign" (f32.const nan) (f32.const 0x1p-1)) (f32.const nan))
-(assert_return (invoke "copysign" (f32.const -nan) (f32.const -0x1p+0)) (f32.const -nan))
-(assert_return (invoke "copysign" (f32.const -nan) (f32.const 0x1p+0)) (f32.const nan))
-(assert_return (invoke "copysign" (f32.const nan) (f32.const -0x1p+0)) (f32.const -nan))
-(assert_return (invoke "copysign" (f32.const nan) (f32.const 0x1p+0)) (f32.const nan))
-(assert_return (invoke "copysign" (f32.const -nan) (f32.const -0x1.921fb6p+2)) (f32.const -nan))
-(assert_return (invoke "copysign" (f32.const -nan) (f32.const 0x1.921fb6p+2)) (f32.const nan))
-(assert_return (invoke "copysign" (f32.const nan) (f32.const -0x1.921fb6p+2)) (f32.const -nan))
-(assert_return (invoke "copysign" (f32.const nan) (f32.const 0x1.921fb6p+2)) (f32.const nan))
-(assert_return (invoke "copysign" (f32.const -nan) (f32.const -0x1.fffffep+127)) (f32.const -nan))
-(assert_return (invoke "copysign" (f32.const -nan) (f32.const 0x1.fffffep+127)) (f32.const nan))
-(assert_return (invoke "copysign" (f32.const nan) (f32.const -0x1.fffffep+127)) (f32.const -nan))
-(assert_return (invoke "copysign" (f32.const nan) (f32.const 0x1.fffffep+127)) (f32.const nan))
-(assert_return (invoke "copysign" (f32.const -nan) (f32.const -inf)) (f32.const -nan))
-(assert_return (invoke "copysign" (f32.const -nan) (f32.const inf)) (f32.const nan))
-(assert_return (invoke "copysign" (f32.const nan) (f32.const -inf)) (f32.const -nan))
-(assert_return (invoke "copysign" (f32.const nan) (f32.const inf)) (f32.const nan))
-(assert_return (invoke "copysign" (f32.const -nan) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "copysign" (f32.const -nan) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "copysign" (f32.const nan) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "copysign" (f32.const nan) (f32.const nan)) (f32.const nan))
 (assert_return (invoke "abs" (f32.const -0x0p+0)) (f32.const 0x0p+0))
 (assert_return (invoke "abs" (f32.const 0x0p+0)) (f32.const 0x0p+0))
 (assert_return (invoke "abs" (f32.const -0x1p-149)) (f32.const 0x1p-149))
diff --git a/tests/misc_testsuite/winch/f32_cmp.wast b/tests/misc_testsuite/winch/f32_cmp.wast
deleted file mode 100644
index e01153feadbb..000000000000
--- a/tests/misc_testsuite/winch/f32_cmp.wast
+++ /dev/null
@@ -1,2412 +0,0 @@
-;; Test all the f32 comparison operators on major boundary values and all
-;; special values.
-
-(module
-  (func (export "eq") (param $x f32) (param $y f32) (result i32) (f32.eq (local.get $x) (local.get $y)))
-  (func (export "ne") (param $x f32) (param $y f32) (result i32) (f32.ne (local.get $x) (local.get $y)))
-  (func (export "lt") (param $x f32) (param $y f32) (result i32) (f32.lt (local.get $x) (local.get $y)))
-  (func (export "le") (param $x f32) (param $y f32) (result i32) (f32.le (local.get $x) (local.get $y)))
-  (func (export "gt") (param $x f32) (param $y f32) (result i32) (f32.gt (local.get $x) (local.get $y)))
-  (func (export "ge") (param $x f32) (param $y f32) (result i32) (f32.ge (local.get $x) (local.get $y)))
-)
-
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x0p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x0p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-149) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-149) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-126) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-126) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p-1) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p-1) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.921fb6p+2) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.921fb6p+2) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -0x1.fffffep+127) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const 0x1.fffffep+127) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -inf) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const inf) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const -nan:0x200000) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "eq" (f32.const nan:0x200000) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x0p+0) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x0p+0) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-149) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-149) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-126) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-126) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p-1) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p-1) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1p+0) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1p+0) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.921fb6p+2) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.921fb6p+2) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -0x1.fffffep+127) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const 0x1.fffffep+127) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -inf) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const inf) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const -nan:0x200000) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const -nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "ne" (f32.const nan:0x200000) (f32.const nan:0x200000)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x0p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x0p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-149) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-149) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-126) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-126) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p-1) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p-1) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.921fb6p+2) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.921fb6p+2) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -0x1.fffffep+127) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const 0x1.fffffep+127) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const inf) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const inf) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const inf) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const inf) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const inf) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const inf) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const inf) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const inf) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const inf) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const inf) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const inf) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const inf) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const inf) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const inf) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f32.const inf) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const inf) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -inf) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const inf) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const inf) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const inf) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const inf) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const -nan:0x200000) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "lt" (f32.const nan:0x200000) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x0p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x0p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-149) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-149) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-126) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-126) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p-1) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p-1) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.921fb6p+2) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.921fb6p+2) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -0x1.fffffep+127) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const 0x1.fffffep+127) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -inf) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -inf) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const inf) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const inf) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -inf) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -inf) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "le" (f32.const inf) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const inf) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -inf) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -inf) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "le" (f32.const inf) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const inf) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -inf) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -inf) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f32.const inf) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const inf) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -inf) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -inf) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f32.const inf) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const inf) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -inf) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -inf) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "le" (f32.const inf) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const inf) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -inf) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -inf) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "le" (f32.const inf) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const inf) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -inf) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -inf) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f32.const inf) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const inf) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f32.const -inf) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -inf) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -inf) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -inf) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const inf) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const inf) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const inf) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const inf) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const -nan:0x200000) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "le" (f32.const nan:0x200000) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x0p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x0p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-149) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-149) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-126) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-126) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p-1) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p-1) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.921fb6p+2) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.921fb6p+2) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -0x1.fffffep+127) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const 0x1.fffffep+127) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const inf) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const inf) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const inf) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const inf) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const inf) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const inf) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const inf) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const inf) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const inf) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const inf) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const inf) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const inf) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const inf) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const inf) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const inf) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f32.const inf) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -inf) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const inf) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const inf) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const inf) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const inf) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const -nan:0x200000) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "gt" (f32.const nan:0x200000) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x0p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x0p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-149) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-149) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-126) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-126) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p-1) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p-1) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1p+0) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.921fb6p+2) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.921fb6p+2) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -0x1.fffffep+127) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const 0x1.fffffep+127) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const inf) (f32.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const inf) (f32.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const inf) (f32.const -0x1p-149)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const inf) (f32.const 0x1p-149)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const inf) (f32.const -0x1p-126)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const inf) (f32.const 0x1p-126)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const inf) (f32.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const inf) (f32.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const inf) (f32.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const inf) (f32.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const inf) (f32.const -0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const inf) (f32.const 0x1.921fb6p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const inf) (f32.const -0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const inf) (f32.const 0x1.fffffep+127)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const inf) (f32.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const inf) (f32.const inf)) (i32.const 1))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -inf) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const inf) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const inf) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const inf) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const inf) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const -0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const 0x1p-149)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const -0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const 0x1p-126)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const -0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const 0x1.921fb6p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const -0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const 0x1.fffffep+127)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const -inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const -nan:0x200000) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const -nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan) (f32.const nan:0x200000)) (i32.const 0))
-(assert_return (invoke "ge" (f32.const nan:0x200000) (f32.const nan:0x200000)) (i32.const 0))
diff --git a/tests/misc_testsuite/winch/f64.wast b/tests/misc_testsuite/winch/f64.wast
index 0654530abd72..7acb99be620c 100644
--- a/tests/misc_testsuite/winch/f64.wast
+++ b/tests/misc_testsuite/winch/f64.wast
@@ -329,2439 +329,12 @@
 (assert_return (invoke "type-first-f64") (f64.const 1.64))
 
 (module
-  (func (export "add") (param $x f64) (param $y f64) (result f64) (f64.add (local.get $x) (local.get $y)))
-  (func (export "sub") (param $x f64) (param $y f64) (result f64) (f64.sub (local.get $x) (local.get $y)))
-  (func (export "mul") (param $x f64) (param $y f64) (result f64) (f64.mul (local.get $x) (local.get $y)))
-  (func (export "div") (param $x f64) (param $y f64) (result f64) (f64.div (local.get $x) (local.get $y)))
-  (func (export "sqrt") (param $x f64) (result f64) (f64.sqrt (local.get $x)))
-  (func (export "min") (param $x f64) (param $y f64) (result f64) (f64.min (local.get $x) (local.get $y)))
-  (func (export "max") (param $x f64) (param $y f64) (result f64) (f64.max (local.get $x) (local.get $y)))
   (func (export "ceil") (param $x f64) (result f64) (f64.ceil (local.get $x)))
   (func (export "floor") (param $x f64) (result f64) (f64.floor (local.get $x)))
   (func (export "trunc") (param $x f64) (result f64) (f64.trunc (local.get $x)))
   (func (export "nearest") (param $x f64) (result f64) (f64.nearest (local.get $x)))
 )
 
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const -0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -0x0p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const 0x0p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0p+0)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0p+0)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0p+0)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0p+0)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000002p-1022))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000002p-1022))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (f64.const -0x1.0000000000001p-1022))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (f64.const 0x0.fffffffffffffp-1022))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (f64.const -0x0.fffffffffffffp-1022))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (f64.const 0x1.0000000000001p-1022))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const 0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const -0x0p+0)) (f64.const -0x1p-1022))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const 0x0p+0)) (f64.const -0x1p-1022))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const -0x0p+0)) (f64.const 0x1p-1022))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const 0x0p+0)) (f64.const 0x1p-1022))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1.0000000000001p-1022))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x0.fffffffffffffp-1022))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x0.fffffffffffffp-1022))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1.0000000000001p-1022))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const -0x1p-1022)) (f64.const -0x1p-1021))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const 0x1p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const -0x1p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const 0x1p-1022)) (f64.const 0x1p-1021))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -0x1p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const 0x1p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const -0x0p+0)) (f64.const -0x1p-1))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const 0x0p+0)) (f64.const -0x1p-1))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const -0x0p+0)) (f64.const 0x1p-1))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const 0x0p+0)) (f64.const 0x1p-1))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1p-1))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x1p-1))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x1p-1))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1p-1))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const -0x1p-1022)) (f64.const -0x1p-1))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const 0x1p-1022)) (f64.const -0x1p-1))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const -0x1p-1022)) (f64.const 0x1p-1))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const 0x1p-1022)) (f64.const 0x1p-1))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const -0x1p-1)) (f64.const -0x1p+0))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const 0x1p-1)) (f64.const 0x0p+0))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const -0x1p-1)) (f64.const 0x0p+0))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const 0x1p-1)) (f64.const 0x1p+0))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const -0x1p+0)) (f64.const -0x1.8p+0))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const 0x1p+0)) (f64.const 0x1p-1))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const -0x1p+0)) (f64.const -0x1p-1))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const 0x1p+0)) (f64.const 0x1.8p+0))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.b21fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.721fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.721fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.b21fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -0x1p-1) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const 0x1p-1) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const -0x0p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const 0x0p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const -0x0p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const 0x0p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const -0x1p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const 0x1p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const -0x1p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const 0x1p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const -0x1p-1)) (f64.const -0x1.8p+0))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const 0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const -0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const 0x1p-1)) (f64.const 0x1.8p+0))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const -0x1p+0)) (f64.const -0x1p+1))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const 0x1p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const -0x1p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const 0x1p+0)) (f64.const 0x1p+1))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.d21fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.521fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.521fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.d21fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -0x1p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const 0x1p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (f64.const -0x1.b21fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (f64.const -0x1.721fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (f64.const 0x1.721fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (f64.const 0x1.b21fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (f64.const -0x1.d21fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (f64.const -0x1.521fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (f64.const 0x1.521fb54442d18p+2))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (f64.const 0x1.d21fb54442d18p+2))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+3))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x0p+0))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x0p+0))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+3))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const 0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x0p+0))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x0p+0))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (f64.const inf))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -inf) (f64.const -0x0p+0)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const -inf) (f64.const 0x0p+0)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const inf) (f64.const -0x0p+0)) (f64.const inf))
-(assert_return (invoke "add" (f64.const inf) (f64.const 0x0p+0)) (f64.const inf))
-(assert_return (invoke "add" (f64.const -inf) (f64.const -0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const -inf) (f64.const 0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const inf) (f64.const -0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "add" (f64.const inf) (f64.const 0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "add" (f64.const -inf) (f64.const -0x1p-1022)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const -inf) (f64.const 0x1p-1022)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const inf) (f64.const -0x1p-1022)) (f64.const inf))
-(assert_return (invoke "add" (f64.const inf) (f64.const 0x1p-1022)) (f64.const inf))
-(assert_return (invoke "add" (f64.const -inf) (f64.const -0x1p-1)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const -inf) (f64.const 0x1p-1)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const inf) (f64.const -0x1p-1)) (f64.const inf))
-(assert_return (invoke "add" (f64.const inf) (f64.const 0x1p-1)) (f64.const inf))
-(assert_return (invoke "add" (f64.const -inf) (f64.const -0x1p+0)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const -inf) (f64.const 0x1p+0)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const inf) (f64.const -0x1p+0)) (f64.const inf))
-(assert_return (invoke "add" (f64.const inf) (f64.const 0x1p+0)) (f64.const inf))
-(assert_return (invoke "add" (f64.const -inf) (f64.const -0x1.921fb54442d18p+2)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const -inf) (f64.const 0x1.921fb54442d18p+2)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const inf) (f64.const -0x1.921fb54442d18p+2)) (f64.const inf))
-(assert_return (invoke "add" (f64.const inf) (f64.const 0x1.921fb54442d18p+2)) (f64.const inf))
-(assert_return (invoke "add" (f64.const -inf) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const -inf) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const inf) (f64.const -0x1.fffffffffffffp+1023)) (f64.const inf))
-(assert_return (invoke "add" (f64.const inf) (f64.const 0x1.fffffffffffffp+1023)) (f64.const inf))
-(assert_return (invoke "add" (f64.const -inf) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "add" (f64.const -inf) (f64.const inf)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const inf) (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const inf) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "add" (f64.const -inf) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -inf) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -inf) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -inf) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const inf) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const inf) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const inf) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const inf) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const -0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const -0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const 0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const 0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const -0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const -0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const 0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const 0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const -0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const 0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const -0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const -0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const 0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const 0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const -0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const 0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const -0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const -0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const 0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const 0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const -0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const -0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const 0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const 0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const -0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const -0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const 0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const 0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const -inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const inf)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const -inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const inf)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const -nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const -nan:0x4000000000000) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const -nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "add" (f64.const nan:0x4000000000000) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const -0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const 0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const -0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const -0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const 0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const -0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const 0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const -0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const 0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const -0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const 0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const -0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const 0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const -0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const 0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -0x0p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const 0x0p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0p+0)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0p+0)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0p+0)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0p+0)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x0.0000000000002p-1022))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x0.0000000000002p-1022))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (f64.const 0x0.fffffffffffffp-1022))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (f64.const -0x1.0000000000001p-1022))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (f64.const 0x1.0000000000001p-1022))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (f64.const -0x0.fffffffffffffp-1022))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const 0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const -0x0p+0)) (f64.const -0x1p-1022))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const 0x0p+0)) (f64.const -0x1p-1022))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const -0x0p+0)) (f64.const 0x1p-1022))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const 0x0p+0)) (f64.const 0x1p-1022))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.fffffffffffffp-1022))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x1.0000000000001p-1022))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x1.0000000000001p-1022))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.fffffffffffffp-1022))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const -0x1p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const 0x1p-1022)) (f64.const -0x1p-1021))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const -0x1p-1022)) (f64.const 0x1p-1021))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const 0x1p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const -0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const 0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const -0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const 0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const -0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const 0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const -0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const 0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -0x1p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const 0x1p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const -0x0p+0)) (f64.const -0x1p-1))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const 0x0p+0)) (f64.const -0x1p-1))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const -0x0p+0)) (f64.const 0x1p-1))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const 0x0p+0)) (f64.const 0x1p-1))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1p-1))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x1p-1))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x1p-1))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1p-1))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const -0x1p-1022)) (f64.const -0x1p-1))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const 0x1p-1022)) (f64.const -0x1p-1))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const -0x1p-1022)) (f64.const 0x1p-1))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const 0x1p-1022)) (f64.const 0x1p-1))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const -0x1p-1)) (f64.const 0x0p+0))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const 0x1p-1)) (f64.const -0x1p+0))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const -0x1p-1)) (f64.const 0x1p+0))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const 0x1p-1)) (f64.const 0x0p+0))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const -0x1p+0)) (f64.const 0x1p-1))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const 0x1p+0)) (f64.const -0x1.8p+0))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const -0x1p+0)) (f64.const 0x1.8p+0))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const 0x1p+0)) (f64.const -0x1p-1))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.721fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.b21fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.b21fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.721fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -0x1p-1) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const 0x1p-1) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const -0x0p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const 0x0p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const -0x0p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const 0x0p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const -0x1p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const 0x1p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const -0x1p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const 0x1p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const 0x1p-1)) (f64.const -0x1.8p+0))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const -0x1p-1)) (f64.const 0x1.8p+0))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const -0x1p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const 0x1p+0)) (f64.const -0x1p+1))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const -0x1p+0)) (f64.const 0x1p+1))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const 0x1p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.521fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.d21fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.d21fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.521fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -0x1p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const 0x1p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (f64.const -0x1.721fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (f64.const -0x1.b21fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (f64.const 0x1.b21fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (f64.const 0x1.721fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (f64.const -0x1.521fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (f64.const -0x1.d21fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (f64.const 0x1.d21fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (f64.const 0x1.521fb54442d18p+2))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x0p+0))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+3))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+3))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x0p+0))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const 0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x0p+0))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x0p+0))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const -0x0p+0)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const 0x0p+0)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const inf) (f64.const -0x0p+0)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const inf) (f64.const 0x0p+0)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const -0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const 0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const inf) (f64.const -0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const inf) (f64.const 0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const -0x1p-1022)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const 0x1p-1022)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const inf) (f64.const -0x1p-1022)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const inf) (f64.const 0x1p-1022)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const -0x1p-1)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const 0x1p-1)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const inf) (f64.const -0x1p-1)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const inf) (f64.const 0x1p-1)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const -0x1p+0)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const 0x1p+0)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const inf) (f64.const -0x1p+0)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const inf) (f64.const 0x1p+0)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const -0x1.921fb54442d18p+2)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const 0x1.921fb54442d18p+2)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const inf) (f64.const -0x1.921fb54442d18p+2)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const inf) (f64.const 0x1.921fb54442d18p+2)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const inf) (f64.const -0x1.fffffffffffffp+1023)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const inf) (f64.const 0x1.fffffffffffffp+1023)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "sub" (f64.const inf) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "sub" (f64.const inf) (f64.const inf)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -inf) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const inf) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const inf) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const inf) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const inf) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const -0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const -0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const 0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const 0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const -0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const -0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const 0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const 0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const -0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const 0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const -0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const -0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const 0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const 0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const -0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const 0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const -0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const -0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const 0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const 0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const -0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const -0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const 0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const 0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const -0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const -0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const 0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const 0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const -inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const inf)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const -inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const inf)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const -nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const -nan:0x4000000000000) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const -nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sub" (f64.const nan:0x4000000000000) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const -0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const 0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const -0x1p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const 0x1p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const -0x1p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const 0x1p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const -0x1p-1)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const 0x1p-1)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const -0x1p-1)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const 0x1p-1)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const -0x1p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const 0x1p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const -0x1p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const 0x1p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const inf)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const inf)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -0x0p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const 0x0p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p+0)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p+0)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p+0)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p+0)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x0.0000000000006p-1022))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x0.0000000000006p-1022))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x0.0000000000006p-1022))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x0.0000000000006p-1022))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp-51))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp-51))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp-51))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp-51))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const 0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const -0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const 0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const -0x1p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const 0x1p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const -0x1p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const 0x1p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const -0x1p-1)) (f64.const 0x0.8p-1022))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const 0x1p-1)) (f64.const -0x0.8p-1022))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const -0x1p-1)) (f64.const -0x0.8p-1022))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const 0x1p-1)) (f64.const 0x0.8p-1022))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const -0x1p+0)) (f64.const 0x1p-1022))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const 0x1p+0)) (f64.const -0x1p-1022))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const -0x1p+0)) (f64.const -0x1p-1022))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const 0x1p+0)) (f64.const 0x1p-1022))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p-1020))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p-1020))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p-1020))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p-1020))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -0x1p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const 0x1p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const -0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const 0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const -0x1p-1022)) (f64.const 0x0.8p-1022))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const 0x1p-1022)) (f64.const -0x0.8p-1022))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const -0x1p-1022)) (f64.const -0x0.8p-1022))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const 0x1p-1022)) (f64.const 0x0.8p-1022))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const -0x1p-1)) (f64.const 0x1p-2))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const 0x1p-1)) (f64.const -0x1p-2))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const -0x1p-1)) (f64.const -0x1p-2))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const 0x1p-1)) (f64.const 0x1p-2))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const -0x1p+0)) (f64.const 0x1p-1))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const 0x1p+0)) (f64.const -0x1p-1))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const -0x1p+0)) (f64.const -0x1p-1))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const 0x1p+0)) (f64.const 0x1p-1))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+1))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+1))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+1))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+1))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1022))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1022))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1022))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1022))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -0x1p-1) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const 0x1p-1) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const -0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const 0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const -0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const 0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const -0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const 0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const -0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const 0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -0x1p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const 0x1p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x0.0000000000006p-1022))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x0.0000000000006p-1022))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000006p-1022))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000006p-1022))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (f64.const 0x1.921fb54442d18p-1020))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (f64.const -0x1.921fb54442d18p-1020))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (f64.const -0x1.921fb54442d18p-1020))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (f64.const 0x1.921fb54442d18p-1020))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (f64.const 0x1.921fb54442d18p+1))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (f64.const -0x1.921fb54442d18p+1))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (f64.const -0x1.921fb54442d18p+1))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (f64.const 0x1.921fb54442d18p+1))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.3bd3cc9be45dep+5))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.3bd3cc9be45dep+5))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.3bd3cc9be45dep+5))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.3bd3cc9be45dep+5))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const 0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x1.fffffffffffffp-51))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x1.fffffffffffffp-51))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1.fffffffffffffp-51))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1.fffffffffffffp-51))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (f64.const 0x1.fffffffffffffp+1))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (f64.const -0x1.fffffffffffffp+1))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (f64.const -0x1.fffffffffffffp+1))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (f64.const 0x1.fffffffffffffp+1))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (f64.const 0x1.fffffffffffffp+1022))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (f64.const -0x1.fffffffffffffp+1022))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (f64.const -0x1.fffffffffffffp+1022))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (f64.const 0x1.fffffffffffffp+1022))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const -0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const 0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const inf) (f64.const -0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const inf) (f64.const 0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const -0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const 0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const inf) (f64.const -0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const inf) (f64.const 0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const -0x1p-1022)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const 0x1p-1022)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const inf) (f64.const -0x1p-1022)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const inf) (f64.const 0x1p-1022)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const -0x1p-1)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const 0x1p-1)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const inf) (f64.const -0x1p-1)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const inf) (f64.const 0x1p-1)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const -0x1p+0)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const 0x1p+0)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const inf) (f64.const -0x1p+0)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const inf) (f64.const 0x1p+0)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const -0x1.921fb54442d18p+2)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const 0x1.921fb54442d18p+2)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const inf) (f64.const -0x1.921fb54442d18p+2)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const inf) (f64.const 0x1.921fb54442d18p+2)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const -0x1.fffffffffffffp+1023)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const inf) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const inf) (f64.const 0x1.fffffffffffffp+1023)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const inf) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "mul" (f64.const inf) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -inf) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const inf) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const inf) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const inf) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const inf) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const -0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const -0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const 0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const 0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const -0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const -0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const 0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const 0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const -0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const 0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const -0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const -0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const 0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const 0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const -0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const 0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const -0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const -0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const 0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const 0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const -0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const -0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const 0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const 0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const -0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const -0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const 0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const 0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const -inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const inf)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const -inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const inf)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const -nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const -nan:0x4000000000000) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const -nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "mul" (f64.const nan:0x4000000000000) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const -0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const 0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const -0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const 0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const -0x1p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const 0x1p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const -0x1p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const 0x1p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const -0x1p-1)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const 0x1p-1)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const -0x1p-1)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const 0x1p-1)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const -0x1p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const 0x1p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const -0x1p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const 0x1p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const -inf)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const inf)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const -inf)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const inf)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -0x0p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const 0x0p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0p+0)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0p+0)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0p+0)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0p+0)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (f64.const 0x1p-52))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (f64.const -0x1p-52))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (f64.const -0x1p-52))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (f64.const 0x1p-52))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1)) (f64.const 0x0.0000000000002p-1022))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1)) (f64.const -0x0.0000000000002p-1022))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1)) (f64.const -0x0.0000000000002p-1022))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1)) (f64.const 0x0.0000000000002p-1022))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p+0)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p+0)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p+0)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p+0)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const -inf)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const inf)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const -inf)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const inf)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const 0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const -0x0p+0)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const 0x0p+0)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const -0x0p+0)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const 0x0p+0)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x1p+52))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x1p+52))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1p+52))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1p+52))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const -0x1p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const 0x1p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const -0x1p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const 0x1p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const -0x1p-1)) (f64.const 0x1p-1021))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const 0x1p-1)) (f64.const -0x1p-1021))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const -0x1p-1)) (f64.const -0x1p-1021))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const 0x1p-1)) (f64.const 0x1p-1021))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const -0x1p+0)) (f64.const 0x1p-1022))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const 0x1p+0)) (f64.const -0x1p-1022))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const -0x1p+0)) (f64.const -0x1p-1022))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const 0x1p+0)) (f64.const 0x1p-1022))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x0.28be60db9391p-1022))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x0.28be60db9391p-1022))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x0.28be60db9391p-1022))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x0.28be60db9391p-1022))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const -inf)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const inf)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const -inf)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const inf)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -0x1p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const 0x1p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const -0x0p+0)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const 0x0p+0)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const -0x0p+0)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const 0x0p+0)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const -0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const 0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const -0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const 0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const -0x1p-1022)) (f64.const 0x1p+1021))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const 0x1p-1022)) (f64.const -0x1p+1021))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const -0x1p-1022)) (f64.const -0x1p+1021))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const 0x1p-1022)) (f64.const 0x1p+1021))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const -0x1p-1)) (f64.const 0x1p+0))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const 0x1p-1)) (f64.const -0x1p+0))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const -0x1p-1)) (f64.const -0x1p+0))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const 0x1p-1)) (f64.const 0x1p+0))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const -0x1p+0)) (f64.const 0x1p-1))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const 0x1p+0)) (f64.const -0x1p-1))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const -0x1p+0)) (f64.const -0x1p-1))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const 0x1p+0)) (f64.const 0x1p-1))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.45f306dc9c883p-4))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.45f306dc9c883p-4))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.45f306dc9c883p-4))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.45f306dc9c883p-4))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x0.2p-1022))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x0.2p-1022))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x0.2p-1022))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x0.2p-1022))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const -inf)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const inf)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const -inf)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const inf)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -0x1p-1) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const 0x1p-1) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const -0x0p+0)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const 0x0p+0)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const -0x0p+0)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const 0x0p+0)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const -0x1p-1022)) (f64.const 0x1p+1022))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const 0x1p-1022)) (f64.const -0x1p+1022))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const -0x1p-1022)) (f64.const -0x1p+1022))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const 0x1p-1022)) (f64.const 0x1p+1022))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const -0x1p-1)) (f64.const 0x1p+1))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const 0x1p-1)) (f64.const -0x1p+1))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const -0x1p-1)) (f64.const -0x1p+1))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const 0x1p-1)) (f64.const 0x1p+1))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const -0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const 0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.45f306dc9c883p-3))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.45f306dc9c883p-3))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.45f306dc9c883p-3))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.45f306dc9c883p-3))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x0.4p-1022))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x0.4p-1022))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x0.4p-1022))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x0.4p-1022))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const -inf)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const inf)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const -inf)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const inf)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -0x1p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const 0x1p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (f64.const 0x1.921fb54442d18p+3))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (f64.const -0x1.921fb54442d18p+3))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (f64.const -0x1.921fb54442d18p+3))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (f64.const 0x1.921fb54442d18p+3))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1p+0))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1p+0))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1p+0))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1p+0))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.921fb54442d19p-1022))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.921fb54442d19p-1022))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.921fb54442d19p-1022))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.921fb54442d19p-1022))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const -inf)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const inf)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const -inf)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const inf)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const 0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.45f306dc9c882p+1021))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.45f306dc9c882p+1021))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.45f306dc9c882p+1021))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.45f306dc9c882p+1021))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1p+0))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1p+0))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1p+0))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1p+0))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const -inf)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const inf)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const -inf)) (f64.const -0x0p+0))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const inf)) (f64.const 0x0p+0))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -inf) (f64.const -0x0p+0)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -inf) (f64.const 0x0p+0)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const inf) (f64.const -0x0p+0)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const inf) (f64.const 0x0p+0)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -inf) (f64.const -0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -inf) (f64.const 0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const inf) (f64.const -0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const inf) (f64.const 0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -inf) (f64.const -0x1p-1022)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -inf) (f64.const 0x1p-1022)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const inf) (f64.const -0x1p-1022)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const inf) (f64.const 0x1p-1022)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -inf) (f64.const -0x1p-1)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -inf) (f64.const 0x1p-1)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const inf) (f64.const -0x1p-1)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const inf) (f64.const 0x1p-1)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -inf) (f64.const -0x1p+0)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -inf) (f64.const 0x1p+0)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const inf) (f64.const -0x1p+0)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const inf) (f64.const 0x1p+0)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -inf) (f64.const -0x1.921fb54442d18p+2)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -inf) (f64.const 0x1.921fb54442d18p+2)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const inf) (f64.const -0x1.921fb54442d18p+2)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const inf) (f64.const 0x1.921fb54442d18p+2)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -inf) (f64.const -0x1.fffffffffffffp+1023)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -inf) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const inf) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -inf))
-(assert_return (invoke "div" (f64.const inf) (f64.const 0x1.fffffffffffffp+1023)) (f64.const inf))
-(assert_return (invoke "div" (f64.const -inf) (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -inf) (f64.const inf)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const inf) (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const inf) (f64.const inf)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -inf) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -inf) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -inf) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -inf) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const inf) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const inf) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const inf) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const inf) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const -0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const -0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const 0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const 0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const -0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const -0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const 0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const 0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const -0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const 0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const -0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const -0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const 0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const 0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const -0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const 0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const -0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const -0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const 0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const 0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const -0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const -0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const 0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const 0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const -0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const -0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const 0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const 0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const -inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const inf)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const -inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const inf)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const -nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const -nan:0x4000000000000) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const -nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "div" (f64.const nan:0x4000000000000) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const 0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const 0x1p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const 0x1p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const 0x1p-1)) (f64.const -0x0p+0))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const 0x1p-1)) (f64.const 0x0p+0))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const 0x1p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const 0x1p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x0p+0))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x0p+0))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x0p+0))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x0p+0))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const inf)) (f64.const -0x0p+0))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const inf)) (f64.const 0x0p+0))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0p+0)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0p+0)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p+0)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p+0)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const inf)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const inf)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const -0x0p+0)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const 0x0p+0)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const 0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const 0x1p-1)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const 0x1p-1)) (f64.const 0x1p-1022))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const 0x1p+0)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const 0x1p+0)) (f64.const 0x1p-1022))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1p-1022))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1p-1022))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const inf)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const inf)) (f64.const 0x1p-1022))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const -0x0p+0)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const 0x0p+0)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const -0x1p-1022)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const 0x1p-1022)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const 0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const 0x1p+0)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const 0x1p+0)) (f64.const 0x1p-1))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1p-1))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1p-1))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const inf)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const inf)) (f64.const 0x1p-1))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const -0x0p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const 0x0p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const -0x1p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const 0x1p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const -0x1p-1)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const 0x1p-1)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const 0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1p+0))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1p+0))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const inf)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const inf)) (f64.const 0x1p+0))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const inf)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const inf)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const inf)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const inf)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -inf) (f64.const -0x0p+0)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const -inf) (f64.const 0x0p+0)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const inf) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "min" (f64.const inf) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "min" (f64.const -inf) (f64.const -0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const -inf) (f64.const 0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const inf) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const inf) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const -inf) (f64.const -0x1p-1022)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const -inf) (f64.const 0x1p-1022)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const inf) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "min" (f64.const inf) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "min" (f64.const -inf) (f64.const -0x1p-1)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const -inf) (f64.const 0x1p-1)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const inf) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "min" (f64.const inf) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "min" (f64.const -inf) (f64.const -0x1p+0)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const -inf) (f64.const 0x1p+0)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const inf) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "min" (f64.const inf) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "min" (f64.const -inf) (f64.const -0x1.921fb54442d18p+2)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const -inf) (f64.const 0x1.921fb54442d18p+2)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const inf) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const inf) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const -inf) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const -inf) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const inf) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const inf) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const -inf) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const -inf) (f64.const inf)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const inf) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "min" (f64.const inf) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "min" (f64.const -inf) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -inf) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -inf) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -inf) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const inf) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const inf) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const inf) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const inf) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const -0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const 0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const 0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const -0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const -0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const 0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const 0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const 0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const -0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const -0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const 0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const 0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const 0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const -0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const -0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const 0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const 0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const -0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const 0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const 0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const -0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const -0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const 0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const 0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const -inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const inf)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const -inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const inf)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const -nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const -nan:0x4000000000000) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const -nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "min" (f64.const nan:0x4000000000000) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const -0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const -0x1p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const -0x1p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const -0x1p-1)) (f64.const -0x0p+0))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const -0x1p-1)) (f64.const 0x0p+0))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const -0x1p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const -0x1p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x0p+0))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x0p+0))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x0p+0))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x0p+0))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const -inf)) (f64.const -0x0p+0))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const -inf)) (f64.const 0x0p+0))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0p+0)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0p+0)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p+0)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p+0)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const -inf)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const -inf)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const -0x0p+0)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const 0x0p+0)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const -0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const -0x1p-1)) (f64.const -0x1p-1022))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const -0x1p-1)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const -0x1p+0)) (f64.const -0x1p-1022))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const -0x1p+0)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1p-1022))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1p-1022))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const -inf)) (f64.const -0x1p-1022))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const -inf)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const -0x0p+0)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const 0x0p+0)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const -0x1p-1022)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const 0x1p-1022)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const -0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const -0x1p+0)) (f64.const -0x1p-1))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const -0x1p+0)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1p-1))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1p-1))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const -inf)) (f64.const -0x1p-1))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const -inf)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const -0x0p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const 0x0p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const -0x1p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const 0x1p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const -0x1p-1)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const 0x1p-1)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const -0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1p+0))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1p+0))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const -inf)) (f64.const -0x1p+0))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const -inf)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const -inf)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const -inf)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const -inf)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const -inf)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -inf) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "max" (f64.const -inf) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "max" (f64.const inf) (f64.const -0x0p+0)) (f64.const inf))
-(assert_return (invoke "max" (f64.const inf) (f64.const 0x0p+0)) (f64.const inf))
-(assert_return (invoke "max" (f64.const -inf) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const -inf) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "max" (f64.const inf) (f64.const -0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "max" (f64.const inf) (f64.const 0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "max" (f64.const -inf) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "max" (f64.const -inf) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "max" (f64.const inf) (f64.const -0x1p-1022)) (f64.const inf))
-(assert_return (invoke "max" (f64.const inf) (f64.const 0x1p-1022)) (f64.const inf))
-(assert_return (invoke "max" (f64.const -inf) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "max" (f64.const -inf) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "max" (f64.const inf) (f64.const -0x1p-1)) (f64.const inf))
-(assert_return (invoke "max" (f64.const inf) (f64.const 0x1p-1)) (f64.const inf))
-(assert_return (invoke "max" (f64.const -inf) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "max" (f64.const -inf) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "max" (f64.const inf) (f64.const -0x1p+0)) (f64.const inf))
-(assert_return (invoke "max" (f64.const inf) (f64.const 0x1p+0)) (f64.const inf))
-(assert_return (invoke "max" (f64.const -inf) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const -inf) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "max" (f64.const inf) (f64.const -0x1.921fb54442d18p+2)) (f64.const inf))
-(assert_return (invoke "max" (f64.const inf) (f64.const 0x1.921fb54442d18p+2)) (f64.const inf))
-(assert_return (invoke "max" (f64.const -inf) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const -inf) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "max" (f64.const inf) (f64.const -0x1.fffffffffffffp+1023)) (f64.const inf))
-(assert_return (invoke "max" (f64.const inf) (f64.const 0x1.fffffffffffffp+1023)) (f64.const inf))
-(assert_return (invoke "max" (f64.const -inf) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "max" (f64.const -inf) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "max" (f64.const inf) (f64.const -inf)) (f64.const inf))
-(assert_return (invoke "max" (f64.const inf) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "max" (f64.const -inf) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -inf) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -inf) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -inf) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const inf) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const inf) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const inf) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const inf) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const -0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const 0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const 0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const -0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const -0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const 0x0p+0)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const 0x0p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const 0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const -0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const -0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const 0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const 0x1p-1022)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const 0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const -0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const -0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const 0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const 0x1p-1)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const -0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const 0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const 0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const -0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const -0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const 0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const 0x1p+0)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const -inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const inf)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const -inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const inf)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const inf)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const -nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const -nan:0x4000000000000) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const -nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const nan)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "max" (f64.const nan:0x4000000000000) (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sqrt" (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "sqrt" (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "sqrt" (f64.const -0x0.0000000000001p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "sqrt" (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1p-537))
-(assert_return (invoke "sqrt" (f64.const -0x1p-1022)) (f64.const nan:canonical))
-(assert_return (invoke "sqrt" (f64.const 0x1p-1022)) (f64.const 0x1p-511))
-(assert_return (invoke "sqrt" (f64.const -0x1p-1)) (f64.const nan:canonical))
-(assert_return (invoke "sqrt" (f64.const 0x1p-1)) (f64.const 0x1.6a09e667f3bcdp-1))
-(assert_return (invoke "sqrt" (f64.const -0x1p+0)) (f64.const nan:canonical))
-(assert_return (invoke "sqrt" (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "sqrt" (f64.const -0x1.921fb54442d18p+2)) (f64.const nan:canonical))
-(assert_return (invoke "sqrt" (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.40d931ff62705p+1))
-(assert_return (invoke "sqrt" (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan:canonical))
-(assert_return (invoke "sqrt" (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+511))
-(assert_return (invoke "sqrt" (f64.const -inf)) (f64.const nan:canonical))
-(assert_return (invoke "sqrt" (f64.const inf)) (f64.const inf))
-(assert_return (invoke "sqrt" (f64.const -nan)) (f64.const nan:canonical))
-(assert_return (invoke "sqrt" (f64.const -nan:0x4000000000000)) (f64.const nan:arithmetic))
-(assert_return (invoke "sqrt" (f64.const nan)) (f64.const nan:canonical))
-(assert_return (invoke "sqrt" (f64.const nan:0x4000000000000)) (f64.const nan:arithmetic))
 (assert_return (invoke "floor" (f64.const -0x0p+0)) (f64.const -0x0p+0))
 (assert_return (invoke "floor" (f64.const 0x0p+0)) (f64.const 0x0p+0))
 (assert_return (invoke "floor" (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1p+0))
diff --git a/tests/misc_testsuite/winch/f64_bitwise.wast b/tests/misc_testsuite/winch/f64_bitwise.wast
index b9f491e8e4c4..d6b85d0fce84 100644
--- a/tests/misc_testsuite/winch/f64_bitwise.wast
+++ b/tests/misc_testsuite/winch/f64_bitwise.wast
@@ -4,333 +4,8 @@
 (module
   (func (export "abs") (param $x f64) (result f64) (f64.abs (local.get $x)))
   (func (export "neg") (param $x f64) (result f64) (f64.neg (local.get $x)))
-  (func (export "copysign") (param $x f64) (param $y f64) (result f64) (f64.copysign (local.get $x) (local.get $y)))
 )
 
-(assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const -0x0p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const 0x0p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const -0x1p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const 0x1p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const -0x1p-1022)) (f64.const -0x0p+0))
-(assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const 0x1p-1022)) (f64.const 0x0p+0))
-(assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const -0x1p-1)) (f64.const -0x0p+0))
-(assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const 0x1p-1)) (f64.const 0x0p+0))
-(assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const -0x1p-1)) (f64.const -0x0p+0))
-(assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const 0x1p-1)) (f64.const 0x0p+0))
-(assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const -0x1p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const 0x1p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const -0x1p+0)) (f64.const -0x0p+0))
-(assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const 0x1p+0)) (f64.const 0x0p+0))
-(assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x0p+0))
-(assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x0p+0))
-(assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x0p+0))
-(assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x0p+0))
-(assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x0p+0))
-(assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x0p+0))
-(assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x0p+0))
-(assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x0p+0))
-(assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const -inf)) (f64.const -0x0p+0))
-(assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const inf)) (f64.const 0x0p+0))
-(assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const -inf)) (f64.const -0x0p+0))
-(assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const inf)) (f64.const 0x0p+0))
-(assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const -nan)) (f64.const -0x0p+0))
-(assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const nan)) (f64.const 0x0p+0))
-(assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const -nan)) (f64.const -0x0p+0))
-(assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const nan)) (f64.const 0x0p+0))
-(assert_return (invoke "copysign" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0p+0)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0p+0)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0p+0)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0p+0)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p+0)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p+0)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p+0)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p+0)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const -0x0.0000000000001p-1022) (f64.const -inf)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const -0x0.0000000000001p-1022) (f64.const inf)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const 0x0.0000000000001p-1022) (f64.const -inf)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const 0x0.0000000000001p-1022) (f64.const inf)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const -0x0.0000000000001p-1022) (f64.const -nan)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const -0x0.0000000000001p-1022) (f64.const nan)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const 0x0.0000000000001p-1022) (f64.const -nan)) (f64.const -0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const 0x0.0000000000001p-1022) (f64.const nan)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1022) (f64.const -0x0p+0)) (f64.const -0x1p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1022) (f64.const 0x0p+0)) (f64.const 0x1p-1022))
-(assert_return (invoke "copysign" (f64.const 0x1p-1022) (f64.const -0x0p+0)) (f64.const -0x1p-1022))
-(assert_return (invoke "copysign" (f64.const 0x1p-1022) (f64.const 0x0p+0)) (f64.const 0x1p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "copysign" (f64.const 0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "copysign" (f64.const 0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1022) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1022) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "copysign" (f64.const 0x1p-1022) (f64.const -0x1p-1022)) (f64.const -0x1p-1022))
-(assert_return (invoke "copysign" (f64.const 0x1p-1022) (f64.const 0x1p-1022)) (f64.const 0x1p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1022) (f64.const -0x1p-1)) (f64.const -0x1p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1022) (f64.const 0x1p-1)) (f64.const 0x1p-1022))
-(assert_return (invoke "copysign" (f64.const 0x1p-1022) (f64.const -0x1p-1)) (f64.const -0x1p-1022))
-(assert_return (invoke "copysign" (f64.const 0x1p-1022) (f64.const 0x1p-1)) (f64.const 0x1p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1022) (f64.const -0x1p+0)) (f64.const -0x1p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1022) (f64.const 0x1p+0)) (f64.const 0x1p-1022))
-(assert_return (invoke "copysign" (f64.const 0x1p-1022) (f64.const -0x1p+0)) (f64.const -0x1p-1022))
-(assert_return (invoke "copysign" (f64.const 0x1p-1022) (f64.const 0x1p+0)) (f64.const 0x1p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1p-1022))
-(assert_return (invoke "copysign" (f64.const 0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1p-1022))
-(assert_return (invoke "copysign" (f64.const 0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1p-1022))
-(assert_return (invoke "copysign" (f64.const 0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1p-1022))
-(assert_return (invoke "copysign" (f64.const 0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1022) (f64.const -inf)) (f64.const -0x1p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1022) (f64.const inf)) (f64.const 0x1p-1022))
-(assert_return (invoke "copysign" (f64.const 0x1p-1022) (f64.const -inf)) (f64.const -0x1p-1022))
-(assert_return (invoke "copysign" (f64.const 0x1p-1022) (f64.const inf)) (f64.const 0x1p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1022) (f64.const -nan)) (f64.const -0x1p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1022) (f64.const nan)) (f64.const 0x1p-1022))
-(assert_return (invoke "copysign" (f64.const 0x1p-1022) (f64.const -nan)) (f64.const -0x1p-1022))
-(assert_return (invoke "copysign" (f64.const 0x1p-1022) (f64.const nan)) (f64.const 0x1p-1022))
-(assert_return (invoke "copysign" (f64.const -0x1p-1) (f64.const -0x0p+0)) (f64.const -0x1p-1))
-(assert_return (invoke "copysign" (f64.const -0x1p-1) (f64.const 0x0p+0)) (f64.const 0x1p-1))
-(assert_return (invoke "copysign" (f64.const 0x1p-1) (f64.const -0x0p+0)) (f64.const -0x1p-1))
-(assert_return (invoke "copysign" (f64.const 0x1p-1) (f64.const 0x0p+0)) (f64.const 0x1p-1))
-(assert_return (invoke "copysign" (f64.const -0x1p-1) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1p-1))
-(assert_return (invoke "copysign" (f64.const -0x1p-1) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1p-1))
-(assert_return (invoke "copysign" (f64.const 0x1p-1) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1p-1))
-(assert_return (invoke "copysign" (f64.const 0x1p-1) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1p-1))
-(assert_return (invoke "copysign" (f64.const -0x1p-1) (f64.const -0x1p-1022)) (f64.const -0x1p-1))
-(assert_return (invoke "copysign" (f64.const -0x1p-1) (f64.const 0x1p-1022)) (f64.const 0x1p-1))
-(assert_return (invoke "copysign" (f64.const 0x1p-1) (f64.const -0x1p-1022)) (f64.const -0x1p-1))
-(assert_return (invoke "copysign" (f64.const 0x1p-1) (f64.const 0x1p-1022)) (f64.const 0x1p-1))
-(assert_return (invoke "copysign" (f64.const -0x1p-1) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "copysign" (f64.const -0x1p-1) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "copysign" (f64.const 0x1p-1) (f64.const -0x1p-1)) (f64.const -0x1p-1))
-(assert_return (invoke "copysign" (f64.const 0x1p-1) (f64.const 0x1p-1)) (f64.const 0x1p-1))
-(assert_return (invoke "copysign" (f64.const -0x1p-1) (f64.const -0x1p+0)) (f64.const -0x1p-1))
-(assert_return (invoke "copysign" (f64.const -0x1p-1) (f64.const 0x1p+0)) (f64.const 0x1p-1))
-(assert_return (invoke "copysign" (f64.const 0x1p-1) (f64.const -0x1p+0)) (f64.const -0x1p-1))
-(assert_return (invoke "copysign" (f64.const 0x1p-1) (f64.const 0x1p+0)) (f64.const 0x1p-1))
-(assert_return (invoke "copysign" (f64.const -0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1p-1))
-(assert_return (invoke "copysign" (f64.const -0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1p-1))
-(assert_return (invoke "copysign" (f64.const 0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1p-1))
-(assert_return (invoke "copysign" (f64.const 0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1p-1))
-(assert_return (invoke "copysign" (f64.const -0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1p-1))
-(assert_return (invoke "copysign" (f64.const -0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1p-1))
-(assert_return (invoke "copysign" (f64.const 0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1p-1))
-(assert_return (invoke "copysign" (f64.const 0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1p-1))
-(assert_return (invoke "copysign" (f64.const -0x1p-1) (f64.const -inf)) (f64.const -0x1p-1))
-(assert_return (invoke "copysign" (f64.const -0x1p-1) (f64.const inf)) (f64.const 0x1p-1))
-(assert_return (invoke "copysign" (f64.const 0x1p-1) (f64.const -inf)) (f64.const -0x1p-1))
-(assert_return (invoke "copysign" (f64.const 0x1p-1) (f64.const inf)) (f64.const 0x1p-1))
-(assert_return (invoke "copysign" (f64.const -0x1p-1) (f64.const -nan)) (f64.const -0x1p-1))
-(assert_return (invoke "copysign" (f64.const -0x1p-1) (f64.const nan)) (f64.const 0x1p-1))
-(assert_return (invoke "copysign" (f64.const 0x1p-1) (f64.const -nan)) (f64.const -0x1p-1))
-(assert_return (invoke "copysign" (f64.const 0x1p-1) (f64.const nan)) (f64.const 0x1p-1))
-(assert_return (invoke "copysign" (f64.const -0x1p+0) (f64.const -0x0p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "copysign" (f64.const -0x1p+0) (f64.const 0x0p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "copysign" (f64.const 0x1p+0) (f64.const -0x0p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "copysign" (f64.const 0x1p+0) (f64.const 0x0p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "copysign" (f64.const -0x1p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "copysign" (f64.const -0x1p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "copysign" (f64.const 0x1p+0) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "copysign" (f64.const 0x1p+0) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "copysign" (f64.const -0x1p+0) (f64.const -0x1p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "copysign" (f64.const -0x1p+0) (f64.const 0x1p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "copysign" (f64.const 0x1p+0) (f64.const -0x1p-1022)) (f64.const -0x1p+0))
-(assert_return (invoke "copysign" (f64.const 0x1p+0) (f64.const 0x1p-1022)) (f64.const 0x1p+0))
-(assert_return (invoke "copysign" (f64.const -0x1p+0) (f64.const -0x1p-1)) (f64.const -0x1p+0))
-(assert_return (invoke "copysign" (f64.const -0x1p+0) (f64.const 0x1p-1)) (f64.const 0x1p+0))
-(assert_return (invoke "copysign" (f64.const 0x1p+0) (f64.const -0x1p-1)) (f64.const -0x1p+0))
-(assert_return (invoke "copysign" (f64.const 0x1p+0) (f64.const 0x1p-1)) (f64.const 0x1p+0))
-(assert_return (invoke "copysign" (f64.const -0x1p+0) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "copysign" (f64.const -0x1p+0) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "copysign" (f64.const 0x1p+0) (f64.const -0x1p+0)) (f64.const -0x1p+0))
-(assert_return (invoke "copysign" (f64.const 0x1p+0) (f64.const 0x1p+0)) (f64.const 0x1p+0))
-(assert_return (invoke "copysign" (f64.const -0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1p+0))
-(assert_return (invoke "copysign" (f64.const -0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1p+0))
-(assert_return (invoke "copysign" (f64.const 0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1p+0))
-(assert_return (invoke "copysign" (f64.const 0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1p+0))
-(assert_return (invoke "copysign" (f64.const -0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1p+0))
-(assert_return (invoke "copysign" (f64.const -0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1p+0))
-(assert_return (invoke "copysign" (f64.const 0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1p+0))
-(assert_return (invoke "copysign" (f64.const 0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1p+0))
-(assert_return (invoke "copysign" (f64.const -0x1p+0) (f64.const -inf)) (f64.const -0x1p+0))
-(assert_return (invoke "copysign" (f64.const -0x1p+0) (f64.const inf)) (f64.const 0x1p+0))
-(assert_return (invoke "copysign" (f64.const 0x1p+0) (f64.const -inf)) (f64.const -0x1p+0))
-(assert_return (invoke "copysign" (f64.const 0x1p+0) (f64.const inf)) (f64.const 0x1p+0))
-(assert_return (invoke "copysign" (f64.const -0x1p+0) (f64.const -nan)) (f64.const -0x1p+0))
-(assert_return (invoke "copysign" (f64.const -0x1p+0) (f64.const nan)) (f64.const 0x1p+0))
-(assert_return (invoke "copysign" (f64.const 0x1p+0) (f64.const -nan)) (f64.const -0x1p+0))
-(assert_return (invoke "copysign" (f64.const 0x1p+0) (f64.const nan)) (f64.const 0x1p+0))
-(assert_return (invoke "copysign" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const -0x1.921fb54442d18p+2) (f64.const -inf)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const -0x1.921fb54442d18p+2) (f64.const inf)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const 0x1.921fb54442d18p+2) (f64.const -inf)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const 0x1.921fb54442d18p+2) (f64.const inf)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const -0x1.921fb54442d18p+2) (f64.const nan)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan)) (f64.const -0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const 0x1.921fb54442d18p+2) (f64.const nan)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "copysign" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const -0x1.fffffffffffffp+1023) (f64.const -inf)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const -0x1.fffffffffffffp+1023) (f64.const inf)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const 0x1.fffffffffffffp+1023) (f64.const -inf)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const 0x1.fffffffffffffp+1023) (f64.const inf)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan)) (f64.const -0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "copysign" (f64.const -inf) (f64.const -0x0p+0)) (f64.const -inf))
-(assert_return (invoke "copysign" (f64.const -inf) (f64.const 0x0p+0)) (f64.const inf))
-(assert_return (invoke "copysign" (f64.const inf) (f64.const -0x0p+0)) (f64.const -inf))
-(assert_return (invoke "copysign" (f64.const inf) (f64.const 0x0p+0)) (f64.const inf))
-(assert_return (invoke "copysign" (f64.const -inf) (f64.const -0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "copysign" (f64.const -inf) (f64.const 0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "copysign" (f64.const inf) (f64.const -0x0.0000000000001p-1022)) (f64.const -inf))
-(assert_return (invoke "copysign" (f64.const inf) (f64.const 0x0.0000000000001p-1022)) (f64.const inf))
-(assert_return (invoke "copysign" (f64.const -inf) (f64.const -0x1p-1022)) (f64.const -inf))
-(assert_return (invoke "copysign" (f64.const -inf) (f64.const 0x1p-1022)) (f64.const inf))
-(assert_return (invoke "copysign" (f64.const inf) (f64.const -0x1p-1022)) (f64.const -inf))
-(assert_return (invoke "copysign" (f64.const inf) (f64.const 0x1p-1022)) (f64.const inf))
-(assert_return (invoke "copysign" (f64.const -inf) (f64.const -0x1p-1)) (f64.const -inf))
-(assert_return (invoke "copysign" (f64.const -inf) (f64.const 0x1p-1)) (f64.const inf))
-(assert_return (invoke "copysign" (f64.const inf) (f64.const -0x1p-1)) (f64.const -inf))
-(assert_return (invoke "copysign" (f64.const inf) (f64.const 0x1p-1)) (f64.const inf))
-(assert_return (invoke "copysign" (f64.const -inf) (f64.const -0x1p+0)) (f64.const -inf))
-(assert_return (invoke "copysign" (f64.const -inf) (f64.const 0x1p+0)) (f64.const inf))
-(assert_return (invoke "copysign" (f64.const inf) (f64.const -0x1p+0)) (f64.const -inf))
-(assert_return (invoke "copysign" (f64.const inf) (f64.const 0x1p+0)) (f64.const inf))
-(assert_return (invoke "copysign" (f64.const -inf) (f64.const -0x1.921fb54442d18p+2)) (f64.const -inf))
-(assert_return (invoke "copysign" (f64.const -inf) (f64.const 0x1.921fb54442d18p+2)) (f64.const inf))
-(assert_return (invoke "copysign" (f64.const inf) (f64.const -0x1.921fb54442d18p+2)) (f64.const -inf))
-(assert_return (invoke "copysign" (f64.const inf) (f64.const 0x1.921fb54442d18p+2)) (f64.const inf))
-(assert_return (invoke "copysign" (f64.const -inf) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -inf))
-(assert_return (invoke "copysign" (f64.const -inf) (f64.const 0x1.fffffffffffffp+1023)) (f64.const inf))
-(assert_return (invoke "copysign" (f64.const inf) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -inf))
-(assert_return (invoke "copysign" (f64.const inf) (f64.const 0x1.fffffffffffffp+1023)) (f64.const inf))
-(assert_return (invoke "copysign" (f64.const -inf) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "copysign" (f64.const -inf) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "copysign" (f64.const inf) (f64.const -inf)) (f64.const -inf))
-(assert_return (invoke "copysign" (f64.const inf) (f64.const inf)) (f64.const inf))
-(assert_return (invoke "copysign" (f64.const -inf) (f64.const -nan)) (f64.const -inf))
-(assert_return (invoke "copysign" (f64.const -inf) (f64.const nan)) (f64.const inf))
-(assert_return (invoke "copysign" (f64.const inf) (f64.const -nan)) (f64.const -inf))
-(assert_return (invoke "copysign" (f64.const inf) (f64.const nan)) (f64.const inf))
-(assert_return (invoke "copysign" (f64.const -nan) (f64.const -0x0p+0)) (f64.const -nan))
-(assert_return (invoke "copysign" (f64.const -nan) (f64.const 0x0p+0)) (f64.const nan))
-(assert_return (invoke "copysign" (f64.const nan) (f64.const -0x0p+0)) (f64.const -nan))
-(assert_return (invoke "copysign" (f64.const nan) (f64.const 0x0p+0)) (f64.const nan))
-(assert_return (invoke "copysign" (f64.const -nan) (f64.const -0x0.0000000000001p-1022)) (f64.const -nan))
-(assert_return (invoke "copysign" (f64.const -nan) (f64.const 0x0.0000000000001p-1022)) (f64.const nan))
-(assert_return (invoke "copysign" (f64.const nan) (f64.const -0x0.0000000000001p-1022)) (f64.const -nan))
-(assert_return (invoke "copysign" (f64.const nan) (f64.const 0x0.0000000000001p-1022)) (f64.const nan))
-(assert_return (invoke "copysign" (f64.const -nan) (f64.const -0x1p-1022)) (f64.const -nan))
-(assert_return (invoke "copysign" (f64.const -nan) (f64.const 0x1p-1022)) (f64.const nan))
-(assert_return (invoke "copysign" (f64.const nan) (f64.const -0x1p-1022)) (f64.const -nan))
-(assert_return (invoke "copysign" (f64.const nan) (f64.const 0x1p-1022)) (f64.const nan))
-(assert_return (invoke "copysign" (f64.const -nan) (f64.const -0x1p-1)) (f64.const -nan))
-(assert_return (invoke "copysign" (f64.const -nan) (f64.const 0x1p-1)) (f64.const nan))
-(assert_return (invoke "copysign" (f64.const nan) (f64.const -0x1p-1)) (f64.const -nan))
-(assert_return (invoke "copysign" (f64.const nan) (f64.const 0x1p-1)) (f64.const nan))
-(assert_return (invoke "copysign" (f64.const -nan) (f64.const -0x1p+0)) (f64.const -nan))
-(assert_return (invoke "copysign" (f64.const -nan) (f64.const 0x1p+0)) (f64.const nan))
-(assert_return (invoke "copysign" (f64.const nan) (f64.const -0x1p+0)) (f64.const -nan))
-(assert_return (invoke "copysign" (f64.const nan) (f64.const 0x1p+0)) (f64.const nan))
-(assert_return (invoke "copysign" (f64.const -nan) (f64.const -0x1.921fb54442d18p+2)) (f64.const -nan))
-(assert_return (invoke "copysign" (f64.const -nan) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan))
-(assert_return (invoke "copysign" (f64.const nan) (f64.const -0x1.921fb54442d18p+2)) (f64.const -nan))
-(assert_return (invoke "copysign" (f64.const nan) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan))
-(assert_return (invoke "copysign" (f64.const -nan) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -nan))
-(assert_return (invoke "copysign" (f64.const -nan) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan))
-(assert_return (invoke "copysign" (f64.const nan) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -nan))
-(assert_return (invoke "copysign" (f64.const nan) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan))
-(assert_return (invoke "copysign" (f64.const -nan) (f64.const -inf)) (f64.const -nan))
-(assert_return (invoke "copysign" (f64.const -nan) (f64.const inf)) (f64.const nan))
-(assert_return (invoke "copysign" (f64.const nan) (f64.const -inf)) (f64.const -nan))
-(assert_return (invoke "copysign" (f64.const nan) (f64.const inf)) (f64.const nan))
-(assert_return (invoke "copysign" (f64.const -nan) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "copysign" (f64.const -nan) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "copysign" (f64.const nan) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "copysign" (f64.const nan) (f64.const nan)) (f64.const nan))
 (assert_return (invoke "abs" (f64.const -0x0p+0)) (f64.const 0x0p+0))
 (assert_return (invoke "abs" (f64.const 0x0p+0)) (f64.const 0x0p+0))
 (assert_return (invoke "abs" (f64.const -0x0.0000000000001p-1022)) (f64.const 0x0.0000000000001p-1022))
diff --git a/tests/misc_testsuite/winch/f64_cmp.wast b/tests/misc_testsuite/winch/f64_cmp.wast
deleted file mode 100644
index 9cb378cd8c49..000000000000
--- a/tests/misc_testsuite/winch/f64_cmp.wast
+++ /dev/null
@@ -1,2412 +0,0 @@
-;; Test all the f64 comparison operators on major boundary values and all
-;; special values.
-
-(module
-  (func (export "eq") (param $x f64) (param $y f64) (result i32) (f64.eq (local.get $x) (local.get $y)))
-  (func (export "ne") (param $x f64) (param $y f64) (result i32) (f64.ne (local.get $x) (local.get $y)))
-  (func (export "lt") (param $x f64) (param $y f64) (result i32) (f64.lt (local.get $x) (local.get $y)))
-  (func (export "le") (param $x f64) (param $y f64) (result i32) (f64.le (local.get $x) (local.get $y)))
-  (func (export "gt") (param $x f64) (param $y f64) (result i32) (f64.gt (local.get $x) (local.get $y)))
-  (func (export "ge") (param $x f64) (param $y f64) (result i32) (f64.ge (local.get $x) (local.get $y)))
-)
-
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p-1) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p-1) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -inf) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const inf) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const -nan:0x4000000000000) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "eq" (f64.const nan:0x4000000000000) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0p+0) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0p+0) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1022) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1022) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p-1) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p-1) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1p+0) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1p+0) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -inf) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const inf) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const -nan:0x4000000000000) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const -nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const nan)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "ne" (f64.const nan:0x4000000000000) (f64.const nan:0x4000000000000)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p-1) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p-1) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const inf) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const inf) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const inf) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const inf) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const inf) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const inf) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const inf) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const inf) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const inf) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const inf) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const inf) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const inf) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const inf) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const inf) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "lt" (f64.const inf) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const inf) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -inf) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const inf) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const inf) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const inf) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const inf) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const -nan:0x4000000000000) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "lt" (f64.const nan:0x4000000000000) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p-1) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p-1) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -inf) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -inf) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const inf) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const inf) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -inf) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -inf) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const inf) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const inf) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -inf) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -inf) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "le" (f64.const inf) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const inf) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -inf) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -inf) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "le" (f64.const inf) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const inf) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -inf) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -inf) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "le" (f64.const inf) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const inf) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -inf) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -inf) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "le" (f64.const inf) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const inf) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -inf) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -inf) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "le" (f64.const inf) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const inf) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -inf) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -inf) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f64.const inf) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const inf) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "le" (f64.const -inf) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -inf) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -inf) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -inf) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const inf) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const inf) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const inf) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const inf) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const -nan:0x4000000000000) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "le" (f64.const nan:0x4000000000000) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p-1) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p-1) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const inf) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const inf) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const inf) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const inf) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const inf) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const inf) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const inf) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const inf) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const inf) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const inf) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const inf) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const inf) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const inf) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const inf) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const inf) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "gt" (f64.const inf) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -inf) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const inf) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const inf) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const inf) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const inf) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const -nan:0x4000000000000) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "gt" (f64.const nan:0x4000000000000) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x0.0000000000001p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1022) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p-1) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p-1) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1p+0) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.921fb54442d18p+2) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const inf) (f64.const -0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const inf) (f64.const 0x0p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const inf) (f64.const -0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const inf) (f64.const 0x0.0000000000001p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const inf) (f64.const -0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const inf) (f64.const 0x1p-1022)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const inf) (f64.const -0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const inf) (f64.const 0x1p-1)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const inf) (f64.const -0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const inf) (f64.const 0x1p+0)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const inf) (f64.const -0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const inf) (f64.const 0x1.921fb54442d18p+2)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const inf) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const inf) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const inf) (f64.const -inf)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const inf) (f64.const inf)) (i32.const 1))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -inf) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const inf) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const inf) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const inf) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const inf) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const -0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const 0x0p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const -0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const 0x0.0000000000001p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const -0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const 0x1p-1022)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const -0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const 0x1p-1)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const -0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const 0x1p+0)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const -0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const 0x1.921fb54442d18p+2)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const -0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const 0x1.fffffffffffffp+1023)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const -inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const inf)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const -nan:0x4000000000000) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const -nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const -nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const nan)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan) (f64.const nan:0x4000000000000)) (i32.const 0))
-(assert_return (invoke "ge" (f64.const nan:0x4000000000000) (f64.const nan:0x4000000000000)) (i32.const 0))
diff --git a/tests/misc_testsuite/winch/table_fill.wast b/tests/misc_testsuite/winch/table_fill.wast
deleted file mode 100644
index 56a98c164eb6..000000000000
--- a/tests/misc_testsuite/winch/table_fill.wast
+++ /dev/null
@@ -1,65 +0,0 @@
-(module
-  (type $t0 (func))
-  (func $f1 (type $t0))
-  (func $f2 (type $t0))
-  (func $f3 (type $t0))
-
-  ;; Define two tables of funcref
-  (table $t1 3 funcref)
-  (table $t2 10 funcref)
-
-  ;; Initialize table $t1 with functions $f1, $f2, $f3
-  (elem (i32.const 0) $f1 $f2 $f3)
-
-  ;; Function to fill table $t1 using a function reference from table $t2
-  (func (export "fill") (param $i i32) (param $r i32) (param $n i32)
-    (local $ref funcref)
-    (local.set $ref (table.get $t1 (local.get $r)))
-    (table.fill $t2 (local.get $i) (local.get $ref) (local.get $n))
-  )
-
-  (func (export "get") (param $i i32) (result funcref)
-    (table.get $t2 (local.get $i))
-  )
-)
-
-(assert_return (invoke "get" (i32.const 1)) (ref.null func))
-(assert_return (invoke "get" (i32.const 2)) (ref.null func))
-(assert_return (invoke "get" (i32.const 3)) (ref.null func))
-(assert_return (invoke "get" (i32.const 4)) (ref.null func))
-(assert_return (invoke "get" (i32.const 5)) (ref.null func))
-
-(assert_return (invoke "fill" (i32.const 2) (i32.const 0) (i32.const 3)))
-(assert_return (invoke "get" (i32.const 1)) (ref.null func))
-(assert_return (invoke "get" (i32.const 2)) (ref.func 0))
-(assert_return (invoke "get" (i32.const 3)) (ref.func 0))
-(assert_return (invoke "get" (i32.const 4)) (ref.func 0))
-(assert_return (invoke "get" (i32.const 5)) (ref.null func))
-
-(assert_return (invoke "fill" (i32.const 4) (i32.const 1) (i32.const 2)))
-(assert_return (invoke "get" (i32.const 3)) (ref.func 0))
-(assert_return (invoke "get" (i32.const 4)) (ref.func 1))
-(assert_return (invoke "get" (i32.const 5)) (ref.func 1))
-(assert_return (invoke "get" (i32.const 6)) (ref.null func))
-
-(assert_return (invoke "fill" (i32.const 4) (i32.const 2) (i32.const 0)))
-(assert_return (invoke "get" (i32.const 3)) (ref.func 0))
-(assert_return (invoke "get" (i32.const 4)) (ref.func 1))
-(assert_return (invoke "get" (i32.const 5)) (ref.func 1))
-
-(assert_return (invoke "fill" (i32.const 8) (i32.const 0) (i32.const 2)))
-(assert_return (invoke "get" (i32.const 7)) (ref.null func))
-(assert_return (invoke "get" (i32.const 8)) (ref.func 0))
-(assert_return (invoke "get" (i32.const 9)) (ref.func 0))
-
-(assert_return (invoke "fill" (i32.const 9) (i32.const 2) (i32.const 1)))
-(assert_return (invoke "get" (i32.const 8)) (ref.func 0))
-(assert_return (invoke "get" (i32.const 9)) (ref.func 2))
-
-(assert_return (invoke "fill" (i32.const 10) (i32.const 1) (i32.const 0)))
-(assert_return (invoke "get" (i32.const 9)) (ref.func 2))
-
-(assert_trap
-  (invoke "fill" (i32.const 8) (i32.const 0) (i32.const 3))
-  "out of bounds table access"
-)
diff --git a/tests/misc_testsuite/winch/table_get.wast b/tests/misc_testsuite/winch/table_get.wast
deleted file mode 100644
index 09f57cace9f3..000000000000
--- a/tests/misc_testsuite/winch/table_get.wast
+++ /dev/null
@@ -1,13 +0,0 @@
-(module
-  (table $t3 3 funcref)
-  (elem (table $t3) (i32.const 1) func $dummy)
-  (func $dummy)
-  (func $f3 (export "get-funcref") (param $i i32) (result funcref)
-    (table.get $t3 (local.get $i))
-  )
-)
-
-(assert_return (invoke "get-funcref" (i32.const 0)) (ref.null func))
-(assert_trap (invoke "get-funcref" (i32.const 3)) "out of bounds table access")
-(assert_trap (invoke "get-funcref" (i32.const -1)) "out of bounds table access")
-
diff --git a/tests/misc_testsuite/winch/table_grow.wast b/tests/misc_testsuite/winch/table_grow.wast
deleted file mode 100644
index be293cb79469..000000000000
--- a/tests/misc_testsuite/winch/table_grow.wast
+++ /dev/null
@@ -1,26 +0,0 @@
-(module
-  (table $t1 0 funcref)
-
-  (func (export "grow-by-10") (param $r funcref) (result i32)
-    (table.grow $t1 (local.get $r) (i32.const 10))
-  )
-  (func (export "grow-over") (param $r funcref) (result i32)
-    (table.grow $t1 (local.get $r) (i32.const 0xffff_fff0))
-  )
-
-  (func (export "size") (result i32)
-    (table.size $t1))
-)
-
-(assert_return (invoke "size") (i32.const 0))
-(assert_return (invoke "grow-by-10" (ref.null func)) (i32.const 0))
-(assert_return (invoke "size") (i32.const 10))
-
-(module
-  (table $t 0x10 funcref)
-  (func $f (export "grow") (param $r funcref) (result i32)
-    (table.grow $t (local.get $r) (i32.const 0xffff_fff0))
-  )
-)
-
-(assert_return (invoke "grow" (ref.null func)) (i32.const -1))
diff --git a/tests/misc_testsuite/winch/table_set.wast b/tests/misc_testsuite/winch/table_set.wast
deleted file mode 100644
index fb1f783883f2..000000000000
--- a/tests/misc_testsuite/winch/table_set.wast
+++ /dev/null
@@ -1,27 +0,0 @@
-(module
-  (table $t3 2 funcref)
-  (elem (table $t3) (i32.const 1) func $dummy)
-  (func $dummy)
-
-  (func $f3 (export "get-funcref") (param $i i32) (result funcref)
-    (table.get $t3 (local.get $i))
-  )
-
-  (func (export "set-funcref") (param $i i32) (param $r funcref)
-    (table.set $t3 (local.get $i) (local.get $r))
-  )
-  (func (export "set-funcref-from") (param $i i32) (param $j i32)
-    (table.set $t3 (local.get $i) (table.get $t3 (local.get $j)))
-  )
-)
-
-(assert_return (invoke "get-funcref" (i32.const 0)) (ref.null func))
-(assert_return (invoke "set-funcref-from" (i32.const 0) (i32.const 1)))
-(assert_return (invoke "set-funcref" (i32.const 0) (ref.null func)))
-(assert_return (invoke "get-funcref" (i32.const 0)) (ref.null func))
-
-(assert_trap (invoke "set-funcref" (i32.const 3) (ref.null func)) "out of bounds table access")
-(assert_trap (invoke "set-funcref" (i32.const -1) (ref.null func)) "out of bounds table access")
-
-(assert_trap (invoke "set-funcref-from" (i32.const 3) (i32.const 1)) "out of bounds table access")
-(assert_trap (invoke "set-funcref-from" (i32.const -1) (i32.const 1)) "out of bounds table access")
diff --git a/winch/Cargo.toml b/winch/Cargo.toml
index cf83b27d1b37..d86a0b22a2a4 100644
--- a/winch/Cargo.toml
+++ b/winch/Cargo.toml
@@ -19,7 +19,7 @@ wasmtime-environ = { workspace = true }
 target-lexicon = { workspace = true }
 anyhow = { workspace = true }
 wasmparser = { workspace = true }
-clap = { workspace = true, features = ['default'] }
+clap = { workspace = true }
 wat = { workspace = true }
 cranelift-codegen = { workspace = true }
 capstone = { workspace = true }
diff --git a/winch/codegen/Cargo.toml b/winch/codegen/Cargo.toml
index db0365ebb944..63f186fe71d7 100644
--- a/winch/codegen/Cargo.toml
+++ b/winch/codegen/Cargo.toml
@@ -4,7 +4,7 @@ name = "winch-codegen"
 description = "Winch code generation library"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"
-version = "0.13.0"
+version = "0.12.0"
 edition.workspace = true
 
 [dependencies]
diff --git a/winch/codegen/src/abi/mod.rs b/winch/codegen/src/abi/mod.rs
index a8c843113e6c..5fff6798240a 100644
--- a/winch/codegen/src/abi/mod.rs
+++ b/winch/codegen/src/abi/mod.rs
@@ -46,9 +46,8 @@
 use crate::isa::{reg::Reg, CallingConvention};
 use crate::masm::OperandSize;
 use smallvec::SmallVec;
-use std::collections::HashSet;
 use std::ops::{Add, BitAnd, Not, Sub};
-use wasmtime_environ::{WasmFuncType, WasmHeapType, WasmType};
+use wasmtime_environ::{WasmFuncType, WasmType};
 
 pub(crate) mod local;
 pub(crate) use local::*;
@@ -73,10 +72,6 @@ pub(crate) trait ABI {
     /// function type.
     fn sig(wasm_sig: &WasmFuncType, call_conv: &CallingConvention) -> ABISig;
 
-    /// Construct an ABI signature from WasmType params and returns.
-    fn sig_from(params: &[WasmType], returns: &[WasmType], call_conv: &CallingConvention)
-        -> ABISig;
-
     /// Construct the ABI-specific result from a slice of
     /// [`wasmtime_environ::WasmtType`].
     fn result(returns: &[WasmType], call_conv: &CallingConvention) -> ABIResult;
@@ -111,8 +106,8 @@ pub(crate) trait ABI {
 }
 
 /// ABI-specific representation of a function argument.
-#[derive(Clone, Debug)]
-pub enum ABIArg {
+#[derive(Debug)]
+pub(crate) enum ABIArg {
     /// A register argument.
     Reg {
         /// Type of the argument.
@@ -217,20 +212,11 @@ impl ABIResult {
             1
         }
     }
-
-    /// Returns an iterator over the result registers.
-    ///
-    /// NOTE: Currently only one or zero registers
-    /// will be returned until suport for multi-value is introduced.
-    pub fn regs(&self) -> impl Iterator<Item = Reg> + '_ {
-        std::iter::once(self.result_reg()).filter_map(|v| v)
-    }
 }
 
 pub(crate) type ABIParams = SmallVec<[ABIArg; 6]>;
 
 /// An ABI-specific representation of a function signature.
-#[derive(Debug, Clone)]
 pub(crate) struct ABISig {
     /// Function parameters.
     pub params: ABIParams,
@@ -238,28 +224,15 @@ pub(crate) struct ABISig {
     pub result: ABIResult,
     /// Stack space needed for stack arguments.
     pub stack_bytes: u32,
-    /// All the registers used in the [`ABISig`].
-    /// Note that this collection is guaranteed to
-    /// be unique: in some cases some registers might
-    /// be used as params as a well as returns (e.g. xmm0 in x64).
-    pub regs: HashSet<Reg>,
 }
 
 impl ABISig {
     /// Create a new ABI signature.
     pub fn new(params: ABIParams, result: ABIResult, stack_bytes: u32) -> Self {
-        let regs = params
-            .iter()
-            .filter_map(|r| r.get_reg())
-            .collect::<SmallVec<[Reg; 6]>>();
-        let result_regs = result.regs();
-        let chained = regs.into_iter().chain(result_regs);
-
         Self {
             params,
             result,
             stack_bytes,
-            regs: HashSet::from_iter(chained),
         }
     }
 }
@@ -269,15 +242,7 @@ pub(crate) fn ty_size(ty: &WasmType) -> u32 {
     match *ty {
         WasmType::I32 | WasmType::F32 => 4,
         WasmType::I64 | WasmType::F64 => 8,
-        WasmType::Ref(rt) => match rt.heap_type {
-            // TODO: Similar to the comment in visitor.rs at impl From<WasmType> for
-            // OperandSize, Once Wasmtime supports 32-bit architectures, this will
-            // need to be updated to derive operand size from the target's pointer
-            // size.
-            WasmHeapType::Func => 8,
-            ht => unimplemented!("Support for WasmHeapType: {ht}"),
-        },
-        t => unimplemented!("Support for WasmType: {t}"),
+        _ => panic!(),
     }
 }
 
diff --git a/winch/codegen/src/codegen/builtin.rs b/winch/codegen/src/codegen/builtin.rs
deleted file mode 100644
index 2293afc615fa..000000000000
--- a/winch/codegen/src/codegen/builtin.rs
+++ /dev/null
@@ -1,268 +0,0 @@
-//! Builtin function handling.
-
-use crate::{
-    abi::{ABISig, ABI},
-    codegen::env::ptr_type_from_ptr_size,
-    CallingConvention,
-};
-use cranelift_codegen::ir::LibCall;
-use std::sync::Arc;
-use wasmtime_environ::{BuiltinFunctionIndex, PtrSize, VMOffsets, WasmType};
-
-#[derive(Copy, Clone)]
-pub(crate) enum BuiltinType {
-    /// Dynamic built-in function, derived from the VMContext.
-    Dynamic {
-        /// The index of the built-in function.
-        index: u32,
-        /// The built-in function base, relative to the VMContext.
-        base: u32,
-    },
-    /// A known libcall.
-    /// See [`cranelift_codegen::ir::LibCall`] for more details.
-    Known(LibCall),
-}
-
-impl BuiltinType {
-    /// Create a new dynamic built-in function type.
-    pub fn dynamic(index: u32, base: u32) -> Self {
-        Self::Dynamic { index, base }
-    }
-
-    /// Create a new known built-in function type.
-    pub fn known(libcall: LibCall) -> Self {
-        Self::Known(libcall)
-    }
-}
-
-#[derive(Clone)]
-pub struct BuiltinFunction {
-    inner: Arc<BuiltinFunctionInner>,
-}
-
-impl BuiltinFunction {
-    pub(crate) fn sig(&self) -> &ABISig {
-        &self.inner.sig
-    }
-
-    pub(crate) fn ty(&self) -> BuiltinType {
-        self.inner.ty
-    }
-}
-
-/// Metadata about a builtin function.
-pub struct BuiltinFunctionInner {
-    /// The ABI specific signature of the function.
-    sig: ABISig,
-    /// The built-in function type.
-    ty: BuiltinType,
-}
-
-macro_rules! declare_function_sig {
-    (
-        $(
-            $( #[$attr:meta] )*
-            $name:ident( $( $pname:ident: $param:ident ),* ) $( -> $result:ident )?;
-         )*
-    ) => {
-        /// Provides the ABI signatures for each builtin function
-        /// signature.
-        pub struct BuiltinFunctions {
-            /// The target calling convention.
-            call_conv: CallingConvention,
-            /// The target pointer size.
-            ptr_size: u8,
-            /// The target pointer type, as a WebAssembly type.
-            ptr_type: WasmType,
-            /// The builtin functions base relative to the VMContext.
-            base: u32,
-            /// F32 Ceil.
-            ceil_f32: Option<BuiltinFunction>,
-            /// F64 Ceil.
-            ceil_f64: Option<BuiltinFunction>,
-            /// F32 Floor.
-            floor_f32: Option<BuiltinFunction>,
-            /// F64 Floor.
-            floor_f64: Option<BuiltinFunction>,
-            /// F32 Trunc.
-            trunc_f32: Option<BuiltinFunction>,
-            /// F64 Trunc.
-            trunc_f64: Option<BuiltinFunction>,
-            /// F32 Nearest.
-            nearest_f32: Option<BuiltinFunction>,
-            /// F64 Nearest.
-            nearest_f64: Option<BuiltinFunction>,
-            $(
-                $name: Option<BuiltinFunction>,
-            )*
-        }
-
-        // Until all the builtin functions are used.
-        #[allow(dead_code)]
-        impl BuiltinFunctions {
-            pub fn new<P: PtrSize>(vmoffsets: &VMOffsets<P>, call_conv: CallingConvention) -> Self {
-                let size = vmoffsets.ptr.size();
-                Self {
-                    ptr_size: size,
-                    call_conv,
-                    base: vmoffsets.vmctx_builtin_functions(),
-                    ptr_type: ptr_type_from_ptr_size(size),
-                    ceil_f32: None,
-                    ceil_f64: None,
-                    floor_f32: None,
-                    floor_f64: None,
-                    trunc_f32: None,
-                    trunc_f64: None,
-                    nearest_f32: None,
-                    nearest_f64: None,
-                    $(
-                        $name: None,
-                    )*
-                }
-            }
-
-            fn pointer(&self) -> WasmType {
-                self.ptr_type
-            }
-
-            fn vmctx(&self) -> WasmType {
-                self.pointer()
-            }
-
-            fn i32(&self) -> WasmType {
-                WasmType::I32
-            }
-
-            fn f32(&self) -> WasmType {
-                WasmType::F32
-            }
-
-            fn f64(&self) -> WasmType {
-                WasmType::F64
-            }
-
-            fn i64(&self) -> WasmType {
-                WasmType::I64
-            }
-
-            fn reference(&self) -> WasmType {
-                self.pointer()
-            }
-
-            fn over_f64<A: ABI>(&self) -> ABISig {
-                A::sig_from(&[self.f64()], &[self.f64()], &self.call_conv)
-            }
-
-            fn over_f32<A: ABI>(&self) -> ABISig {
-                A::sig_from(&[self.f64()], &[self.f64()], &self.call_conv)
-            }
-
-            pub(crate) fn ceil_f32<A: ABI>(&mut self) -> BuiltinFunction {
-                if self.ceil_f32.is_none() {
-                    let sig = self.over_f32::<A>();
-                    let inner = Arc::new(BuiltinFunctionInner { sig, ty: BuiltinType::known(LibCall::CeilF32) });
-                    self.ceil_f32 = Some(BuiltinFunction {
-                        inner,
-                    });
-                }
-                self.ceil_f32.as_ref().unwrap().clone()
-            }
-
-            pub(crate) fn ceil_f64<A: ABI>(&mut self) -> BuiltinFunction {
-                if self.ceil_f64.is_none() {
-                    let sig = self.over_f64::<A>();
-                    let inner = Arc::new(BuiltinFunctionInner { sig, ty: BuiltinType::known(LibCall::CeilF64) });
-                    self.ceil_f64 = Some(BuiltinFunction {
-                        inner,
-                    });
-                }
-                self.ceil_f64.as_ref().unwrap().clone()
-            }
-
-            pub(crate) fn floor_f32<A: ABI>(&mut self) -> BuiltinFunction {
-                if self.floor_f32.is_none() {
-                    let sig = self.over_f32::<A>();
-                    let inner = Arc::new(BuiltinFunctionInner { sig, ty: BuiltinType::known(LibCall::FloorF32) });
-                    self.floor_f32 = Some(BuiltinFunction {
-                        inner,
-                    });
-                }
-                self.floor_f32.as_ref().unwrap().clone()
-            }
-
-            pub(crate) fn floor_f64<A: ABI>(&mut self) -> BuiltinFunction {
-                if self.floor_f64.is_none() {
-                    let sig = self.over_f64::<A>();
-                    let inner = Arc::new(BuiltinFunctionInner { sig, ty: BuiltinType::known(LibCall::FloorF64) });
-                    self.floor_f64 = Some(BuiltinFunction {
-                        inner,
-                    });
-                }
-                self.floor_f64.as_ref().unwrap().clone()
-            }
-
-            pub(crate) fn trunc_f32<A: ABI>(&mut self) -> BuiltinFunction {
-                if self.trunc_f32.is_none() {
-                    let sig = self.over_f32::<A>();
-                    let inner = Arc::new(BuiltinFunctionInner { sig, ty: BuiltinType::known(LibCall::TruncF32) });
-                    self.trunc_f32 = Some(BuiltinFunction {
-                        inner,
-                    });
-                }
-                self.trunc_f32.as_ref().unwrap().clone()
-            }
-
-            pub(crate) fn trunc_f64<A: ABI>(&mut self) -> BuiltinFunction {
-                if self.trunc_f64.is_none() {
-                    let sig = self.over_f64::<A>();
-                    let inner = Arc::new(BuiltinFunctionInner { sig, ty: BuiltinType::known(LibCall::TruncF64) });
-                    self.trunc_f64 = Some(BuiltinFunction {
-                        inner,
-                    });
-                }
-                self.trunc_f64.as_ref().unwrap().clone()
-            }
-
-            pub(crate) fn nearest_f32<A: ABI>(&mut self) -> BuiltinFunction {
-                if self.nearest_f32.is_none() {
-                    let sig = self.over_f32::<A>();
-                    let inner = Arc::new(BuiltinFunctionInner { sig, ty: BuiltinType::known(LibCall::NearestF32) });
-                    self.nearest_f32 = Some(BuiltinFunction {
-                        inner,
-                    });
-                }
-                self.nearest_f32.as_ref().unwrap().clone()
-            }
-
-            pub(crate) fn nearest_f64<A: ABI>(&mut self) -> BuiltinFunction {
-                if self.nearest_f64.is_none() {
-                    let sig = self.over_f64::<A>();
-                    let inner = Arc::new(BuiltinFunctionInner { sig, ty: BuiltinType::known(LibCall::NearestF64) });
-                    self.nearest_f64 = Some(BuiltinFunction {
-                        inner,
-                    });
-                }
-                self.nearest_f64.as_ref().unwrap().clone()
-            }
-
-            $(
-                pub(crate) fn $name<A: ABI, P: PtrSize>(&mut self) -> BuiltinFunction {
-                    if self.$name.is_none() {
-                        let params = vec![ $(self.$param() ),* ];
-                        let result = vec![ $(self.$result() )?];
-                        let sig = A::sig_from(&params, &result, &self.call_conv);
-                        let index = BuiltinFunctionIndex::$name();
-                        let inner = Arc::new(BuiltinFunctionInner { sig, ty: BuiltinType::dynamic(index.index() * (self.ptr_size as u32), self.base) });
-                        self.$name = Some(BuiltinFunction {
-                            inner,
-                        });
-                    }
-
-                    self.$name.as_ref().unwrap().clone()
-                }
-             )*
-        }
-    }
-}
-
-wasmtime_environ::foreach_builtin_function!(declare_function_sig);
diff --git a/winch/codegen/src/codegen/call.rs b/winch/codegen/src/codegen/call.rs
index 977b4757e901..aab3e688cf8c 100644
--- a/winch/codegen/src/codegen/call.rs
+++ b/winch/codegen/src/codegen/call.rs
@@ -1,331 +1,170 @@
 //! Function call emission.  For more details around the ABI and
 //! calling convention, see [ABI].
-//!
-//! This module exposes a single function [`FnCall::emit`], which is responsible
-//! of orchestrating the emission of calls. In general such orchestration
-//! takes place in 4 steps:
-//!
-//! 1. [`Callee`] resolution.
-//! 2. Mapping of the [`Callee`] to the [`CalleeKind`].
-//! 3. Calculation of the stack space consumed by the call.
-//! 4. Emission.
-//!
-//! The stack space consumed by the function call; that is,
-//! the sum of:
-//!
-//! 1. The amount of stack space created by saving any live
-//!    registers at the callsite.
-//! 2. The amount of space used by any memory entries in the value
-//!    stack present at the callsite, that will be used as
-//!    arguments for the function call. Any memory values in the
-//!    value stack that are needed as part of the function
-//!    arguments, will be consumed by the function call (either by
-//!    assigning those values to a register or by storing those
-//!    values to a memory location if the callee argument is on
-//!    the stack), so we track that stack space to reclaim it once
-//!    the function call has ended. This could also be done in
-//!    when assigning arguments everytime a memory entry needs to be assigned
-//!    to a particular location, but doing so, will incur in more
-//!    instructions (e.g. a pop per argument that needs to be
-//!    assigned); it's more efficient to track the space needed by
-//!    those memory values and reclaim it at once.
-//!
-//! The machine stack throghout the function call is as follows:
-//! ┌──────────────────────────────────────────────────┐
-//! │                                                  │
-//! │                  1                               │
-//! │  Stack space created by any previous spills      │
-//! │  from the value stack; and which memory values   │
-//! │  are used as function arguments.                 │
-//! │                                                  │
-//! ├──────────────────────────────────────────────────┤ ---> The Wasm value stack at this point in time would look like:
-//! │                                                  │      [ Reg | Reg | Mem(offset) | Mem(offset) ]
-//! │                   2                              │
-//! │   Stack space created by saving                  │
-//! │   any live registers at the callsite.            │
-//! │                                                  │
-//! │                                                  │
-//! ├─────────────────────────────────────────────────┬┤ ---> The Wasm value stack at this point in time would look like:
-//! │                                                  │      [ Mem(offset) | Mem(offset) | Mem(offset) | Mem(offset) ]
-//! │                                                  │      Assuming that the callee takes 4 arguments, we calculate
-//! │                                                  │      2 spilled registers + 2 memory values; all of which will be used
-//! │   Stack space allocated for                      │      as arguments to the call via `assign_args`, thus the memory they represent is
-//! │   the callee function arguments in the stack;    │      is considered to be consumed by the call.
-//! │   represented by `arg_stack_space`               │
-//! │                                                  │
-//! │                                                  │
-//! │                                                  │
-//! └──────────────────────────────────────────────────┘ ------> Stack pointer when emitting the call
-
 use crate::{
     abi::{ABIArg, ABISig, ABI},
-    codegen::{
-        ptr_type_from_ptr_size, BuiltinFunction, BuiltinType, Callee, CalleeInfo, CodeGenContext,
-        TypedReg,
-    },
+    codegen::CodeGenContext,
     masm::{CalleeKind, MacroAssembler, OperandSize},
     reg::Reg,
-    CallingConvention,
 };
-use smallvec::SmallVec;
-use std::borrow::Cow;
-use wasmtime_environ::{PtrSize, VMOffsets, WasmType};
+use wasmtime_environ::FuncIndex;
 
 /// All the information needed to emit a function call.
-#[derive(Copy, Clone)]
-pub(crate) struct FnCall {}
-
-impl FnCall {
-    /// Orchestrates the emission of a function call:
-    /// 1. Resolves the [`Callee`] through the given callback.
-    /// 2. Maps the resolved [`Callee`] to the [`CalleeKind`].
-    /// 3. Saves any live registers and calculates the stack space consumed
-    ///    by the function call.
-    /// 4. Emits the call.
-    pub fn emit<M: MacroAssembler, P: PtrSize, R>(
-        masm: &mut M,
-        context: &mut CodeGenContext,
-        mut resolve: R,
-    ) where
-        R: FnMut(&mut CodeGenContext) -> Callee,
-    {
-        let callee = resolve(context);
-        let ptr_type = ptr_type_from_ptr_size(context.vmoffsets.ptr.size());
-        let sig = Self::get_sig::<M>(&callee, ptr_type);
-        let sig = sig.as_ref();
-
-        let arg_stack_space = sig.stack_bytes;
-        let kind = Self::map(&context.vmoffsets, &callee, sig, context, masm);
-        let call_stack_space = Self::save(context, masm, &sig);
-
-        let reserved_stack = masm.call(arg_stack_space, |masm| {
-            let scratch = <M::ABI as ABI>::scratch_reg();
-            Self::assign(sig, context, masm, scratch);
-            kind
-        });
-
-        match kind {
-            CalleeKind::Indirect(r) => context.free_reg(r),
-            _ => {}
-        }
-        Self::cleanup(
-            sig,
-            call_stack_space.checked_add(reserved_stack).unwrap(),
-            masm,
-            context,
-        );
-    }
-
-    /// Derive the [`ABISig`] for a particulare [`Callee].
-    fn get_sig<M: MacroAssembler>(callee: &Callee, ptr_type: WasmType) -> Cow<'_, ABISig> {
-        match callee {
-            Callee::Builtin(info) => Cow::Borrowed(info.sig()),
-            Callee::Import(info) => {
-                let mut params: SmallVec<[WasmType; 6]> =
-                    SmallVec::with_capacity(info.ty.params().len() + 2);
-                params.extend_from_slice(&[ptr_type, ptr_type]);
-                params.extend_from_slice(info.ty.params());
-                Cow::Owned(<M::ABI as ABI>::sig_from(
-                    &params,
-                    info.ty.returns(),
-                    &CallingConvention::Default,
-                ))
-            }
-            Callee::Local(info) => {
-                Cow::Owned(<M::ABI as ABI>::sig(&info.ty, &CallingConvention::Default))
-            }
-            Callee::FuncRef(ty) => {
-                Cow::Owned(<M::ABI as ABI>::sig(&ty, &CallingConvention::Default))
-            }
-        }
-    }
-
-    /// Maps the given [`Callee`] to a [`CalleeKind`].
-    fn map<P: PtrSize, M: MacroAssembler>(
-        vmoffsets: &VMOffsets<P>,
-        callee: &Callee,
-        sig: &ABISig,
-        context: &mut CodeGenContext,
-        masm: &mut M,
-    ) -> CalleeKind {
-        match callee {
-            Callee::Builtin(b) => Self::load_builtin(b, context, masm),
-            Callee::FuncRef(_) => Self::load_funcref(sig, vmoffsets.ptr.size(), context, masm),
-            Callee::Local(i) => Self::map_local(i),
-            Callee::Import(i) => Self::load_import(i, sig, context, masm, vmoffsets),
-        }
-    }
-
-    /// Load a built-in function to the next available register.
-    fn load_builtin<M: MacroAssembler>(
-        builtin: &BuiltinFunction,
-        context: &mut CodeGenContext,
-        masm: &mut M,
-    ) -> CalleeKind {
-        match builtin.ty() {
-            BuiltinType::Dynamic { index, base } => {
-                let sig = builtin.sig();
-                let callee = context.without::<Reg, _, _>(&sig.regs, masm, |cx, masm| {
-                    let scratch = <M::ABI as ABI>::scratch_reg();
-                    let builtins_base = masm.address_at_vmctx(base);
-                    masm.load_ptr(builtins_base, scratch);
-                    let addr = masm.address_at_reg(scratch, index);
-                    let callee = cx.any_gpr(masm);
-                    masm.load_ptr(addr, callee);
-                    callee
-                });
-                CalleeKind::indirect(callee)
-            }
-            BuiltinType::Known(c) => CalleeKind::known(c),
-        }
-    }
-
-    /// Map a local function to a [`CalleeKind`].
-    fn map_local(info: &CalleeInfo) -> CalleeKind {
-        CalleeKind::direct(info.index.as_u32())
-    }
-
-    /// Loads a function import to the next available register.
-    fn load_import<M: MacroAssembler, P: PtrSize>(
-        info: &CalleeInfo,
-        sig: &ABISig,
-        context: &mut CodeGenContext,
-        masm: &mut M,
-        vmoffsets: &VMOffsets<P>,
-    ) -> CalleeKind {
-        let ptr_type = ptr_type_from_ptr_size(vmoffsets.ptr.size());
-        let caller_vmctx = <M::ABI as ABI>::vmctx_reg();
-        let (callee, callee_vmctx) =
-            context.without::<(Reg, Reg), M, _>(&sig.regs, masm, |context, masm| {
-                (context.any_gpr(masm), context.any_gpr(masm))
-            });
-        let callee_vmctx_offset = vmoffsets.vmctx_vmfunction_import_vmctx(info.index);
-        let callee_vmctx_addr = masm.address_at_vmctx(callee_vmctx_offset);
-        masm.load_ptr(callee_vmctx_addr, callee_vmctx);
-
-        let callee_body_offset = vmoffsets.vmctx_vmfunction_import_wasm_call(info.index);
-        let callee_addr = masm.address_at_vmctx(callee_body_offset);
-        masm.load_ptr(callee_addr, callee);
-
-        // Put the callee / caller vmctx at the start of the
-        // range of the stack so that they are used as first
-        // and second arguments.
-        let stack = &mut context.stack;
-        let location = stack.len() - (sig.params.len() - 2);
-        let values = [
-            TypedReg::new(ptr_type, callee_vmctx).into(),
-            TypedReg::new(ptr_type, caller_vmctx).into(),
-        ]
-        .into_iter();
-        context.stack.insert_many(location, values);
-
-        CalleeKind::indirect(callee)
-    }
-
-    /// Loads a function reference to the next available register.
-    fn load_funcref<M: MacroAssembler>(
-        sig: &ABISig,
-        ptr: impl PtrSize,
-        context: &mut CodeGenContext,
-        masm: &mut M,
-    ) -> CalleeKind {
-        // Pop the funcref pointer to a register and allocate a register to hold the
-        // address of the funcref. Since the callee is not addressed from a global non
-        // allocatable register (like the vmctx in the case of an import), we load the
-        // funcref to a register ensuring that it doesn't get assigned to a non-arg
-        // register.
-        let (funcref_ptr, funcref) = context.without::<_, M, _>(&sig.regs, masm, |cx, masm| {
-            (cx.pop_to_reg(masm, None).into(), cx.any_gpr(masm))
-        });
-
-        masm.load_ptr(
-            masm.address_at_reg(funcref_ptr, ptr.vm_func_ref_wasm_call().into()),
-            funcref,
-        );
-        context.free_reg(funcref_ptr);
-        CalleeKind::indirect(funcref)
-    }
+pub(crate) struct FnCall<'a> {
+    /// The stack space consumed by the function call; that is,
+    /// the sum of:
+    ///
+    /// 1. The amount of stack space created by saving any live
+    ///    registers at the callsite.
+    /// 2. The amount of space used by any memory entries in the value
+    ///    stack present at the callsite, that will be used as
+    ///    arguments for the function call. Any memory values in the
+    ///    value stack that are needed as part of the function
+    ///    arguments, will be consumed by the function call (either by
+    ///    assigning those values to a register or by storing those
+    ///    values to a memory location if the callee argument is on
+    ///    the stack), so we track that stack space to reclaim it once
+    ///    the function call has ended. This could also be done in
+    ///    `assign_args` everytime a memory entry needs to be assigned
+    ///    to a particular location, but doing so, will incur in more
+    ///    instructions (e.g. a pop per argument that needs to be
+    ///    assigned); it's more efficient to track the space needed by
+    ///    those memory values and reclaim it at once.
+    ///
+    /// The machine stack throghout the function call is as follows:
+    /// ┌──────────────────────────────────────────────────┐
+    /// │                                                  │
+    /// │                  1                               │
+    /// │  Stack space created by any previous spills      │
+    /// │  from the value stack; and which memory values   │
+    /// │  are used as function arguments.                 │
+    /// │                                                  │
+    /// ├──────────────────────────────────────────────────┤ ---> The Wasm value stack at this point in time would look like:
+    /// │                                                  │      [ Reg | Reg | Mem(offset) | Mem(offset) ]
+    /// │                   2                              │
+    /// │   Stack space created by saving                  │
+    /// │   any live registers at the callsite.            │
+    /// │                                                  │
+    /// │                                                  │
+    /// ├─────────────────────────────────────────────────┬┤ ---> The Wasm value stack at this point in time would look like:
+    /// │                                                  │      [ Mem(offset) | Mem(offset) | Mem(offset) | Mem(offset) ]
+    /// │                                                  │      Assuming that the callee takes 4 arguments, we calculate
+    /// │                                                  │      2 spilled registers + 2 memory values; all of which will be used
+    /// │   Stack space allocated for                      │      as arguments to the call via `assign_args`, thus the memory they represent is
+    /// │   the callee function arguments in the stack;    │      is considered to be consumed by the call.
+    /// │   represented by `arg_stack_space`               │
+    /// │                                                  │
+    /// │                                                  │
+    /// │                                                  │
+    /// └──────────────────────────────────────────────────┘ ------> Stack pointer when emitting the call
+    ///
+    call_stack_space: u32,
+    /// The total stack space needed for the callee arguments on the
+    /// stack, including any adjustments to the function's frame and
+    /// aligned to to the required ABI alignment.
+    arg_stack_space: u32,
+    /// The ABI-specific signature of the callee.
+    abi_sig: &'a ABISig,
+}
 
-    /// Assign arguments for the function call.
-    fn assign<M: MacroAssembler>(
-        sig: &ABISig,
+impl<'a> FnCall<'a> {
+    /// Allocate and setup a new function call.
+    ///
+    /// The setup process, will first save all the live registers in
+    /// the value stack, tracking down those spilled for the function
+    /// arguments(see comment below for more details) it will also
+    /// track all the memory entries consumed by the function
+    /// call. Then, it will calculate any adjustments needed to ensure
+    /// the alignment of the caller's frame.  It's important to note
+    /// that the order of operations in the setup is important, as we
+    /// want to calculate any adjustments to the caller's frame, after
+    /// having saved any live registers, so that we can account for
+    /// any pushes generated by register spilling.
+    pub fn new<M: MacroAssembler>(
+        callee_sig: &'a ABISig,
         context: &mut CodeGenContext,
         masm: &mut M,
-        scratch: Reg,
-    ) {
-        let arg_count = sig.params.len();
+    ) -> Self {
         let stack = &context.stack;
-        let mut stack_values = stack.peekn(arg_count);
-        for arg in &sig.params {
-            let val = stack_values
-                .next()
-                .unwrap_or_else(|| panic!("expected stack value for function argument"));
-            match &arg {
-                &ABIArg::Reg { ty: _, reg } => {
-                    context.move_val_to_reg(&val, *reg, masm);
-                }
-                &ABIArg::Stack { ty, offset } => {
-                    let addr = masm.address_at_sp(*offset);
-                    let size: OperandSize = (*ty).into();
-                    context.move_val_to_reg(val, scratch, masm);
-                    masm.store(scratch.into(), addr, size);
-                }
-            }
-        }
-    }
+        let arg_stack_space = callee_sig.stack_bytes;
+        let callee_params = &callee_sig.params;
 
-    /// Save any live registers prior to emitting the call.
-    //
-    // Here we perform a "spill" of the register entries
-    // in the Wasm value stack, we also count any memory
-    // values that will be used used as part of the callee
-    // arguments.  Saving the live registers is done by
-    // emitting push operations for every `Reg` entry in
-    // the Wasm value stack. We do this to be compliant
-    // with Winch's internal ABI, in which all registers
-    // are treated as caller-saved. For more details, see
-    // [ABI].
-    //
-    // The next few lines, partition the value stack into
-    // two sections:
-    // +------------------+--+--- (Stack top)
-    // |                  |  |
-    // |                  |  | 1. The top `n` elements, which are used for
-    // |                  |  |    function arguments; for which we save any
-    // |                  |  |    live registers, keeping track of the amount of registers
-    // +------------------+  |    saved plus the amount of memory values consumed by the function call;
-    // |                  |  |    with this information we can later reclaim the space used by the function call.
-    // |                  |  |
-    // +------------------+--+---
-    // |                  |  | 2. The rest of the items in the stack, for which
-    // |                  |  |    we only save any live registers.
-    // |                  |  |
-    // +------------------+  |
-    fn save<M: MacroAssembler>(context: &mut CodeGenContext, masm: &mut M, sig: &ABISig) -> u32 {
-        let callee_params = &sig.params;
-        let stack = &context.stack;
-        match callee_params.len() {
+        let call_stack_space = match callee_params.len() {
             0 => {
                 let _ = context.save_live_registers_and_calculate_sizeof(masm, ..);
                 0u32
             }
             _ => {
+                // Here we perform a "spill" of the register entries
+                // in the Wasm value stack, we also count any memory
+                // values that will be used used as part of the callee
+                // arguments.  Saving the live registers is done by
+                // emitting push operations for every `Reg` entry in
+                // the Wasm value stack. We do this to be compliant
+                // with Winch's internal ABI, in which all registers
+                // are treated as caller-saved. For more details, see
+                // [ABI].
+                //
+                // The next few lines, partition the value stack into
+                // two sections:
+                // +------------------+--+--- (Stack top)
+                // |                  |  |
+                // |                  |  | 1. The top `n` elements, which are used for
+                // |                  |  |    function arguments; for which we save any
+                // |                  |  |    live registers, keeping track of the amount of registers
+                // +------------------+  |    saved plus the amount of memory values consumed by the function call;
+                // |                  |  |    with this information we can later reclaim the space used by the function call.
+                // |                  |  |
+                // +------------------+--+---
+                // |                  |  | 2. The rest of the items in the stack, for which
+                // |                  |  |    we only save any live registers.
+                // |                  |  |
+                // +------------------+  |
                 assert!(stack.len() >= callee_params.len());
                 let partition = stack.len() - callee_params.len();
                 let _ = context.save_live_registers_and_calculate_sizeof(masm, 0..partition);
                 context.save_live_registers_and_calculate_sizeof(masm, partition..)
             }
+        };
+
+        Self {
+            abi_sig: &callee_sig,
+            arg_stack_space,
+            call_stack_space,
         }
     }
 
-    /// Cleanup stack space and free registers after emitting the call.
-    fn cleanup<M: MacroAssembler>(
-        sig: &ABISig,
-        total_space: u32,
+    /// Emit a direct function call, to a locally defined function.
+    pub fn direct<M: MacroAssembler>(
+        &self,
+        masm: &mut M,
+        context: &mut CodeGenContext,
+        callee: FuncIndex,
+    ) {
+        let reserved_stack = masm.call(self.arg_stack_space, |masm| {
+            self.assign_args(context, masm, <M::ABI as ABI>::scratch_reg());
+            CalleeKind::Direct(callee.as_u32())
+        });
+        self.post_call::<M>(masm, context, reserved_stack);
+    }
+
+    /// Emit an indirect function call, using a raw address.
+    pub fn indirect<M: MacroAssembler>(
+        &self,
         masm: &mut M,
         context: &mut CodeGenContext,
+        addr: M::Address,
     ) {
-        masm.free_stack(total_space);
+        let reserved_stack = masm.call(self.arg_stack_space, |masm| {
+            let scratch = <M::ABI as ABI>::scratch_reg();
+            self.assign_args(context, masm, scratch);
+            masm.load(addr, scratch, OperandSize::S64);
+            CalleeKind::Indirect(scratch)
+        });
+        self.post_call::<M>(masm, context, reserved_stack);
+    }
+
+    fn post_call<M: MacroAssembler>(&self, masm: &mut M, context: &mut CodeGenContext, size: u32) {
+        masm.free_stack(self.call_stack_space + size);
         // Only account for registers given that any memory entries
         // consumed by the call (assigned to a register or to a stack
         // slot) were freed by the previous call to
@@ -343,11 +182,38 @@ impl FnCall {
         // * Rely on the new implementation of `drop_last` to calcuate
         // the stack memory entries consumed by the call and then free
         // the calculated stack space.
-        context.drop_last(sig.params.len(), |regalloc, v| {
+        context.drop_last(self.abi_sig.params.len(), |regalloc, v| {
             if v.is_reg() {
                 regalloc.free(v.get_reg().into());
             }
         });
-        context.push_abi_results(&sig.result, masm);
+        context.push_abi_results(&self.abi_sig.result, masm);
+    }
+
+    fn assign_args<M: MacroAssembler>(
+        &self,
+        context: &mut CodeGenContext,
+        masm: &mut M,
+        scratch: Reg,
+    ) {
+        let arg_count = self.abi_sig.params.len();
+        let stack = &context.stack;
+        let mut stack_values = stack.peekn(arg_count);
+        for arg in &self.abi_sig.params {
+            let val = stack_values
+                .next()
+                .unwrap_or_else(|| panic!("expected stack value for function argument"));
+            match &arg {
+                &ABIArg::Reg { ty: _, reg } => {
+                    context.move_val_to_reg(&val, *reg, masm);
+                }
+                &ABIArg::Stack { ty, offset } => {
+                    let addr = masm.address_at_sp(*offset);
+                    let size: OperandSize = (*ty).into();
+                    context.move_val_to_reg(val, scratch, masm);
+                    masm.store(scratch.into(), addr, size);
+                }
+            }
+        }
     }
 }
diff --git a/winch/codegen/src/codegen/context.rs b/winch/codegen/src/codegen/context.rs
index 58409520e7b9..ad4bc40693ee 100644
--- a/winch/codegen/src/codegen/context.rs
+++ b/winch/codegen/src/codegen/context.rs
@@ -1,9 +1,8 @@
-use wasmtime_environ::{VMOffsets, WasmHeapType, WasmType};
+use wasmtime_environ::WasmType;
 
 use super::ControlStackFrame;
 use crate::{
-    abi::{ABIResult, ABI},
-    codegen::BuiltinFunctions,
+    abi::ABIResult,
     frame::Frame,
     isa::reg::RegClass,
     masm::{MacroAssembler, OperandSize, RegImm},
@@ -28,37 +27,25 @@ use std::ops::RangeBounds;
 /// generation process. The code generation context should
 /// be generally used as the single entry point to access
 /// the compound functionality provided by its elements.
-pub(crate) struct CodeGenContext<'a, 'builtins: 'a> {
+pub(crate) struct CodeGenContext<'a> {
     /// The register allocator.
     pub regalloc: RegAlloc,
     /// The value stack.
     pub stack: Stack,
     /// The current function's frame.
-    pub frame: Frame,
+    pub frame: &'a Frame,
     /// Reachability state.
     pub reachable: bool,
-    /// The built-in functions available to the JIT code.
-    pub builtins: &'builtins mut BuiltinFunctions,
-    /// A reference to the VMOffsets.
-    pub vmoffsets: &'a VMOffsets<u8>,
 }
 
-impl<'a, 'builtins> CodeGenContext<'a, 'builtins> {
+impl<'a> CodeGenContext<'a> {
     /// Create a new code generation context.
-    pub fn new(
-        regalloc: RegAlloc,
-        stack: Stack,
-        frame: Frame,
-        builtins: &'builtins mut BuiltinFunctions,
-        vmoffsets: &'a VMOffsets<u8>,
-    ) -> Self {
+    pub fn new(regalloc: RegAlloc, stack: Stack, frame: &'a Frame) -> Self {
         Self {
             regalloc,
             stack,
             frame,
             reachable: true,
-            builtins,
-            vmoffsets,
         }
     }
 
@@ -76,11 +63,7 @@ impl<'a, 'builtins> CodeGenContext<'a, 'builtins> {
         match ty {
             I32 | I64 => self.reg_for_class(RegClass::Int, masm),
             F32 | F64 => self.reg_for_class(RegClass::Float, masm),
-            Ref(rt) => match rt.heap_type {
-                WasmHeapType::Func => self.reg_for_class(RegClass::Int, masm),
-                ht => unimplemented!("Support for WasmHeapType: {ht}"),
-            },
-            t => unimplemented!("Support for WasmType: {t}"),
+            t => panic!("unsupported type {:?}", t),
         }
     }
 
@@ -98,47 +81,27 @@ impl<'a, 'builtins> CodeGenContext<'a, 'builtins> {
         self.reg_for_class(RegClass::Int, masm)
     }
 
-    /// Executes the provided function, guaranteeing that the specified set of
-    /// registers, if any, remain unallocatable throughout the function's
-    /// execution. Only the registers in the `free` iterator will be freed. The
-    /// caller must guarantee that in case the iterators are different, the free
-    /// iterator must be a subset of the alloc iterator.
-    pub fn without<'r, T, M, F>(
-        &mut self,
-        regs: impl IntoIterator<Item = &'r Reg> + Copy,
-        masm: &mut M,
-        mut f: F,
-    ) -> T
+    /// Executes the provided function, guaranteeing that the
+    /// specified register, if any, remains unallocatable throughout
+    /// the function's execution.
+    pub fn without<T, M, F>(&mut self, reg: Option<Reg>, masm: &mut M, mut f: F) -> T
     where
         M: MacroAssembler,
         F: FnMut(&mut Self, &mut M) -> T,
     {
-        for r in regs {
-            self.reg(*r, masm);
+        if let Some(reg) = reg {
+            self.reg(reg, masm);
         }
 
         let result = f(self, masm);
 
-        for r in regs {
-            self.free_reg(*r);
+        if let Some(reg) = reg {
+            self.free_reg(reg);
         }
 
         result
     }
 
-    /// Similar to [`Self::without`] but takes an optional, single register
-    /// as a paramter.
-    pub fn maybe_without1<T, M, F>(&mut self, reg: Option<Reg>, masm: &mut M, mut f: F) -> T
-    where
-        M: MacroAssembler,
-        F: FnMut(&mut Self, &mut M) -> T,
-    {
-        match reg {
-            Some(r) => self.without(&[r], masm, f),
-            None => f(self, masm),
-        }
-    }
-
     /// Free the given register.
     pub fn free_reg(&mut self, reg: impl Into<Reg>) {
         let reg: Reg = reg.into();
@@ -218,40 +181,6 @@ impl<'a, 'builtins> CodeGenContext<'a, 'builtins> {
         self.stack.push(typed_reg.into());
     }
 
-    /// Prepares arguments for emitting a binary operation.
-    pub fn binop<F, M>(&mut self, masm: &mut M, size: OperandSize, mut emit: F)
-    where
-        F: FnMut(&mut M, Reg, Reg, OperandSize),
-        M: MacroAssembler,
-    {
-        let src = self.pop_to_reg(masm, None);
-        let dst = self.pop_to_reg(masm, None);
-        emit(masm, dst.reg, src.reg.into(), size);
-        self.free_reg(src);
-        self.stack.push(dst.into());
-    }
-
-    /// Prepares arguments for emitting an f32 or f64 comparison operation.
-    pub fn float_cmp_op<F, M>(&mut self, masm: &mut M, size: OperandSize, mut emit: F)
-    where
-        F: FnMut(&mut M, Reg, Reg, Reg, OperandSize),
-        M: MacroAssembler,
-    {
-        let src1 = self.pop_to_reg(masm, None);
-        let src2 = self.pop_to_reg(masm, None);
-        let dst = self.any_gpr(masm);
-        emit(masm, dst, src1.reg, src2.reg, size);
-        self.free_reg(src1);
-        self.free_reg(src2);
-
-        let dst = match size {
-            OperandSize::S32 => TypedReg::i32(dst),
-            OperandSize::S64 => TypedReg::i64(dst),
-            OperandSize::S128 => unreachable!(),
-        };
-        self.stack.push(dst.into());
-    }
-
     /// Prepares arguments for emitting an i32 binary operation.
     pub fn i32_binop<F, M>(&mut self, masm: &mut M, mut emit: F)
     where
@@ -269,9 +198,11 @@ impl<'a, 'builtins> CodeGenContext<'a, 'builtins> {
             emit(masm, typed_reg.reg, RegImm::i32(val), OperandSize::S32);
             self.stack.push(typed_reg.into());
         } else {
-            self.binop(masm, OperandSize::S32, |masm, dst, src, size| {
-                emit(masm, dst, src.into(), size)
-            });
+            let src = self.pop_to_reg(masm, None);
+            let dst = self.pop_to_reg(masm, None);
+            emit(masm, dst.reg, src.reg.into(), OperandSize::S32);
+            self.free_reg(src);
+            self.stack.push(dst.into());
         }
     }
 
@@ -291,9 +222,11 @@ impl<'a, 'builtins> CodeGenContext<'a, 'builtins> {
             emit(masm, typed_reg.reg, RegImm::i64(val), OperandSize::S64);
             self.stack.push(typed_reg.into());
         } else {
-            self.binop(masm, OperandSize::S64, |masm, dst, src, size| {
-                emit(masm, dst, src.into(), size)
-            });
+            let src = self.pop_to_reg(masm, None);
+            let dst = self.pop_to_reg(masm, None);
+            emit(masm, dst.reg, src.reg.into(), OperandSize::S64);
+            self.free_reg(src);
+            self.stack.push(dst.into());
         }
     }
 
@@ -431,6 +364,22 @@ impl<'a, 'builtins> CodeGenContext<'a, 'builtins> {
         }
     }
 
+    /// Pops the value at the stack top and assigns it to the local at
+    /// the given index, returning the typed register holding the
+    /// source value.
+    pub fn set_local<M: MacroAssembler>(&mut self, masm: &mut M, index: u32) -> TypedReg {
+        let slot = self
+            .frame
+            .get_local(index)
+            .unwrap_or_else(|| panic!("invalid local slot = {}", index));
+        let size: OperandSize = slot.ty.into();
+        let src = self.pop_to_reg(masm, None);
+        let addr = masm.local_address(&slot);
+        masm.store(RegImm::reg(src.reg), addr, size);
+
+        src
+    }
+
     /// Spill locals and registers to memory.
     // TODO optimize the spill range;
     //
@@ -454,9 +403,8 @@ impl<'a, 'builtins> CodeGenContext<'a, 'builtins> {
             Val::Local(local) => {
                 let slot = frame.get_local(local.index).expect("valid local at slot");
                 let addr = masm.local_address(&slot);
-                let scratch = <M::ABI as ABI>::scratch_reg();
-                masm.load(addr, scratch, slot.ty.into());
-                let stack_slot = masm.push(scratch, slot.ty.into());
+                masm.load(addr, regalloc.scratch, slot.ty.into());
+                let stack_slot = masm.push(regalloc.scratch, slot.ty.into());
                 *v = Val::mem(slot.ty, stack_slot);
             }
             _ => {}
diff --git a/winch/codegen/src/codegen/control.rs b/winch/codegen/src/codegen/control.rs
index b7c54ecc4df8..a726cff1d157 100644
--- a/winch/codegen/src/codegen/control.rs
+++ b/winch/codegen/src/codegen/control.rs
@@ -31,7 +31,7 @@
 use super::{CodeGenContext, MacroAssembler, OperandSize};
 use crate::{
     abi::{ABIResult, ABI},
-    masm::IntCmpKind,
+    masm::CmpKind,
     CallingConvention,
 };
 use cranelift_codegen::MachLabel;
@@ -193,7 +193,7 @@ impl ControlStackFrame {
                 *original_stack_len = context.stack.len();
                 *original_sp_offset = masm.sp_offset();
                 masm.branch(
-                    IntCmpKind::Eq,
+                    CmpKind::Eq,
                     top.reg.into(),
                     top.reg.into(),
                     *cont,
diff --git a/winch/codegen/src/codegen/env.rs b/winch/codegen/src/codegen/env.rs
index 9d5f6e10e868..d3676ca65399 100644
--- a/winch/codegen/src/codegen/env.rs
+++ b/winch/codegen/src/codegen/env.rs
@@ -1,109 +1,31 @@
-use crate::codegen::{BuiltinFunction, OperandSize};
 use smallvec::{smallvec, SmallVec};
-use std::collections::{
-    hash_map::Entry::{Occupied, Vacant},
-    HashMap,
-};
 use wasmparser::BlockType;
 use wasmtime_environ::{
-    FuncIndex, GlobalIndex, ModuleTranslation, ModuleTypes, PtrSize, TableIndex, TablePlan,
-    TypeConvert, TypeIndex, VMOffsets, WasmFuncType, WasmType,
+    FuncIndex, GlobalIndex, ModuleTranslation, PtrSize, TypeConvert, VMOffsets, WasmFuncType,
+    WasmType,
 };
 
-/// Table metadata.
-#[derive(Debug, Copy, Clone)]
-pub struct TableData {
-    /// The offset to the base of the table.
-    pub offset: u32,
-    /// The offset to the current elements field.
-    pub current_elems_offset: u32,
-    /// If the table is imported, return the base
-    /// offset of the `from` field in `VMTableImport`.
-    pub base: Option<u32>,
-    /// The size of the table elements.
-    pub(crate) element_size: OperandSize,
-    /// The size of the current elements field.
-    pub(crate) current_elements_size: OperandSize,
-}
-
-/// A function callee.
-/// It categorizes how the callee should be treated
-/// when performing the call.
-#[derive(Clone)]
-pub enum Callee {
-    /// Locally defined function.
-    Local(CalleeInfo),
-    /// Imported function.
-    Import(CalleeInfo),
-    /// Function reference.
-    FuncRef(WasmFuncType),
-    /// A built-in function.
-    Builtin(BuiltinFunction),
-}
-
-/// Metadata about a function callee. Used by the code generation to
-/// emit function calls to local or imported functions.
-#[derive(Clone)]
-pub struct CalleeInfo {
-    /// The function type.
-    pub ty: WasmFuncType,
-    /// The callee index in the WebAssembly function index space.
-    pub index: FuncIndex,
-}
-
 /// The function environment.
 ///
 /// Contains all information about the module and runtime that is accessible to
 /// to a particular function during code generation.
-pub struct FuncEnv<'a, 'translation: 'a, 'data: 'translation, P: PtrSize> {
+pub struct FuncEnv<'a, P> {
     /// Offsets to the fields within the `VMContext` ptr.
-    pub vmoffsets: &'a VMOffsets<P>,
+    pub vmoffsets: VMOffsets<P>,
     /// Metadata about the translation process of a WebAssembly module.
-    pub translation: &'translation ModuleTranslation<'data>,
-    /// The module's function types.
-    pub types: &'translation ModuleTypes,
-    /// Track resolved table information.
-    resolved_tables: HashMap<TableIndex, TableData>,
+    pub translation: &'a ModuleTranslation<'a>,
 }
 
-pub fn ptr_type_from_ptr_size(size: u8) -> WasmType {
-    (size == 8)
-        .then(|| WasmType::I64)
-        .unwrap_or_else(|| unimplemented!("Support for non-64-bit architectures"))
-}
-
-impl<'a, 'translation, 'data, P: PtrSize> FuncEnv<'a, 'translation, 'data, P> {
+impl<'a, P: PtrSize> FuncEnv<'a, P> {
     /// Create a new function environment.
-    pub fn new(
-        vmoffsets: &'a VMOffsets<P>,
-        translation: &'translation ModuleTranslation<'data>,
-        types: &'translation ModuleTypes,
-    ) -> Self {
+    pub fn new(ptr: P, translation: &'a ModuleTranslation) -> Self {
+        let vmoffsets = VMOffsets::new(ptr, &translation.module);
         Self {
             vmoffsets,
             translation,
-            types,
-            resolved_tables: HashMap::new(),
         }
     }
 
-    /// Derive the [`WasmType`] from the pointer size.
-    pub(crate) fn ptr_type(&self) -> WasmType {
-        ptr_type_from_ptr_size(self.ptr_size())
-    }
-
-    /// Returns the pointer size for the target ISA.
-    fn ptr_size(&self) -> u8 {
-        self.vmoffsets.ptr.size()
-    }
-
-    /// Resolves a [`Callee::FuncRef`] from a type index.
-    pub fn funcref(&self, idx: TypeIndex) -> Callee {
-        let sig_index = self.translation.module.types[idx].unwrap_function();
-        let ty = self.types[sig_index].clone();
-        Callee::FuncRef(ty)
-    }
-
     /// Resolves a function [`Callee`] from an index.
     pub fn callee_from_index(&self, idx: FuncIndex) -> Callee {
         let types = &self.translation.get_types();
@@ -111,12 +33,10 @@ impl<'a, 'translation, 'data, P: PtrSize> FuncEnv<'a, 'translation, 'data, P> {
         let ty = self.translation.module.convert_func_type(ty);
         let import = self.translation.module.is_imported_function(idx);
 
-        let info = CalleeInfo { ty, index: idx };
-
-        if import {
-            Callee::Import(info)
-        } else {
-            Callee::Local(info)
+        Callee {
+            ty,
+            import,
+            index: idx,
         }
     }
 
@@ -140,42 +60,15 @@ impl<'a, 'translation, 'data, P: PtrSize> FuncEnv<'a, 'translation, 'data, P> {
 
         (ty, offset)
     }
+}
 
-    /// Returns the table information for the given table index.
-    pub fn resolve_table_data(&mut self, index: TableIndex) -> TableData {
-        match self.resolved_tables.entry(index) {
-            Occupied(entry) => *entry.get(),
-            Vacant(entry) => {
-                let (from_offset, base_offset, current_elems_offset) =
-                    match self.translation.module.defined_table_index(index) {
-                        Some(defined) => (
-                            None,
-                            self.vmoffsets.vmctx_vmtable_definition_base(defined),
-                            self.vmoffsets
-                                .vmctx_vmtable_definition_current_elements(defined),
-                        ),
-                        None => (
-                            Some(self.vmoffsets.vmctx_vmtable_import_from(index)),
-                            self.vmoffsets.vmtable_definition_base().into(),
-                            self.vmoffsets.vmtable_definition_current_elements().into(),
-                        ),
-                    };
-
-                *entry.insert(TableData {
-                    base: from_offset,
-                    offset: base_offset,
-                    current_elems_offset,
-                    element_size: OperandSize::from_bytes(self.vmoffsets.ptr.size()),
-                    current_elements_size: OperandSize::from_bytes(
-                        self.vmoffsets.size_of_vmtable_definition_current_elements(),
-                    ),
-                })
-            }
-        }
-    }
-
-    /// Get a [`TablePlan`] from a [`TableIndex`].
-    pub fn table_plan(&mut self, index: TableIndex) -> &TablePlan {
-        &self.translation.module.table_plans[index]
-    }
+/// Metadata about a function callee.  Use by the code generation
+/// to emit function calls.
+pub struct Callee {
+    /// The function type.
+    pub ty: WasmFuncType,
+    /// A flag to determine if the callee is imported.
+    pub import: bool,
+    /// The callee index in the WebAssembly function index space.
+    pub index: FuncIndex,
 }
diff --git a/winch/codegen/src/codegen/mod.rs b/winch/codegen/src/codegen/mod.rs
index ab688a61b61b..1c3813901c6b 100644
--- a/winch/codegen/src/codegen/mod.rs
+++ b/winch/codegen/src/codegen/mod.rs
@@ -1,27 +1,25 @@
 use crate::{
     abi::{ABISig, ABI},
-    isa::reg::Reg,
-    masm::{IntCmpKind, MacroAssembler, OperandSize, RegImm, TrapCode},
+    masm::{MacroAssembler, OperandSize},
     stack::{TypedReg, Val},
+    CallingConvention,
 };
 use anyhow::Result;
+use call::FnCall;
 use smallvec::SmallVec;
 use wasmparser::{BinaryReader, FuncValidator, Operator, ValidatorResources, VisitOperator};
-use wasmtime_environ::{PtrSize, TableIndex, TypeIndex, WasmHeapType, WasmType, FUNCREF_MASK};
+use wasmtime_environ::{FuncIndex, WasmFuncType, WasmType};
 
 mod context;
 pub(crate) use context::*;
 mod env;
 pub use env::*;
-mod call;
-pub(crate) use call::*;
+pub mod call;
 mod control;
 pub(crate) use control::*;
-mod builtin;
-pub use builtin::*;
 
 /// The code generation abstraction.
-pub(crate) struct CodeGen<'a, 'translation: 'a, 'data: 'translation, M>
+pub(crate) struct CodeGen<'a, M>
 where
     M: MacroAssembler,
 {
@@ -29,10 +27,10 @@ where
     sig: ABISig,
 
     /// The code generation context.
-    pub context: CodeGenContext<'a, 'translation>,
+    pub context: CodeGenContext<'a>,
 
     /// A reference to the function compilation environment.
-    pub env: FuncEnv<'a, 'translation, 'data, M::Ptr>,
+    pub env: FuncEnv<'a, M::Ptr>,
 
     /// The MacroAssembler.
     pub masm: &'a mut M,
@@ -43,14 +41,14 @@ where
     pub control_frames: SmallVec<[ControlStackFrame; 64]>,
 }
 
-impl<'a, 'translation, 'data, M> CodeGen<'a, 'translation, 'data, M>
+impl<'a, M> CodeGen<'a, M>
 where
     M: MacroAssembler,
 {
     pub fn new(
         masm: &'a mut M,
-        context: CodeGenContext<'a, 'translation>,
-        env: FuncEnv<'a, 'translation, 'data, M::Ptr>,
+        context: CodeGenContext<'a>,
+        env: FuncEnv<'a, M::Ptr>,
         sig: ABISig,
     ) -> Self {
         Self {
@@ -175,7 +173,8 @@ where
     ) -> Result<()> {
         self.spill_register_arguments();
         let defined_locals_range = &self.context.frame.defined_locals_range;
-        self.masm.zero_mem_range(defined_locals_range.as_range());
+        self.masm
+            .zero_mem_range(defined_locals_range.as_range(), &mut self.context.regalloc);
 
         // Save the vmctx pointer to its local slot in case we need to reload it
         // at any point.
@@ -230,7 +229,7 @@ where
             fn is_reachable(&self) -> bool;
         }
 
-        impl<'a, 'b, 'c, M: MacroAssembler> ReachableState for CodeGen<'a, 'b, 'c, M> {
+        impl<'a, M: MacroAssembler> ReachableState for CodeGen<'a, M> {
             fn is_reachable(&self) -> bool {
                 self.context.reachable
             }
@@ -248,48 +247,51 @@ where
         }
     }
 
-    /// Emits a a series of instructions that will type check a function reference call.
-    pub fn emit_typecheck_funcref(&mut self, funcref_ptr: Reg, type_index: TypeIndex) {
-        let ptr_size: OperandSize = self.env.ptr_type().into();
-        let sig_index_bytes = self.env.vmoffsets.size_of_vmshared_signature_index();
-        let sig_size = OperandSize::from_bytes(sig_index_bytes);
-        let sig_index = self.env.translation.module.types[type_index].unwrap_function();
-        let sig_offset = sig_index
-            .as_u32()
-            .checked_mul(sig_index_bytes.into())
-            .unwrap();
-        let signatures_base_offset = self.env.vmoffsets.vmctx_signature_ids_array();
-        let scratch = <M::ABI as ABI>::scratch_reg();
-        let funcref_sig_offset = self.env.vmoffsets.ptr.vm_func_ref_type_index();
-
-        // Load the signatures address into the scratch register.
-        self.masm.load(
-            self.masm.address_at_vmctx(signatures_base_offset),
-            scratch,
-            ptr_size,
-        );
-
-        // Get the caller id.
-        let caller_id = self.context.any_gpr(self.masm);
-        self.masm.load(
-            self.masm.address_at_reg(scratch, sig_offset),
-            caller_id,
-            sig_size,
-        );
-
-        let callee_id = self.context.any_gpr(self.masm);
-        self.masm.load(
+    /// Emit a direct function call.
+    pub fn emit_call(&mut self, index: FuncIndex) {
+        let callee = self.env.callee_from_index(index);
+        let (sig, callee_addr): (ABISig, Option<<M as MacroAssembler>::Address>) = if callee.import
+        {
+            let mut params = vec![WasmType::I64, WasmType::I64];
+            params.extend_from_slice(callee.ty.params());
+            let sig = WasmFuncType::new(params.into(), callee.ty.returns().into());
+
+            let caller_vmctx = <M::ABI as ABI>::vmctx_reg();
+            let callee_vmctx = self.context.any_gpr(self.masm);
+            let callee_vmctx_offset = self.env.vmoffsets.vmctx_vmfunction_import_vmctx(index);
+            let callee_vmctx_addr = self.masm.address_at_reg(caller_vmctx, callee_vmctx_offset);
+            // FIXME Remove harcoded operand size, this will be needed
+            // once 32-bit architectures are supported.
             self.masm
-                .address_at_reg(funcref_ptr, funcref_sig_offset.into()),
-            callee_id,
-            sig_size,
-        );
-
-        // Typecheck.
-        self.masm.cmp(callee_id.into(), caller_id, OperandSize::S32);
-        self.masm.trapif(IntCmpKind::Ne, TrapCode::BadSignature);
-        self.context.free_reg(callee_id);
-        self.context.free_reg(caller_id);
+                .load(callee_vmctx_addr, callee_vmctx, OperandSize::S64);
+
+            let callee_body_offset = self.env.vmoffsets.vmctx_vmfunction_import_wasm_call(index);
+            let callee_addr = self.masm.address_at_reg(caller_vmctx, callee_body_offset);
+
+            // Put the callee / caller vmctx at the start of the
+            // range of the stack so that they are used as first
+            // and second arguments.
+            let stack = &mut self.context.stack;
+            let location = stack.len() - (sig.params().len() - 2);
+            stack.insert(location as usize, TypedReg::i64(caller_vmctx).into());
+            stack.insert(location as usize, TypedReg::i64(callee_vmctx).into());
+            (
+                <M::ABI as ABI>::sig(&sig, &CallingConvention::Default),
+                Some(callee_addr),
+            )
+        } else {
+            (
+                <M::ABI as ABI>::sig(&callee.ty, &CallingConvention::Default),
+                None,
+            )
+        };
+
+        let fncall = FnCall::new::<M>(&sig, &mut self.context, self.masm);
+        if let Some(addr) = callee_addr {
+            fncall.indirect::<M>(self.masm, &mut self.context, addr);
+        } else {
+            fncall.direct::<M>(self.masm, &mut self.context, index);
+        }
     }
 
     /// Emit the usual function end instruction sequence.
@@ -320,96 +322,10 @@ where
 
                 match &ty {
                     I32 | I64 | F32 | F64 => self.masm.store(src.into(), addr, ty.into()),
-                    Ref(rt) => match rt.heap_type {
-                        WasmHeapType::Func => self.masm.store_ptr(src.into(), addr),
-                        ht => unimplemented!("Support for WasmHeapType: {ht}"),
-                    },
-                    _ => unimplemented!("Support for WasmType {ty}"),
+                    _ => panic!("Unsupported type {:?}", ty),
                 }
             });
     }
-
-    /// Pops the value at the stack top and assigns it to the local at
-    ///
-    /// the given index, returning the typed register holding the
-    /// source value.
-    pub fn emit_set_local(&mut self, addr: M::Address, size: OperandSize) -> TypedReg {
-        let src = self.context.pop_to_reg(self.masm, None);
-        self.masm.store(RegImm::reg(src.reg), addr, size);
-
-        src
-    }
-
-    pub fn emit_lazy_init_funcref(&mut self, table_index: TableIndex) {
-        let table_data = self.env.resolve_table_data(table_index);
-        let ptr_type = self.env.ptr_type();
-        let builtin = self
-            .context
-            .builtins
-            .table_get_lazy_init_func_ref::<M::ABI, M::Ptr>();
-
-        // Request the builtin's  result register and use it to hold the
-        // table element value. We preemptively request this register to
-        // avoid conflict at the control flow merge below.
-        // Requesting the result register is safe since we know ahead-of-time
-        // the builtin's signature.
-        let elem_value: Reg = self
-            .context
-            .reg(builtin.sig().result.result_reg().unwrap(), self.masm)
-            .into();
-
-        let index = self.context.pop_to_reg(self.masm, None);
-        let base = self.context.any_gpr(self.masm);
-
-        let elem_addr =
-            self.masm
-                .table_elem_address(index.into(), base, &table_data, &mut self.context);
-        self.masm.load_ptr(elem_addr, elem_value);
-        // Free the register used as base, once we have loaded the element
-        // address into the element value register.
-        self.context.free_reg(base);
-
-        let (defined, cont) = (self.masm.get_label(), self.masm.get_label());
-
-        // Push the built-in arguments to the stack.
-        self.context.stack.extend([
-            TypedReg::new(ptr_type, <M::ABI as ABI>::vmctx_reg()).into(),
-            table_index.as_u32().try_into().unwrap(),
-            index.into(),
-        ]);
-
-        self.masm.branch(
-            IntCmpKind::Ne,
-            elem_value.into(),
-            elem_value,
-            defined,
-            ptr_type.into(),
-        );
-        // Free the element value register.
-        // This is safe since the FnCall::emit call below, will ensure
-        // that the result register is placed on the value stack.
-        self.context.free_reg(elem_value);
-        FnCall::emit::<M, M::Ptr, _>(self.masm, &mut self.context, |_| {
-            Callee::Builtin(builtin.clone())
-        });
-
-        // We know the signature of the libcall in this case, so we assert that there's
-        // one element in the stack and that it's  the ABI signature's result register.
-        let top = self.context.stack.peek().unwrap();
-        let top = top.get_reg();
-        debug_assert!(top.reg == elem_value);
-        self.masm.jmp(cont);
-
-        // In the defined case, mask the funcref address in place, by peeking into the
-        // last element of the value stack, which was pushed by the `indirect` function
-        // call above.
-        self.masm.bind(defined);
-        let imm = RegImm::i64(FUNCREF_MASK as i64);
-        let dst = top.into();
-        self.masm.and(dst, dst, imm, top.ty.into());
-
-        self.masm.bind(cont);
-    }
 }
 
 /// Returns the index of the [`ControlStackFrame`] for the given
diff --git a/winch/codegen/src/frame/mod.rs b/winch/codegen/src/frame/mod.rs
index 9a0329856c8c..2979162648e9 100644
--- a/winch/codegen/src/frame/mod.rs
+++ b/winch/codegen/src/frame/mod.rs
@@ -1,12 +1,9 @@
-use crate::{
-    abi::{align_to, ty_size, ABIArg, ABISig, LocalSlot, ABI},
-    masm::MacroAssembler,
-};
+use crate::abi::{align_to, ty_size, ABIArg, ABISig, LocalSlot, ABI};
 use anyhow::Result;
 use smallvec::SmallVec;
 use std::ops::Range;
 use wasmparser::{BinaryReader, FuncValidator, ValidatorResources};
-use wasmtime_environ::{ModuleTranslation, TypeConvert, WasmType};
+use wasmtime_environ::{ModuleTranslation, TypeConvert};
 
 // TODO:
 // SpiderMonkey's implementation uses 16;
@@ -118,20 +115,6 @@ impl Frame {
         self.locals.get(index as usize)
     }
 
-    /// Returns the address of the local at the given index.
-    ///
-    /// # Panics
-    /// This function panics if the the index is not associated to a local.
-    pub fn get_local_address<M: MacroAssembler>(
-        &self,
-        index: u32,
-        masm: &mut M,
-    ) -> (WasmType, M::Address) {
-        self.get_local(index)
-            .map(|slot| (slot.ty, masm.local_address(slot)))
-            .unwrap_or_else(|| panic!("Invalid local slot: {}", index))
-    }
-
     fn compute_arg_slots<A: ABI>(sig: &ABISig) -> Result<(Locals, u32)> {
         // Go over the function ABI-signature and
         // calculate the stack slots.
diff --git a/winch/codegen/src/isa/aarch64/abi.rs b/winch/codegen/src/isa/aarch64/abi.rs
index 8a38a2918d18..99d6a2560897 100644
--- a/winch/codegen/src/isa/aarch64/abi.rs
+++ b/winch/codegen/src/isa/aarch64/abi.rs
@@ -65,29 +65,22 @@ impl ABI for Aarch64ABI {
     }
 
     fn sig(wasm_sig: &WasmFuncType, call_conv: &CallingConvention) -> ABISig {
-        Self::sig_from(wasm_sig.params(), wasm_sig.returns(), call_conv)
-    }
-
-    fn sig_from(
-        params: &[WasmType],
-        returns: &[WasmType],
-        call_conv: &CallingConvention,
-    ) -> ABISig {
         assert!(call_conv.is_apple_aarch64() || call_conv.is_default());
 
-        if returns.len() > 1 {
+        if wasm_sig.returns().len() > 1 {
             panic!("multi-value not supported");
         }
 
         let mut stack_offset = 0;
         let mut index_env = RegIndexEnv::default();
 
-        let params: SmallVec<[ABIArg; 6]> = params
+        let params: SmallVec<[ABIArg; 6]> = wasm_sig
+            .params()
             .iter()
             .map(|arg| Self::to_abi_arg(arg, &mut stack_offset, &mut index_env))
             .collect();
 
-        let result = Self::result(returns, call_conv);
+        let result = Self::result(wasm_sig.returns(), call_conv);
         ABISig::new(params, result, stack_offset)
     }
 
@@ -108,7 +101,7 @@ impl ABI for Aarch64ABI {
     }
 
     fn scratch_reg() -> Reg {
-        regs::scratch()
+        todo!()
     }
 
     fn sp_reg() -> Reg {
diff --git a/winch/codegen/src/isa/aarch64/masm.rs b/winch/codegen/src/isa/aarch64/masm.rs
index 0c65d8675e57..5953d4d231d1 100644
--- a/winch/codegen/src/isa/aarch64/masm.rs
+++ b/winch/codegen/src/isa/aarch64/masm.rs
@@ -1,11 +1,11 @@
 use super::{abi::Aarch64ABI, address::Address, asm::Assembler, regs};
 use crate::{
     abi::{self, local::LocalSlot},
-    codegen::{CodeGenContext, TableData},
+    codegen::CodeGenContext,
     isa::reg::Reg,
     masm::{
-        CalleeKind, DivKind, FloatCmpKind, Imm as I, IntCmpKind, MacroAssembler as Masm,
-        OperandSize, RegImm, RemKind, RoundingMode, ShiftKind, StackSlot, TrapCode,
+        CalleeKind, CmpKind, DivKind, Imm as I, MacroAssembler as Masm, OperandSize, RegImm,
+        RemKind, RoundingMode, ShiftKind, StackSlot,
     },
 };
 use cranelift_codegen::{settings, Final, MachBufferFinalized, MachLabel};
@@ -97,20 +97,6 @@ impl Masm for MacroAssembler {
         Address::offset(reg, offset as i64)
     }
 
-    fn table_elem_address(
-        &mut self,
-        _index: Reg,
-        _base: Reg,
-        _table_data: &TableData,
-        _context: &mut CodeGenContext,
-    ) -> Self::Address {
-        todo!()
-    }
-
-    fn table_size(&mut self, _table_data: &TableData, _context: &mut CodeGenContext) {
-        todo!()
-    }
-
     fn address_from_sp(&self, _offset: u32) -> Self::Address {
         todo!()
     }
@@ -119,14 +105,6 @@ impl Masm for MacroAssembler {
         todo!()
     }
 
-    fn address_at_vmctx(&self, _offset: u32) -> Self::Address {
-        todo!()
-    }
-
-    fn store_ptr(&mut self, _src: Reg, _dst: Self::Address) {
-        todo!()
-    }
-
     fn store(&mut self, src: RegImm, dst: Address, size: OperandSize) {
         let src = match src {
             RegImm::Imm(v) => {
@@ -157,10 +135,6 @@ impl Masm for MacroAssembler {
         self.asm.ldr(src, dst, size);
     }
 
-    fn load_ptr(&mut self, _src: Self::Address, _dst: Reg) {
-        todo!()
-    }
-
     fn pop(&mut self, _dst: Reg, _size: OperandSize) {
         todo!()
     }
@@ -192,7 +166,7 @@ impl Masm for MacroAssembler {
         }
     }
 
-    fn cmov(&mut self, _src: Reg, _dst: Reg, _cc: IntCmpKind, _size: OperandSize) {
+    fn cmov(&mut self, _src: Reg, _dst: Reg, _cc: CmpKind, _size: OperandSize) {
         todo!()
     }
 
@@ -250,34 +224,6 @@ impl Masm for MacroAssembler {
         }
     }
 
-    fn float_add(&mut self, _dst: Reg, _lhs: Reg, _rhs: Reg, _size: OperandSize) {
-        todo!()
-    }
-
-    fn float_sub(&mut self, _dst: Reg, _lhs: Reg, _rhs: Reg, _size: OperandSize) {
-        todo!()
-    }
-
-    fn float_mul(&mut self, _dst: Reg, _lhs: Reg, _rhs: Reg, _size: OperandSize) {
-        todo!()
-    }
-
-    fn float_div(&mut self, _dst: Reg, _lhs: Reg, _rhs: Reg, _size: OperandSize) {
-        todo!()
-    }
-
-    fn float_min(&mut self, _dst: Reg, _lhs: Reg, _rhs: Reg, _size: OperandSize) {
-        todo!()
-    }
-
-    fn float_max(&mut self, _dst: Reg, _lhs: Reg, _rhs: Reg, _size: OperandSize) {
-        todo!()
-    }
-
-    fn float_copysign(&mut self, _dst: Reg, _lhs: Reg, _rhs: Reg, _size: OperandSize) {
-        todo!()
-    }
-
     fn float_neg(&mut self, _dst: Reg, _size: OperandSize) {
         todo!()
     }
@@ -286,19 +232,10 @@ impl Masm for MacroAssembler {
         todo!()
     }
 
-    fn float_round(
-        &mut self,
-        _mode: RoundingMode,
-        _context: &mut CodeGenContext,
-        _size: OperandSize,
-    ) {
+    fn float_round(&mut self, _mode: RoundingMode, _dst: Reg, _src: RegImm, _size: OperandSize) {
         todo!();
     }
 
-    fn float_sqrt(&mut self, _dst: Reg, _src: Reg, _size: OperandSize) {
-        todo!()
-    }
-
     fn and(&mut self, _dst: Reg, _lhs: Reg, _rhs: RegImm, _size: OperandSize) {
         todo!()
     }
@@ -347,7 +284,7 @@ impl Masm for MacroAssembler {
         Address::offset(reg, offset as i64)
     }
 
-    fn cmp_with_set(&mut self, _src: RegImm, _dst: Reg, _kind: IntCmpKind, _size: OperandSize) {
+    fn cmp_with_set(&mut self, _src: RegImm, _dst: Reg, _kind: CmpKind, _size: OperandSize) {
         todo!()
     }
 
@@ -355,17 +292,6 @@ impl Masm for MacroAssembler {
         todo!()
     }
 
-    fn float_cmp_with_set(
-        &mut self,
-        _src1: Reg,
-        _src2: Reg,
-        _dst: Reg,
-        _kind: FloatCmpKind,
-        _size: OperandSize,
-    ) {
-        todo!()
-    }
-
     fn clz(&mut self, _src: Reg, _dst: Reg, _size: OperandSize) {
         todo!()
     }
@@ -385,9 +311,9 @@ impl Masm for MacroAssembler {
 
     fn branch(
         &mut self,
-        _kind: IntCmpKind,
+        _kind: CmpKind,
         _lhs: RegImm,
-        _rhs: Reg,
+        _rhs: RegImm,
         _taken: MachLabel,
         _size: OperandSize,
     ) {
@@ -405,14 +331,6 @@ impl Masm for MacroAssembler {
     fn jmp_table(&mut self, _targets: &[MachLabel], _index: Reg, _tmp: Reg) {
         todo!()
     }
-
-    fn trapz(&mut self, _src: Reg, _code: TrapCode) {
-        todo!()
-    }
-
-    fn trapif(&mut self, _cc: IntCmpKind, _code: TrapCode) {
-        todo!()
-    }
 }
 
 impl MacroAssembler {
diff --git a/winch/codegen/src/isa/aarch64/mod.rs b/winch/codegen/src/isa/aarch64/mod.rs
index ba9fb049e9bd..8d299eba0a93 100644
--- a/winch/codegen/src/isa/aarch64/mod.rs
+++ b/winch/codegen/src/isa/aarch64/mod.rs
@@ -1,4 +1,4 @@
-use self::regs::{ALL_GPR, MAX_FPR, MAX_GPR, NON_ALLOCATABLE_GPR};
+use self::regs::{scratch, ALL_GPR};
 use crate::{
     abi::ABI,
     codegen::{CodeGen, CodeGenContext, FuncEnv},
@@ -6,9 +6,9 @@ use crate::{
     isa::{Builder, CallingConvention, TargetIsa},
     masm::MacroAssembler,
     regalloc::RegAlloc,
-    regset::RegBitSet,
+    regset::RegSet,
     stack::Stack,
-    BuiltinFunctions, TrampolineKind,
+    TrampolineKind,
 };
 use anyhow::Result;
 use cranelift_codegen::settings::{self, Flags};
@@ -17,7 +17,7 @@ use cranelift_codegen::{MachTextSectionBuilder, TextSectionBuilder};
 use masm::MacroAssembler as Aarch64Masm;
 use target_lexicon::Triple;
 use wasmparser::{FuncValidator, FunctionBody, ValidatorResources};
-use wasmtime_environ::{ModuleTranslation, ModuleTypes, VMOffsets, WasmFuncType};
+use wasmtime_environ::{ModuleTranslation, WasmFuncType};
 
 mod abi;
 mod address;
@@ -87,11 +87,8 @@ impl TargetIsa for Aarch64 {
         sig: &WasmFuncType,
         body: &FunctionBody,
         translation: &ModuleTranslation,
-        types: &ModuleTypes,
-        builtins: &mut BuiltinFunctions,
         validator: &mut FuncValidator<ValidatorResources>,
     ) -> Result<MachBufferFinalized<Final>> {
-        let vmoffsets = VMOffsets::new(self.pointer_bytes(), &translation.module);
         let mut body = body.get_binary_reader();
         let mut masm = Aarch64Masm::new(self.shared_flags.clone());
         let stack = Stack::new();
@@ -99,16 +96,10 @@ impl TargetIsa for Aarch64 {
 
         let defined_locals = DefinedLocals::new(translation, &mut body, validator)?;
         let frame = Frame::new::<abi::Aarch64ABI>(&abi_sig, &defined_locals)?;
-        let gpr = RegBitSet::int(
-            ALL_GPR.into(),
-            NON_ALLOCATABLE_GPR.into(),
-            usize::try_from(MAX_GPR).unwrap(),
-        );
         // TODO: Add floating point bitmask
-        let fpr = RegBitSet::float(0, 0, usize::try_from(MAX_FPR).unwrap());
-        let regalloc = RegAlloc::from(gpr, fpr);
-        let codegen_context = CodeGenContext::new(regalloc, stack, frame, builtins, &vmoffsets);
-        let env = FuncEnv::new(&vmoffsets, translation, types);
+        let regalloc = RegAlloc::new(RegSet::new(ALL_GPR, 0), scratch());
+        let codegen_context = CodeGenContext::new(regalloc, stack, &frame);
+        let env = FuncEnv::new(self.pointer_bytes(), translation);
         let mut codegen = CodeGen::new(&mut masm, codegen_context, env, abi_sig);
 
         codegen.emit(&mut body, validator)?;
diff --git a/winch/codegen/src/isa/aarch64/regs.rs b/winch/codegen/src/isa/aarch64/regs.rs
index ec540b43fe10..e11d3a84f94d 100644
--- a/winch/codegen/src/isa/aarch64/regs.rs
+++ b/winch/codegen/src/isa/aarch64/regs.rs
@@ -4,20 +4,15 @@ use crate::{isa::reg::Reg, masm::OperandSize};
 use regalloc2::{PReg, RegClass};
 use smallvec::{smallvec, SmallVec};
 
-/// FPR index bound.
-pub(crate) const MAX_FPR: u32 = 32;
-/// FPR index bound.
-pub(crate) const MAX_GPR: u32 = 32;
-
 /// Construct a X-register from an index.
 pub(crate) const fn xreg(num: u8) -> Reg {
-    assert!((num as u32) < MAX_GPR);
+    assert!(num < 32);
     Reg::new(PReg::new(num as usize, RegClass::Int))
 }
 
 /// Construct a V-register from an index.
 pub(crate) const fn vreg(num: u8) -> Reg {
-    assert!((num as u32) < MAX_FPR);
+    assert!(num < 32);
     Reg::new(PReg::new(num as usize, RegClass::Float))
 }
 
@@ -136,8 +131,7 @@ pub(crate) const fn shadow_sp() -> Reg {
     xreg(28)
 }
 
-/// Bitmask for non-allocatble GPR.
-pub(crate) const NON_ALLOCATABLE_GPR: u32 = (1 << ip0().hw_enc())
+const NON_ALLOCATABLE_GPR: u32 = (1 << ip0().hw_enc())
     | (1 << ip1().hw_enc())
     | (1 << platform().hw_enc())
     | (1 << fp().hw_enc())
diff --git a/winch/codegen/src/isa/mod.rs b/winch/codegen/src/isa/mod.rs
index 53e821dde5f5..c90d4264c271 100644
--- a/winch/codegen/src/isa/mod.rs
+++ b/winch/codegen/src/isa/mod.rs
@@ -1,4 +1,4 @@
-use crate::{BuiltinFunctions, TrampolineKind};
+use crate::TrampolineKind;
 use anyhow::{anyhow, Result};
 use core::fmt::Formatter;
 use cranelift_codegen::isa::{CallConv, IsaBuilder};
@@ -10,7 +10,7 @@ use std::{
 };
 use target_lexicon::{Architecture, Triple};
 use wasmparser::{FuncValidator, FunctionBody, ValidatorResources};
-use wasmtime_environ::{ModuleTranslation, ModuleTypes, WasmFuncType};
+use wasmtime_environ::{ModuleTranslation, WasmFuncType};
 
 #[cfg(feature = "x64")]
 pub(crate) mod x64;
@@ -77,7 +77,6 @@ pub(crate) enum LookupError {
 /// This enum is a reduced subset of the calling conventions defined in
 /// [cranelift_codegen::isa::CallConv]. Introducing this enum makes it easier
 /// to enforce the invariant of all the calling conventions supported by Winch.
-#[derive(Copy, Clone)]
 pub enum CallingConvention {
     /// See [cranelift_codegen::isa::CallConv::WasmtimeSystemV]
     WasmtimeSystemV,
@@ -151,8 +150,6 @@ pub trait TargetIsa: Send + Sync {
         sig: &WasmFuncType,
         body: &FunctionBody,
         translation: &ModuleTranslation,
-        types: &ModuleTypes,
-        builtins: &mut BuiltinFunctions,
         validator: &mut FuncValidator<ValidatorResources>,
     ) -> Result<MachBufferFinalized<Final>>;
 
diff --git a/winch/codegen/src/isa/reg.rs b/winch/codegen/src/isa/reg.rs
index 0a96df3293be..fda5f07cfdc0 100644
--- a/winch/codegen/src/isa/reg.rs
+++ b/winch/codegen/src/isa/reg.rs
@@ -34,8 +34,8 @@ impl Reg {
     }
 
     /// Get the encoding of the underlying register.
-    pub const fn hw_enc(self) -> usize {
-        self.0.hw_enc()
+    pub const fn hw_enc(self) -> u8 {
+        self.0.hw_enc() as u8
     }
 
     /// Get the physical register representation.
diff --git a/winch/codegen/src/isa/x64/abi.rs b/winch/codegen/src/isa/x64/abi.rs
index 6fed025684fa..e7194a1acdb1 100644
--- a/winch/codegen/src/isa/x64/abi.rs
+++ b/winch/codegen/src/isa/x64/abi.rs
@@ -5,7 +5,7 @@ use crate::{
     masm::OperandSize,
 };
 use smallvec::SmallVec;
-use wasmtime_environ::{WasmFuncType, WasmHeapType, WasmType};
+use wasmtime_environ::{WasmFuncType, WasmType};
 
 /// Helper environment to track argument-register
 /// assignment in x64.
@@ -97,14 +97,10 @@ impl ABI for X64ABI {
         64
     }
 
-    fn sig_from(
-        params: &[WasmType],
-        returns: &[WasmType],
-        call_conv: &CallingConvention,
-    ) -> ABISig {
+    fn sig(wasm_sig: &WasmFuncType, call_conv: &CallingConvention) -> ABISig {
         assert!(call_conv.is_fastcall() || call_conv.is_systemv() || call_conv.is_default());
 
-        if returns.len() > 1 {
+        if wasm_sig.returns().len() > 1 {
             panic!("multi-value not supported");
         }
 
@@ -119,19 +115,16 @@ impl ABI for X64ABI {
             (0, RegIndexEnv::default())
         };
 
-        let params: SmallVec<[ABIArg; 6]> = params
+        let params: SmallVec<[ABIArg; 6]> = wasm_sig
+            .params()
             .iter()
             .map(|arg| Self::to_abi_arg(arg, &mut stack_offset, &mut index_env, is_fastcall))
             .collect();
 
-        let result = Self::result(returns, call_conv);
+        let result = Self::result(wasm_sig.returns(), call_conv);
         ABISig::new(params, result, stack_offset)
     }
 
-    fn sig(wasm_sig: &WasmFuncType, call_conv: &CallingConvention) -> ABISig {
-        Self::sig_from(wasm_sig.params(), wasm_sig.returns(), call_conv)
-    }
-
     fn result(returns: &[WasmType], _call_conv: &CallingConvention) -> ABIResult {
         // This invariant will be lifted once support for multi-value is added.
         assert!(returns.len() <= 1, "multi-value not supported");
@@ -142,10 +135,6 @@ impl ABI for X64ABI {
                 // NOTE This should be updated when supporting multi-value.
                 WasmType::I32 | WasmType::I64 => regs::rax(),
                 WasmType::F32 | WasmType::F64 => regs::xmm0(),
-                WasmType::Ref(rt) => {
-                    assert!(rt.heap_type == WasmHeapType::Func);
-                    regs::rax()
-                }
                 t => panic!("Unsupported return type {:?}", t),
             };
             ABIResult::reg(ty, reg)
@@ -175,13 +164,9 @@ impl ABI for X64ABI {
 
     fn stack_arg_slot_size_for_type(ty: WasmType) -> u32 {
         match ty {
-            WasmType::Ref(rt) => match rt.heap_type {
-                WasmHeapType::Func => Self::word_bytes(),
-                ht => unimplemented!("Support for WasmHeapType: {ht}"),
-            },
             WasmType::F64 | WasmType::I32 | WasmType::I64 => Self::word_bytes(),
             WasmType::F32 => Self::word_bytes() / 2,
-            ty => unimplemented!("Support for WasmType: {ty}"),
+            _ => unreachable!(),
         }
     }
 }
@@ -194,11 +179,6 @@ impl X64ABI {
         fastcall: bool,
     ) -> ABIArg {
         let (reg, ty) = match wasm_arg {
-            ty @ WasmType::Ref(rt) => match rt.heap_type {
-                WasmHeapType::Func => (Self::int_reg_for(index_env.next_gpr(), fastcall), ty),
-                ht => unimplemented!("Support for WasmHeapType: {ht}"),
-            },
-
             ty @ (WasmType::I32 | WasmType::I64) => {
                 (Self::int_reg_for(index_env.next_gpr(), fastcall), ty)
             }
@@ -207,7 +187,7 @@ impl X64ABI {
                 (Self::float_reg_for(index_env.next_fpr(), fastcall), ty)
             }
 
-            ty => unimplemented!("Support for argument of WasmType: {ty}"),
+            ty => unreachable!("Unsupported argument type {:?}", ty),
         };
 
         let default = || {
diff --git a/winch/codegen/src/isa/x64/address.rs b/winch/codegen/src/isa/x64/address.rs
index 47229ae37448..970c0fa8b0d2 100644
--- a/winch/codegen/src/isa/x64/address.rs
+++ b/winch/codegen/src/isa/x64/address.rs
@@ -1,8 +1,9 @@
 //! x64 addressing mode.
 
-use crate::reg::Reg;
 use cranelift_codegen::ir::Constant;
 
+use crate::reg::Reg;
+
 /// Memory address representation.
 #[derive(Debug, Copy, Clone)]
 pub(crate) enum Address {
diff --git a/winch/codegen/src/isa/x64/asm.rs b/winch/codegen/src/isa/x64/asm.rs
index e44bdc4fc044..930ba22e9ae1 100644
--- a/winch/codegen/src/isa/x64/asm.rs
+++ b/winch/codegen/src/isa/x64/asm.rs
@@ -1,12 +1,12 @@
 //! Assembler library implementation for x64.
 
 use crate::{
-    isa::reg::Reg,
-    masm::{DivKind, IntCmpKind, OperandSize, RemKind, RoundingMode, ShiftKind},
+    isa::reg::{Reg, RegClass},
+    masm::{CalleeKind, CmpKind, DivKind, OperandSize, RemKind, RoundingMode, ShiftKind},
 };
 use cranelift_codegen::{
     entity::EntityRef,
-    ir::{types, ConstantPool, ExternalName, LibCall, Opcode, TrapCode, UserExternalNameRef},
+    ir::{types, ConstantPool, ExternalName, Opcode, TrapCode, UserExternalNameRef},
     isa::{
         x64::{
             args::{
@@ -103,19 +103,19 @@ impl From<DivKind> for DivSignedness {
     }
 }
 
-impl From<IntCmpKind> for CC {
-    fn from(value: IntCmpKind) -> Self {
+impl From<CmpKind> for CC {
+    fn from(value: CmpKind) -> Self {
         match value {
-            IntCmpKind::Eq => CC::Z,
-            IntCmpKind::Ne => CC::NZ,
-            IntCmpKind::LtS => CC::L,
-            IntCmpKind::LtU => CC::B,
-            IntCmpKind::GtS => CC::NLE,
-            IntCmpKind::GtU => CC::NBE,
-            IntCmpKind::LeS => CC::LE,
-            IntCmpKind::LeU => CC::BE,
-            IntCmpKind::GeS => CC::NL,
-            IntCmpKind::GeU => CC::NB,
+            CmpKind::Eq => CC::Z,
+            CmpKind::Ne => CC::NZ,
+            CmpKind::LtS => CC::L,
+            CmpKind::LtU => CC::B,
+            CmpKind::GtS => CC::NLE,
+            CmpKind::GtU => CC::NBE,
+            CmpKind::LeS => CC::LE,
+            CmpKind::LeU => CC::BE,
+            CmpKind::GeS => CC::NL,
+            CmpKind::GeU => CC::NB,
         }
     }
 }
@@ -296,7 +296,7 @@ impl Assembler {
     }
 
     /// Integer register conditional move.
-    pub fn cmov(&mut self, src: Reg, dst: Reg, cc: IntCmpKind, size: OperandSize) {
+    pub fn cmov(&mut self, src: Reg, dst: Reg, cc: CmpKind, size: OperandSize) {
         self.emit(Inst::Cmove {
             size: size.into(),
             cc: cc.into(),
@@ -366,7 +366,7 @@ impl Assembler {
     }
 
     /// Floating point register conditional move.
-    pub fn xmm_cmov(&mut self, src: Reg, dst: Reg, cc: IntCmpKind, size: OperandSize) {
+    pub fn xmm_cmov(&mut self, src: Reg, dst: Reg, cc: CmpKind, size: OperandSize) {
         let ty = match size {
             OperandSize::S32 => types::F32,
             OperandSize::S64 => types::F64,
@@ -409,13 +409,32 @@ impl Assembler {
 
     /// "and" two registers.
     pub fn and_rr(&mut self, src: Reg, dst: Reg, size: OperandSize) {
-        self.emit(Inst::AluRmiR {
-            size: size.into(),
-            op: AluRmiROpcode::And,
-            src1: dst.into(),
-            src2: src.into(),
-            dst: dst.into(),
-        });
+        match dst.class() {
+            RegClass::Int => {
+                self.emit(Inst::AluRmiR {
+                    size: size.into(),
+                    op: AluRmiROpcode::And,
+                    src1: dst.into(),
+                    src2: src.into(),
+                    dst: dst.into(),
+                });
+            }
+            RegClass::Float => {
+                let op = match size {
+                    OperandSize::S32 => SseOpcode::Andps,
+                    OperandSize::S64 => SseOpcode::Andpd,
+                    OperandSize::S128 => unreachable!(),
+                };
+
+                self.emit(Inst::XmmRmR {
+                    op,
+                    src1: dst.into(),
+                    src2: XmmMemAligned::from(Xmm::from(src)),
+                    dst: dst.into(),
+                });
+            }
+            RegClass::Vector => unreachable!(),
+        }
     }
 
     pub fn and_ir(&mut self, imm: i32, dst: Reg, size: OperandSize) {
@@ -429,38 +448,6 @@ impl Assembler {
         });
     }
 
-    /// "and" two float registers.
-    pub fn xmm_and_rr(&mut self, src: Reg, dst: Reg, size: OperandSize) {
-        let op = match size {
-            OperandSize::S32 => SseOpcode::Andps,
-            OperandSize::S64 => SseOpcode::Andpd,
-            OperandSize::S128 => unreachable!(),
-        };
-
-        self.emit(Inst::XmmRmR {
-            op,
-            src1: dst.into(),
-            src2: XmmMemAligned::from(Xmm::from(src)),
-            dst: dst.into(),
-        });
-    }
-
-    /// "and not" two float registers.
-    pub fn xmm_andn_rr(&mut self, src: Reg, dst: Reg, size: OperandSize) {
-        let op = match size {
-            OperandSize::S32 => SseOpcode::Andnps,
-            OperandSize::S64 => SseOpcode::Andnpd,
-            OperandSize::S128 => unreachable!(),
-        };
-
-        self.emit(Inst::XmmRmR {
-            op,
-            src1: dst.into(),
-            src2: Xmm::from(src).into(),
-            dst: dst.into(),
-        });
-    }
-
     pub fn gpr_to_xmm(&mut self, src: Reg, dst: Reg, size: OperandSize) {
         let op = match size {
             OperandSize::S32 => SseOpcode::Movd,
@@ -498,30 +485,34 @@ impl Assembler {
         });
     }
 
-    pub fn xmm_or_rr(&mut self, src: Reg, dst: Reg, size: OperandSize) {
-        let op = match size {
-            OperandSize::S32 => SseOpcode::Orps,
-            OperandSize::S64 => SseOpcode::Orpd,
-            OperandSize::S128 => unreachable!(),
-        };
-
-        self.emit(Inst::XmmRmR {
-            op,
-            src1: dst.into(),
-            src2: XmmMemAligned::from(Xmm::from(src)),
-            dst: dst.into(),
-        });
-    }
-
     /// Logical exclusive or with registers.
     pub fn xor_rr(&mut self, src: Reg, dst: Reg, size: OperandSize) {
-        self.emit(Inst::AluRmiR {
-            size: size.into(),
-            op: AluRmiROpcode::Xor,
-            src1: dst.into(),
-            src2: src.into(),
-            dst: dst.into(),
-        });
+        match dst.class() {
+            RegClass::Int => {
+                self.emit(Inst::AluRmiR {
+                    size: size.into(),
+                    op: AluRmiROpcode::Xor,
+                    src1: dst.into(),
+                    src2: src.into(),
+                    dst: dst.into(),
+                });
+            }
+            RegClass::Float => {
+                let op = match size {
+                    OperandSize::S32 => SseOpcode::Xorps,
+                    OperandSize::S64 => SseOpcode::Xorpd,
+                    OperandSize::S128 => unreachable!(),
+                };
+
+                self.emit(Inst::XmmRmR {
+                    op,
+                    src1: dst.into(),
+                    src2: XmmMemAligned::from(Xmm::from(src)),
+                    dst: dst.into(),
+                });
+            }
+            RegClass::Vector => todo!(),
+        }
     }
 
     pub fn xor_ir(&mut self, imm: i32, dst: Reg, size: OperandSize) {
@@ -536,22 +527,6 @@ impl Assembler {
         });
     }
 
-    /// Logical exclusive or with float registers.
-    pub fn xmm_xor_rr(&mut self, src: Reg, dst: Reg, size: OperandSize) {
-        let op = match size {
-            OperandSize::S32 => SseOpcode::Xorps,
-            OperandSize::S64 => SseOpcode::Xorpd,
-            OperandSize::S128 => unreachable!(),
-        };
-
-        self.emit(Inst::XmmRmR {
-            op,
-            src1: dst.into(),
-            src2: XmmMemAligned::from(Xmm::from(src)),
-            dst: dst.into(),
-        });
-    }
-
     /// Shift with register and register.
     pub fn shift_rr(&mut self, src: Reg, dst: Reg, kind: ShiftKind, size: OperandSize) {
         self.emit(Inst::ShiftR {
@@ -756,22 +731,6 @@ impl Assembler {
         });
     }
 
-    /// Compares values in src and dst and sets ZF, PF, and CF flags in EFLAGS
-    /// register.
-    pub fn ucomis(&mut self, src: Reg, dst: Reg, size: OperandSize) {
-        let op = match size {
-            OperandSize::S32 => SseOpcode::Ucomiss,
-            OperandSize::S64 => SseOpcode::Ucomisd,
-            OperandSize::S128 => unreachable!(),
-        };
-
-        self.emit(Inst::XmmCmpRmR {
-            op,
-            src: Xmm::from(src).into(),
-            dst: dst.into(),
-        });
-    }
-
     pub fn popcnt(&mut self, src: Reg, size: OperandSize) {
         assert!(self.isa_flags.has_popcnt(), "Requires has_popcnt flag");
         self.emit(Inst::UnaryRmR {
@@ -794,23 +753,7 @@ impl Assembler {
 
     /// Set value in dst to `0` or `1` based on flags in status register and
     /// [`CmpKind`].
-    pub fn setcc(&mut self, kind: IntCmpKind, dst: Reg) {
-        self.setcc_impl(kind.into(), dst);
-    }
-
-    /// Set value in dst to `1` if parity flag in status register is set, `0`
-    /// otherwise.
-    pub fn setp(&mut self, dst: Reg) {
-        self.setcc_impl(CC::P, dst);
-    }
-
-    /// Set value in dst to `1` if parity flag in status register is not set,
-    /// `0` otherwise.
-    pub fn setnp(&mut self, dst: Reg) {
-        self.setcc_impl(CC::NP, dst);
-    }
-
-    fn setcc_impl(&mut self, cc: CC, dst: Reg) {
+    pub fn setcc(&mut self, kind: CmpKind, dst: Reg) {
         // Clear the dst register or bits 1 to 31 may be incorrectly set.
         // Don't use xor since it updates the status register.
         self.emit(Inst::Imm {
@@ -820,7 +763,7 @@ impl Assembler {
         });
         // Copy correct bit from status register into dst register.
         self.emit(Inst::Setcc {
-            cc,
+            cc: kind.into(),
             dst: dst.into(),
         });
     }
@@ -880,95 +823,7 @@ impl Assembler {
         });
     }
 
-    /// Performs float addition on src and dst and places result in dst.
-    pub fn xmm_add_rr(&mut self, src: Reg, dst: Reg, size: OperandSize) {
-        let op = match size {
-            OperandSize::S32 => SseOpcode::Addss,
-            OperandSize::S64 => SseOpcode::Addsd,
-            OperandSize::S128 => unreachable!(),
-        };
-
-        self.emit(Inst::XmmRmRUnaligned {
-            op,
-            src1: Xmm::from(dst).into(),
-            src2: Xmm::from(src).into(),
-            dst: dst.into(),
-        });
-    }
-
-    /// Performs float subtraction on src and dst and places result in dst.
-    pub fn xmm_sub_rr(&mut self, src: Reg, dst: Reg, size: OperandSize) {
-        let op = match size {
-            OperandSize::S32 => SseOpcode::Subss,
-            OperandSize::S64 => SseOpcode::Subsd,
-            OperandSize::S128 => unreachable!(),
-        };
-
-        self.emit(Inst::XmmRmRUnaligned {
-            op,
-            src1: Xmm::from(dst).into(),
-            src2: Xmm::from(src).into(),
-            dst: dst.into(),
-        });
-    }
-
-    /// Performs float multiplication on src and dst and places result in dst.
-    pub fn xmm_mul_rr(&mut self, src: Reg, dst: Reg, size: OperandSize) {
-        let op = match size {
-            OperandSize::S32 => SseOpcode::Mulss,
-            OperandSize::S64 => SseOpcode::Mulsd,
-            OperandSize::S128 => unreachable!(),
-        };
-
-        self.emit(Inst::XmmRmRUnaligned {
-            op,
-            src1: Xmm::from(dst).into(),
-            src2: Xmm::from(src).into(),
-            dst: dst.into(),
-        });
-    }
-
-    /// Performs float division on src and dst and places result in dst.
-    pub fn xmm_div_rr(&mut self, src: Reg, dst: Reg, size: OperandSize) {
-        let op = match size {
-            OperandSize::S32 => SseOpcode::Divss,
-            OperandSize::S64 => SseOpcode::Divsd,
-            OperandSize::S128 => unreachable!(),
-        };
-
-        self.emit(Inst::XmmRmRUnaligned {
-            op,
-            src1: Xmm::from(dst).into(),
-            src2: Xmm::from(src).into(),
-            dst: dst.into(),
-        });
-    }
-
-    /// Mininum for src and dst XMM registers with results put in dst.
-    pub fn xmm_min_seq(&mut self, src: Reg, dst: Reg, size: OperandSize) {
-        self.emit(Inst::XmmMinMaxSeq {
-            size: size.into(),
-            is_min: true,
-            lhs: src.into(),
-            rhs: dst.into(),
-            dst: dst.into(),
-        });
-    }
-
-    /// Maximum for src and dst XMM registers with results put in dst.
-    pub fn xmm_max_seq(&mut self, src: Reg, dst: Reg, size: OperandSize) {
-        self.emit(Inst::XmmMinMaxSeq {
-            size: size.into(),
-            is_min: false,
-            lhs: src.into(),
-            rhs: dst.into(),
-            dst: dst.into(),
-        });
-    }
-
-    /// Perform rounding operation on float register src and place results in
-    /// float register dst.
-    pub fn xmm_rounds_rr(&mut self, src: Reg, dst: Reg, mode: RoundingMode, size: OperandSize) {
+    pub fn rounds(&mut self, src: Reg, dst: Reg, mode: RoundingMode, size: OperandSize) {
         let op = match size {
             OperandSize::S32 => SseOpcode::Roundss,
             OperandSize::S64 => SseOpcode::Roundsd,
@@ -990,65 +845,41 @@ impl Assembler {
         })
     }
 
-    pub fn sqrt(&mut self, src: Reg, dst: Reg, size: OperandSize) {
-        let op = match size {
-            OperandSize::S32 => SseOpcode::Sqrtss,
-            OperandSize::S64 => SseOpcode::Sqrtsd,
-            OperandSize::S128 => unreachable!(),
-        };
-
-        self.emit(Inst::XmmUnaryRmR {
-            op,
-            src: Xmm::from(src).into(),
-            dst: dst.into(),
-        })
-    }
-
-    /// Emit a call to an unknown location through a register.
-    pub fn call_with_reg(&mut self, callee: Reg) {
-        self.emit(Inst::CallUnknown {
-            dest: RegMem::reg(callee.into()),
-            info: Box::new(CallInfo {
-                uses: smallvec![],
-                defs: smallvec![],
-                clobbers: Default::default(),
-                opcode: Opcode::Call,
-                callee_pop_size: 0,
-                callee_conv: CallConv::SystemV,
-            }),
-        });
-    }
-
-    /// Emit a call to a locally defined function through an index.
-    pub fn call_with_index(&mut self, index: u32) {
-        let dest = ExternalName::user(UserExternalNameRef::new(index as usize));
-        self.emit(Inst::CallKnown {
-            dest,
-            info: Box::new(CallInfo {
-                uses: smallvec![],
-                defs: smallvec![],
-                clobbers: Default::default(),
-                opcode: Opcode::Call,
-                callee_pop_size: 0,
-                callee_conv: CallConv::SystemV,
-            }),
-        });
-    }
-
-    /// Emit a call to a well-known libcall.
-    pub fn call_with_lib(&mut self, lib: LibCall) {
-        let dest = ExternalName::LibCall(lib);
-        self.emit(Inst::CallKnown {
-            dest,
-            info: Box::new(CallInfo {
-                uses: smallvec![],
-                defs: smallvec![],
-                clobbers: Default::default(),
-                opcode: Opcode::Call,
-                callee_pop_size: 0,
-                callee_conv: CallConv::SystemV,
-            }),
-        });
+    /// Emit a function call to a known or unknown location.
+    ///
+    /// A known location is a locally defined function index.
+    /// An unknown location is an address whose value is located
+    /// ina register.
+    pub fn call(&mut self, callee: CalleeKind) {
+        match callee {
+            CalleeKind::Indirect(reg) => {
+                self.emit(Inst::CallUnknown {
+                    dest: RegMem::reg(reg.into()),
+                    info: Box::new(CallInfo {
+                        uses: smallvec![],
+                        defs: smallvec![],
+                        clobbers: Default::default(),
+                        opcode: Opcode::Call,
+                        callee_pop_size: 0,
+                        callee_conv: CallConv::SystemV,
+                    }),
+                });
+            }
+            CalleeKind::Direct(index) => {
+                let dest = ExternalName::user(UserExternalNameRef::new(index as usize));
+                self.emit(Inst::CallKnown {
+                    dest,
+                    info: Box::new(CallInfo {
+                        uses: smallvec![],
+                        defs: smallvec![],
+                        clobbers: Default::default(),
+                        opcode: Opcode::Call,
+                        callee_pop_size: 0,
+                        callee_conv: CallConv::SystemV,
+                    }),
+                });
+            }
+        }
     }
 
     /// Emits a conditional jump to the given label.
@@ -1078,7 +909,7 @@ impl Assembler {
             tmp1: Writable::from_reg(tmp1.into()),
             tmp2: Writable::from_reg(tmp2.into()),
             default_target: default,
-            targets: Box::new(targets.to_vec()),
+            targets: Box::new(targets),
         })
     }
 
@@ -1086,12 +917,4 @@ impl Assembler {
     pub fn trap(&mut self, code: TrapCode) {
         self.emit(Inst::Ud2 { trap_code: code })
     }
-
-    /// Conditional trap.
-    pub fn trapif(&mut self, cc: IntCmpKind, trap_code: TrapCode) {
-        self.emit(Inst::TrapIf {
-            cc: cc.into(),
-            trap_code,
-        });
-    }
 }
diff --git a/winch/codegen/src/isa/x64/masm.rs b/winch/codegen/src/isa/x64/masm.rs
index f28ab3196173..d4c6cb6a0f47 100644
--- a/winch/codegen/src/isa/x64/masm.rs
+++ b/winch/codegen/src/isa/x64/masm.rs
@@ -6,13 +6,13 @@ use super::{
 };
 
 use crate::masm::{
-    DivKind, FloatCmpKind, Imm as I, IntCmpKind, MacroAssembler as Masm, OperandSize, RegImm,
-    RemKind, RoundingMode, ShiftKind, TrapCode,
+    CmpKind, DivKind, Imm as I, MacroAssembler as Masm, OperandSize, RegImm, RemKind, RoundingMode,
+    ShiftKind,
 };
-use crate::{abi::ABI, masm::StackSlot, stack::TypedReg};
+use crate::{abi::ABI, masm::StackSlot};
 use crate::{
     abi::{self, align_to, calculate_frame_adjustment, LocalSlot},
-    codegen::{ptr_type_from_ptr_size, Callee, CodeGenContext, FnCall, TableData},
+    codegen::CodeGenContext,
     stack::Val,
 };
 use crate::{
@@ -20,11 +20,10 @@ use crate::{
     masm::CalleeKind,
 };
 use cranelift_codegen::{
-    isa::x64::settings as x64_settings, settings, Final, MachBufferFinalized, MachLabel,
+    ir::TrapCode, isa::x64::settings as x64_settings, settings, Final, MachBufferFinalized,
+    MachLabel,
 };
 
-use wasmtime_environ::PtrSize;
-
 /// x64 MacroAssembler.
 pub(crate) struct MacroAssembler {
     /// Stack pointer offset.
@@ -33,10 +32,6 @@ pub(crate) struct MacroAssembler {
     asm: Assembler,
     /// ISA flags.
     flags: x64_settings::Flags,
-    /// Shared flags.
-    shared_flags: settings::Flags,
-    /// The target pointer size.
-    ptr_size: OperandSize,
 }
 
 impl Masm for MacroAssembler {
@@ -109,87 +104,6 @@ impl Masm for MacroAssembler {
         Address::offset(reg, offset)
     }
 
-    fn table_elem_address(
-        &mut self,
-        index: Reg,
-        ptr_base: Reg,
-        table_data: &TableData,
-        context: &mut CodeGenContext,
-    ) -> Self::Address {
-        let vmctx = <Self::ABI as ABI>::vmctx_reg();
-        let scratch = regs::scratch();
-        let bound = context.any_gpr(self);
-        let tmp = context.any_gpr(self);
-
-        if let Some(offset) = table_data.base {
-            // If the table data declares a particular offset base,
-            // load the address into a register to further use it as
-            // the table address.
-            self.asm
-                .mov_mr(&self.address_at_vmctx(offset), ptr_base, self.ptr_size);
-        } else {
-            // Else, simply move the vmctx register into the addr register as
-            // the base to calculate the table address.
-            self.asm.mov_rr(vmctx, ptr_base, self.ptr_size);
-        };
-
-        // OOB check.
-        let bound_addr = self.address_at_reg(ptr_base, table_data.current_elems_offset);
-        let bound_size = table_data.current_elements_size;
-        self.asm.mov_mr(&bound_addr, bound, bound_size);
-        self.asm.cmp_rr(bound, index, bound_size);
-        self.asm.trapif(IntCmpKind::GeU, TrapCode::TableOutOfBounds);
-
-        // Move the index into the scratch register to calcualte the table
-        // element address.
-        // Moving the value of the index register to the scratch register
-        // also avoids overwriting the context of the index register.
-        self.asm.mov_rr(index, scratch, bound_size);
-        self.asm.mul_ir(
-            table_data.element_size.bytes() as i32,
-            scratch,
-            table_data.element_size,
-        );
-        self.asm.mov_mr(
-            &self.address_at_reg(ptr_base, table_data.offset),
-            ptr_base,
-            self.ptr_size,
-        );
-        // Copy the value of the table base into a temporary register
-        // so that we can use it later in case of a misspeculation.
-        self.asm.mov_rr(ptr_base, tmp, self.ptr_size);
-        // Calculate the address of the table element.
-        self.asm.add_rr(scratch, ptr_base, self.ptr_size);
-        if self.shared_flags.enable_table_access_spectre_mitigation() {
-            // Perform a bounds check and override the value of the
-            // table element address in case the index is out of bounds.
-            self.asm.cmp_rr(bound, index, OperandSize::S32);
-            self.asm.cmov(tmp, ptr_base, IntCmpKind::GeU, self.ptr_size);
-        }
-        context.free_reg(bound);
-        context.free_reg(tmp);
-        self.address_at_reg(ptr_base, 0)
-    }
-
-    fn table_size(&mut self, table_data: &TableData, context: &mut CodeGenContext) {
-        let vmctx = <Self::ABI as ABI>::vmctx_reg();
-        let scratch = regs::scratch();
-        let size = context.any_gpr(self);
-
-        if let Some(offset) = table_data.base {
-            self.asm
-                .mov_mr(&self.address_at_vmctx(offset), scratch, self.ptr_size);
-        } else {
-            self.asm.mov_rr(vmctx, scratch, self.ptr_size);
-        };
-
-        let size_addr = Address::offset(scratch, table_data.current_elems_offset);
-        self.asm
-            .mov_mr(&size_addr, size, table_data.current_elements_size);
-
-        context.stack.push(TypedReg::i32(size).into());
-    }
-
     fn address_from_sp(&self, offset: u32) -> Self::Address {
         Address::offset(regs::rsp(), self.sp_offset - offset)
     }
@@ -198,14 +112,6 @@ impl Masm for MacroAssembler {
         Address::offset(regs::rsp(), offset)
     }
 
-    fn address_at_vmctx(&self, offset: u32) -> Self::Address {
-        Address::offset(<Self::ABI as ABI>::vmctx_reg(), offset)
-    }
-
-    fn store_ptr(&mut self, src: Reg, dst: Self::Address) {
-        self.store(src.into(), dst, self.ptr_size);
-    }
-
     fn store(&mut self, src: RegImm, dst: Address, size: OperandSize) {
         match src {
             RegImm::Imm(imm) => match imm {
@@ -236,7 +142,7 @@ impl Masm for MacroAssembler {
             self.asm.pop_r(dst);
             self.decrement_sp(<Self::ABI as abi::ABI>::word_bytes());
         } else {
-            let addr = self.address_from_sp(self.sp_offset);
+            let addr = self.address_at_sp(self.sp_offset);
             self.asm.xmm_mov_mr(&addr, dst, size);
             self.free_stack(size.bytes());
         }
@@ -254,18 +160,10 @@ impl Masm for MacroAssembler {
         let total_stack = delta + aligned_args_size;
         self.reserve_stack(total_stack);
         let callee = load_callee(self);
-        match callee {
-            CalleeKind::Indirect(reg) => self.asm.call_with_reg(reg),
-            CalleeKind::Direct(idx) => self.asm.call_with_index(idx),
-            CalleeKind::Known(lib) => self.asm.call_with_lib(lib),
-        };
+        self.asm.call(callee);
         total_stack
     }
 
-    fn load_ptr(&mut self, src: Self::Address, dst: Reg) {
-        self.load(src, dst, self.ptr_size);
-    }
-
     fn load(&mut self, src: Address, dst: Reg, size: OperandSize) {
         if dst.is_int() {
             self.asm.mov_mr(&src, dst, size);
@@ -304,7 +202,7 @@ impl Masm for MacroAssembler {
         }
     }
 
-    fn cmov(&mut self, src: Reg, dst: Reg, cc: IntCmpKind, size: OperandSize) {
+    fn cmov(&mut self, src: Reg, dst: Reg, cc: CmpKind, size: OperandSize) {
         match (src.class(), dst.class()) {
             (RegClass::Int, RegClass::Int) => self.asm.cmov(src, dst, cc, size),
             (RegClass::Float, RegClass::Float) => self.asm.xmm_cmov(src, dst, cc, size),
@@ -369,60 +267,6 @@ impl Masm for MacroAssembler {
         }
     }
 
-    fn float_add(&mut self, dst: Reg, lhs: Reg, rhs: Reg, size: OperandSize) {
-        Self::ensure_two_argument_form(&dst, &lhs);
-        self.asm.xmm_add_rr(rhs, dst, size);
-    }
-
-    fn float_sub(&mut self, dst: Reg, lhs: Reg, rhs: Reg, size: OperandSize) {
-        Self::ensure_two_argument_form(&dst, &lhs);
-        self.asm.xmm_sub_rr(rhs, dst, size);
-    }
-
-    fn float_mul(&mut self, dst: Reg, lhs: Reg, rhs: Reg, size: OperandSize) {
-        Self::ensure_two_argument_form(&dst, &lhs);
-        self.asm.xmm_mul_rr(rhs, dst, size);
-    }
-
-    fn float_div(&mut self, dst: Reg, lhs: Reg, rhs: Reg, size: OperandSize) {
-        Self::ensure_two_argument_form(&dst, &lhs);
-        self.asm.xmm_div_rr(rhs, dst, size);
-    }
-
-    fn float_min(&mut self, dst: Reg, lhs: Reg, rhs: Reg, size: OperandSize) {
-        Self::ensure_two_argument_form(&dst, &lhs);
-        self.asm.xmm_min_seq(rhs, dst, size);
-    }
-
-    fn float_max(&mut self, dst: Reg, lhs: Reg, rhs: Reg, size: OperandSize) {
-        Self::ensure_two_argument_form(&dst, &lhs);
-        self.asm.xmm_max_seq(rhs, dst, size);
-    }
-
-    fn float_copysign(&mut self, dst: Reg, lhs: Reg, rhs: Reg, size: OperandSize) {
-        Self::ensure_two_argument_form(&dst, &lhs);
-        let scratch_gpr = regs::scratch();
-        let scratch_xmm = regs::scratch_xmm();
-        let sign_mask = match size {
-            OperandSize::S32 => I::I32(0x80000000),
-            OperandSize::S64 => I::I64(0x8000000000000000),
-            OperandSize::S128 => unreachable!(),
-        };
-        self.load_constant(&sign_mask, scratch_gpr, size);
-        self.asm.gpr_to_xmm(scratch_gpr, scratch_xmm, size);
-
-        // Clear everything except sign bit in src.
-        self.asm.xmm_and_rr(scratch_xmm, rhs, size);
-
-        // Clear sign bit in dst using scratch to store result. Then copy the
-        // result back to dst.
-        self.asm.xmm_andn_rr(dst, scratch_xmm, size);
-        self.asm.xmm_mov_rr(scratch_xmm, dst, size);
-
-        // Copy sign bit from src to dst.
-        self.asm.xmm_or_rr(rhs, dst, size);
-    }
-
     fn float_neg(&mut self, dst: Reg, size: OperandSize) {
         assert_eq!(dst.class(), RegClass::Float);
         let mask = match size {
@@ -434,7 +278,7 @@ impl Masm for MacroAssembler {
         self.load_constant(&mask, scratch_gpr, size);
         let scratch_xmm = regs::scratch_xmm();
         self.asm.gpr_to_xmm(scratch_gpr, scratch_xmm, size);
-        self.asm.xmm_xor_rr(scratch_xmm, dst, size);
+        self.asm.xor_rr(scratch_xmm, dst, size);
     }
 
     fn float_abs(&mut self, dst: Reg, size: OperandSize) {
@@ -448,52 +292,17 @@ impl Masm for MacroAssembler {
         self.load_constant(&mask, scratch_gpr, size);
         let scratch_xmm = regs::scratch_xmm();
         self.asm.gpr_to_xmm(scratch_gpr, scratch_xmm, size);
-        self.asm.xmm_and_rr(scratch_xmm, dst, size);
+        self.asm.and_rr(scratch_xmm, dst, size);
     }
 
-    fn float_round(&mut self, mode: RoundingMode, context: &mut CodeGenContext, size: OperandSize) {
+    fn float_round(&mut self, mode: RoundingMode, dst: Reg, src: RegImm, size: OperandSize) {
         if self.flags.has_sse41() {
-            let src = context.pop_to_reg(self, None);
-            self.asm.xmm_rounds_rr(src.into(), src.into(), mode, size);
-            context.stack.push(src.into());
+            self.asm.rounds(src.get_reg().unwrap(), dst, mode, size);
         } else {
-            FnCall::emit::<Self, Self::Ptr, _>(self, context, |context| {
-                let b = match (&mode, size) {
-                    (RoundingMode::Up, OperandSize::S32) => {
-                        context.builtins.ceil_f32::<<Self as Masm>::ABI>()
-                    }
-                    (RoundingMode::Up, OperandSize::S64) => {
-                        context.builtins.ceil_f64::<<Self as Masm>::ABI>()
-                    }
-                    (RoundingMode::Down, OperandSize::S32) => {
-                        context.builtins.floor_f32::<<Self as Masm>::ABI>()
-                    }
-                    (RoundingMode::Down, OperandSize::S64) => {
-                        context.builtins.floor_f64::<<Self as Masm>::ABI>()
-                    }
-                    (RoundingMode::Nearest, OperandSize::S32) => {
-                        context.builtins.nearest_f32::<<Self as Masm>::ABI>()
-                    }
-                    (RoundingMode::Nearest, OperandSize::S64) => {
-                        context.builtins.nearest_f64::<<Self as Masm>::ABI>()
-                    }
-                    (RoundingMode::Zero, OperandSize::S32) => {
-                        context.builtins.trunc_f32::<<Self as Masm>::ABI>()
-                    }
-                    (RoundingMode::Zero, OperandSize::S64) => {
-                        context.builtins.trunc_f64::<<Self as Masm>::ABI>()
-                    }
-                    (_, _) => unreachable!(),
-                };
-                Callee::Builtin(b)
-            })
+            todo!("libcall fallback for rounding is not implemented")
         }
     }
 
-    fn float_sqrt(&mut self, dst: Reg, src: Reg, size: OperandSize) {
-        self.asm.sqrt(src, dst, size);
-    }
-
     fn and(&mut self, dst: Reg, lhs: Reg, rhs: RegImm, size: OperandSize) {
         Self::ensure_two_argument_form(&dst, &lhs);
         match (rhs, dst) {
@@ -666,60 +475,11 @@ impl Masm for MacroAssembler {
         }
     }
 
-    fn cmp_with_set(&mut self, src: RegImm, dst: Reg, kind: IntCmpKind, size: OperandSize) {
+    fn cmp_with_set(&mut self, src: RegImm, dst: Reg, kind: CmpKind, size: OperandSize) {
         self.cmp(src, dst, size);
         self.asm.setcc(kind, dst);
     }
 
-    fn float_cmp_with_set(
-        &mut self,
-        src1: Reg,
-        src2: Reg,
-        dst: Reg,
-        kind: FloatCmpKind,
-        size: OperandSize,
-    ) {
-        // Float comparisons needs to be ordered (that is, comparing with a NaN
-        // should return 0) except for not equal which needs to be unordered.
-        // We use ucomis{s, d} because comis{s, d} has an undefined result if
-        // either operand is NaN. Since ucomis{s, d} is unordered, we need to
-        // compensate to make the comparison ordered.  Ucomis{s, d} sets the
-        // ZF, PF, and CF flags if there is an unordered result.
-        let (src1, src2, set_kind) = match kind {
-            FloatCmpKind::Eq => (src1, src2, IntCmpKind::Eq),
-            FloatCmpKind::Ne => (src1, src2, IntCmpKind::Ne),
-            FloatCmpKind::Gt => (src1, src2, IntCmpKind::GtU),
-            FloatCmpKind::Ge => (src1, src2, IntCmpKind::GeU),
-            // Reversing the operands and using the complementary comparison
-            // avoids needing to perform an additional SETNP and AND
-            // instruction.
-            // SETNB and SETNBE check if the carry flag is unset (i.e., not
-            // less than and not unordered) so we get the intended result
-            // without having to look at the parity flag.
-            FloatCmpKind::Lt => (src2, src1, IntCmpKind::GtU),
-            FloatCmpKind::Le => (src2, src1, IntCmpKind::GeU),
-        };
-        self.asm.ucomis(src1, src2, size);
-        self.asm.setcc(set_kind, dst);
-        match kind {
-            FloatCmpKind::Eq | FloatCmpKind::Gt | FloatCmpKind::Ge => {
-                // Return false if either operand is NaN by ensuring PF is
-                // unset.
-                let scratch = regs::scratch();
-                self.asm.setnp(scratch);
-                self.asm.and_rr(scratch, dst, size);
-            }
-            FloatCmpKind::Ne => {
-                // Return true if either operand is NaN by checking if PF is
-                // set.
-                let scratch = regs::scratch();
-                self.asm.setp(scratch);
-                self.asm.or_rr(scratch, dst, size);
-            }
-            FloatCmpKind::Lt | FloatCmpKind::Le => (),
-        }
-    }
-
     fn clz(&mut self, src: Reg, dst: Reg, size: OperandSize) {
         if self.flags.has_lzcnt() {
             self.asm.lzcnt(src, dst, size);
@@ -730,7 +490,7 @@ impl Masm for MacroAssembler {
             // dst = size.num_bits() - bsr(src) - is_not_zero
             //     = size.num.bits() + -bsr(src) - is_not_zero.
             self.asm.bsr(src.into(), dst.into(), size);
-            self.asm.setcc(IntCmpKind::Ne, scratch.into());
+            self.asm.setcc(CmpKind::Ne, scratch.into());
             self.asm.neg(dst, dst, size);
             self.asm.add_ir(size.num_bits(), dst, size);
             self.asm.sub_rr(scratch, dst, size);
@@ -750,7 +510,7 @@ impl Masm for MacroAssembler {
             // When the value is 0, BSF outputs 0, correct output for ctz is
             // the number of bits.
             self.asm.bsf(src.into(), dst.into(), size);
-            self.asm.setcc(IntCmpKind::Eq, scratch.into());
+            self.asm.setcc(CmpKind::Eq, scratch.into());
             self.asm
                 .shift_ir(size.log2(), scratch, ShiftKind::Shl, size);
             self.asm.add_rr(scratch, dst, size);
@@ -769,26 +529,26 @@ impl Masm for MacroAssembler {
 
     fn branch(
         &mut self,
-        kind: IntCmpKind,
+        kind: CmpKind,
         lhs: RegImm,
-        rhs: Reg,
+        rhs: RegImm,
         taken: MachLabel,
         size: OperandSize,
     ) {
-        use IntCmpKind::*;
+        use CmpKind::*;
 
         match &(lhs, rhs) {
-            (RegImm::Reg(rlhs), rrhs) => {
+            (RegImm::Reg(rlhs), RegImm::Reg(rrhs)) => {
                 // If the comparision kind is zero or not zero and both operands
                 // are the same register, emit a test instruction. Else we emit
                 // a normal comparison.
                 if (kind == Eq || kind == Ne) && (rlhs == rrhs) {
                     self.asm.test_rr(*rrhs, *rlhs, size);
                 } else {
-                    self.cmp(lhs, rhs, size);
+                    self.cmp(lhs, rhs.get_reg().unwrap(), size);
                 }
             }
-            _ => self.cmp(lhs, rhs, size),
+            _ => self.cmp(lhs, rhs.get_reg().unwrap(), size),
         }
         self.asm.jmp_if(kind, taken);
     }
@@ -867,15 +627,6 @@ impl Masm for MacroAssembler {
         self.asm.trap(TrapCode::UnreachableCodeReached)
     }
 
-    fn trapif(&mut self, cc: IntCmpKind, code: TrapCode) {
-        self.asm.trapif(cc, code);
-    }
-
-    fn trapz(&mut self, src: Reg, code: TrapCode) {
-        self.asm.test_rr(src, src, self.ptr_size);
-        self.asm.trapif(IntCmpKind::Eq, code);
-    }
-
     fn jmp_table(&mut self, targets: &[MachLabel], index: Reg, tmp: Reg) {
         // At least one default target.
         assert!(targets.len() >= 1);
@@ -887,7 +638,7 @@ impl Masm for MacroAssembler {
         let size = OperandSize::S32;
         self.asm.mov_ir(max as u64, tmp, size);
         self.asm.cmp_rr(index, tmp, size);
-        self.asm.cmov(tmp, index, IntCmpKind::LtU, size);
+        self.asm.cmov(tmp, index, CmpKind::LtU, size);
 
         let default = targets[default_index];
         let rest = &targets[0..default_index];
@@ -898,17 +649,11 @@ impl Masm for MacroAssembler {
 
 impl MacroAssembler {
     /// Create an x64 MacroAssembler.
-    pub fn new(
-        ptr_size: impl PtrSize,
-        shared_flags: settings::Flags,
-        isa_flags: x64_settings::Flags,
-    ) -> Self {
+    pub fn new(shared_flags: settings::Flags, isa_flags: x64_settings::Flags) -> Self {
         Self {
             sp_offset: 0,
-            asm: Assembler::new(shared_flags.clone(), isa_flags.clone()),
+            asm: Assembler::new(shared_flags, isa_flags.clone()),
             flags: isa_flags,
-            shared_flags,
-            ptr_size: ptr_type_from_ptr_size(ptr_size.size()).into(),
         }
     }
 
diff --git a/winch/codegen/src/isa/x64/mod.rs b/winch/codegen/src/isa/x64/mod.rs
index 1d38ed4a1703..0d3359f8ec39 100644
--- a/winch/codegen/src/isa/x64/mod.rs
+++ b/winch/codegen/src/isa/x64/mod.rs
@@ -1,6 +1,6 @@
 use crate::{
     abi::ABI,
-    codegen::{BuiltinFunctions, CodeGen, CodeGenContext, FuncEnv},
+    codegen::{CodeGen, CodeGenContext, FuncEnv},
 };
 
 use crate::frame::{DefinedLocals, Frame};
@@ -11,7 +11,7 @@ use crate::stack::Stack;
 use crate::trampoline::{Trampoline, TrampolineKind};
 use crate::{
     isa::{Builder, TargetIsa},
-    regset::RegBitSet,
+    regset::RegSet,
 };
 use anyhow::Result;
 use cranelift_codegen::settings::{self, Flags};
@@ -19,9 +19,9 @@ use cranelift_codegen::{isa::x64::settings as x64_settings, Final, MachBufferFin
 use cranelift_codegen::{MachTextSectionBuilder, TextSectionBuilder};
 use target_lexicon::Triple;
 use wasmparser::{FuncValidator, FunctionBody, ValidatorResources};
-use wasmtime_environ::{ModuleTranslation, ModuleTypes, VMOffsets, WasmFuncType};
+use wasmtime_environ::{ModuleTranslation, WasmFuncType};
 
-use self::regs::{ALL_FPR, ALL_GPR, MAX_FPR, MAX_GPR, NON_ALLOCATABLE_FPR, NON_ALLOCATABLE_GPR};
+use self::regs::{ALL_FPR, ALL_GPR};
 
 mod abi;
 mod address;
@@ -91,38 +91,18 @@ impl TargetIsa for X64 {
         sig: &WasmFuncType,
         body: &FunctionBody,
         translation: &ModuleTranslation,
-        types: &ModuleTypes,
-        builtins: &mut BuiltinFunctions,
         validator: &mut FuncValidator<ValidatorResources>,
     ) -> Result<MachBufferFinalized<Final>> {
-        let pointer_bytes = self.pointer_bytes();
-        let vmoffsets = VMOffsets::new(pointer_bytes, &translation.module);
-
         let mut body = body.get_binary_reader();
-        let mut masm = X64Masm::new(
-            pointer_bytes,
-            self.shared_flags.clone(),
-            self.isa_flags.clone(),
-        );
+        let mut masm = X64Masm::new(self.shared_flags.clone(), self.isa_flags.clone());
         let stack = Stack::new();
         let abi_sig = abi::X64ABI::sig(sig, &CallingConvention::Default);
 
         let defined_locals = DefinedLocals::new(translation, &mut body, validator)?;
         let frame = Frame::new::<abi::X64ABI>(&abi_sig, &defined_locals)?;
-        let gpr = RegBitSet::int(
-            ALL_GPR.into(),
-            NON_ALLOCATABLE_GPR.into(),
-            usize::try_from(MAX_GPR).unwrap(),
-        );
-        let fpr = RegBitSet::float(
-            ALL_FPR.into(),
-            NON_ALLOCATABLE_FPR.into(),
-            usize::try_from(MAX_FPR).unwrap(),
-        );
-
-        let regalloc = RegAlloc::from(gpr, fpr);
-        let env = FuncEnv::new(&vmoffsets, translation, types);
-        let codegen_context = CodeGenContext::new(regalloc, stack, frame, builtins, &vmoffsets);
+        let regalloc = RegAlloc::new(RegSet::new(ALL_GPR, ALL_FPR), regs::scratch());
+        let codegen_context = CodeGenContext::new(regalloc, stack, &frame);
+        let env = FuncEnv::new(self.pointer_bytes(), translation);
         let mut codegen = CodeGen::new(&mut masm, codegen_context, env, abi_sig);
 
         codegen.emit(&mut body, validator)?;
@@ -146,11 +126,7 @@ impl TargetIsa for X64 {
     ) -> Result<MachBufferFinalized<Final>> {
         use TrampolineKind::*;
 
-        let mut masm = X64Masm::new(
-            self.pointer_bytes(),
-            self.shared_flags.clone(),
-            self.isa_flags.clone(),
-        );
+        let mut masm = X64Masm::new(self.shared_flags.clone(), self.isa_flags.clone());
         let call_conv = self.wasmtime_call_conv();
 
         let mut trampoline = Trampoline::new(
diff --git a/winch/codegen/src/isa/x64/regs.rs b/winch/codegen/src/isa/x64/regs.rs
index 238423dac896..0724b1d67252 100644
--- a/winch/codegen/src/isa/x64/regs.rs
+++ b/winch/codegen/src/isa/x64/regs.rs
@@ -170,29 +170,22 @@ pub(crate) fn scratch_xmm() -> Reg {
     xmm15()
 }
 
-/// GPR count.
 const GPR: u32 = 16;
-/// FPR count.
 const FPR: u32 = 16;
-/// GPR index bound.
-pub(crate) const MAX_GPR: u32 = GPR;
-/// GPR index bound.
-pub(crate) const MAX_FPR: u32 = FPR;
 const ALLOCATABLE_GPR: u32 = (1 << GPR) - 1;
 const ALLOCATABLE_FPR: u32 = (1 << FPR) - 1;
-/// Bitmask of non-alloctable GPRs.
 // R11: Is used as the scratch register.
 // R14: Is a pinned register, used as the instance register.
-pub(crate) const NON_ALLOCATABLE_GPR: u32 =
-    (1 << ENC_RBP) | (1 << ENC_RSP) | (1 << ENC_R11) | (1 << ENC_R14);
+const NON_ALLOCATABLE_GPR: u32 = (1 << ENC_RBP) | (1 << ENC_RSP) | (1 << ENC_R11) | (1 << ENC_R14);
 
-/// Bitmask of non-alloctable FPRs.
 // xmm15: Is used as the scratch register.
-pub(crate) const NON_ALLOCATABLE_FPR: u32 = 1 << 15;
+const NON_ALLOCATABLE_FPR: u32 = 1 << 15;
 
 /// Bitmask to represent the available general purpose registers.
 pub(crate) const ALL_GPR: u32 = ALLOCATABLE_GPR & !NON_ALLOCATABLE_GPR;
 /// Bitmask to represent the available floating point registers.
+// Note: at the time of writing all floating point registers are allocatable,
+// but we might need a scratch register in the future.
 pub(crate) const ALL_FPR: u32 = ALLOCATABLE_FPR & !NON_ALLOCATABLE_FPR;
 
 /// Returns the callee-saved registers according to a particular calling
diff --git a/winch/codegen/src/lib.rs b/winch/codegen/src/lib.rs
index 12656ff4a265..f68aa5ab3a2a 100644
--- a/winch/codegen/src/lib.rs
+++ b/winch/codegen/src/lib.rs
@@ -7,7 +7,7 @@
 #![cfg_attr(not(feature = "all-arch"), allow(dead_code))]
 
 mod abi;
-pub use codegen::{BuiltinFunctions, FuncEnv};
+pub use codegen::FuncEnv;
 mod codegen;
 mod frame;
 pub mod isa;
diff --git a/winch/codegen/src/masm.rs b/winch/codegen/src/masm.rs
index cee34e21551a..2e7da9e208b5 100644
--- a/winch/codegen/src/masm.rs
+++ b/winch/codegen/src/masm.rs
@@ -1,12 +1,11 @@
 use crate::abi::{self, align_to, LocalSlot};
-use crate::codegen::{CodeGenContext, TableData};
+use crate::codegen::CodeGenContext;
 use crate::isa::reg::Reg;
-use cranelift_codegen::{ir::LibCall, Final, MachBufferFinalized, MachLabel};
+use crate::regalloc::RegAlloc;
+use cranelift_codegen::{Final, MachBufferFinalized, MachLabel};
 use std::{fmt::Debug, ops::Range};
 use wasmtime_environ::PtrSize;
 
-pub(crate) use cranelift_codegen::ir::TrapCode;
-
 #[derive(Eq, PartialEq)]
 pub(crate) enum DivKind {
     /// Signed division.
@@ -32,11 +31,11 @@ pub struct StackSlot {
     pub size: u32,
 }
 
-/// Kinds of integer binary comparison in WebAssembly. The [`MacroAssembler`]
-/// implementation for each ISA is responsible for emitting the correct
-/// sequence of instructions when lowering to machine code.
+/// Kinds of binary comparison in WebAssembly. The [`masm`] implementation for
+/// each ISA is responsible for emitting the correct sequence of instructions
+/// when lowering to machine code.
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
-pub(crate) enum IntCmpKind {
+pub(crate) enum CmpKind {
     /// Equal.
     Eq,
     /// Not equal.
@@ -59,25 +58,6 @@ pub(crate) enum IntCmpKind {
     GeU,
 }
 
-/// Kinds of float binary comparison in WebAssembly. The [`MacroAssembler`]
-/// implementation for each ISA is responsible for emitting the correct
-/// sequence of instructions when lowering code.
-#[derive(Debug)]
-pub(crate) enum FloatCmpKind {
-    /// Equal.
-    Eq,
-    /// Not equal.
-    Ne,
-    /// Less than.
-    Lt,
-    /// Greater than.
-    Gt,
-    /// Less than or equal.
-    Le,
-    /// Greater than or equal.
-    Ge,
-}
-
 /// Kinds of shifts in WebAssembly.The [`masm`] implementation for each ISA is
 /// responsible for emitting the correct sequence of instructions when
 /// lowering to machine code.
@@ -132,17 +112,6 @@ impl OperandSize {
             OperandSize::S128 => 7,
         }
     }
-
-    /// Create an [`OperandSize`]  from the given number of bytes.
-    pub fn from_bytes(bytes: u8) -> Self {
-        use OperandSize::*;
-        match bytes {
-            4 => S32,
-            8 => S64,
-            16 => S128,
-            _ => panic!("Invalid bytes {} for OperandSize", bytes),
-        }
-    }
 }
 
 /// An abstraction over a register or immediate.
@@ -202,31 +171,12 @@ impl Imm {
     }
 }
 
-#[derive(Copy, Clone, Debug)]
+#[derive(Clone)]
 pub(crate) enum CalleeKind {
     /// A function call to a raw address.
     Indirect(Reg),
     /// A function call to a local function.
     Direct(u32),
-    /// Call to a well known LibCall.
-    Known(LibCall),
-}
-
-impl CalleeKind {
-    /// Creates a callee kind from a register.
-    pub fn indirect(reg: Reg) -> Self {
-        Self::Indirect(reg)
-    }
-
-    /// Creates a direct callee kind from a function index.
-    pub fn direct(index: u32) -> Self {
-        Self::Direct(index)
-    }
-
-    /// Creates a known callee kind from a libcall.
-    pub fn known(call: LibCall) -> Self {
-        Self::Known(call)
-    }
 }
 
 impl RegImm {
@@ -258,6 +208,15 @@ impl RegImm {
     pub fn f64(bits: u64) -> Self {
         RegImm::Imm(Imm::f64(bits))
     }
+
+    /// Get the underlying register of the operand,
+    /// if it is one.
+    pub fn get_reg(&self) -> Option<Reg> {
+        match self {
+            Self::Reg(r) => Some(*r),
+            _ => None,
+        }
+    }
 }
 
 impl From<Reg> for RegImm {
@@ -322,19 +281,6 @@ pub(crate) trait MacroAssembler {
     /// Get the address of a local slot.
     fn local_address(&mut self, local: &LocalSlot) -> Self::Address;
 
-    /// Loads the address of the table element at a given index. Returns the
-    /// address of the table element using the provided register as base.
-    fn table_elem_address(
-        &mut self,
-        index: Reg,
-        base: Reg,
-        table_data: &TableData,
-        context: &mut CodeGenContext,
-    ) -> Self::Address;
-
-    /// Retrieves the size of the table, pushing the result to the value stack.
-    fn table_size(&mut self, table_data: &TableData, context: &mut CodeGenContext);
-
     /// Constructs an address with an offset that is relative to the
     /// current position of the stack pointer (e.g. [sp + (sp_offset -
     /// offset)].
@@ -344,11 +290,6 @@ pub(crate) trait MacroAssembler {
     /// current position of the stack pointer (e.g. [sp + offset].
     fn address_at_sp(&self, offset: u32) -> Self::Address;
 
-    /// Alias for [`Self::address_at_reg`] using the VMContext register as
-    /// a base. The VMContext register is derived from the ABI type that is
-    /// associated to the MacroAssembler.
-    fn address_at_vmctx(&self, offset: u32) -> Self::Address;
-
     /// Construct an address that is absolute to the current position
     /// of the given register.
     fn address_at_reg(&self, reg: Reg, offset: u32) -> Self::Address;
@@ -365,14 +306,6 @@ pub(crate) trait MacroAssembler {
     /// Perform a stack load.
     fn load(&mut self, src: Self::Address, dst: Reg, size: OperandSize);
 
-    /// Alias for `MacroAssembler::load` with the operand size corresponding
-    /// to the pointer size of the target.
-    fn load_ptr(&mut self, src: Self::Address, dst: Reg);
-
-    /// Alias for `MacroAssembler::store` with the operand size corresponding
-    /// to the pointer size of the target.
-    fn store_ptr(&mut self, src: Reg, dst: Self::Address);
-
     /// Pop a value from the machine stack into the given register.
     fn pop(&mut self, dst: Reg, size: OperandSize);
 
@@ -380,7 +313,7 @@ pub(crate) trait MacroAssembler {
     fn mov(&mut self, src: RegImm, dst: Reg, size: OperandSize);
 
     /// Perform a conditional move.
-    fn cmov(&mut self, src: Reg, dst: Reg, cc: IntCmpKind, size: OperandSize);
+    fn cmov(&mut self, src: Reg, dst: Reg, cc: CmpKind, size: OperandSize);
 
     /// Perform add operation.
     fn add(&mut self, dst: Reg, lhs: Reg, rhs: RegImm, size: OperandSize);
@@ -391,30 +324,6 @@ pub(crate) trait MacroAssembler {
     /// Perform multiplication operation.
     fn mul(&mut self, dst: Reg, lhs: Reg, rhs: RegImm, size: OperandSize);
 
-    /// Perform a floating point add operation.
-    fn float_add(&mut self, dst: Reg, lhs: Reg, rhs: Reg, size: OperandSize);
-
-    /// Perform a floating point subtraction operation.
-    fn float_sub(&mut self, dst: Reg, lhs: Reg, rhs: Reg, size: OperandSize);
-
-    /// Perform a floating point multiply operation.
-    fn float_mul(&mut self, dst: Reg, lhs: Reg, rhs: Reg, size: OperandSize);
-
-    /// Perform a floating point divide operation.
-    fn float_div(&mut self, dst: Reg, lhs: Reg, rhs: Reg, size: OperandSize);
-
-    /// Perform a floating point minimum operation. In x86, this will emit
-    /// multiple instructions.
-    fn float_min(&mut self, dst: Reg, lhs: Reg, rhs: Reg, size: OperandSize);
-
-    /// Perform a floating point maximum operation. In x86, this will emit
-    /// multiple instructions.
-    fn float_max(&mut self, dst: Reg, lhs: Reg, rhs: Reg, size: OperandSize);
-
-    /// Perform a floating point copysign operation. In x86, this will emit
-    /// multiple instructions.
-    fn float_copysign(&mut self, dst: Reg, lhs: Reg, rhs: Reg, size: OperandSize);
-
     /// Perform a floating point abs operation.
     fn float_abs(&mut self, dst: Reg, size: OperandSize);
 
@@ -422,10 +331,7 @@ pub(crate) trait MacroAssembler {
     fn float_neg(&mut self, dst: Reg, size: OperandSize);
 
     /// Perform a floating point floor operation.
-    fn float_round(&mut self, mode: RoundingMode, context: &mut CodeGenContext, size: OperandSize);
-
-    /// Perform a floating point square root operation.
-    fn float_sqrt(&mut self, dst: Reg, src: Reg, size: OperandSize);
+    fn float_round(&mut self, mode: RoundingMode, dst: Reg, src: RegImm, size: OperandSize);
 
     /// Perform logical and operation.
     fn and(&mut self, dst: Reg, lhs: Reg, rhs: RegImm, size: OperandSize);
@@ -465,18 +371,7 @@ pub(crate) trait MacroAssembler {
 
     /// Compare src and dst and put the result in dst.
     /// This function will potentially emit a series of instructions.
-    fn cmp_with_set(&mut self, src: RegImm, dst: Reg, kind: IntCmpKind, size: OperandSize);
-
-    /// Compare floats in src1 and src2 and put the result in dst.
-    /// In x86, this will emit multiple instructions.
-    fn float_cmp_with_set(
-        &mut self,
-        src1: Reg,
-        src2: Reg,
-        dst: Reg,
-        kind: FloatCmpKind,
-        size: OperandSize,
-    );
+    fn cmp_with_set(&mut self, src: RegImm, dst: Reg, kind: CmpKind, size: OperandSize);
 
     /// Count the number of leading zeroes in src and put the result in dst.
     /// In x64, this will emit multiple instructions if the `has_lzcnt` flag is
@@ -511,7 +406,7 @@ pub(crate) trait MacroAssembler {
     /// The default implementation divides the given memory range
     /// into word-sized slots. Then it unrolls a series of store
     /// instructions, effectively assigning zero to each slot.
-    fn zero_mem_range(&mut self, mem: &Range<u32>) {
+    fn zero_mem_range(&mut self, mem: &Range<u32>, regalloc: &mut RegAlloc) {
         let word_size = <Self::ABI as abi::ABI>::word_bytes();
         if mem.is_empty() {
             return;
@@ -542,7 +437,7 @@ pub(crate) trait MacroAssembler {
             // Add an upper bound to this generation;
             // given a considerably large amount of slots
             // this will be inefficient.
-            let zero = <Self::ABI as abi::ABI>::scratch_reg();
+            let zero = regalloc.scratch;
             self.zero(zero);
             let zero = RegImm::reg(zero);
 
@@ -567,9 +462,9 @@ pub(crate) trait MacroAssembler {
     /// label destination if the condition is met.
     fn branch(
         &mut self,
-        kind: IntCmpKind,
+        kind: CmpKind,
         lhs: RegImm,
-        rhs: Reg,
+        rhs: RegImm,
         taken: MachLabel,
         size: OperandSize,
     );
@@ -583,10 +478,4 @@ pub(crate) trait MacroAssembler {
 
     /// Emit an unreachable code trap.
     fn unreachable(&mut self);
-
-    /// Traps if the condition code is met.
-    fn trapif(&mut self, cc: IntCmpKind, code: TrapCode);
-
-    /// Trap if the source register is zero.
-    fn trapz(&mut self, src: Reg, code: TrapCode);
 }
diff --git a/winch/codegen/src/regalloc.rs b/winch/codegen/src/regalloc.rs
index 2bcb8db3063a..c63036ff2cf8 100644
--- a/winch/codegen/src/regalloc.rs
+++ b/winch/codegen/src/regalloc.rs
@@ -1,6 +1,6 @@
 use crate::{
     isa::reg::{Reg, RegClass},
-    regset::{RegBitSet, RegSet},
+    regset::RegSet,
 };
 
 /// The register allocator.
@@ -15,15 +15,15 @@ use crate::{
 /// This processs ensures that whenever a register is requested,
 /// it is going to be available.
 pub(crate) struct RegAlloc {
-    /// The register set.
+    pub scratch: Reg,
     regset: RegSet,
 }
 
 impl RegAlloc {
-    /// Create a register allocator from a bit set for each register class.
-    pub fn from(gpr: RegBitSet, fpr: RegBitSet) -> Self {
-        let rs = RegSet::new(gpr, fpr);
-        Self { regset: rs }
+    /// Create a new register allocator
+    /// from a register set.
+    pub fn new(regset: RegSet, scratch: Reg) -> Self {
+        Self { regset, scratch }
     }
 
     /// Allocate the next available register for the given class,
@@ -50,6 +50,12 @@ impl RegAlloc {
     where
         F: FnMut(&mut RegAlloc),
     {
+        // If the scratch register is explicitly requested
+        // just return it, it's usage should never cause spills.
+        if named == self.scratch {
+            return named;
+        }
+
         self.regset.reg(named).unwrap_or_else(|| {
             spill(self);
             self.regset
@@ -60,6 +66,8 @@ impl RegAlloc {
 
     /// Free the given register.
     pub fn free(&mut self, reg: Reg) {
-        self.regset.free(reg);
+        if reg != self.scratch {
+            self.regset.free(reg);
+        }
     }
 }
diff --git a/winch/codegen/src/regset.rs b/winch/codegen/src/regset.rs
index 0f51dc2babed..655a10dc10ee 100644
--- a/winch/codegen/src/regset.rs
+++ b/winch/codegen/src/regset.rs
@@ -3,15 +3,15 @@ use crate::isa::reg::{Reg, RegClass};
 /// A bit set to track regiter availability.
 pub(crate) struct RegSet {
     /// Bitset to track general purpose register availability.
-    gpr: RegBitSet,
+    gpr: u32,
     /// Bitset to track floating-point register availability.
-    fpr: RegBitSet,
+    fpr: u32,
 }
 
 use std::ops::{Index, IndexMut};
 
 impl Index<RegClass> for RegSet {
-    type Output = RegBitSet;
+    type Output = u32;
 
     fn index(&self, class: RegClass) -> &Self::Output {
         match class {
@@ -32,53 +32,9 @@ impl IndexMut<RegClass> for RegSet {
     }
 }
 
-/// Bitset for a particular register class.
-pub struct RegBitSet {
-    /// The register class.
-    class: RegClass,
-    /// The set of allocatable
-    allocatable: u64,
-    /// The set of non-alloctable registers.
-    non_allocatable: u64,
-    /// The max number of registers.
-    /// Invariant:
-    /// When allocating or freeing a register the encoding (index) of the
-    /// register must be less than the max property.
-    max: usize,
-}
-
-impl RegBitSet {
-    /// Creates an integer register class bitset.
-    pub fn int(allocatable: u64, non_allocatable: u64, max: usize) -> Self {
-        // Assert that one set is the complement of the other.
-        debug_assert!(allocatable & non_allocatable == 0);
-        Self {
-            class: RegClass::Int,
-            allocatable,
-            non_allocatable,
-            max,
-        }
-    }
-
-    /// Creates a float register class bitset.
-    pub fn float(allocatable: u64, non_allocatable: u64, max: usize) -> Self {
-        // Assert that one set is the complement of the other.
-        debug_assert!(allocatable & non_allocatable == 0);
-        Self {
-            class: RegClass::Float,
-            allocatable,
-            non_allocatable,
-            max,
-        }
-    }
-}
-
 impl RegSet {
     /// Create a new register set.
-    pub fn new(gpr: RegBitSet, fpr: RegBitSet) -> Self {
-        debug_assert!(gpr.class == RegClass::Int);
-        debug_assert!(fpr.class == RegClass::Float);
-
+    pub fn new(gpr: u32, fpr: u32) -> Self {
         Self { gpr, fpr }
     }
 
@@ -86,9 +42,9 @@ impl RegSet {
     /// returning `None` if there are no more registers available.
     pub fn reg_for_class(&mut self, class: RegClass) -> Option<Reg> {
         self.available(class).then(|| {
-            let bitset = &self[class];
-            let index = bitset.allocatable.trailing_zeros();
-            self.allocate(class, index.into());
+            let bitset = self[class];
+            let index = bitset.trailing_zeros();
+            self.allocate(class, index);
             Reg::from(class, index as usize)
         })
     }
@@ -97,7 +53,7 @@ impl RegSet {
     pub fn reg(&mut self, reg: Reg) -> Option<Reg> {
         let index = reg.hw_enc();
         self.named_reg_available(reg).then(|| {
-            self.allocate(reg.class(), index.try_into().unwrap());
+            self.allocate(reg.class(), index.into());
             reg
         })
     }
@@ -105,55 +61,36 @@ impl RegSet {
     /// Marks the specified register as available, utilizing the
     /// register class to determine the bitset that requires updating.
     pub fn free(&mut self, reg: Reg) {
-        let bitset = &self[reg.class()];
-        let index = reg.hw_enc();
-        assert!(index < bitset.max);
-        let index = u64::try_from(index).unwrap();
-        if !self.is_non_allocatable(reg.class(), index) {
-            self[reg.class()].allocatable |= 1 << index;
-        }
+        let index = reg.hw_enc() as u32;
+        self[reg.class()] |= 1 << index;
     }
 
     /// Returns true if the specified register is allocatable.
     pub fn named_reg_available(&self, reg: Reg) -> bool {
-        let bitset = &self[reg.class()];
-        assert!(reg.hw_enc() < bitset.max);
+        let bitset = self[reg.class()];
         let index = 1 << reg.hw_enc();
-
-        (!bitset.allocatable & index) == 0
-            || self.is_non_allocatable(reg.class(), reg.hw_enc().try_into().unwrap())
+        (!bitset & index) == 0
     }
 
     fn available(&self, class: RegClass) -> bool {
-        let bitset = &self[class];
-        bitset.allocatable != 0
-    }
-
-    fn allocate(&mut self, class: RegClass, index: u64) {
-        if !self.is_non_allocatable(class, index) {
-            self[class].allocatable &= !(1 << index);
-        }
+        let bitset = self[class];
+        bitset != 0
     }
 
-    fn is_non_allocatable(&self, class: RegClass, index: u64) -> bool {
-        let bitset = &self[class];
-        let non_allocatable = bitset.non_allocatable;
-        non_allocatable != 0 && !non_allocatable & (1 << index) == 0
+    fn allocate(&mut self, class: RegClass, index: u32) {
+        self[class] &= !(1 << index);
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use super::{Reg, RegBitSet, RegClass, RegSet};
+    use super::{Reg, RegClass, RegSet};
 
-    const UNIVERSE: u64 = (1 << 16) - 1;
-    const MAX: usize = 16;
+    const UNIVERSE: u32 = (1 << 16) - 1;
 
     #[test]
     fn test_any_gpr() {
-        let bitset = RegBitSet::int(UNIVERSE, !UNIVERSE, MAX);
-        let zero = RegBitSet::float(0, 0, MAX);
-        let mut set = RegSet::new(bitset, zero);
+        let mut set = RegSet::new(UNIVERSE, 0);
         for _ in 0..16 {
             let gpr = set.reg_for_class(RegClass::Int);
             assert!(gpr.is_some())
@@ -165,28 +102,15 @@ mod tests {
 
     #[test]
     fn test_gpr() {
-        let non_allocatable: u64 = 1 << 5;
-        let all = UNIVERSE & !non_allocatable;
-        let non_alloc = Reg::int(5);
-        let alloc = Reg::int(2);
-        let bitset = RegBitSet::int(all, non_allocatable, MAX);
-        let zero = RegBitSet::float(0, 0, MAX);
-        let mut set = RegSet::new(bitset, zero);
-        // Requesting a non alloctable register returns the register
-        // and doesn't allocate it.
-        assert!(set.reg(non_alloc).is_some());
-        assert!(set.reg(non_alloc).is_some());
-        // Requesting an allocatable register twice returns none the
-        // second time.
-        assert!(set.reg(alloc).is_some());
-        assert!(set.reg(alloc).is_none());
+        let all = UNIVERSE & !(1 << 5);
+        let target = Reg::int(5);
+        let mut set = RegSet::new(all, 0);
+        assert!(set.reg(target).is_none());
     }
 
     #[test]
     fn test_free_reg() {
-        let set = RegBitSet::int(UNIVERSE, !UNIVERSE, MAX);
-        let zero = RegBitSet::float(0, 0, MAX);
-        let mut set = RegSet::new(set, zero);
+        let mut set = RegSet::new(UNIVERSE, 0);
         let gpr = set.reg_for_class(RegClass::Int).unwrap();
         set.free(gpr);
         assert!(set.reg(gpr).is_some());
diff --git a/winch/codegen/src/stack.rs b/winch/codegen/src/stack.rs
index 1fc61bdee6dd..d176b8d4d04c 100644
--- a/winch/codegen/src/stack.rs
+++ b/winch/codegen/src/stack.rs
@@ -14,26 +14,18 @@ pub struct TypedReg {
 }
 
 impl TypedReg {
-    /// Create a new [`TypedReg`].
+    /// Create a new TypedReg.
     pub fn new(ty: WasmType, reg: Reg) -> Self {
         Self { ty, reg }
     }
 
-    /// Create an i64 [`TypedReg`].
+    /// Create an i64 TypedReg.
     pub fn i64(reg: Reg) -> Self {
         Self {
             ty: WasmType::I64,
             reg,
         }
     }
-
-    /// Create an i64 [`TypedReg`].
-    pub fn i32(reg: Reg) -> Self {
-        Self {
-            ty: WasmType::I32,
-            reg,
-        }
-    }
 }
 
 impl From<TypedReg> for Reg {
@@ -97,13 +89,6 @@ impl From<Memory> for Val {
     }
 }
 
-impl TryFrom<u32> for Val {
-    type Error = anyhow::Error;
-    fn try_from(value: u32) -> Result<Self, Self::Error> {
-        i32::try_from(value).map(Val::i32).map_err(Into::into)
-    }
-}
-
 impl Val {
     /// Create a new I32 constant value.
     pub fn i32(v: i32) -> Self {
@@ -232,22 +217,9 @@ impl Stack {
         }
     }
 
-    /// Extend the stack with the given elements.
-    pub fn extend(&mut self, values: impl IntoIterator<Item = Val>) {
-        self.inner.extend(values);
-    }
-
-    /// Inserts many values at the given index.
-    pub fn insert_many(&mut self, at: usize, values: impl IntoIterator<Item = Val>) {
-        debug_assert!(at <= self.len());
-        // If last, simply extend.
-        if at == self.inner.len() {
-            self.inner.extend(values);
-        } else {
-            let mut tail = self.inner.split_off(at);
-            self.inner.extend(values);
-            self.inner.append(&mut tail);
-        }
+    /// Insert a new value at the specified index.
+    pub fn insert(&mut self, at: usize, val: Val) {
+        self.inner.insert(at, val);
     }
 
     /// Get the length of the stack.
diff --git a/winch/codegen/src/visitor.rs b/winch/codegen/src/visitor.rs
index d46104f2cb7f..101df49ff5d9 100644
--- a/winch/codegen/src/visitor.rs
+++ b/winch/codegen/src/visitor.rs
@@ -5,20 +5,16 @@
 //! machine code emitter.
 
 use crate::abi::ABI;
-use crate::codegen::{control_index, Callee, CodeGen, ControlStackFrame, FnCall};
+use crate::codegen::ControlStackFrame;
+use crate::codegen::{control_index, CodeGen};
 use crate::masm::{
-    DivKind, FloatCmpKind, IntCmpKind, MacroAssembler, OperandSize, RegImm, RemKind, RoundingMode,
-    ShiftKind,
+    CmpKind, DivKind, MacroAssembler, OperandSize, RegImm, RemKind, RoundingMode, ShiftKind,
 };
 use crate::stack::{TypedReg, Val};
-use cranelift_codegen::ir::TrapCode;
 use smallvec::SmallVec;
 use wasmparser::BrTable;
 use wasmparser::{BlockType, Ieee32, Ieee64, VisitOperator};
-use wasmtime_environ::{
-    FuncIndex, GlobalIndex, TableIndex, TableStyle, TypeIndex, WasmHeapType, WasmType,
-    FUNCREF_INIT_BIT,
-};
+use wasmtime_environ::{FuncIndex, GlobalIndex, WasmType};
 
 /// A macro to define unsupported WebAssembly operators.
 ///
@@ -45,20 +41,6 @@ macro_rules! def_unsupported {
     (emit I64Const $($rest:tt)*) => {};
     (emit F32Const $($rest:tt)*) => {};
     (emit F64Const $($rest:tt)*) => {};
-    (emit F32Add $($rest:tt)*) => {};
-    (emit F64Add $($rest:tt)*) => {};
-    (emit F32Sub $($rest:tt)*) => {};
-    (emit F64Sub $($rest:tt)*) => {};
-    (emit F32Mul $($rest:tt)*) => {};
-    (emit F64Mul $($rest:tt)*) => {};
-    (emit F32Div $($rest:tt)*) => {};
-    (emit F64Div $($rest:tt)*) => {};
-    (emit F32Min $($rest:tt)*) => {};
-    (emit F64Min $($rest:tt)*) => {};
-    (emit F32Max $($rest:tt)*) => {};
-    (emit F64Max $($rest:tt)*) => {};
-    (emit F32Copysign $($rest:tt)*) => {};
-    (emit F64Copysign $($rest:tt)*) => {};
     (emit F32Abs $($rest:tt)*) => {};
     (emit F64Abs $($rest:tt)*) => {};
     (emit F32Neg $($rest:tt)*) => {};
@@ -71,20 +53,6 @@ macro_rules! def_unsupported {
     (emit F64Nearest $($rest:tt)*) => {};
     (emit F32Trunc $($rest:tt)*) => {};
     (emit F64Trunc $($rest:tt)*) => {};
-    (emit F32Sqrt $($rest:tt)*) => {};
-    (emit F64Sqrt $($rest:tt)*) => {};
-    (emit F32Eq $($rest:tt)*) => {};
-    (emit F64Eq $($rest:tt)*) => {};
-    (emit F32Ne $($rest:tt)*) => {};
-    (emit F64Ne $($rest:tt)*) => {};
-    (emit F32Lt $($rest:tt)*) => {};
-    (emit F64Lt $($rest:tt)*) => {};
-    (emit F32Gt $($rest:tt)*) => {};
-    (emit F64Gt $($rest:tt)*) => {};
-    (emit F32Le $($rest:tt)*) => {};
-    (emit F64Le $($rest:tt)*) => {};
-    (emit F32Ge $($rest:tt)*) => {};
-    (emit F64Ge $($rest:tt)*) => {};
     (emit I32Add $($rest:tt)*) => {};
     (emit I64Add $($rest:tt)*) => {};
     (emit I32Sub $($rest:tt)*) => {};
@@ -162,20 +130,11 @@ macro_rules! def_unsupported {
     (emit Select $($rest:tt)*) => {};
     (emit Drop $($rest:tt)*) => {};
     (emit BrTable $($rest:tt)*) => {};
-    (emit CallIndirect $($rest:tt)*) => {};
-    (emit TableInit $($rest:tt)*) => {};
-    (emit TableCopy $($rest:tt)*) => {};
-    (emit TableGet $($rest:tt)*) => {};
-    (emit TableSet $($rest:tt)*) => {};
-    (emit TableGrow $($rest:tt)*) => {};
-    (emit TableSize $($rest:tt)*) => {};
-    (emit TableFill $($rest:tt)*) => {};
-    (emit ElemDrop $($rest:tt)*) => {};
 
     (emit $unsupported:tt $($rest:tt)*) => {$($rest)*};
 }
 
-impl<'a, 'translation, 'data, M> VisitOperator<'a> for CodeGen<'a, 'translation, 'data, M>
+impl<'a, M> VisitOperator<'a> for CodeGen<'a, M>
 where
     M: MacroAssembler,
 {
@@ -197,146 +156,6 @@ where
         self.context.stack.push(Val::f64(val));
     }
 
-    fn visit_f32_add(&mut self) {
-        self.context.binop(
-            self.masm,
-            OperandSize::S32,
-            &mut |masm: &mut M, dst, src, size| {
-                masm.float_add(dst, dst, src, size);
-            },
-        );
-    }
-
-    fn visit_f64_add(&mut self) {
-        self.context.binop(
-            self.masm,
-            OperandSize::S64,
-            &mut |masm: &mut M, dst, src, size| {
-                masm.float_add(dst, dst, src, size);
-            },
-        );
-    }
-
-    fn visit_f32_sub(&mut self) {
-        self.context.binop(
-            self.masm,
-            OperandSize::S32,
-            &mut |masm: &mut M, dst, src, size| {
-                masm.float_sub(dst, dst, src, size);
-            },
-        );
-    }
-
-    fn visit_f64_sub(&mut self) {
-        self.context.binop(
-            self.masm,
-            OperandSize::S64,
-            &mut |masm: &mut M, dst, src, size| {
-                masm.float_sub(dst, dst, src, size);
-            },
-        );
-    }
-
-    fn visit_f32_mul(&mut self) {
-        self.context.binop(
-            self.masm,
-            OperandSize::S32,
-            &mut |masm: &mut M, dst, src, size| {
-                masm.float_mul(dst, dst, src, size);
-            },
-        );
-    }
-
-    fn visit_f64_mul(&mut self) {
-        self.context.binop(
-            self.masm,
-            OperandSize::S64,
-            &mut |masm: &mut M, dst, src, size| {
-                masm.float_mul(dst, dst, src, size);
-            },
-        );
-    }
-
-    fn visit_f32_div(&mut self) {
-        self.context.binop(
-            self.masm,
-            OperandSize::S32,
-            &mut |masm: &mut M, dst, src, size| {
-                masm.float_div(dst, dst, src, size);
-            },
-        );
-    }
-
-    fn visit_f64_div(&mut self) {
-        self.context.binop(
-            self.masm,
-            OperandSize::S64,
-            &mut |masm: &mut M, dst, src, size| {
-                masm.float_div(dst, dst, src, size);
-            },
-        );
-    }
-
-    fn visit_f32_min(&mut self) {
-        self.context.binop(
-            self.masm,
-            OperandSize::S32,
-            &mut |masm: &mut M, dst, src, size| {
-                masm.float_min(dst, dst, src, size);
-            },
-        );
-    }
-
-    fn visit_f64_min(&mut self) {
-        self.context.binop(
-            self.masm,
-            OperandSize::S64,
-            &mut |masm: &mut M, dst, src, size| {
-                masm.float_min(dst, dst, src, size);
-            },
-        );
-    }
-
-    fn visit_f32_max(&mut self) {
-        self.context.binop(
-            self.masm,
-            OperandSize::S32,
-            &mut |masm: &mut M, dst, src, size| {
-                masm.float_max(dst, dst, src, size);
-            },
-        );
-    }
-
-    fn visit_f64_max(&mut self) {
-        self.context.binop(
-            self.masm,
-            OperandSize::S64,
-            &mut |masm: &mut M, dst, src, size| {
-                masm.float_max(dst, dst, src, size);
-            },
-        );
-    }
-
-    fn visit_f32_copysign(&mut self) {
-        self.context.binop(
-            self.masm,
-            OperandSize::S32,
-            &mut |masm: &mut M, dst, src, size| {
-                masm.float_copysign(dst, dst, src, size);
-            },
-        );
-    }
-
-    fn visit_f64_copysign(&mut self) {
-        self.context.binop(
-            self.masm,
-            OperandSize::S64,
-            &mut |masm: &mut M, dst, src, size| {
-                masm.float_copysign(dst, dst, src, size);
-            },
-        );
-    }
-
     fn visit_f32_abs(&mut self) {
         self.context
             .unop(self.masm, OperandSize::S32, &mut |masm, reg, size| {
@@ -366,179 +185,61 @@ where
     }
 
     fn visit_f32_floor(&mut self) {
-        self.masm
-            .float_round(RoundingMode::Down, &mut self.context, OperandSize::S32);
+        self.context
+            .unop(self.masm, OperandSize::S32, &mut |masm, reg, size| {
+                masm.float_round(RoundingMode::Down, reg, RegImm::Reg(reg), size);
+            });
     }
 
     fn visit_f64_floor(&mut self) {
-        self.masm
-            .float_round(RoundingMode::Down, &mut self.context, OperandSize::S64);
+        self.context
+            .unop(self.masm, OperandSize::S64, &mut |masm, reg, size| {
+                masm.float_round(RoundingMode::Down, reg, RegImm::Reg(reg), size);
+            });
     }
 
     fn visit_f32_ceil(&mut self) {
-        self.masm
-            .float_round(RoundingMode::Up, &mut self.context, OperandSize::S32);
+        self.context
+            .unop(self.masm, OperandSize::S32, &mut |masm, reg, size| {
+                masm.float_round(RoundingMode::Up, reg, RegImm::Reg(reg), size);
+            });
     }
 
     fn visit_f64_ceil(&mut self) {
-        self.masm
-            .float_round(RoundingMode::Up, &mut self.context, OperandSize::S64);
+        self.context
+            .unop(self.masm, OperandSize::S64, &mut |masm, reg, size| {
+                masm.float_round(RoundingMode::Up, reg, RegImm::Reg(reg), size);
+            });
     }
 
     fn visit_f32_nearest(&mut self) {
-        self.masm
-            .float_round(RoundingMode::Nearest, &mut self.context, OperandSize::S32);
+        self.context
+            .unop(self.masm, OperandSize::S32, &mut |masm, reg, size| {
+                masm.float_round(RoundingMode::Nearest, reg, RegImm::Reg(reg), size);
+            });
     }
 
     fn visit_f64_nearest(&mut self) {
-        self.masm
-            .float_round(RoundingMode::Nearest, &mut self.context, OperandSize::S64);
+        self.context
+            .unop(self.masm, OperandSize::S64, &mut |masm, reg, size| {
+                masm.float_round(RoundingMode::Nearest, reg, RegImm::Reg(reg), size);
+            });
     }
 
     fn visit_f32_trunc(&mut self) {
-        self.masm
-            .float_round(RoundingMode::Zero, &mut self.context, OperandSize::S32);
-    }
-
-    fn visit_f64_trunc(&mut self) {
-        self.masm
-            .float_round(RoundingMode::Zero, &mut self.context, OperandSize::S64);
-    }
-
-    fn visit_f32_sqrt(&mut self) {
         self.context
             .unop(self.masm, OperandSize::S32, &mut |masm, reg, size| {
-                masm.float_sqrt(reg, reg, size);
+                masm.float_round(RoundingMode::Zero, reg, RegImm::Reg(reg), size);
             });
     }
 
-    fn visit_f64_sqrt(&mut self) {
+    fn visit_f64_trunc(&mut self) {
         self.context
             .unop(self.masm, OperandSize::S64, &mut |masm, reg, size| {
-                masm.float_sqrt(reg, reg, size);
+                masm.float_round(RoundingMode::Zero, reg, RegImm::Reg(reg), size);
             });
     }
 
-    fn visit_f32_eq(&mut self) {
-        self.context.float_cmp_op(
-            self.masm,
-            OperandSize::S32,
-            &mut |masm: &mut M, dst, src1, src2, size| {
-                masm.float_cmp_with_set(src1, src2, dst, FloatCmpKind::Eq, size);
-            },
-        );
-    }
-
-    fn visit_f64_eq(&mut self) {
-        self.context.float_cmp_op(
-            self.masm,
-            OperandSize::S64,
-            &mut |masm: &mut M, dst, src1, src2, size| {
-                masm.float_cmp_with_set(src1, src2, dst, FloatCmpKind::Eq, size);
-            },
-        );
-    }
-
-    fn visit_f32_ne(&mut self) {
-        self.context.float_cmp_op(
-            self.masm,
-            OperandSize::S32,
-            &mut |masm: &mut M, dst, src1, src2, size| {
-                masm.float_cmp_with_set(src1, src2, dst, FloatCmpKind::Ne, size);
-            },
-        );
-    }
-
-    fn visit_f64_ne(&mut self) {
-        self.context.float_cmp_op(
-            self.masm,
-            OperandSize::S64,
-            &mut |masm: &mut M, dst, src1, src2, size| {
-                masm.float_cmp_with_set(src1, src2, dst, FloatCmpKind::Ne, size);
-            },
-        );
-    }
-
-    fn visit_f32_lt(&mut self) {
-        self.context.float_cmp_op(
-            self.masm,
-            OperandSize::S32,
-            &mut |masm: &mut M, dst, src1, src2, size| {
-                masm.float_cmp_with_set(src1, src2, dst, FloatCmpKind::Lt, size);
-            },
-        );
-    }
-
-    fn visit_f64_lt(&mut self) {
-        self.context.float_cmp_op(
-            self.masm,
-            OperandSize::S64,
-            &mut |masm: &mut M, dst, src1, src2, size| {
-                masm.float_cmp_with_set(src1, src2, dst, FloatCmpKind::Lt, size);
-            },
-        );
-    }
-
-    fn visit_f32_gt(&mut self) {
-        self.context.float_cmp_op(
-            self.masm,
-            OperandSize::S32,
-            &mut |masm: &mut M, dst, src1, src2, size| {
-                masm.float_cmp_with_set(src1, src2, dst, FloatCmpKind::Gt, size);
-            },
-        );
-    }
-
-    fn visit_f64_gt(&mut self) {
-        self.context.float_cmp_op(
-            self.masm,
-            OperandSize::S64,
-            &mut |masm: &mut M, dst, src1, src2, size| {
-                masm.float_cmp_with_set(src1, src2, dst, FloatCmpKind::Gt, size);
-            },
-        );
-    }
-
-    fn visit_f32_le(&mut self) {
-        self.context.float_cmp_op(
-            self.masm,
-            OperandSize::S32,
-            &mut |masm: &mut M, dst, src1, src2, size| {
-                masm.float_cmp_with_set(src1, src2, dst, FloatCmpKind::Le, size);
-            },
-        );
-    }
-
-    fn visit_f64_le(&mut self) {
-        self.context.float_cmp_op(
-            self.masm,
-            OperandSize::S64,
-            &mut |masm: &mut M, dst, src1, src2, size| {
-                masm.float_cmp_with_set(src1, src2, dst, FloatCmpKind::Le, size);
-            },
-        );
-    }
-
-    fn visit_f32_ge(&mut self) {
-        self.context.float_cmp_op(
-            self.masm,
-            OperandSize::S32,
-            &mut |masm: &mut M, dst, src1, src2, size| {
-                masm.float_cmp_with_set(src1, src2, dst, FloatCmpKind::Ge, size);
-            },
-        );
-    }
-
-    fn visit_f64_ge(&mut self) {
-        self.context.float_cmp_op(
-            self.masm,
-            OperandSize::S64,
-            &mut |masm: &mut M, dst, src1, src2, size| {
-                masm.float_cmp_with_set(src1, src2, dst, FloatCmpKind::Ge, size);
-            },
-        );
-    }
-
     fn visit_i32_add(&mut self) {
         self.context.i32_binop(self.masm, |masm, dst, src, size| {
             masm.add(dst, dst, src, size);
@@ -632,90 +333,90 @@ where
     }
 
     fn visit_i32_eq(&mut self) {
-        self.cmp_i32s(IntCmpKind::Eq);
+        self.cmp_i32s(CmpKind::Eq);
     }
 
     fn visit_i64_eq(&mut self) {
-        self.cmp_i64s(IntCmpKind::Eq);
+        self.cmp_i64s(CmpKind::Eq);
     }
 
     fn visit_i32_ne(&mut self) {
-        self.cmp_i32s(IntCmpKind::Ne);
+        self.cmp_i32s(CmpKind::Ne);
     }
 
     fn visit_i64_ne(&mut self) {
-        self.cmp_i64s(IntCmpKind::Ne);
+        self.cmp_i64s(CmpKind::Ne);
     }
 
     fn visit_i32_lt_s(&mut self) {
-        self.cmp_i32s(IntCmpKind::LtS);
+        self.cmp_i32s(CmpKind::LtS);
     }
 
     fn visit_i64_lt_s(&mut self) {
-        self.cmp_i64s(IntCmpKind::LtS);
+        self.cmp_i64s(CmpKind::LtS);
     }
 
     fn visit_i32_lt_u(&mut self) {
-        self.cmp_i32s(IntCmpKind::LtU);
+        self.cmp_i32s(CmpKind::LtU);
     }
 
     fn visit_i64_lt_u(&mut self) {
-        self.cmp_i64s(IntCmpKind::LtU);
+        self.cmp_i64s(CmpKind::LtU);
     }
 
     fn visit_i32_le_s(&mut self) {
-        self.cmp_i32s(IntCmpKind::LeS);
+        self.cmp_i32s(CmpKind::LeS);
     }
 
     fn visit_i64_le_s(&mut self) {
-        self.cmp_i64s(IntCmpKind::LeS);
+        self.cmp_i64s(CmpKind::LeS);
     }
 
     fn visit_i32_le_u(&mut self) {
-        self.cmp_i32s(IntCmpKind::LeU);
+        self.cmp_i32s(CmpKind::LeU);
     }
 
     fn visit_i64_le_u(&mut self) {
-        self.cmp_i64s(IntCmpKind::LeU);
+        self.cmp_i64s(CmpKind::LeU);
     }
 
     fn visit_i32_gt_s(&mut self) {
-        self.cmp_i32s(IntCmpKind::GtS);
+        self.cmp_i32s(CmpKind::GtS);
     }
 
     fn visit_i64_gt_s(&mut self) {
-        self.cmp_i64s(IntCmpKind::GtS);
+        self.cmp_i64s(CmpKind::GtS);
     }
 
     fn visit_i32_gt_u(&mut self) {
-        self.cmp_i32s(IntCmpKind::GtU);
+        self.cmp_i32s(CmpKind::GtU);
     }
 
     fn visit_i64_gt_u(&mut self) {
-        self.cmp_i64s(IntCmpKind::GtU);
+        self.cmp_i64s(CmpKind::GtU);
     }
 
     fn visit_i32_ge_s(&mut self) {
-        self.cmp_i32s(IntCmpKind::GeS);
+        self.cmp_i32s(CmpKind::GeS);
     }
 
     fn visit_i64_ge_s(&mut self) {
-        self.cmp_i64s(IntCmpKind::GeS);
+        self.cmp_i64s(CmpKind::GeS);
     }
 
     fn visit_i32_ge_u(&mut self) {
-        self.cmp_i32s(IntCmpKind::GeU);
+        self.cmp_i32s(CmpKind::GeU);
     }
 
     fn visit_i64_ge_u(&mut self) {
-        self.cmp_i64s(IntCmpKind::GeU);
+        self.cmp_i64s(CmpKind::GeU);
     }
 
     fn visit_i32_eqz(&mut self) {
         use OperandSize::*;
 
         self.context.unop(self.masm, S32, &mut |masm, reg, size| {
-            masm.cmp_with_set(RegImm::i32(0), reg.into(), IntCmpKind::Eq, size);
+            masm.cmp_with_set(RegImm::i32(0), reg.into(), CmpKind::Eq, size);
         });
     }
 
@@ -723,7 +424,7 @@ where
         use OperandSize::*;
 
         self.context.unop(self.masm, S64, &mut |masm, reg, size| {
-            masm.cmp_with_set(RegImm::i64(0), reg.into(), IntCmpKind::Eq, size);
+            masm.cmp_with_set(RegImm::i64(0), reg.into(), CmpKind::Eq, size);
         });
     }
 
@@ -904,213 +605,18 @@ where
             .unwrap_or_else(|| panic!("valid local at slot = {}", index));
         match slot.ty {
             I32 | I64 | F32 | F64 => context.stack.push(Val::local(index, slot.ty)),
-            Ref(rt) => match rt.heap_type {
-                WasmHeapType::Func => context.stack.push(Val::local(index, slot.ty)),
-                ht => unimplemented!("Support for WasmHeapType: {ht}"),
-            },
-            t => unimplemented!("Support local type: {t}"),
+            _ => panic!("Unsupported type {:?} for local", slot.ty),
         }
     }
 
-    // TODO: verify the case where the target local is on the stack.
+    // TODO verify the case where the target local is on the stack.
     fn visit_local_set(&mut self, index: u32) {
-        let (ty, slot) = self.context.frame.get_local_address(index, self.masm);
-        let src = self.emit_set_local(slot, ty.into());
+        let src = self.context.set_local(self.masm, index);
         self.context.free_reg(src);
     }
 
     fn visit_call(&mut self, index: u32) {
-        let callee = self.env.callee_from_index(FuncIndex::from_u32(index));
-        FnCall::emit::<M, M::Ptr, _>(self.masm, &mut self.context, |_| callee.clone());
-    }
-
-    fn visit_call_indirect(&mut self, type_index: u32, table_index: u32, _: u8) {
-        let type_index = TypeIndex::from_u32(type_index);
-        let table_index = TableIndex::from_u32(table_index);
-
-        self.emit_lazy_init_funcref(table_index);
-
-        // Perform the indirect call.
-        // This code assumes that [`Self::emit_lazy_init_funcref`] will
-        // push the funcref to the value stack.
-        match self.env.translation.module.table_plans[table_index].style {
-            TableStyle::CallerChecksSignature => {
-                let funcref_ptr = self.context.stack.peek().map(|v| v.get_reg()).unwrap();
-                self.masm
-                    .trapz(funcref_ptr.into(), TrapCode::IndirectCallToNull);
-                self.emit_typecheck_funcref(funcref_ptr.into(), type_index);
-            }
-        }
-
-        FnCall::emit::<M, M::Ptr, _>(self.masm, &mut self.context, |_| {
-            self.env.funcref(type_index)
-        })
-    }
-
-    fn visit_table_init(&mut self, elem: u32, table: u32) {
-        let ptr_type = self.env.ptr_type();
-        let vmctx = TypedReg::new(ptr_type, <M::ABI as ABI>::vmctx_reg());
-
-        debug_assert!(self.context.stack.len() >= 3);
-        let at = self.context.stack.len() - 3;
-
-        self.context.stack.insert_many(
-            at,
-            [
-                vmctx.into(),
-                table.try_into().unwrap(),
-                elem.try_into().unwrap(),
-            ],
-        );
-        FnCall::emit::<M, M::Ptr, _>(self.masm, &mut self.context, |cx| {
-            Callee::Builtin(cx.builtins.table_init::<M::ABI, M::Ptr>())
-        });
-    }
-
-    fn visit_table_copy(&mut self, dst: u32, src: u32) {
-        let ptr_type = self.env.ptr_type();
-        let vmctx = TypedReg::new(ptr_type, <M::ABI as ABI>::vmctx_reg());
-        debug_assert!(self.context.stack.len() >= 3);
-        let at = self.context.stack.len() - 3;
-        self.context.stack.insert_many(
-            at,
-            [
-                vmctx.into(),
-                dst.try_into().unwrap(),
-                src.try_into().unwrap(),
-            ],
-        );
-
-        FnCall::emit::<M, M::Ptr, _>(self.masm, &mut self.context, |context| {
-            Callee::Builtin(context.builtins.table_copy::<M::ABI, M::Ptr>())
-        });
-    }
-
-    fn visit_table_get(&mut self, table: u32) {
-        let table_index = TableIndex::from_u32(table);
-        let plan = self.env.table_plan(table_index);
-        let heap_type = plan.table.wasm_ty.heap_type;
-        let style = &plan.style;
-
-        match heap_type {
-            WasmHeapType::Func => match style {
-                TableStyle::CallerChecksSignature => self.emit_lazy_init_funcref(table_index),
-            },
-            t => unimplemented!("Support for WasmHeapType: {t}"),
-        }
-    }
-
-    fn visit_table_grow(&mut self, table: u32) {
-        let ptr_type = self.env.ptr_type();
-        let vmctx = TypedReg::new(ptr_type, <M::ABI as ABI>::vmctx_reg());
-        let table_index = TableIndex::from_u32(table);
-        let table_plan = self.env.table_plan(table_index);
-        let builtin = match table_plan.table.wasm_ty.heap_type {
-            WasmHeapType::Func => self
-                .context
-                .builtins
-                .table_grow_func_ref::<M::ABI, M::Ptr>(),
-            ty => unimplemented!("Support for HeapType: {ty}"),
-        };
-
-        let len = self.context.stack.len();
-        // table.grow` requires at least 2 elements on the value stack.
-        debug_assert!(len >= 2);
-        let at = len - 2;
-
-        // The table_grow builtin expects the parameters in a different
-        // order.
-        // The value stack at this point should contain:
-        // [ init_value | delta ] (stack top)
-        // but the builtin function expects the init value as the last
-        // argument.
-        self.context.stack.inner_mut().swap(len - 1, len - 2);
-        self.context
-            .stack
-            .insert_many(at, [vmctx.into(), table.try_into().unwrap()]);
-
-        FnCall::emit::<M, M::Ptr, _>(self.masm, &mut self.context, |_| {
-            Callee::Builtin(builtin.clone())
-        });
-    }
-
-    fn visit_table_size(&mut self, table: u32) {
-        let table_index = TableIndex::from_u32(table);
-        let table_data = self.env.resolve_table_data(table_index);
-        self.masm.table_size(&table_data, &mut self.context);
-    }
-
-    fn visit_table_fill(&mut self, table: u32) {
-        let ptr_type = self.env.ptr_type();
-        let vmctx = TypedReg::new(ptr_type, <M::ABI as ABI>::vmctx_reg());
-        let table_index = TableIndex::from_u32(table);
-        let table_plan = self.env.table_plan(table_index);
-        let builtin = match table_plan.table.wasm_ty.heap_type {
-            WasmHeapType::Func => self
-                .context
-                .builtins
-                .table_fill_func_ref::<M::ABI, M::Ptr>(),
-            ty => unimplemented!("Support for heap type: {ty}"),
-        };
-
-        let len = self.context.stack.len();
-        debug_assert!(len >= 3);
-        let at = len - 3;
-        self.context
-            .stack
-            .insert_many(at, [vmctx.into(), table.try_into().unwrap()]);
-        FnCall::emit::<M, M::Ptr, _>(self.masm, &mut self.context, |_| {
-            Callee::Builtin(builtin.clone())
-        })
-    }
-
-    fn visit_table_set(&mut self, table: u32) {
-        let ptr_type = self.env.ptr_type();
-        let table_index = TableIndex::from_u32(table);
-        let table_data = self.env.resolve_table_data(table_index);
-        let plan = self.env.table_plan(table_index);
-        match plan.table.wasm_ty.heap_type {
-            WasmHeapType::Func => match plan.style {
-                TableStyle::CallerChecksSignature => {
-                    let value = self.context.pop_to_reg(self.masm, None);
-                    let index = self.context.pop_to_reg(self.masm, None);
-                    let base = self.context.any_gpr(self.masm);
-                    let elem_addr = self.masm.table_elem_address(
-                        index.into(),
-                        base,
-                        &table_data,
-                        &mut self.context,
-                    );
-
-                    // Set the initialized bit.
-                    self.masm.or(
-                        value.into(),
-                        value.into(),
-                        RegImm::i64(FUNCREF_INIT_BIT as i64),
-                        ptr_type.into(),
-                    );
-
-                    self.masm.store_ptr(value.into(), elem_addr);
-
-                    self.context.free_reg(value);
-                    self.context.free_reg(index);
-                    self.context.free_reg(base);
-                }
-            },
-            ty => unimplemented!("Support for WasmHeapType: {ty}"),
-        };
-    }
-
-    fn visit_elem_drop(&mut self, index: u32) {
-        let ptr_type = self.env.ptr_type();
-        let elem_drop = self.context.builtins.elem_drop::<M::ABI, M::Ptr>();
-        let vmctx = TypedReg::new(ptr_type, <M::ABI as ABI>::vmctx_reg());
-        self.context
-            .stack
-            .extend([vmctx.into(), index.try_into().unwrap()]);
-        FnCall::emit::<M, M::Ptr, _>(self.masm, &mut self.context, |_| {
-            Callee::Builtin(elem_drop.clone())
-        });
+        self.emit_call(FuncIndex::from_u32(index));
     }
 
     fn visit_nop(&mut self) {}
@@ -1165,15 +671,15 @@ where
         let frame = &mut self.control_frames[index];
         frame.set_as_target();
         let result = frame.as_target_result();
-        let top = self.context.maybe_without1::<TypedReg, M, _>(
-            result.result_reg(),
-            self.masm,
-            |ctx, masm| ctx.pop_to_reg(masm, None),
-        );
+        let top =
+            self.context
+                .without::<TypedReg, M, _>(result.result_reg(), self.masm, |ctx, masm| {
+                    ctx.pop_to_reg(masm, None)
+                });
         self.context.pop_abi_results(&result, self.masm);
         self.context.push_abi_results(&result, self.masm);
         self.masm.branch(
-            IntCmpKind::Ne,
+            CmpKind::Ne,
             top.reg.into(),
             top.reg.into(),
             *frame.label(),
@@ -1192,7 +698,7 @@ where
 
         let default_index = control_index(targets.default(), self.control_frames.len());
         let default_result = self.control_frames[default_index].as_target_result();
-        let (index, tmp) = self.context.maybe_without1::<(TypedReg, _), M, _>(
+        let (index, tmp) = self.context.without::<(TypedReg, _), M, _>(
             default_result.result_reg(),
             self.masm,
             |cx, masm| (cx.pop_to_reg(masm, None), cx.any_gpr(masm)),
@@ -1247,8 +753,7 @@ where
     }
 
     fn visit_local_tee(&mut self, index: u32) {
-        let (ty, slot) = self.context.frame.get_local_address(index, self.masm);
-        let typed_reg = self.emit_set_local(slot, ty.into());
+        let typed_reg = self.context.set_local(self.masm, index);
         self.context.stack.push(typed_reg.into());
     }
 
@@ -1291,7 +796,7 @@ where
         // Conditionally move val1 to val2 if the the comparision is
         // not zero.
         self.masm
-            .cmov(val1.into(), val2.into(), IntCmpKind::Ne, val1.ty.into());
+            .cmov(val1.into(), val2.into(), CmpKind::Ne, val1.ty.into());
         self.context.stack.push(val2.into());
         self.context.free_reg(val1.reg);
         self.context.free_reg(cond);
@@ -1300,17 +805,17 @@ where
     wasmparser::for_each_operator!(def_unsupported);
 }
 
-impl<'a, 'b, 'c, M> CodeGen<'a, 'b, 'c, M>
+impl<'a, M> CodeGen<'a, M>
 where
     M: MacroAssembler,
 {
-    fn cmp_i32s(&mut self, kind: IntCmpKind) {
+    fn cmp_i32s(&mut self, kind: CmpKind) {
         self.context.i32_binop(self.masm, |masm, dst, src, size| {
             masm.cmp_with_set(src, dst, kind, size);
         });
     }
 
-    fn cmp_i64s(&mut self, kind: IntCmpKind) {
+    fn cmp_i64s(&mut self, kind: CmpKind) {
         self.context
             .i64_binop(self.masm, move |masm, dst, src, size| {
                 masm.cmp_with_set(src, dst, kind, size);
@@ -1323,17 +828,7 @@ impl From<WasmType> for OperandSize {
         match ty {
             WasmType::I32 | WasmType::F32 => OperandSize::S32,
             WasmType::I64 | WasmType::F64 => OperandSize::S64,
-            WasmType::Ref(rt) => {
-                match rt.heap_type {
-                    // TODO: Harcoded size, assuming 64-bit support only. Once
-                    // Wasmtime supports 32-bit architectures, this will need
-                    // to be updated in such a way that the calculation of the
-                    // OperandSize will depend on the target's  pointer size.
-                    WasmHeapType::Func => OperandSize::S64,
-                    t => unimplemented!("Support for WasmHeapType: {t}"),
-                }
-            }
-            ty => unimplemented!("Support for WasmType {ty}"),
+            ty => todo!("unsupported type {:?}", ty),
         }
     }
 }
diff --git a/winch/filetests/filetests/x64/call_indirect/call_indirect.wat b/winch/filetests/filetests/x64/call_indirect/call_indirect.wat
deleted file mode 100644
index 68b768a633a4..000000000000
--- a/winch/filetests/filetests/x64/call_indirect/call_indirect.wat
+++ /dev/null
@@ -1,143 +0,0 @@
-;;! target="x86_64"
-
-(module
-  (type $over-i32 (func (param i32) (result i32)))
-
-  (table funcref
-    (elem
-      $fib-i32
-    )
-  )
-  
-  (func $fib-i32 (export "fib-i32") (type $over-i32)
-    (if (result i32) (i32.le_u (local.get 0) (i32.const 1))
-      (then (i32.const 1))
-      (else
-        (i32.add
-          (call_indirect (type $over-i32)
-            (i32.sub (local.get 0) (i32.const 2))
-            (i32.const 0)
-          )
-          (call_indirect (type $over-i32)
-            (i32.sub (local.get 0) (i32.const 1))
-            (i32.const 0)
-          )
-        )
-      )
-    )
-  )
-)
-
-
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 897c240c             	mov	dword ptr [rsp + 0xc], edi
-;;    c:	 4c89742404           	mov	qword ptr [rsp + 4], r14
-;;   11:	 8b44240c             	mov	eax, dword ptr [rsp + 0xc]
-;;   15:	 83f801               	cmp	eax, 1
-;;   18:	 b800000000           	mov	eax, 0
-;;   1d:	 400f96c0             	setbe	al
-;;   21:	 85c0                 	test	eax, eax
-;;   23:	 0f840a000000         	je	0x33
-;;   29:	 b801000000           	mov	eax, 1
-;;   2e:	 e92e010000           	jmp	0x161
-;;   33:	 8b44240c             	mov	eax, dword ptr [rsp + 0xc]
-;;   37:	 83e802               	sub	eax, 2
-;;   3a:	 50                   	push	rax
-;;   3b:	 b900000000           	mov	ecx, 0
-;;   40:	 4c89f2               	mov	rdx, r14
-;;   43:	 8b5a50               	mov	ebx, dword ptr [rdx + 0x50]
-;;   46:	 39d9                 	cmp	ecx, ebx
-;;   48:	 0f8319010000         	jae	0x167
-;;   4e:	 4189cb               	mov	r11d, ecx
-;;   51:	 4d6bdb08             	imul	r11, r11, 8
-;;   55:	 488b5248             	mov	rdx, qword ptr [rdx + 0x48]
-;;   59:	 4889d6               	mov	rsi, rdx
-;;   5c:	 4c01da               	add	rdx, r11
-;;   5f:	 39d9                 	cmp	ecx, ebx
-;;   61:	 480f43d6             	cmovae	rdx, rsi
-;;   65:	 488b02               	mov	rax, qword ptr [rdx]
-;;   68:	 4885c0               	test	rax, rax
-;;   6b:	 0f8528000000         	jne	0x99
-;;   71:	 4d8b5e38             	mov	r11, qword ptr [r14 + 0x38]
-;;   75:	 498b5b48             	mov	rbx, qword ptr [r11 + 0x48]
-;;   79:	 4156                 	push	r14
-;;   7b:	 51                   	push	rcx
-;;   7c:	 4883ec08             	sub	rsp, 8
-;;   80:	 488b7c2410           	mov	rdi, qword ptr [rsp + 0x10]
-;;   85:	 be00000000           	mov	esi, 0
-;;   8a:	 8b542408             	mov	edx, dword ptr [rsp + 8]
-;;   8e:	 ffd3                 	call	rbx
-;;   90:	 4883c418             	add	rsp, 0x18
-;;   94:	 e904000000           	jmp	0x9d
-;;   99:	 4883e0fe             	and	rax, 0xfffffffffffffffe
-;;   9d:	 4885c0               	test	rax, rax
-;;   a0:	 0f84c3000000         	je	0x169
-;;   a6:	 4d8b5e40             	mov	r11, qword ptr [r14 + 0x40]
-;;   aa:	 418b0b               	mov	ecx, dword ptr [r11]
-;;   ad:	 8b5018               	mov	edx, dword ptr [rax + 0x18]
-;;   b0:	 39d1                 	cmp	ecx, edx
-;;   b2:	 0f85b3000000         	jne	0x16b
-;;   b8:	 50                   	push	rax
-;;   b9:	 59                   	pop	rcx
-;;   ba:	 488b5110             	mov	rdx, qword ptr [rcx + 0x10]
-;;   be:	 4883ec08             	sub	rsp, 8
-;;   c2:	 8b7c2408             	mov	edi, dword ptr [rsp + 8]
-;;   c6:	 ffd2                 	call	rdx
-;;   c8:	 4883c410             	add	rsp, 0x10
-;;   cc:	 8b4c240c             	mov	ecx, dword ptr [rsp + 0xc]
-;;   d0:	 83e901               	sub	ecx, 1
-;;   d3:	 50                   	push	rax
-;;   d4:	 51                   	push	rcx
-;;   d5:	 b900000000           	mov	ecx, 0
-;;   da:	 4c89f2               	mov	rdx, r14
-;;   dd:	 8b5a50               	mov	ebx, dword ptr [rdx + 0x50]
-;;   e0:	 39d9                 	cmp	ecx, ebx
-;;   e2:	 0f8385000000         	jae	0x16d
-;;   e8:	 4189cb               	mov	r11d, ecx
-;;   eb:	 4d6bdb08             	imul	r11, r11, 8
-;;   ef:	 488b5248             	mov	rdx, qword ptr [rdx + 0x48]
-;;   f3:	 4889d6               	mov	rsi, rdx
-;;   f6:	 4c01da               	add	rdx, r11
-;;   f9:	 39d9                 	cmp	ecx, ebx
-;;   fb:	 480f43d6             	cmovae	rdx, rsi
-;;   ff:	 488b02               	mov	rax, qword ptr [rdx]
-;;  102:	 4885c0               	test	rax, rax
-;;  105:	 0f8523000000         	jne	0x12e
-;;  10b:	 4d8b5e38             	mov	r11, qword ptr [r14 + 0x38]
-;;  10f:	 498b5b48             	mov	rbx, qword ptr [r11 + 0x48]
-;;  113:	 4156                 	push	r14
-;;  115:	 51                   	push	rcx
-;;  116:	 488b7c2408           	mov	rdi, qword ptr [rsp + 8]
-;;  11b:	 be00000000           	mov	esi, 0
-;;  120:	 8b1424               	mov	edx, dword ptr [rsp]
-;;  123:	 ffd3                 	call	rbx
-;;  125:	 4883c410             	add	rsp, 0x10
-;;  129:	 e904000000           	jmp	0x132
-;;  12e:	 4883e0fe             	and	rax, 0xfffffffffffffffe
-;;  132:	 4885c0               	test	rax, rax
-;;  135:	 0f8434000000         	je	0x16f
-;;  13b:	 4d8b5e40             	mov	r11, qword ptr [r14 + 0x40]
-;;  13f:	 418b0b               	mov	ecx, dword ptr [r11]
-;;  142:	 8b5018               	mov	edx, dword ptr [rax + 0x18]
-;;  145:	 39d1                 	cmp	ecx, edx
-;;  147:	 0f8524000000         	jne	0x171
-;;  14d:	 50                   	push	rax
-;;  14e:	 59                   	pop	rcx
-;;  14f:	 488b5110             	mov	rdx, qword ptr [rcx + 0x10]
-;;  153:	 8b3c24               	mov	edi, dword ptr [rsp]
-;;  156:	 ffd2                 	call	rdx
-;;  158:	 4883c408             	add	rsp, 8
-;;  15c:	 59                   	pop	rcx
-;;  15d:	 01c1                 	add	ecx, eax
-;;  15f:	 89c8                 	mov	eax, ecx
-;;  161:	 4883c410             	add	rsp, 0x10
-;;  165:	 5d                   	pop	rbp
-;;  166:	 c3                   	ret	
-;;  167:	 0f0b                 	ud2	
-;;  169:	 0f0b                 	ud2	
-;;  16b:	 0f0b                 	ud2	
-;;  16d:	 0f0b                 	ud2	
-;;  16f:	 0f0b                 	ud2	
-;;  171:	 0f0b                 	ud2	
diff --git a/winch/filetests/filetests/x64/f32_add/const.wat b/winch/filetests/filetests/x64/f32_add/const.wat
deleted file mode 100644
index 866494e07946..000000000000
--- a/winch/filetests/filetests/x64/f32_add/const.wat
+++ /dev/null
@@ -1,29 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f32)
-        (f32.const 1.1)
-        (f32.const 2.2)
-        (f32.add)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f30f10051c000000     	movss	xmm0, dword ptr [rip + 0x1c]
-;;   14:	 f30f100d1c000000     	movss	xmm1, dword ptr [rip + 0x1c]
-;;   1c:	 f30f58c8             	addss	xmm1, xmm0
-;;   20:	 0f28c1               	movaps	xmm0, xmm1
-;;   23:	 4883c408             	add	rsp, 8
-;;   27:	 5d                   	pop	rbp
-;;   28:	 c3                   	ret	
-;;   29:	 0000                 	add	byte ptr [rax], al
-;;   2b:	 0000                 	add	byte ptr [rax], al
-;;   2d:	 0000                 	add	byte ptr [rax], al
-;;   2f:	 00cd                 	add	ch, cl
-;;   31:	 cc                   	int3	
-;;   32:	 0c40                 	or	al, 0x40
-;;   34:	 0000                 	add	byte ptr [rax], al
-;;   36:	 0000                 	add	byte ptr [rax], al
-;;   38:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_add/locals.wat b/winch/filetests/filetests/x64/f32_add/locals.wat
deleted file mode 100644
index ff1aeb1b478f..000000000000
--- a/winch/filetests/filetests/x64/f32_add/locals.wat
+++ /dev/null
@@ -1,39 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f32)
-        (local $foo f32)  
-        (local $bar f32)
-
-        (f32.const 1.1)
-        (local.set $foo)
-
-        (f32.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f32.add
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 48c744240800000000   	
-;; 				mov	qword ptr [rsp + 8], 0
-;;   11:	 4c893424             	mov	qword ptr [rsp], r14
-;;   15:	 f30f100533000000     	movss	xmm0, dword ptr [rip + 0x33]
-;;   1d:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;   23:	 f30f10052d000000     	movss	xmm0, dword ptr [rip + 0x2d]
-;;   2b:	 f30f11442408         	movss	dword ptr [rsp + 8], xmm0
-;;   31:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   37:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   3d:	 f30f58c8             	addss	xmm1, xmm0
-;;   41:	 0f28c1               	movaps	xmm0, xmm1
-;;   44:	 4883c410             	add	rsp, 0x10
-;;   48:	 5d                   	pop	rbp
-;;   49:	 c3                   	ret	
-;;   4a:	 0000                 	add	byte ptr [rax], al
-;;   4c:	 0000                 	add	byte ptr [rax], al
-;;   4e:	 0000                 	add	byte ptr [rax], al
-;;   50:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_add/params.wat b/winch/filetests/filetests/x64/f32_add/params.wat
deleted file mode 100644
index d5606c63f908..000000000000
--- a/winch/filetests/filetests/x64/f32_add/params.wat
+++ /dev/null
@@ -1,22 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f32) (param f32) (result f32)
-        (local.get 0)
-        (local.get 1)
-        (f32.add)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;    e:	 f30f114c2408         	movss	dword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   1e:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   24:	 f30f58c8             	addss	xmm1, xmm0
-;;   28:	 0f28c1               	movaps	xmm0, xmm1
-;;   2b:	 4883c410             	add	rsp, 0x10
-;;   2f:	 5d                   	pop	rbp
-;;   30:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f32_ceil/f32_ceil_param.wat b/winch/filetests/filetests/x64/f32_ceil/f32_ceil_param.wat
deleted file mode 100644
index ddc23ace0472..000000000000
--- a/winch/filetests/filetests/x64/f32_ceil/f32_ceil_param.wat
+++ /dev/null
@@ -1,18 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f32) (result f32)
-        (local.get 0)
-        (f32.ceil)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;    e:	 4c89742404           	mov	qword ptr [rsp + 4], r14
-;;   13:	 f30f1044240c         	movss	xmm0, dword ptr [rsp + 0xc]
-;;   19:	 e800000000           	call	0x1e
-;;   1e:	 4883c410             	add	rsp, 0x10
-;;   22:	 5d                   	pop	rbp
-;;   23:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f32_copysign/const.wat b/winch/filetests/filetests/x64/f32_copysign/const.wat
deleted file mode 100644
index 987b0cd5587e..000000000000
--- a/winch/filetests/filetests/x64/f32_copysign/const.wat
+++ /dev/null
@@ -1,31 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f32)
-        (f32.const -1.1)
-        (f32.const 2.2)
-        (f32.copysign)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f30f10052c000000     	movss	xmm0, dword ptr [rip + 0x2c]
-;;   14:	 f30f100d2c000000     	movss	xmm1, dword ptr [rip + 0x2c]
-;;   1c:	 41bb00000080         	mov	r11d, 0x80000000
-;;   22:	 66450f6efb           	movd	xmm15, r11d
-;;   27:	 410f54c7             	andps	xmm0, xmm15
-;;   2b:	 440f55f9             	andnps	xmm15, xmm1
-;;   2f:	 410f28cf             	movaps	xmm1, xmm15
-;;   33:	 0f56c8               	orps	xmm1, xmm0
-;;   36:	 0f28c1               	movaps	xmm0, xmm1
-;;   39:	 4883c408             	add	rsp, 8
-;;   3d:	 5d                   	pop	rbp
-;;   3e:	 c3                   	ret	
-;;   3f:	 00cd                 	add	ch, cl
-;;   41:	 cc                   	int3	
-;;   42:	 0c40                 	or	al, 0x40
-;;   44:	 0000                 	add	byte ptr [rax], al
-;;   46:	 0000                 	add	byte ptr [rax], al
-;;   48:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_copysign/locals.wat b/winch/filetests/filetests/x64/f32_copysign/locals.wat
deleted file mode 100644
index a99433315bad..000000000000
--- a/winch/filetests/filetests/x64/f32_copysign/locals.wat
+++ /dev/null
@@ -1,41 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f32)
-        (local $foo f32)  
-        (local $bar f32)
-
-        (f32.const -1.1)
-        (local.set $foo)
-
-        (f32.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f32.copysign
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 48c744240800000000   	
-;; 				mov	qword ptr [rsp + 8], 0
-;;   11:	 4c893424             	mov	qword ptr [rsp], r14
-;;   15:	 f30f100543000000     	movss	xmm0, dword ptr [rip + 0x43]
-;;   1d:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;   23:	 f30f10053d000000     	movss	xmm0, dword ptr [rip + 0x3d]
-;;   2b:	 f30f11442408         	movss	dword ptr [rsp + 8], xmm0
-;;   31:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   37:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   3d:	 41bb00000080         	mov	r11d, 0x80000000
-;;   43:	 66450f6efb           	movd	xmm15, r11d
-;;   48:	 410f54c7             	andps	xmm0, xmm15
-;;   4c:	 440f55f9             	andnps	xmm15, xmm1
-;;   50:	 410f28cf             	movaps	xmm1, xmm15
-;;   54:	 0f56c8               	orps	xmm1, xmm0
-;;   57:	 0f28c1               	movaps	xmm0, xmm1
-;;   5a:	 4883c410             	add	rsp, 0x10
-;;   5e:	 5d                   	pop	rbp
-;;   5f:	 c3                   	ret	
-;;   60:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_copysign/params.wat b/winch/filetests/filetests/x64/f32_copysign/params.wat
deleted file mode 100644
index 2413e64edd3f..000000000000
--- a/winch/filetests/filetests/x64/f32_copysign/params.wat
+++ /dev/null
@@ -1,27 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f32) (param f32) (result f32)
-        (local.get 0)
-        (local.get 1)
-        (f32.copysign)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;    e:	 f30f114c2408         	movss	dword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   1e:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   24:	 41bb00000080         	mov	r11d, 0x80000000
-;;   2a:	 66450f6efb           	movd	xmm15, r11d
-;;   2f:	 410f54c7             	andps	xmm0, xmm15
-;;   33:	 440f55f9             	andnps	xmm15, xmm1
-;;   37:	 410f28cf             	movaps	xmm1, xmm15
-;;   3b:	 0f56c8               	orps	xmm1, xmm0
-;;   3e:	 0f28c1               	movaps	xmm0, xmm1
-;;   41:	 4883c410             	add	rsp, 0x10
-;;   45:	 5d                   	pop	rbp
-;;   46:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f32_div/const.wat b/winch/filetests/filetests/x64/f32_div/const.wat
deleted file mode 100644
index 08bc25e3c7b1..000000000000
--- a/winch/filetests/filetests/x64/f32_div/const.wat
+++ /dev/null
@@ -1,29 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f32)
-        (f32.const 1.1)
-        (f32.const 2.2)
-        (f32.div)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f30f10051c000000     	movss	xmm0, dword ptr [rip + 0x1c]
-;;   14:	 f30f100d1c000000     	movss	xmm1, dword ptr [rip + 0x1c]
-;;   1c:	 f30f5ec8             	divss	xmm1, xmm0
-;;   20:	 0f28c1               	movaps	xmm0, xmm1
-;;   23:	 4883c408             	add	rsp, 8
-;;   27:	 5d                   	pop	rbp
-;;   28:	 c3                   	ret	
-;;   29:	 0000                 	add	byte ptr [rax], al
-;;   2b:	 0000                 	add	byte ptr [rax], al
-;;   2d:	 0000                 	add	byte ptr [rax], al
-;;   2f:	 00cd                 	add	ch, cl
-;;   31:	 cc                   	int3	
-;;   32:	 0c40                 	or	al, 0x40
-;;   34:	 0000                 	add	byte ptr [rax], al
-;;   36:	 0000                 	add	byte ptr [rax], al
-;;   38:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_div/locals.wat b/winch/filetests/filetests/x64/f32_div/locals.wat
deleted file mode 100644
index bbae5c9e8760..000000000000
--- a/winch/filetests/filetests/x64/f32_div/locals.wat
+++ /dev/null
@@ -1,39 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f32)
-        (local $foo f32)  
-        (local $bar f32)
-
-        (f32.const 1.1)
-        (local.set $foo)
-
-        (f32.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f32.div
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 48c744240800000000   	
-;; 				mov	qword ptr [rsp + 8], 0
-;;   11:	 4c893424             	mov	qword ptr [rsp], r14
-;;   15:	 f30f100533000000     	movss	xmm0, dword ptr [rip + 0x33]
-;;   1d:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;   23:	 f30f10052d000000     	movss	xmm0, dword ptr [rip + 0x2d]
-;;   2b:	 f30f11442408         	movss	dword ptr [rsp + 8], xmm0
-;;   31:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   37:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   3d:	 f30f5ec8             	divss	xmm1, xmm0
-;;   41:	 0f28c1               	movaps	xmm0, xmm1
-;;   44:	 4883c410             	add	rsp, 0x10
-;;   48:	 5d                   	pop	rbp
-;;   49:	 c3                   	ret	
-;;   4a:	 0000                 	add	byte ptr [rax], al
-;;   4c:	 0000                 	add	byte ptr [rax], al
-;;   4e:	 0000                 	add	byte ptr [rax], al
-;;   50:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_div/params.wat b/winch/filetests/filetests/x64/f32_div/params.wat
deleted file mode 100644
index 0789fdbbc5ce..000000000000
--- a/winch/filetests/filetests/x64/f32_div/params.wat
+++ /dev/null
@@ -1,22 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f32) (param f32) (result f32)
-        (local.get 0)
-        (local.get 1)
-        (f32.div)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;    e:	 f30f114c2408         	movss	dword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   1e:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   24:	 f30f5ec8             	divss	xmm1, xmm0
-;;   28:	 0f28c1               	movaps	xmm0, xmm1
-;;   2b:	 4883c410             	add	rsp, 0x10
-;;   2f:	 5d                   	pop	rbp
-;;   30:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f32_eq/const.wat b/winch/filetests/filetests/x64/f32_eq/const.wat
deleted file mode 100644
index a43c065bf2a2..000000000000
--- a/winch/filetests/filetests/x64/f32_eq/const.wat
+++ /dev/null
@@ -1,32 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (f32.const 1.1)
-        (f32.const 2.2)
-        (f32.eq)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f30f10052c000000     	movss	xmm0, dword ptr [rip + 0x2c]
-;;   14:	 f30f100d2c000000     	movss	xmm1, dword ptr [rip + 0x2c]
-;;   1c:	 0f2ec8               	ucomiss	xmm1, xmm0
-;;   1f:	 b800000000           	mov	eax, 0
-;;   24:	 400f94c0             	sete	al
-;;   28:	 41bb00000000         	mov	r11d, 0
-;;   2e:	 410f9bc3             	setnp	r11b
-;;   32:	 4421d8               	and	eax, r11d
-;;   35:	 4883c408             	add	rsp, 8
-;;   39:	 5d                   	pop	rbp
-;;   3a:	 c3                   	ret	
-;;   3b:	 0000                 	add	byte ptr [rax], al
-;;   3d:	 0000                 	add	byte ptr [rax], al
-;;   3f:	 00cd                 	add	ch, cl
-;;   41:	 cc                   	int3	
-;;   42:	 0c40                 	or	al, 0x40
-;;   44:	 0000                 	add	byte ptr [rax], al
-;;   46:	 0000                 	add	byte ptr [rax], al
-;;   48:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_eq/locals.wat b/winch/filetests/filetests/x64/f32_eq/locals.wat
deleted file mode 100644
index 8a35395b7839..000000000000
--- a/winch/filetests/filetests/x64/f32_eq/locals.wat
+++ /dev/null
@@ -1,42 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (local $foo f32)  
-        (local $bar f32)
-
-        (f32.const 1.1)
-        (local.set $foo)
-
-        (f32.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f32.eq
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 48c744240800000000   	
-;; 				mov	qword ptr [rsp + 8], 0
-;;   11:	 4c893424             	mov	qword ptr [rsp], r14
-;;   15:	 f30f100543000000     	movss	xmm0, dword ptr [rip + 0x43]
-;;   1d:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;   23:	 f30f10053d000000     	movss	xmm0, dword ptr [rip + 0x3d]
-;;   2b:	 f30f11442408         	movss	dword ptr [rsp + 8], xmm0
-;;   31:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   37:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   3d:	 0f2ec8               	ucomiss	xmm1, xmm0
-;;   40:	 b800000000           	mov	eax, 0
-;;   45:	 400f94c0             	sete	al
-;;   49:	 41bb00000000         	mov	r11d, 0
-;;   4f:	 410f9bc3             	setnp	r11b
-;;   53:	 4421d8               	and	eax, r11d
-;;   56:	 4883c410             	add	rsp, 0x10
-;;   5a:	 5d                   	pop	rbp
-;;   5b:	 c3                   	ret	
-;;   5c:	 0000                 	add	byte ptr [rax], al
-;;   5e:	 0000                 	add	byte ptr [rax], al
-;;   60:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_eq/params.wat b/winch/filetests/filetests/x64/f32_eq/params.wat
deleted file mode 100644
index 2d85d9e1dd3c..000000000000
--- a/winch/filetests/filetests/x64/f32_eq/params.wat
+++ /dev/null
@@ -1,26 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f32) (param f32) (result i32)
-        (local.get 0)
-        (local.get 1)
-        (f32.eq)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;    e:	 f30f114c2408         	movss	dword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   1e:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   24:	 0f2ec8               	ucomiss	xmm1, xmm0
-;;   27:	 b800000000           	mov	eax, 0
-;;   2c:	 400f94c0             	sete	al
-;;   30:	 41bb00000000         	mov	r11d, 0
-;;   36:	 410f9bc3             	setnp	r11b
-;;   3a:	 4421d8               	and	eax, r11d
-;;   3d:	 4883c410             	add	rsp, 0x10
-;;   41:	 5d                   	pop	rbp
-;;   42:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f32_floor/f32_floor_param.wat b/winch/filetests/filetests/x64/f32_floor/f32_floor_param.wat
deleted file mode 100644
index 905d073e5a0d..000000000000
--- a/winch/filetests/filetests/x64/f32_floor/f32_floor_param.wat
+++ /dev/null
@@ -1,18 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f32) (result f32)
-        (local.get 0)
-        (f32.floor)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;    e:	 4c89742404           	mov	qword ptr [rsp + 4], r14
-;;   13:	 f30f1044240c         	movss	xmm0, dword ptr [rsp + 0xc]
-;;   19:	 e800000000           	call	0x1e
-;;   1e:	 4883c410             	add	rsp, 0x10
-;;   22:	 5d                   	pop	rbp
-;;   23:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f32_ge/const.wat b/winch/filetests/filetests/x64/f32_ge/const.wat
deleted file mode 100644
index 6e5b09082dbf..000000000000
--- a/winch/filetests/filetests/x64/f32_ge/const.wat
+++ /dev/null
@@ -1,32 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (f32.const 1.1)
-        (f32.const 2.2)
-        (f32.ge)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f30f10052c000000     	movss	xmm0, dword ptr [rip + 0x2c]
-;;   14:	 f30f100d2c000000     	movss	xmm1, dword ptr [rip + 0x2c]
-;;   1c:	 0f2ec8               	ucomiss	xmm1, xmm0
-;;   1f:	 b800000000           	mov	eax, 0
-;;   24:	 400f93c0             	setae	al
-;;   28:	 41bb00000000         	mov	r11d, 0
-;;   2e:	 410f9bc3             	setnp	r11b
-;;   32:	 4421d8               	and	eax, r11d
-;;   35:	 4883c408             	add	rsp, 8
-;;   39:	 5d                   	pop	rbp
-;;   3a:	 c3                   	ret	
-;;   3b:	 0000                 	add	byte ptr [rax], al
-;;   3d:	 0000                 	add	byte ptr [rax], al
-;;   3f:	 00cd                 	add	ch, cl
-;;   41:	 cc                   	int3	
-;;   42:	 0c40                 	or	al, 0x40
-;;   44:	 0000                 	add	byte ptr [rax], al
-;;   46:	 0000                 	add	byte ptr [rax], al
-;;   48:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_ge/locals.wat b/winch/filetests/filetests/x64/f32_ge/locals.wat
deleted file mode 100644
index 951a9cdf7cf9..000000000000
--- a/winch/filetests/filetests/x64/f32_ge/locals.wat
+++ /dev/null
@@ -1,42 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (local $foo f32)  
-        (local $bar f32)
-
-        (f32.const 1.1)
-        (local.set $foo)
-
-        (f32.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f32.ge
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 48c744240800000000   	
-;; 				mov	qword ptr [rsp + 8], 0
-;;   11:	 4c893424             	mov	qword ptr [rsp], r14
-;;   15:	 f30f100543000000     	movss	xmm0, dword ptr [rip + 0x43]
-;;   1d:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;   23:	 f30f10053d000000     	movss	xmm0, dword ptr [rip + 0x3d]
-;;   2b:	 f30f11442408         	movss	dword ptr [rsp + 8], xmm0
-;;   31:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   37:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   3d:	 0f2ec8               	ucomiss	xmm1, xmm0
-;;   40:	 b800000000           	mov	eax, 0
-;;   45:	 400f93c0             	setae	al
-;;   49:	 41bb00000000         	mov	r11d, 0
-;;   4f:	 410f9bc3             	setnp	r11b
-;;   53:	 4421d8               	and	eax, r11d
-;;   56:	 4883c410             	add	rsp, 0x10
-;;   5a:	 5d                   	pop	rbp
-;;   5b:	 c3                   	ret	
-;;   5c:	 0000                 	add	byte ptr [rax], al
-;;   5e:	 0000                 	add	byte ptr [rax], al
-;;   60:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_ge/params.wat b/winch/filetests/filetests/x64/f32_ge/params.wat
deleted file mode 100644
index 41aca2be5330..000000000000
--- a/winch/filetests/filetests/x64/f32_ge/params.wat
+++ /dev/null
@@ -1,26 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f32) (param f32) (result i32)
-        (local.get 0)
-        (local.get 1)
-        (f32.ge)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;    e:	 f30f114c2408         	movss	dword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   1e:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   24:	 0f2ec8               	ucomiss	xmm1, xmm0
-;;   27:	 b800000000           	mov	eax, 0
-;;   2c:	 400f93c0             	setae	al
-;;   30:	 41bb00000000         	mov	r11d, 0
-;;   36:	 410f9bc3             	setnp	r11b
-;;   3a:	 4421d8               	and	eax, r11d
-;;   3d:	 4883c410             	add	rsp, 0x10
-;;   41:	 5d                   	pop	rbp
-;;   42:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f32_gt/const.wat b/winch/filetests/filetests/x64/f32_gt/const.wat
deleted file mode 100644
index 58bf08f16f8f..000000000000
--- a/winch/filetests/filetests/x64/f32_gt/const.wat
+++ /dev/null
@@ -1,32 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (f32.const 1.1)
-        (f32.const 2.2)
-        (f32.gt)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f30f10052c000000     	movss	xmm0, dword ptr [rip + 0x2c]
-;;   14:	 f30f100d2c000000     	movss	xmm1, dword ptr [rip + 0x2c]
-;;   1c:	 0f2ec8               	ucomiss	xmm1, xmm0
-;;   1f:	 b800000000           	mov	eax, 0
-;;   24:	 400f97c0             	seta	al
-;;   28:	 41bb00000000         	mov	r11d, 0
-;;   2e:	 410f9bc3             	setnp	r11b
-;;   32:	 4421d8               	and	eax, r11d
-;;   35:	 4883c408             	add	rsp, 8
-;;   39:	 5d                   	pop	rbp
-;;   3a:	 c3                   	ret	
-;;   3b:	 0000                 	add	byte ptr [rax], al
-;;   3d:	 0000                 	add	byte ptr [rax], al
-;;   3f:	 00cd                 	add	ch, cl
-;;   41:	 cc                   	int3	
-;;   42:	 0c40                 	or	al, 0x40
-;;   44:	 0000                 	add	byte ptr [rax], al
-;;   46:	 0000                 	add	byte ptr [rax], al
-;;   48:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_gt/locals.wat b/winch/filetests/filetests/x64/f32_gt/locals.wat
deleted file mode 100644
index 6481f5d7231b..000000000000
--- a/winch/filetests/filetests/x64/f32_gt/locals.wat
+++ /dev/null
@@ -1,42 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (local $foo f32)  
-        (local $bar f32)
-
-        (f32.const 1.1)
-        (local.set $foo)
-
-        (f32.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f32.gt
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 48c744240800000000   	
-;; 				mov	qword ptr [rsp + 8], 0
-;;   11:	 4c893424             	mov	qword ptr [rsp], r14
-;;   15:	 f30f100543000000     	movss	xmm0, dword ptr [rip + 0x43]
-;;   1d:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;   23:	 f30f10053d000000     	movss	xmm0, dword ptr [rip + 0x3d]
-;;   2b:	 f30f11442408         	movss	dword ptr [rsp + 8], xmm0
-;;   31:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   37:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   3d:	 0f2ec8               	ucomiss	xmm1, xmm0
-;;   40:	 b800000000           	mov	eax, 0
-;;   45:	 400f97c0             	seta	al
-;;   49:	 41bb00000000         	mov	r11d, 0
-;;   4f:	 410f9bc3             	setnp	r11b
-;;   53:	 4421d8               	and	eax, r11d
-;;   56:	 4883c410             	add	rsp, 0x10
-;;   5a:	 5d                   	pop	rbp
-;;   5b:	 c3                   	ret	
-;;   5c:	 0000                 	add	byte ptr [rax], al
-;;   5e:	 0000                 	add	byte ptr [rax], al
-;;   60:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_gt/params.wat b/winch/filetests/filetests/x64/f32_gt/params.wat
deleted file mode 100644
index 2286a7b567c6..000000000000
--- a/winch/filetests/filetests/x64/f32_gt/params.wat
+++ /dev/null
@@ -1,26 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f32) (param f32) (result i32)
-        (local.get 0)
-        (local.get 1)
-        (f32.gt)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;    e:	 f30f114c2408         	movss	dword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   1e:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   24:	 0f2ec8               	ucomiss	xmm1, xmm0
-;;   27:	 b800000000           	mov	eax, 0
-;;   2c:	 400f97c0             	seta	al
-;;   30:	 41bb00000000         	mov	r11d, 0
-;;   36:	 410f9bc3             	setnp	r11b
-;;   3a:	 4421d8               	and	eax, r11d
-;;   3d:	 4883c410             	add	rsp, 0x10
-;;   41:	 5d                   	pop	rbp
-;;   42:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f32_le/const.wat b/winch/filetests/filetests/x64/f32_le/const.wat
deleted file mode 100644
index a75a82d72299..000000000000
--- a/winch/filetests/filetests/x64/f32_le/const.wat
+++ /dev/null
@@ -1,27 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (f32.const 1.1)
-        (f32.const 2.2)
-        (f32.le)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f30f10051c000000     	movss	xmm0, dword ptr [rip + 0x1c]
-;;   14:	 f30f100d1c000000     	movss	xmm1, dword ptr [rip + 0x1c]
-;;   1c:	 0f2ec1               	ucomiss	xmm0, xmm1
-;;   1f:	 b800000000           	mov	eax, 0
-;;   24:	 400f93c0             	setae	al
-;;   28:	 4883c408             	add	rsp, 8
-;;   2c:	 5d                   	pop	rbp
-;;   2d:	 c3                   	ret	
-;;   2e:	 0000                 	add	byte ptr [rax], al
-;;   30:	 cdcc                 	int	0xcc
-;;   32:	 0c40                 	or	al, 0x40
-;;   34:	 0000                 	add	byte ptr [rax], al
-;;   36:	 0000                 	add	byte ptr [rax], al
-;;   38:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_le/locals.wat b/winch/filetests/filetests/x64/f32_le/locals.wat
deleted file mode 100644
index 98a21193726f..000000000000
--- a/winch/filetests/filetests/x64/f32_le/locals.wat
+++ /dev/null
@@ -1,38 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (local $foo f32)  
-        (local $bar f32)
-
-        (f32.const 1.1)
-        (local.set $foo)
-
-        (f32.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f32.le
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 48c744240800000000   	
-;; 				mov	qword ptr [rsp + 8], 0
-;;   11:	 4c893424             	mov	qword ptr [rsp], r14
-;;   15:	 f30f100533000000     	movss	xmm0, dword ptr [rip + 0x33]
-;;   1d:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;   23:	 f30f10052d000000     	movss	xmm0, dword ptr [rip + 0x2d]
-;;   2b:	 f30f11442408         	movss	dword ptr [rsp + 8], xmm0
-;;   31:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   37:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   3d:	 0f2ec1               	ucomiss	xmm0, xmm1
-;;   40:	 b800000000           	mov	eax, 0
-;;   45:	 400f93c0             	setae	al
-;;   49:	 4883c410             	add	rsp, 0x10
-;;   4d:	 5d                   	pop	rbp
-;;   4e:	 c3                   	ret	
-;;   4f:	 00cd                 	add	ch, cl
-;;   51:	 cc                   	int3	
diff --git a/winch/filetests/filetests/x64/f32_le/params.wat b/winch/filetests/filetests/x64/f32_le/params.wat
deleted file mode 100644
index f7c88c295449..000000000000
--- a/winch/filetests/filetests/x64/f32_le/params.wat
+++ /dev/null
@@ -1,23 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f32) (param f32) (result i32)
-        (local.get 0)
-        (local.get 1)
-        (f32.le)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;    e:	 f30f114c2408         	movss	dword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   1e:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   24:	 0f2ec1               	ucomiss	xmm0, xmm1
-;;   27:	 b800000000           	mov	eax, 0
-;;   2c:	 400f93c0             	setae	al
-;;   30:	 4883c410             	add	rsp, 0x10
-;;   34:	 5d                   	pop	rbp
-;;   35:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f32_lt/const.wat b/winch/filetests/filetests/x64/f32_lt/const.wat
deleted file mode 100644
index d1531ac68914..000000000000
--- a/winch/filetests/filetests/x64/f32_lt/const.wat
+++ /dev/null
@@ -1,27 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (f32.const 1.1)
-        (f32.const 2.2)
-        (f32.lt)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f30f10051c000000     	movss	xmm0, dword ptr [rip + 0x1c]
-;;   14:	 f30f100d1c000000     	movss	xmm1, dword ptr [rip + 0x1c]
-;;   1c:	 0f2ec1               	ucomiss	xmm0, xmm1
-;;   1f:	 b800000000           	mov	eax, 0
-;;   24:	 400f97c0             	seta	al
-;;   28:	 4883c408             	add	rsp, 8
-;;   2c:	 5d                   	pop	rbp
-;;   2d:	 c3                   	ret	
-;;   2e:	 0000                 	add	byte ptr [rax], al
-;;   30:	 cdcc                 	int	0xcc
-;;   32:	 0c40                 	or	al, 0x40
-;;   34:	 0000                 	add	byte ptr [rax], al
-;;   36:	 0000                 	add	byte ptr [rax], al
-;;   38:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_lt/locals.wat b/winch/filetests/filetests/x64/f32_lt/locals.wat
deleted file mode 100644
index 872a9fc1ebaa..000000000000
--- a/winch/filetests/filetests/x64/f32_lt/locals.wat
+++ /dev/null
@@ -1,38 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (local $foo f32)  
-        (local $bar f32)
-
-        (f32.const 1.1)
-        (local.set $foo)
-
-        (f32.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f32.lt
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 48c744240800000000   	
-;; 				mov	qword ptr [rsp + 8], 0
-;;   11:	 4c893424             	mov	qword ptr [rsp], r14
-;;   15:	 f30f100533000000     	movss	xmm0, dword ptr [rip + 0x33]
-;;   1d:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;   23:	 f30f10052d000000     	movss	xmm0, dword ptr [rip + 0x2d]
-;;   2b:	 f30f11442408         	movss	dword ptr [rsp + 8], xmm0
-;;   31:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   37:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   3d:	 0f2ec1               	ucomiss	xmm0, xmm1
-;;   40:	 b800000000           	mov	eax, 0
-;;   45:	 400f97c0             	seta	al
-;;   49:	 4883c410             	add	rsp, 0x10
-;;   4d:	 5d                   	pop	rbp
-;;   4e:	 c3                   	ret	
-;;   4f:	 00cd                 	add	ch, cl
-;;   51:	 cc                   	int3	
diff --git a/winch/filetests/filetests/x64/f32_lt/params.wat b/winch/filetests/filetests/x64/f32_lt/params.wat
deleted file mode 100644
index 32de598fec29..000000000000
--- a/winch/filetests/filetests/x64/f32_lt/params.wat
+++ /dev/null
@@ -1,23 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f32) (param f32) (result i32)
-        (local.get 0)
-        (local.get 1)
-        (f32.lt)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;    e:	 f30f114c2408         	movss	dword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   1e:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   24:	 0f2ec1               	ucomiss	xmm0, xmm1
-;;   27:	 b800000000           	mov	eax, 0
-;;   2c:	 400f97c0             	seta	al
-;;   30:	 4883c410             	add	rsp, 0x10
-;;   34:	 5d                   	pop	rbp
-;;   35:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f32_max/const.wat b/winch/filetests/filetests/x64/f32_max/const.wat
deleted file mode 100644
index 27116057f724..000000000000
--- a/winch/filetests/filetests/x64/f32_max/const.wat
+++ /dev/null
@@ -1,35 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f32)
-        (f32.const 1.1)
-        (f32.const 2.2)
-        (f32.max)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f30f10053c000000     	movss	xmm0, dword ptr [rip + 0x3c]
-;;   14:	 f30f100d3c000000     	movss	xmm1, dword ptr [rip + 0x3c]
-;;   1c:	 0f2ec8               	ucomiss	xmm1, xmm0
-;;   1f:	 0f8518000000         	jne	0x3d
-;;   25:	 0f8a08000000         	jp	0x33
-;;   2b:	 0f54c8               	andps	xmm1, xmm0
-;;   2e:	 e90e000000           	jmp	0x41
-;;   33:	 f30f58c8             	addss	xmm1, xmm0
-;;   37:	 0f8a04000000         	jp	0x41
-;;   3d:	 f30f5fc8             	maxss	xmm1, xmm0
-;;   41:	 0f28c1               	movaps	xmm0, xmm1
-;;   44:	 4883c408             	add	rsp, 8
-;;   48:	 5d                   	pop	rbp
-;;   49:	 c3                   	ret	
-;;   4a:	 0000                 	add	byte ptr [rax], al
-;;   4c:	 0000                 	add	byte ptr [rax], al
-;;   4e:	 0000                 	add	byte ptr [rax], al
-;;   50:	 cdcc                 	int	0xcc
-;;   52:	 0c40                 	or	al, 0x40
-;;   54:	 0000                 	add	byte ptr [rax], al
-;;   56:	 0000                 	add	byte ptr [rax], al
-;;   58:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_max/locals.wat b/winch/filetests/filetests/x64/f32_max/locals.wat
deleted file mode 100644
index f47fdc2accb6..000000000000
--- a/winch/filetests/filetests/x64/f32_max/locals.wat
+++ /dev/null
@@ -1,46 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f32)
-        (local $foo f32)  
-        (local $bar f32)
-
-        (f32.const 1.1)
-        (local.set $foo)
-
-        (f32.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f32.max
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 48c744240800000000   	
-;; 				mov	qword ptr [rsp + 8], 0
-;;   11:	 4c893424             	mov	qword ptr [rsp], r14
-;;   15:	 f30f100553000000     	movss	xmm0, dword ptr [rip + 0x53]
-;;   1d:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;   23:	 f30f10054d000000     	movss	xmm0, dword ptr [rip + 0x4d]
-;;   2b:	 f30f11442408         	movss	dword ptr [rsp + 8], xmm0
-;;   31:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   37:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   3d:	 0f2ec8               	ucomiss	xmm1, xmm0
-;;   40:	 0f8518000000         	jne	0x5e
-;;   46:	 0f8a08000000         	jp	0x54
-;;   4c:	 0f54c8               	andps	xmm1, xmm0
-;;   4f:	 e90e000000           	jmp	0x62
-;;   54:	 f30f58c8             	addss	xmm1, xmm0
-;;   58:	 0f8a04000000         	jp	0x62
-;;   5e:	 f30f5fc8             	maxss	xmm1, xmm0
-;;   62:	 0f28c1               	movaps	xmm0, xmm1
-;;   65:	 4883c410             	add	rsp, 0x10
-;;   69:	 5d                   	pop	rbp
-;;   6a:	 c3                   	ret	
-;;   6b:	 0000                 	add	byte ptr [rax], al
-;;   6d:	 0000                 	add	byte ptr [rax], al
-;;   6f:	 00cd                 	add	ch, cl
-;;   71:	 cc                   	int3	
diff --git a/winch/filetests/filetests/x64/f32_max/params.wat b/winch/filetests/filetests/x64/f32_max/params.wat
deleted file mode 100644
index 9c77973705df..000000000000
--- a/winch/filetests/filetests/x64/f32_max/params.wat
+++ /dev/null
@@ -1,29 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f32) (param f32) (result f32)
-        (local.get 0)
-        (local.get 1)
-        (f32.max)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;    e:	 f30f114c2408         	movss	dword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   1e:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   24:	 0f2ec8               	ucomiss	xmm1, xmm0
-;;   27:	 0f8518000000         	jne	0x45
-;;   2d:	 0f8a08000000         	jp	0x3b
-;;   33:	 0f54c8               	andps	xmm1, xmm0
-;;   36:	 e90e000000           	jmp	0x49
-;;   3b:	 f30f58c8             	addss	xmm1, xmm0
-;;   3f:	 0f8a04000000         	jp	0x49
-;;   45:	 f30f5fc8             	maxss	xmm1, xmm0
-;;   49:	 0f28c1               	movaps	xmm0, xmm1
-;;   4c:	 4883c410             	add	rsp, 0x10
-;;   50:	 5d                   	pop	rbp
-;;   51:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f32_min/const.wat b/winch/filetests/filetests/x64/f32_min/const.wat
deleted file mode 100644
index 59c8a94fb887..000000000000
--- a/winch/filetests/filetests/x64/f32_min/const.wat
+++ /dev/null
@@ -1,35 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f32)
-        (f32.const 1.1)
-        (f32.const 2.2)
-        (f32.min)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f30f10053c000000     	movss	xmm0, dword ptr [rip + 0x3c]
-;;   14:	 f30f100d3c000000     	movss	xmm1, dword ptr [rip + 0x3c]
-;;   1c:	 0f2ec8               	ucomiss	xmm1, xmm0
-;;   1f:	 0f8518000000         	jne	0x3d
-;;   25:	 0f8a08000000         	jp	0x33
-;;   2b:	 0f56c8               	orps	xmm1, xmm0
-;;   2e:	 e90e000000           	jmp	0x41
-;;   33:	 f30f58c8             	addss	xmm1, xmm0
-;;   37:	 0f8a04000000         	jp	0x41
-;;   3d:	 f30f5dc8             	minss	xmm1, xmm0
-;;   41:	 0f28c1               	movaps	xmm0, xmm1
-;;   44:	 4883c408             	add	rsp, 8
-;;   48:	 5d                   	pop	rbp
-;;   49:	 c3                   	ret	
-;;   4a:	 0000                 	add	byte ptr [rax], al
-;;   4c:	 0000                 	add	byte ptr [rax], al
-;;   4e:	 0000                 	add	byte ptr [rax], al
-;;   50:	 cdcc                 	int	0xcc
-;;   52:	 0c40                 	or	al, 0x40
-;;   54:	 0000                 	add	byte ptr [rax], al
-;;   56:	 0000                 	add	byte ptr [rax], al
-;;   58:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_min/locals.wat b/winch/filetests/filetests/x64/f32_min/locals.wat
deleted file mode 100644
index bd591c201e4b..000000000000
--- a/winch/filetests/filetests/x64/f32_min/locals.wat
+++ /dev/null
@@ -1,46 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f32)
-        (local $foo f32)  
-        (local $bar f32)
-
-        (f32.const 1.1)
-        (local.set $foo)
-
-        (f32.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f32.min
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 48c744240800000000   	
-;; 				mov	qword ptr [rsp + 8], 0
-;;   11:	 4c893424             	mov	qword ptr [rsp], r14
-;;   15:	 f30f100553000000     	movss	xmm0, dword ptr [rip + 0x53]
-;;   1d:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;   23:	 f30f10054d000000     	movss	xmm0, dword ptr [rip + 0x4d]
-;;   2b:	 f30f11442408         	movss	dword ptr [rsp + 8], xmm0
-;;   31:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   37:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   3d:	 0f2ec8               	ucomiss	xmm1, xmm0
-;;   40:	 0f8518000000         	jne	0x5e
-;;   46:	 0f8a08000000         	jp	0x54
-;;   4c:	 0f56c8               	orps	xmm1, xmm0
-;;   4f:	 e90e000000           	jmp	0x62
-;;   54:	 f30f58c8             	addss	xmm1, xmm0
-;;   58:	 0f8a04000000         	jp	0x62
-;;   5e:	 f30f5dc8             	minss	xmm1, xmm0
-;;   62:	 0f28c1               	movaps	xmm0, xmm1
-;;   65:	 4883c410             	add	rsp, 0x10
-;;   69:	 5d                   	pop	rbp
-;;   6a:	 c3                   	ret	
-;;   6b:	 0000                 	add	byte ptr [rax], al
-;;   6d:	 0000                 	add	byte ptr [rax], al
-;;   6f:	 00cd                 	add	ch, cl
-;;   71:	 cc                   	int3	
diff --git a/winch/filetests/filetests/x64/f32_min/params.wat b/winch/filetests/filetests/x64/f32_min/params.wat
deleted file mode 100644
index 3ee32384ebad..000000000000
--- a/winch/filetests/filetests/x64/f32_min/params.wat
+++ /dev/null
@@ -1,29 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f32) (param f32) (result f32)
-        (local.get 0)
-        (local.get 1)
-        (f32.min)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;    e:	 f30f114c2408         	movss	dword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   1e:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   24:	 0f2ec8               	ucomiss	xmm1, xmm0
-;;   27:	 0f8518000000         	jne	0x45
-;;   2d:	 0f8a08000000         	jp	0x3b
-;;   33:	 0f56c8               	orps	xmm1, xmm0
-;;   36:	 e90e000000           	jmp	0x49
-;;   3b:	 f30f58c8             	addss	xmm1, xmm0
-;;   3f:	 0f8a04000000         	jp	0x49
-;;   45:	 f30f5dc8             	minss	xmm1, xmm0
-;;   49:	 0f28c1               	movaps	xmm0, xmm1
-;;   4c:	 4883c410             	add	rsp, 0x10
-;;   50:	 5d                   	pop	rbp
-;;   51:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f32_mul/const.wat b/winch/filetests/filetests/x64/f32_mul/const.wat
deleted file mode 100644
index 090264bb08ad..000000000000
--- a/winch/filetests/filetests/x64/f32_mul/const.wat
+++ /dev/null
@@ -1,29 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f32)
-        (f32.const 1.1)
-        (f32.const 2.2)
-        (f32.mul)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f30f10051c000000     	movss	xmm0, dword ptr [rip + 0x1c]
-;;   14:	 f30f100d1c000000     	movss	xmm1, dword ptr [rip + 0x1c]
-;;   1c:	 f30f59c8             	mulss	xmm1, xmm0
-;;   20:	 0f28c1               	movaps	xmm0, xmm1
-;;   23:	 4883c408             	add	rsp, 8
-;;   27:	 5d                   	pop	rbp
-;;   28:	 c3                   	ret	
-;;   29:	 0000                 	add	byte ptr [rax], al
-;;   2b:	 0000                 	add	byte ptr [rax], al
-;;   2d:	 0000                 	add	byte ptr [rax], al
-;;   2f:	 00cd                 	add	ch, cl
-;;   31:	 cc                   	int3	
-;;   32:	 0c40                 	or	al, 0x40
-;;   34:	 0000                 	add	byte ptr [rax], al
-;;   36:	 0000                 	add	byte ptr [rax], al
-;;   38:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_mul/locals.wat b/winch/filetests/filetests/x64/f32_mul/locals.wat
deleted file mode 100644
index 30fe20f868e5..000000000000
--- a/winch/filetests/filetests/x64/f32_mul/locals.wat
+++ /dev/null
@@ -1,39 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f32)
-        (local $foo f32)  
-        (local $bar f32)
-
-        (f32.const 1.1)
-        (local.set $foo)
-
-        (f32.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f32.mul
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 48c744240800000000   	
-;; 				mov	qword ptr [rsp + 8], 0
-;;   11:	 4c893424             	mov	qword ptr [rsp], r14
-;;   15:	 f30f100533000000     	movss	xmm0, dword ptr [rip + 0x33]
-;;   1d:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;   23:	 f30f10052d000000     	movss	xmm0, dword ptr [rip + 0x2d]
-;;   2b:	 f30f11442408         	movss	dword ptr [rsp + 8], xmm0
-;;   31:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   37:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   3d:	 f30f59c8             	mulss	xmm1, xmm0
-;;   41:	 0f28c1               	movaps	xmm0, xmm1
-;;   44:	 4883c410             	add	rsp, 0x10
-;;   48:	 5d                   	pop	rbp
-;;   49:	 c3                   	ret	
-;;   4a:	 0000                 	add	byte ptr [rax], al
-;;   4c:	 0000                 	add	byte ptr [rax], al
-;;   4e:	 0000                 	add	byte ptr [rax], al
-;;   50:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_mul/params.wat b/winch/filetests/filetests/x64/f32_mul/params.wat
deleted file mode 100644
index 4fb433c6e2f8..000000000000
--- a/winch/filetests/filetests/x64/f32_mul/params.wat
+++ /dev/null
@@ -1,22 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f32) (param f32) (result f32)
-        (local.get 0)
-        (local.get 1)
-        (f32.mul)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;    e:	 f30f114c2408         	movss	dword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   1e:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   24:	 f30f59c8             	mulss	xmm1, xmm0
-;;   28:	 0f28c1               	movaps	xmm0, xmm1
-;;   2b:	 4883c410             	add	rsp, 0x10
-;;   2f:	 5d                   	pop	rbp
-;;   30:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f32_ne/const.wat b/winch/filetests/filetests/x64/f32_ne/const.wat
deleted file mode 100644
index dfd4e0de9938..000000000000
--- a/winch/filetests/filetests/x64/f32_ne/const.wat
+++ /dev/null
@@ -1,32 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (f32.const 1.1)
-        (f32.const 2.2)
-        (f32.ne)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f30f10052c000000     	movss	xmm0, dword ptr [rip + 0x2c]
-;;   14:	 f30f100d2c000000     	movss	xmm1, dword ptr [rip + 0x2c]
-;;   1c:	 0f2ec8               	ucomiss	xmm1, xmm0
-;;   1f:	 b800000000           	mov	eax, 0
-;;   24:	 400f95c0             	setne	al
-;;   28:	 41bb00000000         	mov	r11d, 0
-;;   2e:	 410f9ac3             	setp	r11b
-;;   32:	 4409d8               	or	eax, r11d
-;;   35:	 4883c408             	add	rsp, 8
-;;   39:	 5d                   	pop	rbp
-;;   3a:	 c3                   	ret	
-;;   3b:	 0000                 	add	byte ptr [rax], al
-;;   3d:	 0000                 	add	byte ptr [rax], al
-;;   3f:	 00cd                 	add	ch, cl
-;;   41:	 cc                   	int3	
-;;   42:	 0c40                 	or	al, 0x40
-;;   44:	 0000                 	add	byte ptr [rax], al
-;;   46:	 0000                 	add	byte ptr [rax], al
-;;   48:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_ne/locals.wat b/winch/filetests/filetests/x64/f32_ne/locals.wat
deleted file mode 100644
index e27972cdfbd3..000000000000
--- a/winch/filetests/filetests/x64/f32_ne/locals.wat
+++ /dev/null
@@ -1,42 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (local $foo f32)  
-        (local $bar f32)
-
-        (f32.const 1.1)
-        (local.set $foo)
-
-        (f32.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f32.ne
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 48c744240800000000   	
-;; 				mov	qword ptr [rsp + 8], 0
-;;   11:	 4c893424             	mov	qword ptr [rsp], r14
-;;   15:	 f30f100543000000     	movss	xmm0, dword ptr [rip + 0x43]
-;;   1d:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;   23:	 f30f10053d000000     	movss	xmm0, dword ptr [rip + 0x3d]
-;;   2b:	 f30f11442408         	movss	dword ptr [rsp + 8], xmm0
-;;   31:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   37:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   3d:	 0f2ec8               	ucomiss	xmm1, xmm0
-;;   40:	 b800000000           	mov	eax, 0
-;;   45:	 400f95c0             	setne	al
-;;   49:	 41bb00000000         	mov	r11d, 0
-;;   4f:	 410f9ac3             	setp	r11b
-;;   53:	 4409d8               	or	eax, r11d
-;;   56:	 4883c410             	add	rsp, 0x10
-;;   5a:	 5d                   	pop	rbp
-;;   5b:	 c3                   	ret	
-;;   5c:	 0000                 	add	byte ptr [rax], al
-;;   5e:	 0000                 	add	byte ptr [rax], al
-;;   60:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_ne/params.wat b/winch/filetests/filetests/x64/f32_ne/params.wat
deleted file mode 100644
index c8d17316dab9..000000000000
--- a/winch/filetests/filetests/x64/f32_ne/params.wat
+++ /dev/null
@@ -1,26 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f32) (param f32) (result i32)
-        (local.get 0)
-        (local.get 1)
-        (f32.ne)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;    e:	 f30f114c2408         	movss	dword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   1e:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   24:	 0f2ec8               	ucomiss	xmm1, xmm0
-;;   27:	 b800000000           	mov	eax, 0
-;;   2c:	 400f95c0             	setne	al
-;;   30:	 41bb00000000         	mov	r11d, 0
-;;   36:	 410f9ac3             	setp	r11b
-;;   3a:	 4409d8               	or	eax, r11d
-;;   3d:	 4883c410             	add	rsp, 0x10
-;;   41:	 5d                   	pop	rbp
-;;   42:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f32_nearest/f32_nearest_param.wat b/winch/filetests/filetests/x64/f32_nearest/f32_nearest_param.wat
deleted file mode 100644
index 3641f869c46f..000000000000
--- a/winch/filetests/filetests/x64/f32_nearest/f32_nearest_param.wat
+++ /dev/null
@@ -1,18 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f32) (result f32)
-        (local.get 0)
-        (f32.nearest)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;    e:	 4c89742404           	mov	qword ptr [rsp + 4], r14
-;;   13:	 f30f1044240c         	movss	xmm0, dword ptr [rsp + 0xc]
-;;   19:	 e800000000           	call	0x1e
-;;   1e:	 4883c410             	add	rsp, 0x10
-;;   22:	 5d                   	pop	rbp
-;;   23:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f32_sqrt/f32_sqrt_const.wat b/winch/filetests/filetests/x64/f32_sqrt/f32_sqrt_const.wat
deleted file mode 100644
index 0cc61434bab0..000000000000
--- a/winch/filetests/filetests/x64/f32_sqrt/f32_sqrt_const.wat
+++ /dev/null
@@ -1,21 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f32)
-        (f32.const 1.32)
-        (f32.sqrt)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f30f10050c000000     	movss	xmm0, dword ptr [rip + 0xc]
-;;   14:	 f30f51c0             	sqrtss	xmm0, xmm0
-;;   18:	 4883c408             	add	rsp, 8
-;;   1c:	 5d                   	pop	rbp
-;;   1d:	 c3                   	ret	
-;;   1e:	 0000                 	add	byte ptr [rax], al
-;;   20:	 c3                   	ret	
-;;   21:	 f5                   	cmc	
-;;   22:	 a83f                 	test	al, 0x3f
diff --git a/winch/filetests/filetests/x64/f32_sqrt/f32_sqrt_param.wat b/winch/filetests/filetests/x64/f32_sqrt/f32_sqrt_param.wat
deleted file mode 100644
index 6e096d088ff2..000000000000
--- a/winch/filetests/filetests/x64/f32_sqrt/f32_sqrt_param.wat
+++ /dev/null
@@ -1,18 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f32) (result f32)
-        (local.get 0)
-        (f32.sqrt)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;    e:	 4c89742404           	mov	qword ptr [rsp + 4], r14
-;;   13:	 f30f1044240c         	movss	xmm0, dword ptr [rsp + 0xc]
-;;   19:	 f30f51c0             	sqrtss	xmm0, xmm0
-;;   1d:	 4883c410             	add	rsp, 0x10
-;;   21:	 5d                   	pop	rbp
-;;   22:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f32_sub/const.wat b/winch/filetests/filetests/x64/f32_sub/const.wat
deleted file mode 100644
index 1a5ff8edabbd..000000000000
--- a/winch/filetests/filetests/x64/f32_sub/const.wat
+++ /dev/null
@@ -1,29 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f32)
-        (f32.const 1.1)
-        (f32.const 2.2)
-        (f32.sub)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f30f10051c000000     	movss	xmm0, dword ptr [rip + 0x1c]
-;;   14:	 f30f100d1c000000     	movss	xmm1, dword ptr [rip + 0x1c]
-;;   1c:	 f30f5cc8             	subss	xmm1, xmm0
-;;   20:	 0f28c1               	movaps	xmm0, xmm1
-;;   23:	 4883c408             	add	rsp, 8
-;;   27:	 5d                   	pop	rbp
-;;   28:	 c3                   	ret	
-;;   29:	 0000                 	add	byte ptr [rax], al
-;;   2b:	 0000                 	add	byte ptr [rax], al
-;;   2d:	 0000                 	add	byte ptr [rax], al
-;;   2f:	 00cd                 	add	ch, cl
-;;   31:	 cc                   	int3	
-;;   32:	 0c40                 	or	al, 0x40
-;;   34:	 0000                 	add	byte ptr [rax], al
-;;   36:	 0000                 	add	byte ptr [rax], al
-;;   38:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_sub/locals.wat b/winch/filetests/filetests/x64/f32_sub/locals.wat
deleted file mode 100644
index 07ae1d968b58..000000000000
--- a/winch/filetests/filetests/x64/f32_sub/locals.wat
+++ /dev/null
@@ -1,39 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f32)
-        (local $foo f32)  
-        (local $bar f32)
-
-        (f32.const 1.1)
-        (local.set $foo)
-
-        (f32.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f32.sub
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 48c744240800000000   	
-;; 				mov	qword ptr [rsp + 8], 0
-;;   11:	 4c893424             	mov	qword ptr [rsp], r14
-;;   15:	 f30f100533000000     	movss	xmm0, dword ptr [rip + 0x33]
-;;   1d:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;   23:	 f30f10052d000000     	movss	xmm0, dword ptr [rip + 0x2d]
-;;   2b:	 f30f11442408         	movss	dword ptr [rsp + 8], xmm0
-;;   31:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   37:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   3d:	 f30f5cc8             	subss	xmm1, xmm0
-;;   41:	 0f28c1               	movaps	xmm0, xmm1
-;;   44:	 4883c410             	add	rsp, 0x10
-;;   48:	 5d                   	pop	rbp
-;;   49:	 c3                   	ret	
-;;   4a:	 0000                 	add	byte ptr [rax], al
-;;   4c:	 0000                 	add	byte ptr [rax], al
-;;   4e:	 0000                 	add	byte ptr [rax], al
-;;   50:	 cdcc                 	int	0xcc
diff --git a/winch/filetests/filetests/x64/f32_sub/params.wat b/winch/filetests/filetests/x64/f32_sub/params.wat
deleted file mode 100644
index 18c77dba3452..000000000000
--- a/winch/filetests/filetests/x64/f32_sub/params.wat
+++ /dev/null
@@ -1,22 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f32) (param f32) (result f32)
-        (local.get 0)
-        (local.get 1)
-        (f32.sub)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;    e:	 f30f114c2408         	movss	dword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f30f10442408         	movss	xmm0, dword ptr [rsp + 8]
-;;   1e:	 f30f104c240c         	movss	xmm1, dword ptr [rsp + 0xc]
-;;   24:	 f30f5cc8             	subss	xmm1, xmm0
-;;   28:	 0f28c1               	movaps	xmm0, xmm1
-;;   2b:	 4883c410             	add	rsp, 0x10
-;;   2f:	 5d                   	pop	rbp
-;;   30:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f32_trunc/f32_trunc_param.wat b/winch/filetests/filetests/x64/f32_trunc/f32_trunc_param.wat
deleted file mode 100644
index 58a3680ea836..000000000000
--- a/winch/filetests/filetests/x64/f32_trunc/f32_trunc_param.wat
+++ /dev/null
@@ -1,18 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f32) (result f32)
-        (local.get 0)
-        (f32.trunc)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f30f1144240c         	movss	dword ptr [rsp + 0xc], xmm0
-;;    e:	 4c89742404           	mov	qword ptr [rsp + 4], r14
-;;   13:	 f30f1044240c         	movss	xmm0, dword ptr [rsp + 0xc]
-;;   19:	 e800000000           	call	0x1e
-;;   1e:	 4883c410             	add	rsp, 0x10
-;;   22:	 5d                   	pop	rbp
-;;   23:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f64_add/const.wat b/winch/filetests/filetests/x64/f64_add/const.wat
deleted file mode 100644
index 47f8521e7f9d..000000000000
--- a/winch/filetests/filetests/x64/f64_add/const.wat
+++ /dev/null
@@ -1,23 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f64)
-        (f64.const 1.1)
-        (f64.const 2.2)
-        (f64.add)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f20f10051c000000     	movsd	xmm0, qword ptr [rip + 0x1c]
-;;   14:	 f20f100d1c000000     	movsd	xmm1, qword ptr [rip + 0x1c]
-;;   1c:	 f20f58c8             	addsd	xmm1, xmm0
-;;   20:	 660f28c1             	movapd	xmm0, xmm1
-;;   24:	 4883c408             	add	rsp, 8
-;;   28:	 5d                   	pop	rbp
-;;   29:	 c3                   	ret	
-;;   2a:	 0000                 	add	byte ptr [rax], al
-;;   2c:	 0000                 	add	byte ptr [rax], al
-;;   2e:	 0000                 	add	byte ptr [rax], al
diff --git a/winch/filetests/filetests/x64/f64_add/locals.wat b/winch/filetests/filetests/x64/f64_add/locals.wat
deleted file mode 100644
index 1ed3cb42fa55..000000000000
--- a/winch/filetests/filetests/x64/f64_add/locals.wat
+++ /dev/null
@@ -1,39 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f64)
-        (local $foo f64)  
-        (local $bar f64)
-
-        (f64.const 1.1)
-        (local.set $foo)
-
-        (f64.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f64.add
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 4531db               	xor	r11d, r11d
-;;    b:	 4c895c2410           	mov	qword ptr [rsp + 0x10], r11
-;;   10:	 4c895c2408           	mov	qword ptr [rsp + 8], r11
-;;   15:	 4c893424             	mov	qword ptr [rsp], r14
-;;   19:	 f20f10052f000000     	movsd	xmm0, qword ptr [rip + 0x2f]
-;;   21:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;   27:	 f20f100529000000     	movsd	xmm0, qword ptr [rip + 0x29]
-;;   2f:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;   35:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   3b:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   41:	 f20f58c8             	addsd	xmm1, xmm0
-;;   45:	 660f28c1             	movapd	xmm0, xmm1
-;;   49:	 4883c418             	add	rsp, 0x18
-;;   4d:	 5d                   	pop	rbp
-;;   4e:	 c3                   	ret	
-;;   4f:	 009a99999999         	add	byte ptr [rdx - 0x66666667], bl
-;;   55:	 99                   	cdq	
-;;   56:	 f1                   	int1	
diff --git a/winch/filetests/filetests/x64/f64_add/params.wat b/winch/filetests/filetests/x64/f64_add/params.wat
deleted file mode 100644
index 076a8c0e0eb6..000000000000
--- a/winch/filetests/filetests/x64/f64_add/params.wat
+++ /dev/null
@@ -1,22 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f64) (param f64) (result f64)
-        (local.get 0)
-        (local.get 1)
-        (f64.add)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;    e:	 f20f114c2408         	movsd	qword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   1e:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   24:	 f20f58c8             	addsd	xmm1, xmm0
-;;   28:	 660f28c1             	movapd	xmm0, xmm1
-;;   2c:	 4883c418             	add	rsp, 0x18
-;;   30:	 5d                   	pop	rbp
-;;   31:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f64_ceil/f64_ceil_param.wat b/winch/filetests/filetests/x64/f64_ceil/f64_ceil_param.wat
deleted file mode 100644
index c08fae754a1e..000000000000
--- a/winch/filetests/filetests/x64/f64_ceil/f64_ceil_param.wat
+++ /dev/null
@@ -1,18 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f64) (result f64)
-        (local.get 0)
-        (f64.ceil)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;    e:	 4c893424             	mov	qword ptr [rsp], r14
-;;   12:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   18:	 e800000000           	call	0x1d
-;;   1d:	 4883c410             	add	rsp, 0x10
-;;   21:	 5d                   	pop	rbp
-;;   22:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f64_copysign/const.wat b/winch/filetests/filetests/x64/f64_copysign/const.wat
deleted file mode 100644
index 418fd6f77321..000000000000
--- a/winch/filetests/filetests/x64/f64_copysign/const.wat
+++ /dev/null
@@ -1,26 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f64)
-        (f64.const -1.1)
-        (f64.const 2.2)
-        (f64.copysign)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f20f100534000000     	movsd	xmm0, qword ptr [rip + 0x34]
-;;   14:	 f20f100d34000000     	movsd	xmm1, qword ptr [rip + 0x34]
-;;   1c:	 49bb0000000000000080 	
-;; 				movabs	r11, 0x8000000000000000
-;;   26:	 664d0f6efb           	movq	xmm15, r11
-;;   2b:	 66410f54c7           	andpd	xmm0, xmm15
-;;   30:	 66440f55f9           	andnpd	xmm15, xmm1
-;;   35:	 66410f28cf           	movapd	xmm1, xmm15
-;;   3a:	 660f56c8             	orpd	xmm1, xmm0
-;;   3e:	 660f28c1             	movapd	xmm0, xmm1
-;;   42:	 4883c408             	add	rsp, 8
-;;   46:	 5d                   	pop	rbp
-;;   47:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f64_copysign/locals.wat b/winch/filetests/filetests/x64/f64_copysign/locals.wat
deleted file mode 100644
index 6c0f2e053201..000000000000
--- a/winch/filetests/filetests/x64/f64_copysign/locals.wat
+++ /dev/null
@@ -1,49 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f64)
-        (local $foo f64)  
-        (local $bar f64)
-
-        (f64.const -1.1)
-        (local.set $foo)
-
-        (f64.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f64.copysign
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 4531db               	xor	r11d, r11d
-;;    b:	 4c895c2410           	mov	qword ptr [rsp + 0x10], r11
-;;   10:	 4c895c2408           	mov	qword ptr [rsp + 8], r11
-;;   15:	 4c893424             	mov	qword ptr [rsp], r14
-;;   19:	 f20f10054f000000     	movsd	xmm0, qword ptr [rip + 0x4f]
-;;   21:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;   27:	 f20f100549000000     	movsd	xmm0, qword ptr [rip + 0x49]
-;;   2f:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;   35:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   3b:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   41:	 49bb0000000000000080 	
-;; 				movabs	r11, 0x8000000000000000
-;;   4b:	 664d0f6efb           	movq	xmm15, r11
-;;   50:	 66410f54c7           	andpd	xmm0, xmm15
-;;   55:	 66440f55f9           	andnpd	xmm15, xmm1
-;;   5a:	 66410f28cf           	movapd	xmm1, xmm15
-;;   5f:	 660f56c8             	orpd	xmm1, xmm0
-;;   63:	 660f28c1             	movapd	xmm0, xmm1
-;;   67:	 4883c418             	add	rsp, 0x18
-;;   6b:	 5d                   	pop	rbp
-;;   6c:	 c3                   	ret	
-;;   6d:	 0000                 	add	byte ptr [rax], al
-;;   6f:	 009a99999999         	add	byte ptr [rdx - 0x66666667], bl
-;;   75:	 99                   	cdq	
-;;   76:	 f1                   	int1	
-;;   77:	 bf9a999999           	mov	edi, 0x9999999a
-;;   7c:	 99                   	cdq	
-;;   7d:	 99                   	cdq	
diff --git a/winch/filetests/filetests/x64/f64_copysign/params.wat b/winch/filetests/filetests/x64/f64_copysign/params.wat
deleted file mode 100644
index ddf7ff2af612..000000000000
--- a/winch/filetests/filetests/x64/f64_copysign/params.wat
+++ /dev/null
@@ -1,28 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f64) (param f64) (result f64)
-        (local.get 0)
-        (local.get 1)
-        (f64.copysign)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;    e:	 f20f114c2408         	movsd	qword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   1e:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   24:	 49bb0000000000000080 	
-;; 				movabs	r11, 0x8000000000000000
-;;   2e:	 664d0f6efb           	movq	xmm15, r11
-;;   33:	 66410f54c7           	andpd	xmm0, xmm15
-;;   38:	 66440f55f9           	andnpd	xmm15, xmm1
-;;   3d:	 66410f28cf           	movapd	xmm1, xmm15
-;;   42:	 660f56c8             	orpd	xmm1, xmm0
-;;   46:	 660f28c1             	movapd	xmm0, xmm1
-;;   4a:	 4883c418             	add	rsp, 0x18
-;;   4e:	 5d                   	pop	rbp
-;;   4f:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f64_div/const.wat b/winch/filetests/filetests/x64/f64_div/const.wat
deleted file mode 100644
index f29a6d25dd58..000000000000
--- a/winch/filetests/filetests/x64/f64_div/const.wat
+++ /dev/null
@@ -1,23 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f64)
-        (f64.const 1.1)
-        (f64.const 2.2)
-        (f64.div)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f20f10051c000000     	movsd	xmm0, qword ptr [rip + 0x1c]
-;;   14:	 f20f100d1c000000     	movsd	xmm1, qword ptr [rip + 0x1c]
-;;   1c:	 f20f5ec8             	divsd	xmm1, xmm0
-;;   20:	 660f28c1             	movapd	xmm0, xmm1
-;;   24:	 4883c408             	add	rsp, 8
-;;   28:	 5d                   	pop	rbp
-;;   29:	 c3                   	ret	
-;;   2a:	 0000                 	add	byte ptr [rax], al
-;;   2c:	 0000                 	add	byte ptr [rax], al
-;;   2e:	 0000                 	add	byte ptr [rax], al
diff --git a/winch/filetests/filetests/x64/f64_div/locals.wat b/winch/filetests/filetests/x64/f64_div/locals.wat
deleted file mode 100644
index a8ffb3e618b7..000000000000
--- a/winch/filetests/filetests/x64/f64_div/locals.wat
+++ /dev/null
@@ -1,39 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f64)
-        (local $foo f64)  
-        (local $bar f64)
-
-        (f64.const 1.1)
-        (local.set $foo)
-
-        (f64.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f64.div
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 4531db               	xor	r11d, r11d
-;;    b:	 4c895c2410           	mov	qword ptr [rsp + 0x10], r11
-;;   10:	 4c895c2408           	mov	qword ptr [rsp + 8], r11
-;;   15:	 4c893424             	mov	qword ptr [rsp], r14
-;;   19:	 f20f10052f000000     	movsd	xmm0, qword ptr [rip + 0x2f]
-;;   21:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;   27:	 f20f100529000000     	movsd	xmm0, qword ptr [rip + 0x29]
-;;   2f:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;   35:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   3b:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   41:	 f20f5ec8             	divsd	xmm1, xmm0
-;;   45:	 660f28c1             	movapd	xmm0, xmm1
-;;   49:	 4883c418             	add	rsp, 0x18
-;;   4d:	 5d                   	pop	rbp
-;;   4e:	 c3                   	ret	
-;;   4f:	 009a99999999         	add	byte ptr [rdx - 0x66666667], bl
-;;   55:	 99                   	cdq	
-;;   56:	 f1                   	int1	
diff --git a/winch/filetests/filetests/x64/f64_div/params.wat b/winch/filetests/filetests/x64/f64_div/params.wat
deleted file mode 100644
index 2b0beadd141a..000000000000
--- a/winch/filetests/filetests/x64/f64_div/params.wat
+++ /dev/null
@@ -1,22 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f64) (param f64) (result f64)
-        (local.get 0)
-        (local.get 1)
-        (f64.div)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;    e:	 f20f114c2408         	movsd	qword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   1e:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   24:	 f20f5ec8             	divsd	xmm1, xmm0
-;;   28:	 660f28c1             	movapd	xmm0, xmm1
-;;   2c:	 4883c418             	add	rsp, 0x18
-;;   30:	 5d                   	pop	rbp
-;;   31:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f64_eq/const.wat b/winch/filetests/filetests/x64/f64_eq/const.wat
deleted file mode 100644
index e66d344b475a..000000000000
--- a/winch/filetests/filetests/x64/f64_eq/const.wat
+++ /dev/null
@@ -1,26 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (f64.const 1.1)
-        (f64.const 2.2)
-        (f64.eq)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f20f10052c000000     	movsd	xmm0, qword ptr [rip + 0x2c]
-;;   14:	 f20f100d2c000000     	movsd	xmm1, qword ptr [rip + 0x2c]
-;;   1c:	 660f2ec8             	ucomisd	xmm1, xmm0
-;;   20:	 b800000000           	mov	eax, 0
-;;   25:	 400f94c0             	sete	al
-;;   29:	 41bb00000000         	mov	r11d, 0
-;;   2f:	 410f9bc3             	setnp	r11b
-;;   33:	 4c21d8               	and	rax, r11
-;;   36:	 4883c408             	add	rsp, 8
-;;   3a:	 5d                   	pop	rbp
-;;   3b:	 c3                   	ret	
-;;   3c:	 0000                 	add	byte ptr [rax], al
-;;   3e:	 0000                 	add	byte ptr [rax], al
diff --git a/winch/filetests/filetests/x64/f64_eq/locals.wat b/winch/filetests/filetests/x64/f64_eq/locals.wat
deleted file mode 100644
index 54e6724e3ee6..000000000000
--- a/winch/filetests/filetests/x64/f64_eq/locals.wat
+++ /dev/null
@@ -1,46 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (local $foo f64)  
-        (local $bar f64)
-
-        (f64.const 1.1)
-        (local.set $foo)
-
-        (f64.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f64.eq
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 4531db               	xor	r11d, r11d
-;;    b:	 4c895c2410           	mov	qword ptr [rsp + 0x10], r11
-;;   10:	 4c895c2408           	mov	qword ptr [rsp + 8], r11
-;;   15:	 4c893424             	mov	qword ptr [rsp], r14
-;;   19:	 f20f100547000000     	movsd	xmm0, qword ptr [rip + 0x47]
-;;   21:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;   27:	 f20f100541000000     	movsd	xmm0, qword ptr [rip + 0x41]
-;;   2f:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;   35:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   3b:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   41:	 660f2ec8             	ucomisd	xmm1, xmm0
-;;   45:	 b800000000           	mov	eax, 0
-;;   4a:	 400f94c0             	sete	al
-;;   4e:	 41bb00000000         	mov	r11d, 0
-;;   54:	 410f9bc3             	setnp	r11b
-;;   58:	 4c21d8               	and	rax, r11
-;;   5b:	 4883c418             	add	rsp, 0x18
-;;   5f:	 5d                   	pop	rbp
-;;   60:	 c3                   	ret	
-;;   61:	 0000                 	add	byte ptr [rax], al
-;;   63:	 0000                 	add	byte ptr [rax], al
-;;   65:	 0000                 	add	byte ptr [rax], al
-;;   67:	 009a99999999         	add	byte ptr [rdx - 0x66666667], bl
-;;   6d:	 99                   	cdq	
-;;   6e:	 f1                   	int1	
diff --git a/winch/filetests/filetests/x64/f64_eq/params.wat b/winch/filetests/filetests/x64/f64_eq/params.wat
deleted file mode 100644
index 68ef77e076eb..000000000000
--- a/winch/filetests/filetests/x64/f64_eq/params.wat
+++ /dev/null
@@ -1,26 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f64) (param f64) (result i32)
-        (local.get 0)
-        (local.get 1)
-        (f64.eq)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;    e:	 f20f114c2408         	movsd	qword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   1e:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   24:	 660f2ec8             	ucomisd	xmm1, xmm0
-;;   28:	 b800000000           	mov	eax, 0
-;;   2d:	 400f94c0             	sete	al
-;;   31:	 41bb00000000         	mov	r11d, 0
-;;   37:	 410f9bc3             	setnp	r11b
-;;   3b:	 4c21d8               	and	rax, r11
-;;   3e:	 4883c418             	add	rsp, 0x18
-;;   42:	 5d                   	pop	rbp
-;;   43:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f64_floor/f64_floor_param.wat b/winch/filetests/filetests/x64/f64_floor/f64_floor_param.wat
deleted file mode 100644
index 01b6e9517c0f..000000000000
--- a/winch/filetests/filetests/x64/f64_floor/f64_floor_param.wat
+++ /dev/null
@@ -1,18 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f64) (result f64)
-        (local.get 0)
-        (f64.floor)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;    e:	 4c893424             	mov	qword ptr [rsp], r14
-;;   12:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   18:	 e800000000           	call	0x1d
-;;   1d:	 4883c410             	add	rsp, 0x10
-;;   21:	 5d                   	pop	rbp
-;;   22:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f64_ge/const.wat b/winch/filetests/filetests/x64/f64_ge/const.wat
deleted file mode 100644
index babc26b1cff2..000000000000
--- a/winch/filetests/filetests/x64/f64_ge/const.wat
+++ /dev/null
@@ -1,26 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (f64.const 1.1)
-        (f64.const 2.2)
-        (f64.ge)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f20f10052c000000     	movsd	xmm0, qword ptr [rip + 0x2c]
-;;   14:	 f20f100d2c000000     	movsd	xmm1, qword ptr [rip + 0x2c]
-;;   1c:	 660f2ec8             	ucomisd	xmm1, xmm0
-;;   20:	 b800000000           	mov	eax, 0
-;;   25:	 400f93c0             	setae	al
-;;   29:	 41bb00000000         	mov	r11d, 0
-;;   2f:	 410f9bc3             	setnp	r11b
-;;   33:	 4c21d8               	and	rax, r11
-;;   36:	 4883c408             	add	rsp, 8
-;;   3a:	 5d                   	pop	rbp
-;;   3b:	 c3                   	ret	
-;;   3c:	 0000                 	add	byte ptr [rax], al
-;;   3e:	 0000                 	add	byte ptr [rax], al
diff --git a/winch/filetests/filetests/x64/f64_ge/locals.wat b/winch/filetests/filetests/x64/f64_ge/locals.wat
deleted file mode 100644
index 4bc63797ecad..000000000000
--- a/winch/filetests/filetests/x64/f64_ge/locals.wat
+++ /dev/null
@@ -1,46 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (local $foo f64)  
-        (local $bar f64)
-
-        (f64.const 1.1)
-        (local.set $foo)
-
-        (f64.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f64.ge
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 4531db               	xor	r11d, r11d
-;;    b:	 4c895c2410           	mov	qword ptr [rsp + 0x10], r11
-;;   10:	 4c895c2408           	mov	qword ptr [rsp + 8], r11
-;;   15:	 4c893424             	mov	qword ptr [rsp], r14
-;;   19:	 f20f100547000000     	movsd	xmm0, qword ptr [rip + 0x47]
-;;   21:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;   27:	 f20f100541000000     	movsd	xmm0, qword ptr [rip + 0x41]
-;;   2f:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;   35:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   3b:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   41:	 660f2ec8             	ucomisd	xmm1, xmm0
-;;   45:	 b800000000           	mov	eax, 0
-;;   4a:	 400f93c0             	setae	al
-;;   4e:	 41bb00000000         	mov	r11d, 0
-;;   54:	 410f9bc3             	setnp	r11b
-;;   58:	 4c21d8               	and	rax, r11
-;;   5b:	 4883c418             	add	rsp, 0x18
-;;   5f:	 5d                   	pop	rbp
-;;   60:	 c3                   	ret	
-;;   61:	 0000                 	add	byte ptr [rax], al
-;;   63:	 0000                 	add	byte ptr [rax], al
-;;   65:	 0000                 	add	byte ptr [rax], al
-;;   67:	 009a99999999         	add	byte ptr [rdx - 0x66666667], bl
-;;   6d:	 99                   	cdq	
-;;   6e:	 f1                   	int1	
diff --git a/winch/filetests/filetests/x64/f64_ge/params.wat b/winch/filetests/filetests/x64/f64_ge/params.wat
deleted file mode 100644
index 87c4dd9f741c..000000000000
--- a/winch/filetests/filetests/x64/f64_ge/params.wat
+++ /dev/null
@@ -1,26 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f64) (param f64) (result i32)
-        (local.get 0)
-        (local.get 1)
-        (f64.ge)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;    e:	 f20f114c2408         	movsd	qword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   1e:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   24:	 660f2ec8             	ucomisd	xmm1, xmm0
-;;   28:	 b800000000           	mov	eax, 0
-;;   2d:	 400f93c0             	setae	al
-;;   31:	 41bb00000000         	mov	r11d, 0
-;;   37:	 410f9bc3             	setnp	r11b
-;;   3b:	 4c21d8               	and	rax, r11
-;;   3e:	 4883c418             	add	rsp, 0x18
-;;   42:	 5d                   	pop	rbp
-;;   43:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f64_gt/const.wat b/winch/filetests/filetests/x64/f64_gt/const.wat
deleted file mode 100644
index c335eb301183..000000000000
--- a/winch/filetests/filetests/x64/f64_gt/const.wat
+++ /dev/null
@@ -1,26 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (f64.const 1.1)
-        (f64.const 2.2)
-        (f64.gt)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f20f10052c000000     	movsd	xmm0, qword ptr [rip + 0x2c]
-;;   14:	 f20f100d2c000000     	movsd	xmm1, qword ptr [rip + 0x2c]
-;;   1c:	 660f2ec8             	ucomisd	xmm1, xmm0
-;;   20:	 b800000000           	mov	eax, 0
-;;   25:	 400f97c0             	seta	al
-;;   29:	 41bb00000000         	mov	r11d, 0
-;;   2f:	 410f9bc3             	setnp	r11b
-;;   33:	 4c21d8               	and	rax, r11
-;;   36:	 4883c408             	add	rsp, 8
-;;   3a:	 5d                   	pop	rbp
-;;   3b:	 c3                   	ret	
-;;   3c:	 0000                 	add	byte ptr [rax], al
-;;   3e:	 0000                 	add	byte ptr [rax], al
diff --git a/winch/filetests/filetests/x64/f64_gt/locals.wat b/winch/filetests/filetests/x64/f64_gt/locals.wat
deleted file mode 100644
index 89707c693a69..000000000000
--- a/winch/filetests/filetests/x64/f64_gt/locals.wat
+++ /dev/null
@@ -1,46 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (local $foo f64)  
-        (local $bar f64)
-
-        (f64.const 1.1)
-        (local.set $foo)
-
-        (f64.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f64.gt
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 4531db               	xor	r11d, r11d
-;;    b:	 4c895c2410           	mov	qword ptr [rsp + 0x10], r11
-;;   10:	 4c895c2408           	mov	qword ptr [rsp + 8], r11
-;;   15:	 4c893424             	mov	qword ptr [rsp], r14
-;;   19:	 f20f100547000000     	movsd	xmm0, qword ptr [rip + 0x47]
-;;   21:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;   27:	 f20f100541000000     	movsd	xmm0, qword ptr [rip + 0x41]
-;;   2f:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;   35:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   3b:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   41:	 660f2ec8             	ucomisd	xmm1, xmm0
-;;   45:	 b800000000           	mov	eax, 0
-;;   4a:	 400f97c0             	seta	al
-;;   4e:	 41bb00000000         	mov	r11d, 0
-;;   54:	 410f9bc3             	setnp	r11b
-;;   58:	 4c21d8               	and	rax, r11
-;;   5b:	 4883c418             	add	rsp, 0x18
-;;   5f:	 5d                   	pop	rbp
-;;   60:	 c3                   	ret	
-;;   61:	 0000                 	add	byte ptr [rax], al
-;;   63:	 0000                 	add	byte ptr [rax], al
-;;   65:	 0000                 	add	byte ptr [rax], al
-;;   67:	 009a99999999         	add	byte ptr [rdx - 0x66666667], bl
-;;   6d:	 99                   	cdq	
-;;   6e:	 f1                   	int1	
diff --git a/winch/filetests/filetests/x64/f64_gt/params.wat b/winch/filetests/filetests/x64/f64_gt/params.wat
deleted file mode 100644
index 8785734d7026..000000000000
--- a/winch/filetests/filetests/x64/f64_gt/params.wat
+++ /dev/null
@@ -1,26 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f64) (param f64) (result i32)
-        (local.get 0)
-        (local.get 1)
-        (f64.gt)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;    e:	 f20f114c2408         	movsd	qword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   1e:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   24:	 660f2ec8             	ucomisd	xmm1, xmm0
-;;   28:	 b800000000           	mov	eax, 0
-;;   2d:	 400f97c0             	seta	al
-;;   31:	 41bb00000000         	mov	r11d, 0
-;;   37:	 410f9bc3             	setnp	r11b
-;;   3b:	 4c21d8               	and	rax, r11
-;;   3e:	 4883c418             	add	rsp, 0x18
-;;   42:	 5d                   	pop	rbp
-;;   43:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f64_le/const.wat b/winch/filetests/filetests/x64/f64_le/const.wat
deleted file mode 100644
index 87f260ba9166..000000000000
--- a/winch/filetests/filetests/x64/f64_le/const.wat
+++ /dev/null
@@ -1,30 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (f64.const 1.1)
-        (f64.const 2.2)
-        (f64.le)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f20f10051c000000     	movsd	xmm0, qword ptr [rip + 0x1c]
-;;   14:	 f20f100d1c000000     	movsd	xmm1, qword ptr [rip + 0x1c]
-;;   1c:	 660f2ec1             	ucomisd	xmm0, xmm1
-;;   20:	 b800000000           	mov	eax, 0
-;;   25:	 400f93c0             	setae	al
-;;   29:	 4883c408             	add	rsp, 8
-;;   2d:	 5d                   	pop	rbp
-;;   2e:	 c3                   	ret	
-;;   2f:	 009a99999999         	add	byte ptr [rdx - 0x66666667], bl
-;;   35:	 99                   	cdq	
-;;   36:	 01409a               	add	dword ptr [rax - 0x66], eax
-;;   39:	 99                   	cdq	
-;;   3a:	 99                   	cdq	
-;;   3b:	 99                   	cdq	
-;;   3c:	 99                   	cdq	
-;;   3d:	 99                   	cdq	
-;;   3e:	 f1                   	int1	
diff --git a/winch/filetests/filetests/x64/f64_le/locals.wat b/winch/filetests/filetests/x64/f64_le/locals.wat
deleted file mode 100644
index 892e85acd3c8..000000000000
--- a/winch/filetests/filetests/x64/f64_le/locals.wat
+++ /dev/null
@@ -1,39 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (local $foo f64)  
-        (local $bar f64)
-
-        (f64.const 1.1)
-        (local.set $foo)
-
-        (f64.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f64.le
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 4531db               	xor	r11d, r11d
-;;    b:	 4c895c2410           	mov	qword ptr [rsp + 0x10], r11
-;;   10:	 4c895c2408           	mov	qword ptr [rsp + 8], r11
-;;   15:	 4c893424             	mov	qword ptr [rsp], r14
-;;   19:	 f20f100537000000     	movsd	xmm0, qword ptr [rip + 0x37]
-;;   21:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;   27:	 f20f100531000000     	movsd	xmm0, qword ptr [rip + 0x31]
-;;   2f:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;   35:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   3b:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   41:	 660f2ec1             	ucomisd	xmm0, xmm1
-;;   45:	 b800000000           	mov	eax, 0
-;;   4a:	 400f93c0             	setae	al
-;;   4e:	 4883c418             	add	rsp, 0x18
-;;   52:	 5d                   	pop	rbp
-;;   53:	 c3                   	ret	
-;;   54:	 0000                 	add	byte ptr [rax], al
-;;   56:	 0000                 	add	byte ptr [rax], al
diff --git a/winch/filetests/filetests/x64/f64_le/params.wat b/winch/filetests/filetests/x64/f64_le/params.wat
deleted file mode 100644
index 892e85acd3c8..000000000000
--- a/winch/filetests/filetests/x64/f64_le/params.wat
+++ /dev/null
@@ -1,39 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (local $foo f64)  
-        (local $bar f64)
-
-        (f64.const 1.1)
-        (local.set $foo)
-
-        (f64.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f64.le
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 4531db               	xor	r11d, r11d
-;;    b:	 4c895c2410           	mov	qword ptr [rsp + 0x10], r11
-;;   10:	 4c895c2408           	mov	qword ptr [rsp + 8], r11
-;;   15:	 4c893424             	mov	qword ptr [rsp], r14
-;;   19:	 f20f100537000000     	movsd	xmm0, qword ptr [rip + 0x37]
-;;   21:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;   27:	 f20f100531000000     	movsd	xmm0, qword ptr [rip + 0x31]
-;;   2f:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;   35:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   3b:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   41:	 660f2ec1             	ucomisd	xmm0, xmm1
-;;   45:	 b800000000           	mov	eax, 0
-;;   4a:	 400f93c0             	setae	al
-;;   4e:	 4883c418             	add	rsp, 0x18
-;;   52:	 5d                   	pop	rbp
-;;   53:	 c3                   	ret	
-;;   54:	 0000                 	add	byte ptr [rax], al
-;;   56:	 0000                 	add	byte ptr [rax], al
diff --git a/winch/filetests/filetests/x64/f64_lt/const.wat b/winch/filetests/filetests/x64/f64_lt/const.wat
deleted file mode 100644
index f95ce8491e71..000000000000
--- a/winch/filetests/filetests/x64/f64_lt/const.wat
+++ /dev/null
@@ -1,30 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (f64.const 1.1)
-        (f64.const 2.2)
-        (f64.lt)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f20f10051c000000     	movsd	xmm0, qword ptr [rip + 0x1c]
-;;   14:	 f20f100d1c000000     	movsd	xmm1, qword ptr [rip + 0x1c]
-;;   1c:	 660f2ec1             	ucomisd	xmm0, xmm1
-;;   20:	 b800000000           	mov	eax, 0
-;;   25:	 400f97c0             	seta	al
-;;   29:	 4883c408             	add	rsp, 8
-;;   2d:	 5d                   	pop	rbp
-;;   2e:	 c3                   	ret	
-;;   2f:	 009a99999999         	add	byte ptr [rdx - 0x66666667], bl
-;;   35:	 99                   	cdq	
-;;   36:	 01409a               	add	dword ptr [rax - 0x66], eax
-;;   39:	 99                   	cdq	
-;;   3a:	 99                   	cdq	
-;;   3b:	 99                   	cdq	
-;;   3c:	 99                   	cdq	
-;;   3d:	 99                   	cdq	
-;;   3e:	 f1                   	int1	
diff --git a/winch/filetests/filetests/x64/f64_lt/locals.wat b/winch/filetests/filetests/x64/f64_lt/locals.wat
deleted file mode 100644
index be6b7432d3e9..000000000000
--- a/winch/filetests/filetests/x64/f64_lt/locals.wat
+++ /dev/null
@@ -1,39 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (local $foo f64)  
-        (local $bar f64)
-
-        (f64.const 1.1)
-        (local.set $foo)
-
-        (f64.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f64.lt
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 4531db               	xor	r11d, r11d
-;;    b:	 4c895c2410           	mov	qword ptr [rsp + 0x10], r11
-;;   10:	 4c895c2408           	mov	qword ptr [rsp + 8], r11
-;;   15:	 4c893424             	mov	qword ptr [rsp], r14
-;;   19:	 f20f100537000000     	movsd	xmm0, qword ptr [rip + 0x37]
-;;   21:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;   27:	 f20f100531000000     	movsd	xmm0, qword ptr [rip + 0x31]
-;;   2f:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;   35:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   3b:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   41:	 660f2ec1             	ucomisd	xmm0, xmm1
-;;   45:	 b800000000           	mov	eax, 0
-;;   4a:	 400f97c0             	seta	al
-;;   4e:	 4883c418             	add	rsp, 0x18
-;;   52:	 5d                   	pop	rbp
-;;   53:	 c3                   	ret	
-;;   54:	 0000                 	add	byte ptr [rax], al
-;;   56:	 0000                 	add	byte ptr [rax], al
diff --git a/winch/filetests/filetests/x64/f64_lt/params.wat b/winch/filetests/filetests/x64/f64_lt/params.wat
deleted file mode 100644
index 284f8bb77084..000000000000
--- a/winch/filetests/filetests/x64/f64_lt/params.wat
+++ /dev/null
@@ -1,23 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f64) (param f64) (result i32)
-        (local.get 0)
-        (local.get 1)
-        (f64.lt)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;    e:	 f20f114c2408         	movsd	qword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   1e:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   24:	 660f2ec1             	ucomisd	xmm0, xmm1
-;;   28:	 b800000000           	mov	eax, 0
-;;   2d:	 400f97c0             	seta	al
-;;   31:	 4883c418             	add	rsp, 0x18
-;;   35:	 5d                   	pop	rbp
-;;   36:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f64_max/const.wat b/winch/filetests/filetests/x64/f64_max/const.wat
deleted file mode 100644
index 6f83eb06f607..000000000000
--- a/winch/filetests/filetests/x64/f64_max/const.wat
+++ /dev/null
@@ -1,37 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f64)
-        (f64.const 1.1)
-        (f64.const 2.2)
-        (f64.max)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f20f10053c000000     	movsd	xmm0, qword ptr [rip + 0x3c]
-;;   14:	 f20f100d3c000000     	movsd	xmm1, qword ptr [rip + 0x3c]
-;;   1c:	 660f2ec8             	ucomisd	xmm1, xmm0
-;;   20:	 0f8519000000         	jne	0x3f
-;;   26:	 0f8a09000000         	jp	0x35
-;;   2c:	 660f54c8             	andpd	xmm1, xmm0
-;;   30:	 e90e000000           	jmp	0x43
-;;   35:	 f20f58c8             	addsd	xmm1, xmm0
-;;   39:	 0f8a04000000         	jp	0x43
-;;   3f:	 f20f5fc8             	maxsd	xmm1, xmm0
-;;   43:	 660f28c1             	movapd	xmm0, xmm1
-;;   47:	 4883c408             	add	rsp, 8
-;;   4b:	 5d                   	pop	rbp
-;;   4c:	 c3                   	ret	
-;;   4d:	 0000                 	add	byte ptr [rax], al
-;;   4f:	 009a99999999         	add	byte ptr [rdx - 0x66666667], bl
-;;   55:	 99                   	cdq	
-;;   56:	 01409a               	add	dword ptr [rax - 0x66], eax
-;;   59:	 99                   	cdq	
-;;   5a:	 99                   	cdq	
-;;   5b:	 99                   	cdq	
-;;   5c:	 99                   	cdq	
-;;   5d:	 99                   	cdq	
-;;   5e:	 f1                   	int1	
diff --git a/winch/filetests/filetests/x64/f64_max/locals.wat b/winch/filetests/filetests/x64/f64_max/locals.wat
deleted file mode 100644
index 9822729ffd67..000000000000
--- a/winch/filetests/filetests/x64/f64_max/locals.wat
+++ /dev/null
@@ -1,46 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f64)
-        (local $foo f64)  
-        (local $bar f64)
-
-        (f64.const 1.1)
-        (local.set $foo)
-
-        (f64.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f64.max
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 4531db               	xor	r11d, r11d
-;;    b:	 4c895c2410           	mov	qword ptr [rsp + 0x10], r11
-;;   10:	 4c895c2408           	mov	qword ptr [rsp + 8], r11
-;;   15:	 4c893424             	mov	qword ptr [rsp], r14
-;;   19:	 f20f100557000000     	movsd	xmm0, qword ptr [rip + 0x57]
-;;   21:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;   27:	 f20f100551000000     	movsd	xmm0, qword ptr [rip + 0x51]
-;;   2f:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;   35:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   3b:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   41:	 660f2ec8             	ucomisd	xmm1, xmm0
-;;   45:	 0f8519000000         	jne	0x64
-;;   4b:	 0f8a09000000         	jp	0x5a
-;;   51:	 660f54c8             	andpd	xmm1, xmm0
-;;   55:	 e90e000000           	jmp	0x68
-;;   5a:	 f20f58c8             	addsd	xmm1, xmm0
-;;   5e:	 0f8a04000000         	jp	0x68
-;;   64:	 f20f5fc8             	maxsd	xmm1, xmm0
-;;   68:	 660f28c1             	movapd	xmm0, xmm1
-;;   6c:	 4883c418             	add	rsp, 0x18
-;;   70:	 5d                   	pop	rbp
-;;   71:	 c3                   	ret	
-;;   72:	 0000                 	add	byte ptr [rax], al
-;;   74:	 0000                 	add	byte ptr [rax], al
-;;   76:	 0000                 	add	byte ptr [rax], al
diff --git a/winch/filetests/filetests/x64/f64_max/params.wat b/winch/filetests/filetests/x64/f64_max/params.wat
deleted file mode 100644
index c7a97a58d99d..000000000000
--- a/winch/filetests/filetests/x64/f64_max/params.wat
+++ /dev/null
@@ -1,29 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f64) (param f64) (result f64)
-        (local.get 0)
-        (local.get 1)
-        (f64.max)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;    e:	 f20f114c2408         	movsd	qword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   1e:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   24:	 660f2ec8             	ucomisd	xmm1, xmm0
-;;   28:	 0f8519000000         	jne	0x47
-;;   2e:	 0f8a09000000         	jp	0x3d
-;;   34:	 660f54c8             	andpd	xmm1, xmm0
-;;   38:	 e90e000000           	jmp	0x4b
-;;   3d:	 f20f58c8             	addsd	xmm1, xmm0
-;;   41:	 0f8a04000000         	jp	0x4b
-;;   47:	 f20f5fc8             	maxsd	xmm1, xmm0
-;;   4b:	 660f28c1             	movapd	xmm0, xmm1
-;;   4f:	 4883c418             	add	rsp, 0x18
-;;   53:	 5d                   	pop	rbp
-;;   54:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f64_min/const.wat b/winch/filetests/filetests/x64/f64_min/const.wat
deleted file mode 100644
index 2711f73b6187..000000000000
--- a/winch/filetests/filetests/x64/f64_min/const.wat
+++ /dev/null
@@ -1,37 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f64)
-        (f64.const 1.1)
-        (f64.const 2.2)
-        (f64.min)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f20f10053c000000     	movsd	xmm0, qword ptr [rip + 0x3c]
-;;   14:	 f20f100d3c000000     	movsd	xmm1, qword ptr [rip + 0x3c]
-;;   1c:	 660f2ec8             	ucomisd	xmm1, xmm0
-;;   20:	 0f8519000000         	jne	0x3f
-;;   26:	 0f8a09000000         	jp	0x35
-;;   2c:	 660f56c8             	orpd	xmm1, xmm0
-;;   30:	 e90e000000           	jmp	0x43
-;;   35:	 f20f58c8             	addsd	xmm1, xmm0
-;;   39:	 0f8a04000000         	jp	0x43
-;;   3f:	 f20f5dc8             	minsd	xmm1, xmm0
-;;   43:	 660f28c1             	movapd	xmm0, xmm1
-;;   47:	 4883c408             	add	rsp, 8
-;;   4b:	 5d                   	pop	rbp
-;;   4c:	 c3                   	ret	
-;;   4d:	 0000                 	add	byte ptr [rax], al
-;;   4f:	 009a99999999         	add	byte ptr [rdx - 0x66666667], bl
-;;   55:	 99                   	cdq	
-;;   56:	 01409a               	add	dword ptr [rax - 0x66], eax
-;;   59:	 99                   	cdq	
-;;   5a:	 99                   	cdq	
-;;   5b:	 99                   	cdq	
-;;   5c:	 99                   	cdq	
-;;   5d:	 99                   	cdq	
-;;   5e:	 f1                   	int1	
diff --git a/winch/filetests/filetests/x64/f64_min/locals.wat b/winch/filetests/filetests/x64/f64_min/locals.wat
deleted file mode 100644
index 46409ead152d..000000000000
--- a/winch/filetests/filetests/x64/f64_min/locals.wat
+++ /dev/null
@@ -1,46 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f64)
-        (local $foo f64)  
-        (local $bar f64)
-
-        (f64.const 1.1)
-        (local.set $foo)
-
-        (f64.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f64.min
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 4531db               	xor	r11d, r11d
-;;    b:	 4c895c2410           	mov	qword ptr [rsp + 0x10], r11
-;;   10:	 4c895c2408           	mov	qword ptr [rsp + 8], r11
-;;   15:	 4c893424             	mov	qword ptr [rsp], r14
-;;   19:	 f20f100557000000     	movsd	xmm0, qword ptr [rip + 0x57]
-;;   21:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;   27:	 f20f100551000000     	movsd	xmm0, qword ptr [rip + 0x51]
-;;   2f:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;   35:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   3b:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   41:	 660f2ec8             	ucomisd	xmm1, xmm0
-;;   45:	 0f8519000000         	jne	0x64
-;;   4b:	 0f8a09000000         	jp	0x5a
-;;   51:	 660f56c8             	orpd	xmm1, xmm0
-;;   55:	 e90e000000           	jmp	0x68
-;;   5a:	 f20f58c8             	addsd	xmm1, xmm0
-;;   5e:	 0f8a04000000         	jp	0x68
-;;   64:	 f20f5dc8             	minsd	xmm1, xmm0
-;;   68:	 660f28c1             	movapd	xmm0, xmm1
-;;   6c:	 4883c418             	add	rsp, 0x18
-;;   70:	 5d                   	pop	rbp
-;;   71:	 c3                   	ret	
-;;   72:	 0000                 	add	byte ptr [rax], al
-;;   74:	 0000                 	add	byte ptr [rax], al
-;;   76:	 0000                 	add	byte ptr [rax], al
diff --git a/winch/filetests/filetests/x64/f64_min/params.wat b/winch/filetests/filetests/x64/f64_min/params.wat
deleted file mode 100644
index 98f5f35bd163..000000000000
--- a/winch/filetests/filetests/x64/f64_min/params.wat
+++ /dev/null
@@ -1,29 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f64) (param f64) (result f64)
-        (local.get 0)
-        (local.get 1)
-        (f64.min)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;    e:	 f20f114c2408         	movsd	qword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   1e:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   24:	 660f2ec8             	ucomisd	xmm1, xmm0
-;;   28:	 0f8519000000         	jne	0x47
-;;   2e:	 0f8a09000000         	jp	0x3d
-;;   34:	 660f56c8             	orpd	xmm1, xmm0
-;;   38:	 e90e000000           	jmp	0x4b
-;;   3d:	 f20f58c8             	addsd	xmm1, xmm0
-;;   41:	 0f8a04000000         	jp	0x4b
-;;   47:	 f20f5dc8             	minsd	xmm1, xmm0
-;;   4b:	 660f28c1             	movapd	xmm0, xmm1
-;;   4f:	 4883c418             	add	rsp, 0x18
-;;   53:	 5d                   	pop	rbp
-;;   54:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f64_mul/const.wat b/winch/filetests/filetests/x64/f64_mul/const.wat
deleted file mode 100644
index 7fb68dc1359e..000000000000
--- a/winch/filetests/filetests/x64/f64_mul/const.wat
+++ /dev/null
@@ -1,23 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f64)
-        (f64.const 1.1)
-        (f64.const 2.2)
-        (f64.mul)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f20f10051c000000     	movsd	xmm0, qword ptr [rip + 0x1c]
-;;   14:	 f20f100d1c000000     	movsd	xmm1, qword ptr [rip + 0x1c]
-;;   1c:	 f20f59c8             	mulsd	xmm1, xmm0
-;;   20:	 660f28c1             	movapd	xmm0, xmm1
-;;   24:	 4883c408             	add	rsp, 8
-;;   28:	 5d                   	pop	rbp
-;;   29:	 c3                   	ret	
-;;   2a:	 0000                 	add	byte ptr [rax], al
-;;   2c:	 0000                 	add	byte ptr [rax], al
-;;   2e:	 0000                 	add	byte ptr [rax], al
diff --git a/winch/filetests/filetests/x64/f64_mul/locals.wat b/winch/filetests/filetests/x64/f64_mul/locals.wat
deleted file mode 100644
index 1f82a81a6695..000000000000
--- a/winch/filetests/filetests/x64/f64_mul/locals.wat
+++ /dev/null
@@ -1,39 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f64)
-        (local $foo f64)  
-        (local $bar f64)
-
-        (f64.const 1.1)
-        (local.set $foo)
-
-        (f64.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f64.mul
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 4531db               	xor	r11d, r11d
-;;    b:	 4c895c2410           	mov	qword ptr [rsp + 0x10], r11
-;;   10:	 4c895c2408           	mov	qword ptr [rsp + 8], r11
-;;   15:	 4c893424             	mov	qword ptr [rsp], r14
-;;   19:	 f20f10052f000000     	movsd	xmm0, qword ptr [rip + 0x2f]
-;;   21:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;   27:	 f20f100529000000     	movsd	xmm0, qword ptr [rip + 0x29]
-;;   2f:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;   35:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   3b:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   41:	 f20f59c8             	mulsd	xmm1, xmm0
-;;   45:	 660f28c1             	movapd	xmm0, xmm1
-;;   49:	 4883c418             	add	rsp, 0x18
-;;   4d:	 5d                   	pop	rbp
-;;   4e:	 c3                   	ret	
-;;   4f:	 009a99999999         	add	byte ptr [rdx - 0x66666667], bl
-;;   55:	 99                   	cdq	
-;;   56:	 f1                   	int1	
diff --git a/winch/filetests/filetests/x64/f64_mul/params.wat b/winch/filetests/filetests/x64/f64_mul/params.wat
deleted file mode 100644
index e927a9333022..000000000000
--- a/winch/filetests/filetests/x64/f64_mul/params.wat
+++ /dev/null
@@ -1,22 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f64) (param f64) (result f64)
-        (local.get 0)
-        (local.get 1)
-        (f64.mul)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;    e:	 f20f114c2408         	movsd	qword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   1e:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   24:	 f20f59c8             	mulsd	xmm1, xmm0
-;;   28:	 660f28c1             	movapd	xmm0, xmm1
-;;   2c:	 4883c418             	add	rsp, 0x18
-;;   30:	 5d                   	pop	rbp
-;;   31:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f64_ne/const.wat b/winch/filetests/filetests/x64/f64_ne/const.wat
deleted file mode 100644
index 8ba744d9a9dd..000000000000
--- a/winch/filetests/filetests/x64/f64_ne/const.wat
+++ /dev/null
@@ -1,26 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (f64.const 1.1)
-        (f64.const 2.2)
-        (f64.ne)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f20f10052c000000     	movsd	xmm0, qword ptr [rip + 0x2c]
-;;   14:	 f20f100d2c000000     	movsd	xmm1, qword ptr [rip + 0x2c]
-;;   1c:	 660f2ec8             	ucomisd	xmm1, xmm0
-;;   20:	 b800000000           	mov	eax, 0
-;;   25:	 400f95c0             	setne	al
-;;   29:	 41bb00000000         	mov	r11d, 0
-;;   2f:	 410f9ac3             	setp	r11b
-;;   33:	 4c09d8               	or	rax, r11
-;;   36:	 4883c408             	add	rsp, 8
-;;   3a:	 5d                   	pop	rbp
-;;   3b:	 c3                   	ret	
-;;   3c:	 0000                 	add	byte ptr [rax], al
-;;   3e:	 0000                 	add	byte ptr [rax], al
diff --git a/winch/filetests/filetests/x64/f64_ne/locals.wat b/winch/filetests/filetests/x64/f64_ne/locals.wat
deleted file mode 100644
index 2c0253f843ff..000000000000
--- a/winch/filetests/filetests/x64/f64_ne/locals.wat
+++ /dev/null
@@ -1,46 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result i32)
-        (local $foo f64)  
-        (local $bar f64)
-
-        (f64.const 1.1)
-        (local.set $foo)
-
-        (f64.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f64.ne
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 4531db               	xor	r11d, r11d
-;;    b:	 4c895c2410           	mov	qword ptr [rsp + 0x10], r11
-;;   10:	 4c895c2408           	mov	qword ptr [rsp + 8], r11
-;;   15:	 4c893424             	mov	qword ptr [rsp], r14
-;;   19:	 f20f100547000000     	movsd	xmm0, qword ptr [rip + 0x47]
-;;   21:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;   27:	 f20f100541000000     	movsd	xmm0, qword ptr [rip + 0x41]
-;;   2f:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;   35:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   3b:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   41:	 660f2ec8             	ucomisd	xmm1, xmm0
-;;   45:	 b800000000           	mov	eax, 0
-;;   4a:	 400f95c0             	setne	al
-;;   4e:	 41bb00000000         	mov	r11d, 0
-;;   54:	 410f9ac3             	setp	r11b
-;;   58:	 4c09d8               	or	rax, r11
-;;   5b:	 4883c418             	add	rsp, 0x18
-;;   5f:	 5d                   	pop	rbp
-;;   60:	 c3                   	ret	
-;;   61:	 0000                 	add	byte ptr [rax], al
-;;   63:	 0000                 	add	byte ptr [rax], al
-;;   65:	 0000                 	add	byte ptr [rax], al
-;;   67:	 009a99999999         	add	byte ptr [rdx - 0x66666667], bl
-;;   6d:	 99                   	cdq	
-;;   6e:	 f1                   	int1	
diff --git a/winch/filetests/filetests/x64/f64_ne/params.wat b/winch/filetests/filetests/x64/f64_ne/params.wat
deleted file mode 100644
index 2898773c1689..000000000000
--- a/winch/filetests/filetests/x64/f64_ne/params.wat
+++ /dev/null
@@ -1,26 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f64) (param f64) (result i32)
-        (local.get 0)
-        (local.get 1)
-        (f64.ne)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;    e:	 f20f114c2408         	movsd	qword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   1e:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   24:	 660f2ec8             	ucomisd	xmm1, xmm0
-;;   28:	 b800000000           	mov	eax, 0
-;;   2d:	 400f95c0             	setne	al
-;;   31:	 41bb00000000         	mov	r11d, 0
-;;   37:	 410f9ac3             	setp	r11b
-;;   3b:	 4c09d8               	or	rax, r11
-;;   3e:	 4883c418             	add	rsp, 0x18
-;;   42:	 5d                   	pop	rbp
-;;   43:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f64_nearest/f64_nearest_param.wat b/winch/filetests/filetests/x64/f64_nearest/f64_nearest_param.wat
deleted file mode 100644
index 7e957c10612b..000000000000
--- a/winch/filetests/filetests/x64/f64_nearest/f64_nearest_param.wat
+++ /dev/null
@@ -1,18 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f64) (result f64)
-        (local.get 0)
-        (f64.nearest)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;    e:	 4c893424             	mov	qword ptr [rsp], r14
-;;   12:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   18:	 e800000000           	call	0x1d
-;;   1d:	 4883c410             	add	rsp, 0x10
-;;   21:	 5d                   	pop	rbp
-;;   22:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f64_sqrt/f64_sqrt_const.wat b/winch/filetests/filetests/x64/f64_sqrt/f64_sqrt_const.wat
deleted file mode 100644
index 0b70b08850bc..000000000000
--- a/winch/filetests/filetests/x64/f64_sqrt/f64_sqrt_const.wat
+++ /dev/null
@@ -1,18 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f64)
-        (f64.const 1.32)
-        (f64.sqrt)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f20f10050c000000     	movsd	xmm0, qword ptr [rip + 0xc]
-;;   14:	 f20f51c0             	sqrtsd	xmm0, xmm0
-;;   18:	 4883c408             	add	rsp, 8
-;;   1c:	 5d                   	pop	rbp
-;;   1d:	 c3                   	ret	
-;;   1e:	 0000                 	add	byte ptr [rax], al
diff --git a/winch/filetests/filetests/x64/f64_sqrt/f64_sqrt_param.wat b/winch/filetests/filetests/x64/f64_sqrt/f64_sqrt_param.wat
deleted file mode 100644
index 9b06a96375f9..000000000000
--- a/winch/filetests/filetests/x64/f64_sqrt/f64_sqrt_param.wat
+++ /dev/null
@@ -1,18 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f64) (result f64)
-        (local.get 0)
-        (f64.sqrt)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;    e:	 4c893424             	mov	qword ptr [rsp], r14
-;;   12:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   18:	 f20f51c0             	sqrtsd	xmm0, xmm0
-;;   1c:	 4883c410             	add	rsp, 0x10
-;;   20:	 5d                   	pop	rbp
-;;   21:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f64_sub/const.wat b/winch/filetests/filetests/x64/f64_sub/const.wat
deleted file mode 100644
index ede4b5957040..000000000000
--- a/winch/filetests/filetests/x64/f64_sub/const.wat
+++ /dev/null
@@ -1,23 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f64)
-        (f64.const 1.1)
-        (f64.const 2.2)
-        (f64.sub)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 f20f10051c000000     	movsd	xmm0, qword ptr [rip + 0x1c]
-;;   14:	 f20f100d1c000000     	movsd	xmm1, qword ptr [rip + 0x1c]
-;;   1c:	 f20f5cc8             	subsd	xmm1, xmm0
-;;   20:	 660f28c1             	movapd	xmm0, xmm1
-;;   24:	 4883c408             	add	rsp, 8
-;;   28:	 5d                   	pop	rbp
-;;   29:	 c3                   	ret	
-;;   2a:	 0000                 	add	byte ptr [rax], al
-;;   2c:	 0000                 	add	byte ptr [rax], al
-;;   2e:	 0000                 	add	byte ptr [rax], al
diff --git a/winch/filetests/filetests/x64/f64_sub/locals.wat b/winch/filetests/filetests/x64/f64_sub/locals.wat
deleted file mode 100644
index d5a53faf352c..000000000000
--- a/winch/filetests/filetests/x64/f64_sub/locals.wat
+++ /dev/null
@@ -1,39 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (result f64)
-        (local $foo f64)  
-        (local $bar f64)
-
-        (f64.const 1.1)
-        (local.set $foo)
-
-        (f64.const 2.2)
-        (local.set $bar)
-
-        (local.get $foo)
-        (local.get $bar)
-        f64.sub
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 4531db               	xor	r11d, r11d
-;;    b:	 4c895c2410           	mov	qword ptr [rsp + 0x10], r11
-;;   10:	 4c895c2408           	mov	qword ptr [rsp + 8], r11
-;;   15:	 4c893424             	mov	qword ptr [rsp], r14
-;;   19:	 f20f10052f000000     	movsd	xmm0, qword ptr [rip + 0x2f]
-;;   21:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;   27:	 f20f100529000000     	movsd	xmm0, qword ptr [rip + 0x29]
-;;   2f:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;   35:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   3b:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   41:	 f20f5cc8             	subsd	xmm1, xmm0
-;;   45:	 660f28c1             	movapd	xmm0, xmm1
-;;   49:	 4883c418             	add	rsp, 0x18
-;;   4d:	 5d                   	pop	rbp
-;;   4e:	 c3                   	ret	
-;;   4f:	 009a99999999         	add	byte ptr [rdx - 0x66666667], bl
-;;   55:	 99                   	cdq	
-;;   56:	 f1                   	int1	
diff --git a/winch/filetests/filetests/x64/f64_sub/params.wat b/winch/filetests/filetests/x64/f64_sub/params.wat
deleted file mode 100644
index 28a7cff80dd4..000000000000
--- a/winch/filetests/filetests/x64/f64_sub/params.wat
+++ /dev/null
@@ -1,22 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f64) (param f64) (result f64)
-        (local.get 0)
-        (local.get 1)
-        (f64.sub)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 f20f11442410         	movsd	qword ptr [rsp + 0x10], xmm0
-;;    e:	 f20f114c2408         	movsd	qword ptr [rsp + 8], xmm1
-;;   14:	 4c893424             	mov	qword ptr [rsp], r14
-;;   18:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   1e:	 f20f104c2410         	movsd	xmm1, qword ptr [rsp + 0x10]
-;;   24:	 f20f5cc8             	subsd	xmm1, xmm0
-;;   28:	 660f28c1             	movapd	xmm0, xmm1
-;;   2c:	 4883c418             	add	rsp, 0x18
-;;   30:	 5d                   	pop	rbp
-;;   31:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/f64_trunc/f64_trunc_param.wat b/winch/filetests/filetests/x64/f64_trunc/f64_trunc_param.wat
deleted file mode 100644
index 00d68f5ae80f..000000000000
--- a/winch/filetests/filetests/x64/f64_trunc/f64_trunc_param.wat
+++ /dev/null
@@ -1,18 +0,0 @@
-;;! target = "x86_64"
-
-(module
-    (func (param f64) (result f64)
-        (local.get 0)
-        (f64.trunc)
-    )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 f20f11442408         	movsd	qword ptr [rsp + 8], xmm0
-;;    e:	 4c893424             	mov	qword ptr [rsp], r14
-;;   12:	 f20f10442408         	movsd	xmm0, qword ptr [rsp + 8]
-;;   18:	 e800000000           	call	0x1d
-;;   1d:	 4883c410             	add	rsp, 0x10
-;;   21:	 5d                   	pop	rbp
-;;   22:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/table/fill.wat b/winch/filetests/filetests/x64/table/fill.wat
deleted file mode 100644
index 2a61212958ae..000000000000
--- a/winch/filetests/filetests/x64/table/fill.wat
+++ /dev/null
@@ -1,94 +0,0 @@
-;;! target = "x86_64"
-(module
-  (type $t0 (func))
-  (func $f1 (type $t0))
-  (func $f2 (type $t0))
-  (func $f3 (type $t0))
-
-  ;; Define two tables of funcref
-  (table $t1 3 funcref)
-  (table $t2 10 funcref)
-
-  ;; Initialize table $t1 with functions $f1, $f2, $f3
-  (elem (i32.const 0) $f1 $f2 $f3)
-
-  ;; Function to fill table $t1 using a function reference from table $t2
-  (func (export "fill") (param $i i32) (param $r i32) (param $n i32)
-    (local $ref funcref)
-    (local.set $ref (table.get $t1 (local.get $r)))
-    (table.fill $t2 (local.get $i) (local.get $ref) (local.get $n))
-  )
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 4883c408             	add	rsp, 8
-;;   10:	 5d                   	pop	rbp
-;;   11:	 c3                   	ret	
-;;
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 4883c408             	add	rsp, 8
-;;   10:	 5d                   	pop	rbp
-;;   11:	 c3                   	ret	
-;;
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 4883c408             	add	rsp, 8
-;;   10:	 5d                   	pop	rbp
-;;   11:	 c3                   	ret	
-;;
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec20             	sub	rsp, 0x20
-;;    8:	 897c241c             	mov	dword ptr [rsp + 0x1c], edi
-;;    c:	 89742418             	mov	dword ptr [rsp + 0x18], esi
-;;   10:	 89542414             	mov	dword ptr [rsp + 0x14], edx
-;;   14:	 4c89742404           	mov	qword ptr [rsp + 4], r14
-;;   19:	 8b4c2418             	mov	ecx, dword ptr [rsp + 0x18]
-;;   1d:	 4c89f2               	mov	rdx, r14
-;;   20:	 8b5a50               	mov	ebx, dword ptr [rdx + 0x50]
-;;   23:	 39d9                 	cmp	ecx, ebx
-;;   25:	 0f8381000000         	jae	0xac
-;;   2b:	 4189cb               	mov	r11d, ecx
-;;   2e:	 4d6bdb08             	imul	r11, r11, 8
-;;   32:	 488b5248             	mov	rdx, qword ptr [rdx + 0x48]
-;;   36:	 4889d6               	mov	rsi, rdx
-;;   39:	 4c01da               	add	rdx, r11
-;;   3c:	 39d9                 	cmp	ecx, ebx
-;;   3e:	 480f43d6             	cmovae	rdx, rsi
-;;   42:	 488b02               	mov	rax, qword ptr [rdx]
-;;   45:	 4885c0               	test	rax, rax
-;;   48:	 0f8523000000         	jne	0x71
-;;   4e:	 4d8b5e38             	mov	r11, qword ptr [r14 + 0x38]
-;;   52:	 498b5b48             	mov	rbx, qword ptr [r11 + 0x48]
-;;   56:	 4156                 	push	r14
-;;   58:	 51                   	push	rcx
-;;   59:	 488b7c2408           	mov	rdi, qword ptr [rsp + 8]
-;;   5e:	 be00000000           	mov	esi, 0
-;;   63:	 8b1424               	mov	edx, dword ptr [rsp]
-;;   66:	 ffd3                 	call	rbx
-;;   68:	 4883c410             	add	rsp, 0x10
-;;   6c:	 e904000000           	jmp	0x75
-;;   71:	 4883e0fe             	and	rax, 0xfffffffffffffffe
-;;   75:	 488944240c           	mov	qword ptr [rsp + 0xc], rax
-;;   7a:	 4d8b5e38             	mov	r11, qword ptr [r14 + 0x38]
-;;   7e:	 498b4368             	mov	rax, qword ptr [r11 + 0x68]
-;;   82:	 4156                 	push	r14
-;;   84:	 4883ec08             	sub	rsp, 8
-;;   88:	 488b7c2408           	mov	rdi, qword ptr [rsp + 8]
-;;   8d:	 be01000000           	mov	esi, 1
-;;   92:	 8b54242c             	mov	edx, dword ptr [rsp + 0x2c]
-;;   96:	 488b4c241c           	mov	rcx, qword ptr [rsp + 0x1c]
-;;   9b:	 448b442424           	mov	r8d, dword ptr [rsp + 0x24]
-;;   a0:	 ffd0                 	call	rax
-;;   a2:	 4883c410             	add	rsp, 0x10
-;;   a6:	 4883c420             	add	rsp, 0x20
-;;   aa:	 5d                   	pop	rbp
-;;   ab:	 c3                   	ret	
-;;   ac:	 0f0b                 	ud2	
diff --git a/winch/filetests/filetests/x64/table/get.wat b/winch/filetests/filetests/x64/table/get.wat
deleted file mode 100644
index 58d6b0fb9dfd..000000000000
--- a/winch/filetests/filetests/x64/table/get.wat
+++ /dev/null
@@ -1,54 +0,0 @@
-;;! target = "x86_64"
-(module
-  (table $t3 3 funcref)
-  (elem (table $t3) (i32.const 1) func $dummy)
-  (func $dummy)
-  (func $f3 (export "get-funcref") (param $i i32) (result funcref)
-    (table.get $t3 (local.get $i))
-  )
-)
-
-
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 4883c408             	add	rsp, 8
-;;   10:	 5d                   	pop	rbp
-;;   11:	 c3                   	ret	
-;;
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 897c240c             	mov	dword ptr [rsp + 0xc], edi
-;;    c:	 4c89742404           	mov	qword ptr [rsp + 4], r14
-;;   11:	 8b4c240c             	mov	ecx, dword ptr [rsp + 0xc]
-;;   15:	 4c89f2               	mov	rdx, r14
-;;   18:	 8b5a50               	mov	ebx, dword ptr [rdx + 0x50]
-;;   1b:	 39d9                 	cmp	ecx, ebx
-;;   1d:	 0f8350000000         	jae	0x73
-;;   23:	 4189cb               	mov	r11d, ecx
-;;   26:	 4d6bdb08             	imul	r11, r11, 8
-;;   2a:	 488b5248             	mov	rdx, qword ptr [rdx + 0x48]
-;;   2e:	 4889d6               	mov	rsi, rdx
-;;   31:	 4c01da               	add	rdx, r11
-;;   34:	 39d9                 	cmp	ecx, ebx
-;;   36:	 480f43d6             	cmovae	rdx, rsi
-;;   3a:	 488b02               	mov	rax, qword ptr [rdx]
-;;   3d:	 4885c0               	test	rax, rax
-;;   40:	 0f8523000000         	jne	0x69
-;;   46:	 4d8b5e38             	mov	r11, qword ptr [r14 + 0x38]
-;;   4a:	 498b5b48             	mov	rbx, qword ptr [r11 + 0x48]
-;;   4e:	 4156                 	push	r14
-;;   50:	 51                   	push	rcx
-;;   51:	 488b7c2408           	mov	rdi, qword ptr [rsp + 8]
-;;   56:	 be00000000           	mov	esi, 0
-;;   5b:	 8b1424               	mov	edx, dword ptr [rsp]
-;;   5e:	 ffd3                 	call	rbx
-;;   60:	 4883c410             	add	rsp, 0x10
-;;   64:	 e904000000           	jmp	0x6d
-;;   69:	 4883e0fe             	and	rax, 0xfffffffffffffffe
-;;   6d:	 4883c410             	add	rsp, 0x10
-;;   71:	 5d                   	pop	rbp
-;;   72:	 c3                   	ret	
-;;   73:	 0f0b                 	ud2	
diff --git a/winch/filetests/filetests/x64/table/grow.wat b/winch/filetests/filetests/x64/table/grow.wat
deleted file mode 100644
index 918d16747603..000000000000
--- a/winch/filetests/filetests/x64/table/grow.wat
+++ /dev/null
@@ -1,29 +0,0 @@
-;;! target = "x86_64"
-
-(module
-  (table $t1 0 funcref)
-
-  (func (export "grow-by-10") (param $r funcref) (result i32)
-    (table.grow $t1 (local.get $r) (i32.const 10))
-  )
-)
-
-
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 48897c2408           	mov	qword ptr [rsp + 8], rdi
-;;    d:	 4c893424             	mov	qword ptr [rsp], r14
-;;   11:	 4d8b5e38             	mov	r11, qword ptr [r14 + 0x38]
-;;   15:	 498b5b50             	mov	rbx, qword ptr [r11 + 0x50]
-;;   19:	 4156                 	push	r14
-;;   1b:	 4883ec08             	sub	rsp, 8
-;;   1f:	 488b7c2408           	mov	rdi, qword ptr [rsp + 8]
-;;   24:	 be00000000           	mov	esi, 0
-;;   29:	 ba0a000000           	mov	edx, 0xa
-;;   2e:	 488b4c2418           	mov	rcx, qword ptr [rsp + 0x18]
-;;   33:	 ffd3                 	call	rbx
-;;   35:	 4883c410             	add	rsp, 0x10
-;;   39:	 4883c410             	add	rsp, 0x10
-;;   3d:	 5d                   	pop	rbp
-;;   3e:	 c3                   	ret	
diff --git a/winch/filetests/filetests/x64/table/init_copy_drop.wat b/winch/filetests/filetests/x64/table/init_copy_drop.wat
deleted file mode 100644
index a5d12df2efc9..000000000000
--- a/winch/filetests/filetests/x64/table/init_copy_drop.wat
+++ /dev/null
@@ -1,227 +0,0 @@
-;;! target = "x86_64"
-
-(module
-  (type (func (result i32)))  ;; type #0
-  (import "a" "ef0" (func (result i32)))    ;; index 0
-  (import "a" "ef1" (func (result i32)))
-  (import "a" "ef2" (func (result i32)))
-  (import "a" "ef3" (func (result i32)))
-  (import "a" "ef4" (func (result i32)))    ;; index 4
-  (table $t0 30 30 funcref)
-  (table $t1 30 30 funcref)
-  (elem (table $t0) (i32.const 2) func 3 1 4 1)
-  (elem funcref
-    (ref.func 2) (ref.func 7) (ref.func 1) (ref.func 8))
-  (elem (table $t0) (i32.const 12) func 7 5 2 3 6)
-  (elem funcref
-    (ref.func 5) (ref.func 9) (ref.func 2) (ref.func 7) (ref.func 6))
-  (func (result i32) (i32.const 5))  ;; index 5
-  (func (result i32) (i32.const 6))
-  (func (result i32) (i32.const 7))
-  (func (result i32) (i32.const 8))
-  (func (result i32) (i32.const 9))  ;; index 9
-  (func (export "test")
-    (table.init $t0 1 (i32.const 7) (i32.const 0) (i32.const 4))
-         (elem.drop 1)
-         (table.init $t0 3 (i32.const 15) (i32.const 1) (i32.const 3))
-         (elem.drop 3)
-         (table.copy $t0 0 (i32.const 20) (i32.const 15) (i32.const 5))
-         (table.copy $t0 0 (i32.const 21) (i32.const 29) (i32.const 1))
-         (table.copy $t0 0 (i32.const 24) (i32.const 10) (i32.const 1))
-         (table.copy $t0 0 (i32.const 13) (i32.const 11) (i32.const 4))
-         (table.copy $t0 0 (i32.const 19) (i32.const 20) (i32.const 5)))
-  (func (export "check") (param i32) (result i32)
-    (call_indirect $t0 (type 0) (local.get 0)))
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 b805000000           	mov	eax, 5
-;;   11:	 4883c408             	add	rsp, 8
-;;   15:	 5d                   	pop	rbp
-;;   16:	 c3                   	ret	
-;;
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 b806000000           	mov	eax, 6
-;;   11:	 4883c408             	add	rsp, 8
-;;   15:	 5d                   	pop	rbp
-;;   16:	 c3                   	ret	
-;;
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 b807000000           	mov	eax, 7
-;;   11:	 4883c408             	add	rsp, 8
-;;   15:	 5d                   	pop	rbp
-;;   16:	 c3                   	ret	
-;;
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 b808000000           	mov	eax, 8
-;;   11:	 4883c408             	add	rsp, 8
-;;   15:	 5d                   	pop	rbp
-;;   16:	 c3                   	ret	
-;;
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 b809000000           	mov	eax, 9
-;;   11:	 4883c408             	add	rsp, 8
-;;   15:	 5d                   	pop	rbp
-;;   16:	 c3                   	ret	
-;;
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 4d8b5e38             	mov	r11, qword ptr [r14 + 0x38]
-;;   10:	 498b4310             	mov	rax, qword ptr [r11 + 0x10]
-;;   14:	 4156                 	push	r14
-;;   16:	 488b3c24             	mov	rdi, qword ptr [rsp]
-;;   1a:	 be00000000           	mov	esi, 0
-;;   1f:	 ba01000000           	mov	edx, 1
-;;   24:	 b907000000           	mov	ecx, 7
-;;   29:	 41b800000000         	mov	r8d, 0
-;;   2f:	 41b904000000         	mov	r9d, 4
-;;   35:	 ffd0                 	call	rax
-;;   37:	 4883c408             	add	rsp, 8
-;;   3b:	 4d8b5e38             	mov	r11, qword ptr [r14 + 0x38]
-;;   3f:	 498b4318             	mov	rax, qword ptr [r11 + 0x18]
-;;   43:	 4156                 	push	r14
-;;   45:	 488b3c24             	mov	rdi, qword ptr [rsp]
-;;   49:	 be01000000           	mov	esi, 1
-;;   4e:	 ffd0                 	call	rax
-;;   50:	 4883c408             	add	rsp, 8
-;;   54:	 4d8b5e38             	mov	r11, qword ptr [r14 + 0x38]
-;;   58:	 498b4310             	mov	rax, qword ptr [r11 + 0x10]
-;;   5c:	 4156                 	push	r14
-;;   5e:	 488b3c24             	mov	rdi, qword ptr [rsp]
-;;   62:	 be00000000           	mov	esi, 0
-;;   67:	 ba03000000           	mov	edx, 3
-;;   6c:	 b90f000000           	mov	ecx, 0xf
-;;   71:	 41b801000000         	mov	r8d, 1
-;;   77:	 41b903000000         	mov	r9d, 3
-;;   7d:	 ffd0                 	call	rax
-;;   7f:	 4883c408             	add	rsp, 8
-;;   83:	 4d8b5e38             	mov	r11, qword ptr [r14 + 0x38]
-;;   87:	 498b4318             	mov	rax, qword ptr [r11 + 0x18]
-;;   8b:	 4156                 	push	r14
-;;   8d:	 488b3c24             	mov	rdi, qword ptr [rsp]
-;;   91:	 be03000000           	mov	esi, 3
-;;   96:	 ffd0                 	call	rax
-;;   98:	 4883c408             	add	rsp, 8
-;;   9c:	 4d8b5e38             	mov	r11, qword ptr [r14 + 0x38]
-;;   a0:	 498b4308             	mov	rax, qword ptr [r11 + 8]
-;;   a4:	 4156                 	push	r14
-;;   a6:	 488b3c24             	mov	rdi, qword ptr [rsp]
-;;   aa:	 be00000000           	mov	esi, 0
-;;   af:	 ba00000000           	mov	edx, 0
-;;   b4:	 b914000000           	mov	ecx, 0x14
-;;   b9:	 41b80f000000         	mov	r8d, 0xf
-;;   bf:	 41b905000000         	mov	r9d, 5
-;;   c5:	 ffd0                 	call	rax
-;;   c7:	 4883c408             	add	rsp, 8
-;;   cb:	 4d8b5e38             	mov	r11, qword ptr [r14 + 0x38]
-;;   cf:	 498b4308             	mov	rax, qword ptr [r11 + 8]
-;;   d3:	 4156                 	push	r14
-;;   d5:	 488b3c24             	mov	rdi, qword ptr [rsp]
-;;   d9:	 be00000000           	mov	esi, 0
-;;   de:	 ba00000000           	mov	edx, 0
-;;   e3:	 b915000000           	mov	ecx, 0x15
-;;   e8:	 41b81d000000         	mov	r8d, 0x1d
-;;   ee:	 41b901000000         	mov	r9d, 1
-;;   f4:	 ffd0                 	call	rax
-;;   f6:	 4883c408             	add	rsp, 8
-;;   fa:	 4d8b5e38             	mov	r11, qword ptr [r14 + 0x38]
-;;   fe:	 498b4308             	mov	rax, qword ptr [r11 + 8]
-;;  102:	 4156                 	push	r14
-;;  104:	 488b3c24             	mov	rdi, qword ptr [rsp]
-;;  108:	 be00000000           	mov	esi, 0
-;;  10d:	 ba00000000           	mov	edx, 0
-;;  112:	 b918000000           	mov	ecx, 0x18
-;;  117:	 41b80a000000         	mov	r8d, 0xa
-;;  11d:	 41b901000000         	mov	r9d, 1
-;;  123:	 ffd0                 	call	rax
-;;  125:	 4883c408             	add	rsp, 8
-;;  129:	 4d8b5e38             	mov	r11, qword ptr [r14 + 0x38]
-;;  12d:	 498b4308             	mov	rax, qword ptr [r11 + 8]
-;;  131:	 4156                 	push	r14
-;;  133:	 488b3c24             	mov	rdi, qword ptr [rsp]
-;;  137:	 be00000000           	mov	esi, 0
-;;  13c:	 ba00000000           	mov	edx, 0
-;;  141:	 b90d000000           	mov	ecx, 0xd
-;;  146:	 41b80b000000         	mov	r8d, 0xb
-;;  14c:	 41b904000000         	mov	r9d, 4
-;;  152:	 ffd0                 	call	rax
-;;  154:	 4883c408             	add	rsp, 8
-;;  158:	 4d8b5e38             	mov	r11, qword ptr [r14 + 0x38]
-;;  15c:	 498b4308             	mov	rax, qword ptr [r11 + 8]
-;;  160:	 4156                 	push	r14
-;;  162:	 488b3c24             	mov	rdi, qword ptr [rsp]
-;;  166:	 be00000000           	mov	esi, 0
-;;  16b:	 ba00000000           	mov	edx, 0
-;;  170:	 b913000000           	mov	ecx, 0x13
-;;  175:	 41b814000000         	mov	r8d, 0x14
-;;  17b:	 41b905000000         	mov	r9d, 5
-;;  181:	 ffd0                 	call	rax
-;;  183:	 4883c408             	add	rsp, 8
-;;  187:	 4883c408             	add	rsp, 8
-;;  18b:	 5d                   	pop	rbp
-;;  18c:	 c3                   	ret	
-;;
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 897c240c             	mov	dword ptr [rsp + 0xc], edi
-;;    c:	 4c89742404           	mov	qword ptr [rsp + 4], r14
-;;   11:	 8b4c240c             	mov	ecx, dword ptr [rsp + 0xc]
-;;   15:	 4c89f2               	mov	rdx, r14
-;;   18:	 8b9af0000000         	mov	ebx, dword ptr [rdx + 0xf0]
-;;   1e:	 39d9                 	cmp	ecx, ebx
-;;   20:	 0f8376000000         	jae	0x9c
-;;   26:	 4189cb               	mov	r11d, ecx
-;;   29:	 4d6bdb08             	imul	r11, r11, 8
-;;   2d:	 488b92e8000000       	mov	rdx, qword ptr [rdx + 0xe8]
-;;   34:	 4889d6               	mov	rsi, rdx
-;;   37:	 4c01da               	add	rdx, r11
-;;   3a:	 39d9                 	cmp	ecx, ebx
-;;   3c:	 480f43d6             	cmovae	rdx, rsi
-;;   40:	 488b02               	mov	rax, qword ptr [rdx]
-;;   43:	 4885c0               	test	rax, rax
-;;   46:	 0f8523000000         	jne	0x6f
-;;   4c:	 4d8b5e38             	mov	r11, qword ptr [r14 + 0x38]
-;;   50:	 498b5b48             	mov	rbx, qword ptr [r11 + 0x48]
-;;   54:	 4156                 	push	r14
-;;   56:	 51                   	push	rcx
-;;   57:	 488b7c2408           	mov	rdi, qword ptr [rsp + 8]
-;;   5c:	 be00000000           	mov	esi, 0
-;;   61:	 8b1424               	mov	edx, dword ptr [rsp]
-;;   64:	 ffd3                 	call	rbx
-;;   66:	 4883c410             	add	rsp, 0x10
-;;   6a:	 e904000000           	jmp	0x73
-;;   6f:	 4883e0fe             	and	rax, 0xfffffffffffffffe
-;;   73:	 4885c0               	test	rax, rax
-;;   76:	 0f8422000000         	je	0x9e
-;;   7c:	 4d8b5e40             	mov	r11, qword ptr [r14 + 0x40]
-;;   80:	 418b0b               	mov	ecx, dword ptr [r11]
-;;   83:	 8b5018               	mov	edx, dword ptr [rax + 0x18]
-;;   86:	 39d1                 	cmp	ecx, edx
-;;   88:	 0f8512000000         	jne	0xa0
-;;   8e:	 50                   	push	rax
-;;   8f:	 59                   	pop	rcx
-;;   90:	 488b5110             	mov	rdx, qword ptr [rcx + 0x10]
-;;   94:	 ffd2                 	call	rdx
-;;   96:	 4883c410             	add	rsp, 0x10
-;;   9a:	 5d                   	pop	rbp
-;;   9b:	 c3                   	ret	
-;;   9c:	 0f0b                 	ud2	
-;;   9e:	 0f0b                 	ud2	
-;;   a0:	 0f0b                 	ud2	
diff --git a/winch/filetests/filetests/x64/table/set.wat b/winch/filetests/filetests/x64/table/set.wat
deleted file mode 100644
index b3cfb2b0f56e..000000000000
--- a/winch/filetests/filetests/x64/table/set.wat
+++ /dev/null
@@ -1,101 +0,0 @@
-;;! target = "x86_64"
-
-
-(module
-  (table $t3 2 funcref)
-  (elem (table $t3) (i32.const 1) func $dummy)
-  (func $dummy)
-
-  (func (export "set-funcref") (param $i i32) (param $r funcref)
-    (table.set $t3 (local.get $i) (local.get $r))
-  )
-  (func (export "set-funcref-from") (param $i i32) (param $j i32)
-    (table.set $t3 (local.get $i) (table.get $t3 (local.get $j)))
-  )
-)
-
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 4883c408             	add	rsp, 8
-;;   10:	 5d                   	pop	rbp
-;;   11:	 c3                   	ret	
-;;
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec18             	sub	rsp, 0x18
-;;    8:	 897c2414             	mov	dword ptr [rsp + 0x14], edi
-;;    c:	 4889742408           	mov	qword ptr [rsp + 8], rsi
-;;   11:	 4c893424             	mov	qword ptr [rsp], r14
-;;   15:	 488b442408           	mov	rax, qword ptr [rsp + 8]
-;;   1a:	 8b4c2414             	mov	ecx, dword ptr [rsp + 0x14]
-;;   1e:	 4c89f2               	mov	rdx, r14
-;;   21:	 8b5a50               	mov	ebx, dword ptr [rdx + 0x50]
-;;   24:	 39d9                 	cmp	ecx, ebx
-;;   26:	 0f8324000000         	jae	0x50
-;;   2c:	 4189cb               	mov	r11d, ecx
-;;   2f:	 4d6bdb08             	imul	r11, r11, 8
-;;   33:	 488b5248             	mov	rdx, qword ptr [rdx + 0x48]
-;;   37:	 4889d6               	mov	rsi, rdx
-;;   3a:	 4c01da               	add	rdx, r11
-;;   3d:	 39d9                 	cmp	ecx, ebx
-;;   3f:	 480f43d6             	cmovae	rdx, rsi
-;;   43:	 4883c801             	or	rax, 1
-;;   47:	 488902               	mov	qword ptr [rdx], rax
-;;   4a:	 4883c418             	add	rsp, 0x18
-;;   4e:	 5d                   	pop	rbp
-;;   4f:	 c3                   	ret	
-;;   50:	 0f0b                 	ud2	
-;;
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec10             	sub	rsp, 0x10
-;;    8:	 897c240c             	mov	dword ptr [rsp + 0xc], edi
-;;    c:	 89742408             	mov	dword ptr [rsp + 8], esi
-;;   10:	 4c893424             	mov	qword ptr [rsp], r14
-;;   14:	 8b4c2408             	mov	ecx, dword ptr [rsp + 8]
-;;   18:	 4c89f2               	mov	rdx, r14
-;;   1b:	 8b5a50               	mov	ebx, dword ptr [rdx + 0x50]
-;;   1e:	 39d9                 	cmp	ecx, ebx
-;;   20:	 0f8380000000         	jae	0xa6
-;;   26:	 4189cb               	mov	r11d, ecx
-;;   29:	 4d6bdb08             	imul	r11, r11, 8
-;;   2d:	 488b5248             	mov	rdx, qword ptr [rdx + 0x48]
-;;   31:	 4889d6               	mov	rsi, rdx
-;;   34:	 4c01da               	add	rdx, r11
-;;   37:	 39d9                 	cmp	ecx, ebx
-;;   39:	 480f43d6             	cmovae	rdx, rsi
-;;   3d:	 488b02               	mov	rax, qword ptr [rdx]
-;;   40:	 4885c0               	test	rax, rax
-;;   43:	 0f8523000000         	jne	0x6c
-;;   49:	 4d8b5e38             	mov	r11, qword ptr [r14 + 0x38]
-;;   4d:	 498b5b48             	mov	rbx, qword ptr [r11 + 0x48]
-;;   51:	 4156                 	push	r14
-;;   53:	 51                   	push	rcx
-;;   54:	 488b7c2408           	mov	rdi, qword ptr [rsp + 8]
-;;   59:	 be00000000           	mov	esi, 0
-;;   5e:	 8b1424               	mov	edx, dword ptr [rsp]
-;;   61:	 ffd3                 	call	rbx
-;;   63:	 4883c410             	add	rsp, 0x10
-;;   67:	 e904000000           	jmp	0x70
-;;   6c:	 4883e0fe             	and	rax, 0xfffffffffffffffe
-;;   70:	 8b4c240c             	mov	ecx, dword ptr [rsp + 0xc]
-;;   74:	 4c89f2               	mov	rdx, r14
-;;   77:	 8b5a50               	mov	ebx, dword ptr [rdx + 0x50]
-;;   7a:	 39d9                 	cmp	ecx, ebx
-;;   7c:	 0f8326000000         	jae	0xa8
-;;   82:	 4189cb               	mov	r11d, ecx
-;;   85:	 4d6bdb08             	imul	r11, r11, 8
-;;   89:	 488b5248             	mov	rdx, qword ptr [rdx + 0x48]
-;;   8d:	 4889d6               	mov	rsi, rdx
-;;   90:	 4c01da               	add	rdx, r11
-;;   93:	 39d9                 	cmp	ecx, ebx
-;;   95:	 480f43d6             	cmovae	rdx, rsi
-;;   99:	 4883c801             	or	rax, 1
-;;   9d:	 488902               	mov	qword ptr [rdx], rax
-;;   a0:	 4883c410             	add	rsp, 0x10
-;;   a4:	 5d                   	pop	rbp
-;;   a5:	 c3                   	ret	
-;;   a6:	 0f0b                 	ud2	
-;;   a8:	 0f0b                 	ud2	
diff --git a/winch/filetests/filetests/x64/table/size.wat b/winch/filetests/filetests/x64/table/size.wat
deleted file mode 100644
index 8c0f47f0ace2..000000000000
--- a/winch/filetests/filetests/x64/table/size.wat
+++ /dev/null
@@ -1,15 +0,0 @@
-;;! target = "x86_64"
-(module
-  (table $t1 0 funcref)
-  (func (export "size") (result i32)
-    (table.size $t1))
-)
-;;    0:	 55                   	push	rbp
-;;    1:	 4889e5               	mov	rbp, rsp
-;;    4:	 4883ec08             	sub	rsp, 8
-;;    8:	 4c893424             	mov	qword ptr [rsp], r14
-;;    c:	 4d89f3               	mov	r11, r14
-;;    f:	 418b4350             	mov	eax, dword ptr [r11 + 0x50]
-;;   13:	 4883c408             	add	rsp, 8
-;;   17:	 5d                   	pop	rbp
-;;   18:	 c3                   	ret	
diff --git a/winch/filetests/src/lib.rs b/winch/filetests/src/lib.rs
index aabcab240837..b1f5daa86c6d 100644
--- a/winch/filetests/src/lib.rs
+++ b/winch/filetests/src/lib.rs
@@ -12,10 +12,9 @@ mod test {
     use wasmtime_environ::ModuleTranslation;
     use wasmtime_environ::{
         wasmparser::{Parser as WasmParser, Validator},
-        DefinedFuncIndex, FunctionBodyData, ModuleEnvironment, ModuleTypes, Tunables, TypeConvert,
-        VMOffsets,
+        DefinedFuncIndex, FunctionBodyData, ModuleEnvironment, Tunables, TypeConvert,
     };
-    use winch_codegen::{lookup, BuiltinFunctions, TargetIsa};
+    use winch_codegen::{lookup, TargetIsa};
     use winch_test_macros::generate_file_tests;
 
     #[derive(Clone, Debug, Serialize, Deserialize)]
@@ -109,13 +108,13 @@ mod test {
             .translate(parser, &wasm)
             .context("Failed to translate WebAssembly module")
             .unwrap();
-        let types = types.finish();
+        let _ = types.finish();
 
         let body_inputs = std::mem::take(&mut translation.function_body_inputs);
 
         let binding = body_inputs
             .into_iter()
-            .map(|func| compile(&isa, &types, &translation, func).join("\n"))
+            .map(|func| compile(&isa, &translation, func).join("\n"))
             .collect::<Vec<String>>()
             .join("\n\n");
         let actual = binding.as_str();
@@ -148,7 +147,6 @@ mod test {
 
     fn compile(
         isa: &Box<dyn TargetIsa>,
-        module_types: &ModuleTypes,
         translation: &ModuleTranslation,
         f: (DefinedFuncIndex, FunctionBodyData<'_>),
     ) -> Vec<String> {
@@ -159,19 +157,10 @@ mod test {
         let sig = types[types.function_at(index.as_u32())].unwrap_func();
         let sig = translation.module.convert_func_type(&sig);
 
-        let vmoffsets = VMOffsets::new(isa.pointer_bytes(), &translation.module);
-        let mut builtins = BuiltinFunctions::new(&vmoffsets, isa.wasmtime_call_conv());
         let FunctionBodyData { body, validator } = f.1;
         let mut validator = validator.into_validator(Default::default());
         let buffer = isa
-            .compile_function(
-                &sig,
-                &body,
-                translation,
-                module_types,
-                &mut builtins,
-                &mut validator,
-            )
+            .compile_function(&sig, &body, &translation, &mut validator)
             .expect("Couldn't compile function");
 
         disasm(buffer.data(), isa).unwrap()
diff --git a/winch/src/compile.rs b/winch/src/compile.rs
index ebf6061080af..723f3a6ac4fd 100644
--- a/winch/src/compile.rs
+++ b/winch/src/compile.rs
@@ -5,10 +5,10 @@ use std::{fs, path::PathBuf, str::FromStr};
 use target_lexicon::Triple;
 use wasmtime_environ::{
     wasmparser::{Parser as WasmParser, Validator},
-    DefinedFuncIndex, FunctionBodyData, ModuleEnvironment, ModuleTranslation, ModuleTypes,
-    Tunables, TypeConvert, VMOffsets,
+    DefinedFuncIndex, FunctionBodyData, ModuleEnvironment, ModuleTranslation, Tunables,
+    TypeConvert,
 };
-use winch_codegen::{lookup, BuiltinFunctions, TargetIsa};
+use winch_codegen::{lookup, TargetIsa};
 use winch_filetests::disasm::disasm;
 
 #[derive(Parser, Debug)]
@@ -36,12 +36,12 @@ pub fn run(opt: &Options) -> Result<()> {
     let mut translation = ModuleEnvironment::new(&tunables, &mut validator, &mut types)
         .translate(parser, &bytes)
         .context("Failed to translate WebAssembly module")?;
-    let types = types.finish();
+    let _ = types.finish();
     let body_inputs = std::mem::take(&mut translation.function_body_inputs);
 
     body_inputs
         .into_iter()
-        .try_for_each(|func| compile(&isa, &translation, &types, func))?;
+        .try_for_each(|func| compile(&isa, &translation, func))?;
 
     Ok(())
 }
@@ -49,7 +49,6 @@ pub fn run(opt: &Options) -> Result<()> {
 fn compile(
     isa: &Box<dyn TargetIsa>,
     translation: &ModuleTranslation,
-    module_types: &ModuleTypes,
     f: (DefinedFuncIndex, FunctionBodyData<'_>),
 ) -> Result<()> {
     let index = translation.module.func_index(f.0);
@@ -57,18 +56,9 @@ fn compile(
     let sig = types[types.function_at(index.as_u32())].unwrap_func();
     let sig = translation.module.convert_func_type(sig);
     let FunctionBodyData { body, validator } = f.1;
-    let vmoffsets = VMOffsets::new(isa.pointer_bytes(), &translation.module);
-    let mut builtins = BuiltinFunctions::new(&vmoffsets, isa.wasmtime_call_conv());
     let mut validator = validator.into_validator(Default::default());
     let buffer = isa
-        .compile_function(
-            &sig,
-            &body,
-            translation,
-            module_types,
-            &mut builtins,
-            &mut validator,
-        )
+        .compile_function(&sig, &body, &translation, &mut validator)
         .expect("Couldn't compile function");
 
     println!("Disassembly for function: {}", index.as_u32());